Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Improve error message on copying files (#6290)

Browse source 
Based on KRosUser's copyerrorfix.patch.
JIRA issue: CORE-19414
- If feFrom->szFilename was empty,
  then use feFrom->szFullPath instead.
This commit is contained in:
Katayama Hirofumi MZ 2024-01-12 16:01:21 +09:00 committed by GitHub
parent f51258ae51
commit 4490a053d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1883,6 +1883,8 @@ static void check_flags(FILEOP_FLAGS fFlags)
FIXME("Unsupported flags: %04x\n", fFlags); FIXME("Unsupported flags: %04x\n", fFlags);
} }
#define GET_FILENAME(fe) ((fe)->szFilename[0] ? (fe)->szFilename : (fe)->szFullPath)
static DWORD static DWORD
validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo) validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo)
{ {
@ -1922,14 +1924,14 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT
{ {
strTitle.LoadStringW(IDS_MOVEERRORTITLE); strTitle.LoadStringW(IDS_MOVEERRORTITLE);
if (IsAttribDir(feFrom->attributes)) if (IsAttribDir(feFrom->attributes))
strText.Format(IDS_MOVEERRORSAMEFOLDER, feFrom->szFilename); strText.Format(IDS_MOVEERRORSAMEFOLDER, GET_FILENAME(feFrom));
else else
strText.Format(IDS_MOVEERRORSAME, feFrom->szFilename); strText.Format(IDS_MOVEERRORSAME, GET_FILENAME(feFrom));
} }
else else
{ {
strTitle.LoadStringW(IDS_COPYERRORTITLE); strTitle.LoadStringW(IDS_COPYERRORTITLE);
strText.Format(IDS_COPYERRORSAME, feFrom->szFilename); strText.Format(IDS_COPYERRORSAME, GET_FILENAME(feFrom));
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR); MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR);
@ -1957,12 +1959,12 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT
if (wFunc == FO_MOVE) if (wFunc == FO_MOVE)
{ {
strTitle.LoadStringW(IDS_MOVEERRORTITLE); strTitle.LoadStringW(IDS_MOVEERRORTITLE);
strText.Format(IDS_MOVEERRORSUBFOLDER, feFrom->szFilename); strText.Format(IDS_MOVEERRORSUBFOLDER, GET_FILENAME(feFrom));
} }
else else
{ {
strTitle.LoadStringW(IDS_COPYERRORTITLE); strTitle.LoadStringW(IDS_COPYERRORTITLE);
strText.Format(IDS_COPYERRORSUBFOLDER, feFrom->szFilename); strText.Format(IDS_COPYERRORSUBFOLDER, GET_FILENAME(feFrom));
} }
MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR); MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR);
return DE_DESTSUBTREE; return DE_DESTSUBTREE;