Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 20:18:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Fix SHFileOperation Move operation (#1487)

Browse source 
Reduce failures of Move operation of shell32!SHFileOperation function. CORE-13450
This commit is contained in:
Katayama Hirofumi MZ 2019-04-08 21:59:33 +09:00 committed by GitHub
parent 5f4cf8a716
commit c65156002c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dll/win32/shell32/shlfileop.cpp
View file

@ -5,6 +5,7 @@
* Copyright 2002 Andriy Palamarchuk * Copyright 2002 Andriy Palamarchuk
* Copyright 2004 Dietrich Teickner (from Odin) * Copyright 2004 Dietrich Teickner (from Odin)
* Copyright 2004 Rolf Kalbermatter * Copyright 2004 Rolf Kalbermatter
* Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -1064,11 +1065,15 @@ static void add_file_to_entry(FILE_ENTRY *feFile, LPCWSTR szFile)
{ {
DWORD dwLen = lstrlenW(szFile) + 1; DWORD dwLen = lstrlenW(szFile) + 1;
LPCWSTR ptr; LPCWSTR ptr;
LPCWSTR ptr2;
feFile->szFullPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); feFile->szFullPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR));
lstrcpyW(feFile->szFullPath, szFile); lstrcpyW(feFile->szFullPath, szFile);
ptr = StrRChrW(szFile, NULL, '\\'); ptr = StrRChrW(szFile, NULL, '\\');
ptr2 = StrRChrW(szFile, NULL, '/');
if (!ptr || ptr < ptr2)
ptr = ptr2;
if (ptr) if (ptr)
{ {
dwLen = ptr - szFile + 1; dwLen = ptr - szFile + 1;
@ -1085,10 +1090,14 @@ static void add_file_to_entry(FILE_ENTRY *feFile, LPCWSTR szFile)
static LPWSTR wildcard_to_file(LPCWSTR szWildCard, LPCWSTR szFileName) static LPWSTR wildcard_to_file(LPCWSTR szWildCard, LPCWSTR szFileName)
{ {
LPCWSTR ptr; LPCWSTR ptr;
LPCWSTR ptr2;
LPWSTR szFullPath; LPWSTR szFullPath;
DWORD dwDirLen, dwFullLen; DWORD dwDirLen, dwFullLen;
ptr = StrRChrW(szWildCard, NULL, '\\'); ptr = StrRChrW(szWildCard, NULL, '\\');
ptr2 = StrRChrW(szWildCard, NULL, '/');
if (!ptr || ptr < ptr2)
ptr = ptr2;
dwDirLen = ptr - szWildCard + 1; dwDirLen = ptr - szWildCard + 1;
dwFullLen = dwDirLen + lstrlenW(szFileName) + 1; dwFullLen = dwDirLen + lstrlenW(szFileName) + 1;
@ -1630,6 +1639,9 @@ static void move_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST
destroy_file_list(&flFromNew); destroy_file_list(&flFromNew);
destroy_file_list(&flToNew); destroy_file_list(&flToNew);
if (PathIsDirectoryEmptyW(feFrom->szFullPath))
Win32RemoveDirectoryW(feFrom->szFullPath);
} }
/* moves a file or directory to another directory */ /* moves a file or directory to another directory */
@ -1668,7 +1680,8 @@ static DWORD move_files(FILE_OPERATION *op, BOOL multiDest, const FILE_LIST *flF
if (!(multiDest) && if (!(multiDest) &&
!flFrom->bAnyDirectories && !flFrom->bAnyDirectories &&
flFrom->dwNumFiles > flTo->dwNumFiles) flFrom->dwNumFiles > flTo->dwNumFiles &&
!(flTo->bAnyDirectories && flTo->dwNumFiles == 1))
{ {
return ERROR_CANCELLED; return ERROR_CANCELLED;
} }
@ -1779,6 +1792,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
if (FAILED(ret)) if (FAILED(ret))
return ret; return ret;
lpFileOp->fAnyOperationsAborted = FALSE;
check_flags(lpFileOp->fFlags); check_flags(lpFileOp->fFlags);
ZeroMemory(&flFrom, sizeof(FILE_LIST)); ZeroMemory(&flFrom, sizeof(FILE_LIST));