mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-31 13:44:24 +00:00
user32: Removed unused owner argument.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
ed6614107a
commit
d75991d80e
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
};
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue