Module: wine Branch: master Commit: f6be79684f0c5a0a3a03103e8577995bfceb19dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6be79684f0c5a0a3a03103e85...
Author: Damjan Jovanovic damjan.jov@gmail.com Date: Wed Jun 20 09:12:23 2012 +0200
shell32: Fix some function prototypes.
---
dlls/shell32/shell32.spec | 6 +++--- dlls/shell32/shellord.c | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 29685e8..6fcd5e8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -95,7 +95,7 @@ 100 stdcall -ordinal SHRestricted(long)
102 stdcall -ordinal SHCoCreateInstance(wstr ptr long ptr ptr) - 103 stdcall -ordinal SignalFileOpen(long) + 103 stdcall -ordinal SignalFileOpen(ptr) 104 stdcall -noname FileMenu_DeleteAllItems(long) 105 stdcall -noname FileMenu_DrawItem(long ptr) 106 stdcall -noname FileMenu_FindSubMenuByPidl(long ptr) @@ -150,7 +150,7 @@ 158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW 159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW 160 stub SHNetConnectionDialog - 161 stdcall -noname SHRunControlPanel(long long) + 161 stdcall -noname SHRunControlPanel(wstr long) 162 stdcall -ordinal SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW 164 stdcall -ordinal Win32DeleteFile(str) Win32DeleteFileAW @@ -162,7 +162,7 @@ 170 stdcall -ordinal SHReplaceFromPropSheetExtArray(long long long long) 171 stdcall -ordinal PathCleanupSpec(ptr ptr) 172 stdcall -noname SHCreateLinks(long str ptr long ptr) - 173 stdcall -ordinal SHValidateUNC(long long long) + 173 stdcall -ordinal SHValidateUNC(long wstr long) 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW 176 stdcall -ordinal SHSetInstanceExplorer(long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 05105c5..7f329de 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -614,12 +614,12 @@ WORD WINAPI ArrangeWindows( * NOTES * exported by ordinal */ -DWORD WINAPI -SignalFileOpen (DWORD dwParam1) +BOOL WINAPI +SignalFileOpen (PCIDLIST_ABSOLUTE pidl) { - FIXME("(0x%08x):stub.\n", dwParam1); + FIXME("(%p):stub.\n", pidl);
- return 0; + return FALSE; }
/************************************************************************* @@ -1131,9 +1131,10 @@ HRESULT WINAPI SHWinHelp (DWORD v, DWORD w, DWORD x, DWORD z) * SHRunControlPanel [SHELL32.161] * */ -HRESULT WINAPI SHRunControlPanel (DWORD x, DWORD z) -{ FIXME("0x%08x 0x%08x stub\n",x,z); - return 0; +BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent) +{ + FIXME("(%s, %p): stub\n", debugstr_w(commandLine), parent); + return FALSE; }
static LPUNKNOWN SHELL32_IExplorerInterface=0; @@ -1499,7 +1500,7 @@ HRESULT WINAPI SHLoadOLE(LPARAM lParam) * DriveType [SHELL32.64] * */ -HRESULT WINAPI DriveType(DWORD u) +int WINAPI DriveType(int u) { FIXME("0x%04x stub\n",u); return 0; } @@ -1582,10 +1583,10 @@ DWORD WINAPI RLBuildListOfPaths (void) * SHValidateUNC [SHELL32.173] * */ -HRESULT WINAPI SHValidateUNC (DWORD x, DWORD y, DWORD z) +BOOL WINAPI SHValidateUNC (HWND hwndOwner, PWSTR pszFile, UINT fConnect) { - FIXME("0x%08x 0x%08x 0x%08x stub\n",x,y,z); - return 0; + FIXME("(%p, %s, 0x%08x): stub\n", hwndOwner, debugstr_w(pszFile), fConnect); + return FALSE; }
/************************************************************************