Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-26 01:29:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Fix hung-up of shell32:shlfileop (#2136)

Browse source 
#2085 caused some failures and hung-up in shell32:shlfileop testcase. This PR will fix it.
CORE-16546
This commit is contained in:
Katayama Hirofumi MZ 2019-12-08 07:58:14 +09:00 • committed by GitHub
parent bd149e8a11
commit 257e7307b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1811,6 +1811,18 @@ static void check_flags(FILEOP_FLAGS fFlags)
} }
#ifdef __REACTOS__ #ifdef __REACTOS__
/* Error codes could be pre-Win32 */
#define DE_SAMEFILE 0x71
#define DE_MANYSRC1DEST 0x72
#define DE_DIFFDIR 0x73
#define DE_OPCANCELLED 0x75
#define DE_DESTSUBTREE 0x76
#define DE_INVALIDFILES 0x7C
#define DE_DESTSAMETREE 0x7D
#define DE_FLDDESTISFILE 0x7E
#define DE_FILEDESTISFLD 0x80
static DWORD static DWORD
validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo) validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo)
{ {
@ -1821,7 +1833,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT
UINT wFunc = lpFileOp->wFunc; UINT wFunc = lpFileOp->wFunc;
HWND hwnd = lpFileOp->hwnd; HWND hwnd = lpFileOp->hwnd;
dwNumDest = ((lpFileOp->fFlags & FOF_MULTIDESTFILES) ? flTo->dwNumFiles : 1); dwNumDest = flTo->dwNumFiles;
if (wFunc != FO_COPY && wFunc != FO_MOVE) if (wFunc != FO_COPY && wFunc != FO_MOVE)
return ERROR_SUCCESS; return ERROR_SUCCESS;
@ -1844,7 +1856,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT
if (lstrcmpiW(szFrom, szTo) == 0 && if (lstrcmpiW(szFrom, szTo) == 0 &&
(wFunc == FO_MOVE || !(lpFileOp->fFlags & FOF_RENAMEONCOLLISION))) (wFunc == FO_MOVE || !(lpFileOp->fFlags & FOF_RENAMEONCOLLISION)))
{ {
if (!(lpFileOp->fFlags & FOF_SILENT)) if (!(lpFileOp->fFlags & (FOF_NOERRORUI | FOF_SILENT)))
{ {
if (wFunc == FO_MOVE) if (wFunc == FO_MOVE)
{ {
@ -1861,7 +1873,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT
MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR);
} }
} }
return ERROR_SHARING_VIOLATION; return DE_OPCANCELLED;
} }
// subfolder? // subfolder?
@ -1878,7 +1890,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT
if (compare == 0) if (compare == 0)
{ {
if (!(lpFileOp->fFlags & FOF_SILENT)) if (!(lpFileOp->fFlags & (FOF_NOERRORUI | FOF_SILENT)))
{ {
if (wFunc == FO_MOVE) if (wFunc == FO_MOVE)
{ {
@ -1895,7 +1907,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT
MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR);
} }
} }
return ERROR_SHARING_VIOLATION; return ERROR_SUCCESS;
} }
} }
} }