wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Austin English : user32: Add a missing HeapFree.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: f1ea9f6e79990f837f2696ac6241bbf45d853894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ea9f6e79990f837f2696ac6… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 21 15:42:26 2009 -0600 user32: Add a missing HeapFree. --- dlls/user32/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6419478..bb08e1e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -187,6 +187,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) ret = !wine_server_call_err( req ); } SERVER_END_REQ; + HeapFree( GetProcessHeap(), 0, data ); } else /* clear existing region */ {

1 0

Vitaliy Margolen : kernel32: Implement GetShortPathName16.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 908eab4f1f0cf861531f31cf2bb858f779abf5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908eab4f1f0cf861531f31cf2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Feb 21 13:19:43 2009 -0700 kernel32: Implement GetShortPathName16. --- dlls/kernel32/file16.c | 9 +++++++++ dlls/kernel32/krnl386.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file16.c b/dlls/kernel32/file16.c index ad30903..adaf1ab 100644 --- a/dlls/kernel32/file16.c +++ b/dlls/kernel32/file16.c @@ -540,6 +540,15 @@ UINT16 WINAPI SetHandleCount16( UINT16 count ) /*********************************************************************** + * GetShortPathName (KERNEL.274) + */ +WORD WINAPI GetShortPathName16( LPCSTR longpath, LPSTR shortpath, WORD len ) +{ + return GetShortPathNameA( longpath, shortpath, len ); +} + + +/*********************************************************************** * WritePrivateProfileStruct (KERNEL.406) */ BOOL16 WINAPI WritePrivateProfileStruct16 (LPCSTR section, LPCSTR key, diff --git a/dlls/kernel32/krnl386.exe.spec b/dlls/kernel32/krnl386.exe.spec index 0005f37..8b91b5d 100644 --- a/dlls/kernel32/krnl386.exe.spec +++ b/dlls/kernel32/krnl386.exe.spec @@ -249,7 +249,7 @@ 262 stub WOWWaitForMsgAndEvent 263 stub WOWMsgBox 273 stub K273 -274 stub GetShortPathName +274 pascal -ret16 GetShortPathName(str ptr word) GetShortPathName16 # 310-356 are again shared between all versions

1 0

Vitaliy Margolen : dinput: Let each device decide which hook event to skip.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 74f2eccc9085d5f7667497f5d0d74e8053732f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f2eccc9085d5f7667497f5d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Feb 21 12:54:37 2009 -0700 dinput: Let each device decide which hook event to skip. Some programs acquire mouse in exclusive and keyboard in non-exclusive mode. --- dlls/dinput/dinput_main.c | 3 +-- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/keyboard.c | 12 +++++++----- dlls/dinput/mouse.c | 10 +++++++--- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index bdcf557..f89d5f0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -899,8 +899,7 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) if (dev->acquired && dev->event_proc) { TRACE("calling %p->%p (%lx %lx)\n", dev, dev->event_proc, wparam, lparam); - dev->event_proc( (LPDIRECTINPUTDEVICE8A)dev, wparam, lparam ); - skip |= dev->dwCoopLevel & DISCL_EXCLUSIVE; + skip |= dev->event_proc( (LPDIRECTINPUTDEVICE8A)dev, wparam, lparam ); } LeaveCriticalSection( &dinput->crit ); } diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 15783e2..24fffb8 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -60,7 +60,7 @@ extern const struct dinput_device joystick_linux_device; extern const struct dinput_device joystick_linuxinput_device; extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A); -typedef void (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); +typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 47536f7..f9c689b 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -74,16 +74,16 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) return out_code; } -static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - int dik_code; + int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; BYTE new_diks; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) - return; + return 0; TRACE("(%p) %ld,%ld\n", iface, wparam, lparam); @@ -96,15 +96,17 @@ static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM /* returns now if key event already known */ if (new_diks == This->DInputKeyState[dik_code]) - return; + return ret; This->DInputKeyState[dik_code] = new_diks; TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]); - + dik_code = id_to_offset(&This->base.data_format, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON); EnterCriticalSection(&This->base.crit); queue_event((LPDIRECTINPUTDEVICE8A)This, dik_code, new_diks, hook->time, This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); + + return ret; } const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 178b8fb..7b95be3 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -78,7 +78,7 @@ struct SysMouseImpl WARP_MOUSE warp_override; }; -static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); +static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} @@ -286,17 +286,18 @@ const struct dinput_device mouse_device = { */ /* low-level mouse hook */ -static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = (SysMouseImpl*) iface; DWORD dwCoop; - int wdata = 0, inst_id = -1; + int wdata = 0, inst_id = -1, ret; TRACE("msg %lx @ (%d %d)\n", wparam, hook->pt.x, hook->pt.y); EnterCriticalSection(&This->base.crit); dwCoop = This->base.dwCoopLevel; + ret = dwCoop & DISCL_EXCLUSIVE; switch(wparam) { case WM_MOUSEMOVE: @@ -370,6 +371,8 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x00; break; + default: + ret = 0; } @@ -381,6 +384,7 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA } LeaveCriticalSection(&This->base.crit); + return ret; } static BOOL dinput_window_check(SysMouseImpl* This) {

1 0

Paul Vriens : fusion/tests: Fix a test failure on Win64.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 6f73f1bdbb7a55a6e2122d84a027717b8c95b5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f73f1bdbb7a55a6e2122d84a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 21 15:16:32 2009 +0100 fusion/tests: Fix a test failure on Win64. --- dlls/fusion/tests/asmenum.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index cbc0c40..921ddf8 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -303,6 +303,10 @@ static void test_enumerate(void) enum_gac_assemblies(&assemblies, 0, path); to_multibyte(path, buf); + lstrcatA(path, "_64"); + enum_gac_assemblies(&assemblies, 0, path); + + to_multibyte(path, buf); lstrcatA(path, "_MSIL"); enum_gac_assemblies(&assemblies, 0, path);

1 0

Detlef Riekenberg : fusion/tests: Fix remaining win98 failures in asmcache.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: cfb33d1894a7c77c132ebe4cebd85eb5e3c5533b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb33d1894a7c77c132ebe4ce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 21 12:17:43 2009 +0100 fusion/tests: Fix remaining win98 failures in asmcache. --- dlls/fusion/tests/asmcache.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 7f757c5..cd55afa 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1193,7 +1193,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1214,7 +1216,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1237,7 +1241,9 @@ static void test_QueryAssemblyInfo(void) { ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); @@ -1260,7 +1266,9 @@ static void test_QueryAssemblyInfo(void) { ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); @@ -1282,7 +1290,9 @@ static void test_QueryAssemblyInfo(void) "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1304,7 +1314,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1328,7 +1340,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1372,7 +1386,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1419,7 +1435,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1463,7 +1481,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n");

1 0

Detlef Riekenberg : fusion/tests: Do not use an hardcoded path for the windows directory.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: d68c2956f58091b3dccc281e10423eb6acdc1062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68c2956f58091b3dccc281e1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 21 10:02:59 2009 +0100 fusion/tests: Do not use an hardcoded path for the windows directory. --- dlls/fusion/tests/asmcache.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 436a04d..7f757c5 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -987,6 +987,8 @@ static void test_QueryAssemblyInfo(void) HRESULT hr; DWORD size; ULONG disp; + char dllpath[MAX_PATH]; + UINT len; static const WCHAR empty[] = {0}; static const WCHAR commasep[] = {',',' ',0}; @@ -1480,10 +1482,13 @@ static void test_QueryAssemblyInfo(void) } /* FIXME: remove once UninstallAssembly is implemented */ - DeleteFileA("C:\\windows\\assembly\\GAC_MSIL\\wine\\" - "1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - RemoveDirectoryA("C:\\windows\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5"); - RemoveDirectoryA("C:\\windows\\assembly\\GAC_MSIL\\wine"); + len = GetWindowsDirectoryA(dllpath, MAX_PATH); + strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); + DeleteFileA(dllpath); + dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; + RemoveDirectoryA(dllpath); + dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; + RemoveDirectoryA(dllpath); DeleteFileA("test.dll"); DeleteFileA("wine.dll");

1 0

Anders Jonsson : winemine: Change max number of mines to (cols-1)*(rows-1).
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 14c68c3c2876e5e7266ebfa6d8a98af5b8165465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c68c3c2876e5e7266ebfa6d… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Feb 20 23:19:27 2009 +0100 winemine: Change max number of mines to (cols-1)*(rows-1). --- programs/winemine/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 36e0fef..d5c9d04 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -53,8 +53,8 @@ void CheckLevel( BOARD *p_board ) if( p_board->mines < BEGINNER_MINES ) p_board->mines = BEGINNER_MINES; - if( p_board->mines > p_board->cols * p_board->rows - 2 ) - p_board->mines = p_board->cols * p_board->rows - 2; + if( p_board->mines > ( p_board->cols - 1 ) * ( p_board->rows - 1 ) ) + p_board->mines = ( p_board->cols - 1 ) * ( p_board->rows - 1 ); } static void LoadBoard( BOARD *p_board )

1 0

Alexandre Julliard : user32/tests: Print all the unexpected messages we received. Fix a couple of sequences.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: fadc8afc79581c2bd653e15baad33615e9830ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadc8afc79581c2bd653e15ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 21 12:57:23 2009 +0100 user32/tests: Print all the unexpected messages we received. Fix a couple of sequences. --- dlls/user32/tests/msg.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c3ac46d..957f197 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -575,8 +575,10 @@ static const struct message WmShowMinOverlappedSeq[] = { { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent }, { WM_ACTIVATEAPP, sent|wparam, 0 }, + /* Vista sometimes restores the window right away... */ { WM_SYSCOMMAND, sent|optional|wparam, SC_RESTORE }, { HCBT_SYSCOMMAND, hook|optional|wparam, SC_RESTORE }, + { HCBT_MINMAX, hook|optional|lparam, 0, SW_RESTORE }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, @@ -1910,9 +1912,17 @@ static void dump_sequence(const struct message *expected, const char *context, c } if (expected->message) + { trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); - else if (actual->message && actual->output[0]) + return; + } + + while (actual->message && actual->output[0]) + { trace_(file, line)( " %u: expected: nothing - actual: %s\n", count, actual->output ); + actual++; + count++; + } } #define ok_sequence( exp, contx, todo) \ @@ -6787,6 +6797,18 @@ static void test_accelerators(void) /* this test doesn't pass in Wine for managed windows */ ok_sequence(WmAltPressRelease, "Alt press/release", TRUE); + trace("testing VK_F1 press/release\n"); + keybd_event(VK_F1, 0, 0, 0); + keybd_event(VK_F1, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmF1Seq, "F1 press/release", FALSE); + + trace("testing VK_APPS press/release\n"); + keybd_event(VK_APPS, 0, 0, 0); + keybd_event(VK_APPS, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmVkAppsSeq, "VK_APPS press/release", FALSE); + trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ GetClientRect(hwnd, &rc); @@ -6809,17 +6831,6 @@ static void test_accelerators(void) ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE); } - trace("testing VK_F1 press/release\n"); - keybd_event(VK_F1, 0, 0, 0); - keybd_event(VK_F1, 0, KEYEVENTF_KEYUP, 0); - pump_msg_loop(hwnd, 0); - ok_sequence(WmF1Seq, "F1 press/release", FALSE); - - trace("testing VK_APPS press/release\n"); - keybd_event(VK_APPS, 0, 0, 0); - keybd_event(VK_APPS, 0, KEYEVENTF_KEYUP, 0); - pump_msg_loop(hwnd, 0); - ok_sequence(WmVkAppsSeq, "VK_APPS press/release", FALSE); done: if (hAccel) DestroyAcceleratorTable(hAccel); DestroyWindow(hwnd); @@ -8181,6 +8192,7 @@ todo_wine { static const struct message ScrollWindowPaint1[] = { { WM_PAINT, sent }, { WM_ERASEBKGND, sent|beginpaint }, + { WM_GETTEXTLENGTH, sent|optional }, { 0 } }; @@ -10408,8 +10420,9 @@ static const struct message SetActiveWindowSeq0[] = { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, { WM_KILLFOCUS, sent|defwinproc }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 0 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_SETFOCUS, sent|defwinproc|optional },

1 0

Alexandre Julliard : user32/tests: Add some optional keystrokes for AltGr key.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 2e2b1512a97d04ce4ac23b3be6ca22f12d03fab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2b1512a97d04ce4ac23b3be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 21 12:56:52 2009 +0100 user32/tests: Add some optional keystrokes for AltGr key. --- dlls/user32/tests/input.c | 60 ++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 27 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f025db7..defe142 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -238,8 +238,8 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) ok( msg.message == expmsg[i].message && msg.wParam == expmsg[i].wParam && msg.lParam == expmsg[i].lParam, - "%u: wrong message %x expected %s wParam %04lx lParam %08lx\n", - i, msg.message, MSGNAME[(expmsg[i]).message - WM_KEYFIRST], + "%u/%u: wrong message %x expected %s wParam %04lx lParam %08lx\n", + seqnr, i, msg.message, MSGNAME[(expmsg[i]).message - WM_KEYFIRST], expmsg[i].wParam, expmsg[i].lParam ); } i++; @@ -570,12 +570,14 @@ struct sendinput_test_s { /* RMENU == LMENU */ /* 38 */ {VK_RMENU, 0, 0, - {{VK_MENU, 0x00}, {VK_LMENU, 0x00}, {0}}, - {{WM_SYSKEYDOWN, hook|wparam, VK_RMENU}, + {{VK_MENU, 0x00}, {VK_LMENU, 0x00}, {VK_CONTROL, 0x00, 1}, {VK_LCONTROL, 0x01, 1}, {0}}, + {{WM_SYSKEYDOWN, hook|wparam|optional, VK_LCONTROL}, + {WM_SYSKEYDOWN, hook|wparam, VK_RMENU}, {WM_SYSKEYDOWN, wparam|lparam, VK_MENU, 0}, {0}}}, {VK_RMENU, KEYEVENTF_KEYUP, 1, - {{VK_MENU, 0x80}, {VK_LMENU, 0x80}, {0}}, - {{WM_KEYUP, hook|wparam, VK_RMENU}, + {{VK_MENU, 0x80}, {VK_LMENU, 0x80}, {VK_CONTROL, 0x81, 1}, {VK_LCONTROL, 0x80, 1}, {0}}, + {{WM_KEYUP, hook|wparam|optional, VK_LCONTROL}, + {WM_KEYUP, hook|wparam, VK_RMENU}, {WM_SYSKEYUP, wparam|lparam, VK_MENU, KF_UP}, {WM_SYSCOMMAND}, {0}}}, /* LMENU | KEYEVENTF_EXTENDEDKEY == RMENU */ @@ -592,12 +594,14 @@ struct sendinput_test_s { /* RMENU | KEYEVENTF_EXTENDEDKEY == RMENU */ /* 42 */ {VK_RMENU, KEYEVENTF_EXTENDEDKEY, 0, - {{VK_MENU, 0x00}, {VK_RMENU, 0x00}, {0}}, - {{WM_SYSKEYDOWN, hook|wparam|lparam, VK_RMENU, LLKHF_EXTENDED}, + {{VK_MENU, 0x00}, {VK_RMENU, 0x00}, {VK_CONTROL, 0x00, 1}, {VK_LCONTROL, 0x01, 1}, {0}}, + {{WM_SYSKEYDOWN, hook|wparam|lparam|optional, VK_LCONTROL, 0}, + {WM_SYSKEYDOWN, hook|wparam|lparam, VK_RMENU, LLKHF_EXTENDED}, {WM_SYSKEYDOWN, wparam|lparam, VK_MENU, KF_EXTENDED}, {0}}}, {VK_RMENU, KEYEVENTF_KEYUP | KEYEVENTF_EXTENDEDKEY, 1, - {{VK_MENU, 0x80}, {VK_RMENU, 0x80}, {0}}, - {{WM_KEYUP, hook|wparam|lparam, VK_RMENU, LLKHF_UP|LLKHF_EXTENDED}, + {{VK_MENU, 0x80}, {VK_RMENU, 0x80}, {VK_CONTROL, 0x81, 1}, {VK_LCONTROL, 0x80, 1}, {0}}, + {{WM_KEYUP, hook|wparam|lparam|optional, VK_LCONTROL, LLKHF_UP}, + {WM_KEYUP, hook|wparam|lparam, VK_RMENU, LLKHF_UP|LLKHF_EXTENDED}, {WM_SYSKEYUP, wparam|lparam, VK_MENU, KF_UP|KF_EXTENDED}, {WM_SYSCOMMAND}, {0}}}, /* MENU == LMENU */ @@ -614,12 +618,14 @@ struct sendinput_test_s { /* MENU | KEYEVENTF_EXTENDEDKEY == RMENU */ /* 46 */ {VK_MENU, KEYEVENTF_EXTENDEDKEY, 0, - {{VK_MENU, 0x00}, {VK_RMENU, 0x00}, {0}}, - {{WM_SYSKEYDOWN, hook/*|wparam*/|lparam, VK_MENU, LLKHF_EXTENDED}, + {{VK_MENU, 0x00}, {VK_RMENU, 0x00}, {VK_CONTROL, 0x00, 1}, {VK_LCONTROL, 0x01, 1}, {0}}, + {{WM_SYSKEYDOWN, hook|wparam|lparam|optional, VK_CONTROL, 0}, + {WM_SYSKEYDOWN, hook/*|wparam*/|lparam, VK_MENU, LLKHF_EXTENDED}, {WM_SYSKEYDOWN, wparam|lparam, VK_MENU, KF_EXTENDED}, {0}}}, {VK_MENU, KEYEVENTF_KEYUP | KEYEVENTF_EXTENDEDKEY, 1, - {{VK_MENU, 0x80}, {VK_RMENU, 0x80}, {0}}, - {{WM_KEYUP, hook/*|wparam*/|lparam, VK_MENU, LLKHF_UP|LLKHF_EXTENDED}, + {{VK_MENU, 0x80}, {VK_RMENU, 0x80}, {VK_CONTROL, 0x81, 1}, {VK_LCONTROL, 0x80, 1}, {0}}, + {{WM_KEYUP, hook|wparam|lparam|optional, VK_CONTROL, LLKHF_UP}, + {WM_KEYUP, hook/*|wparam*/|lparam, VK_MENU, LLKHF_UP|LLKHF_EXTENDED}, {WM_SYSKEYUP, wparam|lparam, VK_MENU, KF_UP|KF_EXTENDED}, {WM_SYSCOMMAND}, {0}}}, @@ -660,7 +666,7 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_tes int matched = ((ks1[t->wVk]&0x80) == (t->before_state&0x80) && (ks2[t->wVk]&0x80) == (~t->before_state&0x80)); - if (!matched && test->_todo_wine) + if (!matched && !t->optional && test->_todo_wine) { failcount++; todo_wine { @@ -696,12 +702,13 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_tes if (expected->message == actual->message) { - ok((expected->flags & hook) == (actual->flags & hook), - "%2d (%x/%x): the msg 0x%04x should have been sent by a hook\n", - id, test->wVk, test->dwFlags, expected->message); - if (expected->flags & wparam) { + if ((expected->flags & optional) && (expected->wParam != actual->wParam)) + { + expected++; + continue; + } if (expected->wParam != actual->wParam && test->_todo_wine) { failcount++; @@ -728,6 +735,10 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_tes "%2d (%x/%x): in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", id, test->wVk, test->dwFlags, expected->message, expected->lParam, actual->lParam); } + ok((expected->flags & hook) == (actual->flags & hook), + "%2d (%x/%x): the msg 0x%04x should have been sent by a hook\n", + id, test->wVk, test->dwFlags, expected->message); + } else if (expected->flags & optional) { @@ -841,12 +852,6 @@ static void test_Input_blackbox(void) HWND window; HHOOK hook; - if (!pSendInput) - { - skip("SendInput is not available\n"); - return; - } - window = CreateWindow("Static", NULL, WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, NULL, NULL, NULL, NULL); @@ -1256,9 +1261,10 @@ START_TEST(input) if (!pSendInput) skip("SendInput is not available\n"); else + { + test_Input_blackbox(); test_Input_whitebox(); - - test_Input_blackbox(); + } test_keynames(); test_mouse_ll_hook(); test_key_map();

1 0

Alexandre Julliard : Avoid outputting trailing spaces in sfd files.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: fontforge Branch: master Commit: 37fa1cd216930f21081059b7e8b5bf9473711340 URL: http://source.winehq.org/git/fontforge.git/?a=commit;h=37fa1cd216930f210810… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 19:17:13 2009 +0100 Avoid outputting trailing spaces in sfd files. --- fontforge/sfd.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/fontforge/sfd.c b/fontforge/sfd.c index adb7481..9d5f2a2 100644 --- a/fontforge/sfd.c +++ b/fontforge/sfd.c @@ -191,7 +191,6 @@ static void SFDDumpUTF7Str(FILE *sfd, const char *_str) { utf7_encode(sfd,prev); } putc('"',sfd); - putc(' ',sfd); } @@ -701,7 +700,7 @@ static void SFDDumpAnchorPoints(FILE *sfd,SplineChar *sc) { for ( ap = sc->anchor; ap!=NULL; ap=ap->next ) { fprintf( sfd, "AnchorPoint: " ); SFDDumpUTF7Str(sfd,ap->anchor->name); - fprintf( sfd, "%g %g %s %d", + fprintf( sfd, " %g %g %s %d", (double) ap->me.x, (double) ap->me.y, ap->type==at_centry ? "entry" : ap->type==at_cexit ? "exit" : @@ -1382,7 +1381,10 @@ static void SFDDumpChar(FILE *sfd,SplineChar *sc,EncMap *map,int *newgids) { "LCarets2:", NULL }; fprintf( sfd, "%s ", keywords[pst->type] ); if ( pst->subtable!=NULL ) + { SFDDumpUTF7Str(sfd,pst->subtable->subtable_name ); + putc(' ',sfd); + } if ( pst->type==pst_position ) { fprintf( sfd, "dx=%d dy=%d dh=%d dv=%d", pst->u.pos.xoff, pst->u.pos.yoff, @@ -1408,9 +1410,9 @@ static void SFDDumpChar(FILE *sfd,SplineChar *sc,EncMap *map,int *newgids) { putc('\n',sfd); } else if ( pst->type==pst_lcaret ) { int i; - fprintf( sfd, "%d ", pst->u.lcaret.cnt ); + fprintf( sfd, "%d", pst->u.lcaret.cnt ); for ( i=0; i<pst->u.lcaret.cnt; ++i ) - fprintf( sfd, "%d ", pst->u.lcaret.carets[i] ); + fprintf( sfd, " %d", pst->u.lcaret.carets[i] ); fprintf( sfd, "\n" ); } else fprintf( sfd, "%s\n", pst->u.lig.components ); @@ -1515,8 +1517,12 @@ static int SFDDumpBitmapFont(FILE *sfd,BDFFont *bdf,EncMap *encm,int *newgids, int err = false; ff_progress_next_stage(); - fprintf( sfd, "BitmapFont: %d %d %d %d %d %s\n", bdf->pixelsize, bdf->glyphcnt, - bdf->ascent, bdf->descent, BDFDepth(bdf), bdf->foundry?bdf->foundry:"" ); + if (bdf->foundry) + fprintf( sfd, "BitmapFont: %d %d %d %d %d %s\n", bdf->pixelsize, bdf->glyphcnt, + bdf->ascent, bdf->descent, BDFDepth(bdf), bdf->foundry ); + else + fprintf( sfd, "BitmapFont: %d %d %d %d %d\n", bdf->pixelsize, bdf->glyphcnt, + bdf->ascent, bdf->descent, BDFDepth(bdf) ); if ( bdf->prop_cnt>0 ) { fprintf( sfd, "BDFStartProperties: %d\n", bdf->prop_cnt ); for ( i=0; i<bdf->prop_cnt; ++i ) { @@ -1574,10 +1580,13 @@ static void SFDDumpPrivate(FILE *sfd,struct psdict *private) { static void SFDDumpLangName(FILE *sfd, struct ttflangname *ln) { int i, end; - fprintf( sfd, "LangName: %d ", ln->lang ); + fprintf( sfd, "LangName: %d", ln->lang ); for ( end = ttf_namemax; end>0 && ln->names[end-1]==NULL; --end ); for ( i=0; i<end; ++i ) + { + putc(' ',sfd); SFDDumpUTF7Str(sfd,ln->names[i]); + } putc('\n',sfd); } @@ -1914,10 +1923,10 @@ static int SFD_Dump(FILE *sfd,SplineFont *sf,EncMap *map,EncMap *normal, for ( i=1; i<sf->mark_class_cnt; ++i ) { /* Class 0 is unused */ SFDDumpUTF7Str(sfd, sf->mark_class_names[i]); if ( sf->mark_classes[i]!=NULL ) - fprintf( sfd, "%d %s\n", (int) strlen(sf->mark_classes[i]), + fprintf( sfd, " %d %s\n", (int) strlen(sf->mark_classes[i]), sf->mark_classes[i] ); else - fprintf( sfd, "0 \n" ); + fprintf( sfd, " 0 \n" ); } } fprintf( sfd, "DEI: 91125\n" ); @@ -2169,8 +2178,9 @@ static int SFD_Dump(FILE *sfd,SplineFont *sf,EncMap *map,EncMap *normal, } if ( sf->anchor!=NULL ) { AnchorClass *an; - fprintf(sfd, "AnchorClass2: "); + fprintf(sfd, "AnchorClass2:"); for ( an=sf->anchor; an!=NULL; an=an->next ) { + putc(' ',sfd); SFDDumpUTF7Str(sfd,an->name); putc(' ',sfd); SFDDumpUTF7Str(sfd,an->subtable->subtable_name );

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
97
Older →

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 February 2009