SHELL32: Fix prototypes
Thomas Weidenmueller
wine-patches at reactsoft.com
Thu Jan 18 09:10:16 CST 2007
Fix the SHAddFromPropSheetExtArray, SHCreatePropSheetExtArray,
SHReplaceFromPropSheetExtArray and SHDestroyPropSheetExtArray function
prototypes because they're now documented. Also add them to shlobj.h.
-------------- next part --------------
Index: dlls/shell32/shellord.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellord.c,v
retrieving revision 1.145
diff -u -r1.145 shellord.c
--- dlls/shell32/shellord.c 9 Oct 2006 11:06:01 -0000 1.145
+++ dlls/shell32/shellord.c 18 Jan 2007 15:05:32 -0000
@@ -1516,37 +1516,36 @@
/*************************************************************************
* SHAddFromPropSheetExtArray [SHELL32.167]
*/
-DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c)
+UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
{
- FIXME("(%08x,%08x,%08x)stub\n", a, b, c);
+ FIXME("(%p,%p,%08x)stub\n", hpsxa, lpfnAddPage, lParam);
return 0;
}
/*************************************************************************
* SHCreatePropSheetExtArray [SHELL32.168]
*/
-DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c)
+HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface)
{
- FIXME("(%08x,%s,%08x)stub\n", a, debugstr_a(b), c);
- return 0;
+ FIXME("(%p,%ws,%u)stub\n", hKey, debugstr_w(pszSubKey), max_iface);
+ return NULL;
}
/*************************************************************************
* SHReplaceFromPropSheetExtArray [SHELL32.170]
*/
-DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d)
+UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam)
{
- FIXME("(%08x,%08x,%08x,%08x)stub\n", a, b, c, d);
+ FIXME("(%p,%u,%p,%08x)stub\n", hpsxa, uPageID, lpfnReplaceWith, lParam);
return 0;
}
/*************************************************************************
* SHDestroyPropSheetExtArray [SHELL32.169]
*/
-DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a)
+void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa)
{
- FIXME("(%08x)stub\n", a);
- return 0;
+ FIXME("(%p)stub\n", hpsxa);
}
/*************************************************************************
Index: include/shlobj.h
===================================================================
RCS file: /home/wine/wine/include/shlobj.h,v
retrieving revision 1.108
diff -u -r1.108 shlobj.h
--- include/shlobj.h 8 Sep 2006 10:16:08 -0000 1.108
+++ include/shlobj.h 18 Jan 2007 14:58:22 -0000
@@ -34,12 +34,20 @@
#include <shtypes.h>
#include <shobjidl.h>
+#ifndef HPSXA_DEFINED
+#define HPSXA_DEFINED
+DECLARE_HANDLE(HPSXA);
+#endif
+
+UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM);
LPVOID WINAPI SHAlloc(ULONG);
HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*);
+HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT);
DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*);
DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*);
#define SHCLSIDFromString WINELIB_NAME_AW(SHCLSIDFromString)
HRESULT WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IEnumFORMATETC**);
+void WINAPI SHDestroyPropSheetExtArray(HPSXA);
BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST);
DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT);
void WINAPI SHFree(LPVOID);
@@ -50,6 +58,7 @@
INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST);
HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*);
HRESULT WINAPI SHLoadOLE(LPARAM);
+UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM);
LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR);
int WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*);
HRESULT WINAPI SHStartNetConnectionDialog(HWND,LPCSTR,DWORD);
More information about the wine-patches
mailing list