Commit 88e651da authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Fixed newly introduced and some leftover warnings.

parent 7ae72f54
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
static HRESULT WINAPI IShellFolder_QueryInterface(LPSHELLFOLDER,REFIID,LPVOID*); static HRESULT WINAPI IShellFolder_QueryInterface(LPSHELLFOLDER,REFIID,LPVOID*);
static ULONG WINAPI IShellFolder_AddRef(LPSHELLFOLDER); static ULONG WINAPI IShellFolder_AddRef(LPSHELLFOLDER);
static ULONG WINAPI IShellFolder_Release(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_ParseDisplayName(LPSHELLFOLDER,HWND,LPBC,LPOLESTR,DWORD*,LPITEMIDLIST*,DWORD*);
static HRESULT WINAPI IShellFolder_EnumObjects(LPSHELLFOLDER,HWND,DWORD,LPENUMIDLIST*); static HRESULT WINAPI IShellFolder_EnumObjects(LPSHELLFOLDER,HWND,DWORD,LPENUMIDLIST*);
static HRESULT WINAPI IShellFolder_BindToObject(LPSHELLFOLDER,LPCITEMIDLIST,LPBC,REFIID,LPVOID*); static HRESULT WINAPI IShellFolder_BindToObject(LPSHELLFOLDER,LPCITEMIDLIST,LPBC,REFIID,LPVOID*);
...@@ -465,7 +465,7 @@ static HRESULT WINAPI IShellFolder_EnumObjects( ...@@ -465,7 +465,7 @@ static HRESULT WINAPI IShellFolder_EnumObjects(
* IShellFolder_Initialize() * IShellFolder_Initialize()
* IPersistFolder Method * 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); { TRACE(shell,"(%p)->(pidl=%p)\n",this,pidl);
if(this->pMyPidl) if(this->pMyPidl)
......
...@@ -153,7 +153,7 @@ static const CALLBACKS_TABLE CALLBACK_EmulatorTable = ...@@ -153,7 +153,7 @@ static const CALLBACKS_TABLE CALLBACK_EmulatorTable =
(void *)CallTo16_sreg_, /* CallRegisterShortProc */ (void *)CallTo16_sreg_, /* CallRegisterShortProc */
(void *)CallTo16_lreg_, /* CallRegisterLongProc */ (void *)CallTo16_lreg_, /* CallRegisterLongProc */
THUNK_CallTaskReschedule, /* CallTaskRescheduleProc */ THUNK_CallTaskReschedule, /* CallTaskRescheduleProc */
CallFrom16_p_long_wwwll, /* CallFrom16WndProc */ (void*)CallFrom16_p_long_wwwll, /* CallFrom16WndProc */
THUNK_CallWndProc16, /* CallWndProc */ THUNK_CallWndProc16, /* CallWndProc */
(void *)CallTo16_long_lwwll, /* CallDriverProc */ (void *)CallTo16_long_lwwll, /* CallDriverProc */
(void *)CallTo16_word_wwlll, /* CallDriverCallback */ (void *)CallTo16_word_wwlll, /* CallDriverCallback */
......
...@@ -50,7 +50,7 @@ int *__errno_location() ...@@ -50,7 +50,7 @@ int *__errno_location()
if (!thdb) return perrno; if (!thdb) return perrno;
#ifdef NO_REENTRANT_X11 #ifdef NO_REENTRANT_X11
/* Use static libc errno while running in Xlib. */ /* 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; return perrno;
#endif #endif
return &thdb->thread_errno; return &thdb->thread_errno;
...@@ -67,7 +67,7 @@ int *__h_errno_location() ...@@ -67,7 +67,7 @@ int *__h_errno_location()
if (!thdb) return ph_errno; if (!thdb) return ph_errno;
#ifdef NO_REENTRANT_X11 #ifdef NO_REENTRANT_X11
/* Use static libc h_errno while running in Xlib. */ /* 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; return ph_errno;
#endif #endif
return &thdb->thread_h_errno; return &thdb->thread_h_errno;
......
...@@ -1330,7 +1330,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) ...@@ -1330,7 +1330,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process )
tdb = (TDB*)GlobalLock16(htask); tdb = (TDB*)GlobalLock16(htask);
if (!tdb || !tdb->thdb) return 0; if (!tdb || !tdb->thdb) return 0;
if (process) *process = (DWORD)tdb->thdb->process->server_pid; if (process) *process = (DWORD)tdb->thdb->process->server_pid;
return tdb->thdb->server_tid; return (DWORD)tdb->thdb->server_tid;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment