From 88e651dac3c0b8e698117a752d4dcc3825d98fef Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 13 Mar 1999 18:20:26 +0000 Subject: [PATCH] Fixed newly introduced and some leftover warnings. --- dlls/shell32/shlfolder.c | 4 ++-- if1632/thunk.c | 2 +- scheduler/sysdeps.c | 4 ++-- windows/queue.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 67d2e2900de..5cd74feb4f4 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -22,7 +22,7 @@ static HRESULT WINAPI IShellFolder_QueryInterface(LPSHELLFOLDER,REFIID,LPVOID*); static ULONG WINAPI IShellFolder_AddRef(LPSHELLFOLDER); static ULONG WINAPI IShellFolder_Release(LPSHELLFOLDER); -static HRESULT WINAPI IShellFolder_Initialize(LPSHELLFOLDER,LPCITEMIDLIST); +static HRESULT WINAPI WINE_UNUSED IShellFolder_Initialize(LPSHELLFOLDER,LPCITEMIDLIST); static HRESULT WINAPI IShellFolder_ParseDisplayName(LPSHELLFOLDER,HWND,LPBC,LPOLESTR,DWORD*,LPITEMIDLIST*,DWORD*); static HRESULT WINAPI IShellFolder_EnumObjects(LPSHELLFOLDER,HWND,DWORD,LPENUMIDLIST*); static HRESULT WINAPI IShellFolder_BindToObject(LPSHELLFOLDER,LPCITEMIDLIST,LPBC,REFIID,LPVOID*); @@ -465,7 +465,7 @@ static HRESULT WINAPI IShellFolder_EnumObjects( * IShellFolder_Initialize() * IPersistFolder Method */ -static HRESULT WINAPI IShellFolder_Initialize( LPSHELLFOLDER this,LPCITEMIDLIST pidl) +static HRESULT WINAPI WINE_UNUSED IShellFolder_Initialize( LPSHELLFOLDER this,LPCITEMIDLIST pidl) { TRACE(shell,"(%p)->(pidl=%p)\n",this,pidl); if(this->pMyPidl) diff --git a/if1632/thunk.c b/if1632/thunk.c index ec782913fc9..3f695b405b2 100644 --- a/if1632/thunk.c +++ b/if1632/thunk.c @@ -153,7 +153,7 @@ static const CALLBACKS_TABLE CALLBACK_EmulatorTable = (void *)CallTo16_sreg_, /* CallRegisterShortProc */ (void *)CallTo16_lreg_, /* CallRegisterLongProc */ THUNK_CallTaskReschedule, /* CallTaskRescheduleProc */ - CallFrom16_p_long_wwwll, /* CallFrom16WndProc */ + (void*)CallFrom16_p_long_wwwll, /* CallFrom16WndProc */ THUNK_CallWndProc16, /* CallWndProc */ (void *)CallTo16_long_lwwll, /* CallDriverProc */ (void *)CallTo16_word_wwlll, /* CallDriverCallback */ diff --git a/scheduler/sysdeps.c b/scheduler/sysdeps.c index 0337dd960fe..ac41e8a1c77 100644 --- a/scheduler/sysdeps.c +++ b/scheduler/sysdeps.c @@ -50,7 +50,7 @@ int *__errno_location() if (!thdb) return perrno; #ifdef NO_REENTRANT_X11 /* Use static libc errno while running in Xlib. */ - if (X11DRV_CritSection.OwningThread == thdb->server_tid) + if (X11DRV_CritSection.OwningThread == (HANDLE)thdb->server_tid) return perrno; #endif return &thdb->thread_errno; @@ -67,7 +67,7 @@ int *__h_errno_location() if (!thdb) return ph_errno; #ifdef NO_REENTRANT_X11 /* Use static libc h_errno while running in Xlib. */ - if (X11DRV_CritSection.OwningThread == thdb->server_tid) + if (X11DRV_CritSection.OwningThread == (HANDLE)thdb->server_tid) return ph_errno; #endif return &thdb->thread_h_errno; diff --git a/windows/queue.c b/windows/queue.c index c2a4da22834..63e756df16f 100644 --- a/windows/queue.c +++ b/windows/queue.c @@ -1330,7 +1330,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) tdb = (TDB*)GlobalLock16(htask); if (!tdb || !tdb->thdb) return 0; if (process) *process = (DWORD)tdb->thdb->process->server_pid; - return tdb->thdb->server_tid; + return (DWORD)tdb->thdb->server_tid; }