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

Ziqing Hui : d2d1/tests: Test custom effect properties.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 5cb2c805b19d9a4285adc7086798da708f54c617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb2c805b19d9a4285adc708… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 2 18:17:03 2022 +0800 d2d1/tests: Test custom effect properties. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cb2c805b19d9a4285ad…

1 0

Zebediah Figura : user32: Perform HID ioctls on the right file handle.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 2ae59899bf905dc1d6e12bb6114a5c3ac12cbb69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae59899bf905dc1d6e12bb6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 2 23:22:13 2022 -0500 user32: Perform HID ioctls on the right file handle. This fixes a regression from 8962ec5a83286488da6f839ceba3c39ad1cf00b3. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 90ca074f2a4..4dc240b58b3 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -153,7 +153,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, switch (type) { case RIM_TYPEHID: - status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &hid_info, sizeof(hid_info) ); if (status) @@ -172,7 +172,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, goto fail; } - status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, preparsed, hid_info.DescriptorSize ); if (status)

1 0

Gabriel Ivăncescu : jscript: Don't allow starting script using state from uninitialized.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: 079b14b2e97234526c5f1a51d590c0c2d0db0ec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=079b14b2e97234526c5f1a51… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 2 20:00:43 2022 +0300 jscript: Don't allow starting script using state from uninitialized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d3990..d6028e69888 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5c6a5..872354161fc 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite);

1 0

Alexandre Julliard : wininet/tests: Update WineHQ certificate.
by Alexandre Julliard June 3, 2022

June 3, 2022

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

Jacek Caban : winemac: Build with msvcrt.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: daddd9b3d41c6be9e294ee83d1722400642e05cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=daddd9b3d41c6be9e294ee83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 01:29:17 2022 +0200 winemac: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 2 -- dlls/winemac.drv/dllmain.c | 5 ++--- dlls/winemac.drv/dragdrop.c | 5 ++--- dlls/winemac.drv/ime.c | 8 ++------ dlls/winemac.drv/macdrv.h | 12 ------------ dlls/winemac.drv/macdrv_dll.h | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index e3d3180b2d1..19f3e834cec 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = uuid rpcrt4 user32 gdi32 win32u DELAYIMPORTS = ole32 shell32 imm32 EXTRALIBS = -lwin32u -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ clipboard.c \ display.c \ diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 2ffbc12083d..0618ec83228 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> -#include "macdrv.h" +#include "macdrv_dll.h" +#include "macdrv_res.h" #include "shellapi.h" #include "wine/debug.h" diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index aec8b1f4790..afd4fb0a6d2 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -20,18 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS -#include "macdrv.h" +#include "macdrv_dll.h" #define COBJMACROS #include "objidl.h" #include "shellapi.h" #include "shlobj.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dragdrop); diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 756e880c5a3..fd94591a2b8 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -34,14 +34,10 @@ * here the IMM level deals with if the application is IME aware or not. */ -#include "config.h" - -#include <stdarg.h> - -#include "macdrv.h" -#include "winuser.h" +#include "macdrv_dll.h" #include "imm.h" #include "ddk/imm.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 735cfc84d87..7c0f7127883 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -41,7 +41,6 @@ extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; extern BOOL allow_software_rendering DECLSPEC_HIDDEN; extern BOOL disable_window_decorations DECLSPEC_HIDDEN; -extern HMODULE macdrv_module DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN, BOOLEAN,const LARGE_INTEGER*) DECLSPEC_HIDDEN; @@ -276,13 +275,6 @@ extern void check_retina_status(void) DECLSPEC_HIDDEN; extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; extern void init_user_driver(void) DECLSPEC_HIDDEN; -/************************************************************************** - * Mac IME driver - */ - -extern NTSTATUS WINAPI macdrv_ime_set_text(void *params, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECLSPEC_HIDDEN; - /* unixlib interface */ extern NTSTATUS macdrv_dnd_get_data(void *arg) DECLSPEC_HIDDEN; @@ -296,10 +288,6 @@ extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN; - /* user helpers */ static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) diff --git a/dlls/winemac.drv/macdrv_dll.h b/dlls/winemac.drv/macdrv_dll.h new file mode 100644 index 00000000000..3a11528eabc --- /dev/null +++ b/dlls/winemac.drv/macdrv_dll.h @@ -0,0 +1,39 @@ +/* + * MAC driver definitions + * + * Copyright 2022 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MACDRV_DLL_H +#define __WINE_MACDRV_DLL_H + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "ntgdi.h" +#include "unixlib.h" + +extern NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN; + +extern NTSTATUS WINAPI macdrv_ime_set_text(void *params, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECLSPEC_HIDDEN; + +extern HMODULE macdrv_module DECLSPEC_HIDDEN; + +#endif /* __WINE_MACDRV_DLL_H */

1 0

Brendan Shanks : avicap32: Fail gracefully if V4L is unavailable.
by Alexandre Julliard June 3, 2022

June 3, 2022

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

Esme Povirk : mscoree: Update Wine Mono to 7.3.0.
by Alexandre Julliard June 3, 2022

June 3, 2022

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

Alexandre Julliard : kernelbase: Initialize all the compression tables the first time.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: d1580fd209e1de120e673c5b838f4f2d1f68d6d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1580fd209e1de120e673c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 12:50:41 2022 +0200 kernelbase: Initialize all the compression tables the first time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53094 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 33f24863740..ac4dc188345 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3328,7 +3328,7 @@ static int get_compression_weights( UINT compression, const WCHAR *compr_tables[ if (!compr_tables[0]) { compr_tables[0] = sort.compr_data + compr->offset; - for (i = 1; i <= maxlen - 2; i++) + for (i = 1; i < 8; i++) compr_tables[i] = compr_tables[i - 1] + compr->len[i - 1] * compression_size( i + 1 ); } for (i = maxlen - 2; i >= 0; i--)

1 0

Jacek Caban : winemac: Move driver implementation to unixlib.
by Alexandre Julliard June 3, 2022

June 3, 2022

Module: wine Branch: master Commit: f1549e7f6c6ae9898ce6093a0888ffa2c549bfbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1549e7f6c6ae9898ce6093a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 00:25:16 2022 +0200 winemac: Move driver implementation to unixlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 3 ++- dlls/winemac.drv/clipboard.c | 4 ++++ dlls/winemac.drv/display.c | 6 +++++- dlls/winemac.drv/dllmain.c | 10 +++++++++- dlls/winemac.drv/event.c | 12 ++++++++---- dlls/winemac.drv/gdi.c | 4 ++++ dlls/winemac.drv/image.c | 4 ++++ dlls/winemac.drv/keyboard.c | 4 ++++ dlls/winemac.drv/macdrv.h | 9 ++------- dlls/winemac.drv/macdrv_main.c | 30 +++++++++++++++++++++--------- dlls/winemac.drv/mouse.c | 4 ++++ dlls/winemac.drv/opengl.c | 4 ++++ dlls/winemac.drv/surface.c | 4 ++++ dlls/winemac.drv/systray.c | 4 ++++ dlls/winemac.drv/unixlib.h | 6 ++++-- dlls/winemac.drv/vulkan.c | 4 ++++ dlls/winemac.drv/window.c | 4 ++++ tools/makedep.c | 2 ++ 18 files changed, 93 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1549e7f6c6ae9898ce6…

1 0

Zebediah Figura : wined3d: Store whether a depth/stencil state writes to the depth/stencil buffer in the state itself.
by Alexandre Julliard June 3, 2022

June 3, 2022

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