From cce9b8224b8d0d6a69e0990a0e48e9ce6b0a7bea Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 22 Aug 2011 16:32:16 +0000 Subject: [PATCH] [SHELL32] Claudiu Mihail: * Return ERROR_FILE_NOT_FOUND when a file isn't found. Similar to r53373. svn path=/branches/shell32_new-bringup/; revision=53378 --- dll/win32/shell32/shlfileop.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 8e69fdb0995..d0d6014bbf5 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1130,8 +1130,12 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) add_file_to_entry(file, szCurFile); file->attributes = GetFileAttributesW( file->szFullPath ); file->bExists = (file->attributes != INVALID_FILE_ATTRIBUTES); - if (!file->bExists) flList->bAnyDontExist = TRUE; - if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE; + + if (!file->bExists) + flList->bAnyDontExist = TRUE; + + if (IsAttribDir(file->attributes)) + flList->bAnyDirectories = TRUE; } /* advance to the next string */ @@ -1457,7 +1461,7 @@ static HRESULT delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); if (!bPathExists) - return ERROR_PATH_NOT_FOUND; + return ERROR_FILE_NOT_FOUND; } return ERROR_SUCCESS;