Changeset 918 for trunk/src/shell32/new/pidl.cpp

Timestamp:

Sep 13, 1999, 2:36:35 PM (26 years ago)

Author:

phaller

Message:

Fix: updated to current wine 19990913

File:

• trunk/src/shell32/new/pidl.cpp (modified) (3 diffs)

trunk/src/shell32/new/pidl.cpp

@@ -142 +142 @@
 }
 
-
 /*************************************************************************
  * ILGetDisplayName                     [SHELL32.15]
@@ -852 +851 @@
                HANDLE   handle;
 
-               if ( len < sizeof (WIN32_FIND_DATAA))
+               if ( len < sizeof (WIN32_FIND_DATAA)) {
+                 ERR_(shell)("%d does not find sizeof(finddata)\n",len);
                  return E_INVALIDARG;
+               }
 
                SHGetPathFromIDListA(pidl, pszPath);
@@ -879 +880 @@
 HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)
 {
-        FIXME_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
-
+        if (! psf || !dest )  return E_INVALIDARG;
+
+        switch (nFormat)
+        {
+          case SHGDFIL_FINDDATA:
+            {
+               WIN32_FIND_DATAW * pfd = (WIN32_FIND_DATAW*)dest;
+               WCHAR    pszPath[MAX_PATH];
+               HANDLE   handle;
+
+               if ( len < sizeof (WIN32_FIND_DATAW)) {
+                 ERR_(shell)("%d does not find sizeof(finddata)\n",len);
+                 return E_INVALIDARG;
+               }
+               SHGetPathFromIDListW(pidl, pszPath);
+               if ((handle  = FindFirstFileW ( pszPath, pfd)))
+                 FindClose (handle);
+            }
+            return NOERROR;
+          default: /* fallthrough */
+            break;
+        }
+        FIXME_(shell)("(sf=%p pidl=%p nFormat=0x%04x %p 0x%04x), unhandled.\n",psf,pidl,nFormat,dest,len);
         return SHGetDataFromIDListA( psf, pidl, nFormat, dest, len);
 }