June 2022 - Wine-Commits - list.winehq.org

Tag wine-7.11 : Alexandre Julliard : Release 7.11
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: refs/tags/wine-7.11 Tag: 9bc9ff0a7a4c393367a9ef16e4577345a2f7b54d URL: https://source.winehq.org/git/wine.git/?a=tag;h=9bc9ff0a7a4c393367a9ef16e45… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 21:52:59 2022 +0200 Release 7.11

1 0

Alexandre Julliard : Release 7.11.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 1a3217393e2e6226da0f4024d4d384def207a189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a3217393e2e6226da0f4024… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 21:52:59 2022 +0200 Release 7.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 907 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 403 insertions(+), 525 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3217393e2e6226da0f…

1 0

Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromResourceW.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 798395d3b2922bf6939089ffb78aa17ba3c1e103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=798395d3b2922bf6939089ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 14:22:45 2022 +0200 d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromResourceW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 7a4031727fa..a988df6f477 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -715,11 +715,32 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE mo if (!device) return E_INVALIDARG; - hr = load_resourceW(module, resource, &buffer, &size); - if (FAILED(hr)) + if (pump) + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncResourceLoaderW(module, resource, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureProcessor(device, load_info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, hresult, (void **)texture)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; + } - return D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); + if (FAILED((hr = load_resourceW(module, resource, &buffer, &size)))) + return hr; + hr = create_texture(device, buffer, size, load_info, texture); + if (hresult) + *hresult = hr; + return hr; } void init_load_info(const D3DX10_IMAGE_LOAD_INFO *load_info, D3DX10_IMAGE_LOAD_INFO *out)

1 0

Piotr Caban : d3dx10/tests: Add D3DX10CreateTextureFromMemory thread pump tests.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 1b46752126bac21aab30f2def891a946149def18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b46752126bac21aab30f2de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 18:57:58 2022 +0200 d3dx10/tests: Add D3DX10CreateTextureFromMemory thread pump tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index d8839626c3b..1c28a62b700 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -848,7 +848,6 @@ static HRESULT WINAPI D3DX10ThreadPump_AddWorkItem(ID3DX10ThreadPump *iface, ID3 HRESULT hr; ok(!add_work_item_count++, "unexpected call\n"); - ok(!object, "object = %p\n", object); hr = ID3DX10DataLoader_Load(loader); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -2290,6 +2289,17 @@ static void test_create_texture(void) winetest_pop_context(); } + hr2 = 0xdeadbeef; + add_work_item_count = 0; + hr = D3DX10CreateTextureFromMemory(device, test_image[0].data, test_image[0].size, + NULL, &thread_pump, &resource, &hr2); + ok(add_work_item_count == 1, "Got unexpected add_work_item_count %u.\n", add_work_item_count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); + check_resource_info(resource, test_image, __LINE__); + check_resource_data(resource, test_image, __LINE__); + ID3D10Resource_Release(resource); + /* D3DX10CreateTextureFromFile tests */ hr2 = 0xdeadbeef;

1 0

Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromMemory.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 696071af7a3b6ec835d0dbc5cc37e80d9c836f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=696071af7a3b6ec835d0dbc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 14:28:31 2022 +0200 d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromMemory. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index a988df6f477..88efdf585b4 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -966,8 +966,26 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s return E_INVALIDARG; if (!src_data) return E_FAIL; + if (pump) - FIXME("Thread pump is not supported yet.\n"); + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncMemoryLoader(src_data, src_data_size, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureProcessor(device, load_info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, hresult, (void **)texture)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } + return hr; + } hr = create_texture(device, src_data, src_data_size, load_info, texture); if (hresult)

1 0

Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromFileW.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 0c659a23c244e1e3f2568b5bf1ab8dc62fadb52e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c659a23c244e1e3f2568b5b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 14:15:24 2022 +0200 d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromFileW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 7a43d8409da..31775fd6863 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -631,17 +631,33 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s if (!src_file) return E_FAIL; - if (FAILED((hr = load_file(src_file, &buffer, &size)))) + if (pump) { - if (hresult) - *hresult = hr; + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncFileLoaderW(src_file, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureProcessor(device, load_info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, hresult, (void **)texture)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; } - hr = D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); - - free(buffer); - + if (SUCCEEDED((hr = load_file(src_file, &buffer, &size)))) + { + hr = create_texture(device, buffer, size, load_info, texture); + free(buffer); + } + if (hresult) + *hresult = hr; return hr; }

1 0

Jacek Caban : win32u: Move more WM_SYSCOMMAND implementation from user32.
by Alexandre Julliard June 17, 2022

June 17, 2022

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_SETCURSOR implementation from user32.
by Alexandre Julliard June 17, 2022

June 17, 2022

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 WM_NCLBUTTONDBLCLK and WM_LBUTTONDBLCLK implementation from user32.
by Alexandre Julliard June 17, 2022

June 17, 2022

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

Zebediah Figura : win32u: Move NtUserGetRawInputData from user32.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: db43005cd8438c65ef5828f4db8d6e681b2b309d URL: https://source.winehq.org/git/wine.git/?a=commit;h=db43005cd8438c65ef5828f4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 13:31:57 2022 -0500 win32u: Move NtUserGetRawInputData from user32. --- dlls/user32/rawinput.c | 54 +------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 8 +--- dlls/win32u/Makefile.in | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntuser_private.h | 7 ++++ dlls/win32u/rawinput.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 1 + 12 files changed, 114 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db43005cd8438c65ef58…

1 0