[PATCH 2/2] shell32: update specs for SHGetSetFolderCustomSettings to behaviour above win2003

Louis Lenders xerox.xerox2000x at gmail.com
Wed Apr 11 15:09:02 CDT 2018


update specs for SHGetSetFolderCustomSettings to behaviour above win2003
for example in bug 44959 the fixme prints the wrong path (only a C) currently

Signed-off-by: Louis Lenders <xerox.xerox2000x at gmail.com>
---
 dlls/shell32/shell32.spec | 2 +-
 dlls/shell32/shlfolder.c  | 6 +++---
 include/shlobj.h          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 91e4f6b..837abd3 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -259,7 +259,7 @@
 
  701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr)
  704 stdcall -noname GUIDFromStringW(wstr ptr)
- 709 stdcall SHGetSetFolderCustomSettings(ptr str long)
+ 709 stdcall SHGetSetFolderCustomSettings(ptr wstr long)
  714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW
  723 stdcall -noname SHCreateSessionKey(long ptr)
  727 stdcall SHGetImageList(long ptr ptr)
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index f4df6f5..9143f1e 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -607,11 +607,11 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci
 /***********************************************************************
  *  SHGetSetFolderCustomSettings
  *
- *   Only in XP (up to SP2) and Server 2003
+ *   Only Unicode above Server 2003
  */
-HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, LPCSTR path, DWORD flag )
+HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag )
 {
-    FIXME("%p %s 0x%x: stub\n", fcs, path, flag);
+    FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag);
     return E_NOTIMPL;
 }
 
diff --git a/include/shlobj.h b/include/shlobj.h
index e0ea1c4..87b55af 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1507,7 +1507,7 @@ typedef struct {
     DWORD cchLogo;
 } SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS;
 
-HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, LPCSTR pszPath, DWORD dwReadWrite);
+HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, PCWSTR pszPath, DWORD dwReadWrite);
 
 /****************************************************************************
 * SHGetSpecialFolderLocation API
-- 
2.7.4




More information about the wine-devel mailing list