March 2011 - Wine-Commits - list.winehq.org

Francois Gouget : shell32/tests: Add a trailing '\n' to a skip().
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: b7b916b05f1e08b189cacbe5c205fd211e3c3b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b916b05f1e08b189cacbe5c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:37 2011 +0100 shell32/tests: Add a trailing '\n' to a skip(). --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bc3e426..c17694b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3696,7 +3696,7 @@ void test_ShellItemGetAttributes(void) } if(FAILED(hr)) { - skip("Skipping tests."); + skip("Skipping tests.\n"); return; }

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 41663974ad054e51117780a9bff70e928ea946f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41663974ad054e51117780a9b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:57 2011 +0100 d3dx9_36/tests: Add a trailing '\n' to ok() calls. --- dlls/d3dx9_36/tests/mesh.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a6ac4b3..f460c2d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1377,7 +1377,7 @@ static void D3DXCreateBoxTest(void) wnd = CreateWindow("d3dx9_test_wc", "d3dx9_test", WS_SYSMENU | WS_POPUP , 0, 0, 640, 480, 0, 0, 0, 0); - ok(wnd != NULL, "Expected to have a window, received NULL"); + ok(wnd != NULL, "Expected to have a window, received NULL\n"); if (!wnd) { skip("Couldn't create application window\n"); @@ -1405,26 +1405,26 @@ static void D3DXCreateBoxTest(void) } hr = D3DXCreateBuffer(36 * sizeof(DWORD), &ppBuffer); - ok(hr==D3D_OK, "Expected D3D_OK, received %#x", hr); + ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) goto end; hr = D3DXCreateBox(device,2.0f,20.0f,4.9f,NULL, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(NULL,22.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,-2.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,-20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3D_OK,"Expected D3D_OK, received %#x", hr); + todo_wine ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) {

1 0

Francois Gouget : comctl32: Add a trailing '\n' to an ERR() call.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: af104705977c27698d1d72468e9c6ad18078c2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af104705977c27698d1d72468… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:49 2011 +0100 comctl32: Add a trailing '\n' to an ERR() call. --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4235592..cc3c8a7 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2116,7 +2116,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) REBAR_BAND *hitBand, *rowBeginBand; if(infoPtr->uNumBands <= 0) - ERR("There are no bands in this rebar"); + ERR("There are no bands in this rebar\n"); /* Up/down dragging can only occur when there is more than one * band in the rebar */

1 0

Francois Gouget : comcat/tests: Add a '\n' to a pair of ok() calls.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 4c89a83a5a98e9b6b2d9767a8882bd9015451d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c89a83a5a98e9b6b2d9767a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:04 2011 +0100 comcat/tests: Add a '\n' to a pair of ok() calls. --- dlls/comcat/tests/comcat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index cf0b7c1..f78e234 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -104,7 +104,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x", hr); + ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x\n", hr); ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); IEnumGUID_Release(pIEnum); @@ -114,7 +114,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_OK,"Expected S_OK, got 0x%08x", hr); + ok (hr == S_OK,"Expected S_OK, got 0x%08x\n", hr); ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n");

1 0

Francois Gouget : gdi32/tests: Add a '\n' to an ok() call.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 53bcd3edb578797a2546c2e1f2795b6cb6efdd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bcd3edb578797a2546c2e1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:37 2011 +0100 gdi32/tests: Add a '\n' to an ok() call. --- dlls/gdi32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 4b061f9..f4b83e2 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -89,7 +89,7 @@ static void test_widenpath(void) Polyline(hdc, pnt, 6); EndPath(hdc); ret = WidenPath(hdc); - ok(ret == TRUE, "WidenPath failed: %d", GetLastError()); + ok(ret == TRUE, "WidenPath failed: %d\n", GetLastError()); nSize = GetPath(hdc, NULL, NULL, 0); ok(nSize > 6, "WidenPath should compute a widdened path with a 1px wide pen. Path length is %d, should be more than 6\n", nSize);

1 0

Francois Gouget : comctl32/tests: Add a '\n' to a pair of ok() calls.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 755648421e8b6c1cff52317865aaa5653281d409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755648421e8b6c1cff5231786… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:23 2011 +0100 comctl32/tests: Add a '\n' to a pair of ok() calls. --- dlls/comctl32/tests/comboex.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index ca30482..59c261c 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -405,7 +405,7 @@ static void test_WM_WINDOWPOSCHANGING(void) wp.hwndInsertAfter = NULL; ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); - ok(ret == 0, "expected 0, got %x", ret); + ok(ret == 0, "expected 0, got %x\n", ret); ok(wp.cy == combo_height, "Expected height %d, got %d\n", combo_height, wp.cy); @@ -419,7 +419,7 @@ static void test_WM_WINDOWPOSCHANGING(void) wp.hwndInsertAfter = NULL; ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); - ok(ret == 0, "expected 0, got %x", ret); + ok(ret == 0, "expected 0, got %x\n", ret); ok(wp.cy == combo_height, "Expected height %d, got %d\n", combo_height, wp.cy);

1 0

Alexandre Julliard : server: Fix the contents of the mouse data for the low-level hook.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 34efca05c902864016fdbc81dd659360616f505d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34efca05c902864016fdbc81d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 11:07:35 2011 +0100 server: Fix the contents of the mouse data for the low-level hook. --- server/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index d1aa715..97e0c4d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1362,7 +1362,7 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa if (input->kbd.flags & KEYEVENTF_UNICODE) vkey = VK_PACKET; msg->lparam = (input->kbd.scan << 16) | vkey; } - else msg->lparam = input->mouse.data; + else msg->lparam = input->mouse.data << 16; if (!(msg->data = memdup( hardware_msg->data, hardware_msg->data_size )) || !(msg->result = alloc_message_result( sender, queue, msg, timeout )))

1 0

Alexandre Julliard : user32: Set the last mouse event timestamp before calling the low-level hook.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 55e1fec7c3b041de21d08571cd3d3b22328bcc0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e1fec7c3b041de21d08571c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 11:07:15 2011 +0100 user32: Set the last mouse event timestamp before calling the low-level hook. --- dlls/user32/input.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 056dd68..06553a4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -124,9 +124,11 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) */ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) { - NTSTATUS status = send_hardware_message( hwnd, input, 0 ); + NTSTATUS status; + + if (input->type == INPUT_MOUSE) last_mouse_event = GetTickCount(); + status = send_hardware_message( hwnd, input, 0 ); if (status) SetLastError( RtlNtStatusToDosError(status) ); - else if (input->type == INPUT_MOUSE) last_mouse_event = GetTickCount(); return !status; } @@ -181,11 +183,10 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) { /* we need to update the coordinates to what the server expects */ INPUT input = inputs[i]; + last_mouse_event = GetTickCount(); update_mouse_coords( &input ); if (!(status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ))) { - last_mouse_event = GetTickCount(); - if ((input.u.mi.dwFlags & MOUSEEVENTF_MOVE) && ((input.u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) || input.u.mi.dx || input.u.mi.dy)) {

1 0

Alexandre Julliard : advapi32: Fix array size construct that gcc doesn' t like.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 5055ec63a70ff365a7719e9967e0813246bf1002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5055ec63a70ff365a7719e996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 11:06:51 2011 +0100 advapi32: Fix array size construct that gcc doesn't like. --- dlls/advapi32/registry.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index abaf09d..d5c4164 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -43,10 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA -#define NB_SPECIAL_ROOT_KEYS ((UINT_PTR)HKEY_SPECIAL_ROOT_LAST - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST + 1) - -static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; -static BOOL hkcu_cache_disabled; static const WCHAR name_CLASSES_ROOT[] = {'M','a','c','h','i','n','e','\\', @@ -67,7 +63,7 @@ static const WCHAR name_CURRENT_CONFIG[] = static const WCHAR name_DYN_DATA[] = {'D','y','n','D','a','t','a',0}; -static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = +static const WCHAR * const root_key_names[] = { name_CLASSES_ROOT, NULL, /* HKEY_CURRENT_USER is determined dynamically */ @@ -78,6 +74,11 @@ static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = name_DYN_DATA }; +#define NB_SPECIAL_ROOT_KEYS (sizeof(root_key_names)/sizeof(root_key_names[0])) + +static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; +static BOOL hkcu_cache_disabled; + static const int is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */

1 0

Aric Stewart : ws2_32: async_send with no buffers does not need to do any work.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: f520dec3e1fee260f42f4eb28d033d7b177f94d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f520dec3e1fee260f42f4eb28… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 4 12:09:44 2011 -0600 ws2_32: async_send with no buffers does not need to do any work. --- dlls/ws2_32/socket.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f74fd36..1993419 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1797,6 +1797,12 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu switch (status) { case STATUS_ALERTED: + if ( wsa->n_iovecs <= wsa->first_iovec ) + { + /* Nothing to do */ + status = STATUS_SUCCESS; + break; + } if ((status = wine_server_handle_to_fd( wsa->hSocket, FILE_WRITE_DATA, &fd, NULL ) )) break;

1 0