Changeset 21639 for trunk/src

Timestamp:

Jun 20, 2011, 7:19:48 PM (14 years ago)

Author:

dmik

Message:

shell32: SHGetFileInfo(): Differentiate between different drive types (network, local, removable etc) when filling the type name field for paths like 'X:\'.

Location:

trunk/src/shell32

Files:

• pidl.c (modified) (60 diffs)
• shell32_main.c (modified) (1 diff)

trunk/src/shell32/pidl.c

@@ -52 +52 @@
 {
         BOOL bIsShellDebug;
-        
+
         LPITEMIDLIST pidltemp = pidl;
         if (!TRACE_ON(pidl))
@@ -70 +70 @@
           MESSAGE ("PIDL: -------- pidl=%p\n", pidl);
           if (pidltemp->mkid.cb)
-          { 
+          {
             do
             {
@@ -189 +189 @@
           pidl = ODIN_ILGETNEXT(pidl);
         }
-        return pidlLast;                
+        return pidlLast;
 }
 /*************************************************************************
@@ -219 +219 @@
   if (!pidl)
     return NULL;
-    
+
   len = ILGetSize(pidl);
   newpidl = (LPITEMIDLIST)SHAlloc(len);
@@ -239 +239 @@
 {       DWORD len;
         LPITEMIDLIST pidlNew = NULL;
-        
+
         TRACE("pidl=%p \n",pidl);
         pdump(pidl);
-        
+
         if (pidl)
         {
-          len = pidl->mkid.cb;  
+          len = pidl->mkid.cb;
           pidlNew = (LPITEMIDLIST) SHAlloc (len+2);
           if (pidlNew)
@@ -270 +270 @@
         DWORD           dwBytesRead;
         HRESULT         ret = E_FAIL;
-        
+
 
         TRACE_(shell)("%p %p\n", pStream ,  ppPidl);
@@ -278 +278 @@
           *ppPidl = NULL;
         }
-        
+
         IStream_AddRef (pStream);
 
@@ -291 +291 @@
           }
         }
-        
+
         /* we are not yet fully compatible */
         if (!pcheck(*ppPidl))
@@ -297 +297 @@
           *ppPidl = NULL;
         }
-        
+
 
         IStream_Release (pStream);
@@ -315 +315 @@
         WORD            wLen = 0;
         HRESULT         ret = E_FAIL;
-        
+
         TRACE_(shell)("%p %p\n", pStream, pPidl);
 
@@ -333 +333 @@
           }
         }
-        
+
 
         IStream_Release (pStream);
@@ -346 +346 @@
  *   wraper for IShellFolder::ParseDisplayName()
  */
-HRESULT WIN32API SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST *ppidl, 
+HRESULT WIN32API SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST *ppidl,
                                      DWORD *attributes)
 {       LPSHELLFOLDER sf;
@@ -352 +352 @@
         DWORD pchEaten;
         HRESULT ret = E_FAIL;
-        
+
         TRACE_(shell)("%s %p 0x%08lx\n",path,ppidl,attributes?*attributes:0);
 
@@ -367 +367 @@
 
 
-HRESULT WIN32API SHILCreateFromPathW(LPCWSTR path, 
-              LPITEMIDLIST * ppidl, 
+HRESULT WIN32API SHILCreateFromPathW(LPCWSTR path,
+              LPITEMIDLIST * ppidl,
               DWORD * attributes)
 {       LPSHELLFOLDER sf;
         DWORD pchEaten;
         HRESULT ret = E_FAIL;
-        
+
         TRACE_(shell)("%s %p 0x%08lx\n",debugstr_w(path),ppidl,attributes?*attributes:0);
 
@@ -392 +392 @@
 /*************************************************************************
  * SHCloneSpecialIDList [SHELL32.89]
- * 
+ *
  * PARAMETERS
- *  hwndOwner   [in] 
+ *  hwndOwner   [in]
  *  nFolder     [in]    CSIDL_xxxxx ??
  *
@@ -425 +425 @@
         if (!pidl)
           return NULL;
-    
+
         len = ILGetSize(pidl);
         newpidl = (LPITEMIDLIST)pCOMCTL32_Alloc(len);
@@ -459 +459 @@
 
         if ( (!pidl1) || (!pidl2) ) return FALSE;
-        
+
         while (pidl1->mkid.cb && pidl2->mkid.cb)
         {
@@ -465 +465 @@
             if (pidl1->mkid.cb != pidl2->mkid.cb)
               return FALSE;
-          
+
 //          _ILSimpleGetText(pidltemp1, szData1, MAX_PATH);
 //          _ILSimpleGetText(pidltemp2, szData2, MAX_PATH);
@@ -476 +476 @@
             pidl2 = ODIN_ILGETNEXT(pidl2);
         }
-  
+
         if (!pidl1->mkid.cb && !pidl2->mkid.cb)
         {
@@ -499 +499 @@
         LPITEMIDLIST pParent = pidlParent;
         LPITEMIDLIST pChild = pidlChild;
-        
+
         TRACE("%p %p %x\n", pidlParent, pidlChild, bImmediate);
 
@@ -513 +513 @@
           pParent = ODIN_ILGETNEXT(pParent);
           pChild = ODIN_ILGETNEXT(pChild);
-        }       
-        
+        }
+
         if ( pParent->mkid.cb || ! pChild->mkid.cb)     /* child shorter or has equal length to parent */
           return FALSE;
-        
+
         if ( ODIN_ILGETNEXT(pChild)->mkid.cb && bImmediate)     /* not immediate descent */
           return FALSE;
-        
+
         return TRUE;
 }
@@ -572 +572 @@
             pidltemp1 = ODIN_ILGETNEXT(pidltemp1);
             pidltemp2 = ODIN_ILGETNEXT(pidltemp2);
-            ret = pidltemp2;    
+            ret = pidltemp2;
           }
 
@@ -596 +596 @@
         DWORD    len1,len2;
         LPITEMIDLIST  pidlNew;
-        
+
 
         if(!pidl1 && !pidl2) return NULL;
@@ -637 +637 @@
 {
   dprintf(("not yet implemented"));
-  
+
         FIXME("sf=%p pidl=%p 0x%04lx\n",lpsf,pidl,z);
 
@@ -654 +654 @@
 {
   dprintf(("not yet implemented"));
-  
+
         FIXME("(pidl=%p)\n",pidl);
 
@@ -679 +679 @@
   LPSHITEMID si = &(pidl->mkid);
   DWORD  len=0;
-  
+
   // @@@PH this cannot be correct: pidl==NULL would crash!
   if (pidl)
-  { 
+  {
     while (si->cb)
-    { 
+    {
       len += si->cb;
       si  = (LPSHITEMID)(((LPBYTE)si)+si->cb);
@@ -740 +740 @@
         pdump (pidl);
         pdump (item);
-        
+
         if (_ILIsDesktop(pidl))
         {
@@ -771 +771 @@
 DWORD ILFree(LPITEMIDLIST pidl)
 {
-  if(!pidl) 
+  if(!pidl)
     return FALSE;
   SHFree(pidl);
@@ -815 +815 @@
         return FALSE;
 }
-LPITEMIDLIST WINAPI ILCreateFromPathAW (LPCVOID path) 
+LPITEMIDLIST WINAPI ILCreateFromPathAW (LPCVOID path)
 {
         if ( SHELL_OsIsUnicode())
@@ -875 +875 @@
  * gets the folder locations from the registry and creates a pidl
  * creates missing reg keys and directorys
- * 
+ *
  * PARAMS
  *   hwndOwner [I]
@@ -966 +966 @@
 {
         TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
-        
+
         pdump(pidl);
         if (!psf || !dest )  return E_INVALIDARG;
@@ -1051 +1051 @@
  *
  * PARAMETERS
- *  pidl,   [IN] pidl 
+ *  pidl,   [IN] pidl
  *  pszPath [OUT] path
  *
- * RETURNS 
+ * RETURNS
  *  path from a passed PIDL.
  *
@@ -1079 +1079 @@
         if(_ILIsDesktop(pidl))
         {
-           SHGetSpecialFolderPathA(0, pszPath, CSIDL_DESKTOPDIRECTORY, FALSE);  
+           SHGetSpecialFolderPathA(0, pszPath, CSIDL_DESKTOPDIRECTORY, FALSE);
         }
         else if (_ILIsSpecialFolder(ILFindLastID(pidl)))
@@ -1129 +1129 @@
         LPITEMIDLIST    pidlChild, pidlParent;
         HRESULT         hr=E_FAIL;
-        
+
         TRACE_(shell)("pidl=%p\n", pidl);
         pdump(pidl);
-        
+
         *ppv = NULL;
         if (ppidlLast) *ppidlLast = NULL;
@@ -1139 +1139 @@
         {
           /* we are on desktop level */
-          if (ppidlLast) 
+          if (ppidlLast)
             *ppidlLast = ILClone(pidl);
           hr = SHGetDesktopFolder((IShellFolder**)ppv);
@@ -1192 +1192 @@
  *  _ILCreateMyComputer()
  *  _ILCreateDrive()
- *  _ILCreateFolder() 
+ *  _ILCreateFolder()
  *  _ILCreateValue()
  */
@@ -1245 +1245 @@
         ULONG   len, len1;
         LPITEMIDLIST pidl;
-        
+
         TRACE("(%s, %s)\n",stffile->cAlternateFileName, stffile->cFileName);
 
@@ -1265 +1265 @@
 
         pidl = _ILCreate(PT_FOLDER, (LPVOID)buff, len + len1);
-        
+
         /* set attributes */
         if (pidl)
@@ -1285 +1285 @@
         ULONG   len, len1;
         LPITEMIDLIST pidl;
-        
+
         TRACE("(%s, %s)\n",stffile->cAlternateFileName, stffile->cFileName);
 
@@ -1305 +1305 @@
 
         pidl = _ILCreate(PT_VALUE, (LPVOID)buff, len + len1);
-        
+
         /* set attributes */
         if (pidl)
@@ -1344 +1344 @@
         UINT           uSize = 0;
         LPSTR   pszDest;
-        
+
         TRACE("(0x%02x %p %i)\n",type,pIn,uInSize);
 
@@ -1360 +1360 @@
             break;
           case PT_FOLDER:
-          case PT_VALUE:   
+          case PT_VALUE:
             uSize = 2 + 12 + uInSize;
             break;
           default:
-            FIXME("can't create type: 0x%08x\n",type); 
+            FIXME("can't create type: 0x%08x\n",type);
             return NULL;
         }
@@ -1395 +1395 @@
 
           case PT_FOLDER:
-          case PT_VALUE:   
+          case PT_VALUE:
             pData =_ILGetDataPointer(pidlOut);
             pData->type = type;
@@ -1403 +1403 @@
             break;
         }
-        
+
         pidlTemp = ODIN_ILGETNEXT(pidlOut);
         if (pidlTemp)
@@ -1465 +1465 @@
         LPPIDLDATA lpPData = _ILGetDataPointer(pidl);
         TRACE("(%p)\n",pidl);
-        return (pidl && ( (lpPData && (PT_MYCOMP== lpPData->type || PT_SPECIAL== lpPData->type)) || 
+        return (pidl && ( (lpPData && (PT_MYCOMP== lpPData->type || PT_SPECIAL== lpPData->type)) ||
                           (pidl && pidl->mkid.cb == 0x00)
                         ));
@@ -1524 +1524 @@
 DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
 {
-        DWORD           dwReturn=0; 
+        DWORD           dwReturn=0;
         LPSTR           szSrc;
         GUID const *    riid;
         char szTemp[MAX_PATH];
-        
+
         TRACE("(%p %p %x)\n",pidl,szOut,uOutSize);
-        
+
         if (!pidl) return 0;
 
@@ -1536 +1536 @@
           *szOut = 0;
 
-        if (_ILIsDesktop(pidl))                                 
+        if (_ILIsDesktop(pidl))
         {
          /* desktop */
@@ -1588 +1588 @@
   LPSTR lpText1;
   LPSTR lpText2;
-  
+
   char szTemp1[MAX_PATH];
   char szTemp2[MAX_PATH];
   GUID const *  riid;
-  
+
 
   if (!pidl1 && !pidl2)
     return 0;
-  
+
   if (!pidl1 && pidl2)
     return -1;
-  
+
   if (pidl1 && !pidl2)
     return 1;
-  
-  
+
+
   // -------------
   // examine pidl1
@@ -1626 +1626 @@
       else
         lpText1 = "undetermined";
-  
+
   // -------------
   // examine pidl2
@@ -1649 +1649 @@
       else
         lpText2 = "undetermined";
-  
-  
+
+
   // now finally compare the texts
   return strcasecmp(lpText1, lpText2);
@@ -1770 +1770 @@
  *
  * NOTES
- *     
+ *
  */
 BOOL _ILGetFileDateTime(LPCITEMIDLIST pidl, FILETIME *pFt)
@@ -1779 +1779 @@
 
     switch (pdata->type)
-    { 
+    {
         case PT_FOLDER:
             DosDateTimeToFileTime(pdata->u.folder.uFileDate, pdata->u.folder.uFileTime, pFt);
-            break;          
+            break;
         case PT_VALUE:
             DosDateTimeToFileTime(pdata->u.file.uFileDate, pdata->u.file.uFileTime, pFt);
@@ -1793 +1793 @@
 
 BOOL _ILGetFileDate (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
-{       
+{
         FILETIME ft,lft;
         SYSTEMTIME time;
 
         if (! _ILGetFileDateTime( pidl, &ft )) return FALSE;
-        
+
         FileTimeToLocalFileTime(&ft, &lft);
         FileTimeToSystemTime (&lft, &time);
@@ -1819 +1819 @@
  * NOTES
  *      pOut can be null when no string is needed
- *     
+ *
  */
 DWORD _ILGetFileSize (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
@@ -1825 +1825 @@
         LPPIDLDATA pdata =_ILGetDataPointer(pidl);
         DWORD dwSize;
-        
+
         if(! pdata) return 0;
 
@@ -1844 +1844 @@
         const char * pPoint;
         LPITEMIDLIST  pidlTemp=pidl;
-        
+
         TRACE("pidl=%p\n",pidl);
 
         if (!pidl) return FALSE;
-        
+
         pidlTemp = ILFindLastID(pidl);
-        
+
         if (!_ILIsValue(pidlTemp)) return FALSE;
         if (!_ILSimpleGetText(pidlTemp, szTemp, MAX_PATH)) return FALSE;
@@ -1879 +1879 @@
  *
  * NOTES
- *      This function copies as much as possible into the buffer. 
+ *      This function copies as much as possible into the buffer.
  */
 void _ILGetFileType(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
@@ -1885 +1885 @@
         if(_ILIsValue(pidl))
         {
-          char sTemp[64];
-          if(uOutSize > 0)
-          {
-            pOut[0] = 0;
-          }
-          if (_ILGetExtension (pidl, sTemp, 64))
-          {
-            if (!( HCR_MapTypeToValue(sTemp, sTemp, 64, TRUE)
-                && HCR_MapTypeToValue(sTemp, pOut, uOutSize, FALSE )))
-            {
-              lstrcpynA (pOut, sTemp, uOutSize - 6);
-              strcat (pOut, "-file");
-            }
-          }
+                char sTemp[64];
+                if(uOutSize > 0)
+                {
+                        pOut[0] = 0;
+                }
+                if (_ILGetExtension (pidl, sTemp, 64))
+                {
+                        if (!( HCR_MapTypeToValue(sTemp, sTemp, 64, TRUE)
+                                   && HCR_MapTypeToValue(sTemp, pOut, uOutSize, FALSE )))
+                        {
+                                lstrcpynA (pOut, sTemp, uOutSize - 6);
+                                strupr (pOut);
+                                strcat (pOut, " File");
+                        }
+                }
         }
         else
         {
-          lstrcpynA(pOut, "Folder", uOutSize);
+                LPPIDLDATA pdata =_ILGetDataPointer(pidl);
+
+                if (pdata)
+                {
+                        switch (pdata->type)
+                        {
+                                case PT_DRIVE:
+                                case PT_DRIVE1:
+                                case PT_DRIVE2:
+                                case PT_DRIVE3:
+                                {
+                                        UINT type =
+                                                GetDriveTypeA((LPSTR)&(pdata->u.drive.szDriveName));
+                                                GetDriveTypeA(_ILGetTextPointer(pidl));
+                                        switch (type)
+                                        {
+                                                case DRIVE_REMOVABLE:
+                                                        lstrcpynA(pOut, "Removable Disk", uOutSize); return;
+                                                case DRIVE_FIXED:
+                                                        lstrcpynA(pOut, "Local Disk", uOutSize); return;
+                                                case DRIVE_REMOTE:
+                                                        lstrcpynA(pOut, "Network Drive", uOutSize); return;
+                                                case DRIVE_CDROM:
+                                                        lstrcpynA(pOut, "CD Disk", uOutSize); return;
+                                                default:
+                                                        break;
+                                        }
+                                }
+                                default:
+                                        break;
+                        }
+                }
+
+                lstrcpynA(pOut, "File Folder", uOutSize);
         }
 }
@@ -1921 +1955 @@
  * FIXME
  *  return value 0 in case of error is a valid return value
- *     
+ *
  */
 DWORD _ILGetFileAttributes(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
@@ -1940 +1974 @@
             break;
         }
-        
+
         if(uOutSize >= 6)
         {

trunk/src/shell32/shell32_main.c

@@ -202 +202 @@
             {
                 lstrcpynA (psfi->szTypeName, sTemp, 80 - 6);
-                strcat (psfi->szTypeName, "-file");
+                strupr (pOut);
+                strcat (psfi->szTypeName, " File");
             }
         }