shell32: Choose return value for SHFileOperationA depending on windows version.

Based on a patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Choose return value for SHFileOperationA depending on windows version.
c88a65f2 · Alistair Leslie-Hughes · Alexandre Julliard · bf0b9b97 · c88a65f2
Commit c88a65f2 authored May 14, 2018 by Alistair Leslie-Hughes Committed by Alexandre Julliard May 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

shlfileop.c dlls/shell32/shlfileop.c +4 -0

No files found.
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -882,6 +882,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp)
 	  if (ForFree)
 	  {
 	    retCode = SHFileOperationW(&nFileOp);
+	    /* Windows 95/98 returns S_OK for this case. */
+	    if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000))
+	      retCode = S_OK;
+
 	    heap_free(ForFree); /* we cannot use wString, it was changed */
 	    break;
 	  }