shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.

On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.
ba31ce27 · Gabriel Ivăncescu · Alexandre Julliard · 0cdca521 · ba31ce27
Commit ba31ce27 authored Jan 23, 2019 by Gabriel Ivăncescu Committed by Alexandre Julliard Jan 24, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

shfldr_desktop.c dlls/shell32/shfldr_desktop.c +1 -1

No files found.
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -611,7 +611,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface,

        if ((clsid = _ILGetGUIDPointer (pidl)))
        {
-            if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)
+            if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING)
            {
                BOOL bWantsForParsing;