From c0a5a27c15c93bc6b682196c8550c9dbda22f069 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <martin-fuchs@gmx.net>
Date: Mon, 5 Jan 2004 21:13:37 +0000
Subject: [PATCH] Correct return type of SHFileOperationA/W.

---
 dlls/shell32/shlfileop.c | 11 ++++++-----
 include/shellapi.h       |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index c7df3e5819a..8639fa1b687 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -723,10 +723,11 @@ DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
  * NOTES
  *  exported by name
  */
-DWORD WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp)
+int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp)
 {
 	SHFILEOPSTRUCTW nFileOp = *((LPSHFILEOPSTRUCTW)lpFileOp);
-	DWORD retCode = 0, size;
+	int retCode = 0;
+	DWORD size;
 	LPWSTR ForFree = NULL, /* we change wString in SHNameTranslate and can't use it for freeing */
 	       wString = NULL; /* we change this in SHNameTranslate */
 
@@ -792,7 +793,7 @@ static const char * debug_shfileops_action( DWORD op )
  *
  * See SHFileOperationA
  */
-DWORD WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
+int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
 {
 	SHFILEOPSTRUCTW nFileOp = *(lpFileOp);
 
@@ -807,7 +808,7 @@ DWORD WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
 	LPWSTR pFromFile;
 	LPWSTR pToFile = NULL;
 	LPWSTR lpFileName;
-	long retCode = 0;
+	int retCode = 0;
 	DWORD ToAttr;
 	DWORD ToPathAttr;
 	DWORD FromPathAttr;
@@ -1257,7 +1258,7 @@ shfileop_error:
 	{
 	  nFileOp.fAnyOperationsAborted = TRUE;
 	}
-	TRACE("%s level=%ld AnyOpsAborted=%s ret=0x%lx, with %s %s%s\n",
+	TRACE("%s level=%ld AnyOpsAborted=%s ret=0x%x, with %s %s%s\n",
               debug_shfileops_action(FuncSwitch), level,
 	      nFileOp.fAnyOperationsAborted ? "TRUE":"FALSE",
 	      retCode, debugstr_w(pFrom), pTo ? "-> ":"", debugstr_w(pTo));
diff --git a/include/shellapi.h b/include/shellapi.h
index 2b523fa3aec..ae229e95923 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -209,8 +209,8 @@ typedef struct _SHFILEOPSTRUCTW
 #define  SHFILEOPSTRUCT WINELIB_NAME_AW(SHFILEOPSTRUCT)
 #define  LPSHFILEOPSTRUCT WINELIB_NAME_AW(LPSHFILEOPSTRUCT)
 
-DWORD	WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);
-DWORD	WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
+int	WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);
+int	WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
 #define  SHFileOperation WINELIB_NAME_AW(SHFileOperation)
 
 /******************************************