Changeset 7085 for trunk/src/shell32/shellpath.c

Timestamp:

Oct 17, 2001, 11:15:22 AM (24 years ago)

Author:

phaller

Message:

SHELL32 WINE resync

File:

• trunk/src/shell32/shellpath.c (modified) (6 diffs)

trunk/src/shell32/shellpath.c

@@ -337 +337 @@
         TRACE("path=%s\n",debugstr_w(lpszPath));
 
-        for(i=0; lpszExtensions[i]; i++)
+        for(i=0; lpszExtensions[i][0]; i++)
 #ifdef __WIN32OS2__
           if (!lstrcmpiW(lpszExtension,lpszExtensions[i])) return TRUE;
@@ -744 +744 @@
         "Start Menu"
     },
-    { /* not known */
-        0, 0,
-        NULL,
-        NULL,
-    },
-    { /* not known */
-        0, 0,
-        NULL,
-        NULL,
-    },
-    { /* not known */
-        0, 0,
-        NULL,
-        NULL,
-    },
-    { /* not known */
+    { /* CSIDL_MYDOCUMENTS */
+        0, 1, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_MYMUSIC */
+        0, 1, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /*CSIDL_MYVIDEO */
+        0, 1, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* unassigned */
         0, 0,
         NULL,
@@ -824 +824 @@
         "PrintHood"
     },
-    { /* not known */
-        0, 0,
+    { /* CSIDL_LOCAL_APPDATA */
+        0, 0, /* FIXME */
         NULL,
         NULL,
@@ -933 +933 @@
         NULL,
         NULL
+    },
+    { /* unassigned 32*/
+      0, 0,
+        NULL,
+        NULL,
+    },
+    { /* unassigned 33*/
+      0, 0,
+        NULL,
+        NULL,
+    },
+    { /* unassigned 34*/
+      0, 0,
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_COMMON_MUSIC */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_COMMON_PICTURES */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_COMMON_VIDEO */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_RESOURCES */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_RESOURCES_LOCALIZED */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_COMMON_OEM_LINKS */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_CDBURN_AREA */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* unassigned 3C */
+      0, 0,
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_COMPUTERSNEARME */
+      0, 0, /* FIXME */
+        NULL,
+        NULL,
     }
 };
@@ -955 +1015 @@
         TRACE("0x%04x,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
 
-        if ((folder > CSIDL_CONNECTIONS) || (CSIDL_Data[folder].hRootKey == 0))
+        if ((folder > CSIDL_COMPUTERSNEARME) || (CSIDL_Data[folder].hRootKey == 0))
         {
             ERR("folder unknown or not allowed\n");
@@ -1071 +1131 @@
             p = strchr(p+1, '\\');
         }
+        /* last component must be created too. */
+        if (!PathFileExistsA(szBuildPath))
+        {
+          if (!CreateDirectoryA(szBuildPath,NULL))
+          {
+            ERR("Failed to create directory '%s'.\n", szPath);
+            return FALSE;
+          }
+        }
 
         MESSAGE("Created not existing system directory '%s'\n", szPath);