marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct return type of SHFileOperationA/W.

oldstable
Martin Fuchs 2004-01-05 21:13:37 +00:00 committed by Alexandre Julliard
parent 6518b5ca27
commit c0a5a27c15
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/shell32/shlfileop.c
View File

@ -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));

4
include/shellapi.h
View File

@ -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)
/******************************************