December 2022 - Wine-commits

Tag wine-8.0-rc1 : Alexandre Julliard : Release 8.0-rc1
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: refs/tags/wine-8.0-rc1 Tag: f2191e67d1223da8525399c32b172cb9e9fc8d09 URL: https://gitlab.winehq.org/wine/wine/-/tags/f2191e67d1223da8525399c32b172cb9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 22:15:57 2022 +0100 Release 8.0-rc1

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in arb_program_shader.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 279c1dbc3cf79a4996a1159ddda31c7221c8c570 URL: https://gitlab.winehq.org/wine/wine/-/commit/279c1dbc3cf79a4996a1159ddda31c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:44:54 2022 +0100 wined3d: Reduce usage of long integral types in arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 60 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-)

1 0

Eric Pouech : wined3d: Use proper enum type in arb_program_shader.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 5b5f7528b151e4af8bff6fbcde259d3b9c90777e URL: https://gitlab.winehq.org/wine/wine/-/commit/5b5f7528b151e4af8bff6fbcde259d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:44:55 2022 +0100 wined3d: Use proper enum type in arb_program_shader.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6e4acfb27ef..18866eaac00 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1647,7 +1647,7 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ADD %s, %s, TC;\n", dst_name, src_name[0]); } -static DWORD negate_modifiers(DWORD mod, char *extra_char) +static enum wined3d_shader_src_modifier negate_modifiers(enum wined3d_shader_src_modifier mod, char *extra_char) { *extra_char = ' '; switch(mod) @@ -1665,8 +1665,8 @@ static DWORD negate_modifiers(DWORD mod, char *extra_char) case WINED3DSPSM_DW: *extra_char = '-'; return WINED3DSPSM_DW; case WINED3DSPSM_ABS: return WINED3DSPSM_ABSNEG; case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_NOT: FIXME("Unknown modifier %u\n", mod); } - FIXME("Unknown modifier %u\n", mod); return mod; } @@ -2511,7 +2511,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } -static DWORD abs_modifier(DWORD mod, BOOL *need_abs) +static enum wined3d_shader_src_modifier abs_modifier(enum wined3d_shader_src_modifier mod, BOOL *need_abs) { *need_abs = FALSE; @@ -2530,8 +2530,8 @@ static DWORD abs_modifier(DWORD mod, BOOL *need_abs) case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_NOT: FIXME("Unknown modifier %u\n", mod); } - FIXME("Unknown modifier %u\n", mod); return mod; }

1 0

Eric Pouech : wined3d: Enable long types in arb_program_shader.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 2e37a51b8f1a36a0547531c35609b3888772c0a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e37a51b8f1a36a0547531c35609b3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:44:57 2022 +0100 wined3d: Enable long types in arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 18866eaac00..b799e6c1e38 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -26,7 +26,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> @@ -5955,7 +5954,7 @@ static void alpha_test_arbfp(struct wined3d_context *context, const struct wined int glParm; float ref; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (state->render_states[WINED3D_RS_ALPHATESTENABLE]) { @@ -6566,7 +6565,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi const struct arbfp_ffp_desc *desc; unsigned int i; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) { @@ -6659,7 +6658,7 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; DWORD fogend = state->render_states[WINED3D_RS_FOGEND]; - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); if (!isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL))) fragment_prog_arbfp(context, state, state_id); @@ -7865,7 +7864,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, 0, NULL, NULL, &wined3d_null_parent_ops, &staging_texture))) { - ERR("Failed to create staging texture, hr %#x.\n", hr); + ERR("Failed to create staging texture, hr %#lx.\n", hr); return dst_location; }

1 0

Rémi Bernon : uxtheme: Use bsearch and CompareStringOrdinal in MSSTYLES_LookupProperty.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: ae0891eb64e1f7a8a17a07873f96558274e2a6d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae0891eb64e1f7a8a17a07873f9655… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 9 09:39:45 2022 +0100 uxtheme: Use bsearch and CompareStringOrdinal in MSSTYLES_LookupProperty. --- dlls/uxtheme/stylemap.c | 440 +++++++++++++++++++++++++----------------------- 1 file changed, 227 insertions(+), 213 deletions(-)

1 0

Bartosz Kosiorek : gdiplus: Improve performance of GdipTranslateMatrix.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 82d94219cbf2c598f5a9d88c5bd5fc3e0b230bd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/82d94219cbf2c598f5a9d88c5bd5fc… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Dec 3 00:48:53 2022 +0100 gdiplus: Improve performance of GdipTranslateMatrix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/matrix.c | 21 ++++++++++----------- dlls/gdiplus/tests/matrix.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index d790daab2af..d69672bddcf 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -417,24 +417,23 @@ GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, I GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, REAL offsetY, GpMatrixOrder order) { - REAL translate[6]; - TRACE("(%p, %.2f, %.2f, %d)\n", matrix, offsetX, offsetY, order); if(!matrix) return InvalidParameter; - translate[0] = 1.0; - translate[1] = 0.0; - translate[2] = 0.0; - translate[3] = 1.0; - translate[4] = offsetX; - translate[5] = offsetY; - if(order == MatrixOrderAppend) - matrix_multiply(matrix->matrix, translate, matrix->matrix); + { + matrix->matrix[4] += offsetX; + matrix->matrix[5] += offsetY; + } else if (order == MatrixOrderPrepend) - matrix_multiply(translate, matrix->matrix, matrix->matrix); + { + matrix->matrix[4] = offsetX * matrix->matrix[0] + offsetY * matrix->matrix[2] + + matrix->matrix[4]; + matrix->matrix[5] = offsetX * matrix->matrix[1] + offsetY * matrix->matrix[3] + + matrix->matrix[5]; + } else return InvalidParameter; diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 53a57089bbc..dea08c13120 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -110,6 +110,45 @@ static void test_transform(void) GdipDeleteMatrix(matrix); } +static void test_translate(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + REAL elems[6]; + + static const REAL expected_elem_append[] = {1.0, -2.0, 30.0, 40.0, -470.0, 620.0}; + static const REAL expected_elem_prepend[] = {1.0, -2.0, 30.0, 40.0, 130.0, 1340.0}; + + GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + + status = GdipTranslateMatrix(NULL, 30.0, 20.0, MatrixOrderAppend); + expect(InvalidParameter, status); + status = GdipTranslateMatrix(matrix, 30.0, 20.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + GdipDeleteMatrix(matrix); + + for(INT i = 0; i < 6; i++) + ok(expected_elem_append[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i, + expected_elem_append[i], elems[i]); + + GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + + status = GdipTranslateMatrix(matrix, 30.0, 20.0, MatrixOrderPrepend); + expect(Ok, status); + + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + GdipDeleteMatrix(matrix); + + for(INT i = 0; i < 6; i++) + ok(expected_elem_prepend[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i, + expected_elem_prepend[i], elems[i]); + +} + static void test_scale(void) { GpStatus status; @@ -430,6 +469,7 @@ START_TEST(matrix) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_translate(); test_scale(); test_transform(); test_isinvertible();

1 0

Alexandre Julliard : Release 8.0-rc1.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 772badd0d7f3286a7881a71f16fad417e2d7787d URL: https://gitlab.winehq.org/wine/wine/-/commit/772badd0d7f3286a7881a71f16fad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 22:10:23 2022 +0100 Release 8.0-rc1. --- ANNOUNCE | 1280 ++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 686 insertions(+), 615 deletions(-)

1 0

Jacek Caban : win32u: Move NtUserSetShellWindowEx implementation from user32.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: c8f1d41183c38bb07518c6e79229a82ad89ffc51 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8f1d41183c38bb07518c6e79229a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:44:53 2022 +0100 win32u: Move NtUserSetShellWindowEx implementation from user32. --- dlls/user32/focus.c | 47 ++--------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 3 ++- 8 files changed, 58 insertions(+), 48 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index e79f6f68dc2..53802f98b1a 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -55,55 +55,12 @@ HWND WINAPI GetFocus(void) } -/*********************************************************************** -* SetShellWindowEx (USER32.@) -* hwndShell = Progman[Program Manager] -* |-> SHELLDLL_DefView -* hwndListView = | |-> SysListView32 -* | | |-> tooltips_class32 -* | | -* | |-> SysHeader32 -* | -* |-> ProxyTarget -*/ -BOOL WINAPI SetShellWindowEx(HWND hwndShell, HWND hwndListView) -{ - BOOL ret; - - if (GetShellWindow()) - return FALSE; - - if (GetWindowLongW(hwndShell, GWL_EXSTYLE) & WS_EX_TOPMOST) - return FALSE; - - if (hwndListView != hwndShell) - if (GetWindowLongW(hwndListView, GWL_EXSTYLE) & WS_EX_TOPMOST) - return FALSE; - - if (hwndListView && hwndListView!=hwndShell) - NtUserSetWindowPos( hwndListView, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE ); - - NtUserSetWindowPos( hwndShell, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE ); - - SERVER_START_REQ(set_global_windows) - { - req->flags = SET_GLOBAL_SHELL_WINDOWS; - req->shell_window = wine_server_user_handle( hwndShell ); - req->shell_listview = wine_server_user_handle( hwndListView ); - ret = !wine_server_call_err(req); - } - SERVER_END_REQ; - - return ret; -} - - /******************************************************************* * SetShellWindow (USER32.@) */ -BOOL WINAPI SetShellWindow(HWND hwndShell) +BOOL WINAPI SetShellWindow( HWND hwnd ) { - return SetShellWindowEx(hwndShell, hwndShell); + return NtUserSetShellWindowEx( hwnd, hwnd ); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d9cf610b470..1628c7ca74a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -708,7 +708,7 @@ @ stdcall SetScrollPos(long long long long) @ stdcall SetScrollRange(long long long long long) @ stdcall SetShellWindow(long) -@ stdcall SetShellWindowEx (long long) +@ stdcall SetShellWindowEx(long long) NtUserSetShellWindowEx @ stdcall SetSysColors(long ptr ptr) NtUserSetSysColors @ stdcall SetSysColorsTemp(ptr ptr long) @ stdcall SetSystemCursor(long long) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index fb87d6395d3..66fbd0746ae 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2165,3 +2165,45 @@ HWND get_shell_window(void) return hwnd; } + +/*********************************************************************** +* NtUserSetShellWindowEx (win32u.@) +*/ +BOOL WINAPI NtUserSetShellWindowEx( HWND shell, HWND list_view ) +{ + BOOL ret; + + /* shell = Progman[Program Manager] + * |-> SHELLDLL_DefView + * list_view = | |-> SysListView32 + * | | |-> tooltips_class32 + * | | + * | |-> SysHeader32 + * | + * |-> ProxyTarget + */ + + if (get_shell_window()) + return FALSE; + + if (get_window_long( shell, GWL_EXSTYLE ) & WS_EX_TOPMOST) + return FALSE; + + if (list_view != shell && (get_window_long( list_view, GWL_EXSTYLE ) & WS_EX_TOPMOST)) + return FALSE; + + if (list_view && list_view != shell) + NtUserSetWindowPos( list_view, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); + + NtUserSetWindowPos( shell, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); + + SERVER_START_REQ(set_global_windows) + { + req->flags = SET_GLOBAL_SHELL_WINDOWS; + req->shell_window = wine_server_user_handle( shell ); + req->shell_listview = wine_server_user_handle( list_view ); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index cfe2961c45d..32812a3d881 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -273,6 +273,7 @@ static void * const syscalls[] = NtUserSetProcessWindowStation, NtUserSetProp, NtUserSetScrollInfo, + NtUserSetShellWindowEx, NtUserSetSysColors, NtUserSetSystemMenu, NtUserSetSystemTimer, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index af70ad7d3e5..c3ed3c0559a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1226,7 +1226,7 @@ @ stdcall -syscall NtUserSetScrollInfo(long long ptr long) @ stub NtUserSetSensorPresence @ stub NtUserSetSharedWindowData -@ stub NtUserSetShellWindowEx +@ stdcall -syscall NtUserSetShellWindowEx(long long) @ stdcall -syscall NtUserSetSysColors(long ptr ptr) @ stub NtUserSetSystemCursor @ stdcall -syscall NtUserSetSystemMenu(long long) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index e84d4dd60c6..ecf79f69cce 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -259,6 +259,7 @@ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProp ) \ SYSCALL_ENTRY( NtUserSetScrollInfo ) \ + SYSCALL_ENTRY( NtUserSetShellWindowEx ) \ SYSCALL_ENTRY( NtUserSetSysColors ) \ SYSCALL_ENTRY( NtUserSetSystemMenu ) \ SYSCALL_ENTRY( NtUserSetSystemTimer ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 0841119c2d6..4ce8c94c1af 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3624,6 +3624,14 @@ NTSTATUS WINAPI wow64_NtUserSetScrollInfo( UINT *args ) return NtUserSetScrollInfo( hwnd, bar, info, redraw ); } +NTSTATUS WINAPI wow64_NtUserSetShellWindowEx( UINT *args ) +{ + HWND shell = get_handle( &args ); + HWND list_view = get_handle( &args ); + + return NtUserSetShellWindowEx( shell, list_view ); +} + NTSTATUS WINAPI wow64_NtUserSetSysColors( UINT *args ) { INT count = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 94d5326fc6e..7a44f4b0b15 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -803,7 +803,6 @@ DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *han DWORD timeout, DWORD mask, DWORD flags ); void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG child_id ); HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); -BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); BOOL WINAPI NtUserOpenClipboard( HWND hwnd, ULONG unk ); HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); @@ -849,11 +848,13 @@ BOOL WINAPI NtUserSetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE a BOOL WINAPI NtUserSetMenu( HWND hwnd, HMENU menu ); BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ); BOOL WINAPI NtUserSetMenuDefaultItem( HMENU handle, UINT item, UINT bypos ); +BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); HWND WINAPI NtUserSetParent( HWND hwnd, HWND parent ); BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); INT WINAPI NtUserSetScrollInfo( HWND hwnd, INT bar, const SCROLLINFO *info, BOOL redraw ); +BOOL WINAPI NtUserSetShellWindowEx( HWND shell, HWND list_view ); BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *values ); BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ); UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout );

1 0

Jacek Caban : win32u: Move SetProgmanWindow implementation from user32.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 62852dc503c68e65849e3991533feac811074dc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/62852dc503c68e65849e3991533fea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:48:35 2022 +0100 win32u: Move SetProgmanWindow implementation from user32. --- dlls/user32/focus.c | 11 ++--------- dlls/win32u/input.c | 12 ++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 3 +++ include/ntuser.h | 6 ++++++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 53802f98b1a..4d18c49214e 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -76,16 +76,9 @@ HWND WINAPI GetShellWindow(void) /*********************************************************************** * SetProgmanWindow (USER32.@) */ -HWND WINAPI SetProgmanWindow ( HWND hwnd ) +HWND WINAPI SetProgmanWindow( HWND hwnd ) { - SERVER_START_REQ(set_global_windows) - { - req->flags = SET_GLOBAL_PROGMAN_WINDOW; - req->progman_window = wine_server_user_handle( hwnd ); - if (wine_server_call_err( req )) hwnd = 0; - } - SERVER_END_REQ; - return hwnd; + return NtUserSetProgmanWindow( hwnd ); } diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 66fbd0746ae..783db67031a 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2207,3 +2207,15 @@ BOOL WINAPI NtUserSetShellWindowEx( HWND shell, HWND list_view ) SERVER_END_REQ; return ret; } + +HWND set_progman_window( HWND hwnd ) +{ + SERVER_START_REQ(set_global_windows) + { + req->flags = SET_GLOBAL_PROGMAN_WINDOW; + req->progman_window = wine_server_user_handle( hwnd ); + if (wine_server_call_err( req )) hwnd = 0; + } + SERVER_END_REQ; + return hwnd; +} diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 1fe2f80da61..fd29423cec5 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -277,6 +277,7 @@ extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECL extern BOOL set_caret_blink_time( unsigned int time ) DECLSPEC_HIDDEN; extern BOOL set_caret_pos( int x, int y ) DECLSPEC_HIDDEN; extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; +extern HWND set_progman_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 24931eab199..91baca39eaa 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5429,6 +5429,9 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_SetForegroundWindow: return set_foreground_window( hwnd, FALSE ); + case NtUserCallHwnd_SetProgmanWindow: + return HandleToUlong( set_progman_window( hwnd )); + /* temporary exports */ case NtUserGetFullWindowHandle: return HandleToUlong( get_full_window_handle( hwnd )); diff --git a/include/ntuser.h b/include/ntuser.h index 7a44f4b0b15..19e8443475d 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1175,6 +1175,7 @@ enum NtUserCallHwnd_IsWindowUnicode, NtUserCallHwnd_IsWindowVisible, NtUserCallHwnd_SetForegroundWindow, + NtUserCallHwnd_SetProgmanWindow, /* temporary exports */ NtUserGetFullWindowHandle, NtUserIsCurrehtProcessWindow, @@ -1272,6 +1273,11 @@ static inline BOOL NtUserSetForegroundWindow( HWND hwnd ) return NtUserCallHwnd( hwnd, NtUserCallHwnd_SetForegroundWindow ); } +static inline HWND NtUserSetProgmanWindow( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_SetProgmanWindow )); +} + /* NtUserCallHwndParam codes, not compatible with Windows */ enum {

1 0

Jacek Caban : win32u: Move GetProgmanWindow implementation from user32.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 592abf33796b8ca96d2416329e1248a774113b77 URL: https://gitlab.winehq.org/wine/wine/-/commit/592abf33796b8ca96d2416329e1248… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:51:15 2022 +0100 win32u: Move GetProgmanWindow implementation from user32. --- dlls/user32/focus.c | 11 +---------- dlls/win32u/input.c | 14 ++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 4d18c49214e..18084f7dbfd 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -87,16 +87,7 @@ HWND WINAPI SetProgmanWindow( HWND hwnd ) */ HWND WINAPI GetProgmanWindow(void) { - HWND ret = 0; - - SERVER_START_REQ(set_global_windows) - { - req->flags = 0; - if (!wine_server_call_err(req)) - ret = wine_server_ptr_handle( reply->old_progman_window ); - } - SERVER_END_REQ; - return ret; + return NtUserGetProgmanWindow(); } diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 783db67031a..6d727a934c8 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2208,6 +2208,20 @@ BOOL WINAPI NtUserSetShellWindowEx( HWND shell, HWND list_view ) return ret; } +HWND get_progman_window(void) +{ + HWND ret = 0; + + SERVER_START_REQ(set_global_windows) + { + req->flags = 0; + if (!wine_server_call_err(req)) + ret = wine_server_ptr_handle( reply->old_progman_window ); + } + SERVER_END_REQ; + return ret; +} + HWND set_progman_window( HWND hwnd ) { SERVER_START_REQ(set_global_windows) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 89be3bbc6ed..1bd90d85332 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5437,6 +5437,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetProcessDefaultLayout: return process_layout; + case NtUserCallNoParam_GetProgmanWindow: + return HandleToUlong( get_progman_window() ); + case NtUserCallNoParam_GetShellWindow: return HandleToUlong( get_shell_window() ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index fd29423cec5..67efa7ddefc 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -271,6 +271,7 @@ extern HWND get_capture(void) DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; extern HWND get_focus(void) DECLSPEC_HIDDEN; extern DWORD get_input_state(void) DECLSPEC_HIDDEN; +extern HWND get_progman_window(void) DECLSPEC_HIDDEN; extern HWND get_shell_window(void) DECLSPEC_HIDDEN; extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 19e8443475d..3fc0bc71cd4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -911,6 +911,7 @@ enum NtUserCallNoParam_GetDialogBaseUnits, NtUserCallNoParam_GetInputState, NtUserCallNoParam_GetProcessDefaultLayout, + NtUserCallNoParam_GetProgmanWindow, NtUserCallNoParam_GetShellWindow, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ @@ -943,6 +944,11 @@ static inline DWORD NtUserGetProcessDefaultLayout(void) return NtUserCallNoParam( NtUserCallNoParam_GetProcessDefaultLayout ); } +static inline HWND NtUserGetProgmanWindow(void) +{ + return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetProgmanWindow )); +} + static inline HWND NtUserGetShellWindow(void) { return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetShellWindow ));

1 0