From 06983e9ad1e8cd99c22a4b49500fb3f1b9fbbbd0 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Tue, 6 Jan 2004 11:09:46 +0000 Subject: [PATCH] corrected return type of SHFileOperation() svn path=/trunk/; revision=7471 --- reactos/lib/shell32/shlfileop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/reactos/lib/shell32/shlfileop.c b/reactos/lib/shell32/shlfileop.c index c0b7287bda1..8639fa1b687 100644 --- a/reactos/lib/shell32/shlfileop.c +++ b/reactos/lib/shell32/shlfileop.c @@ -726,7 +726,8 @@ DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) 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 */ @@ -807,7 +808,7 @@ int 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));