Module: wine Branch: master Commit: 74fe2989cb87276f9dc488a5ace51a3b398015ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=74fe2989cb87276f9dc488a5ac...
Author: Damjan Jovanovic damjan.jov@gmail.com Date: Wed Jun 20 09:11:27 2012 +0200
shell32: Fix some return types.
---
dlls/shell32/brsfolder.c | 2 +- dlls/shell32/control.c | 2 +- dlls/shell32/shlfileop.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 38195fe..589ba72 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -570,7 +570,7 @@ static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid ); - return 0; + return S_OK; }
static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index d8e4df1..505aff5 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -849,7 +849,7 @@ void WINAPI Control_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdSh HRESULT WINAPI Control_FillCache_RunDLLW(HWND hWnd, HANDLE hModule, DWORD w, DWORD x) { FIXME("%p %p 0x%08x 0x%08x stub\n", hWnd, hModule, w, x); - return 0; + return S_OK; }
/************************************************************************* diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 7ae20c1..5fa79a9 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1177,7 +1177,7 @@ static void create_dest_dirs(LPCWSTR szDestDir) }
/* the FO_COPY operation */ -static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) +static DWORD copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) { DWORD i; const FILE_ENTRY *entryToCopy; @@ -1325,7 +1325,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE }
/* the FO_DELETE operation */ -static HRESULT delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) { const FILE_ENTRY *fileEntry; DWORD i; @@ -1425,7 +1425,7 @@ static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, co }
/* the FO_MOVE operation */ -static HRESULT move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { DWORD i; const FILE_ENTRY *entryToMove; @@ -1477,7 +1477,7 @@ static HRESULT move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, c }
/* the FO_RENAME files */ -static HRESULT rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static DWORD rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { const FILE_ENTRY *feFrom; const FILE_ENTRY *feTo;