Huw Davies : user32: Allow the app specific desktop to be "Default".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 01ac2e48b10469a45d8e371634110d3baab55e2a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=01ac2e48b10469a45d8e371634110d3baab55e2a

Author: Huw Davies <huw at codeweavers.com>
Date:   Wed Jun 24 11:37:20 2020 +0100

user32: Allow the app specific desktop to be "Default".

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/user_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index 31a6168108..9e45835e3a 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -175,12 +175,12 @@ static const WCHAR *get_default_desktop(void)
                                           'A','p','p','D','e','f','a','u','l','t','s',0};
     static WCHAR buffer[MAX_PATH + ARRAY_SIZE(explorerW)];
     WCHAR *p, *appname = buffer;
-    const WCHAR *ret = defaultW;
+    const WCHAR *ret = NULL;
     DWORD len;
     HKEY tmpkey, appkey;
 
     len = (GetModuleFileNameW( 0, buffer, MAX_PATH ));
-    if (!len || len >= MAX_PATH) return ret;
+    if (!len || len >= MAX_PATH) return defaultW;
     if ((p = strrchrW( appname, '/' ))) appname = p + 1;
     if ((p = strrchrW( appname, '\\' ))) appname = p + 1;
     p = appname + strlenW(appname);
@@ -196,8 +196,7 @@ static const WCHAR *get_default_desktop(void)
             len = sizeof(buffer);
             if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer;
             RegCloseKey( appkey );
-            if (ret && strcmpiW( ret, defaultW )) return ret;
-            ret = defaultW;
+            if (ret) return ret;
         }
     }
 
@@ -210,8 +209,9 @@ static const WCHAR *get_default_desktop(void)
         len = sizeof(buffer);
         if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer;
         RegCloseKey( appkey );
+        if (ret) return ret;
     }
-    return ret;
+    return defaultW;
 }