ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Fix return type for helper functions of SHFileOption.

This commit is contained in:
Zhenbo Li 2015-08-31 21:07:32 +08:00 committed by Alexandre Julliard
parent 0fcfb8a082
commit 637bcd5de9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/shell32/shlfileop.c
View File

@ -1180,7 +1180,7 @@ static void create_dest_dirs(LPCWSTR szDestDir)
} }
/* the FO_COPY operation */ /* the FO_COPY operation */
static DWORD copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo)
{ {
DWORD i; DWORD i;
const FILE_ENTRY *entryToCopy; const FILE_ENTRY *entryToCopy;
@ -1328,10 +1328,11 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE
} }
/* the FO_DELETE operation */ /* the FO_DELETE operation */
static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
{ {
const FILE_ENTRY *fileEntry; const FILE_ENTRY *fileEntry;
DWORD i, ret; DWORD i;
int ret;
BOOL bTrash; BOOL bTrash;
if (!flFrom->dwNumFiles) if (!flFrom->dwNumFiles)
@ -1399,7 +1400,7 @@ static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, co
} }
/* the FO_MOVE operation */ /* the FO_MOVE operation */
static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo)
{ {
DWORD i; DWORD i;
INT mismatched = 0; INT mismatched = 0;
@ -1470,7 +1471,7 @@ static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con
} }
/* the FO_RENAME files */ /* the FO_RENAME files */
static DWORD rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo)
{ {
const FILE_ENTRY *feFrom; const FILE_ENTRY *feFrom;
const FILE_ENTRY *feTo; const FILE_ENTRY *feTo;