September 2020 - Wine-commits

Henri Verbeet : vkd3d-compiler: Enable colour output by default when outputting to a colour capable tty.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: vkd3d Branch: master Commit: 8d3e1e830083ddce420bf2a09775ad648ce6a7d2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d3e1e830083ddce420bf2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 17:18:17 2020 +0330 vkd3d-compiler: Enable colour output by default when outputting to a colour capable tty. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 ++- configure.ac | 10 ++++++++-- programs/vkd3d-compiler/main.c | 43 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe6ba92..07426fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,7 +145,8 @@ EXTRA_DIST += \ bin_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c -vkd3d_compiler_LDADD = libvkd3d-shader.la +vkd3d_compiler_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@ +vkd3d_compiler_LDADD = libvkd3d-shader.la @NCURSES_LIBS@ LDADD = libvkd3d.la libvkd3d-utils.la AM_DEFAULT_SOURCE_EXT = .c diff --git a/configure.ac b/configure.ac index 6209386..2f22b05 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,10 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) -AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) +AC_ARG_WITH([ncurses], AS_HELP_STRING([--with-ncurses], [Build with the ncurses library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, [enable_demos=no]) @@ -109,6 +110,10 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], ["$ac_cv_lib_soname_MoltenVK"])], [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])]) +AS_IF([test "x$with_ncurses" != "xno"], + [PKG_CHECK_MODULES([NCURSES], [ncurses], + [AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if you have ncurses.]) with_ncurses=yes], + [with_ncurses=no])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], @@ -152,8 +157,9 @@ AS_ECHO([" widl: ${WIDL} - Have XCB: ${HAVE_XCB} + Have ncurses: ${with_ncurses} Have SPIRV-Tools: ${with_spirv_tools} + Have xcb: ${HAVE_XCB} Building demos: ${enable_demos} Building tests: ${enable_tests} diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index fdf3faf..8480c4f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -17,9 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <fcntl.h> -#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> @@ -28,6 +29,9 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" +#ifdef HAVE_NCURSES +#include <term.h> +#endif #define MAX_COMPILE_OPTIONS 3 @@ -180,6 +184,8 @@ struct options bool print_version; bool print_source_types; bool print_target_types; + uint32_t formatting; + bool explicit_colour; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -230,7 +236,7 @@ static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer return false; } -static bool parse_formatting(uint32_t *formatting, char *arg) +static bool parse_formatting(uint32_t *formatting, bool *colour, char *arg) { static const struct formatting_option { @@ -270,6 +276,8 @@ static bool parse_formatting(uint32_t *formatting, char *arg) *formatting |= opts[i].value; else *formatting &= ~opts[i].value; + if (opts[i].value == VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR) + *colour = true; break; } } @@ -353,8 +361,6 @@ static bool validate_target_type( static bool parse_command_line(int argc, char **argv, struct options *options) { - enum vkd3d_shader_compile_option_formatting_flags formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT - | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; enum vkd3d_shader_compile_option_buffer_uav buffer_uav; int option; @@ -374,6 +380,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) memset(options, 0, sizeof(*options)); options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + options->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; for (;;) { @@ -405,7 +413,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) break; case OPTION_TEXT_FORMATTING: - if (!parse_formatting(&formatting, optarg)) + if (!parse_formatting(&options->formatting, &options->explicit_colour, optarg)) return false; break; @@ -450,7 +458,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; - add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, formatting); if (optind < argc) options->filename = argv[argc - 1]; @@ -527,6 +534,26 @@ static FILE *open_output(const char *filename, bool *close) return f; } +static bool has_colour(FILE *f) +{ +#ifdef HAVE_NCURSES + bool supported; + int ret; + + if (!isatty(fileno(f))) + return false; + setupterm(NULL, fileno(f), &ret); + if (ret != 1) + return false; + supported = !!tigetstr("setaf"); + del_curterm(cur_term); + + return supported; +#else + return false; +#endif +} + int main(int argc, char **argv) { bool close_input = false, close_output = false; @@ -585,6 +612,10 @@ int main(int argc, char **argv) goto done; } + if (!options.explicit_colour && has_colour(output)) + options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type;

1 0

Alexandre Julliard : wine_release: Update for non-recursive makefile.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: tools Branch: master Commit: 4ab66d52642e6cc282573426574bd6c3de5a824c URL: https://source.winehq.org/git/tools.git/?a=commit;h=4ab66d52642e6cc28257342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 22:09:21 2020 +0200 wine_release: Update for non-recursive makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wine_release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wine_release b/wine_release index 7b8def1..2bee22b 100755 --- a/wine_release +++ b/wine_release @@ -56,11 +56,11 @@ then tools/wmc/wmc.man \ tools/wrc/wrc.man" + make -s $manpages + for f in $manpages do name=`basename $f .man` - make -s -C `dirname $f` $name.man - lang=`echo $name | cut -d . -f 2` if [ "$lang" = "$name" ] then lang="en"

1 0

Alexandre Julliard : Wine release 5.18
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: website Branch: master Commit: 158dbaef5bc2c69f0514a4b1234072d0bceddcce URL: https://source.winehq.org/git/website.git/?a=commit;h=158dbaef5bc2c69f0514a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 21:54:00 2020 +0200 Wine release 5.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020092501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2020092501.xml b/news/en/2020092501.xml new file mode 100644 index 00000000..fa716720 --- /dev/null +++ b/news/en/2020092501.xml @@ -0,0 +1,18 @@ +<news> +<date>September 25, 2020</date> +<title>Wine 5.18 Released</title> +<body> + The Wine development release 5.18 is now available. + <a href="{$root}/announce/5.18">What's new</a> in this release: +<ul> + <li>Vulkan shader compilation using the new vkd3d-shader library.</li> + <li>USER32 library converted to PE.</li> + <li>Console no longer requires the curses library.</li> + <li>Support for display modes with various orientations.</li> + <li>A number of syntax fixes in the WIDL compiler.</li> + <li>Non-recursive makefiles.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : include: Also define gethostname for msvcrt builds.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 4b96d1c6802d0acedcf5da8355c1ca40321a6aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b96d1c6802d0acedcf5da83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 12:41:50 2020 +0200 include: Also define gethostname for msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winsock.h b/include/winsock.h index a8bb35a4c4..cafac1a172 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -1053,7 +1053,7 @@ int WINAPI WS(setsockopt)(SOCKET,int,int,const char*,int); int WINAPI WS(shutdown)(SOCKET,int); SOCKET WINAPI WS(socket)(int,int,int); -#if defined(__MINGW32__) || defined (_MSC_VER) +#if defined(__MINGW32__) || defined (_MSC_VER) || defined(__WINE_USE_MSVCRT) /* gethostname is not defined on Unix because of conflicts with unistd.h */ int WINAPI WS(gethostname)(char*,int); #endif

1 0

Alexandre Julliard : kernel32: Get rid of obsolete 16-bit relay functions.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 98d7f90d1d512e5cf060cf567c844919576dbe4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98d7f90d1d512e5cf060cf56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 12:21:06 2020 +0200 kernel32: Get rid of obsolete 16-bit relay functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 5 ----- dlls/kernel32/module.c | 24 ------------------------ 2 files changed, 29 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4b09f359b9..f68989424d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1685,11 +1685,6 @@ # All functions must be prefixed with '__wine_' (for internal functions) # or 'wine_' (for user-visible functions) to avoid namespace conflicts. -# 16-bit relays (for backwards compatibility) -@ cdecl -i386 -private __wine_dll_register_16(ptr str) -@ cdecl -i386 -private __wine_dll_unregister_16(ptr) -@ stub -i386 __wine_call_from_16_regs - # Unix files @ cdecl wine_get_unix_file_name(wstr) @ cdecl wine_get_dos_file_name(str) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 7f27293ee2..faf68d9888 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -357,27 +357,3 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) { return get_proc_address_wrapper( hModule, function ); } - -#ifdef __i386__ - -/*********************************************************************** - * __wine_dll_register_16 (KERNEL32.@) - * - * No longer used. - */ -void __wine_dll_register_16( const IMAGE_DOS_HEADER *header, const char *file_name ) -{ - ERR( "loading old style 16-bit dll %s no longer supported\n", file_name ); -} - - -/*********************************************************************** - * __wine_dll_unregister_16 (KERNEL32.@) - * - * No longer used. - */ -void __wine_dll_unregister_16( const IMAGE_DOS_HEADER *header ) -{ -} - -#endif

1 0

Alexandre Julliard : kernel32: Make export directory writable to set FT_Thunk to 0.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 8db14f4e18a3770b4ac3cfe6e1ddbe17dec342d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db14f4e18a3770b4ac3cfe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 13:45:04 2020 +0200 kernel32: Make export directory writable to set FT_Thunk to 0. But don't bother on non-i386 platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 2207b6eb22..6f60768cbd 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -44,6 +44,7 @@ static STARTUPINFOA startup_infoA; /*********************************************************************** * set_entry_point */ +#ifdef __i386__ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) { IMAGE_EXPORT_DIRECTORY *exports; @@ -64,9 +65,12 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) if (!(res = strcmp( ename, name ))) { WORD ordinal = ordinals[pos]; - assert( ordinal < exports->NumberOfFunctions ); + DWORD oldprot; + TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva ); + VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot ); functions[ordinal] = rva; + VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, NULL ); return; } if (res > 0) max = pos - 1; @@ -74,6 +78,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) } } } +#endif /*********************************************************************** @@ -134,6 +139,7 @@ static BOOL process_attach( HMODULE module ) copy_startup_info(); +#ifdef __i386__ if (!(GetVersion() & 0x80000000)) { /* Securom checks for this one when version is NT */ @@ -146,7 +152,7 @@ static BOOL process_attach( HMODULE module ) if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) LoadLibraryA( "krnl386.exe16" ); } - +#endif return TRUE; }

1 0

Zebediah Figura : wined3d: Introduce a depth/stencil state object.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 2612381273f47a6810cd440832fee02ecf04078e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2612381273f47a6810cd4408… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:43:11 2020 -0500 wined3d: Introduce a depth/stencil state object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/cs.c | 29 ++++++++++++++ dlls/wined3d/device.c | 53 +++++++++++++++++++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 7 ++++ dlls/wined3d/wined3d_private.h | 22 ++++++++++- include/wine/wined3d.h | 17 ++++++++ 8 files changed, 218 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2612381273f47a6810cd…

1 0

Zebediah Figura : d3d11: Use wined3d depth/stencil state objects.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 5860dd52bc82ff62c4c431bc7d06160b4dcfbd79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5860dd52bc82ff62c4c431bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:43:12 2020 -0500 d3d11: Use wined3d depth/stencil state objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 23 ++++++++++---- dlls/d3d11/state.c | 75 +++++++++++++++++++++++++++++----------------- 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cb2b9c3aed..3248285fcd 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -440,6 +440,7 @@ struct d3d_depthstencil_state LONG refcount; struct wined3d_private_store private_store; + struct wined3d_depth_stencil_state *wined3d_state; D3D11_DEPTH_STENCIL_DESC desc; struct wine_rb_entry entry; ID3D11Device2 *device; @@ -549,7 +550,6 @@ struct d3d_device struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; }; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2a68e02585..055e243a43 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -737,6 +737,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); const D3D11_DEPTH_STENCILOP_DESC *front, *back; + struct d3d_depthstencil_state *state_impl; const D3D11_DEPTH_STENCIL_DESC *desc; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", @@ -744,14 +745,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 wined3d_mutex_lock(); device->stencil_ref = stencil_ref; - if (!(device->depth_stencil_state = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) + if (!(state_impl = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { + wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL); set_default_depth_stencil_state(device->wined3d_device); wined3d_mutex_unlock(); return; } - desc = &device->depth_stencil_state->desc; + wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state); + desc = &state_impl->desc; front = &desc->FrontFace; back = &desc->BackFace; @@ -1904,14 +1907,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct wined3d_depth_stencil_state *wined3d_state; + struct d3d_depthstencil_state *state_impl; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); - if ((*depth_stencil_state = device->depth_stencil_state - ? &device->depth_stencil_state->ID3D11DepthStencilState_iface : NULL)) - ID3D11DepthStencilState_AddRef(*depth_stencil_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device))) + { + state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); + ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); + } + else + { + *depth_stencil_state = NULL; + } *stencil_ref = device->stencil_ref; + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 32ef44091c..5d4c352659 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -493,13 +493,15 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci TRACE("%p increasing refcount to %u.\n", state, refcount); - return refcount; -} + if (refcount == 1) + { + ID3D11Device2_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_depth_stencil_state_incref(state->wined3d_state); + wined3d_mutex_unlock(); + } -static void d3d_depthstencil_state_cleanup(struct d3d_depthstencil_state *state) -{ - wined3d_private_store_cleanup(&state->private_store); - ID3D11Device2_Release(state->device); + return refcount; } static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStencilState *iface) @@ -511,12 +513,12 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device2(state->device); + ID3D11Device2 *device = state->device; + wined3d_mutex_lock(); - wine_rb_remove(&device->depthstencil_states, &state->entry); - d3d_depthstencil_state_cleanup(state); + wined3d_depth_stencil_state_decref(state->wined3d_state); wined3d_mutex_unlock(); - heap_free(state); + ID3D11Device2_Release(device); } return refcount; @@ -695,23 +697,25 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = d3d10_depthstencil_state_GetDesc, }; -static HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, - const D3D11_DEPTH_STENCIL_DESC *desc) +static void STDMETHODCALLTYPE d3d_depthstencil_state_wined3d_object_destroyed(void *parent) { - state->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl; - state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; - state->refcount = 1; - wined3d_private_store_init(&state->private_store); - state->desc = *desc; - - ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface); + struct d3d_depthstencil_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device2(state->device); - return S_OK; + wine_rb_remove(&device->depthstencil_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + heap_free(parent); } +static const struct wined3d_parent_ops d3d_depthstencil_state_wined3d_parent_ops = +{ + d3d_depthstencil_state_wined3d_object_destroyed, +}; + HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, struct d3d_depthstencil_state **state) { + struct wined3d_depth_stencil_state_desc wined3d_desc; struct d3d_depthstencil_state *object; D3D11_DEPTH_STENCIL_DESC tmp_desc; struct wine_rb_entry *entry; @@ -775,25 +779,40 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP return E_OUTOFMEMORY; } - if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) + object->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl; + object->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + object->desc = tmp_desc; + + if (wine_rb_put(&device->depthstencil_states, &tmp_desc, &object->entry) == -1) { - WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); + ERR("Failed to insert depth/stencil state entry.\n"); + wined3d_private_store_cleanup(&object->private_store); heap_free(object); wined3d_mutex_unlock(); - return hr; + return E_FAIL; } - if (wine_rb_put(&device->depthstencil_states, &tmp_desc, &object->entry) == -1) + wined3d_desc.depth = desc->DepthEnable; + + /* We cannot fail after creating a wined3d_depth_stencil_state object. It + * would lead to double free. */ + if (FAILED(hr = wined3d_depth_stencil_state_create(device->wined3d_device, &wined3d_desc, + object, &d3d_depthstencil_state_wined3d_parent_ops, &object->wined3d_state))) { - ERR("Failed to insert depthstencil state entry.\n"); - d3d_depthstencil_state_cleanup(object); + WARN("Failed to create wined3d depth/stencil state, hr %#x.\n", hr); + wined3d_private_store_cleanup(&object->private_store); + wine_rb_remove(&device->depthstencil_states, &object->entry); heap_free(object); wined3d_mutex_unlock(); - return E_FAIL; + return hr; } wined3d_mutex_unlock(); - TRACE("Created depthstencil state %p.\n", object); + ID3D11Device2_AddRef(object->device = &device->ID3D11Device2_iface); + + TRACE("Created depth/stencil state %p.\n", object); *state = object; return S_OK;

1 0

Zebediah Figura : wined3d: Fully move the depth buffer enable state to wined3d_depth_stencil_state.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 1acc410b10e2689850ec9537d1a419615ad91d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1acc410b10e2689850ec9537… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:43:13 2020 -0500 wined3d: Fully move the depth buffer enable state to wined3d_depth_stencil_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- dlls/wined3d/adapter_vk.c | 31 ++++++++++++++-------------- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 13 ++++++++++-- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 39 +---------------------------------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 10 files changed, 78 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1acc410b10e2689850ec…

1 0

Jacek Caban : user32: Support control characters in null driver VkKeyScanEx implementation.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 14d97c261b5172f84d9d8a935f7f72b8a83bf7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d97c261b5172f84d9d8a93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 25 16:25:45 2020 +0200 user32: Support control characters in null driver VkKeyScanEx implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49894 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 8ff6b0a817..7ac7714169 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -300,7 +300,14 @@ static void CDECL nulldrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) { - return -1; + static const short ctrl_vks[] = { + 0x332, 0x241, 0x242, 0x003, 0x244, 0x245, 0x246, 0x247, + 0x008, 0x009, 0x20d, 0x24b, 0x24c, 0x00d, 0x24e, 0x24f, + 0x250, 0x251, 0x252, 0x253, 0x254, 0x255, 0x256, 0x257, + 0x258, 0x259, 0x25a, 0x01b, 0x2dc, 0x2dd, 0x336, 0x3bd + }; + + return ch < ARRAY_SIZE(ctrl_vks) ? ctrl_vks[ch] : -1; } static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor )

1 0