wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Henri Verbeet : d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: cc0c7d727b62f6d9ee2cfda60b5bbcc7279281ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc0c7d727b62f6d9ee2cfda6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:56 2018 +0330 d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e513549..1e7c0ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1750,13 +1750,13 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, WARN("Colour fills are not allowed on surfaces with resource access %#x.\n", desc.access); return D3DERR_INVALIDCALL; } - if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) + if ((desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_SHADER_RESOURCE)) == WINED3D_BIND_SHADER_RESOURCE) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; } - if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n");

1 0

Henri Verbeet : d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 86a0f486c6b891853a6a09aebb46615e140716bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a0f486c6b891853a6a09ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:55 2018 +0330 d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4f5a43..e513549 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1668,13 +1668,13 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } - if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + if (dst->texture && !(dst_desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) { WARN("Destination is a regular texture.\n"); goto done; } - if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (src_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { if (device->in_scene) {

1 0

Henri Verbeet : d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 5731069addd04d2526b5dd458bd549e8d70b7904 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5731069addd04d2526b5dd45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:54 2018 +0330 d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 27b32fa..b05df7e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1267,7 +1267,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", src_surface); wined3d_mutex_unlock(); @@ -1278,7 +1278,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_h = wined3d_desc.height; wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Destination %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", dst_surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in wined3d_device_set_rendertarget_view ().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: b93cfc18faa9d45db35584378c7b0d71f2ac63d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b93cfc18faa9d45db3558437… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:53 2018 +0330 wined3d: Prefer bind flags over usage flags in wined3d_device_set_rendertarget_view(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5515b27..1af76f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4461,9 +4461,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (view && !(view->resource->usage & WINED3DUSAGE_RENDERTARGET)) + if (view && !(view->resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) { - WARN("View resource %p doesn't have render target usage.\n", view->resource); + WARN("View resource %p doesn't have render target bind flags.\n", view->resource); return WINED3DERR_INVALIDCALL; }

1 0

Alexandre Julliard : user32/tests: Add tests for GetCurrentInputMessageSource().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 542150afe578c2e460c0b4a94c55accd95096877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=542150afe578c2e460c0b4a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 13:01:18 2018 +0100 user32/tests: Add tests for GetCurrentInputMessageSource(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 154 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 147 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 03b8400..14fd5f8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -77,6 +77,7 @@ static struct { } key_status; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); +static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); @@ -156,14 +157,13 @@ static void init_function_pointers(void) HMODULE hdll = GetModuleHandleA("user32"); #define GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hdll, #func); \ - if(!p ## func) \ - trace("GetProcAddress(%s) failed\n", #func); - - GET_PROC(SendInput) - GET_PROC(GetMouseMovePointsEx) - GET_PROC(GetRawInputDeviceList) + if (!(p ## func = (void*)GetProcAddress(hdll, #func))) \ + trace("GetProcAddress(%s) failed\n", #func) + GET_PROC(SendInput); + GET_PROC(GetCurrentInputMessageSource); + GET_PROC(GetMouseMovePointsEx); + GET_PROC(GetRawInputDeviceList); #undef GET_PROC } @@ -2487,6 +2487,7 @@ static void test_GetKeyState(void) result = WaitForSingleObject(semaphores[0], 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + SetForegroundWindow(hwnd); SetFocus(hwnd); keybd_event('X', 0, 0, 0); @@ -2540,9 +2541,141 @@ static void test_OemKeyScan(void) } } +static INPUT_MESSAGE_SOURCE expect_src; + +static LRESULT WINAPI msg_source_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) +{ + INPUT_MESSAGE_SOURCE source; + MSG msg; + + ok( pGetCurrentInputMessageSource( &source ), "GetCurrentInputMessageSource failed\n" ); + switch (message) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + ok( source.deviceType == expect_src.deviceType || /* also accept system-generated WM_MOUSEMOVE */ + (message == WM_MOUSEMOVE && source.deviceType == IMDT_UNAVAILABLE), + "%x: wrong deviceType %x/%x\n", message, source.deviceType, expect_src.deviceType ); + ok( source.originId == expect_src.originId || + (message == WM_MOUSEMOVE && source.originId == IMO_SYSTEM), + "%x: wrong originId %x/%x\n", message, source.originId, expect_src.originId ); + SendMessageA( hwnd, WM_USER, 0, 0 ); + PostMessageA( hwnd, WM_USER, 0, 0 ); + if (PeekMessageW( &msg, hwnd, WM_USER, WM_USER, PM_REMOVE )) DispatchMessageW( &msg ); + ok( source.deviceType == expect_src.deviceType || /* also accept system-generated WM_MOUSEMOVE */ + (message == WM_MOUSEMOVE && source.deviceType == IMDT_UNAVAILABLE), + "%x: wrong deviceType %x/%x\n", message, source.deviceType, expect_src.deviceType ); + ok( source.originId == expect_src.originId || + (message == WM_MOUSEMOVE && source.originId == IMO_SYSTEM), + "%x: wrong originId %x/%x\n", message, source.originId, expect_src.originId ); + break; + default: + ok( source.deviceType == IMDT_UNAVAILABLE, "%x: wrong deviceType %x\n", + message, source.deviceType ); + ok( source.originId == 0, "%x: wrong originId %x\n", message, source.originId ); + break; + } + + return DefWindowProcA( hwnd, message, wp, lp ); +} + +static void test_input_message_source(void) +{ + WNDCLASSA cls; + TEST_INPUT inputs[2]; + HWND hwnd; + RECT rc; + MSG msg; + + cls.style = 0; + cls.lpfnWndProc = msg_source_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = 0; + cls.lpszMenuName = NULL; + cls.lpszClassName = "message source class"; + RegisterClassA(&cls); + hwnd = CreateWindowA( cls.lpszClassName, "test", WS_OVERLAPPED, 0, 0, 100, 100, + 0, 0, 0, 0 ); + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + SetForegroundWindow( hwnd ); + SetFocus( hwnd ); + + inputs[0].type = INPUT_KEYBOARD; + inputs[0].u.ki.dwExtraInfo = 0; + inputs[0].u.ki.time = 0; + inputs[0].u.ki.wVk = 0; + inputs[0].u.ki.wScan = 0x3c0; + inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; + inputs[1] = inputs[0]; + inputs[1].u.ki.dwFlags |= KEYEVENTF_KEYUP; + + expect_src.deviceType = IMDT_UNAVAILABLE; + expect_src.originId = IMO_UNAVAILABLE; + SendMessageA( hwnd, WM_KEYDOWN, 0, 0 ); + SendMessageA( hwnd, WM_MOUSEMOVE, 0, 0 ); + + pSendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + expect_src.deviceType = IMDT_KEYBOARD; + expect_src.originId = IMO_INJECTED; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + GetWindowRect( hwnd, &rc ); + simulate_click( TRUE, (rc.left + rc.right) / 2, (rc.top + rc.bottom) / 2 ); + simulate_click( FALSE, (rc.left + rc.right) / 2 + 1, (rc.top + rc.bottom) / 2 + 1 ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + expect_src.deviceType = IMDT_MOUSE; + expect_src.originId = IMO_INJECTED; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + expect_src.deviceType = IMDT_UNAVAILABLE; + expect_src.originId = IMO_UNAVAILABLE; + SendMessageA( hwnd, WM_KEYDOWN, 0, 0 ); + SendMessageA( hwnd, WM_LBUTTONDOWN, 0, 0 ); + PostMessageA( hwnd, WM_KEYUP, 0, 0 ); + PostMessageA( hwnd, WM_LBUTTONUP, 0, 0 ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + expect_src.deviceType = IMDT_UNAVAILABLE; + expect_src.originId = IMO_SYSTEM; + SetCursorPos( (rc.left + rc.right) / 2 - 1, (rc.top + rc.bottom) / 2 - 1 ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + DestroyWindow( hwnd ); + UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) ); +} + START_TEST(input) { + POINT pos; + init_function_pointers(); + GetCursorPos( &pos ); if (pSendInput) { @@ -2574,4 +2707,11 @@ START_TEST(input) test_GetRawInputDeviceList(); else win_skip("GetRawInputDeviceList is not available\n"); + + if (pGetCurrentInputMessageSource) + test_input_message_source(); + else + win_skip("GetCurrentInputMessageSource is not available\n"); + + SetCursorPos( pos.x, pos.y ); }

1 0

Alexandre Julliard : user32: Implement GetCurrentInputMessageSource().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 4da1c4370be6515bf64c185e6b55a305247c754b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da1c4370be6515bf64c185e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 13:01:08 2018 +0100 user32: Implement GetCurrentInputMessageSource(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 18 ++++++++++++++++-- dlls/user32/user_private.h | 7 ++++--- include/wine/server_protocol.h | 15 +++++++++++---- server/protocol.def | 13 ++++++++++--- server/queue.c | 35 +++++++++++++++++++++-------------- 5 files changed, 62 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4da1c4370be6515bf64c…

1 0

Alexandre Julliard : user32: Add stub for GetCurrentInputMessageSource().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 771123afb696eecb50d3f0253d433811311130d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=771123afb696eecb50d3f025… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 12:58:33 2018 +0100 user32: Add stub for GetCurrentInputMessageSource(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +- dlls/user32/message.c | 10 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 25 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec index 3a043dc..93ecc1b 100644 --- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall EnableMouseInPointer(long) user32.EnableMouseInPointer -@ stub GetCurrentInputMessageSource +@ stdcall GetCurrentInputMessageSource(ptr) user32.GetCurrentInputMessageSource @ stub GetPointerCursorId @ stub GetPointerDevice @ stub GetPointerDeviceProperties diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1554fbf..9bfeb16 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4132,6 +4132,16 @@ LPARAM WINAPI SetMessageExtraInfo(LPARAM lParam) /*********************************************************************** + * GetCurrentInputMessageSource (USER32.@) + */ +BOOL WINAPI GetCurrentInputMessageSource( INPUT_MESSAGE_SOURCE *source ) +{ + FIXME( "stub\n" ); + return FALSE; +} + + +/*********************************************************************** * WaitMessage (USER.112) Suspend thread pending messages * WaitMessage (USER32.@) Suspend thread pending messages * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a340e02..d5b8597 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -280,6 +280,7 @@ @ stdcall GetClipboardSequenceNumber () @ stdcall GetClipboardViewer() @ stdcall GetComboBoxInfo(long ptr) +@ stdcall GetCurrentInputMessageSource(ptr) @ stdcall GetCursor() @ stdcall GetCursorFrameInfo(long long long ptr ptr) @ stdcall GetCursorInfo(ptr) diff --git a/include/winuser.h b/include/winuser.h index d09f8cd..693965a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -674,6 +674,30 @@ typedef struct tagGUITHREADINFO #define GUI_POPUPMENUMODE 0x00000010 #define GUI_16BITTASK 0x00000020 +typedef enum tagINPUT_MESSAGE_DEVICE_TYPE +{ + IMDT_UNAVAILABLE = 0x00, + IMDT_KEYBOARD = 0x01, + IMDT_MOUSE = 0x02, + IMDT_TOUCH = 0x04, + IMDT_PEN = 0x08, + IMDT_TOUCHPAD = 0x10, +} INPUT_MESSAGE_DEVICE_TYPE; + +typedef enum tagINPUT_MESSAGE_ORIGIN_ID +{ + IMO_UNAVAILABLE = 0x00, + IMO_HARDWARE = 0x01, + IMO_INJECTED = 0x02, + IMO_SYSTEM = 0x04, +} INPUT_MESSAGE_ORIGIN_ID; + +typedef struct tagINPUT_MESSAGE_SOURCE +{ + INPUT_MESSAGE_DEVICE_TYPE deviceType; + INPUT_MESSAGE_ORIGIN_ID originId; +} INPUT_MESSAGE_SOURCE; + /***** Dialogs *****/ @@ -3718,6 +3742,7 @@ WINUSERAPI DWORD WINAPI GetClipboardSequenceNumber(VOID); WINUSERAPI HWND WINAPI GetClipboardViewer(void); WINUSERAPI BOOL WINAPI GetClipCursor(LPRECT); WINUSERAPI BOOL WINAPI GetComboBoxInfo(HWND,PCOMBOBOXINFO); +WINUSERAPI BOOL WINAPI GetCurrentInputMessageSource(INPUT_MESSAGE_SOURCE*); WINUSERAPI HCURSOR WINAPI GetCursor(void); WINUSERAPI BOOL WINAPI GetCursorInfo(PCURSORINFO); WINUSERAPI HCURSOR WINAPI GetCursorFrameInfo(HCURSOR,DWORD,DWORD,DWORD*,DWORD*);

1 0

Alexandre Julliard : server: Add a helper function to allocate a hardware message.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 383cf211da7c19855bf7d04e2f8926b64560e34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=383cf211da7c19855bf7d04e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 12:32:24 2018 +0100 server: Add a helper function to allocate a hardware message. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 110 ++++++++++++++++----------------------------------------- 1 file changed, 30 insertions(+), 80 deletions(-) diff --git a/server/queue.c b/server/queue.c index f274dfb..75070a7 100644 --- a/server/queue.c +++ b/server/queue.c @@ -339,31 +339,39 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ return 1; } -/* set the cursor position and queue the corresponding mouse message */ -static void set_cursor_pos( struct desktop *desktop, int x, int y ) +/* allocate a hardware message and its data */ +static struct message *alloc_hardware_message( lparam_t info, unsigned int time ) { struct hardware_msg_data *msg_data; struct message *msg; - if (!(msg = mem_alloc( sizeof(*msg) ))) return; + if (!(msg = mem_alloc( sizeof(*msg) ))) return NULL; if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) { free( msg ); - return; + return NULL; } - memset( msg_data, 0, sizeof(*msg_data) ); - + memset( msg, 0, sizeof(*msg) ); msg->type = MSG_HARDWARE; - msg->win = 0; - msg->msg = WM_MOUSEMOVE; - msg->wparam = 0; - msg->lparam = 0; - msg->x = x; - msg->y = y; - msg->time = get_tick_count(); - msg->result = NULL; + msg->time = time; msg->data = msg_data; msg->data_size = sizeof(*msg_data); + + memset( msg_data, 0, sizeof(*msg_data) ); + msg_data->info = info; + return msg; +} + +/* set the cursor position and queue the corresponding mouse message */ +static void set_cursor_pos( struct desktop *desktop, int x, int y ) +{ + struct message *msg; + + if (!(msg = alloc_hardware_message( 0, get_tick_count() ))) return; + + msg->msg = WM_MOUSEMOVE; + msg->x = x; + msg->y = y; queue_hardware_message( desktop, msg, 1 ); } @@ -1639,24 +1647,14 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if ((device = current->process->rawinput_mouse)) { - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } + if (!(msg = alloc_hardware_message( input->mouse.info, time ))) return 0; + msg_data = msg->data; - msg->type = MSG_HARDWARE; msg->win = device->target; msg->msg = WM_INPUT; msg->wparam = RIM_INPUT; msg->lparam = 0; - msg->time = time; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg->result = NULL; - msg_data->info = input->mouse.info; msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; @@ -1672,26 +1670,15 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if (!(flags & (1 << i))) continue; flags &= ~(1 << i); - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } - memset( msg_data, 0, sizeof(*msg_data) ); + if (!(msg = alloc_hardware_message( input->mouse.info, time ))) return 0; + msg_data = msg->data; - msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); msg->msg = messages[i]; msg->wparam = input->mouse.data << 16; msg->lparam = 0; msg->x = x; msg->y = y; - msg->time = time; - msg->result = NULL; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg_data->info = input->mouse.info; if (hook_flags & SEND_HWMSG_INJECTED) msg_data->flags = LLMHF_INJECTED; /* specify a sender only when sending the last message */ @@ -1783,26 +1770,15 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } + if (!(msg = alloc_hardware_message( input->kbd.info, time ))) return 0; + msg_data = msg->data; + if ((device = current->process->rawinput_kbd)) { - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } - - msg->type = MSG_HARDWARE; msg->win = device->target; msg->msg = WM_INPUT; msg->wparam = RIM_INPUT; - msg->lparam = 0; - msg->time = time; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg->result = NULL; - msg_data->info = input->kbd.info; msg_data->flags = input->kbd.flags; msg_data->rawinput.type = RIM_TYPEKEYBOARD; msg_data->rawinput.kbd.message = message_code; @@ -1812,23 +1788,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c queue_hardware_message( desktop, msg, 0 ); } - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } - memset( msg_data, 0, sizeof(*msg_data) ); - - msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); msg->msg = message_code; msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */ - msg->time = time; - msg->result = NULL; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg_data->info = input->kbd.info; if (hook_flags & SEND_HWMSG_INJECTED) msg_data->flags = LLKHF_INJECTED; if (input->kbd.flags & KEYEVENTF_UNICODE) @@ -1858,28 +1820,16 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c static void queue_custom_hardware_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input ) { - struct hardware_msg_data *msg_data; struct message *msg; - if (!(msg = mem_alloc( sizeof(*msg) ))) return; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return; - } - memset( msg_data, 0, sizeof(*msg_data) ); + if (!(msg = alloc_hardware_message( 0, get_tick_count() ))) return; - msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); msg->msg = input->hw.msg; msg->wparam = 0; msg->lparam = input->hw.lparam; msg->x = desktop->cursor.x; msg->y = desktop->cursor.y; - msg->time = get_tick_count(); - msg->result = NULL; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); queue_hardware_message( desktop, msg, 1 ); }

1 0

Gabriel Ivăncescu : shell32/tests: Test the amount of enumerator resets for AutoComplete.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: d5e765555587514b3565536634383be878f3f550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e765555587514b35655366… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 2 16:50:41 2018 +0200 shell32/tests: Test the amount of enumerator resets for AutoComplete. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 66bd472..8265bf9 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -274,6 +274,7 @@ struct string_enumerator WCHAR **data; int data_len; int cur; + UINT num_resets; UINT num_expand; WCHAR last_expand[32]; }; @@ -349,6 +350,7 @@ static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) struct string_enumerator *this = impl_from_IEnumString(iface); this->cur = 0; + this->num_resets++; return S_OK; } @@ -456,6 +458,7 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) static WCHAR str2[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a',0}; static WCHAR str2a[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\',0}; static WCHAR str2b[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a','z','_','b','b','q','\\',0}; + obj->num_resets = 0; ok(obj->num_expand == 0, "Expected 0 expansions, got %u\n", obj->num_expand); SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str1); @@ -464,12 +467,14 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) dispatch_messages(); ok(obj->num_expand == 1, "Expected 1 expansion, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str2); SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str2) - 1, ARRAY_SIZE(str2) - 1); SendMessageW(hwnd_edit, WM_CHAR, 'z', 1); dispatch_messages(); ok(obj->num_expand == 2, "Expected 2 expansions, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str2a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str2a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); SetFocus(hwnd_edit); SendMessageW(hwnd_edit, WM_CHAR, '_', 1); SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); @@ -479,20 +484,24 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) SendMessageW(hwnd_edit, WM_CHAR, 'q', 1); dispatch_messages(); ok(obj->num_expand == 2, "Expected 2 expansions, got %u\n", obj->num_expand); + ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, WM_CHAR, '\\', 1); dispatch_messages(); ok(obj->num_expand == 3, "Expected 3 expansions, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str2b) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str2b), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 3, "Expected 3 resets, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1a) - 1, -1); SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); SendMessageW(hwnd_edit, WM_CHAR, 'y', 1); dispatch_messages(); ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 4, "Expected 4 resets, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1) - 1, -1); SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); dispatch_messages(); ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); + ok(obj->num_resets == 5, "Expected 5 resets, got %u\n", obj->num_resets); } static void test_custom_source(void) @@ -502,6 +511,7 @@ static void test_custom_source(void) static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; static WCHAR str_au[] = {'a','u',0}; static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; + struct string_enumerator *obj; IUnknown *enumerator; IAutoComplete2 *autocomplete; HWND hwnd_edit; @@ -516,6 +526,7 @@ static void test_custom_source(void) ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); string_enumerator_create((void**)&enumerator, suggestions, ARRAY_SIZE(suggestions)); + obj = (struct string_enumerator*)enumerator; hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); @@ -528,11 +539,14 @@ static void test_custom_source(void) dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); SendMessageW(hwnd_edit, WM_CHAR, '\b', 1); dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(buffer[0] == '\0', "Expected empty string, got %s\n", wine_dbgstr_w(buffer)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); + obj->num_resets = 0; /* hijack the window procedure */ HijackerWndProc_prev = (WNDPROC)SetWindowLongPtrW(hwnd_edit, GWLP_WNDPROC, (LONG_PTR)HijackerWndProc); @@ -545,6 +559,7 @@ static void test_custom_source(void) dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_au, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_au), wine_dbgstr_w(buffer)); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); SendMessageW(hwnd_edit, WM_CHAR, '\b', 1); dispatch_messages(); @@ -558,6 +573,7 @@ static void test_custom_source(void) dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + ok(obj->num_resets == 2, "Expected 2 resets, got %u\n", obj->num_resets); /* end of hijacks */ test_aclist_expand(hwnd_edit, enumerator);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Reset the enumerator when the text is empty even when auto-suggest is disabled.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 9a41584c4948a36cdc4b52f8d1746d579b63562b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a41584c4948a36cdc4b52f8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 2 16:50:40 2018 +0200 shell32/autocomplete: Reset the enumerator when the text is empty even when auto-suggest is disabled. This is needed for auto-append only AutoComplete controls. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 3e55202..a6404ca 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -454,7 +454,8 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (flag != autoappend_flag_displayempty && len == 0) { if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox, TRUE); + hide_listbox(ac, ac->hwndListBox, FALSE); + free_enum_strs(ac); return; }

1 0

← Newer
1
...
87
88
89
90
91
92
93
...
96
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 November 2018