Sergey Khodych : user32: Use IDOK as default identifier in a template.
Alexandre Julliard
julliard at winehq.org
Wed Aug 26 10:45:48 CDT 2009
Module: wine
Branch: master
Commit: f1f1c5053160777d0db89b1891706b0b960d3d48
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f1c5053160777d0db89b1891706b0b960d3d48
Author: Sergey Khodych <khodych at gmail.com>
Date: Tue Aug 25 17:19:24 2009 +0300
user32: Use IDOK as default identifier in a template.
---
dlls/user32/dialog.c | 2 +-
dlls/user32/tests/dialog.c | 16 ++++++++++++++++
dlls/user32/tests/resource.rc | 7 +++++++
3 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index e8927e9..b6989a6 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -674,7 +674,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
dlgInfo->hMenu = hMenu;
dlgInfo->xBaseUnit = xBaseUnit;
dlgInfo->yBaseUnit = yBaseUnit;
- dlgInfo->idResult = 0;
+ dlgInfo->idResult = IDOK;
dlgInfo->flags = flags;
dlgInfo->hDialogHeap = 0;
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index b7d2b46..5879fbc 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -930,6 +930,19 @@ static INT_PTR CALLBACK DestroyOnCloseDlgWinProc (HWND hDlg, UINT uiMsg,
return FALSE;
}
+
+static INT_PTR CALLBACK TestDefButtonDlgProc (HWND hDlg, UINT uiMsg,
+ WPARAM wParam, LPARAM lParam)
+{
+ switch (uiMsg)
+ {
+ case WM_INITDIALOG:
+ EndDialog(hDlg, LOWORD(SendMessage(hDlg, DM_GETDEFID, 0, 0)));
+ return TRUE;
+ }
+ return FALSE;
+}
+
static void test_DialogBoxParamA(void)
{
INT_PTR ret;
@@ -968,6 +981,9 @@ static void test_DialogBoxParamA(void)
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE ||
broken(GetLastError() == 0xdeadbeef),
"got %d, expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
+
+ ret = DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0);
+ ok(ret == IDOK, "Expected IDOK\n");
}
static void test_DisabledDialogTest(void)
diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc
index 79c036c..1869475 100644
--- a/dlls/user32/tests/resource.rc
+++ b/dlls/user32/tests/resource.rc
@@ -98,6 +98,13 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
END
+TEST_EMPTY_DIALOG DIALOG DISCARDABLE 0, 0, 186, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Sans Serif"
+BEGIN
+END
+
MULTI_EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 75
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER
CAPTION "Multiple Edit Test"
More information about the wine-cvs
mailing list