From 6b9dd2e0984e2779f37fd43aabf2011fac025271 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 18 Mar 1999 17:39:57 +0000 Subject: [PATCH] Lots of warning fixed, one missing WINAPI in ddraw.c added. --- dlls/shell32/iconcache.c | 2 +- files/dos_fs.c | 1 + graphics/ddraw.c | 8 ++++---- graphics/fontengine.c | 3 ++- include/win.h | 2 ++ loader/main.c | 1 - loader/resource.c | 5 +++-- misc/lzexpand.c | 11 ++++++++--- misc/registry.c | 1 + msdos/int10.c | 2 +- multimedia/init.c | 1 + objects/enhmetafile.c | 5 ++--- ole/itemmoniker.c | 2 +- ole/ole2.c | 2 +- ole/olefont.c | 10 +++++----- windows/dinput.c | 5 +---- windows/input.c | 1 - windows/keyboard.c | 1 - windows/message.c | 1 - windows/painting.c | 1 - windows/queue.c | 1 - windows/syscolor.c | 1 - windows/sysmetrics.c | 1 - windows/user.c | 4 ++-- 24 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index ad3799d2426..227df17438f 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -536,7 +536,7 @@ INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex ) * NOTES * retrives the specified icon from the iconcache. if not found try's to load the icon */ -static HICON SIC_GetIcon (LPCSTR sSourceFile, INT dwSourceIndex, BOOL bSmallIcon ) +static HICON WINE_UNUSED SIC_GetIcon (LPCSTR sSourceFile, INT dwSourceIndex, BOOL bSmallIcon ) { INT index; TRACE(shell,"%s %i\n", sSourceFile, dwSourceIndex); diff --git a/files/dos_fs.c b/files/dos_fs.c index 1e3087f51a3..df2495468d6 100644 --- a/files/dos_fs.c +++ b/files/dos_fs.c @@ -30,6 +30,7 @@ #include "syslevel.h" #include "server.h" #include "process.h" +#include "options.h" #include "debug.h" /* Define the VFAT ioctl to get both short and long file names */ diff --git a/graphics/ddraw.c b/graphics/ddraw.c index 607b6c2e95f..0b710b0495a 100644 --- a/graphics/ddraw.c +++ b/graphics/ddraw.c @@ -162,16 +162,16 @@ HRESULT WINAPI DirectDrawEnumerateExA( if (DDRAW_DGA_Available()) { TRACE(ddraw, "Enumerating DGA interface\n"); - if (!lpCallback(&DGA_DirectDraw_GUID, "WINE with XFree86 DGA", "display", lpContext, NULL)) + if (!lpCallback(&DGA_DirectDraw_GUID, "WINE with XFree86 DGA", "display", lpContext, 0)) return DD_OK; } TRACE(ddraw, "Enumerating Xlib interface\n"); - if (!lpCallback(&XLIB_DirectDraw_GUID, "WINE with Xlib", "display", lpContext, NULL)) + if (!lpCallback(&XLIB_DirectDraw_GUID, "WINE with Xlib", "display", lpContext, 0)) return DD_OK; TRACE(ddraw, "Enumerating Default interface\n"); - if (!lpCallback(NULL,"WINE (default)", "display", lpContext, NULL)) + if (!lpCallback(NULL,"WINE (default)", "display", lpContext, 0)) return DD_OK; return DD_OK; @@ -246,7 +246,7 @@ HRESULT WINAPI DirectDrawEnumerateA( * DirectDrawEnumerateW (DDRAW.*) */ -static BOOL DirectDrawEnumerateProcW( +static BOOL WINAPI DirectDrawEnumerateProcW( GUID *lpGUID, LPWSTR lpDriverDescription, LPWSTR lpDriverName, LPVOID lpContext, HMONITOR hm) { diff --git a/graphics/fontengine.c b/graphics/fontengine.c index 0d8a07f57e2..9b672dcc7d2 100644 --- a/graphics/fontengine.c +++ b/graphics/fontengine.c @@ -5,11 +5,12 @@ * Copyright 1998 David Lee Lambert * */ +#include #include #include -#include #include "winbase.h" #include "font.h" +#include "debug.h" diff --git a/include/win.h b/include/win.h index 2c8ab51ce76..95133d71d14 100644 --- a/include/win.h +++ b/include/win.h @@ -170,6 +170,8 @@ extern void PROPERTY_RemoveWindowProps( WND *pWnd ); /* windows/propert extern BOOL PAINT_RedrawWindow( HWND hwnd, const RECT *rectUpdate, HRGN hrgnUpdate, UINT flags, UINT control ); /* windows/painting.c */ +extern void WIN_UpdateNCArea(WND* wnd, BOOL bUpdate); + /* controls/widgets.c */ extern BOOL WIDGETS_Init( void ); diff --git a/loader/main.c b/loader/main.c index 99e0fd98564..a84a407dc9d 100644 --- a/loader/main.c +++ b/loader/main.c @@ -23,7 +23,6 @@ #include "queue.h" #include "sysmetrics.h" #include "file.h" -#include "gdi.h" #include "heap.h" #include "keyboard.h" #include "mouse.h" diff --git a/loader/resource.c b/loader/resource.c index fbd03b8e39f..d314608ef26 100644 --- a/loader/resource.c +++ b/loader/resource.c @@ -17,7 +17,7 @@ #include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "gdi.h" +#include "ldt.h" #include "global.h" #include "heap.h" #include "callback.h" @@ -435,11 +435,12 @@ static BOOL RES_FreeResource( HGLOBAL handle ) /* If this failed, call USER.DestroyIcon32; this will check whether it is a shared cursor/icon; if not it will call GlobalFree16() */ - if ( retv ) + if ( retv ) { if ( Callout.DestroyIcon32 ) retv = Callout.DestroyIcon32( handle, CID_RESOURCE ); else retv = GlobalFree16( handle ); + } } return (BOOL)retv; diff --git a/misc/lzexpand.c b/misc/lzexpand.c index 86606186e4f..0a902d8cf68 100644 --- a/misc/lzexpand.c +++ b/misc/lzexpand.c @@ -486,7 +486,12 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest ) HFILE oldsrc = src; #define BUFLEN 1000 BYTE buf[BUFLEN]; - UINT WINAPI (*xread)(HFILE,LPVOID,UINT); + /* we need that weird typedef, for i can't seem to get function pointer + * casts right. (Or they probably just do not like WINAPI in general) + */ + typedef UINT WINAPI (*_readfun)(HFILE,LPVOID,UINT); + + _readfun xread; TRACE(file,"(%d,%d)\n",src,dest); if (!IS_LZ_HANDLE(src)) { @@ -498,8 +503,8 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest ) /* not compressed? just copy */ if (!IS_LZ_HANDLE(src)) xread=_lread; - else /* Note: Ignore warning, just mismatched INT/UINT */ - xread=LZRead; + else + xread=(_readfun)LZRead; len=0; while (1) { ret=xread(src,buf,BUFLEN); diff --git a/misc/registry.c b/misc/registry.c index fa0454de124..0ba7b98b8f5 100644 --- a/misc/registry.c +++ b/misc/registry.c @@ -39,6 +39,7 @@ #include "heap.h" #include "debug.h" #include "xmalloc.h" +#include "options.h" #include "winreg.h" #include "winversion.h" diff --git a/msdos/int10.c b/msdos/int10.c index 924d6b14052..feff2a8eeec 100644 --- a/msdos/int10.c +++ b/msdos/int10.c @@ -722,7 +722,7 @@ else { AH_reg(context) = 0; *(DWORD *)p = *(DWORD *)"VESA"; *(WORD *)(p+0x04) = 0x0200; /* VESA 2.0 */ - *(DWORD *)(p+0x06) = NULL; /* pointer to OEM name */ + *(DWORD *)(p+0x06) = 0x00000000; /* pointer to OEM name */ *(DWORD *)(p+0x0a) = 0xfffffffd; /* capabilities flags :-) */ } break; diff --git a/multimedia/init.c b/multimedia/init.c index 677000d6a88..d40443262b7 100644 --- a/multimedia/init.c +++ b/multimedia/init.c @@ -13,6 +13,7 @@ #include "winbase.h" #include "multimedia.h" #include "xmalloc.h" +#include "options.h" #include "debug.h" #ifdef HAVE_OSS diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c index 2451d5cdd12..d0c7b1091a9 100644 --- a/objects/enhmetafile.c +++ b/objects/enhmetafile.c @@ -6,11 +6,10 @@ #include #include #include "winbase.h" +#include "wingdi.h" #include "wine/winestring.h" -#include "gdi.h" -#include "winnt.h" -#include "debug.h" #include "winerror.h" +#include "debug.h" /***************************************************************************** * GetEnhMetaFile32A (GDI32.174) diff --git a/ole/itemmoniker.c b/ole/itemmoniker.c index 1312e19a43a..b55dfd81667 100644 --- a/ole/itemmoniker.c +++ b/ole/itemmoniker.c @@ -10,8 +10,8 @@ #include #include "winerror.h" #include "wine/obj_moniker.h" -#include "debug.h" #include "heap.h" +#include "debug.h" typedef struct ItemMonikerImpl{ diff --git a/ole/ole2.c b/ole/ole2.c index 9f05278df06..72807bcb55e 100644 --- a/ole/ole2.c +++ b/ole/ole2.c @@ -469,7 +469,7 @@ HOLEMENU WINAPI OleCreateMenuDescriptor( { FIXME(ole,"(%x,%p),stub!\n", hmenuCombined, lpMenuWidths); - return NULL; + return 0; } /*********************************************************************** diff --git a/ole/olefont.c b/ole/olefont.c index f8dd98fdeb1..e3a1743d173 100644 --- a/ole/olefont.c +++ b/ole/olefont.c @@ -318,7 +318,7 @@ static OLEFontImpl* OLEFontImpl_Construct(LPFONTDESC fontDesc) /* * Initializing all the other members. */ - newObject->gdiFont = NULL; + newObject->gdiFont = 0; newObject->fontLock = 0; newObject->cyHimetric = 1; newObject->cyLogical = 1; @@ -338,7 +338,7 @@ static void OLEFontImpl_Destroy(OLEFontImpl* fontDesc) if (fontDesc->description.lpstrName!=0) HeapFree(GetProcessHeap(), 0, fontDesc->description.lpstrName); - if (fontDesc->gdiFont!=NULL) + if (fontDesc->gdiFont!=0) DeleteObject(fontDesc->gdiFont); HeapFree(GetProcessHeap(), 0, fontDesc); @@ -923,7 +923,7 @@ static HRESULT WINAPI OLEFontImpl_AddRefHfont( { _ICOM_THIS(OLEFontImpl, iface); - if ( (hfont == NULL) || + if ( (hfont == 0) || (hfont != this->gdiFont) ) return E_INVALIDARG; @@ -943,7 +943,7 @@ static HRESULT WINAPI OLEFontImpl_ReleaseHfont( { _ICOM_THIS(OLEFontImpl, iface); - if ( (hfont == NULL) || + if ( (hfont == 0) || (hfont != this->gdiFont) ) return E_INVALIDARG; @@ -955,7 +955,7 @@ static HRESULT WINAPI OLEFontImpl_ReleaseHfont( if (this->fontLock==0) { DeleteObject(this->gdiFont); - this->gdiFont = NULL; + this->gdiFont = 0; } return S_OK; diff --git a/windows/dinput.c b/windows/dinput.c index 6418bdf0d63..800e489882a 100644 --- a/windows/dinput.c +++ b/windows/dinput.c @@ -27,7 +27,6 @@ #include "winuser.h" #include "winerror.h" #include "wine/obj_base.h" -#include "gdi.h" #include "dinput.h" #include "debug.h" #include "message.h" @@ -890,9 +889,7 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface) if (This->acquired == 0) { POINT point; - /* This stores the current mouse handler. - FIXME : need to be fixed for native USER use */ - WND *tempWnd = 0; + /* This stores the current mouse handler. */ This->prev_handler = mouse_event; /* Store (in a global variable) the current lock */ diff --git a/windows/input.c b/windows/input.c index 7d85979b10e..4d34e4b5065 100644 --- a/windows/input.c +++ b/windows/input.c @@ -19,7 +19,6 @@ #include "wine/winuser16.h" #include "wine/keyboard16.h" #include "win.h" -#include "gdi.h" #include "heap.h" #include "input.h" #include "keyboard.h" diff --git a/windows/keyboard.c b/windows/keyboard.c index 9df57fa1e19..2ddf79327c7 100644 --- a/windows/keyboard.c +++ b/windows/keyboard.c @@ -17,7 +17,6 @@ #include "winuser.h" #include "wine/keyboard16.h" #include "win.h" -#include "gdi.h" #include "heap.h" #include "keyboard.h" #include "message.h" diff --git a/windows/message.c b/windows/message.c index 668460e2960..e0b2315e8e2 100644 --- a/windows/message.c +++ b/windows/message.c @@ -14,7 +14,6 @@ #include "message.h" #include "winerror.h" #include "win.h" -#include "gdi.h" #include "sysmetrics.h" #include "heap.h" #include "hook.h" diff --git a/windows/painting.c b/windows/painting.c index 520457b2760..3eb9f99e871 100644 --- a/windows/painting.c +++ b/windows/painting.c @@ -10,7 +10,6 @@ #include "win.h" #include "queue.h" -#include "gdi.h" #include "dce.h" #include "heap.h" #include "debug.h" diff --git a/windows/queue.c b/windows/queue.c index adf918be456..73392cbbaf7 100644 --- a/windows/queue.c +++ b/windows/queue.c @@ -1336,7 +1336,6 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd ) DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) { HTASK16 htask; - DWORD retvalue; TDB *tdb; WND *wndPtr = WIN_FindWndPtr( hwnd ); diff --git a/windows/syscolor.c b/windows/syscolor.c index b2222ca6e08..eade0c342ee 100644 --- a/windows/syscolor.c +++ b/windows/syscolor.c @@ -12,7 +12,6 @@ #include "winbase.h" #include "winuser.h" #include "debug.h" -#include "gdi.h" #include "tweak.h" static const char * const DefSysColors[] = diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c index 8803fa56ec7..ca11fcdb8b3 100644 --- a/windows/sysmetrics.c +++ b/windows/sysmetrics.c @@ -8,7 +8,6 @@ #include #include "winbase.h" #include "winuser.h" -#include "gdi.h" #include "monitor.h" #include "options.h" #include "sysmetrics.h" diff --git a/windows/user.c b/windows/user.c index b54ea8c044e..f573558c21f 100644 --- a/windows/user.c +++ b/windows/user.c @@ -9,8 +9,8 @@ #include "wine/winbase16.h" #include "winuser.h" #include "heap.h" -#include "gdi.h" #include "user.h" +#include "gdi.h" #include "task.h" #include "queue.h" #include "win.h" @@ -18,7 +18,6 @@ #include "menu.h" #include "cursoricon.h" #include "hook.h" -#include "debug.h" #include "toolhelp.h" #include "message.h" #include "module.h" @@ -28,6 +27,7 @@ #include "local.h" #include "class.h" #include "desktop.h" +#include "debug.h" /*********************************************************************** * GetFreeSystemResources (USER.284)