diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:07:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:07:45 +0000 |
| commit | d5e331f2beb2d07c89f117ff0f3dbba5d8ab1506 (patch) | |
| tree | 941063748b7e602b50afc4944928b47733eb489f /odk/source | |
| parent | 83bef9c9045f85178bb0483c4b6b7854daaf2c8e (diff) | |
INTEGRATION: CWS warnings01 (1.3.14); FILE MERGED
2006/03/01 14:11:30 sb 1.3.14.1: #i53898# Made code waring-free.
Diffstat (limited to 'odk/source')
| -rw-r--r-- | odk/source/unoapploader/win/unoapploader.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c index 368e1d032097..d1e116c966c6 100644 --- a/odk/source/unoapploader/win/unoapploader.c +++ b/odk/source/unoapploader/win/unoapploader.c @@ -4,9 +4,9 @@ * * $RCSfile: unoapploader.c,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:20:29 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:07:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,14 @@ #include <stdio.h> #include <string.h> #include <process.h> -#include <Windows.h> + +#if defined _MSC_VER +#pragma warning(push, 1) +#endif +#include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif char* getPath(); char* getPathFromWindowsRegistry(); @@ -82,6 +89,10 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, PROCESS_INFORMATION process_info; BOOL bCreate; + (void) hInstance; /* unused */ + (void) hPrevInstance; /* unused */ + (void) nCmdShow; /* unused */ + /* get the path of the UNO installation */ path = getPath(); @@ -229,7 +240,7 @@ char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) data = (char*) malloc( size ); /* read the default value */ - if ( RegQueryValueEx( hkey, NULL, NULL, &type, data, &size ) != ERROR_SUCCESS ) + if ( RegQueryValueEx( hkey, NULL, NULL, &type, (LPBYTE) data, &size ) != ERROR_SUCCESS ) { RegCloseKey( hkey ); return NULL; |