wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Zebediah Figura : user32/tests: Add some more tests related to the RAWINPUT structure.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: ac5f064521e20ead01829914f392d801d3099fa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac5f064521e20ead01829914… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 13 01:45:41 2022 -0500 user32/tests: Add some more tests related to the RAWINPUT structure. --- dlls/user32/tests/input.c | 96 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6232a7456e8..0d003c6cc21 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2101,13 +2101,29 @@ static void test_RegisterRawInputDevices(void) static int rawinputbuffer_wndproc_count; +typedef struct +{ + DWORD dwType; + DWORD dwSize; + ULONG hDevice; + ULONG wParam; +} RAWINPUTHEADER32; + #ifdef _WIN64 +typedef RAWINPUTHEADER RAWINPUTHEADER64; typedef RAWINPUT RAWINPUT64; #else typedef struct { - RAWINPUTHEADER header; - char pad[8]; + DWORD dwType; + DWORD dwSize; + ULONGLONG hDevice; + ULONGLONG wParam; +} RAWINPUTHEADER64; + +typedef struct +{ + RAWINPUTHEADER64 header; union { RAWMOUSE mouse; RAWKEYBOARD keyboard; @@ -2124,9 +2140,9 @@ static int rawinput_buffer_mouse_x(void *buffer, size_t index) static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + UINT i, size, count, rawinput_size, iteration = rawinputbuffer_wndproc_count++; RAWINPUT ri; char buffer[16 * sizeof(RAWINPUT64)]; - UINT size, count, rawinput_size, iteration = rawinputbuffer_wndproc_count++; MSG message; if (is_wow64) rawinput_size = sizeof(RAWINPUT64); @@ -2134,8 +2150,10 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara if (msg == WM_INPUT) { + SetLastError(0xdeadbeef); count = GetRawInputBuffer(NULL, NULL, sizeof(RAWINPUTHEADER)); ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); size = sizeof(buffer); count = GetRawInputBuffer(NULL, &size, sizeof(RAWINPUTHEADER)); @@ -2147,6 +2165,27 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); ok(count == 3, "GetRawInputBuffer returned %u\n", count); ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size); + + for (i = 0; i < 3; ++i) + { + if (is_wow64) + { + const RAWINPUT64 *data = &((RAWINPUT64 *)buffer)[i]; + ok(data->header.dwType == RIM_TYPEMOUSE, "Unexpected rawinput type: %lu\n", data->header.dwType); + ok(data->header.dwSize == sizeof(*data), "Unexpected rawinput size: %lu\n", data->header.dwSize); + todo_wine_if (wparam) + ok(data->header.wParam == wparam, "Unexpected wparam: %#I64x\n", data->header.wParam); + } + else + { + const RAWINPUT *data = &((RAWINPUT *)buffer)[i]; + ok(data->header.dwType == RIM_TYPEMOUSE, "Unexpected rawinput type: %lu\n", data->header.dwType); + ok(data->header.dwSize == sizeof(*data), "Unexpected rawinput size: %lu\n", data->header.dwSize); + todo_wine_if (wparam) + ok(data->header.wParam == wparam, "Unexpected wparam: %#Ix\n", data->header.wParam); + } + } + ok(rawinput_buffer_mouse_x(buffer, 0) == 2, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 0)); ok(rawinput_buffer_mouse_x(buffer, 1) == 3, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 1)); ok(rawinput_buffer_mouse_x(buffer, 2) == 4, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 2)); @@ -2183,7 +2222,12 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara { SetLastError(0xdeadbeef); count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, 0); - ok(count == ~0U, "GetRawInputData succeeded\n"); + ok(count == ~0u, "GetRawInputData returned %d\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER) + 1); + ok(count == ~0u, "GetRawInputData returned %d\n", count); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2204,6 +2248,30 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara ok(count == sizeof(ri), "GetRawInputData failed\n"); ok(ri.data.mouse.lLastX == 6, "Unexpected rawinput data: %ld\n", ri.data.mouse.lLastX); ok(GetLastError() == 0xdeadbeef, "GetRawInputData returned %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = sizeof(buffer); + if (sizeof(void *) == 8) + { + count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER32)); + ok(count == ~0u, "GetRawInputData returned %d\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); + } + else + { + count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER64)); + if (is_wow64) + { + todo_wine ok(count == sizeof(ri), "GetRawInputData returned %d\n", count); + ok(ri.data.mouse.lLastX == 6, "Unexpected rawinput data: %ld\n", ri.data.mouse.lLastX); + todo_wine ok(GetLastError() == 0xdeadbeef, "GetRawInputData returned %08lx\n", GetLastError()); + } + else + { + ok(count == ~0u, "GetRawInputData returned %d\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); + } + } } else { @@ -2219,9 +2287,9 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara static void test_GetRawInputBuffer(void) { + unsigned int size, count, rawinput_size, header_size; RAWINPUTDEVICE raw_devices[1]; char buffer[16 * sizeof(RAWINPUT64)]; - UINT size, count, rawinput_size; HWND hwnd; BOOL ret; POINT pt; @@ -2295,6 +2363,21 @@ static void test_GetRawInputBuffer(void) ok(count == ~0U, "GetRawInputBuffer succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + size = sizeof(buffer); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER) + 1); + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08lx\n", GetLastError()); + + /* the function returns 64-bit RAWINPUT structures on WoW64, but still + * forbids sizeof(RAWINPUTHEADER) from the wrong architecture */ + SetLastError(0xdeadbeef); + size = sizeof(buffer); + header_size = (sizeof(void *) == 8 ? sizeof(RAWINPUTHEADER32) : sizeof(RAWINPUTHEADER64)); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, header_size); + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08lx\n", GetLastError()); + size = sizeof(buffer); memset(buffer, 0, sizeof(buffer)); count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); @@ -2365,6 +2448,9 @@ static LRESULT CALLBACK rawinput_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA ret = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &raw, &raw_size, sizeof(RAWINPUTHEADER)); ok(ret > 0 && ret != (UINT)-1, "GetRawInputData failed\n"); ok(raw.header.dwType == RIM_TYPEMOUSE, "Unexpected rawinput type: %lu\n", raw.header.dwType); + ok(raw.header.dwSize == raw_size, "Expected size %u, got %lu\n", raw_size, raw.header.dwSize); + todo_wine_if (wparam) + ok(raw.header.wParam == wparam, "Expected wparam %Iu, got %Iu\n", wparam, raw.header.wParam); ok(!(raw.data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE), "Unexpected absolute rawinput motion\n"); ok(!(raw.data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP), "Unexpected virtual desktop rawinput motion\n");

1 0

Stefan Dösinger : include: Emit CFI directives when building on Mac with gcc.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: 9618f5ab8f74dfbff32b868baae78d4167466834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9618f5ab8f74dfbff32b868b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 15 13:16:26 2022 +0300 include: Emit CFI directives when building on Mac with gcc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53157 Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 0547ee94b19..2c996ccd86b 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -35,7 +35,7 @@ # define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name) #endif -#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__)) +#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || ((defined(__APPLE__) || defined(__clang__)) && defined(__GNUC__) && !defined(__SEH__)) # define __ASM_CFI(str) str #else # define __ASM_CFI(str)

1 0

Hans Leidekker : winhttp: Release object on allocation failure.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: c8a356ca1595f708e21bd9ca3a88c8e91f00311f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8a356ca1595f708e21bd9ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 13 11:24:27 2022 +0200 winhttp: Release object on allocation failure. --- dlls/winhttp/request.c | 52 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7fb582362aa..ece4e34f0b8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2308,7 +2308,12 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, const WCHAR *headers, DWORD { struct send_request *s; - if (!(s = malloc( sizeof(*s) ))) return FALSE; + if (!(s = malloc( sizeof(*s) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } s->headers = strdupW( headers ); s->headers_len = headers_len; s->optional = optional; @@ -2886,8 +2891,12 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) { struct receive_response *r; - if (!(r = malloc( sizeof(*r) ))) return FALSE; - + if (!(r = malloc( sizeof(*r) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr, &request->hdr ))) free( r ); } @@ -2981,7 +2990,13 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { struct query_data *q; - if (!(q = malloc( sizeof(*q) ))) return FALSE; + if (!(q = malloc( sizeof(*q) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + q->available = available; if ((ret = queue_task( &request->queue, task_query_data_available, &q->task_hdr, &request->hdr ))) @@ -3034,7 +3049,12 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW { struct read_data *r; - if (!(r = malloc( sizeof(*r) ))) return FALSE; + if (!(r = malloc( sizeof(*r) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } r->buffer = buffer; r->to_read = to_read; r->read = read; @@ -3110,7 +3130,12 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_w { struct write_data *w; - if (!(w = malloc( sizeof(*w) ))) return FALSE; + if (!(w = malloc( sizeof(*w) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } w->buffer = buffer; w->to_write = to_write; w->written = written; @@ -3973,10 +3998,11 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D if (!(r = malloc( sizeof(*r) ))) { InterlockedDecrement( &socket->hdr.pending_receives ); + release_object( &socket->hdr ); return ERROR_OUTOFMEMORY; } - r->buf = buf; - r->len = len; + r->buf = buf; + r->len = len; if ((ret = queue_task( &socket->recv_q, task_socket_receive, &r->task_hdr, &socket->hdr ))) { @@ -4191,8 +4217,8 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas cancel_queue( &socket->recv_q ); } - if (prev_state < SOCKET_STATE_SHUTDOWN - && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) goto done; + if (prev_state < SOCKET_STATE_SHUTDOWN && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) + goto done; if (pending_receives == 1 && socket->close_frame_received) { @@ -4205,7 +4231,11 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas { struct socket_shutdown *s; - if (!(s = calloc( 1, sizeof(*s) ))) return FALSE; + if (!(s = calloc( 1, sizeof(*s) ))) + { + ret = ERROR_OUTOFMEMORY; + goto done; + } if ((ret = queue_task( &socket->recv_q, task_socket_close, &s->task_hdr, &socket->hdr ))) { InterlockedDecrement( &socket->hdr.pending_receives );

1 0

Jacek Caban : win32u: Move NtUserGetTitleBarInfo implementation from user32.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: 86f9c8b1f6f8f5eb00c848e22b80a043726c6d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f9c8b1f6f8f5eb00c848e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 22:33:26 2022 +0200 win32u: Move NtUserGetTitleBarInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/nonclient.c | 125 ------------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/defwnd.c | 73 ++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++ include/ntuser.h | 1 + 8 files changed, 86 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86f9c8b1f6f8f5eb00c8…

1 0

Jacek Caban : win32u: Move more WM_SYSCOMMAND implementation from user32.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: 4663446fe4406f73748121c1eca5a93a832c31b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4663446fe4406f73748121c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 21:15:39 2022 +0200 win32u: Move more WM_SYSCOMMAND implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/nonclient.c | 12 ------------ dlls/win32u/defwnd.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 3844d42adba..0bcbbe54548 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -267,16 +267,11 @@ static void NC_TrackScrollBar( HWND hwnd, WPARAM wParam, POINT pt ) */ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) { - TRACE("hwnd %p WM_SYSCOMMAND %Ix %Ix\n", hwnd, wParam, lParam ); - if (!NtUserMessageCall( hwnd, WM_SYSCOMMAND, wParam, lParam, 0, NtUserDefWindowProc, FALSE )) return 0; switch (wParam & 0xfff0) { - case SC_CLOSE: - return SendMessageW( hwnd, WM_CLOSE, 0, 0 ); - case SC_VSCROLL: case SC_HSCROLL: { @@ -308,13 +303,6 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) } } break; - - case SC_HOTKEY: - case SC_ARRANGE: - case SC_NEXTWINDOW: - case SC_PREVWINDOW: - FIXME("unimplemented WM_SYSCOMMAND %04Ix!\n", wParam); - break; } return 0; } diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index cf3fb25bbc0..2de4834be54 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -892,6 +892,8 @@ static void sys_command_size_move( HWND hwnd, WPARAM wparam ) static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) { + TRACE( "hwnd %p WM_SYSCOMMAND %lx %lx\n", hwnd, wparam, lparam ); + if (!is_window_enabled( hwnd )) return 0; if (call_hooks( WH_CBT, HCBT_SYSCOMMAND, wparam, lparam, TRUE )) @@ -917,6 +919,13 @@ static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) NtUserShowWindow( hwnd, SW_MAXIMIZE ); break; + case SC_CLOSE: + return send_message( hwnd, WM_CLOSE, 0, 0 ); + + case SC_VSCROLL: + case SC_HSCROLL: + return 1; /* FIXME: handle on client side */ + case SC_MOUSEMENU: track_mouse_menu_bar( hwnd, wparam & 0x000F, (short)LOWORD(lparam), (short)HIWORD(lparam) ); break; @@ -930,6 +939,17 @@ static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) NtUserShowWindow( hwnd, SW_RESTORE ); break; + case SC_TASKLIST: + case SC_SCREENSAVE: + return 1; /* FIXME: handle on client side */ + + case SC_HOTKEY: + case SC_ARRANGE: + case SC_NEXTWINDOW: + case SC_PREVWINDOW: + FIXME( "unimplemented WM_SYSCOMMAND %04lx\n", wparam ); + break; + default: return 1; /* handle on client side */ }

1 0

Jacek Caban : win32u: Move WM_NCLBUTTONDBLCLK and WM_LBUTTONDBLCLK implementation from user32.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: 19e8cc96b5bae745b1b01ffb874e8f0ad9ab941e URL: https://source.winehq.org/git/wine.git/?a=commit;h=19e8cc96b5bae745b1b01ffb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 21:08:28 2022 +0200 win32u: Move WM_NCLBUTTONDBLCLK and WM_LBUTTONDBLCLK implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/defwnd.c | 6 ------ dlls/user32/nonclient.c | 51 ------------------------------------------------- dlls/win32u/defwnd.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 58 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a0047d6183d..639b9f2214e 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -121,7 +121,6 @@ extern HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) DECLSPEC_HIDDEN; /* nonclient area */ extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; /* scrollbar */ diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index fd6c44dd29b..45f1842714f 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -175,12 +175,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa iF10Key = iMenuSysKey = 0; break; - case WM_LBUTTONDBLCLK: - return NC_HandleNCLButtonDblClk( hwnd, HTCLIENT, lParam ); - - case WM_NCLBUTTONDBLCLK: - return NC_HandleNCLButtonDblClk( hwnd, wParam, lParam ); - case WM_RBUTTONUP: { POINT pt; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index cc31e1b2f2f..3844d42adba 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -260,57 +260,6 @@ static void NC_TrackScrollBar( HWND hwnd, WPARAM wParam, POINT pt ) } -/*********************************************************************** - * NC_HandleNCLButtonDblClk - * - * Handle a WM_NCLBUTTONDBLCLK message. Called from DefWindowProc(). - */ -LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam ) -{ - /* - * if this is an icon, send a restore since we are handling - * a double click - */ - if (IsIconic(hwnd)) - { - SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, lParam ); - return 0; - } - - switch(wParam) /* Hit test */ - { - case HTCAPTION: - /* stop processing if WS_MAXIMIZEBOX is missing */ - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MAXIMIZEBOX) - SendMessageW( hwnd, WM_SYSCOMMAND, - IsZoomed(hwnd) ? SC_RESTORE : SC_MAXIMIZE, lParam ); - break; - - case HTSYSMENU: - { - HMENU hSysMenu = NtUserGetSystemMenu(hwnd, FALSE); - UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); - - /* If the close item of the sysmenu is disabled or not present do nothing */ - if ((state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF)) - break; - - SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, lParam ); - break; - } - - case HTHSCROLL: - SendMessageW( hwnd, WM_SYSCOMMAND, SC_HSCROLL + HTHSCROLL, lParam ); - break; - - case HTVSCROLL: - SendMessageW( hwnd, WM_SYSCOMMAND, SC_VSCROLL + HTVSCROLL, lParam ); - break; - } - return 0; -} - - /*********************************************************************** * NC_HandleSysCommand * diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index ff2b44c0508..cf3fb25bbc0 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2169,6 +2169,48 @@ static LRESULT handle_nc_rbutton_down( HWND hwnd, WPARAM wparam, LPARAM lparam ) return 0; } +static LRESULT handle_nc_button_dbl_click( HWND hwnd, WPARAM wparam, LPARAM lparam ) +{ + /* if this is an icon, send a restore since we are handling a double click */ + if (is_iconic(hwnd)) + { + send_message( hwnd, WM_SYSCOMMAND, SC_RESTORE, lparam ); + return 0; + } + + switch (wparam) /* Hit test */ + { + case HTCAPTION: + /* stop processing if WS_MAXIMIZEBOX is missing */ + if (get_window_long( hwnd, GWL_STYLE ) & WS_MAXIMIZEBOX) + send_message( hwnd, WM_SYSCOMMAND, + is_zoomed( hwnd ) ? SC_RESTORE : SC_MAXIMIZE, lparam ); + break; + + case HTSYSMENU: + { + HMENU hSysMenu = NtUserGetSystemMenu( hwnd, FALSE ); + UINT state = get_menu_state( hSysMenu, SC_CLOSE, MF_BYCOMMAND ); + + /* If the close item of the sysmenu is disabled or not present do nothing */ + if ((state & (MF_DISABLED | MF_GRAYED)) || state == 0xffffffff) + break; + + send_message( hwnd, WM_SYSCOMMAND, SC_CLOSE, lparam ); + break; + } + + case HTHSCROLL: + send_message( hwnd, WM_SYSCOMMAND, SC_HSCROLL + HTHSCROLL, lparam ); + break; + + case HTVSCROLL: + send_message( hwnd, WM_SYSCOMMAND, SC_VSCROLL + HTVSCROLL, lparam ); + break; + } + return 0; +} + LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { LRESULT result = 0; @@ -2220,6 +2262,12 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_NCRBUTTONDOWN: return handle_nc_rbutton_down( hwnd, wparam, lparam ); + case WM_LBUTTONDBLCLK: + return handle_nc_button_dbl_click( hwnd, HTCLIENT, lparam ); + + case WM_NCLBUTTONDBLCLK: + return handle_nc_button_dbl_click( hwnd, wparam, lparam ); + case WM_CONTEXTMENU: if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) send_message( get_parent( hwnd ), msg, (WPARAM)hwnd, lparam );

1 0

Jacek Caban : win32u: Move WM_SETCURSOR implementation from user32.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: bdae778e7fa2e82d8dbcfb8c1d46dfd616743cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdae778e7fa2e82d8dbcfb8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 21:00:43 2022 +0200 win32u: Move WM_SETCURSOR implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/defwnd.c | 15 ------------ dlls/user32/nonclient.c | 52 ---------------------------------------- dlls/win32u/defwnd.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 68 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 3fadcc113c0..a0047d6183d 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -123,7 +123,6 @@ extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) D extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleSetCursor( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; /* scrollbar */ diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 57e12d8e00b..fd6c44dd29b 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -225,21 +225,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_CTLCOLOR: return (LRESULT)DEFWND_ControlColor( (HDC)wParam, HIWORD(lParam) ); - case WM_SETCURSOR: - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) - { - /* with the exception of the border around a resizable wnd, - * give the parent first chance to set the cursor */ - if ((LOWORD(lParam) < HTSIZEFIRST) || (LOWORD(lParam) > HTSIZELAST)) - { - HWND parent = GetParent( hwnd ); - if (parent != GetDesktopWindow() && - SendMessageW( parent, WM_SETCURSOR, wParam, lParam )) return TRUE; - } - } - NC_HandleSetCursor( hwnd, wParam, lParam ); - break; - case WM_SYSCOMMAND: return NC_HandleSysCommand( hwnd, wParam, lParam ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 73d5b6449de..cc31e1b2f2f 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -236,58 +236,6 @@ LRESULT NC_HandleNCMouseLeave(HWND hwnd) return 0; } -/*********************************************************************** - * NC_HandleSetCursor - * - * Handle a WM_SETCURSOR message. Called from DefWindowProc(). - */ -LRESULT NC_HandleSetCursor( HWND hwnd, WPARAM wParam, LPARAM lParam ) -{ - hwnd = WIN_GetFullHandle( (HWND)wParam ); - - switch((short)LOWORD(lParam)) - { - case HTERROR: - { - WORD msg = HIWORD( lParam ); - if ((msg == WM_LBUTTONDOWN) || (msg == WM_MBUTTONDOWN) || - (msg == WM_RBUTTONDOWN) || (msg == WM_XBUTTONDOWN)) - MessageBeep(0); - } - break; - - case HTCLIENT: - { - HCURSOR hCursor = (HCURSOR)GetClassLongPtrW(hwnd, GCLP_HCURSOR); - if(hCursor) { - NtUserSetCursor(hCursor); - return TRUE; - } - return FALSE; - } - - case HTLEFT: - case HTRIGHT: - return (LRESULT)NtUserSetCursor( LoadCursorA( 0, (LPSTR)IDC_SIZEWE ) ); - - case HTTOP: - case HTBOTTOM: - return (LRESULT)NtUserSetCursor( LoadCursorA( 0, (LPSTR)IDC_SIZENS ) ); - - case HTTOPLEFT: - case HTBOTTOMRIGHT: - return (LRESULT)NtUserSetCursor( LoadCursorA( 0, (LPSTR)IDC_SIZENWSE ) ); - - case HTTOPRIGHT: - case HTBOTTOMLEFT: - return (LRESULT)NtUserSetCursor( LoadCursorA( 0, (LPSTR)IDC_SIZENESW ) ); - } - - /* Default cursor: arrow */ - return (LRESULT)NtUserSetCursor( LoadCursorA( 0, (LPSTR)IDC_ARROW ) ); -} - - /*********************************************************************** * NC_TrackScrollBar diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index df7cc793ee1..ff2b44c0508 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -414,6 +414,55 @@ static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) return ret; } +static LRESULT handle_set_cursor( HWND hwnd, WPARAM wparam, LPARAM lparam ) +{ + UINT cursor_id = IDC_ARROW; + HCURSOR cursor; + + hwnd = get_full_window_handle( (HWND)wparam ); + + switch((short)LOWORD( lparam )) + { + case HTERROR: + { + WORD msg = HIWORD( lparam ); + if (msg == WM_LBUTTONDOWN || msg == WM_MBUTTONDOWN || + msg == WM_RBUTTONDOWN || msg == WM_XBUTTONDOWN) + message_beep( 0 ); + } + break; + + case HTCLIENT: + cursor = (HCURSOR)get_class_long_ptr( hwnd, GCLP_HCURSOR, FALSE ); + if (!cursor) return FALSE; + NtUserSetCursor( cursor ); + return TRUE; + + case HTLEFT: + case HTRIGHT: + cursor_id = IDC_SIZEWE; + break; + + case HTTOP: + case HTBOTTOM: + cursor_id = IDC_SIZENS; + break; + + case HTTOPLEFT: + case HTBOTTOMRIGHT: + cursor_id = IDC_SIZENWSE; + break; + + case HTTOPRIGHT: + case HTBOTTOMLEFT: + cursor_id = IDC_SIZENESW; + } + + cursor = LoadImageW( 0, MAKEINTRESOURCEW( cursor_id ), IMAGE_CURSOR, + 0, 0, LR_SHARED | LR_DEFAULTSIZE ); + return (LRESULT)NtUserSetCursor( cursor ); +} + static LONG handle_window_pos_changing( HWND hwnd, WINDOWPOS *winpos ) { LONG style = get_window_long( hwnd, GWL_STYLE ); @@ -2307,6 +2356,21 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, result = (LRESULT)get_window_icon( hwnd, wparam ); break; + case WM_SETCURSOR: + if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) + { + /* with the exception of the border around a resizable window, + * give the parent first chance to set the cursor */ + if ((LOWORD( lparam ) < HTSIZEFIRST) || (LOWORD( lparam ) > HTSIZELAST)) + { + HWND parent = get_parent( hwnd ); + if (parent != get_desktop_window() && + send_message( parent, WM_SETCURSOR, wparam, lparam )) return TRUE; + } + } + handle_set_cursor( hwnd, wparam, lparam ); + break; + case WM_SYSCOMMAND: result = handle_sys_command( hwnd, wparam, lparam ); break;

1 0

Jacek Caban : win32u: Move NtUserDrawCaptionTemp implementation from user32.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: 67e39efb7528dc9e5505b8e7fbc3e0e39f1c5779 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67e39efb7528dc9e5505b8e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:52:44 2022 +0200 win32u: Move NtUserDrawCaptionTemp implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/nonclient.c | 185 +------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/defwnd.c | 112 +++++++++++++++++++++++++- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 7 ++ include/ntuser.h | 2 + 8 files changed, 128 insertions(+), 185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67e39efb7528dc9e5505…

1 0

Jinoh Kang : comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: wine Branch: master Commit: 0b07bb8566b60cf7c2d7410999a0db5a011b8ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b07bb8566b60cf7c2d74109… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Mar 15 02:40:03 2022 +0900 comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush. This is consistent with the behaviour of other static control styles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/comctl32/static.c | 7 ++++--- dlls/comctl32/tests/static.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 3151cda6552..c09655da903 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -849,13 +849,16 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style { HDC hMemDC; HBITMAP hBitmap, oldbitmap; + RECT rcClient; + + GetClientRect( hwnd, &rcClient ); + FillRect( hdc, &rcClient, hbrush ); if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) && (hMemDC = CreateCompatibleDC( hdc ))) { BITMAP bm; - RECT rcClient; LOGBRUSH brush; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); @@ -870,10 +873,8 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style if (brush.lbStyle == BS_SOLID) SetBkColor(hdc, brush.lbColor); } - GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - FillRect( hdc, &rcClient, hbrush ); rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; rcClient.right = rcClient.left + bm.bmWidth; diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index dbd71539a57..756fed86fe0 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -118,7 +118,6 @@ static void test_updates(int style) { HDC hdc = GetDC(hStatic); COLORREF colour = GetPixel(hdc, 10, 10); - todo_wine ok(colour == 0, "Unexpected pixel color.\n"); ReleaseDC(hStatic, hdc); }

1 0

Francois Gouget : patches: Add an end tag for some <td colspan='xxx'>.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: tools Branch: master Commit: 1dfa91e21aea36df8ed194f63bb32af68be93df8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1dfa91e21aea36df8ed194f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:58:53 2022 +0200 patches: Add an end tag for some <td colspan='xxx'>. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index f3eac9ee..8f79da9c 100755 --- a/patches/update +++ b/patches/update @@ -338,15 +338,15 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k if (@signoff) { printf INDEX "<tr class=\"%s $file.signoff\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . - "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", + "<td colspan=\"5\"></td><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . " "; } @signoff ); } foreach my $child (@{$patch->{"children"}}) { printf INDEX "<tr class=\"%s\ $file.reply\" id=\"%s\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . - "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\">%s</td> " . + "<td colspan=\"2\"></td><td colspan=\"2\" class=\"reply author\">%s</td> " . "<td class=\"reply author\"><a href=\"data/%s\">%s</a></td> " . - "<td colspan=\"4\" /></tr>\n", + "<td colspan=\"4\"></td></tr>\n", $row & 1 ? "odd" : "even", $child->{"id"}, escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); } $row++;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
80
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 June 2022