From d75991d80e77ac9d93b85b8369c6fce39bd4fdb2 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 2 Mar 2016 15:05:10 +0100 Subject: [PATCH] user32: Removed unused owner argument. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/user_private.h | 2 +- dlls/user32/controls.h | 4 ++-- dlls/user32/dialog.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index fead42d34a1..766a468d407 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -744,7 +744,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template, { HWND owner = WIN_Handle32(owner16); hwnd = DIALOG_CreateIndirect16( hInst, data, owner, dlgProc, param, TRUE ); - if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd ); GlobalUnlock16( hmem ); } FreeResource16( hmem ); @@ -764,7 +764,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate, if (!(ptr = GlobalLock16( dlgTemplate ))) return -1; hwnd = DIALOG_CreateIndirect16( hInst, ptr, owner, dlgProc, param, TRUE ); GlobalUnlock16( dlgTemplate ); - if (hwnd) return wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) return wow_handlers32.dialog_box_loop( hwnd ); return -1; } diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 7c91afb2ce0..3d975463298 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -63,7 +63,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 69bc94c4899..542bf39c9fe 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -121,7 +121,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; @@ -244,7 +244,7 @@ typedef struct tagDIALOGINFO #define DF_OWNERENABLED 0x0002 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; -extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; +extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; HRGN set_control_clipping( HDC hdc, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 180ab3d9d12..3ea426d606b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -769,14 +769,14 @@ HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst, LPCDLGTEMPLATEW dlgTemp /*********************************************************************** * DIALOG_DoDialogBox */ -INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) +INT DIALOG_DoDialogBox( HWND hwnd ) { + HWND owner = GetWindow( hwnd, GW_OWNER ); DIALOGINFO * dlgInfo; MSG msg; INT retval; BOOL bFirstEmpty; - owner = GetWindow( hwnd, GW_OWNER ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) return -1; bFirstEmpty = TRUE; @@ -842,7 +842,7 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -860,7 +860,7 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -873,7 +873,7 @@ INT_PTR WINAPI DialogBoxIndirectParamAorW( HINSTANCE hInstance, LPCVOID template LPARAM param, DWORD flags ) { HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return -1; }