wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Nicolas Le Cam : kernel32/tests: Fix a failing test in Vista.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: eb612fd4dc7bce5c4208c9ba6d6852df16adf748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb612fd4dc7bce5c4208c9ba6… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Jul 20 23:35:03 2008 +0200 kernel32/tests: Fix a failing test in Vista. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c234921..59d02cf 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -840,7 +840,7 @@ static void test_CompareStringA(void) /* test for CompareStringA flags */ SetLastError(0xdeadbeef); - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0x10, "NULL", -1, "NULL", -1); + ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0x8, "NULL", -1, "NULL", -1); ok(GetLastError() == ERROR_INVALID_FLAGS, "unexpected error code %d\n", GetLastError()); ok(!ret, "CompareStringA must fail with invalid flag\n");

1 0

Nicolas Le Cam : comctl32/tests: Fix a test failure in multiple platforms.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 5cf418f5218d46e28c00f15ba2eb5748888794f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf418f5218d46e28c00f15ba… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Jul 20 22:44:00 2008 +0200 comctl32/tests: Fix a test failure in multiple platforms. --- dlls/comctl32/tests/comboex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index eca7ca4..5714365 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -205,7 +205,7 @@ static void test_WM_LBUTTONDOWN(void) hEdit = (HWND)SendMessage(hComboEx, CBEM_GETEDITCONTROL, 0, 0); cbInfo.cbSize = sizeof(COMBOBOXINFO); - result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + result = GetComboBoxInfo(hCombo, &cbInfo); ok(result, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hList = cbInfo.hwndList;

1 0

Dan Kegel : winmm/tests: Test mciSendString with non-null return string buffer.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 6f164d504b966a8c67db68497e1c11473e583dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f164d504b966a8c67db68497… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Jul 18 18:56:45 2008 -0700 winmm/tests: Test mciSendString with non-null return string buffer. --- dlls/winmm/tests/mci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6af062b..90a185f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -28,7 +28,9 @@ START_TEST(mci) const char command_open[] = "open new type waveaudio alias mysound"; const char command_close_my[] = "close mysound notify"; const char command_close_all[] = "close all notify"; + const char command_sysinfo[] = "sysinfo waveaudio quantity open"; MSG msg; + char buf[1024]; err = mciSendString(command_open, NULL, 0, NULL); ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_open, err); @@ -44,6 +46,16 @@ START_TEST(mci) err = mciSendString(command_close_all, NULL, 0, NULL); todo_wine ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_close_all, err); + memset(buf, 0, sizeof(buf)); + err = mciSendString(command_close_all, buf, sizeof(buf), NULL); + todo_wine ok(!err,"mciSendString(%s, buf, sizeof(buf) , NULL) returned error: %d\n", command_close_all, err); + todo_wine ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf); + + memset(buf, 0, sizeof(buf)); + err = mciSendString(command_sysinfo, buf, sizeof(buf), NULL); + ok(!err,"mciSendString(%s, buf, sizeof(buf) , NULL) returned error: %d\n", command_sysinfo, err); + todo_wine ok(buf[0] == '0' && buf[1] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL), expected output buffer '0', got: '%s'\n", command_sysinfo, buf); + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0); todo_wine ok(err == MCIERR_INVALID_DEVICE_ID, "mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, NULL) returned %d instead of %d\n",

1 0

Aric Stewart : winex11: Add Japanese Mac keyboard layout as many of the vkey code are quite different .
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: c6fd037d88f2e53a158df5de6e75c931919d2573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fd037d88f2e53a158df5de6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 23 18:10:46 2008 +0900 winex11: Add Japanese Mac keyboard layout as many of the vkey code are quite different. --- dlls/winex11.drv/keyboard.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5a69733..bf399c9 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -126,6 +126,19 @@ static const WORD main_key_scan_qwerty_jp106[MAIN_LEN] = 0x56 /* the 102nd key (actually to the right of l-shift) */ }; +static const WORD main_key_scan_qwerty_macjp[MAIN_LEN] = +{ + /* 1 2 3 4 5 6 7 8 9 0 - ^ \ */ + 0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x7d, + /* q w e r t y u i o p @ [ */ + 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B, + /* a s d f g h j k l ; : ] */ + 0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2B, + /* z x c v b n m , . / */ + 0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35, + 0x73 /* the 102nd key (actually to the right of l-shift) */ +}; + static const WORD main_key_vkey_qwerty[MAIN_LEN] = { @@ -147,6 +160,16 @@ static const WORD main_key_vkey_qwerty_jp106[MAIN_LEN] = VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */ }; +static const WORD main_key_vkey_qwerty_macjp[MAIN_LEN] = +{ +/* NOTE: this layout must concur with the scan codes layout above */ + '1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_7,VK_OEM_5, + 'Q','W','E','R','T','Y','U','I','O','P',VK_OEM_3,VK_OEM_4, + 'A','S','D','F','G','H','J','K','L',VK_OEM_PLUS,VK_OEM_1,VK_OEM_6, + 'Z','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2, + VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */ +}; + static const WORD main_key_vkey_qwerty_v2[MAIN_LEN] = { /* NOTE: this layout must concur with the scan codes layout above */ @@ -648,6 +671,15 @@ static const char main_key_JA_jp106[MAIN_LEN][4] = "\\_", }; +static const char main_key_JA_macjp[MAIN_LEN][4] = +{ + "1!","2\"","3#","4$","5%","6&","7'","8(","9)","0","-=","^~","\\|", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","@`","[{", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";+",":*","]}", + "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", + "__", +}; + /*** Japanese pc98x1 keyboard layout ***/ static const char main_key_JA_pc98x1[MAIN_LEN][4] = { @@ -925,6 +957,7 @@ static const struct { {0x041a, "Croatian keyboard layout", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x041a, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0411, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, + {0x0411, "Japanese Mac keyboard layout", &main_key_JA_macjp, &main_key_scan_qwerty_macjp, &main_key_vkey_qwerty_macjp}, {0x0411, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041b, "Slovak keyboard layout", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041b, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_scan_qwerty, &main_key_vkey_qwerty},

1 0

Detlef Riekenberg : msxml3/tests: Fix failure and crash on win9x.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 50840ec3be7c8e46224dedde6c5a40d819a4518a URL: http://source.winehq.org/git/wine.git/?a=commit;h=50840ec3be7c8e46224dedde6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 20 21:15:22 2008 +0200 msxml3/tests: Fix failure and crash on win9x. --- dlls/msxml3/tests/domdoc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c64f6c..1a2f85c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1157,7 +1157,7 @@ todo_wine if (list) { r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL); - ok( r == E_INVALIDARG, "ret %08x\n", r ); + ok( r == E_INVALIDARG || r == E_POINTER, "ret %08x\n", r ); r = IXMLDOMNodeList_get_item(list, 0, NULL); ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); @@ -1597,8 +1597,11 @@ static void test_get_text(void) ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); + if (0) { + /* this test crashes on win9x */ r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); ok( r == E_INVALIDARG, "ret %08x\n", r ); + } r = IXMLDOMNodeList_get_length( node_list, NULL ); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0

Alex Villacís Lasso : richedit: Do not read actual scrollbar state for scrollbar update, use internal state instead.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: acfb6ea210c92ef9ff41dc6828f9482e9c6d6516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfb6ea210c92ef9ff41dc682… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Jul 20 11:29:19 2008 -0500 richedit: Do not read actual scrollbar state for scrollbar update, use internal state instead. --- dlls/riched20/editor.c | 21 +++++++++++ dlls/riched20/editstr.h | 3 ++ dlls/riched20/paint.c | 36 ++++++++++++++----- dlls/riched20/tests/editor.c | 77 +++++++---------------------------------- 4 files changed, 63 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acfb6ea210c92ef9ff41d…

1 0

Alex Villacís Lasso : richedit: Tests for WM_SIZE/ scrollbar recursion bug, with todo_wine.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 9d39754e93f4490291d839b463dc4577bad9501f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d39754e93f4490291d839b46… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Jul 20 10:57:18 2008 -0500 richedit: Tests for WM_SIZE/scrollbar recursion bug, with todo_wine. This is a minimal model of what happens in Corman Lisp 3.0 - subclassed window class that unconditionally calls ShowScrollBar() to force scrollbar visibility. --- dlls/riched20/tests/editor.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a4d0369..d8abdc0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2229,11 +2229,45 @@ static void test_EM_SCROLL(void) DestroyWindow(hwndRichEdit); } +unsigned int recursionLevel = 0; +unsigned int WM_SIZE_recursionLevel = 0; +BOOL bailedOutOfRecursion = FALSE; +LRESULT WINAPI (*richeditProc)(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); + +static LRESULT WINAPI RicheditStupidOverrideProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + LRESULT r; + + if (bailedOutOfRecursion) return 0; + if (recursionLevel >= 32) { + bailedOutOfRecursion = TRUE; + return 0; + } + + recursionLevel++; + switch (message) { + case WM_SIZE: + WM_SIZE_recursionLevel++; + r = richeditProc(hwnd, message, wParam, lParam); + /* Because, uhhhh... I never heard of ES_DISABLENOSCROLL */ + ShowScrollBar(hwnd, SB_VERT, TRUE); + WM_SIZE_recursionLevel--; + break; + default: + r = richeditProc(hwnd, message, wParam, lParam); + break; + } + recursionLevel--; + return r; +} + static void test_scrollbar_visibility(void) { HWND hwndRichEdit; const char * text="a\na\na\na\na\na\na\na\na\na\na\na\na\na\na\na\na\na\na\na\n"; SCROLLINFO si; + WNDCLASSA cls; + BOOL r; /* These tests show that richedit should temporarily refrain from automatically hiding or showing its scrollbars (vertical at least) when an explicit request @@ -2929,6 +2963,43 @@ static void test_scrollbar_visibility(void) si.nPage, si.nMin, si.nMax); DestroyWindow(hwndRichEdit); + + /* This window proc models what is going on with Corman Lisp 3.0. + At WM_SIZE, this proc unconditionally calls ShowScrollBar() to + force the scrollbar into visibility. Recursion should NOT happen + as a result of this action. + */ + r = GetClassInfoA(NULL, RICHEDIT_CLASS, &cls); + if (r) { + richeditProc = cls.lpfnWndProc; + cls.lpfnWndProc = RicheditStupidOverrideProcA; + cls.lpszClassName = "RicheditStupidOverride"; + if(!RegisterClassA(&cls)) assert(0); + + recursionLevel = 0; + WM_SIZE_recursionLevel = 0; + bailedOutOfRecursion = FALSE; + hwndRichEdit = new_window(cls.lpszClassName, ES_MULTILINE, NULL); + todo_wine { + ok(!bailedOutOfRecursion, + "WM_SIZE/scrollbar mutual recursion detected, expected none!\n"); + } + + recursionLevel = 0; + WM_SIZE_recursionLevel = 0; + bailedOutOfRecursion = FALSE; + MoveWindow(hwndRichEdit, 0, 0, 250, 100, TRUE); + todo_wine { + ok(!bailedOutOfRecursion, + "WM_SIZE/scrollbar mutual recursion detected, expected none!\n"); + } + + /* Unblock window in order to process WM_DESTROY */ + recursionLevel = 0; + bailedOutOfRecursion = FALSE; + WM_SIZE_recursionLevel = 0; + DestroyWindow(hwndRichEdit); + } } static void test_EM_SETUNDOLIMIT(void)

1 0

Alex Villacís Lasso : richedit: More tests for visibility behavior of richedit scrollbars, with todo_wine.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 47871f69a13af06eb08450a516bd62aed67edba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47871f69a13af06eb08450a51… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Jul 19 21:54:38 2008 -0500 richedit: More tests for visibility behavior of richedit scrollbars, with todo_wine. Alternate method of forcing (in)visibility of scrollbars, with SetWindowLongA(). --- dlls/riched20/tests/editor.c | 232 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 232 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47871f69a13af06eb0845…

1 0

Alex Villacís Lasso : richedit: Tests for visibility behavior of richedit scrollbars, with todo_wine.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 86e9e0720c64b5d7d23f5105f283349d7215e32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e9e0720c64b5d7d23f5105f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Jul 19 21:42:57 2008 -0500 richedit: Tests for visibility behavior of richedit scrollbars, with todo_wine. Some applications have never heard of ES_DISABLENOSCROLL and attempt to force scrollbars to be always shown (with ShowScrollBar() or similar) when otherwise richedit would hide them. If richedit attempts to wrestle control back, a recursive loop of requests can result if app overrides WM_SIZE behavior. Apparently native never reads the scrollbar state, and operates from some sort of internal state, so that scrollbars can be modified externally without native trying to wrestle back control. This is confirmed by attached tests. An exception: EM_SCROLL will restore visibility to a scrollbar that was forcibly hidden. --- dlls/riched20/tests/editor.c | 471 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 471 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86e9e0720c64b5d7d23f5…

1 0

Aric Stewart : mlang: Correct and fill out Japanese locale information.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: db726e416547727a6f35e956f8ba11a30e6cd7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=db726e416547727a6f35e956f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 22 20:13:41 2008 +0900 mlang: Correct and fill out Japanese locale information. Implement Japanese auto detect, JIS and EUC encoding conversions to Unicode and back. These conversions are not done in code pages but are simple algorithms. --- dlls/mlang/mlang.c | 444 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 436 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db726e416547727a6f35e…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2008