- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Parse the tex3D() intrinsic.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: vkd3d Branch: master Commit: 7c1c2e6cc4f9d2f6e8df0a46a58c721a74ba5dff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c1c2e6cc4f9d2f6e8df0a46a58c7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 11 18:27:57 2021 -0500 vkd3d-shader/hlsl: Parse the tex3D() intrinsic. --- libs/vkd3d-shader/hlsl.y | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4731d519..6c618912 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3127,6 +3127,12 @@ static bool intrinsic_tex2D(struct hlsl_ctx *ctx, return intrinsic_tex(ctx, params, loc, "tex2D", HLSL_SAMPLER_DIM_2D); } +static bool intrinsic_tex3D(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return intrinsic_tex(ctx, params, loc, "tex3D", HLSL_SAMPLER_DIM_3D); +} + static bool intrinsic_transpose(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3224,6 +3230,7 @@ intrinsic_functions[] = {"sqrt", 1, true, intrinsic_sqrt}, {"step", 2, true, intrinsic_step}, {"tex2D", -1, false, intrinsic_tex2D}, + {"tex3D", -1, false, intrinsic_tex3D}, {"transpose", 1, true, intrinsic_transpose}, };

1 0

Francisco Casas : vkd3d-shader/hlsl: Avoid segfault on missing sampler.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: vkd3d Branch: master Commit: 9fdff25a3b815860894c7f07166a69a5d013b6d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9fdff25a3b815860894c7f07166a6… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Sep 29 13:32:07 2022 -0300 vkd3d-shader/hlsl: Avoid segfault on missing sampler. --- libs/vkd3d-shader/hlsl_sm4.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 10bb1e3d..d69b8fea 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2265,7 +2265,10 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, case HLSL_RESOURCE_SAMPLE: if (!load->sampler.var) + { hlsl_fixme(ctx, &load->node.loc, "SM4 combined sample expression."); + return; + } write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords, texel_offset); break;

1 0

Max Figura : wined3d: Move the WINED3D_RS_ZVISIBLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 8422ee0fdd4ac32020e86e1aff19197e42ec9232 URL: https://gitlab.winehq.org/wine/wine/-/commit/8422ee0fdd4ac32020e86e1aff1919… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:42:34 2022 -0600 wined3d: Move the WINED3D_RS_ZVISIBLE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 8 +------- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f7d9ae07a1c..1422ac8dd3e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -138,7 +138,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), state_nop}}, {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_nop}}, {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_nop}}, - {STATE_RENDER(WINED3D_RS_ZVISIBLE), {STATE_RENDER(WINED3D_RS_ZVISIBLE), state_nop}}, /* Samplers */ {STATE_SAMPLER(0), {STATE_SAMPLER(0), state_nop}}, {STATE_SAMPLER(1), {STATE_SAMPLER(1), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 68ba69d8a26..5fe73bd285c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4084,6 +4084,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } break; + case WINED3D_RS_ZVISIBLE: + if (state->rs[WINED3D_RS_ZVISIBLE]) + FIXME("WINED3D_RS_ZVISIBLE not implemented.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68728a65952..12bc5e4313e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2851,7 +2851,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_ZVISIBLE), {STATE_VDECL}}, /* Samplers */ {STATE_SAMPLER(0), {STATE_VDECL}}, {STATE_SAMPLER(1), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8707ce6a561..79ad2601da7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1969,12 +1969,6 @@ static void depthbias(struct wined3d_context *context, const struct wined3d_stat checkGLcall("depth bias"); } -static void state_zvisible(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_ZVISIBLE]) - FIXME("WINED3D_RS_ZVISIBLE not implemented.\n"); -} - static void state_stippledalpha(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_STIPPLEDALPHA]) @@ -4776,7 +4770,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE }, { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }, WINED3D_GL_EXT_NONE }, @@ -5535,6 +5528,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 11, 14}, { 16, 23}, { 27, 27}, + { 30, 30}, { 40, 40}, { 42, 45}, { 47, 47},

1 0

Max Figura : wined3d: Move the WINED3D_RS_SUBPIXEL stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 17d0806643e80e2c73583e641833eaa430862b71 URL: https://gitlab.winehq.org/wine/wine/-/commit/17d0806643e80e2c73583e641833ea… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:46:43 2022 -0600 wined3d: Move the WINED3D_RS_SUBPIXEL stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 9 +-------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1422ac8dd3e..0f0409ee462 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_RENDER(WINED3D_RS_SUBPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_SUBPIXELX), {STATE_RENDER(WINED3D_RS_SUBPIXELX), state_nop}}, {STATE_RENDER(WINED3D_RS_STIPPLEDALPHA), {STATE_RENDER(WINED3D_RS_STIPPLEDALPHA), state_nop}}, {STATE_RENDER(WINED3D_RS_STIPPLEENABLE), {STATE_RENDER(WINED3D_RS_STIPPLEENABLE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5fe73bd285c..677535e0e7e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4089,6 +4089,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("WINED3D_RS_ZVISIBLE not implemented.\n"); break; + case WINED3D_RS_SUBPIXEL: + if (state->rs[WINED3D_RS_SUBPIXEL]) + FIXME("Render state WINED3D_RS_SUBPIXEL not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 12bc5e4313e..91246b3667d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SUBPIXELX), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STIPPLEDALPHA), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_STIPPLEENABLE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 79ad2601da7..909a246c578 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2048,12 +2048,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_subpixel(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_SUBPIXEL]) - FIXME("Render state WINED3D_RS_SUBPIXEL not implemented yet.\n"); -} - static void state_subpixelx(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_SUBPIXELX]) @@ -4729,7 +4723,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXELX), { STATE_RENDER(WINED3D_RS_SUBPIXELX), state_subpixelx }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STIPPLEDALPHA), { STATE_RENDER(WINED3D_RS_STIPPLEDALPHA), state_stippledalpha }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STIPPLEENABLE), { STATE_RENDER(WINED3D_RS_STIPPLEENABLE), state_stippleenable }, WINED3D_GL_EXT_NONE }, @@ -5528,7 +5521,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 11, 14}, { 16, 23}, { 27, 27}, - { 30, 30}, + { 30, 31}, { 40, 40}, { 42, 45}, { 47, 47},

1 0

Max Figura : wined3d: Move the WINED3D_RS_LASTPIXEL stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: db5952e40654753cd52356350e879bc8e2177086 URL: https://gitlab.winehq.org/wine/wine/-/commit/db5952e40654753cd52356350e879b… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:37:46 2022 -0600 wined3d: Move the WINED3D_RS_LASTPIXEL stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 12 ++++++++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 21 +-------------------- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 710ba2ca71d..f7d9ae07a1c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, - {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_RENDER(WINED3D_RS_SUBPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_SUBPIXELX), {STATE_RENDER(WINED3D_RS_SUBPIXELX), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7745a18d42..68ba69d8a26 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4072,6 +4072,18 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_PLANEMASK not implemented yet.\n"); break; + case WINED3D_RS_LASTPIXEL: + if (!state->rs[WINED3D_RS_LASTPIXEL]) + { + static bool warned; + if (!warned) + { + FIXME("Last Pixel Drawing Disabled, not handled yet.\n"); + warned = true; + } + } + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2d705f2ff5..68728a65952 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SUBPIXEL), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 88f5b9183c6..8707ce6a561 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1787,24 +1787,6 @@ static void state_localviewer(struct wined3d_context *context, const struct wine } } -static void state_lastpixel(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_LASTPIXEL]) - { - TRACE("Last Pixel Drawing Enabled\n"); - } - else - { - static BOOL warned; - if (!warned) { - FIXME("Last Pixel Drawing Disabled, not handled yet\n"); - warned = TRUE; - } else { - TRACE("Last Pixel Drawing Disabled, not handled yet\n"); - } - } -} - void state_pointsprite_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { static BOOL warned; @@ -4752,7 +4734,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXELX), { STATE_RENDER(WINED3D_RS_SUBPIXELX), state_subpixelx }, WINED3D_GL_EXT_NONE }, @@ -5552,7 +5533,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { { 1, 8}, { 11, 14}, - { 17, 23}, + { 16, 23}, { 27, 27}, { 40, 40}, { 42, 45},

1 0

Piotr Caban : wineps: Remove no longer used output parameter handling from PSDRV_CreateDC.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 2bfe9ce883e1f0f18dada51e836ea61286abb0dc URL: https://gitlab.winehq.org/wine/wine/-/commit/2bfe9ce883e1f0f18dada51e836ea6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 21 12:40:12 2023 +0100 wineps: Remove no longer used output parameter handling from PSDRV_CreateDC. We're storing it now in DC attributes. --- dlls/wineps.drv/escape.c | 10 +--------- dlls/wineps.drv/init.c | 3 --- dlls/wineps.drv/psdrv.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 0149e192520..9ced2221b1c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -459,17 +459,9 @@ INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) } di.pDocName = (LPWSTR) doc->lpszDocName; + di.pOutputFile = (LPWSTR) doc->lpszOutput; di.pDatatype = NULL; - if(doc->lpszOutput) - di.pOutputFile = (LPWSTR) doc->lpszOutput; - else if(physDev->job.output) - di.pOutputFile = physDev->job.output; - else - di.pOutputFile = NULL; - - TRACE("using output: %s\n", debugstr_w(di.pOutputFile)); - /* redirection located in HKCU\Software\Wine\Printing\Spooler is done during winspool.drv,ScheduleJob */ physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0d4467b6964..579e59e621b 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -387,8 +387,6 @@ static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - if (output && *output) physDev->job.output = strdupW( output ); - if(initData) { dump_devmode(initData); @@ -432,7 +430,6 @@ static BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) TRACE("\n"); HeapFree( GetProcessHeap(), 0, physDev->Devmode ); - HeapFree( GetProcessHeap(), 0, physDev->job.output ); HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 2af021508b7..153601d4c86 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -352,7 +352,6 @@ enum passthrough typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ - LPWSTR output; /* Output file/port */ LPWSTR doc_name; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ BOOL OutOfPage; /* Page header not sent yet */

1 0

Max Figura : wined3d: Move the WINED3D_RS_ROP2 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: a9967c947a09e156a20618412fed29aaea79a773 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9967c947a09e156a20618412fed29… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 13:22:34 2022 -0600 wined3d: Move the WINED3D_RS_ROP2 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 9 +-------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cdf71270d8c..0fbbb378847 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -97,7 +97,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, - {STATE_RENDER(WINED3D_RS_ROP2), {STATE_RENDER(WINED3D_RS_ROP2), state_nop}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_RENDER(WINED3D_RS_PLANEMASK), state_nop}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_RENDER(WINED3D_RS_LASTPIXEL), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 477a6e9af34..4182a13a58a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4062,6 +4062,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_MONOENABLE not implemented yet.\n"); break; + case WINED3D_RS_ROP2: + if (state->rs[WINED3D_RS_ROP2]) + FIXME("Render state WINED3D_RS_ROP2 not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 75b2a90d20a..64029552910 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,7 +2809,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_ROP2), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PLANEMASK), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LASTPIXEL), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a570bbb11b8..4007ee25658 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_rop2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_ROP2]) - FIXME("Render state WINED3D_RS_ROP2 not implemented yet.\n"); -} - static void state_planemask(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_PLANEMASK]) @@ -4764,7 +4758,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, @@ -5565,7 +5558,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) rs_holes[] = { { 1, 8}, - { 11, 11}, + { 11, 12}, { 14, 14}, { 17, 23}, { 27, 27},

1 0

Piotr Caban : localspl: Ignore an empty output string.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 48d3271f963319b6e45eeaf18b44ac1a1bd3c190 URL: https://gitlab.winehq.org/wine/wine/-/commit/48d3271f963319b6e45eeaf18b44ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 21 14:45:16 2023 +0100 localspl: Ignore an empty output string. We should probably ignore all incorrect ports. This is a minimal change that restores 5dadeeb29d36a93b3bbeec8d7b1d237f29bf8f67 commit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54379 --- dlls/localspl/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7ab68b62c3d..d09ac4420c3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3697,7 +3697,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) } port = job->port; - if (!port) + if (!port || !*port) port = printer->info->port; TRACE("need to schedule job %ld filename %s to port %s\n", job->id, debugstr_w(job->filename), debugstr_w(port));

1 0

Alexandros Frantzis : win32u: Reset draw_start_ticks for new window_surface.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 6d2bd75c4a82d10ee98c63010a5701d428ccc5d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d2bd75c4a82d10ee98c63010a5701… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Feb 16 18:20:56 2023 +0200 win32u: Reset draw_start_ticks for new window_surface. Normally, a new window_surface has no damage so its draw_start_ticks value is reset at the time of the first lock_surface. However, if contents from the old window_surface are copied to the new one when the window_surface for a window is updated, the new window_surface will be initially damaged. We want to reset the draw_start_ticks value in this case too, to avoid flushes occuring soon after such updates, during the initial redraw of the window_surface. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/dibdrv/dc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index f96374c1229..23ef7f64390 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -744,7 +744,8 @@ static inline void lock_surface( struct windrv_physdev *dev ) { /* gdi_lock should not be locked */ dev->surface->funcs->lock( dev->surface ); - if (IsRectEmpty( dev->dibdrv->bounds )) dev->surface->draw_start_ticks = NtGetTickCount(); + if (IsRectEmpty( dev->dibdrv->bounds ) || dev->surface->draw_start_ticks == 0) + dev->surface->draw_start_ticks = NtGetTickCount(); } static inline void unlock_surface( struct windrv_physdev *dev )

1 0

Alexandros Frantzis : gdi32: Track ticks since draw start per window_surface.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: aa72d7d42d64a8fd9ded6d870f261eeaccf632fb URL: https://gitlab.winehq.org/wine/wine/-/commit/aa72d7d42d64a8fd9ded6d870f261e… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Feb 16 18:17:03 2023 +0200 gdi32: Track ticks since draw start per window_surface. Track ticks since draw start per window_surface, instead of per DC as is currently the case. This change helps reduce visual glitches caused by badly timed flushes when drawing to the same window_surface from multiple DCs (e.g., for child windows). This approach is a better fit for the current heuristic for forcing flushing, which consults the shared window_surface bounds to decide whether this is the start of a draw in order to reset the (currently per DC) draw start time. The problem in the current implementation occurs when a drawing to a DC begins with an already damaged window_surface, e.g., due to draws from other DCs targeting that window_surface. In such a case, the DC draw start time is not reset and refers to the start of some previous draw sequence using this DC, thus increasing the chances that the 50ms time flush limit will be eventually exceeded in the middle of the current draw sequence. In other words, the state of the (shared) window_surface damage is not a reliable indicator of the beginning (or not) of a draw to a DC. An example, assuming DC1 and DC2 target the same window_surface: DC1.start_ticks = 0 DC2.start_ticks = 0 FLUSH_PERIOD = 50 0 flush 1 draw to DC1 -> DC1.start_ticks = 1 ... [no flush] ... 2 draw to DC2 -> DC2.start_ticks remains 0 since surface is damaged ... 50 flush 51 draw to DC1 -> DC1.start_ticks = 51 ... [no flush] ... 52 draw to DC2 -> DC2.start_ticks remains 0 since surface is damaged, current - DC2.start_ticks > FLUSH_PERIOD so we are forced to flush in the middle of the drawing sequence => potential glitch Tracking the draw start per window_surface ameliorates the problem because the beginning of a draw on a DC targeting an undamaged window_surface resets the start time for all DCs targeting that window_surface: ... 50 flush 51 draw to DC1 -> surface.draw_ticks = 51 ... [no flush] ... 52 draw to DC2 -> surface.draw_ticks remains 51 since surface is damaged, but current - surface.draw_ticks < FLUSH_PERIOD, so we do not flush Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/dibdrv/dc.c | 6 +++--- include/wine/gdi_driver.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 68a009f576e..f96374c1229 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -731,7 +731,6 @@ struct windrv_physdev struct gdi_physdev dev; struct dibdrv_physdev *dibdrv; struct window_surface *surface; - DWORD start_ticks; }; static const struct gdi_dc_funcs window_driver; @@ -745,13 +744,14 @@ static inline void lock_surface( struct windrv_physdev *dev ) { /* gdi_lock should not be locked */ dev->surface->funcs->lock( dev->surface ); - if (IsRectEmpty( dev->dibdrv->bounds )) dev->start_ticks = NtGetTickCount(); + if (IsRectEmpty( dev->dibdrv->bounds )) dev->surface->draw_start_ticks = NtGetTickCount(); } static inline void unlock_surface( struct windrv_physdev *dev ) { + BOOL should_flush = NtGetTickCount() - dev->surface->draw_start_ticks > FLUSH_PERIOD; dev->surface->funcs->unlock( dev->surface ); - if (NtGetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface ); + if (should_flush) dev->surface->funcs->flush( dev->surface ); } static void CDECL unlock_bits_surface( struct gdi_image_bits *bits ) diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 3de7e20af9a..fe0894b2820 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -217,6 +217,7 @@ struct window_surface struct list entry; /* entry in global list managed by user32 */ LONG ref; /* reference count */ RECT rect; /* constant, no locking needed */ + DWORD draw_start_ticks; /* start ticks of fresh draw */ /* driver-specific fields here */ };

1 0