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

Timestamp:

Mar 8, 2002, 12:01:03 PM (23 years ago)

Author:

sandervl

Message:

PH: Wine resync + OS2 integration

File:

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

trunk/src/shell32/shell32_main.c

@@ -1 @@
-/* $Id: shell32_main.c,v 1.6 2001-10-17 09:15:21 phaller Exp $ */
+/* $Id: shell32_main.c,v 1.7 2002-03-08 11:01:00 sandervl Exp $ */
 /*
  *                              Shell basics
@@ -215 +215 @@
         LPITEMIDLIST    pidlLast = NULL, pidl = NULL;
         HRESULT hr = S_OK;
+        BOOL IconNotYetLoaded=TRUE;
 
         TRACE("(%s fattr=0x%lx sfi=%p(attr=0x%08lx) size=0x%x flags=0x%x)\n", 
@@ -337 +338 @@
         if (SUCCEEDED(hr) && (flags & SHGFI_TYPENAME))
         {
-          _ILGetFileType(pidlLast, psfi->szTypeName, 80);
+            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 )))
+                {
+                    lstrcpynA (psfi->szTypeName, sTemp, 80 - 6);
+                    strcat (psfi->szTypeName, "-file");
+                }
+            }
         }
 
@@ -359 +372 @@
           {
             hr = IExtractIconA_GetIconLocation(pei, (flags & SHGFI_OPENICON)? GIL_OPENICON : 0,szLoaction, MAX_PATH, &iIndex, &uFlags);
-            /* fixme what to do with the index? */
+            /* FIXME what to do with the index? */
 
             if(uFlags != GIL_NOTFILENAME)
@@ -373 +386 @@
         if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX)))
         {
+
           if (flags & SHGFI_USEFILEATTRIBUTES)
           {
@@ -388 +402 @@
                 strcpy(sTemp, path);
               }
-              /* FIXME: if sTemp contains a valid filename, get the icon 
-                 from there, index is in dwNr
-              */
-              psfi->iIcon = 2;
+              IconNotYetLoaded=FALSE;
+              psfi->iIcon = 0;
+              if (SHGFI_LARGEICON)
+                PrivateExtractIconsA(sTemp,dwNr,GetSystemMetrics(SM_CXICON),
+                                     GetSystemMetrics(SM_CYICON),
+                                     &psfi->hIcon,0,1,0);
+              else
+                PrivateExtractIconsA(sTemp,dwNr,GetSystemMetrics(SM_CXSMICON),
+                                     GetSystemMetrics(SM_CYSMICON),
+                                     &psfi->hIcon,0,1,0);
             }
             else                                  /* default icon */
@@ -413 +433 @@
 
         /* icon handle */
-        if (SUCCEEDED(hr) && (flags & SHGFI_ICON))
+        if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded)
           psfi->hIcon = ImageList_GetIcon((flags & SHGFI_LARGEICON) ? ShellBigIconList:ShellSmallIconList, psfi->iIcon, ILD_NORMAL);
 
@@ -432 +452 @@
         return ret;
 } 
+
 /*************************************************************************
  * SHGetFileInfoW                       [SHELL32.@]
@@ -462 +483 @@
 
 /*************************************************************************
- * SHGetFileInfoAW                      [SHELL32.@]
+ * SHGetFileInfo                        [SHELL32.@]
  */
 DWORD WINAPI SHGetFileInfoAW(