Ticket #1495: DirTreeCtrl.cpp.diff

DirTreeCtrl.cpp

@@ -72 +72 @@
             GetRootItem(),
             (LPCTSTR)list,
             SHGFI_PIDL | FF_DISPLAYNAME,
-            CSIDL_DESKTOP | FF_SYSTEM | FF_NODRAG);
+            CSIDL_DESKTOPDIRECTORY | FF_SYSTEM | FF_NODRAG);
     CoTaskMemFree(list);
 
     /* Add `My Document' , `My Computer', etc, to `My Desktop' */
@@ -84 +84 @@
 
     /* Add other normal folders to `My Desktop' */
     TCHAR szPath[MAX_PATH];
-    SHGetSpecialFolderPath(NULL, szPath, CSIDL_DESKTOP, false);
+    /* Use CSIDL_DESKTOPDIRECTORY instead of CSIDL_DESKTOP 
+     * that phsically store file objects.
+     * CSIDL_DESKTOP is bad if someone changes Desktop folder by Tweak UI */
+    SHGetSpecialFolderPath(NULL, szPath, CSIDL_DESKTOPDIRECTORY, false);
     DisplayPath( GetRootItem(), szPath );
 
     Expand(GetRootItem(), TVE_EXPAND);
@@ -197 +200 @@
     for (int i = 0; i < sfLength; i++)
     {
         SHGetSpecialFolderLocation(m_pOwner->m_hWnd, systemFolders[i] ,&list);
-        SHGetSpecialFolderPath(NULL, szPath, systemFolders[i] | 0x00010000, false);
+        SHGetSpecialFolderPath(NULL, szPath, systemFolders[i] | FF_SYSTEM, false);
         hParent = AddItem(
             GetRootItem(),
             (LPCTSTR)list,
@@ -492 +495 @@
                 else
                     return strReturn;
             case CSIDL_PERSONAL:    /* My Documents */
-            case CSIDL_DESKTOP:     /* My Desktop */
-                SHGetSpecialFolderPath(NULL, szPath, item.lParam & 0xFFFF, false);
+            case CSIDL_DESKTOPDIRECTORY:        /* My Desktop */
+                SHGetSpecialFolderPath(NULL, szPath, item.lParam & FF_LBYTES, false);
                 strTemp = szPath;
                 strTemp += _T("\\");
                 strReturn = strTemp + strReturn;