From 1758f2d81a5fcf09973723b6f1a374c4b799687b Mon Sep 17 00:00:00 2001 From: James Abbatiello Date: Fri, 25 Feb 2000 21:01:50 +0000 Subject: [PATCH] Misc. fixes for compiler warnings. --- debugger/msc.c | 2 +- debugger/stabs.c | 2 +- dlls/comctl32/draglist.c | 2 ++ graphics/ddraw.c | 2 +- include/debugger.h | 2 +- misc/comm.c | 2 +- ole/ole2nls.c | 46 ++++++++++++++++++++-------------------- relay32/snoop.c | 2 ++ tools/build.c | 2 ++ windows/multimon.c | 2 ++ windows/x11drv/monitor.c | 2 +- 11 files changed, 37 insertions(+), 29 deletions(-) diff --git a/debugger/msc.c b/debugger/msc.c index 4326ab98b0a..5f134a9caf4 100644 --- a/debugger/msc.c +++ b/debugger/msc.c @@ -1451,7 +1451,7 @@ DEBUG_RegisterDebugInfo( HMODULE hModule, const char *module_name) * can make 'info shared' types of displays possible. */ int -DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, char * name) +DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, const char * name) { struct deferred_debug_info * deefer; diff --git a/debugger/stabs.c b/debugger/stabs.c index d77ae6db8c5..e0376d8ec9d 100644 --- a/debugger/stabs.c +++ b/debugger/stabs.c @@ -1177,7 +1177,7 @@ DEBUG_ProcessElfSymtab(char * addr, unsigned int load_offset, static int -DEBUG_ProcessElfObject(char * filename, unsigned int load_offset) +DEBUG_ProcessElfObject(const char * filename, unsigned int load_offset) { int rtn = FALSE; struct stat statbuf; diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c index d5228d02bb2..848cbf14b28 100644 --- a/dlls/comctl32/draglist.c +++ b/dlls/comctl32/draglist.c @@ -93,12 +93,14 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll) } +#if 0 static LRESULT CALLBACK DRAGLIST_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return FALSE; } +#endif diff --git a/graphics/ddraw.c b/graphics/ddraw.c index 2472d5197e0..5d74d9e6220 100644 --- a/graphics/ddraw.c +++ b/graphics/ddraw.c @@ -4685,7 +4685,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_EnumDisplayModes( XVisualInfo *vi; XPixmapFormatValues *pf; XVisualInfo vt; - int xbpp, nvisuals, npixmap, i, emu; + int xbpp = 1, nvisuals, npixmap, i, emu; int has_mode[] = { 0, 0, 0, 0 }; int has_depth[] = { 8, 15, 16, 24 }; DDSURFACEDESC ddsfd; diff --git a/include/debugger.h b/include/debugger.h index 7bbc97afca8..7428017d23e 100644 --- a/include/debugger.h +++ b/include/debugger.h @@ -283,7 +283,7 @@ extern int DEBUG_ParseStabs(char * addr, unsigned int load_offset, unsigned int /* debugger/msc.c */ extern int DEBUG_RegisterDebugInfo( HMODULE, const char *); extern int DEBUG_ProcessDeferredDebug(void); -extern int DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, char * name); +extern int DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, const char * name); extern void DEBUG_InfoShare(void); extern void DEBUG_InitCVDataTypes(void); diff --git a/misc/comm.c b/misc/comm.c index 5e569644a2f..0f9bf1ee1fc 100644 --- a/misc/comm.c +++ b/misc/comm.c @@ -2374,7 +2374,7 @@ BOOL WINAPI GetCommTimeouts(HANDLE hcom,LPCOMMTIMEOUTS lptimeouts) * SetCommTimeouts (KERNEL32.453) */ BOOL WINAPI SetCommTimeouts(HANDLE hcom,LPCOMMTIMEOUTS lptimeouts) { - struct DosDeviceStruct *ptr; + /* struct DosDeviceStruct *ptr; */ struct termios tios; int fd; diff --git a/ole/ole2nls.c b/ole/ole2nls.c index 3b562693989..bb6147bd40e 100644 --- a/ole/ole2nls.c +++ b/ole/ole2nls.c @@ -3193,7 +3193,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags, UINT thisnegativeorder; - LPSTR sptr; + LPCSTR sptr; LPSTR dptr; char roundbuffer[24]; /* Should be enough */ char *gptr; @@ -3334,28 +3334,28 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags, */ if (decsize>0 && decsize>thisnumdigits) { - sptr-=(decsize-thisnumdigits); - - if (*sptr>='5') { - strcpy(roundbuffer+1,lpValue); - if (negflag) { - *roundbuffer='-'; - *(roundbuffer+1)='0'; - } else - *roundbuffer='0'; - sptr=roundbuffer+(sptr-lpValue); // +1-1 - - while ( (++*sptr) > '9') { - *(sptr--)='0'; - if (*sptr=='.') sptr--; - } - if ((negflag ? *(roundbuffer+leadingzeros+1) : *(roundbuffer+leadingzeros)) == '1') - intsize++; - sptr=roundbuffer; - } else - sptr=lpValue; - } else - sptr=lpValue; + sptr-=(decsize-thisnumdigits); + + if (*sptr>='5') { + strcpy(roundbuffer+1,lpValue); + if (negflag) { + *roundbuffer='-'; + *(roundbuffer+1)='0'; + } else + *roundbuffer='0'; + dptr=roundbuffer+(sptr-lpValue); // +1-1 + + while ( (++*dptr) > '9') { + *(dptr--)='0'; + if (*dptr=='.') dptr--; + } + if ((negflag ? *(roundbuffer+leadingzeros+1) : *(roundbuffer+leadingzeros)) == '1') + intsize++; + sptr=roundbuffer; + } else + sptr=lpValue; + } else + sptr=lpValue; totalsize=intsize; diff --git a/relay32/snoop.c b/relay32/snoop.c index e9b7592cf90..f4650112722 100644 --- a/relay32/snoop.c +++ b/relay32/snoop.c @@ -10,6 +10,8 @@ #include #include #include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "winnt.h" #include "heap.h" #include "builtin32.h" diff --git a/tools/build.c b/tools/build.c index ba1cef624ec..835ad88224c 100644 --- a/tools/build.c +++ b/tools/build.c @@ -753,10 +753,12 @@ static void ParseTopLevel(void) } if (!DLLFileName[0]) + { if (SpecMode == SPEC_MODE_DLL) sprintf( DLLFileName, "%s.DLL", DLLName ); else sprintf( DLLFileName, "%s.EXE", DLLName ); + } } diff --git a/windows/multimon.c b/windows/multimon.c index 1b9617a91b7..67944b3c9e4 100644 --- a/windows/multimon.c +++ b/windows/multimon.c @@ -23,6 +23,7 @@ MONITOR MONITOR_PrimaryMonitor; /*********************************************************************** * MONITOR_GetMonitor */ +#if 0 static MONITOR *MONITOR_GetMonitor(HMONITOR hMonitor) { if(hMonitor == xPRIMARY_MONITOR) @@ -34,6 +35,7 @@ static MONITOR *MONITOR_GetMonitor(HMONITOR hMonitor) return NULL; } } +#endif /*********************************************************************** * MONITOR_Initialize diff --git a/windows/x11drv/monitor.c b/windows/x11drv/monitor.c index 5580aace8cf..049967d5953 100644 --- a/windows/x11drv/monitor.c +++ b/windows/x11drv/monitor.c @@ -114,7 +114,7 @@ static void X11DRV_MONITOR_CreateDesktop(MONITOR *pMonitor) wm_hints->flags = InputHint | StateHint; wm_hints->input = True; wm_hints->initial_state = NormalState; - class_hints->res_name = argv0; + class_hints->res_name = (char *)argv0; class_hints->res_class = "Wine"; TSXStringListToTextProperty( &name, 1, &window_name );