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

Protect against wrong return value from WM_INITDIALOG.

Browse Source
This commit is contained in:
Adrian Thurston 1999-10-23 16:48:05 +00:00 committed by Alexandre Julliard
parent be5753d35e
commit 00442ba5ae
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
windows/dialog.c
View File

@ -771,12 +771,22 @@ HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
if (DIALOG_CreateControls( wndPtr, dlgTemplate, &template, if (DIALOG_CreateControls( wndPtr, dlgTemplate, &template,
hInst, win32Template )) hInst, win32Template ))
{ {
/* Send initialisation messages and set focus */ HWND hwndPreInitFocus;
/* Send initialisation messages and set focus */
dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE );
hwndPreInitFocus = GetFocus();
if (SendMessageA( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param )) if (SendMessageA( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ))
SetFocus( dlgInfo->hwndFocus ); SetFocus( dlgInfo->hwndFocus );
else
{
/* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
but the focus has not changed, set the focus where we expect it. */
if ( GetFocus() == hwndPreInitFocus )
SetFocus( dlgInfo->hwndFocus );
}
if (template.style & WS_VISIBLE && !(wndPtr->dwStyle & WS_VISIBLE)) if (template.style & WS_VISIBLE && !(wndPtr->dwStyle & WS_VISIBLE))
{ {