Changeset 5618 for trunk/src/shell32/shlfolder.c

Timestamp:

Apr 28, 2001, 3:33:49 PM (25 years ago)

Author:

sandervl

Message:

resync with latest wine

File:

• trunk/src/shell32/shlfolder.c (modified) (15 diffs)

trunk/src/shell32/shlfolder.c

@@ -1 @@
-/* $Id: shlfolder.c,v 1.1 2000-08-30 13:52:57 sandervl Exp $ */
 /*
  *      Shell Folder stuff
@@ -10 +9 @@
  */
 #ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
+#define WINE_LARGE_INTEGER
+#define snprintf(a,b,c,d)       sprintf(a,c,d)
 #endif
-
 #include <stdlib.h>
 #include <string.h>
@@ -20 +18 @@
 #include "debugtools.h"
 #include "winerror.h"
+#include "winbase.h"
 
 #include "oleidl.h"
@@ -32 +31 @@
 #include "shresdef.h"
 #include "shlwapi.h"
-
-#define INITGUID
-#include "initguid.h"
 #include "shellfolder.h"
 
-
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 
@@ -347 +342 @@
 
 /**************************************************************************
-*       we need a seperate IUnknown to handle aggregation
+*       we need a separate IUnknown to handle aggregation
 *       (inner IUnknown)
 */
@@ -616 +611 @@
 *
 * NOTES
-*  every folder trys to parse only it's own (the leftmost) pidl and creates a 
+*  every folder tries to parse only its own (the leftmost) pidl and creates a 
 *  subfolder to evaluate the remaining parts
 *  now we can parse into namespaces implemented by shell extensions
@@ -658 +653 @@
 
           /* build the full pathname to the element */
-          lstrcpynWtoA(szTempA, szElement, lstrlenW(szElement) + 1);
+          WideCharToMultiByte( CP_ACP, 0, szElement, -1, szTempA, MAX_PATH, NULL, NULL );
           strcpy(szPath, This->sMyPath);
           PathAddBackslashA(szPath);
@@ -691 +686 @@
         }
 
-        *ppidl = pidlTemp;
+        if (!hr)
+          *ppidl = pidlTemp;
+        else
+          *ppidl = NULL;
 
         TRACE("(%p)->(-- pidl=%p ret=0x%08lx)\n", This, ppidl? *ppidl:0, hr);
@@ -1188 +1186 @@
         PathAddBackslashA(szDest);
         len = strlen (szDest);
-        lstrcpynWtoA(szDest+len, lpName, MAX_PATH-len);
-        
+        WideCharToMultiByte( CP_ACP, 0, lpName, -1, szDest+len, MAX_PATH-len, NULL, NULL );
+        szDest[MAX_PATH-1] = 0;
         TRACE("src=%s dest=%s\n", szSrc, szDest);
         if ( MoveFileA(szSrc, szDest) )
@@ -1498 +1496 @@
         int i;
         char szPath[MAX_PATH];
+        BOOL bConfirm = TRUE;
 
         TRACE("(%p)(%u %p)\n", This, cidl, apidl);
         
+        /* deleting multiple items so give a slightly different warning */
+        if(cidl != 1)
+        {
+          char tmp[8]; 
+          snprintf(tmp, sizeof(tmp), "%d", cidl);
+          if(!SHELL_WarnItemDelete(ASK_DELETE_MULTIPLE_ITEM, tmp))
+            return E_FAIL;
+          bConfirm = FALSE;
+        }
+
         for(i=0; i< cidl; i++)
         {
@@ -1510 +1519 @@
           {
             LPITEMIDLIST pidl;
-
-            MESSAGE("delete %s\n", szPath);
-            if (! SHELL_DeleteDirectoryA(szPath, TRUE)) return E_FAIL;
+            TRACE("delete %s\n", szPath);
+            if (! SHELL_DeleteDirectoryA(szPath, bConfirm))
+            {
+              TRACE("delete %s failed, bConfirm=%d", szPath, bConfirm);
+              return E_FAIL;
+            }
             pidl = ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_RMDIR, SHCNF_IDLIST, pidl, NULL);
@@ -1521 +1533 @@
             LPITEMIDLIST pidl;
 
-            MESSAGE("delete %s\n", szPath);
-            if (! DeleteFileA(szPath)) return E_FAIL;
+            TRACE("delete %s\n", szPath);
+            if (! SHELL_DeleteFileA(szPath, bConfirm))
+            {
+              TRACE("delete %s failed, bConfirm=%d", szPath, bConfirm);
+              return E_FAIL;
+            }
             pidl = ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_DELETE, SHCNF_IDLIST, pidl, NULL);
@@ -2133 +2149 @@
         {
           szNext = GetNextElementW(lpszDisplayName, szElement, MAX_PATH);
-          lstrcpynWtoA(szTempA, szElement, lstrlenW(szElement) + 1);
+          WideCharToMultiByte( CP_ACP, 0, szElement, -1, szTempA, MAX_PATH, NULL, NULL );
           pidlTemp = _ILCreateDrive(szTempA);
 
@@ -2498 +2514 @@
                 _ILSimpleGetText(pidl, szPath, MAX_PATH);
                 GetDiskFreeSpaceExA(szPath, NULL, &ulBytes, NULL);
-#ifdef __WIN32OS2__
-                StrFormatByteSizeA(ulBytes.LowPart, psd->str.u.cStr, MAX_PATH);
-#else
                 StrFormatByteSizeA(ulBytes.s.LowPart, psd->str.u.cStr, MAX_PATH);
-#endif
               }
               break;
@@ -2510 +2522 @@
                 _ILSimpleGetText(pidl, szPath, MAX_PATH);
                 GetDiskFreeSpaceExA(szPath, &ulBytes, NULL, NULL);
-#ifdef __WIN32OS2__
-                StrFormatByteSizeA(ulBytes.LowPart, psd->str.u.cStr, MAX_PATH);
-#else
                 StrFormatByteSizeA(ulBytes.s.LowPart, psd->str.u.cStr, MAX_PATH);
-#endif
               }
               break;