From 478eee17be4009739ce636641256dc7a3cd9347a Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Sat, 31 Jul 1999 13:13:23 +0000 Subject: [PATCH] Eliminated warnings. --- debugger/external.c | 2 +- dlls/shell32/contmenu.c | 3 --- dlls/shell32/folders.c | 4 ++-- dlls/shell32/shelllink.c | 8 ++++---- dlls/shell32/shlfolder.c | 2 +- dlls/shell32/shlview.c | 2 +- include/wine/undocshell.h | 5 ++++- multimedia/mcimidi.c | 4 ++++ ole/antimoniker.c | 4 ++-- ole/compositemoniker.c | 4 ++-- ole/datacache.c | 4 ++-- ole/filemoniker.c | 4 ++-- ole/itemmoniker.c | 4 ++-- ole/olefont.c | 4 ++-- scheduler/thread.c | 2 ++ 15 files changed, 31 insertions(+), 25 deletions(-) diff --git a/debugger/external.c b/debugger/external.c index 341eb389384..fb3deec2862 100644 --- a/debugger/external.c +++ b/debugger/external.c @@ -117,7 +117,7 @@ void DEBUG_ExternalDebugger(void) memset(pid_string, 0, DBG_BUFF_SIZE); /* make pid into string */ - sprintf(pid_string, "%d", attach_pid); + sprintf(pid_string, "%ld", (long) attach_pid); /* now exec the debugger to get it's own clean memory space */ if (dbg_no_xterm) diff --git a/dlls/shell32/contmenu.c b/dlls/shell32/contmenu.c index 2a3438d0d38..a3b57caf18a 100644 --- a/dlls/shell32/contmenu.c +++ b/dlls/shell32/contmenu.c @@ -311,9 +311,6 @@ static HRESULT WINAPI IContextMenu_fnInvokeCommand( ICOM_THIS(IContextMenuImpl, iface); LPITEMIDLIST pidlFQ; - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV; - HWND hWndSV; SHELLEXECUTEINFOA sei; int i; diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 82bbd972f01..e9193ec0ab6 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -287,8 +287,8 @@ static ULONG WINAPI IEIPersistFile_fnRelease( * IEIPersistFile_GetClassID (IPersist) */ static HRESULT WINAPI IEIPersistFile_fnGetClassID( - const IPersistFile *iface, - LPCLSID lpClassId) + IPersistFile *iface, + LPCLSID lpClassId) { CLSID StdFolderID = { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6ebf7106d5d..d434e9b3919 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -132,13 +132,13 @@ static ULONG WINAPI IPersistFile_fnRelease(IPersistFile* iface) return IShellLink_Release((IShellLink*)This); } -static HRESULT WINAPI IPersistFile_fnGetClassID(const IPersistFile* iface, CLSID *pClassID) +static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile* iface, CLSID *pClassID) { _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface) FIXME("(%p)\n",This); return NOERROR; } -static HRESULT WINAPI IPersistFile_fnIsDirty(const IPersistFile* iface) +static HRESULT WINAPI IPersistFile_fnIsDirty(IPersistFile* iface) { _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface) FIXME("(%p)\n",This); @@ -181,7 +181,7 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST FIXME("(%p)->(%s)\n",This,debugstr_w(pszFileName)); return NOERROR; } -static HRESULT WINAPI IPersistFile_fnGetCurFile(const IPersistFile* iface, LPOLESTR *ppszFileName) +static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *ppszFileName) { _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface); FIXME("(%p)\n",This); @@ -248,7 +248,7 @@ static ULONG WINAPI IPersistStream_fnAddRef( * */ static HRESULT WINAPI IPersistStream_fnGetClassID( - const IPersistStream* iface, + IPersistStream* iface, CLSID* pClassID) { _ICOM_THIS_From_IPersistStream(IShellLinkImpl, iface); diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 4b3378d0800..c4dd7c3313b 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -1742,7 +1742,7 @@ static ULONG WINAPI ISFPersistFolder_Release( * ISFPersistFolder_GetClassID (IPersist) */ static HRESULT WINAPI ISFPersistFolder_GetClassID( - const IPersistFolder * iface, + IPersistFolder * iface, CLSID * lpClassId) { _ICOM_THIS_From_IPersistFolder(IGenericSFImpl, iface); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 80908875082..2b99feac500 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -140,7 +140,7 @@ static HRESULT IncludeObject(IShellViewImpl * This, LPCITEMIDLIST pidl) { TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView*)This, pidl); - TRACE("--0x%08x\n", ret); + TRACE("--0x%08lx\n", ret); } return ret; } diff --git a/include/wine/undocshell.h b/include/wine/undocshell.h index bd78a258d26..223478ccdbd 100644 --- a/include/wine/undocshell.h +++ b/include/wine/undocshell.h @@ -46,7 +46,10 @@ LPITEMIDLIST WINAPI ILCreateFromPathAW(LPVOID path); */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast); -HRESULT WINAPI StrRetToStrN (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl); +HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl); +HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl); +HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/multimedia/mcimidi.c b/multimedia/mcimidi.c index 540e377b8a5..2923e7b5f64 100644 --- a/multimedia/mcimidi.c +++ b/multimedia/mcimidi.c @@ -24,6 +24,8 @@ DEFAULT_DEBUG_CHANNEL(mcimidi) +#ifdef SNDCTL_MIDI_INFO + typedef struct { DWORD dwFirst; /* offset in file of track */ DWORD dwLast; /* number of bytes in file of track */ @@ -60,6 +62,8 @@ typedef struct tagWINE_MCIMIDI { } WINE_MCIMIDI; +#endif /* defined(SNDCTL_MIDI_INFO) */ + /*======================================================================* * MCI MIDI implemantation * *======================================================================*/ diff --git a/ole/antimoniker.c b/ole/antimoniker.c index f0ae4e3fd6d..a9092189fa9 100644 --- a/ole/antimoniker.c +++ b/ole/antimoniker.c @@ -39,7 +39,7 @@ static ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker* iface); static ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface); /* IPersist prototype functions */ -static HRESULT WINAPI AntiMonikerImpl_GetClassID(const IMoniker* iface, CLSID *pClassID); +static HRESULT WINAPI AntiMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID); /* IPersistStream prototype functions */ static HRESULT WINAPI AntiMonikerImpl_IsDirty(IMoniker* iface); @@ -193,7 +193,7 @@ ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface) /****************************************************************************** * AntiMoniker_GetClassID ******************************************************************************/ -HRESULT WINAPI AntiMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID) +HRESULT WINAPI AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) { TRACE("(%p,%p),stub!\n",iface,pClassID); diff --git a/ole/compositemoniker.c b/ole/compositemoniker.c index 3096ebd76fb..64e74304c98 100644 --- a/ole/compositemoniker.c +++ b/ole/compositemoniker.c @@ -65,7 +65,7 @@ static ULONG WINAPI CompositeMonikerImpl_AddRef(IMoniker* iface); static ULONG WINAPI CompositeMonikerImpl_Release(IMoniker* iface); /* IPersist prototype functions */ -static HRESULT WINAPI CompositeMonikerImpl_GetClassID(const IMoniker* iface, CLSID *pClassID); +static HRESULT WINAPI CompositeMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID); /* IPersistStream prototype functions */ static HRESULT WINAPI CompositeMonikerImpl_IsDirty(IMoniker* iface); @@ -255,7 +255,7 @@ ULONG WINAPI CompositeMonikerImpl_Release(IMoniker* iface) /****************************************************************************** * CompositeMoniker_GetClassID ******************************************************************************/ -HRESULT WINAPI CompositeMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID) +HRESULT WINAPI CompositeMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) { TRACE("(%p,%p),stub!\n",iface,pClassID); diff --git a/ole/datacache.c b/ole/datacache.c index a2198b157a9..d9bc470cd4a 100644 --- a/ole/datacache.c +++ b/ole/datacache.c @@ -213,7 +213,7 @@ static ULONG WINAPI DataCache_IPersistStorage_AddRef( static ULONG WINAPI DataCache_IPersistStorage_Release( IPersistStorage* iface); static HRESULT WINAPI DataCache_GetClassID( - const IPersistStorage* iface, + IPersistStorage* iface, CLSID* pClassID); static HRESULT WINAPI DataCache_IsDirty( IPersistStorage* iface); @@ -1189,7 +1189,7 @@ static ULONG WINAPI DataCache_IPersistStorage_Release( * See Windows documentation for more details on IPersistStorage methods. */ static HRESULT WINAPI DataCache_GetClassID( - const IPersistStorage* iface, + IPersistStorage* iface, CLSID* pClassID) { TRACE("(%p, %p)\n", iface, pClassID); diff --git a/ole/filemoniker.c b/ole/filemoniker.c index aa1cc6e80f0..c40ebe4e0c9 100644 --- a/ole/filemoniker.c +++ b/ole/filemoniker.c @@ -42,7 +42,7 @@ static ULONG WINAPI FileMonikerImpl_AddRef(IMoniker* iface); static ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface); /* IPersist prototype functions */ -static HRESULT WINAPI FileMonikerImpl_GetClassID(const IMoniker* iface, CLSID *pClassID); +static HRESULT WINAPI FileMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID); /* IPersistStream prototype functions */ static HRESULT WINAPI FileMonikerImpl_IsDirty(IMoniker* iface); @@ -199,7 +199,7 @@ ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface) /****************************************************************************** * FileMoniker_GetClassID ******************************************************************************/ -HRESULT WINAPI FileMonikerImpl_GetClassID(const IMoniker* iface, +HRESULT WINAPI FileMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID)/* Pointer to CLSID of object */ { TRACE("(%p,%p),stub!\n",iface,pClassID); diff --git a/ole/itemmoniker.c b/ole/itemmoniker.c index dd203b8bb5c..029e4051d63 100644 --- a/ole/itemmoniker.c +++ b/ole/itemmoniker.c @@ -43,7 +43,7 @@ static ULONG WINAPI ItemMonikerImpl_AddRef(IMoniker* iface); static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface); /* IPersist prototype functions */ -static HRESULT WINAPI ItemMonikerImpl_GetClassID(const IMoniker* iface, CLSID *pClassID); +static HRESULT WINAPI ItemMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID); /* IPersistStream prototype functions */ static HRESULT WINAPI ItemMonikerImpl_IsDirty(IMoniker* iface); @@ -198,7 +198,7 @@ ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) /****************************************************************************** * ItemMoniker_GetClassID ******************************************************************************/ -HRESULT WINAPI ItemMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID) +HRESULT WINAPI ItemMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) { TRACE("(%p,%p),stub!\n",iface,pClassID); diff --git a/ole/olefont.c b/ole/olefont.c index ca78755748e..b17b4c5e8ff 100644 --- a/ole/olefont.c +++ b/ole/olefont.c @@ -152,7 +152,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistStream_QueryInterface(IPersistStream* VOID** ppvoid); static ULONG WINAPI OLEFontImpl_IPersistStream_AddRef(IPersistStream* iface); static ULONG WINAPI OLEFontImpl_IPersistStream_Release(IPersistStream* iface); -static HRESULT WINAPI OLEFontImpl_GetClassID(const IPersistStream* iface, +static HRESULT WINAPI OLEFontImpl_GetClassID(IPersistStream* iface, CLSID* pClassID); static HRESULT WINAPI OLEFontImpl_IsDirty(IPersistStream* iface); static HRESULT WINAPI OLEFontImpl_Load(IPersistStream* iface, @@ -1136,7 +1136,7 @@ static ULONG WINAPI OLEFontImpl_IPersistStream_AddRef( * See Windows documentation for more details on IPersistStream methods. */ static HRESULT WINAPI OLEFontImpl_GetClassID( - const IPersistStream* iface, + IPersistStream* iface, CLSID* pClassID) { if (pClassID==0) diff --git a/scheduler/thread.c b/scheduler/thread.c index dc1e298c4ea..a649cebb278 100644 --- a/scheduler/thread.c +++ b/scheduler/thread.c @@ -4,6 +4,8 @@ * Copyright 1996 Alexandre Julliard */ +#include "config.h" + #include #include #include -- 2.11.4.GIT