dlls/shell32 match to PSDK
Ge van Geldorp
gvg at reactos.com
Sun Jun 27 16:38:10 CDT 2004
Changelog:
Ge van Geldorp <gvg at reactos.com>
Match prototypes to Platform SDK
Index: include/shlobj.h
===================================================================
RCS file: /home/wine/wine/include/shlobj.h,v
retrieving revision 1.84
diff -u -r1.84 shlobj.h
--- include/shlobj.h 11 Feb 2004 06:21:45 -0000 1.84
+++ include/shlobj.h 27 Jun 2004 21:34:25 -0000
@@ -200,7 +200,7 @@
#define SHARD_PATHW 0x00000003L
#define SHARD_PATH WINELIB_NAME_AW(SHARD_PATH)
-DWORD WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
+void WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
/****************************************************************************
* SHBrowseForFolder API
@@ -701,8 +701,8 @@
* SHCreateDirectory API
*/
DWORD WINAPI SHCreateDirectory(HWND, LPCVOID);
-DWORD WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES);
-DWORD WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES);
+int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES);
+int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES);
/****************************************************************************
* SHGetSpecialFolderLocation API
@@ -791,7 +791,7 @@
/****************************************************************************
* SHGetDesktopFolder API
*/
-DWORD WINAPI SHGetDesktopFolder(IShellFolder * *);
+HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *);
/****************************************************************************
* SHBindToParent API
@@ -1014,7 +1014,7 @@
UINT WINAPI ILGetSize(LPCITEMIDLIST);
BOOL WINAPI ILIsEqual(LPCITEMIDLIST,LPCITEMIDLIST);
BOOL WINAPI ILIsParent(LPCITEMIDLIST,LPCITEMIDLIST,BOOL);
-BOOL WINAPI ILRemoveLastID(LPCITEMIDLIST);
+BOOL WINAPI ILRemoveLastID(LPITEMIDLIST);
#ifdef __cplusplus
} /* extern "C" */
Index: dlls/shell32/pidl.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/pidl.c,v
retrieving revision 1.116
diff -u -r1.116 pidl.c
--- dlls/shell32/pidl.c 15 Apr 2004 05:04:10 -0000 1.116
+++ dlls/shell32/pidl.c 27 Jun 2004 21:34:26 -0000
@@ -204,7 +204,7 @@
* NOTES
* when pidl=Desktop return=FALSE
*/
-BOOL WINAPI ILRemoveLastID(LPCITEMIDLIST pidl)
+BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl)
{
TRACE_(shell)("pidl=%p\n",pidl);
Index: dlls/shell32/shell32_main.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32_main.c,v
retrieving revision 1.133
diff -u -r1.133 shell32_main.c
--- dlls/shell32/shell32_main.c 19 May 2004 03:22:56 -0000 1.133
+++ dlls/shell32/shell32_main.c 27 Jun 2004 21:34:26 -0000
@@ -712,7 +712,7 @@
* the shell process and release it immediately
*/
-DWORD WINAPI SHLoadInProc (REFCLSID rclsid)
+HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
{
void *ptr = NULL;
Index: dlls/shell32/shellole.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellole.c,v
retrieving revision 1.64
diff -u -r1.64 shellole.c
--- dlls/shell32/shellole.c 18 Jun 2004 00:23:38 -0000 1.64
+++ dlls/shell32/shellole.c 27 Jun 2004 21:34:26 -0000
@@ -473,7 +473,7 @@
/*************************************************************************
* SHGetDesktopFolder [SHELL32.@]
*/
-DWORD WINAPI SHGetDesktopFolder(IShellFolder **psf)
+HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
{
HRESULT hres = S_OK;
TRACE("\n");
Index: dlls/shell32/shellord.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellord.c,v
retrieving revision 1.122
diff -u -r1.122 shellord.c
--- dlls/shell32/shellord.c 18 Jun 2004 00:23:38 -0000 1.122
+++ dlls/shell32/shellord.c 27 Jun 2004 21:34:27 -0000
@@ -606,10 +606,8 @@
*
* NOTES
* exported by name
- *
- * FIXME: ?? MSDN shows this as a VOID
*/
-DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
+void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
{
/* If list is a string list lpfnCompare has the following prototype
* int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2)
@@ -648,20 +646,20 @@
ret=SHADD_get_policy( "NoRecentDocsHistory", &type, &data, &datalen);
if ((ret > 0) && (ret != ERROR_FILE_NOT_FOUND)) {
ERR("Error %d getting policy \"NoRecentDocsHistory\"\n", ret);
- return 0;
+ return;
}
if (ret == ERROR_SUCCESS) {
if (!( (type == REG_DWORD) ||
((type == REG_BINARY) && (datalen == 4)) )) {
ERR("Error policy data for \"NoRecentDocsHistory\" not formated correctly, type=%ld, len=%ld\n",
type, datalen);
- return 0;
+ return;
}
TRACE("policy value for NoRecentDocsHistory = %08lx\n", data[0]);
/* now test the actual policy value */
if ( data[0] != 0)
- return 0;
+ return;
}
/* Open key to where the necessary info is
@@ -674,7 +672,7 @@
"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer",
0, 0, 0, KEY_READ, 0, &HCUbasekey, 0)) {
ERR("Failed to create 'Software\\Microsoft\\Windows\\CurrentVersion\\Explorer'\n");
- return 0;
+ return;
}
/* Get path to user's "Recent" directory
@@ -724,7 +722,7 @@
*/
RegDeleteKeyA(HCUbasekey, "RecentDocs");
RegCloseKey(HCUbasekey);
- return 0;
+ return;
}
/* Have data to add, the jobs to be done:
@@ -780,7 +778,7 @@
/* MRU failed */
ERR("MRU processing failed, handle zero\n");
RegCloseKey(HCUbasekey);
- return 0;
+ return;
}
len = lstrlenA(doc_name);
pos = FindMRUData(mruhandle, doc_name, len, 0);
@@ -929,7 +927,7 @@
/* all done */
RegCloseKey(HCUbasekey);
- return 0;
+ return;
}
/*************************************************************************
Index: dlls/shell32/shlfileop.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v
retrieving revision 1.39
diff -u -r1.39 shlfileop.c
--- dlls/shell32/shlfileop.c 14 Jun 2004 16:56:39 -0000 1.39
+++ dlls/shell32/shlfileop.c 27 Jun 2004 21:34:27 -0000
@@ -545,7 +545,7 @@
* ERROR_ALREADY_EXISTS when the directory already exists
* ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
*/
-DWORD WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec)
+int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec)
{
WCHAR wPath[MAX_PATH];
TRACE("(%p, %s, %p)\n",hWnd, debugstr_a(path), sec);
@@ -557,9 +557,9 @@
/*************************************************************************
* SHCreateDirectoryExW [SHELL32.@]
*/
-DWORD WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
+int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
{
- DWORD ret = ERROR_BAD_PATHNAME;
+ int ret = ERROR_BAD_PATHNAME;
TRACE("(%p, %s, %p)\n",hWnd, debugstr_w(path), sec);
if (PathIsRelativeW(path))
More information about the wine-patches
mailing list