Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 15:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

corrected return type of SHFileOperation()

Browse source 
svn path=/trunk/; revision=7471
This commit is contained in:
Martin Fuchs 2004-01-06 11:09:46 +00:00
parent e6d3a05dff
commit 06983e9ad1
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/lib/shell32/shlfileop.c
View file

@ -726,7 +726,8 @@ DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp)
{ {
SHFILEOPSTRUCTW nFileOp = *((LPSHFILEOPSTRUCTW)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 */ LPWSTR ForFree = NULL, /* we change wString in SHNameTranslate and can't use it for freeing */
wString = NULL; /* we change this in SHNameTranslate */ wString = NULL; /* we change this in SHNameTranslate */
@ -807,7 +808,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
LPWSTR pFromFile; LPWSTR pFromFile;
LPWSTR pToFile = NULL; LPWSTR pToFile = NULL;
LPWSTR lpFileName; LPWSTR lpFileName;
long retCode = 0; int retCode = 0;
DWORD ToAttr; DWORD ToAttr;
DWORD ToPathAttr; DWORD ToPathAttr;
DWORD FromPathAttr; DWORD FromPathAttr;
@ -1257,7 +1258,7 @@ shfileop_error:
{ {
nFileOp.fAnyOperationsAborted = TRUE; 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, debug_shfileops_action(FuncSwitch), level,
nFileOp.fAnyOperationsAborted ? "TRUE":"FALSE", nFileOp.fAnyOperationsAborted ? "TRUE":"FALSE",
retCode, debugstr_w(pFrom), pTo ? "-> ":"", debugstr_w(pTo)); retCode, debugstr_w(pFrom), pTo ? "-> ":"", debugstr_w(pTo));