Changeset 10185 for trunk/src/shell32

Timestamp:

Jul 28, 2003, 1:35:32 PM (22 years ago)

Author:

sandervl

Message:

Updates

Location:

trunk/src/shell32

Files:

• enumidlist.c (modified) (3 diffs)
• shlfolder.c (modified) (4 diffs)

trunk/src/shell32/enumidlist.c

@@ -1 @@
-/* $Id: enumidlist.c,v 1.6 2002-08-22 14:20:44 sandervl Exp $ */
+/* $Id: enumidlist.c,v 1.7 2003-07-28 11:28:56 sandervl Exp $ */
 /*
  *      IEnumIDList
@@ -202 +202 @@
               for (x = 0;x < count;x++)
               {
+                if ( !(dwFlags & SHCONTF_INCLUDEHIDDEN) && (stffile[x].dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ) continue;
+
                 if (stffile[x].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
                 { //directory
@@ -247 +249 @@
               for (x = 0;x < count;x++)
               {
+                if ( !(dwFlags & SHCONTF_INCLUDEHIDDEN) && (stffile[x].dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ) continue;
+
                 if (! (stffile[x].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
                 {

trunk/src/shell32/shlfolder.c

@@ -235 +235 @@
  * This functions does not set flags!! It only resets flags when nessesary.
  */
+#include <dbglog.h>
 static HRESULT SHELL32_GetItemAttributes(
         IShellFolder * psf,
@@ -240 +241 @@
         LPDWORD pdwAttributes)
 {
+#if 1
+    GUID const *clsid;
+    DWORD dwAttributes;
+    DWORD dwSupportedAttr=SFGAO_CANCOPY |           /*0x00000001 */
+                          SFGAO_CANMOVE |           /*0x00000002 */
+                          SFGAO_CANLINK |           /*0x00000004 */
+                          SFGAO_CANRENAME |         /*0x00000010 */
+                          SFGAO_CANDELETE |         /*0x00000020 */
+                          SFGAO_HASPROPSHEET |      /*0x00000040 */
+                          SFGAO_DROPTARGET |        /*0x00000100 */
+                          SFGAO_READONLY |          /*0x00040000 */
+                          SFGAO_HIDDEN |            /*0x00080000 */
+                          SFGAO_FILESYSANCESTOR |   /*0x10000000 */
+                          SFGAO_FOLDER |            /*0x20000000 */
+                          SFGAO_FILESYSTEM |        /*0x40000000 */
+                          SFGAO_HASSUBFOLDER;       /*0x80000000 */
+    
+    TRACE ("0x%08lx\n", *pdwAttributes);
+
+    dprintf(("_ILGetTextPointer returned %s", _ILGetTextPointer(pidl)));
+
+    if (*pdwAttributes & ~dwSupportedAttr)
+    {
+        WARN ("attributes 0x%08lx not implemented\n", (*pdwAttributes & ~dwSupportedAttr));
+        *pdwAttributes &= dwSupportedAttr;
+    }
+
+    if (_ILIsDrive (pidl)) {
+        *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK;
+    } else if ((clsid = _ILGetGUIDPointer (pidl))) {
+        if (HCR_GetFolderAttributes (clsid, &dwAttributes)) {
+            *pdwAttributes &= dwAttributes;
+        } else {
+            *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK;
+        }
+    } else if (_ILGetDataPointer (pidl)) {
+        dwAttributes = _ILGetFileAttributes (pidl, NULL, 0);
+        *pdwAttributes &= ~SFGAO_FILESYSANCESTOR;
+
+        if (((SFGAO_FOLDER|SFGAO_HASSUBFOLDER) & *pdwAttributes) && !(dwAttributes & FILE_ATTRIBUTE_DIRECTORY))
+            *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER);
+
+        if ((SFGAO_HIDDEN & *pdwAttributes) && !(dwAttributes & FILE_ATTRIBUTE_HIDDEN))
+            *pdwAttributes &= ~SFGAO_HIDDEN;
+
+        if ((SFGAO_READONLY & *pdwAttributes) && !(dwAttributes & FILE_ATTRIBUTE_READONLY))
+            *pdwAttributes &= ~SFGAO_READONLY;
+    } else {
+        *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK;
+    }
+    TRACE ("-- 0x%08lx\n", *pdwAttributes);
+    return S_OK;
+#else
         GUID const * clsid;
         DWORD dwAttributes;
@@ -284 +338 @@
         TRACE("-- 0x%08lx\n", *pdwAttributes);
         return S_OK;
+#endif
 }
 
@@ -1809 +1864 @@
              if (!SUCCEEDED(SHELL32_CoCreateInitSF (This->absPidl, pidl, clsid, riid, (LPVOID*)&pShellFolder)))
              {
+#ifdef __WIN32OS2__
+               //SvL: no implementation present, so just copy 'my computer'
+               if ( IsEqualIID(clsid, &CLSID_NetworkPlaces)) {
+                    pShellFolder = ISF_MyComputer_Constructor();
+               }
+#else
                return E_INVALIDARG;
+#endif
              }
           }