- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Store push constants in wined3d_buffers in struct wined3d_state.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: c065b4fe0b3622e0c737a4c7c1c514273ad2d8a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c065b4fe0b3622e0c737a4c7c1c514… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 19 17:33:03 2023 -0600 wined3d: Store push constants in wined3d_buffers in struct wined3d_state. We will need them in buffers for Vulkan, as well as for software vertex shaders. Currently we simply store them in sysmem buffers and read directly back out of them to load GL uniforms. This does decrease memory usage a bit for d3d10+. --- dlls/wined3d/arb_program_shader.c | 69 ++++++++++++++++--------- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 105 +++++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 69 ++++++++++++++++--------- dlls/wined3d/stateblock.c | 6 --- dlls/wined3d/wined3d_private.h | 44 ++++++---------- 7 files changed, 166 insertions(+), 131 deletions(-)

1 0

Zebediah Figura : d3d11/tests: Mark test failures specific to the Vulkan or GL renderers.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 9a19e34bf8f47b33ec1bcad9ca42fa38c2ed2a5b URL: https://gitlab.winehq.org/wine/wine/-/commit/9a19e34bf8f47b33ec1bcad9ca42fa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 22 20:16:22 2023 -0500 d3d11/tests: Mark test failures specific to the Vulkan or GL renderers. --- dlls/d3d11/tests/d3d11.c | 137 +++++++++++++++++++++++++++++++---------------- 1 file changed, 91 insertions(+), 46 deletions(-)

1 0

Zebediah Figura : wined3d: Add helpers to retrieve shader constants from a wined3d_stateblock.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 5323042f7a2aa69c01bce8248a457bcc8533c61c URL: https://gitlab.winehq.org/wine/wine/-/commit/5323042f7a2aa69c01bce8248a457b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 18 15:45:58 2023 -0600 wined3d: Add helpers to retrieve shader constants from a wined3d_stateblock. --- dlls/d3d8/device.c | 26 ++++---------- dlls/d3d9/device.c | 71 ++++++++++---------------------------- dlls/wined3d/stateblock.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 6 ++++ include/wine/wined3d.h | 12 +++++++ 5 files changed, 129 insertions(+), 72 deletions(-)

1 0

Zebediah Figura : wined3d: Remove states not used by d3d10+ from wined3d_device_context_set_state().
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 31eacea31a368fba6b0fc698ad96fb2825806372 URL: https://gitlab.winehq.org/wine/wine/-/commit/31eacea31a368fba6b0fc698ad96fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 15:39:14 2022 -0600 wined3d: Remove states not used by d3d10+ from wined3d_device_context_set_state(). --- dlls/wined3d/device.c | 164 +------------------------------------------------- 1 file changed, 1 insertion(+), 163 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8bb879b41cd..711bc4e7bc5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1545,111 +1545,6 @@ static void wined3d_device_get_transform(const struct wined3d_device *device, *matrix = device->cs->c.state->transforms[state]; } -/* Note lights are real special cases. Although the device caps state only - * e.g. 8 are supported, you can reference any indexes you want as long as - * that number max are enabled at any one point in time. Therefore since the - * indices can be anything, we need a hashmap of them. However, this causes - * stateblock problems. When capturing the state block, I duplicate the - * hashmap, but when recording, just build a chain pretty much of commands to - * be replayed. */ -static void wined3d_device_context_set_light(struct wined3d_device_context *context, - unsigned int light_idx, const struct wined3d_light *light) -{ - struct wined3d_light_info *object = NULL; - float rho; - - if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) - return; - - /* Initialize the object. */ - TRACE("Light %u setting to type %#x, diffuse %s, specular %s, ambient %s, " - "position {%.8e, %.8e, %.8e}, direction {%.8e, %.8e, %.8e}, " - "range %.8e, falloff %.8e, theta %.8e, phi %.8e.\n", - light_idx, light->type, debug_color(&light->diffuse), - debug_color(&light->specular), debug_color(&light->ambient), - light->position.x, light->position.y, light->position.z, - light->direction.x, light->direction.y, light->direction.z, - light->range, light->falloff, light->theta, light->phi); - - switch (light->type) - { - case WINED3D_LIGHT_POINT: - /* Position */ - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - object->cutoff = 180.0f; - /* FIXME: Range */ - break; - - case WINED3D_LIGHT_DIRECTIONAL: - /* Direction */ - object->direction.x = -light->direction.x; - object->direction.y = -light->direction.y; - object->direction.z = -light->direction.z; - object->direction.w = 0.0f; - object->exponent = 0.0f; - object->cutoff = 180.0f; - break; - - case WINED3D_LIGHT_SPOT: - /* Position */ - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - - /* Direction */ - object->direction.x = light->direction.x; - object->direction.y = light->direction.y; - object->direction.z = light->direction.z; - object->direction.w = 0.0f; - - /* opengl-ish and d3d-ish spot lights use too different models - * for the light "intensity" as a function of the angle towards - * the main light direction, so we only can approximate very - * roughly. However, spot lights are rather rarely used in games - * (if ever used at all). Furthermore if still used, probably - * nobody pays attention to such details. */ - if (!light->falloff) - { - /* Falloff = 0 is easy, because d3d's and opengl's spot light - * equations have the falloff resp. exponent parameter as an - * exponent, so the spot light lighting will always be 1.0 for - * both of them, and we don't have to care for the rest of the - * rather complex calculation. */ - object->exponent = 0.0f; - } - else - { - rho = light->theta + (light->phi - light->theta) / (2 * light->falloff); - if (rho < 0.0001f) - rho = 0.0001f; - object->exponent = -0.3f / logf(cosf(rho / 2)); - } - - if (object->exponent > 128.0f) - object->exponent = 128.0f; - - object->cutoff = (float)(light->phi * 90 / M_PI); - /* FIXME: Range */ - break; - - case WINED3D_LIGHT_PARALLELPOINT: - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - break; - - default: - FIXME("Unrecognized light type %#x.\n", light->type); - } - - wined3d_device_context_emit_set_light(context, object); -} - HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status) { @@ -1758,8 +1653,7 @@ void CDECL wined3d_device_context_reset_state(struct wined3d_device_context *con void CDECL wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state) { - struct wined3d_light_info *light; - unsigned int i, j; + unsigned int i; TRACE("context %p, state %p.\n", context, state); @@ -1795,65 +1689,9 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte wined3d_device_context_emit_set_unordered_access_views(context, i, 0, MAX_UNORDERED_ACCESS_VIEWS, state->unordered_access_view[i], NULL); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_F, - 0, WINED3D_MAX_VS_CONSTS_F, state->vs_consts_f); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_I, - 0, WINED3D_MAX_CONSTS_I, state->vs_consts_i); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_B, - 0, WINED3D_MAX_CONSTS_B, state->vs_consts_b); - - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_F, - 0, WINED3D_MAX_PS_CONSTS_F, state->ps_consts_f); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_I, - 0, WINED3D_MAX_CONSTS_I, state->ps_consts_i); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_B, - 0, WINED3D_MAX_CONSTS_B, state->ps_consts_b); - - for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) - { - wined3d_device_context_emit_set_texture(context, i, state->textures[i]); - for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j) - { - wined3d_device_context_emit_set_sampler_state(context, i, j, state->sampler_states[i][j]); - } - } - - for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) - { - for (j = 0; j < WINED3D_HIGHEST_TEXTURE_STATE + 1; ++j) - { - wined3d_device_context_emit_set_texture_state(context, i, j, state->texture_states[i][j]); - } - } - - for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i) - { - if (context->device->state_table[STATE_TRANSFORM(i)].representative) - wined3d_device_context_emit_set_transform(context, i, state->transforms + i); - } - - for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) - { - wined3d_device_context_emit_set_clip_plane(context, i, state->clip_planes + i); - } - - wined3d_device_context_emit_set_material(context, &state->material); - wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_device_context_emit_set_scissor_rects(context, state->scissor_rect_count, state->scissor_rects); - RB_FOR_EACH_ENTRY(light, &state->light_state.lights_tree, struct wined3d_light_info, entry) - { - wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); - wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); - } - - for (i = 0; i < WINEHIGHEST_RENDER_STATE + 1; ++i) - { - if (context->device->state_table[STATE_RENDER(i)].representative) - wined3d_device_context_emit_set_render_state(context, i, state->render_states[i]); - } - wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); wined3d_device_context_emit_set_depth_stencil_state(context, state->depth_stencil_state, state->stencil_ref); wined3d_device_context_emit_set_rasterizer_state(context, state->rasterizer_state);

1 0

Zebediah Figura : wined3d: Move wined3d_device_apply_stateblock() to stateblock.c.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: a10540753cf0c597981c910a877b3794351acdb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a10540753cf0c597981c910a877b37… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 15:33:59 2022 -0600 wined3d: Move wined3d_device_apply_stateblock() to stateblock.c. All other code touching stateblocks is in stateblock.c; this is a more intuitive and modular place for it. This may merit renaming the function, but should be a subsequent commit. --- dlls/wined3d/device.c | 934 ---------------------------------------- dlls/wined3d/stateblock.c | 1034 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1034 insertions(+), 934 deletions(-)

1 0

Piotr Caban : userenv: Fix setting ALLUSERSPROFILE and ProgramData in CreateEnvironmentBlock.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 94812b126536ff5793c40068c0cedcfb2cb1a553 URL: https://gitlab.winehq.org/wine/wine/-/commit/94812b126536ff5793c40068c0cedc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 25 12:56:57 2023 +0200 userenv: Fix setting ALLUSERSPROFILE and ProgramData in CreateEnvironmentBlock. This syncs the code with dlls/ntdll/unix/env.c add_registry_environment. It fixes ALLUSERSPROFILE and ProgramData environment variables value in services. --- dlls/userenv/tests/userenv.c | 7 +++++-- dlls/userenv/userenv_main.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 3f2b3442832..a440f538723 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -78,7 +78,7 @@ static void test_create_env(void) BOOL r, is_wow64 = FALSE; HANDLE htok; WCHAR * env[4]; - char * st, systemroot[100], programdata[100]; + char * st, systemroot[100], programdata[100], allusersprofile[100]; int i, j; static const struct profile_item common_vars[] = { @@ -186,7 +186,7 @@ static void test_create_env(void) } /* Test for common environment variables (post NT4) */ - if (!GetEnvironmentVariableA("ALLUSERSPROFILE", NULL, 0)) + if (!GetEnvironmentVariableA("ALLUSERSPROFILE", allusersprofile, sizeof(allusersprofile))) { win_skip("Some environment variables are not present on NT4\n"); } @@ -198,6 +198,9 @@ static void test_create_env(void) { r = get_env(env[j], common_post_nt4_vars[i].name, &st); expect_env(TRUE, r, common_post_nt4_vars[i].name); + if (!strcmp(common_post_nt4_vars[i].name, "ALLUSERSPROFILE") || + !strcmp(common_post_nt4_vars[i].name, "ProgramData")) + ok(!strcmp(st + strlen(common_post_nt4_vars[i].name) + 1, allusersprofile), "%s\n", st); if (r) HeapFree(GetProcessHeap(), 0, st); } } diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 2b5171254dc..cadb45c1a74 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -242,7 +242,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, profiles_dir[len] = '\0'; } - if (get_reg_value(env, hkey, L"Public", buf, UNICODE_STRING_MAX_CHARS)) + if (get_reg_value(env, hkey, L"ProgramData", buf, UNICODE_STRING_MAX_CHARS)) { set_env_var(&env, L"ALLUSERSPROFILE", buf); set_env_var(&env, L"ProgramData", buf);

1 0

Jacek Caban : win32u: Use user message packing for WM_COMPAREITEM.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: f231c7bed0d9012cb929f196faefdf7299df6b65 URL: https://gitlab.winehq.org/wine/wine/-/commit/f231c7bed0d9012cb929f196faefdf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 10:46:09 2023 +0200 win32u: Use user message packing for WM_COMPAREITEM. --- dlls/user32/winproc.c | 15 +-------------- dlls/win32u/message.c | 18 ++++++++++++++++++ dlls/win32u/tests/win32u.c | 6 ++++++ dlls/wow64win/user.c | 17 +++++++++++++++++ 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index adbc258c1f1..d1fe0d4c4ce 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -844,22 +844,8 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case WM_DRAWITEM: case WM_MEASUREITEM: case WM_DELETEITEM: - break; case WM_COMPAREITEM: - { - COMPAREITEMSTRUCT cis; - if (size < sizeof(ps->cis)) return FALSE; - cis.CtlType = ps->cis.CtlType; - cis.CtlID = ps->cis.CtlID; - cis.hwndItem = unpack_handle( ps->cis.hwndItem ); - cis.itemID1 = ps->cis.itemID1; - cis.itemData1 = (ULONG_PTR)unpack_ptr( ps->cis.itemData1 ); - cis.itemID2 = ps->cis.itemID2; - cis.itemData2 = (ULONG_PTR)unpack_ptr( ps->cis.itemData2 ); - cis.dwLocaleId = ps->cis.dwLocaleId; - memcpy( *buffer, &cis, sizeof(cis) ); break; - } case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: { @@ -1150,6 +1136,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case WM_GETMINMAXINFO: case WM_MEASUREITEM: case WM_DELETEITEM: + case WM_COMPAREITEM: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 253d4df15fe..a752407c52b 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -474,6 +474,21 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa memcpy( *buffer, &dls, sizeof(dls) ); break; } + case WM_COMPAREITEM: + { + COMPAREITEMSTRUCT cis; + if (size < sizeof(ps->cis)) return FALSE; + cis.CtlType = ps->cis.CtlType; + cis.CtlID = ps->cis.CtlID; + cis.hwndItem = wine_server_ptr_handle( ps->cis.hwndItem ); + cis.itemID1 = ps->cis.itemID1; + cis.itemData1 = (ULONG_PTR)unpack_ptr( ps->cis.itemData1 ); + cis.itemID2 = ps->cis.itemID2; + cis.itemData2 = (ULONG_PTR)unpack_ptr( ps->cis.itemData2 ); + cis.dwLocaleId = ps->cis.dwLocaleId; + memcpy( *buffer, &cis, sizeof(cis) ); + break; + } case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1270,6 +1285,9 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case WM_DELETEITEM: size = sizeof(DELETEITEMSTRUCT); break; + case WM_COMPAREITEM: + size = sizeof(COMPAREITEMSTRUCT); + break; } return size; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index e46e82718d1..38686535384 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1625,6 +1625,7 @@ static void test_wndproc_hook(void) static const MEASUREITEMSTRUCT mis_in = { .itemID = 1 }; static const MEASUREITEMSTRUCT mis_out = { .itemID = 2, .CtlType = 3, .CtlID = 4, .itemData = 5 }; static const DELETEITEMSTRUCT dis_in = { .itemID = 1 }; + static const COMPAREITEMSTRUCT cis_in = { .itemID1 = 1 }; static const struct lparam_hook_test lparam_hook_tests[] = { @@ -1724,6 +1725,11 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(dis_in), .lparam = &dis_in, .poison_lparam = TRUE, .check_size = sizeof(dis_in), }, + { + "WM_COMPAREITEM", WM_COMPAREITEM, .wparam = 10, + .lparam_size = sizeof(cis_in), .lparam = &cis_in, .poison_lparam = TRUE, + .check_size = sizeof(cis_in), + }, /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 36544032d70..388a028e3f3 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -698,6 +698,23 @@ static size_t packed_message_64to32( UINT message, WPARAM wparam, memcpy( params32, &dis32, sizeof(dis32) ); return sizeof(dis32); } + + case WM_COMPAREITEM: + { + COMPAREITEMSTRUCT32 cis32; + const COMPAREITEMSTRUCT *cis64 = params64; + + cis32.CtlType = cis64->CtlType; + cis32.CtlID = cis64->CtlID; + cis32.hwndItem = HandleToLong( cis64->hwndItem ); + cis32.itemID1 = cis64->itemID1; + cis32.itemData1 = cis64->itemData1; + cis32.itemID2 = cis64->itemID2; + cis32.itemData2 = cis64->itemData2; + cis32.dwLocaleId = cis64->dwLocaleId; + memcpy( params32, &cis32, sizeof(cis32) ); + return sizeof(cis32); + } } memmove( params32, params64, size );

1 0

Jacek Caban : win32u: Use user message packing for WM_DELETEITEM.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 7f4ffc7c1026919c5b5a66cbad5e6fa5c418cb10 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f4ffc7c1026919c5b5a66cbad5e6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 10:29:07 2023 +0200 win32u: Use user message packing for WM_DELETEITEM. --- dlls/user32/winproc.c | 12 +----------- dlls/win32u/message.c | 15 +++++++++++++++ dlls/win32u/tests/win32u.c | 6 ++++++ dlls/wow64win/user.c | 15 +++++++++++++++ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 43d57766616..adbc258c1f1 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -843,19 +843,8 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case WM_GETMINMAXINFO: case WM_DRAWITEM: case WM_MEASUREITEM: - break; case WM_DELETEITEM: - { - DELETEITEMSTRUCT dls; - if (size < sizeof(ps->dls)) return FALSE; - dls.CtlType = ps->dls.CtlType; - dls.CtlID = ps->dls.CtlID; - dls.itemID = ps->dls.itemID; - dls.hwndItem = unpack_handle( ps->dls.hwndItem ); - dls.itemData = (ULONG_PTR)unpack_ptr( ps->dls.itemData ); - memcpy( *buffer, &dls, sizeof(dls) ); break; - } case WM_COMPAREITEM: { COMPAREITEMSTRUCT cis; @@ -1160,6 +1149,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case EM_REPLACESEL: case WM_GETMINMAXINFO: case WM_MEASUREITEM: + case WM_DELETEITEM: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index fe2e1c77400..253d4df15fe 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -462,6 +462,18 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa memcpy( *buffer, &mis, sizeof(mis) ); break; } + case WM_DELETEITEM: + { + DELETEITEMSTRUCT dls; + if (size < sizeof(ps->dls)) return FALSE; + dls.CtlType = ps->dls.CtlType; + dls.CtlID = ps->dls.CtlID; + dls.itemID = ps->dls.itemID; + dls.hwndItem = wine_server_ptr_handle( ps->dls.hwndItem ); + dls.itemData = (ULONG_PTR)unpack_ptr( ps->dls.itemData ); + memcpy( *buffer, &dls, sizeof(dls) ); + break; + } case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1255,6 +1267,9 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case WM_MEASUREITEM: size = sizeof(MEASUREITEMSTRUCT); break; + case WM_DELETEITEM: + size = sizeof(DELETEITEMSTRUCT); + break; } return size; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 8008e6aff10..e46e82718d1 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1624,6 +1624,7 @@ static void test_wndproc_hook(void) static const DRAWITEMSTRUCT drawitem_in = { .itemID = 1 }; static const MEASUREITEMSTRUCT mis_in = { .itemID = 1 }; static const MEASUREITEMSTRUCT mis_out = { .itemID = 2, .CtlType = 3, .CtlID = 4, .itemData = 5 }; + static const DELETEITEMSTRUCT dis_in = { .itemID = 1 }; static const struct lparam_hook_test lparam_hook_tests[] = { @@ -1718,6 +1719,11 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(mis_in), .lparam = &mis_in, .change_lparam = &mis_out, .check_size = sizeof(mis_in), }, + { + "WM_DELETEITEM", WM_DELETEITEM, .wparam = 10, + .lparam_size = sizeof(dis_in), .lparam = &dis_in, .poison_lparam = TRUE, + .check_size = sizeof(dis_in), + }, /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 937ceea5b90..36544032d70 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -684,6 +684,20 @@ static size_t packed_message_64to32( UINT message, WPARAM wparam, memcpy( params32, &mis32, sizeof(mis32) ); return sizeof(mis32); } + + case WM_DELETEITEM: + { + DELETEITEMSTRUCT32 dis32; + const DELETEITEMSTRUCT *dis64 = params64; + + dis32.CtlType = dis64->CtlType; + dis32.CtlID = dis64->CtlID; + dis32.itemID = dis64->itemID; + dis32.hwndItem = HandleToLong( dis64->hwndItem ); + dis32.itemData = dis64->itemData; + memcpy( params32, &dis32, sizeof(dis32) ); + return sizeof(dis32); + } } memmove( params32, params64, size ); @@ -3167,6 +3181,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l dis.CtlType = dis32->CtlType; dis.CtlID = dis32->CtlID; + dis.itemID = dis32->itemID; dis.hwndItem = LongToHandle( dis32->hwndItem ); dis.itemData = dis32->itemData; return NtUserMessageCall( hwnd, msg, wparam, (LPARAM)&dis, result_info, type, ansi );

1 0

Jacek Caban : win32u: Use user message packing for WM_MEASUREITEM.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 58dece677f0124f83ecdca035339f98ff4b933ce URL: https://gitlab.winehq.org/wine/wine/-/commit/58dece677f0124f83ecdca035339f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 00:32:48 2023 +0200 win32u: Use user message packing for WM_MEASUREITEM. --- dlls/user32/winproc.c | 13 +------------ dlls/win32u/message.c | 22 +++++++++++++++++++--- dlls/win32u/tests/win32u.c | 7 +++++++ dlls/wow64win/user.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 22874360af0..43d57766616 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -842,20 +842,8 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case EM_REPLACESEL: case WM_GETMINMAXINFO: case WM_DRAWITEM: - break; case WM_MEASUREITEM: - { - MEASUREITEMSTRUCT mis; - if (size < sizeof(ps->mis)) return FALSE; - mis.CtlType = ps->mis.CtlType; - mis.CtlID = ps->mis.CtlID; - mis.itemID = ps->mis.itemID; - mis.itemWidth = ps->mis.itemWidth; - mis.itemHeight = ps->mis.itemHeight; - mis.itemData = (ULONG_PTR)unpack_ptr( ps->mis.itemData ); - memcpy( *buffer, &mis, sizeof(mis) ); break; - } case WM_DELETEITEM: { DELETEITEMSTRUCT dls; @@ -1171,6 +1159,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case LB_ADDFILE: case EM_REPLACESEL: case WM_GETMINMAXINFO: + case WM_MEASUREITEM: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 679e349f817..fe2e1c77400 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -449,6 +449,19 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa memcpy( *buffer, &dis, sizeof(dis) ); break; } + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT mis; + if (size < sizeof(ps->mis)) return FALSE; + mis.CtlType = ps->mis.CtlType; + mis.CtlID = ps->mis.CtlID; + mis.itemID = ps->mis.itemID; + mis.itemWidth = ps->mis.itemWidth; + mis.itemHeight = ps->mis.itemHeight; + mis.itemData = (ULONG_PTR)unpack_ptr( ps->mis.itemData ); + memcpy( *buffer, &mis, sizeof(mis) ); + break; + } case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1239,6 +1252,9 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case WM_DRAWITEM: size = sizeof(DRAWITEMSTRUCT); break; + case WM_MEASUREITEM: + size = sizeof(MEASUREITEMSTRUCT); + break; } return size; @@ -1353,6 +1369,9 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me case WM_GETMINMAXINFO: copy_size = sizeof(MINMAXINFO); break; + case WM_MEASUREITEM: + copy_size = sizeof(MEASUREITEMSTRUCT); + break; default: return; } @@ -1377,9 +1396,6 @@ static void copy_reply( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, case LB_GETTEXT: copy_size = (result + 1) * sizeof(WCHAR); break; - case WM_MEASUREITEM: - copy_size = sizeof(MEASUREITEMSTRUCT); - break; case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: copy_size = sizeof(WINDOWPOS); diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 0fa46a57c2e..8008e6aff10 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1622,6 +1622,8 @@ static void test_wndproc_hook(void) static const MINMAXINFO minmax_in = { .ptMinTrackSize.x = 1 }; static const MINMAXINFO minmax_out = { .ptMinTrackSize.x = 2 }; static const DRAWITEMSTRUCT drawitem_in = { .itemID = 1 }; + static const MEASUREITEMSTRUCT mis_in = { .itemID = 1 }; + static const MEASUREITEMSTRUCT mis_out = { .itemID = 2, .CtlType = 3, .CtlID = 4, .itemData = 5 }; static const struct lparam_hook_test lparam_hook_tests[] = { @@ -1711,6 +1713,11 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(minmax_in), .lparam = &minmax_in, .change_lparam = &minmax_out, .check_size = sizeof(minmax_in) }, + { + "WM_MEASUREITEM", WM_MEASUREITEM, .wparam = 10, + .lparam_size = sizeof(mis_in), .lparam = &mis_in, .change_lparam = &mis_out, + .check_size = sizeof(mis_in), + }, /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 32dea8e84ac..937ceea5b90 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -669,6 +669,21 @@ static size_t packed_message_64to32( UINT message, WPARAM wparam, memcpy( params32, &dis32, sizeof(dis32) ); return sizeof(dis32); } + + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT32 mis32; + const MEASUREITEMSTRUCT *mis64 = params64; + + mis32.CtlType = mis64->CtlType; + mis32.CtlID = mis64->CtlID; + mis32.itemID = mis64->itemID; + mis32.itemWidth = mis64->itemWidth; + mis32.itemHeight = mis64->itemHeight; + mis32.itemData = mis64->itemData; + memcpy( params32, &mis32, sizeof(mis32) ); + return sizeof(mis32); + } } memmove( params32, params64, size ); @@ -716,6 +731,20 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par } break; + case WM_MEASUREITEM: + { + const MEASUREITEMSTRUCT32 *mis32 = params32; + MEASUREITEMSTRUCT *mis64 = params64; + + mis64->CtlType = mis32->CtlType; + mis64->CtlID = mis32->CtlID; + mis64->itemID = mis32->itemID; + mis64->itemWidth = mis32->itemWidth; + mis64->itemHeight = mis32->itemHeight; + mis64->itemData = mis32->itemData; + return sizeof(*mis64); + } + case WM_GETTEXT: case WM_ASKCBFORMATNAME: case WM_GETMINMAXINFO: @@ -3155,8 +3184,12 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l mis.itemHeight = mis32->itemHeight; mis.itemData = mis32->itemData; ret = NtUserMessageCall( hwnd, msg, wparam, (LPARAM)&mis, result_info, type, ansi ); + mis32->CtlType = mis.CtlType; + mis32->CtlID = mis.CtlID; + mis32->itemID = mis.itemID; mis32->itemWidth = mis.itemWidth; mis32->itemHeight = mis.itemHeight; + mis32->itemData = mis.itemData; return ret; }

1 0

Jacek Caban : win32u: Use user message packing for WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 9b400f3f3e9597e771d7fb4375e7eee97e3f090c URL: https://gitlab.winehq.org/wine/wine/-/commit/9b400f3f3e9597e771d7fb4375e7ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 12:12:59 2023 +0200 win32u: Use user message packing for WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED. --- dlls/user32/winproc.c | 15 ++------------- dlls/win32u/message.c | 26 ++++++++++++++++++++++---- dlls/win32u/tests/win32u.c | 12 ++++++++++++ dlls/wow64win/user.c | 10 ++++++++++ 4 files changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d1fe0d4c4ce..fb41d444a45 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -845,22 +845,9 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case WM_MEASUREITEM: case WM_DELETEITEM: case WM_COMPAREITEM: - break; case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: - { - WINDOWPOS wp; - if (size < sizeof(ps->wp)) return FALSE; - wp.hwnd = unpack_handle( ps->wp.hwnd ); - wp.hwndInsertAfter = unpack_handle( ps->wp.hwndInsertAfter ); - wp.x = ps->wp.x; - wp.y = ps->wp.y; - wp.cx = ps->wp.cx; - wp.cy = ps->wp.cy; - wp.flags = ps->wp.flags; - memcpy( *buffer, &wp, sizeof(wp) ); break; - } case WM_COPYDATA: { COPYDATASTRUCT cds; @@ -1137,6 +1124,8 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case WM_MEASUREITEM: case WM_DELETEITEM: case WM_COMPAREITEM: + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index a752407c52b..641fa905af3 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -489,6 +489,21 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa memcpy( *buffer, &cis, sizeof(cis) ); break; } + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS wp; + if (size < sizeof(ps->wp)) return FALSE; + wp.hwnd = wine_server_ptr_handle( ps->wp.hwnd ); + wp.hwndInsertAfter = wine_server_ptr_handle( ps->wp.hwndInsertAfter ); + wp.x = ps->wp.x; + wp.y = ps->wp.y; + wp.cx = ps->wp.cx; + wp.cy = ps->wp.cy; + wp.flags = ps->wp.flags; + memcpy( *buffer, &wp, sizeof(wp) ); + break; + } case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1288,6 +1303,10 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case WM_COMPAREITEM: size = sizeof(COMPAREITEMSTRUCT); break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + size = sizeof(WINDOWPOS); + break; } return size; @@ -1405,6 +1424,9 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me case WM_MEASUREITEM: copy_size = sizeof(MEASUREITEMSTRUCT); break; + case WM_WINDOWPOSCHANGING: + copy_size = sizeof(WINDOWPOS); + break; default: return; } @@ -1429,10 +1451,6 @@ static void copy_reply( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, case LB_GETTEXT: copy_size = (result + 1) * sizeof(WCHAR); break; - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - copy_size = sizeof(WINDOWPOS); - break; case CB_GETCOMBOBOXINFO: copy_size = sizeof(COMBOBOXINFO); break; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 38686535384..8d72dba243a 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1626,6 +1626,8 @@ static void test_wndproc_hook(void) static const MEASUREITEMSTRUCT mis_out = { .itemID = 2, .CtlType = 3, .CtlID = 4, .itemData = 5 }; static const DELETEITEMSTRUCT dis_in = { .itemID = 1 }; static const COMPAREITEMSTRUCT cis_in = { .itemID1 = 1 }; + static const WINDOWPOS winpos_in = { .x = 1, .cy = 2 }; + static const WINDOWPOS winpos_out = { .x = 10, .cy = 22 }; static const struct lparam_hook_test lparam_hook_tests[] = { @@ -1730,6 +1732,16 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(cis_in), .lparam = &cis_in, .poison_lparam = TRUE, .check_size = sizeof(cis_in), }, + { + "WM_WINDOWPOSCHANGING", WM_WINDOWPOSCHANGING, + .lparam_size = sizeof(WINDOWPOS), .lparam = &winpos_in, .change_lparam = &winpos_out, + .check_size = sizeof(WINDOWPOS) + }, + { + "WM_WINDOWPOSCHANGED", WM_WINDOWPOSCHANGED, + .lparam_size = sizeof(WINDOWPOS), .lparam = &winpos_in, .poison_lparam = TRUE, + .check_size = sizeof(WINDOWPOS), + }, /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 388a028e3f3..b2a7a3887cc 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -715,6 +715,11 @@ static size_t packed_message_64to32( UINT message, WPARAM wparam, memcpy( params32, &cis32, sizeof(cis32) ); return sizeof(cis32); } + + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + winpos_64to32( params64, params32 ); + return sizeof(WINDOWPOS32); } memmove( params32, params64, size ); @@ -776,6 +781,11 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par return sizeof(*mis64); } + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + winpos_32to64( params64, params32 ); + return sizeof(WINDOWPOS); + case WM_GETTEXT: case WM_ASKCBFORMATNAME: case WM_GETMINMAXINFO:

1 0