Thomas Weidenmueller : shell32: Fix prototypes.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jan 19 06:29:20 CST 2007
Module: wine
Branch: master
Commit: e06345db52c772084f46ed540fe2fd5b7708edf6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06345db52c772084f46ed540fe2fd5b7708edf6
Author: Thomas Weidenmueller <wine-patches at reactsoft.com>
Date: Thu Jan 18 16:10:16 2007 +0100
shell32: Fix prototypes.
Fix the SHAddFromPropSheetExtArray, SHCreatePropSheetExtArray,
SHReplaceFromPropSheetExtArray and SHDestroyPropSheetExtArray function
prototypes because they're now documented. Also add them to shlobj.h.
---
dlls/shell32/shellord.c | 19 +++++++++----------
include/shlobj.h | 9 +++++++++
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index ef6b7b8..7c22e6b 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1516,37 +1516,36 @@ DWORD WINAPI SHELL32_714(LPVOID x)
/*************************************************************************
* 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,%08lx)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,%s,%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,%08lx)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);
}
/*************************************************************************
diff --git a/include/shlobj.h b/include/shlobj.h
index ee8e58c..b5fee16 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -34,12 +34,20 @@ extern "C" {
#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 @@ BOOL WINAPI SHGetPathFromIDListW
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-cvs
mailing list