Olivier F. R. Dierick : shell32: Set last error explicitly in SHFileOperation().

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: e3853a5e0f79b9cc191801b0ff2690f2cdd4a4ee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e3853a5e0f79b9cc191801b0ff2690f2cdd4a4ee

Author: Olivier F. R. Dierick <o.dierick at piezo-forte.be>
Date:   Sat Apr 23 16:03:39 2016 +0200

shell32: Set last error explicitly in SHFileOperation().

Signed-off-by: Olivier F. R. Dierick <o.dierick at piezo-forte.be>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 9f202b78046adbb30cb9b936e72ce3ca0c4fa1fa)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 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;
 }