From d5e331f2beb2d07c89f117ff0f3dbba5d8ab1506 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 19 Jun 2006 12:07:45 +0000 Subject: INTEGRATION: CWS warnings01 (1.3.14); FILE MERGED 2006/03/01 14:11:30 sb 1.3.14.1: #i53898# Made code waring-free. --- odk/source/unoapploader/win/unoapploader.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'odk/source') 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 #include #include -#include + +#if defined _MSC_VER +#pragma warning(push, 1) +#endif +#include +#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; -- cgit