[PATCH] shell32/tests: Add small test for SHGetSetFolderCustomSettings
Louis Lenders
xerox.xerox2000x at gmail.com
Sun Apr 22 15:33:38 CDT 2018
Small test for SHGetSetFolderCustomSettings; the 12 failures on win2003 are not due to this test (happen in other test), as explained
in another mail
Signed-off-by: Louis Lenders <xerox.xerox2000x at gmail.com>
---
dlls/shell32/tests/shlfolder.c | 43 ++++++++++++++++++++++++++++++++++++++++++
include/shlobj.h | 3 ++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index c976c85..94cc147 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -65,6 +65,7 @@ static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**);
static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS);
+static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD);
static WCHAR *make_wstr(const char *str)
{
@@ -118,6 +119,7 @@ static void init_function_pointers(void)
MAKEFUNC(SHGetItemFromObject);
MAKEFUNC(SHCreateDefaultContextMenu);
MAKEFUNC(SHGetPathFromIDListEx);
+ MAKEFUNC(SHGetSetFolderCustomSettings);
#undef MAKEFUNC
/* test named exports */
@@ -5246,6 +5248,46 @@ todo_wine
IShellFolder_Release(desktop);
}
+static void test_SHGetSetFolderCustomSettings(void)
+{
+ HRESULT hr;
+ SHFOLDERCUSTOMSETTINGS fcs;
+ static const WCHAR pathW[] = {'c',':','\\','s','o','m','e','_','d','i','r',0};
+ static const WCHAR iconW[] = {'c',':','\\','s','o','m','e','_','d','i','r','\\','s','o','m','e','_','i','c','o','n','.','i','c','o',0};
+ WCHAR bufferW[MAX_PATH] = {0};
+
+ if (!pSHGetSetFolderCustomSettings)
+ {
+ win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n");
+ return;
+ }
+
+ CreateDirectoryW(pathW, NULL);
+
+ memset(&fcs, 0, sizeof(fcs));
+ fcs.dwSize = sizeof(fcs);
+ fcs.dwMask = FCSM_ICONFILE;
+ fcs.pszIconFile = (WCHAR *)iconW;
+
+ hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/
+ todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr);
+
+ memset(&fcs, 0, sizeof(fcs));
+ fcs.dwSize = sizeof(fcs);
+ fcs.dwMask = FCSM_ICONFILE;
+ fcs.cchIconFile = MAX_PATH;
+ fcs.pszIconFile = bufferW;
+
+ hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_READ);
+ todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr);
+ todo_wine ok(!lstrcmpW(iconW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconW), wine_dbgstr_w(fcs.pszIconFile));
+
+ hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ);
+ todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr);
+
+ RemoveDirectoryW(pathW);
+}
+
START_TEST(shlfolder)
{
init_function_pointers();
@@ -5288,6 +5330,7 @@ START_TEST(shlfolder)
test_GetDefaultColumn();
test_GetDefaultSearchGUID();
test_SHLimitInputEdit();
+ test_SHGetSetFolderCustomSettings();
OleUninitialize();
}
diff --git a/include/shlobj.h b/include/shlobj.h
index 9d6dcdd..7bf0d2e 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1489,7 +1489,7 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES);
#define FCSM_ICONFILE 0x00000010
#define FCSM_LOGO 0x00000020
#define FCSM_FLAGS 0x00000040
-
+#include <pshpack8.h>
typedef struct {
DWORD dwSize;
DWORD dwMask;
@@ -1507,6 +1507,7 @@ typedef struct {
LPWSTR pszLogo;
DWORD cchLogo;
} SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS;
+#include <poppack.h>
HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, PCWSTR pszPath, DWORD dwReadWrite);
--
2.7.4
More information about the wine-devel
mailing list