[SHELL32]

- Return a readable folder name when SHGDN_FORADDRESSBAR was specified
- We no longer show GUIDs in the address bar

svn path=/branches/shell-experiments/; revision=65072

diff --git a/dll/win32/shell32/folders/desktop.cpp b/dll/win32/shell32/folders/desktop.cpp
index 119df7a..4311e12 100644 (file)
--- a/dll/win32/shell32/folders/desktop.cpp
+++ b/dll/win32/shell32/folders/desktop.cpp
@@ -679,7 +679,7 @@ HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFl
 
         if ((clsid = _ILGetGUIDPointer (pidl)))
         {
 
         if ((clsid = _ILGetGUIDPointer (pidl)))
         {

-            if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)
+            if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING)

             {
                 int bWantsForParsing;
 
             {
                 int bWantsForParsing;
 

diff --git a/dll/win32/shell32/folders/mycomp.cpp b/dll/win32/shell32/folders/mycomp.cpp
index 828abac..4b098d9 100644 (file)
--- a/dll/win32/shell32/folders/mycomp.cpp
+++ b/dll/win32/shell32/folders/mycomp.cpp
@@ -491,7 +491,7 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla
             clsid = _ILGetGUIDPointer (pidl);
             if (clsid)
             {
             clsid = _ILGetGUIDPointer (pidl);
             if (clsid)
             {

-                if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)
+                if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING)

                 {
                     static const WCHAR clsidW[] = L"CLSID\\";
                     static const WCHAR shellfolderW[] = L"\\shellfolder";
                 {
                     static const WCHAR clsidW[] = L"CLSID\\";
                     static const WCHAR shellfolderW[] = L"\\shellfolder";