Module: wine Branch: master Commit: 9d2d5eae2d823470dacb013122776a94ff34a70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2d5eae2d823470dacb013122... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 14:43:50 2007 +0100 shell32: Don't wrap SHELL_ConfirmIDs in an assert. Fixed return value. --- dlls/shell32/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 07f19e0..5410c97 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -282,9 +282,9 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI assert(nKindOfDialog >= 0 && nKindOfDialog < 32); if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) - return IDYES; + return TRUE; - assert(SHELL_ConfirmIDs(nKindOfDialog, &ids)); + if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR));