[PATCH v4] shell32: SHCreateDirectoryExW no CANCELLED for ALREADY_EXISTS

[John Thomson]

If SHCreateDirectoryExW is passed a non-null hWnd,
but the directory already exists,
ERROR_CANCELLED is returned in Wine,
rather than ERROR_ALREADY_EXISTS,
the Windows behaviour.

An application relying on an expected return code
may not proceed given the 0x4C7 1223 ERROR_CANCELLED,
rather than a 0xB7 183 ERROR_ALREADY_EXISTS

Warframe in-game screenshots (F6) demonstrates this behaviour

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47023
Signed-off-by: John Thomson <git at johnthomson.fastmail.com.au>
---
v2:
Add Test for conformance of SHCreateDirectoryExW with a Hwnd
when target directory already exists

v3:
Add missing newline on ok test hwnd fail string. Thanks Gijs

v4:
Made SHCreateDirectoryExW with Hwnd test already existing directory
fail string consistent with existing fail strings. Thanks Gijs
---
 dlls/shell32/shlfileop.c       |  4 +++-
 dlls/shell32/tests/shlfileop.c | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index c7bd54d200..1515ad3891 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -763,7 +763,9 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s
 	    }
 	  }
 
-	  if (ret && hWnd && (ERROR_CANCELLED != ret))
+	  if (ret && hWnd &&
+	      ret != ERROR_CANCELLED &&
+	      ret != ERROR_ALREADY_EXISTS)
 	  {
 	    /* We failed and should show a dialog box */
 	    FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret);
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 8fb4dcf66b..474f5fd790 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -2543,6 +2543,7 @@ static void test_unicode(void)
     int ret;
     HANDLE file;
     static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'};
+    HWND hwnd;
 
     shfoW.hwnd = NULL;
     shfoW.wFunc = FO_DELETE;
@@ -2633,6 +2634,20 @@ static void test_unicode(void)
     ok(GetLastError() == ERROR_SUCCESS ||
        broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */
        "Expected ERROR_SUCCESS, got %d\n", GetLastError());
+
+    /* Check SHCreateDirectoryExW with a Hwnd
+     * returns ERROR_ALREADY_EXISTS where a directory already exists */
+    /* Get any window handle */
+    hwnd = FindWindowA(NULL, NULL);
+    ok(hwnd, "FindWindowA failed to produce a hwnd\n");
+    ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL);
+    ok(!ret, "SHCreateDirectoryExW returned %d\n", ret);
+    /* Create already-existing directory */
+    ok(file_existsW(UNICODE_PATH), "The directory was not created\n");
+    ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL);
+    ok(ret == ERROR_ALREADY_EXISTS,
+       "Expected ERROR_ALREADY_EXISTS, got %d\n", ret);
+    RemoveDirectoryW(UNICODE_PATH);
 }
 
 static void
-- 
2.21.0