From: "Olivier F. R. Dierick" Subject: shell32: Set last error explicitly in SHFileOperation() Message-Id: <1461420219.8506.15.camel@piezo3.piezo-forte.be> Date: Sat, 23 Apr 2016 16:03:39 +0200 See bug 36838 for comments and discussion. The patch set last error explicitly in SHFileOperationW(). SHFileOperationA() calls SHFileOperationW() internally. Last error is left untouched in cases that are not covered by tests. Signed-off-by: Olivier F. R. Dierick --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Olivier F. R. Dierick o.dierick@piezo-forte.be From 35db652e5f925887949b8fbc470b0a0bbdb9c002 Mon Sep 17 00:00:00 2001 From: "Olivier F. R. Dierick" Date: Sat, 23 Apr 2016 02:36:54 +0200 Subject: shell32: Set last error explicitly in SHFileOperation() --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 234a141..6f20181 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -894,7 +894,6 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) continue; retCode = ERROR_OUTOFMEMORY; nFileOp.fAnyOperationsAborted = TRUE; - SetLastError(retCode); return retCode; } } @@ -1564,6 +1563,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) if (ret == ERROR_CANCELLED) lpFileOp->fAnyOperationsAborted = TRUE; + SetLastError(ERROR_SUCCESS); return ret; } -- 1.7.10.4