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

Alexandre Julliard : wininet/tests: Update WineHQ certificate.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 79f68cb35f251f8e165338bf6097261876ba2d1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=79f68cb35f251f8e165338bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 21:39:48 2022 +0200 wininet/tests: Update WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bc1b829fca2..6a5a18fe282 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6319,12 +6319,9 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" - "55114\r\n" "Minnesota\r\n" "Saint Paul\r\n" - "Ste 120\r\n" - "700 Raymond Ave\r\n" - "CodeWeavers\r\n" + "\"CodeWeavers, Inc.\"\r\n" "IT\r\n" "*.winehq.org",

1 0

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 02eae36ec861a4133d66035b623dfd81242990c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02eae36ec861a4133d66035b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 21:41:38 2022 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 2bf0336f3f5..314b43a2607 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -575,7 +575,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Esme Povirk : mscoree: Update Wine Mono to 7.3.0.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: aa0186be62d6bc71a8b08da5abc1d89650939c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa0186be62d6bc71a8b08da5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jun 3 12:45:46 2022 -0500 mscoree: Update Wine Mono to 7.3.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 73f44a80f79..021f5484af9 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.2.0" +#define MONO_VERSION "7.3.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323" +#define MONO_SHA "939e2f5669720d0d0fc7e305426622a11a33b7ae385c4d7e581e29ea264e22ff" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 44b2fd88d2a..0e51e0b3d7f 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.2.0" +#define WINE_MONO_VERSION "7.3.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Brendan Shanks : avicap32: Fail gracefully if V4L is unavailable.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: ff31e132601e2df7eff90478e4078941ef68e391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff31e132601e2df7eff90478… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jun 1 21:27:18 2022 -0700 avicap32: Fail gracefully if V4L is unavailable. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/avicap32/avicap32_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index cefd1f0fe6e..1a1c514e931 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -125,7 +125,7 @@ BOOL VFWAPI capGetDriverDescriptionW(WORD index, WCHAR *name, int name_len, WCHA struct get_device_desc_params params; params.index = index; - if (__wine_unix_call(unix_handle, unix_get_device_desc, &params)) + if (!unix_handle || __wine_unix_call(unix_handle, unix_get_device_desc, &params)) return FALSE; TRACE("Found device name %s, version %s.\n", debugstr_w(params.name), debugstr_w(params.version));

1 0

Julian Klemann : ws2_32: Add WSAConnectByName() functions.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: d1f5765e4c268abd083b651e3243d90f4b07ea32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f5765e4c268abd083b651e… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jun 2 13:59:27 2022 -0500 ws2_32: Add WSAConnectByName() functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50941 Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 168 +++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 151 ++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 2 + dlls/ws2_32/ws2_32_private.h | 12 ++++ include/winsock2.h | 3 + 5 files changed, 336 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1f5765e4c268abd083b…

1 0

Floris Renaud : joy.cpl: Resize text boxes.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: f3658e05be7bec7ddad78b775d8cd0218848ea4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3658e05be7bec7ddad78b77… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Jun 2 23:34:41 2022 +0200 joy.cpl: Resize text boxes. Some translations need more space. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index c1d8380af37..6c4bb0053ae 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -40,11 +40,11 @@ FONT 8, "Ms Shell Dlg" PUSHBUTTON "&Reset", IDC_BUTTONRESET, 200, 40, 60, 15 PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 190, 60, 15 PUSHBUTTON "&Override", IDC_BUTTONOVERRIDE, 200, 100, 60, 15 - LTEXT "Connected", IDC_STATIC, 10, 10, 100, 10 + LTEXT "Connected", IDC_STATIC, 10, 10, 180, 10 LISTBOX IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Connected (xinput device)", IDC_STATIC, 10, 90, 100, 10 + LTEXT "Connected (xinput device)", IDC_STATIC, 10, 90, 180, 10 LISTBOX IDC_XINPUTLIST, 10, 100, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Disabled", IDC_STATIC, 10, 180, 100, 10 + LTEXT "Disabled", IDC_STATIC, 10, 180, 180, 10 LISTBOX IDC_DISABLEDLIST, 10, 190, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY LTEXT "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 270, 200, 25 }

1 0

Zebediah Figura : d3d10core/tests: Add a regression test for writing to the stencil buffer after clearing it.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 67b893ac090b0cbca22e1706934e0d82e95d09d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b893ac090b0cbca22e1706… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 20:23:47 2022 -0500 d3d10core/tests: Add a regression test for writing to the stencil buffer after clearing it. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d796087ef3f..c3adcec77cd 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19346,6 +19346,71 @@ static void test_rtv_depth_slice(void) release_test_context(&test_context); } +/* This is a regression test for a rather specific code path, triggered by + * SnowRunner. + * + * When a DSV is written to with a depth/stencil state that only writes stencil, + * we need to ensure that locations other than the draw binding are invalidated. + * In particular, if the texture was previously in CLEARED, that must be + * invalidated. + */ +static void test_stencil_only_write_after_clear(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + ID3D10DepthStencilState *ds_state; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsv; + ID3D10Texture2D *ds_texture; + ID3D10Device *device; + HRESULT hr; + + static const struct D3D10_DEPTH_STENCIL_DESC ds_desc = + { + .DepthEnable = FALSE, + .StencilEnable = TRUE, + .StencilReadMask = 0xff, + .StencilWriteMask = 0xff, + .FrontFace.StencilFunc = D3D10_COMPARISON_NOT_EQUAL, + .FrontFace.StencilPassOp = D3D10_STENCIL_OP_REPLACE, + .FrontFace.StencilFailOp = D3D10_STENCIL_OP_REPLACE, + .FrontFace.StencilDepthFailOp = D3D10_STENCIL_OP_REPLACE, + .BackFace.StencilFunc = D3D10_COMPARISON_NOT_EQUAL, + .BackFace.StencilPassOp = D3D10_STENCIL_OP_REPLACE, + .BackFace.StencilFailOp = D3D10_STENCIL_OP_REPLACE, + .BackFace.StencilDepthFailOp = D3D10_STENCIL_OP_REPLACE, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &ds_texture); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)ds_texture, NULL, &dsv); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ID3D10Device_OMSetDepthStencilState(device, ds_state, 0xff); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, dsv); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0); + draw_color_quad(&test_context, &green); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D10Texture2D_Release(ds_texture); + ID3D10DepthStencilView_Release(dsv); + ID3D10DepthStencilState_Release(ds_state); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19477,6 +19542,7 @@ START_TEST(d3d10core) queue_test(test_texture_compressed_3d); queue_test(test_dynamic_map_synchronization); queue_test(test_rtv_depth_slice); + queue_test(test_stencil_only_write_after_clear); run_queued_tests();

1 0

Zebediah Figura : wined3d: Store whether a depth/stencil state writes to the depth/stencil buffer in the state itself.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: fe85514479a1425b08d0540e96fc8e1783c267e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe85514479a1425b08d0540e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 20:23:48 2022 -0500 wined3d: Store whether a depth/stencil state writes to the depth/stencil buffer in the state itself. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/state.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5ae237db54b..5292297bb85 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5172,7 +5172,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s return; } - if (dsv && (!state->depth_stencil_state || state->depth_stencil_state->desc.depth_write)) + if (dsv && (!state->depth_stencil_state || state->depth_stencil_state->writes_ds)) { DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c257b5f3c86..a9b875a132e 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3455,7 +3455,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding); } - if (!state->depth_stencil_state || state->depth_stencil_state->desc.depth_write) + if (!state->depth_stencil_state || state->depth_stencil_state->writes_ds) invalidate_ds = true; sample_count = max(1, wined3d_resource_get_sample_count(dsv->resource)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 56fd759e5e2..228b4901c00 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -146,6 +146,11 @@ void * CDECL wined3d_depth_stencil_state_get_parent(const struct wined3d_depth_s return state->parent; } +static bool depth_stencil_state_desc_writes_ds(const struct wined3d_depth_stencil_state_desc *desc) +{ + return desc->depth_write; +} + HRESULT CDECL wined3d_depth_stencil_state_create(struct wined3d_device *device, const struct wined3d_depth_stencil_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_depth_stencil_state **state) @@ -164,6 +169,8 @@ HRESULT CDECL wined3d_depth_stencil_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->writes_ds = depth_stencil_state_desc_writes_ds(desc); + TRACE("Created depth/stencil state %p.\n", object); *state = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7bfca0bcb88..918c1b911fe 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3778,6 +3778,8 @@ struct wined3d_depth_stencil_state LONG refcount; struct wined3d_depth_stencil_state_desc desc; + bool writes_ds; + void *parent; const struct wined3d_parent_ops *parent_ops;

1 0

Zebediah Figura : wined3d: Invalidate the depth/stencil view if the depth/stencil state may be written.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 93d51e64a7a82693993a3b166ee5aa4256bb42d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d51e64a7a82693993a3b16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 20:23:49 2022 -0500 wined3d: Invalidate the depth/stencil view if the depth/stencil state may be written. This allows menu items to be rendered in Snowrunner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 228b4901c00..a732182d6c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -146,9 +146,25 @@ void * CDECL wined3d_depth_stencil_state_get_parent(const struct wined3d_depth_s return state->parent; } +static bool stencil_op_writes_ds(const struct wined3d_stencil_op_desc *desc) +{ + return desc->fail_op != WINED3D_STENCIL_OP_KEEP + || desc->depth_fail_op != WINED3D_STENCIL_OP_KEEP + || desc->pass_op != WINED3D_STENCIL_OP_KEEP; +} + static bool depth_stencil_state_desc_writes_ds(const struct wined3d_depth_stencil_state_desc *desc) { - return desc->depth_write; + if (desc->depth_write) + return true; + + if (desc->stencil && desc->stencil_write_mask) + { + if (stencil_op_writes_ds(&desc->front) || stencil_op_writes_ds(&desc->back)) + return true; + } + + return false; } HRESULT CDECL wined3d_depth_stencil_state_create(struct wined3d_device *device,

1 0

Zebediah Figura : wined3d: Consider the depth write mask in depth_stencil_state_desc_writes_ds() only if depth testing is enabled.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 25c148956218bf47894b9dbe4acf7778b18d769e URL: https://source.winehq.org/git/wine.git/?a=commit;h=25c148956218bf47894b9dbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 20:23:50 2022 -0500 wined3d: Consider the depth write mask in depth_stencil_state_desc_writes_ds() only if depth testing is enabled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a732182d6c5..ee3e083e812 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -155,7 +155,7 @@ static bool stencil_op_writes_ds(const struct wined3d_stencil_op_desc *desc) static bool depth_stencil_state_desc_writes_ds(const struct wined3d_depth_stencil_state_desc *desc) { - if (desc->depth_write) + if (desc->depth && desc->depth_write) return true; if (desc->stencil && desc->stencil_write_mask)

1 0