[SHELL32]
authorJohannes Anderwald <johannes.anderwald@reactos.org>
Mon, 17 Oct 2011 16:51:46 +0000 (16:51 +0000)
committerJohannes Anderwald <johannes.anderwald@reactos.org>
Mon, 17 Oct 2011 16:51:46 +0000 (16:51 +0000)
- Check first it the path is a drive path
- Fixes launching drive property dialog when clicked in the shell view area

svn path=/trunk/; revision=54182

reactos/dll/win32/shell32/fprop.cpp

index f0e6f74..2fc592c 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <precomp.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell1);
 
 #define MAX_PROPERTY_SHEET_PAGE 32
 
@@ -895,16 +895,17 @@ SH_ShowPropertiesDialog(WCHAR *lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *api
         wFileName[wLength-1] = L'\0';
     }
 
-    if (PathIsDirectoryW(wFileName))
+    if (PathIsRootW(wFileName))
     {
-        return SH_ShowFolderProperties(wFileName, pidlFolder, apidl);
+        return SH_ShowDriveProperties(wFileName, pidlFolder, apidl);
     }
 
-    if (wcslen(wFileName) == 3)
+    if (PathIsDirectoryW(wFileName))
     {
-        return SH_ShowDriveProperties(wFileName, pidlFolder, apidl);
+        return SH_ShowFolderProperties(wFileName, pidlFolder, apidl);
     }
 
+
     pFileName = wcsrchr(wFileName, '\\');
 
     if (!pFileName)