Changeset 21637 for trunk/src/shell32/shell32_main.c

Timestamp:

Jun 20, 2011, 5:16:00 PM (14 years ago)

Author:

dmik

Message:

shell32: Fixed SHGetFileInfoW(): PIDL input argument was misinterpreted as a string and the display name and type name fields SHFILEINFOW were not properly set on output resulting in garbage on the caller's side.

File:

• trunk/src/shell32/shell32_main.c (modified) (2 diffs)

trunk/src/shell32/shell32_main.c

@@ -192 +192 @@
         if (SUCCEEDED(hr) && (flags & SHGFI_TYPENAME))
         {
-            if (!(flags & SHGFI_USEFILEATTRIBUTES))
-                _ILGetFileType(pidlLast, psfi->szTypeName, 80);
-            else
+        if (!(flags & SHGFI_USEFILEATTRIBUTES))
+                    _ILGetFileType(pidlLast, psfi->szTypeName, 80);
+        else
+        {
+            char sTemp[64];
+            strcpy(sTemp,PathFindExtensionA(path));
+            if (!( HCR_MapTypeToValue(sTemp, sTemp, 64, TRUE)
+                   && HCR_MapTypeToValue(sTemp, psfi->szTypeName, 80, FALSE )))
             {
-                char sTemp[64];
-                strcpy(sTemp,PathFindExtensionA(path));
-                if (!( HCR_MapTypeToValue(sTemp, sTemp, 64, TRUE)
-                       && HCR_MapTypeToValue(sTemp, psfi->szTypeName, 80, FALSE )))
-                {
-                    lstrcpynA (psfi->szTypeName, sTemp, 80 - 6);
-                    strcat (psfi->szTypeName, "-file");
-                }
+                lstrcpynA (psfi->szTypeName, sTemp, 80 - 6);
+                strcat (psfi->szTypeName, "-file");
             }
+        }
         }
 
@@ -320 +320 @@
         SHFILEINFOA temppsfi;
 
-        len = WideCharToMultiByte(CP_ACP, 0, path, -1, NULL, 0, NULL, NULL);
-        temppath = HeapAlloc(GetProcessHeap(), 0, len);
-        WideCharToMultiByte(CP_ACP, 0, path, -1, temppath, len, NULL, NULL);
-
-        WideCharToMultiByte(CP_ACP, 0, psfi->szDisplayName, -1, temppsfi.szDisplayName,
-                            sizeof(temppsfi.szDisplayName), NULL, NULL);
-        WideCharToMultiByte(CP_ACP, 0, psfi->szTypeName, -1, temppsfi.szTypeName,
-                            sizeof(temppsfi.szTypeName), NULL, NULL);
+    memset(&temppsfi, 0, sizeof(temppsfi));
+
+    if (flags & SHGFI_PIDL)
+    {
+        temppath = (LPSTR)path;
+    }
+    else
+    {
+        len = WideCharToMultiByte(CP_ACP, 0, path, -1, NULL, 0, NULL, NULL);
+        temppath = HeapAlloc(GetProcessHeap(), 0, len);
+        WideCharToMultiByte(CP_ACP, 0, path, -1, temppath, len, NULL, NULL);
+    }
+
+    WideCharToMultiByte(CP_ACP, 0, psfi->szDisplayName, -1, temppsfi.szDisplayName,
+                        sizeof(temppsfi.szDisplayName), NULL, NULL);
+    WideCharToMultiByte(CP_ACP, 0, psfi->szTypeName, -1, temppsfi.szTypeName,
+                        sizeof(temppsfi.szTypeName), NULL, NULL);
 
         ret = SHGetFileInfoA(temppath, dwFileAttributes, &temppsfi, sizeof(temppsfi), flags);
+
+    MultiByteToWideChar(CP_ACP, 0, temppsfi.szTypeName, -1,
+                        psfi->szTypeName,
+                        sizeof(psfi->szTypeName) / sizeof(WCHAR));
+    MultiByteToWideChar(CP_ACP, 0, temppsfi.szDisplayName, -1,
+                        psfi->szDisplayName,
+                        sizeof(psfi->szDisplayName) / sizeof(WCHAR));
 
         HeapFree(GetProcessHeap(), 0, temppath);