wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Francois Gouget : shell32/tests: Add a trailing '\n' to a skip().
by Alexandre Julliard 07 Mar '11

07 Mar '11

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 : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: bf75229a0402b8eca8e2f41ded1e69830b587eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf75229a0402b8eca8e2f41de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:15 2011 +0100 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/printf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index f05d124..ddf4801 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -859,7 +859,7 @@ static void test_xcvt(void) for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); - ok(err == 0, "_fcvt_s() failed with error code %d", err); + ok(err == 0, "_fcvt_s() failed with error code %d\n", err); ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), "_fcvt_s() bad return, got '%s' expected '%s'. test %d\n", str, test_cvt_testcases[i].expstr_f, i);

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 07 Mar '11

07 Mar '11

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 : mscoree: Add a '\n' to an ERR() trace.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: e0b2307f9c6208d7672a03338e6f84e8966fd2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b2307f9c6208d7672a03338… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:29 2011 +0100 mscoree: Add a '\n' to an ERR() trace. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 708f638..ca4795e 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -119,7 +119,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if ((*result)->is_shutdown) { - ERR("Cannot load Mono after it has been shut down."); + ERR("Cannot load Mono after it has been shut down.\n"); *result = NULL; return E_FAIL; }

1 0

Francois Gouget : wscript/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: bc6a7f40d5bb02483a166fe388e1cc81195cbcda URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6a7f40d5bb02483a166fe38… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:42 2011 +0100 wscript/tests: Add a '\n' to an ok() call. --- programs/wscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 7cb7bc8..405aae4 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -272,7 +272,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG script_size--; ext = strrchr(name, '.'); - ok(ext != NULL, "no script extension"); + ok(ext != NULL, "no script extension\n"); if(!ext) return TRUE;

1 0

Francois Gouget : comctl32/tests: Add a '\n' to a pair of ok() calls.
by Alexandre Julliard 07 Mar '11

07 Mar '11

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

Francois Gouget : d3dcompiler_43: Add a '\n' to a couple of FIXME() traces.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: fdf97125cb886c0cf90eea6f6d2e2b70096d5d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf97125cb886c0cf90eea6f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:13 2011 +0100 d3dcompiler_43: Add a '\n' to a couple of FIXME() traces. --- dlls/d3dcompiler_43/reflection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 006dc40..3ebb6ec 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1247,7 +1247,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type hr = d3dcompiler_parse_type_members(type->reflection, &members[i], data, &ptr2); if (hr != S_OK) { - FIXME("Failed to parse type members."); + FIXME("Failed to parse type members.\n"); goto err_out; } } @@ -1522,7 +1522,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset); if (hr != S_OK) { - FIXME("Failed to parse variables."); + FIXME("Failed to parse variables.\n"); goto err_out; }

1 0

Aric Stewart : ws2_32: async_send with no buffers does not need to do any work.
by Alexandre Julliard 07 Mar '11

07 Mar '11

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

Alexandre Julliard : server: Fix the contents of the mouse data for the low-level hook.
by Alexandre Julliard 07 Mar '11

07 Mar '11

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 07 Mar '11

07 Mar '11

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

← Newer
1
...
70
71
72
73
74
75
76
...
85
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 March 2011