March 2024 - Wine-commits - list.winehq.org

Rémi Bernon : win32u: Add support for sending and receiving WM_POINTER* messages.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: c9ffab4602efa791ccbd568b18c0a94ab78c7f80 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9ffab4602efa791ccbd568b18c0a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 20:57:55 2021 +0200 win32u: Add support for sending and receiving WM_POINTER* messages. --- dlls/dinput/tests/device8.c | 17 ++--------------- dlls/win32u/message.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 41e560a7e62..8b2a72f5976 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -2000,7 +2000,6 @@ static void test_hid_touch_screen(void) ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchdown_event, 10 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchleave_event, 500 ); todo_wine @@ -2139,7 +2138,6 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); res = msg_wait_for_events( 1, &touchdown_event, 1000 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchleave_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); @@ -2174,18 +2172,15 @@ static void test_hid_touch_screen(void) res = msg_wait_for_events( 1, &touchdown_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - todo_wine ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); expect_flags = POINTER_MESSAGE_FLAG_PRIMARY | POINTER_MESSAGE_FLAG_CONFIDENCE; - todo_wine ok( HIWORD( pointer_wparam[0] ) == expect_flags || broken(HIWORD( pointer_wparam[0] ) == (expect_flags & ~POINTER_MESSAGE_FLAG_CONFIDENCE)), /* Win8 32bit */ "got wparam %#Ix\n", pointer_wparam[0] ); - ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); todo_wine + ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); ok( LOWORD( pointer_lparam[0] ) * 128 / width == 0x08, "got lparam %#Ix\n", pointer_lparam[0] ); - todo_wine ok( HIWORD( pointer_lparam[0] ) * 128 / height == 0x10, "got lparam %#Ix\n", pointer_lparam[0] ); ok( pointer_wparam[1] == 0, "got wparam %#Ix\n", pointer_wparam[1] ); ok( pointer_lparam[1] == 0, "got lparam %#Ix\n", pointer_lparam[1] ); @@ -2197,10 +2192,8 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); res = msg_wait_for_events( 1, &touchdown_event, 1000 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchdown_event, 1000 ); - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchleave_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); @@ -2249,30 +2242,24 @@ static void test_hid_touch_screen(void) res = msg_wait_for_events( 1, &touchdown_event, 10 ); ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - todo_wine ok( pointer_up_count == 2, "got pointer_up_count %u\n", pointer_up_count ); expect_flags = POINTER_MESSAGE_FLAG_PRIMARY | POINTER_MESSAGE_FLAG_CONFIDENCE; - todo_wine ok( HIWORD( pointer_wparam[0] ) == expect_flags || broken(HIWORD( pointer_wparam[0] ) == (expect_flags & ~POINTER_MESSAGE_FLAG_CONFIDENCE)), /* Win8 32bit */ "got wparam %#Ix\n", pointer_wparam[0] ); - ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); todo_wine + ok( LOWORD( pointer_wparam[0] ) == id, "got wparam %#Ix\n", pointer_wparam[0] ); ok( LOWORD( pointer_lparam[0] ) * 128 / width == 0x08, "got lparam %#Ix\n", pointer_lparam[0] ); - todo_wine ok( HIWORD( pointer_lparam[0] ) * 128 / height == 0x10, "got lparam %#Ix\n", pointer_lparam[0] ); expect_flags = POINTER_MESSAGE_FLAG_CONFIDENCE; - todo_wine ok( HIWORD( pointer_wparam[1] ) == expect_flags || broken(HIWORD( pointer_wparam[1] ) == (expect_flags & ~POINTER_MESSAGE_FLAG_CONFIDENCE)), /* Win8 32bit */ "got wparam %#Ix\n", pointer_wparam[1] ); todo_wine ok( LOWORD( pointer_wparam[1] ) == id + 1, "got wparam %#Ix\n", pointer_wparam[1] ); - todo_wine ok( LOWORD( pointer_lparam[1] ) * 128 / width == 0x18, "got lparam %#Ix\n", pointer_lparam[1] ); - todo_wine ok( HIWORD( pointer_lparam[1] ) * 128 / height == 0x20, "got lparam %#Ix\n", pointer_lparam[1] ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 79390a7fdc5..f7f751ef883 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2319,6 +2319,16 @@ static void handle_keyboard_repeat_message( HWND hwnd ) NtUserPostMessage( hwnd, msg->message, msg->wParam, msg->lParam ); } +/*********************************************************************** + * process_pointer_message + * + * returns TRUE if the contents of 'msg' should be passed to the application + */ +static BOOL process_pointer_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) +{ + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); + return TRUE; +} /*********************************************************************** * process_keyboard_message @@ -2669,6 +2679,8 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar ret = process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); else if (is_mouse_message( msg->message )) ret = process_mouse_message( msg, hw_id, msg_data->info, hwnd_filter, first, last, remove ); + else if (msg->message >= WM_POINTERUPDATE && msg->message <= WM_POINTERLEAVE) + ret = process_pointer_message( msg, hw_id, msg_data ); else if (msg->message == WM_WINE_CLIPCURSOR) process_wine_clipcursor( msg->hwnd, msg->wParam, msg->lParam ); else if (msg->message == WM_WINE_SETCURSOR)

1 0

Martin Storsjö : arm64: Expose information about more modern CPU extensions.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: aa78b46e9c88f1bf645c74103e6a46d9a4360ed7 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa78b46e9c88f1bf645c74103e6a46… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Mar 5 14:21:52 2024 +0200 arm64: Expose information about more modern CPU extensions. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/system.c | 8 ++++++-- include/winternl.h | 12 ++++++++---- programs/wineboot/wineboot.c | 4 ++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 72bdd6b31a5..4c6c4cd23e2 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -574,8 +574,12 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (!strcmp( line, "Features" )) { - if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; - if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; + if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "atomics")) features |= CPU_FEATURE_ARM_V81_ATOMIC; + if (strstr(value, "asimddp")) features |= CPU_FEATURE_ARM_V82_DP; + if (strstr(value, "jscvt")) features |= CPU_FEATURE_ARM_V83_JSCVT; + if (strstr(value, "lrcpc")) features |= CPU_FEATURE_ARM_V83_LRCPC; continue; } } diff --git a/include/winternl.h b/include/winternl.h index f027ef47e2f..6b4009b913e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2693,10 +2693,14 @@ typedef struct _SYSTEM_CPU_INFORMATION { #define CPU_FEATURE_PAE 0x00200000 #define CPU_FEATURE_DAZ 0x00400000 -#define CPU_FEATURE_ARM_VFP_32 0x00000001 -#define CPU_FEATURE_ARM_NEON 0x00000002 -#define CPU_FEATURE_ARM_V8_CRC32 0x00000004 -#define CPU_FEATURE_ARM_V8_CRYPTO 0x00000008 +#define CPU_FEATURE_ARM_VFP_32 0x00000001 +#define CPU_FEATURE_ARM_NEON 0x00000002 +#define CPU_FEATURE_ARM_V8_CRC32 0x00000004 +#define CPU_FEATURE_ARM_V8_CRYPTO 0x00000008 +#define CPU_FEATURE_ARM_V81_ATOMIC 0x00000010 +#define CPU_FEATURE_ARM_V82_DP 0x00000020 +#define CPU_FEATURE_ARM_V83_JSCVT 0x00000040 +#define CPU_FEATURE_ARM_V83_LRCPC 0x00000080 typedef struct _SYSTEM_PROCESSOR_FEATURES_INFORMATION { diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index c16446cf289..1c1ad858fa4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -440,6 +440,10 @@ static void create_user_shared_data(void) features[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; features[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V8_CRC32); features[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V8_CRYPTO); + features[PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE]= !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V81_ATOMIC); + features[PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V82_DP); + features[PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V83_JSCVT); + features[PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE] = !!(sci.ProcessorFeatureBits & CPU_FEATURE_ARM_V83_LRCPC); features[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; features[PF_NX_ENABLED] = TRUE; features[PF_FASTFAIL_AVAILABLE] = TRUE;

1 0

Zebediah Figura : wined3d/nvrc: Move TEXTUREFACTOR constant loading to nvrc_apply_draw_state().
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 8f2586cfb5764d0923817ce60176aaa4396a494c URL: https://gitlab.winehq.org/wine/wine/-/commit/8f2586cfb5764d0923817ce60176aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 16:07:11 2023 -0600 wined3d/nvrc: Move TEXTUREFACTOR constant loading to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 0575e72ef43..b7418c9e70d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -651,28 +651,29 @@ static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3 static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_color color; - - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); - GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &color.r)); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } /* Context activation is done by the caller. */ static void nvrc_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; + struct wined3d_color color; - if (!use_ps(state)) - { - gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); - checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); - } - else + if (use_ps(state)) { gl_info->gl_ops.gl.p_glDisable(GL_REGISTER_COMBINERS_NV); checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); + return; + } + + gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); + + if (context->constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) + { + wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); + GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &color.r)); } }

1 0

Zebediah Figura : wined3d/nvrc: Move FFP bumpenv constant loading to nvrc_apply_draw_state().
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: e65679f4555947eebc53e5722b3d8cab3f7eff99 URL: https://gitlab.winehq.org/wine/wine/-/commit/e65679f4555947eebc53e5722b3d8c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 20:12:43 2023 -0600 wined3d/nvrc: Move FFP bumpenv constant loading to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 82 ++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 12 ++++++ 2 files changed, 40 insertions(+), 54 deletions(-)

1 0

Zebediah Figura : wined3d/nvrc: Move color ops from nvrc_colorop() to nvrc_apply_draw_state().
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 1c03b29f7ba0bf07fe6ff60714302eff56eb92a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c03b29f7ba0bf07fe6ff60714302e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:27:54 2024 -0600 wined3d/nvrc: Move color ops from nvrc_colorop() to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 43 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index a290ee70c42..a15b1419d43 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -481,17 +481,18 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - BOOL tex_used = context->fixed_function_usage_map & (1u << stage); + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; +} + +static void nvrc_update_color_op(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, unsigned int stage) +{ + BOOL tex_used = context_gl->c.fixed_function_usage_map & (1u << stage); const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int mapped_stage = context_gl->tex_unit_map[stage]; TRACE("Setting color op for stage %u.\n", stage); - /* Using a pixel shader? Don't care for anything here, the shader applying does it */ - if (use_ps(state)) return; - if (stage != mapped_stage) WARN("Using non 1:1 mapping: %d -> %d!\n", stage, mapped_stage); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -504,16 +505,16 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } - if (context->lowest_disabled_stage > 0) + if (context_gl->c.lowest_disabled_stage > 0) { gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); - GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, context->lowest_disabled_stage)); + GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, context_gl->c.lowest_disabled_stage)); } else { gl_info->gl_ops.gl.p_glDisable(GL_REGISTER_COMBINERS_NV); } - if (stage >= context->lowest_disabled_stage) + if (stage >= context_gl->c.lowest_disabled_stage) { TRACE("Stage disabled\n"); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -542,18 +543,12 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s return; } - /* The sampler will also activate the correct texture dimensions, so no need to do it here - * if the sampler for this stage is dirty - */ - if (!isStateDirty(context, STATE_SAMPLER(stage))) + if (tex_used) { - if (tex_used) - { - if (gl_info->supported[NV_TEXTURE_SHADER2]) - nvts_activate_dimensions(state, stage, context_gl); - else - texture_activate_dimensions(wined3d_state_get_ffp_texture(state, stage), gl_info); - } + if (gl_info->supported[NV_TEXTURE_SHADER2]) + nvts_activate_dimensions(state, stage, context_gl); + else + texture_activate_dimensions(wined3d_state_get_ffp_texture(state, stage), gl_info); } /* Set the texture combiners */ @@ -572,7 +567,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s { BOOL usesBump = (state->texture_states[stage][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_BUMPENVMAP_LUMINANCE || state->texture_states[stage][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_BUMPENVMAP); - BOOL usedBump = !!(context->texShaderBumpMap & 1u << (stage + 1)); + BOOL usedBump = !!(context_gl->c.texShaderBumpMap & 1u << (stage + 1)); if (usesBump != usedBump) { wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage + 1); @@ -673,6 +668,12 @@ static void nvrc_apply_draw_state(struct wined3d_context *context, const struct gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) + { + for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) + nvrc_update_color_op(context_gl, state, i); + } + if (context->constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) { wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]);

1 0

Zebediah Figura : wined3d/nvrc: Remove now redundant STATE_SAMPLER handlers.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 115d690731916b8d54021fb02121290cea12e995 URL: https://gitlab.winehq.org/wine/wine/-/commit/115d690731916b8d54021fb0212129… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:31:41 2024 -0600 wined3d/nvrc: Remove now redundant STATE_SAMPLER handlers. nvrc_update_color_op() takes care of this. Redirect STATE_SAMPLER to nvrc_colorop() so that the shader is invalidated. --- dlls/wined3d/nvidia_texture_shader.c | 46 +++++++----------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index a15b1419d43..3f001a1c436 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -593,28 +593,6 @@ static void nvrc_resultarg(struct wined3d_context *context, const struct wined3d } } -static void nvts_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int sampler, mapped_stage; - - sampler = state_id - STATE_SAMPLER(0); - mapped_stage = context_gl->tex_unit_map[sampler]; - - /* No need to enable / disable anything here for unused samplers. The tex_colorop - * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop - * will take care of this business. */ - if (mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= context_gl->gl_info->limits.ffp_textures) - return; - if (sampler >= context->lowest_disabled_stage) - return; - if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) - return; - - wined3d_context_gl_active_texture(context_gl, context_gl->gl_info, sampler); - nvts_activate_dimensions(state, sampler, context_gl); -} - static void nvrc_update_bumpenv_constants(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -893,22 +871,14 @@ static const struct wined3d_state_entry_template nvrc_fragmentstate_template[] = { STATE_RENDER(WINED3D_RS_FOGSTART), { STATE_RENDER(WINED3D_RS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGEND), { STATE_RENDER(WINED3D_RS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SHADEMODE), { STATE_RENDER(WINED3D_RS_SHADEMODE), state_shademode }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(0), { STATE_SAMPLER(0), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(1), { STATE_SAMPLER(1), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(2), { STATE_SAMPLER(2), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(3), { STATE_SAMPLER(3), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(4), { STATE_SAMPLER(4), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(5), { STATE_SAMPLER(5), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(6), { STATE_SAMPLER(6), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(7), { STATE_SAMPLER(7), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(0), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(1), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(2), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(3), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(4), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(5), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(6), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(7), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0

Zebediah Figura : wined3d/nvrc: Move alpha op application to nvrc_apply_draw_state().
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: c3840b6c497988f5594ab040188604450fe462d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3840b6c497988f5594ab040188604… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:37:51 2024 -0600 wined3d/nvrc: Move alpha op application to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 66 +++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 32 deletions(-)

1 0

Zebediah Figura : wined3d/nvrc: Remove now redundant WINED3D_TSS_RESULT_ARG handlers.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 6fa14583785fb45fd0991cfabb23ab24a5aef3ac URL: https://gitlab.winehq.org/wine/wine/-/commit/6fa14583785fb45fd0991cfabb23ab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:39:02 2024 -0600 wined3d/nvrc: Remove now redundant WINED3D_TSS_RESULT_ARG handlers. nvrc_update_color_op() takes care of this. Redirect WINED3D_TSS_RESULT_ARG to nvrc_colorop() so that the shader is invalidated. --- dlls/wined3d/nvidia_texture_shader.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-)

1 0

Daniel Lehman : ole32: Do not lock storage in read-only deny-write mode.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 2fc073591be28f4606a8818163c6bb4310e55096 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fc073591be28f4606a8818163c6bb… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Mar 1 20:46:39 2024 -0800 ole32: Do not lock storage in read-only deny-write mode. --- dlls/ole32/storage32.c | 8 +++++--- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1bf08e45701..78e6de22be8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5036,7 +5036,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) ULARGE_INTEGER offset; ULARGE_INTEGER cb; DWORD share_mode = STGM_SHARE_MODE(openFlags); - BOOL supported; + BOOL supported, ro_denyw; if (openFlags & STGM_NOSNAPSHOT) { @@ -5045,6 +5045,8 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) else if (share_mode != STGM_SHARE_EXCLUSIVE) share_mode = STGM_SHARE_DENY_WRITE; } + ro_denyw = (STGM_ACCESS_MODE(openFlags) == STGM_READ) && (share_mode == STGM_SHARE_DENY_WRITE); + /* Wrap all other locking inside a single lock so we can check ranges safely */ offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; @@ -5088,7 +5090,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) hr = StorageImpl_LockOne(This, RANGELOCK_PRIORITY2_FIRST, RANGELOCK_PRIORITY2_LAST); } - if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_WRITE)) + if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_WRITE) && !ro_denyw) hr = StorageImpl_LockOne(This, RANGELOCK_READ_FIRST, RANGELOCK_READ_LAST); if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_READ)) @@ -5097,7 +5099,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_READ || share_mode == STGM_SHARE_EXCLUSIVE)) hr = StorageImpl_LockOne(This, RANGELOCK_DENY_READ_FIRST, RANGELOCK_DENY_READ_LAST); - if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE)) + if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE) && !ro_denyw) hr = StorageImpl_LockOne(This, RANGELOCK_DENY_WRITE_FIRST, RANGELOCK_DENY_WRITE_LAST); if (SUCCEEDED(hr) && (openFlags & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 97809db539c..9728c1c9db8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3394,7 +3394,7 @@ static const struct lock_test lock_tests[] = { { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED|STGM_NOSNAPSHOT, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, nosn_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, - { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, + { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, FALSE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE },

1 0

Daniel Lehman : ole32/tests: Remove todo from lock tests.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 91e5d21cdf47edaada0a6bbb170d03c167add287 URL: https://gitlab.winehq.org/wine/wine/-/commit/91e5d21cdf47edaada0a6bbb170d03… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Mar 1 20:46:39 2024 -0800 ole32/tests: Remove todo from lock tests. --- dlls/ole32/tests/storage32.c | 115 +++++++++++++------------------------------ 1 file changed, 33 insertions(+), 82 deletions(-)

1 0