Changeset 5544 for trunk/src

Timestamp:

Apr 19, 2001, 10:32:19 AM (24 years ago)

Author:

sandervl

Message:

update with latest wine

Location:

trunk/src/shell32

Files:

• shell32_main.h (modified) (2 diffs)
• shellstub.cpp (modified) (2 diffs)
• shlfileop.c (modified) (6 diffs)
• shres.orc (modified) (2 diffs)
• shresdef.h (modified) (2 diffs)

trunk/src/shell32/shell32_main.h

@@ -1 @@
-/* $Id: shell32_main.h,v 1.6 2000-08-30 13:50:57 sandervl Exp $ */
+/* $Id: shell32_main.h,v 1.7 2001-04-19 08:32:18 sandervl Exp $ */
 /*
  *      internal Shell32 Library definitions
@@ -180 +180 @@
 
 /* file operation */
+#define ASK_DELETE_FILE          1
+#define ASK_DELETE_FOLDER        2
+#define ASK_DELETE_MULTIPLE_ITEM 3
+
 BOOL SHELL_DeleteDirectoryA(LPCSTR pszDir, BOOL bShowUI);
+BOOL SHELL_DeleteFileA(LPCSTR pszFile, BOOL bShowUI);
+BOOL SHELL_WarnItemDelete(int nKindOfDialog, LPCSTR szDir);
 
 #ifdef __WIN32OS2__

trunk/src/shell32/shellstub.cpp

@@ -1 @@
-/* $Id: shellstub.cpp,v 1.1 2000-05-18 18:06:59 sandervl Exp $ */
+/* $Id: shellstub.cpp,v 1.2 2001-04-19 08:32:18 sandervl Exp $ */
 
 /*
@@ -112 +112 @@
 }
 
-ODINFUNCTION1(DWORD, IsNetDrive, DWORD, x1)
-{
-  dprintf(("STUB!"));
-  return 0;
-}
 
 ODINFUNCTION1(DWORD, SHGlobalDefect, DWORD, x1)

trunk/src/shell32/shlfileop.c

@@ -1 @@
-/* $Id: shlfileop.c,v 1.1 2000-08-30 13:52:57 sandervl Exp $ */
 /*
  * SHFileOperation
@@ -10 +9 @@
 #include "debugtools.h"
 #include "shellapi.h"
-#include "shell32_main.h"
+#include "shlwapi.h"
 
 #include "shlobj.h"
 #include "shresdef.h"
+#include "shell32_main.h"
 #include "wine/undocshell.h"
+#include "shlwapi.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
-#define ASK_DELETE_FILE 1
-#define ASK_DELETE_FOLDER 2
-#define ASK_DELETE_MULTIPLE_FILE 3
-
-static BOOL SHELL_WarnFolderDelete (int nKindOfDialog, LPCSTR szDir)
+BOOL SHELL_WarnItemDelete (int nKindOfDialog, LPCSTR szDir)
 {
         char szCaption[255], szText[255], szBuffer[MAX_PATH + 256];
 
-        LoadStringA(shell32_hInstance, IDS_DELETEFOLDER_TEXT, szText, sizeof(szText));
-        LoadStringA(shell32_hInstance, IDS_DELETEFOLDER_CAPTION, szCaption, sizeof(szCaption));
+        if(nKindOfDialog == ASK_DELETE_FILE)
+        {
+          LoadStringA(shell32_hInstance, IDS_DELETEITEM_TEXT, szText, 
+                sizeof(szText));
+          LoadStringA(shell32_hInstance, IDS_DELETEITEM_CAPTION, 
+                szCaption, sizeof(szCaption));
+        }
+        else if(nKindOfDialog == ASK_DELETE_FOLDER)
+        {
+          LoadStringA(shell32_hInstance, IDS_DELETEITEM_TEXT, szText, 
+                sizeof(szText));
+          LoadStringA(shell32_hInstance, IDS_DELETEFOLDER_CAPTION, 
+                szCaption, sizeof(szCaption));
+        }
+        else if(nKindOfDialog == ASK_DELETE_MULTIPLE_ITEM)
+        {
+          LoadStringA(shell32_hInstance, IDS_DELETEMULTIPLE_TEXT, szText, 
+                sizeof(szText));
+          LoadStringA(shell32_hInstance, IDS_DELETEITEM_CAPTION, 
+                szCaption, sizeof(szCaption));
+        }
+        else {
+          FIXME("Called without a valid nKindOfDialog specified!");
+          LoadStringA(shell32_hInstance, IDS_DELETEITEM_TEXT, szText, 
+                sizeof(szText));
+          LoadStringA(shell32_hInstance, IDS_DELETEITEM_CAPTION, 
+                szCaption, sizeof(szCaption));
+        }          
+
         FormatMessageA(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
-            szText, 0, 0, szBuffer, sizeof(szBuffer), (DWORD*)&szDir);
+            szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)&szDir);
 
         return (IDOK == MessageBoxA(GetActiveWindow(), szBuffer, szCaption, MB_OKCANCEL | MB_ICONEXCLAMATION));
@@ -51 +75 @@
         strcat(szTemp, "*.*");
         
-        if (bShowUI && !SHELL_WarnFolderDelete(ASK_DELETE_FOLDER, pszDir)) return FALSE;
+        if (bShowUI && !SHELL_WarnItemDelete(ASK_DELETE_FOLDER, pszDir))
+          return FALSE;
         
         if(INVALID_HANDLE_VALUE != (hFind = FindFirstFileA(szTemp, &wfd)))
@@ -77 +102 @@
 }
 
+/**************************************************************************
+ *      SHELL_DeleteFileA()
+ */
+
+BOOL SHELL_DeleteFileA(LPCSTR pszFile, BOOL bShowUI)
+{
+        if (bShowUI && !SHELL_WarnItemDelete(ASK_DELETE_FILE, pszFile))
+                return FALSE;
+ 
+        return DeleteFileA(pszFile);
+}
+
 /*************************************************************************
  * SHCreateDirectory                            [SHELL32.165]
@@ -123 +160 @@
 DWORD WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp)   
 {
-        FIXME("(%p):stub.\n", lpFileOp);
+        LPSTR pFrom = (LPSTR)lpFileOp->pFrom;
+        LPSTR pTo = (LPSTR)lpFileOp->pTo;
+        LPSTR pTempTo;
+        
+        switch(lpFileOp->wFunc) {
+        case FO_COPY:
+                TRACE("File Copy:\n");
+                while(1) {
+                        if(!pFrom[0]) break;
+                        if(!pTo[0]) break;
+                        TRACE("   From='%s' To='%s'\n", pFrom, pTo);
+
+                        pTempTo = HeapAlloc(GetProcessHeap(), 0, strlen(pTo)+1);
+                        if (pTempTo)
+                        {
+                            strcpy( pTempTo, pTo );
+                            PathRemoveFileSpecA(pTempTo);
+                            TRACE("   Creating Directory '%s'\n", pTempTo);
+                            SHCreateDirectory(NULL,pTempTo);
+                            HeapFree(GetProcessHeap(), 0, pTempTo);
+                        }
+                        CopyFileA(pFrom, pTo, FALSE);
+
+                        pFrom += strlen(pFrom) + 1;
+                        pTo += strlen(pTo) + 1;
+                }
+                TRACE("Setting AnyOpsAborted=FALSE\n");
+                lpFileOp->fAnyOperationsAborted=FALSE;
+                return 0;
+
+        case FO_DELETE:
+                TRACE("File Delete:\n");
+                while(1) {
+                        if(!pFrom[0]) break;
+                        TRACE("   File='%s'\n", pFrom);
+                        DeleteFileA(pFrom);
+                        pFrom += strlen(pFrom) + 1;
+                }
+                TRACE("Setting AnyOpsAborted=FALSE\n");
+                lpFileOp->fAnyOperationsAborted=FALSE;
+                return 0;
+
+        default:
+                FIXME("Unhandled shell file operation %d\n", lpFileOp->wFunc);
+        }
+
         return 1;
 }
@@ -168 +250 @@
 }
 
+/*************************************************************************
+ * IsNetDrive                   [SHELL32.66]
+ */
+BOOL WINAPI IsNetDrive(DWORD drive)
+{
+        char root[4];
+        strcpy(root, "A:\\");
+        root[0] += drive;
+        return (GetDriveTypeA(root) == DRIVE_REMOTE);
+}

trunk/src/shell32/shres.orc

@@ -1 @@
-/* $Id: shres.orc,v 1.10 2000-11-28 11:00:47 sandervl Exp $ */
+/* $Id: shres.orc,v 1.11 2001-04-19 08:32:18 sandervl Exp $ */
 /*
  * Top level resource file for Common Dialogs
@@ -138 +138 @@
         IDS_CREATEFOLDER_DENIED "Can not create new Folder: Permission denied."
         IDS_CREATEFOLDER_CAPTION "Error during creating a new folder"
-        IDS_DELETEFOLDER_TEXT "Are you sure you want to delete %1 and all it's subfolders?"
-        IDS_DELETEFOLDER_CAPTION "Confirm file delete"
+        IDS_DELETEITEM_CAPTION "Confirm file delete"
+        IDS_DELETEFOLDER_CAPTION "Confirm folder delete"
+        IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
+        IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
 }
 

trunk/src/shell32/shresdef.h

@@ -1 @@
-/* $Id: shresdef.h,v 1.7 2000-08-30 13:51:09 sandervl Exp $ */
+/* $Id: shresdef.h,v 1.8 2001-04-19 08:32:19 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 #define IDS_CREATEFOLDER_DENIED 30
 #define IDS_CREATEFOLDER_CAPTION 31
-#define IDS_DELETEFOLDER_TEXT   32
+#define IDS_DELETEITEM_CAPTION  32
 #define IDS_DELETEFOLDER_CAPTION 33
+#define IDS_DELETEITEM_TEXT     34
+#define IDS_DELETEMULTIPLE_TEXT 35
 
 #define IDS_SHV_INVALID_FILENAME_TITLE 28