=?UTF-8?Q?Gabriel=20Iv=C4=83ncescu=20?=: shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.

[Alexandre Julliard]

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

Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date:   Wed Jan 23 17:27:14 2019 +0200

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 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shell32/shfldr_desktop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index d0b97c6..938871e 100644
--- 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;