Author: weiden Date: Fri Jan 19 21:30:53 2007 New Revision: 25535
URL: http://svn.reactos.org/svn/reactos?rev=25535&view=rev Log: Merge patch from wine-head: Fixes function prototypes of SHAddFromPropSheetExtArray, SHCreatePropSheetExtArray, SHReplaceFromPropSheetExtArray and SHDestroyPropSheetExtArray
Modified: trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/include/psdk/shlobj.h
Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord.... ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Fri Jan 19 21:30:53 2007 @@ -1461,37 +1461,36 @@ /************************************************************************* * SHAddFromPropSheetExtArray [SHELL32.167] */ -DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c) -{ - FIXME("(%08lx,%08lx,%08lx)stub\n", a, b, c); +UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) +{ + FIXME("(%p,%p,%08lx)stub\n", hpsxa, lpfnAddPage, lParam); return 0; }
/************************************************************************* * SHCreatePropSheetExtArray [SHELL32.168] */ -DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c) -{ - FIXME("(%08lx,%s,%08lx)stub\n", a, debugstr_a(b), c); +HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface) +{ + FIXME("(%p,%s,%u)stub\n", hKey, debugstr_w(pszSubKey), max_iface); + return NULL; +} + +/************************************************************************* + * SHReplaceFromPropSheetExtArray [SHELL32.170] + */ +UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam) +{ + FIXME("(%p,%u,%p,%08lx)stub\n", hpsxa, uPageID, lpfnReplaceWith, lParam); return 0; }
/************************************************************************* - * SHReplaceFromPropSheetExtArray [SHELL32.170] - */ -DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d) -{ - FIXME("(%08lx,%08lx,%08lx,%08lx)stub\n", a, b, c, d); - return 0; -} - -/************************************************************************* * SHDestroyPropSheetExtArray [SHELL32.169] */ -DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a) -{ - FIXME("(%08lx)stub\n", a); - return 0; +void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa) +{ + FIXME("(%p)stub\n", hpsxa); }
/*************************************************************************
Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=2... ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Fri Jan 19 21:30:53 2007 @@ -430,6 +430,11 @@
typedef ULONG SFGAOF; typedef DWORD SHGDNF; + +#ifndef HPSXA_DEFINED +#define HPSXA_DEFINED +DECLARE_HANDLE(HPSXA); +#endif
typedef struct _IDA { UINT cidl; @@ -994,6 +999,15 @@ #undef INTERFACE typedef IShellExtInit *LPSHELLEXTINIT;
+#if defined(COBJMACROS) +/*** IUnknown methods ***/ +#define IShellExtInit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellExtInit_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellExtInit_Release(p) (p)->lpVtbl->Release(p) +/*** IShellExtInit methods ***/ +#define IShellExtInit_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) +#endif + #define INTERFACE IShellPropSheetExt DECLARE_INTERFACE_(IShellPropSheetExt, IUnknown) { @@ -1005,6 +1019,17 @@ }; #undef INTERFACE typedef IShellPropSheetExt *LPSHELLPROPSHEETEXT; + +#if defined(COBJMACROS) +/*** IUnknown methods ***/ +#define IShellPropSheetExt_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellPropSheetExt_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellPropSheetExt_Release(p) (p)->lpVtbl->Release(p) +/*** IShellPropSheetExt methods ***/ +#define IShellPropSheetExt_AddPage(p,a,b) (p)->lpVtbl->AddPage(p,a,b) +#define IShellPropSheetExt_ReplacePage(p,a,b,c) (p)->lpVtbl->ReplacePage(p,a,b,c) +#endif +
#define INTERFACE IExtractIconA DECLARE_INTERFACE_(IExtractIconA, IUnknown) @@ -1855,14 +1880,18 @@ IShellFolderViewCB *psfvcb; } SFV_CREATE;
+ +UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); void WINAPI SHAddToRecentDocs(UINT,PCVOID); LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA); LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW); DWORD WINAPI SHCLSIDFromStringA(LPCSTR,CLSID*); DWORD WINAPI SHCLSIDFromStringW(LPCWSTR,CLSID*); +HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE*,IShellView**); HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv); void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID); +void WINAPI SHDestroyPropSheetExtArray(HPSXA); HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int); HRESULT WINAPI SHGetDesktopFolder(LPSHELLFOLDER*); @@ -1895,6 +1924,7 @@ #if (_WIN32_WINNT >= 0x0500) /* W2K */ void WINAPI SHGetSetSettings(LPSHELLSTATE,DWORD,BOOL); #endif +UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM);
#if (_WIN32_WINNT >= 0x0500) /* W2K */ BOOL WINAPI ILIsEqual(LPCITEMIDLIST, LPCITEMIDLIST);