[PATCH v2 4/6] shell32/tests: Move tests of IExplorerBrowser_SetFolderSettings() to a separated function and more tests.

[Jactry Zeng]

From: Jactry Zeng

---
 dlls/shell32/tests/ebrowser.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c
index 9402388f643..c9ec3fa5430 100644
--- a/dlls/shell32/tests/ebrowser.c
+++ b/dlls/shell32/tests/ebrowser.c
@@ -983,7 +983,6 @@ static void test_basics(void)
 {
     IExplorerBrowser *peb;
     IShellBrowser *psb;
-    FOLDERSETTINGS fs;
     ULONG lres;
     EXPLORER_BROWSER_OPTIONS flags;
     HDWP hdwp;
@@ -1088,13 +1087,6 @@ static void test_basics(void)
     ebrowser_instantiate(&peb);
     ebrowser_initialize(peb);

-    /* SetFolderSettings */
-    hr = IExplorerBrowser_SetFolderSettings(peb, NULL);
-    ok(hr == E_INVALIDARG, "got (0x%08lx)\n", hr);
-    fs.ViewMode = 0; fs.fFlags = 0;
-    hr = IExplorerBrowser_SetFolderSettings(peb, &fs);
-    todo_wine ok(hr == E_INVALIDARG, "got (0x%08lx)\n", hr);
-
     /* SetPropertyBag */
     hr = IExplorerBrowser_SetPropertyBag(peb, NULL);
     ok(hr == E_INVALIDARG, "Got 0x%08lx\n", hr);
@@ -1696,6 +1688,25 @@ static void setup_window(void)
     ok(hwnd != NULL, "Failed to create window for tests.\n");
 }

+static void test_folder_settings(void)
+{
+    IExplorerBrowser *browser;
+    FOLDERSETTINGS settings;
+    HRESULT hr;
+
+    ebrowser_instantiate(&browser);
+    ebrowser_initialize(browser);
+
+    hr = IExplorerBrowser_SetFolderSettings(browser, NULL);
+    ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);
+
+    settings.ViewMode = 0; settings.fFlags = FWF_NONE;
+    hr = IExplorerBrowser_SetFolderSettings(browser, &settings);
+    todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);
+
+    IExplorerBrowser_Release(browser);
+}
+
 START_TEST(ebrowser)
 {
     OleInitialize(NULL);
@@ -1719,6 +1730,7 @@ START_TEST(ebrowser)
     test_GetCurrentView();
     test_SetSite();
     test_InputObject();
+    test_folder_settings();

DestroyWindow(hwnd);
     OleUninitialize();