[PATCH 1/2] include/shlobj: add flags and mask values for SHGetSetFolderCustomSettings

[Louis Lenders]

I`m trying to add some small test for SHGetSetFolderCustomSettings and thus need some of these

Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com>
---
 include/shlobj.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/include/shlobj.h b/include/shlobj.h
index 7cdb4f8..e0ea1c4 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1472,6 +1472,20 @@ int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES);
 int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES);
 #define    SHCreateDirectoryEx WINELIB_NAME_AW(SHCreateDirectoryEx)
 
+#define FCS_READ 0x00000001
+#define FCS_FORCEWRITE 0x00000002
+#define FCS_WRITE (FCS_READ | FCS_FORCEWRITE)
+
+#define FCS_FLAG_DRAGDROP 2
+
+#define FCSM_VIEWID 0x00000001
+#define FCSM_WEBVIEWTEMPLATE 0x00000002
+#define FCSM_INFOTIP 0x00000004
+#define FCSM_CLSID 0x00000008
+#define FCSM_ICONFILE 0x00000010
+#define FCSM_LOGO 0x00000020
+#define FCSM_FLAGS 0x00000040
+
 /****************************************************************************
 * SHGetSetFolderCustomSettings API
 */
-- 
2.7.4

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

[Louis Lenders]

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(a)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