August 2009 - Wine-commits - list.winehq.org

Huw Davies : include: Add msdaguid.h.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 655bbb375118912e92810ab405f463cbcd7e420d URL: http://source.winehq.org/git/wine.git/?a=commit;h=655bbb375118912e92810ab40… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 26 14:14:38 2009 +0100 include: Add msdaguid.h. --- include/Makefile.in | 1 + include/msdaguid.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 1127340..cfcfd54 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -300,6 +300,7 @@ SRCDIR_INCLUDES = \ msacmdlg.h \ msacmdrv.h \ mscat.h \ + msdaguid.h \ mshtmcid.h \ mshtmdid.h \ msi.h \ diff --git a/include/msdaguid.h b/include/msdaguid.h new file mode 100644 index 0000000..7ee9b56 --- /dev/null +++ b/include/msdaguid.h @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MSDAGUID_H +#define __WINE_MSDAGUID_H + +DEFINE_GUID(CLSID_EXTENDEDERRORINFO, 0xc8b522cf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(CLSID_OLEDB_ENUMERATOR, 0xc8b522d0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(CLSID_OLEDB_CONVERSIONLIBRARY, 0xc8b522d1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +#endif /*__WINE_MSDAGUID_H */

1 0

Sergey Khodych : user32: Use IDOK as default identifier in a template.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: f1f1c5053160777d0db89b1891706b0b960d3d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f1c5053160777d0db89b189… Author: Sergey Khodych <khodych(a)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"

1 0

Sergey Khodych : user32: edit: Improve handling of WM_KEYDOWN VK_RETURN in a dialog mode.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 205a7f7f03bbfb41718a8aeeec342d6edb0221d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=205a7f7f03bbfb41718a8aeee… Author: Sergey Khodych <khodych(a)gmail.com> Date: Tue Aug 25 18:01:05 2009 +0300 user32: edit: Improve handling of WM_KEYDOWN VK_RETURN in a dialog mode. --- dlls/user32/edit.c | 25 ++++++++++++------------- dlls/user32/tests/edit.c | 24 ++++++++++++++++++++---- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index eef07da..83e004a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3619,21 +3619,20 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) /* If the edit doesn't want the return send a message to the default object */ if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { - HWND hwndParent; - DWORD dw; + DWORD dw; - if (!EDIT_IsInsideDialog(es)) return 1; + if (!EDIT_IsInsideDialog(es)) break; if (control) break; - hwndParent = GetParent(es->hwndSelf); - dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); - if (HIWORD(dw) == DC_HASDEFID) - { - SendMessageW( hwndParent, WM_COMMAND, - MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); - } - else - SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); + dw = SendMessageW(es->hwndParent, DM_GETDEFID, 0, 0); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(es->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, (LPARAM)TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } } break; case VK_ESCAPE: diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 68afb27..f10b798 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -28,6 +28,7 @@ #define ES_COMBO 0x200 #endif +#define ID_EDITTESTDBUTTON 0x123 #define ID_EDITTEST2 99 #define MAXLEN 200 @@ -1819,7 +1820,7 @@ static void test_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1843,7 +1844,7 @@ static void test_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -2115,7 +2116,7 @@ static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam break; case DM_GETDEFID: dm_messages.wm_getdefid++; - return 0; + return MAKELONG(ID_EDITTESTDBUTTON, DC_HASDEFID); case WM_NEXTDLGCTL: dm_messages.wm_nextdlgctl++; break; @@ -2129,7 +2130,7 @@ static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam static void test_dialogmode(void) { - HWND hwEdit, hwParent; + HWND hwEdit, hwParent, hwButton; MSG msg= {0}; int len, r; hwEdit = create_child_editcontrol(ES_MULTILINE, 0); @@ -2241,6 +2242,21 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0, 1); zero_dm_messages(); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 0); + zero_dm_messages(); + + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, + 100, 100, 50, 20, hwParent, (HMENU)ID_EDITTESTDBUTTON, hinst, NULL); + ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 1); + zero_dm_messages(); + + DestroyWindow(hwButton); destroy_child_editcontrol(hwEdit); }

1 0

Sergey Khodych : user32: edit: Improve handling of WM_KEYDOWN VK_TAB in a dialog mode.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: d4707dbb603459c98e74d07aaed3ba8ac297ba0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4707dbb603459c98e74d07aa… Author: Sergey Khodych <khodych(a)gmail.com> Date: Mon Aug 24 01:47:15 2009 +0300 user32: edit: Improve handling of WM_KEYDOWN VK_TAB in a dialog mode. --- dlls/user32/edit.c | 3 ++- dlls/user32/tests/edit.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index a96120a..eef07da 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3641,7 +3641,8 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) PostMessageW(es->hwndParent, WM_CLOSE, 0, 0); break; case VK_TAB: - SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); + if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; } return TRUE; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 1509b1f..68afb27 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2192,12 +2192,36 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0, 0); zero_dm_messages(); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_TAB; + msg.lParam = 0xf0001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_TAB, (LPARAM)&msg); + ok(0x89 == r, "expected 0x89, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + destroy_child_editcontrol(hwEdit); hwEdit = create_child_editcontrol(ES_MULTILINE, 0); hwParent = GetParent(hwEdit); SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + msg.hwnd = hwEdit; msg.message = WM_KEYDOWN; msg.wParam = VK_ESCAPE; @@ -2212,6 +2236,11 @@ static void test_dialogmode(void) test_dm_messages(0, 0, 0, 0); zero_dm_messages(); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 1); + zero_dm_messages(); + destroy_child_editcontrol(hwEdit); }

1 0

Sergey Khodych : user32: edit: Improve handling of WM_KEYDOWN VK_ESCAPE in a dialog mode.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 3b6ea11481e1a4a1301ada177cb8f53379bdeab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6ea11481e1a4a1301ada177… Author: Sergey Khodych <khodych(a)gmail.com> Date: Mon Aug 24 00:33:20 2009 +0300 user32: edit: Improve handling of WM_KEYDOWN VK_ESCAPE in a dialog mode. --- dlls/user32/edit.c | 17 ++------- dlls/user32/tests/edit.c | 86 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 18 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0cb8f11..a96120a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3637,14 +3637,14 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) } break; case VK_ESCAPE: - if (!(es->style & ES_MULTILINE)) - SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)); + PostMessageW(es->hwndParent, WM_CLOSE, 0, 0); break; case VK_TAB: SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; } - return 0; + return TRUE; } @@ -5110,17 +5110,6 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) result |= DLGC_WANTMESSAGE; } - else - { - switch (vk) - { - case VK_ESCAPE: - SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); - break; - default: - break; - } - } } } break; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d8f6922..1509b1f 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1817,7 +1817,7 @@ static void test_edit_dialog(void) /* more tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); @@ -1841,7 +1841,7 @@ static void test_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); @@ -1891,7 +1891,7 @@ static void test_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7); ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8); @@ -2081,9 +2081,55 @@ static void test_fontsize(void) DeleteObject(hfont); } +struct dialog_mode_messages +{ + int wm_getdefid, wm_close, wm_command, wm_nextdlgctl; +}; + +static struct dialog_mode_messages dm_messages; + +static void zero_dm_messages(void) +{ + dm_messages.wm_command = 0; + dm_messages.wm_close = 0; + dm_messages.wm_getdefid = 0; + dm_messages.wm_nextdlgctl = 0; +} + +#define test_dm_messages(wmcommand, wmclose, wmgetdefid, wmnextdlgctl) \ + ok(dm_messages.wm_command == wmcommand, "expected %d WM_COMMAND messages, " \ + "got %d\n", wmcommand, dm_messages.wm_command); \ + ok(dm_messages.wm_close == wmclose, "expected %d WM_CLOSE messages, " \ + "got %d\n", wmclose, dm_messages.wm_close); \ + ok(dm_messages.wm_getdefid == wmgetdefid, "expected %d WM_GETDIFID messages, " \ + "got %d\n", wmgetdefid, dm_messages.wm_getdefid);\ + ok(dm_messages.wm_nextdlgctl == wmnextdlgctl, "expected %d WM_NEXTDLGCTL messages, " \ + "got %d\n", wmgetdefid, dm_messages.wm_nextdlgctl) + +static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + dm_messages.wm_command++; + break; + case DM_GETDEFID: + dm_messages.wm_getdefid++; + return 0; + case WM_NEXTDLGCTL: + dm_messages.wm_nextdlgctl++; + break; + case WM_CLOSE: + dm_messages.wm_close++; + break; + } + + return DefWindowProc(hwnd, iMsg, wParam, lParam); +} + static void test_dialogmode(void) { - HWND hwEdit; + HWND hwEdit, hwParent; MSG msg= {0}; int len, r; hwEdit = create_child_editcontrol(ES_MULTILINE, 0); @@ -2135,6 +2181,38 @@ static void test_dialogmode(void) ok(11 == len, "expected 11, got %d\n", len); DestroyWindow(hwEdit); + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + zero_dm_messages(); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_ESCAPE; + msg.lParam = 0x10001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_ESCAPE, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + destroy_child_editcontrol(hwEdit); } START_TEST(edit)

1 0

Sergey Khodych : user32: edit: Use a dialog mode after receiving WM_GETDLGCODE message.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 6fa48cdd918851e9b5db9c6c8468546d5721e6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa48cdd918851e9b5db9c6c8… Author: Sergey Khodych <khodych(a)gmail.com> Date: Mon Aug 24 00:10:01 2009 +0300 user32: edit: Use a dialog mode after receiving WM_GETDLGCODE message. Tests show that the edit control uses a dialog mode after receiving WM_GETDLGCODE message and it doesn't depend on whether the edit control has a parent window. --- dlls/user32/edit.c | 66 +++++++++++++++++++++------------------------- dlls/user32/tests/edit.c | 57 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 36 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index eadcc3d..0cb8f11 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -83,6 +83,8 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); #define EF_USE_SOFTBRK 0x0100 /* Enable soft breaks in text. */ #define EF_APP_HAS_HANDLE 0x0200 /* Set when an app sends EM_[G|S]ETHANDLE. We are in sole control of the text buffer if this is clear. */ +#define EF_DIALOGMODE 0x0400 /* Indicates that we are inside a dialog window */ + typedef enum { END_0 = 0, /* line ends with terminating '\0' character */ @@ -3163,22 +3165,9 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) * controls without ES_WANTRETURN would attempt to detect whether it is inside * a dialog box or not. */ -static BOOL EDIT_IsInsideDialog(EDITSTATE *es) +static inline BOOL EDIT_IsInsideDialog(EDITSTATE *es) { - WND *pParent; - BOOL r = FALSE; - - if (es->hwndParent) - { - pParent = WIN_GetPtr(es->hwndParent); - if (pParent && pParent != WND_OTHER_PROCESS && pParent != WND_DESKTOP) - { - if (pParent->flags & WIN_ISDIALOG) - r = TRUE; - WIN_ReleasePtr(pParent); - } - } - return r; + return (es->flags & EF_DIALOGMODE); } @@ -5107,27 +5096,32 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, if (es->style & ES_MULTILINE) result |= DLGC_WANTALLKEYS; - if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) - { - int vk = (int)((LPMSG)lParam)->wParam; - - if (es->hwndListBox) - { - if (vk == VK_RETURN || vk == VK_ESCAPE) - if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - result |= DLGC_WANTMESSAGE; - } - else - { - switch (vk) - { - case VK_ESCAPE: - SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); - break; - default: - break; - } - } + if (lParam) + { + es->flags|=EF_DIALOGMODE; + + if (((LPMSG)lParam)->message == WM_KEYDOWN) + { + int vk = (int)((LPMSG)lParam)->wParam; + + if (es->hwndListBox) + { + if (vk == VK_RETURN || vk == VK_ESCAPE) + if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) + result |= DLGC_WANTMESSAGE; + } + else + { + switch (vk) + { + case VK_ESCAPE: + SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); + break; + default: + break; + } + } + } } break; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 399ec4c..d8f6922 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2081,6 +2081,62 @@ static void test_fontsize(void) DeleteObject(hfont); } +static void test_dialogmode(void) +{ + HWND hwEdit; + MSG msg= {0}; + int len, r; + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + r = SendMessage(hwEdit, WM_GETDLGCODE, (WPARAM)NULL, (LPARAM)NULL); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessage(hwEdit, WM_GETDLGCODE, (WPARAM)NULL, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE, 0); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_BACK; + msg.lParam = 0xe0001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_BACK, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + DestroyWindow(hwEdit); +} + START_TEST(edit) { hinst = GetModuleHandleA(NULL); @@ -2105,6 +2161,7 @@ START_TEST(edit) test_singleline_wantreturn_edit_dialog(); test_child_edit_wmkeydown(); test_fontsize(); + test_dialogmode(); UnregisterWindowClasses(); }

1 0

Ge van Geldorp : user32/tests: Fix test failure on Win7.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 0a1e0a3261936cfe41620a79c3a16bdc686543c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1e0a3261936cfe41620a79c… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 14:31:19 2009 +0200 user32/tests: Fix test failure on Win7. --- dlls/user32/tests/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8e085bd..0dd3f7e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -78,7 +78,7 @@ static struct { static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); -#define MAXKEYEVENTS 10 +#define MAXKEYEVENTS 12 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one and only one message */

1 0

Ge van Geldorp : kernel32/tests: Remove test that crashes on Win7.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 40d8c87df27f4e506b47ea6c9b4258ab33d38d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d8c87df27f4e506b47ea6c9… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 24 14:15:28 2009 +0200 kernel32/tests: Remove test that crashes on Win7. --- dlls/kernel32/tests/console.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a54ff5c..c3fa57c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -160,17 +160,7 @@ static void testCursorInfo(HANDLE hCon) ok(GetLastError() == 0xdeadbeef, "GetLastError: expecting %u got %u\n", 0xdeadbeef, GetLastError()); - if (info.dwSize == 12) - { - win_skip("NULL CONSOLE_CURSOR_INFO will crash on win9x\n"); - return; - } - - SetLastError(0xdeadbeef); - ret = GetConsoleCursorInfo(hCon, NULL); - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_ACCESS, "GetLastError: expecting %u got %u\n", - ERROR_INVALID_ACCESS, GetLastError()); + /* Don't test NULL CONSOLE_CURSOR_INFO, it crashes on win9x and win7 */ } static void testEmptyWrite(HANDLE hCon)

1 0

Andrew Eikum : gdiplus: Implement GdipIsVisibleRegionRect.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 2032b0d3544ce5245b264a995317b4515b592a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2032b0d3544ce5245b264a995… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 25 13:39:18 2009 -0500 gdiplus: Implement GdipIsVisibleRegionRect. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 5 + dlls/gdiplus/region.c | 47 +++++++++ dlls/gdiplus/tests/region.c | 205 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 5 files changed, 261 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2032b0d3544ce5245b264…

1 0

Andrew Eikum : gdiplus: Implement GdipIsVisibleRegionPoint.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 32996e0a110d889d168ff039a583bfc5dc65a369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32996e0a110d889d168ff039a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 25 13:39:12 2009 -0500 gdiplus: Implement GdipIsVisibleRegionPoint. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 9 -- dlls/gdiplus/region.c | 39 ++++++++ dlls/gdiplus/tests/region.c | 204 +++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 5 files changed, 246 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32996e0a110d889d168ff…

1 0