Alexandre Julliard : user32: Don' t overwrite the default button id when creating the dialog structure.
Module: wine Branch: master Commit: a64765f673b01944ebf5da44dbcae7b8f4b68ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64765f673b01944ebf5da44db... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 11:43:34 2010 +0100 user32: Don't overwrite the default button id when creating the dialog structure. --- dlls/user.exe16/dialog.c | 1 - dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 04f2435..ab6cb38 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -446,7 +446,6 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = HMENU_32( hMenu ); dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc ); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 373260a..fecd417 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -339,7 +339,7 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->hMenu = 0; dlgInfo->xBaseUnit = 0; dlgInfo->yBaseUnit = 0; - dlgInfo->idResult = 0; + dlgInfo->idResult = IDOK; dlgInfo->flags = 0; wndPtr->dlgInfo = dlgInfo; } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index d95746b..c7c9409 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -672,7 +672,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId );
participants (1)
-
Alexandre Julliard