diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:42:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:42:06 +0000 |
| commit | 090f68181a69b14be7ac485a97944c3a6f0cdd19 (patch) | |
| tree | 5b5c0c264a1fcb0845f86047f56a1335ae44e5e8 /setup_native | |
| parent | fd0fc61817a5c201cf32b9a835fd3ea8c36fbcf8 (diff) | |
INTEGRATION: CWS warnings01 (1.4.18); FILE MERGED
2006/01/31 13:35:35 sb 1.4.18.1: #i53898# Made code warning-free.
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/shellextensions.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx index 49b907fe89fd..11fe7e67aaa0 100644 --- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shellextensions.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:40:46 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:42:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,9 +79,12 @@ prviliges have no negative effect because the shell extensions will work anyhow. */ +#pragma warning(push, 1) /* disable warnings within system headers */ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <msiquery.h> +#pragma warning(pop) + #include <malloc.h> #ifdef UNICODE @@ -104,7 +107,7 @@ RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TE Called during installation when the module "Windows Explorer Extensions" is selected. */ -extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE handle) +extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE) { //MessageBox(NULL, TEXT("InstallExecSequenceEntry"), TEXT("Pythonmsi"), MB_OK | MB_ICONINFORMATION); HKEY hKey; @@ -124,7 +127,7 @@ extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE handle) Called during deinstallation when the module "Windows Explorer Extensions" has been installed. */ -extern "C" UINT __stdcall DeinstallExecSequenceEntry(MSIHANDLE handle) +extern "C" UINT __stdcall DeinstallExecSequenceEntry(MSIHANDLE) { //MessageBox(NULL, TEXT("DeinstallExecSequenceEntry"), TEXT("Pythonmsi"), MB_OK | MB_ICONINFORMATION); HKEY hKey; |