From c69a80c31d0ab583bcafd9d7a533c1d1bd5cc30b Mon Sep 17 00:00:00 2001 From: Niels Kristian Bech Jensen Date: Sun, 28 Nov 1999 20:31:04 +0000 Subject: [PATCH] Compiler warnings fixed. --- dlls/comctl32/tab.c | 1 + dlls/dplayx/dplobby.c | 4 ++-- dlls/shell32/shlview.c | 2 +- graphics/psdrv/font.c | 4 ++-- win32/newfns.c | 2 +- windows/x11drv/clipboard.c | 14 +++++++------- windows/x11drv/event.c | 3 ++- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 530a608e52a..07c67fcceb2 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -17,6 +17,7 @@ #include "commctrl.h" #include "tab.h" #include "debugtools.h" +#include "cache.h" DEFAULT_DEBUG_CHANNEL(tab) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 862074a6cd9..d938cd905f8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1270,7 +1270,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication PROCESS_INFORMATION newProcessInfo; LPSTR appName; - TRACE( "(%p)->(0x%08lx,%p,%p,%p)\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent ); + TRACE( "(%p)->(0x%08lx,%p,%p,%x)\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent ); if( dwFlags != 0 ) { @@ -1367,7 +1367,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_RunApplication HANDLE hReceiveEvent ) { ICOM_THIS(IDirectPlayLobbyWImpl,iface); - FIXME( "(%p)->(0x%08lx,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent ); + FIXME( "(%p)->(0x%08lx,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, (void *)hReceiveEvent ); return DPERR_OUTOFMEMORY; } diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1566f549bda..b7e688c6fbd 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1318,9 +1318,9 @@ static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL */ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG lpmsg) { +#if 0 ICOM_THIS(IShellViewImpl, iface); -#if 0 FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%lx wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif diff --git a/graphics/psdrv/font.c b/graphics/psdrv/font.c index 2ce32d766fb..12c0936ce18 100644 --- a/graphics/psdrv/font.c +++ b/graphics/psdrv/font.c @@ -302,7 +302,7 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, if(family) { for(afmle = family->afmlist; afmle; afmle = afmle->next) { TRACE("Got '%s'\n", afmle->afm->FontName); - if( (b = (*proc)( (LPENUMLOGFONT16)&lf, &tm, + if( (b = (*proc)( &lf, &tm, PSDRV_GetFontMetric( dc, afmle->afm, &tm, &lf, 200 ), lp )) ) bRet = b; @@ -315,7 +315,7 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, for(family = physDev->pi->Fonts; family; family = family->next) { afmle = family->afmlist; TRACE("Got '%s'\n", afmle->afm->FontName); - if( (b = (*proc)( (LPENUMLOGFONT16)&lf, &tm, + if( (b = (*proc)( &lf, &tm, PSDRV_GetFontMetric( dc, afmle->afm, &tm, &lf, 200 ), lp )) ) bRet = b; diff --git a/win32/newfns.c b/win32/newfns.c index cd25162c954..2412312b272 100644 --- a/win32/newfns.c +++ b/win32/newfns.c @@ -320,7 +320,7 @@ HANDLE WINAPI OpenDesktopA( LPCSTR lpszDesktop, DWORD dwFlags, fInherit,dwDesiredAccess); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; + return 0; } diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c index b28bcb83690..880557ee995 100644 --- a/windows/x11drv/clipboard.c +++ b/windows/x11drv/clipboard.c @@ -88,7 +88,7 @@ static Window PrimarySelectionOwner = None; /* The window which owns the prim static Window ClipboardSelectionOwner = None; /* The window which owns the clipboard selection */ static unsigned long cSelectionTargets = 0; /* Number of target formats reported by TARGETS selection */ static Atom selectionCacheSrc = XA_PRIMARY; /* The selection source from which the clipboard cache was filled */ -static HANDLE selectionClearEvent = NULL; /* Synchronization object used to block until server is started */ +static HANDLE selectionClearEvent = 0;/* Synchronization object used to block until server is started */ /* * Dynamic pointer arrays to manage destruction of Pixmap resources @@ -309,7 +309,7 @@ BOOL X11DRV_CLIPBOARD_LaunchServer() /* Release the event */ CloseHandle(selectionClearEvent); - selectionClearEvent = NULL; + selectionClearEvent = 0; } WIN_RestoreWndsLock(iWndsLocks); @@ -327,7 +327,7 @@ BOOL X11DRV_CLIPBOARD_LaunchServer() */ int X11DRV_CLIPBOARD_CacheDataFormats( Atom SelectionName ) { - HWND hWnd = NULL; + HWND hWnd = 0; HWND hWndClipWindow = GetOpenClipboardWindow(); WND* wnd = NULL; XEvent xe; @@ -337,7 +337,7 @@ int X11DRV_CLIPBOARD_CacheDataFormats( Atom SelectionName ) unsigned long remain; Atom* targetList=NULL; Window w; - Window ownerSelection = NULL; + Window ownerSelection = 0; /* * Empty the clipboard cache @@ -577,7 +577,7 @@ static BOOL X11DRV_CLIPBOARD_ReadSelection(UINT wFormat, Window w, Atom prop, At { /* Get the first pixmap handle passed to us */ Pixmap *pPixmap = (Pixmap *)val; - HANDLE hTargetImage = NULL; /* Handle to store the converted bitmap or DIB */ + HANDLE hTargetImage = 0; /* Handle to store the converted bitmap or DIB */ if (aformat != 32 || nitems < 1 || atype != XA_PIXMAP || (wFormat != CF_BITMAP && wFormat != CF_DIB)) @@ -1193,7 +1193,7 @@ END: TRACE("\tLost the selection! Emptying the clipboard...\n"); - OpenClipboard(NULL); + OpenClipboard( 0 ); selectionAcquired = (S_PRIMARY | S_CLIPBOARD); EmptyClipboard(); @@ -1239,7 +1239,7 @@ void X11DRV_CLIPBOARD_FreeResources( Atom property ) */ int i; Pixmap pixmap; - Atom cacheProp = NULL; + Atom cacheProp = 0; for( i = 0; ; i++ ) { if ( !(cacheProp = ((Atom)DPA_GetPtr(PropDPA, i))) ) diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c index 6b6a18fcf42..b4f858faadf 100644 --- a/windows/x11drv/event.c +++ b/windows/x11drv/event.c @@ -108,6 +108,7 @@ static void EVENT_UnmapNotify( HWND pWnd, XUnmapEvent *event ); #ifdef HAVE_LIBXXSHM static void EVENT_ShmCompletion( XShmCompletionEvent *event ); static int ShmCompletionType; +extern int XShmGetEventBase( Display * );/* Missing prototype for function in libXext. */ #endif /* Usable only with OLVWM - compile option perhaps? @@ -1026,7 +1027,7 @@ END: static Atom EVENT_SelectionRequest_PIXMAP( Window requestor, Atom target, Atom rprop ) { HANDLE hClipData = 0; - Pixmap pixmap = NULL; + Pixmap pixmap = 0; UINT wFormat; char * itemFmtName; int xRc;