December 2021 - Wine-commits

Alexandre Julliard : configure: Assume that sys/wait.h is available on Unix.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 411592bf45ef73543a68618432c295a1d279e574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411592bf45ef73543a686184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:10:43 2021 +0100 configure: Assume that sys/wait.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/loader.c | 4 +--- dlls/ntdll/unix/process.c | 4 +--- dlls/ntdll/unix/server.c | 2 -- include/config.h.in | 3 --- libs/wine/mmap.c | 2 -- server/ptrace.c | 4 +--- server/request.c | 4 +--- 9 files changed, 4 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 00e3e7844a1..09e8530446a 100755 --- a/configure +++ b/configure @@ -8677,12 +8677,6 @@ if test "x$ac_cv_header_sys_vnode_h" = xyes then : printf "%s\n" "#define HAVE_SYS_VNODE_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_wait_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default" if test "x$ac_cv_header_syscall_h" = xyes diff --git a/configure.ac b/configure.ac index 760e4f0ed04..8ef1fbbd694 100644 --- a/configure.ac +++ b/configure.ac @@ -505,7 +505,6 @@ AC_CHECK_HEADERS(\ sys/user.h \ sys/utsname.h \ sys/vnode.h \ - sys/wait.h \ syscall.h \ utime.h \ valgrind/memcheck.h \ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cc365fd37d1..8f20da7eece 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> +#include <sys/wait.h> #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_PWD_H @@ -52,9 +53,6 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif #include <limits.h> #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index a07bbf43a6e..23aa340359e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -39,9 +39,7 @@ # include <sys/times.h> #endif #include <sys/types.h> -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif +#include <sys/wait.h> #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 8c8dcf24477..a388247beb2 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -45,9 +45,7 @@ #include <sys/types.h> #include <sys/mman.h> #include <sys/socket.h> -#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 7f57ce10a7d..2bd8d2fa1ae 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -733,9 +733,6 @@ /* Define to 1 if you have the <sys/vnode.h> header file. */ #undef HAVE_SYS_VNODE_H -/* Define to 1 if you have the <sys/wait.h> header file. */ -#undef HAVE_SYS_WAIT_H - /* Define to 1 if you have the `tcdrain' function. */ #undef HAVE_TCDRAIN diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index c8d1b59a4db..ad51153d039 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -28,9 +28,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif #include <sys/mman.h> #include <unistd.h> #ifdef HAVE_STDINT_H diff --git a/server/ptrace.c b/server/ptrace.c index 1875e1dfd56..976d3a3778e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -27,15 +27,13 @@ #include <signal.h> #include <stdarg.h> #include <sys/types.h> +#include <sys/wait.h> #ifdef HAVE_SYS_PTRACE_H # include <sys/ptrace.h> #endif #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/server/request.c b/server/request.c index 086e5f63919..7021741c765 100644 --- a/server/request.c +++ b/server/request.c @@ -35,9 +35,7 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/socket.h> -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif +#include <sys/wait.h> #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif

1 0

Alexandre Julliard : configure: Remove some no longer used checks.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 6613e6bb79b5d18d3b2905e4ba58bc40a935023d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6613e6bb79b5d18d3b2905e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:51:49 2021 +0100 configure: Remove some no longer used checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 280 +--------------------------------------------------- configure.ac | 114 ++------------------- include/config.h.in | 51 ---------- 3 files changed, 12 insertions(+), 433 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6613e6bb79b5d18d3b29…

1 0

Ivo Ivanov : winebus.sys: Scale the force feedback gain value to the Linux FF_GAIN range.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: bc36b50c070bafa9c17a3406d248e3720580c697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc36b50c070bafa9c17a3406… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Dec 9 14:44:11 2021 +0100 winebus.sys: Scale the force feedback gain value to the Linux FF_GAIN range. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 53dca8fce56..56260f9ed61 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -945,7 +945,7 @@ static NTSTATUS lnxev_device_physical_device_set_gain(struct unix_device *iface, { .type = EV_FF, .code = FF_GAIN, - .value = percent, + .value = 0xffff * percent / 100, }; TRACE("iface %p, percent %#x.\n", iface, percent);

1 0

Ivo Ivanov : winebus.sys: Use SDL_HAPTIC_INFINITY for the infinity durations in the SDL backend.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: b3faad66cf2973adc769e76b8022de26090d9756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3faad66cf2973adc769e76b… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Dec 9 14:44:12 2021 +0100 winebus.sys: Use SDL_HAPTIC_INFINITY for the infinity durations in the SDL backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 76d90ab7912..37d75d0bc95 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -515,7 +515,7 @@ static NTSTATUS sdl_device_physical_effect_control(struct unix_device *iface, BY pSDL_HapticStopAll(impl->sdl_haptic); /* fallthrough */ case PID_USAGE_OP_EFFECT_START: - pSDL_HapticRunEffect(impl->sdl_haptic, id, iterations); + pSDL_HapticRunEffect(impl->sdl_haptic, id, (iterations == 0xff ? SDL_HAPTIC_INFINITY : iterations)); break; case PID_USAGE_OP_EFFECT_STOP: pSDL_HapticStopEffect(impl->sdl_haptic, id); @@ -592,7 +592,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: - effect.periodic.length = params->duration; + effect.periodic.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration); effect.periodic.delay = params->start_delay; effect.periodic.button = params->trigger_button; effect.periodic.interval = params->trigger_repeat_interval; @@ -613,7 +613,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - effect.condition.length = params->duration; + effect.condition.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration); effect.condition.delay = params->start_delay; effect.condition.button = params->trigger_button; effect.condition.interval = params->trigger_repeat_interval; @@ -641,7 +641,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT break; case PID_USAGE_ET_CONSTANT_FORCE: - effect.constant.length = params->duration; + effect.constant.length = (params->duration == 0xffff ? SDL_HAPTIC_INFINITY : params->duration); effect.constant.delay = params->start_delay; effect.constant.button = params->trigger_button; effect.constant.interval = params->trigger_repeat_interval; @@ -655,6 +655,8 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.constant.fade_level = params->envelope.fade_level; break; + /* According to the SDL documentation, ramp effect doesn't + * support SDL_HAPTIC_INFINITY. */ case PID_USAGE_ET_RAMP: effect.ramp.length = params->duration; effect.ramp.delay = params->start_delay;

1 0

Jinoh Kang : ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: f37b953e07f67a3d3c3bd800193d4dbbce635cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37b953e07f67a3d3c3bd800… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Dec 10 01:26:53 2021 +0900 ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes. HP-UX libunwind uses the sign of error code to indicate whether the operation was successful; however, LLVM always returns positive error codes. Normalise the sign of the error code so that it handles all flavours of libunwind. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 5 +++-- dlls/ntdll/unix/signal_arm64.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 2b25fb11caa..6389fdde058 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,12 +248,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3f62927e482..01deb9ef8dd 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,12 +212,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 46dfa0c94c1..f3e6f8335d6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1415,6 +1415,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *c *frame = context->Rsp; rc = unw_get_proc_info(&cursor, &info); + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc );

1 0

Alistair Leslie-Hughes : dbghelp: Fix possible memory leak (Coverity).
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 33308a577cb05681ce132910def1345f8681c06b URL: https://source.winehq.org/git/wine.git/?a=commit;h=33308a577cb05681ce132910… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 9 07:33:57 2021 +1100 dbghelp: Fix possible memory leak (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 67440e97fe8..7515e540778 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2314,7 +2314,10 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) * Actual thunks will be created in elf_module from the symbol table */ if (elf_is_in_thunk_area(di->unit_ctx->module_ctx->load_offset + addr_ranges[0].low, di->unit_ctx->module_ctx->thunks) >= 0) + { + free(addr_ranges); return NULL; + } ret_type = dwarf2_lookup_type(di); /* FIXME: assuming C source code */

1 0

Jinoh Kang : ntdll: Fix valid frame address range in ARM/ARM64.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 1886b3d322749c40aa91f8058d9a1d6385e7f3f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1886b3d322749c40aa91f805… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 9 18:03:13 2021 +0900 ntdll: Fix valid frame address range in ARM/ARM64. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 72f3b023e45..12ffbb3663a 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -89,7 +89,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) { if (frame & 3) return FALSE; return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); + (void *)frame <= NtCurrentTeb()->Tib.StackBase); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..034c78f6b4d 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -96,7 +96,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) { if (frame & 7) return FALSE; return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); + (void *)frame <= NtCurrentTeb()->Tib.StackBase); }

1 0

Jan Sikorski : wined3d: Decrement reference count and take the lock atomically for cached objects.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 996728315afb01d4f9ed8a81a14d812d8e866081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=996728315afb01d4f9ed8a81… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Dec 1 13:31:33 2021 +0100 wined3d: Decrement reference count and take the lock atomically for cached objects. Samplers, blend states, rasterizer states and depth stencil states can be retrieved from the cache in struct d3d_device even after the reference count reaches zero, causing memory corruption. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 3 +-- dlls/wined3d/state.c | 9 +++------ dlls/wined3d/wined3d_private.h | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index a6259bd3f82..600442ac6f3 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -34,13 +34,12 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) { - ULONG refcount = InterlockedDecrement(&sampler->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&sampler->refcount); TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) { - wined3d_mutex_lock(); sampler->parent_ops->wined3d_object_destroyed(sampler->parent); sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bc214f73b63..865c60d189e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -51,14 +51,13 @@ static void wined3d_blend_state_destroy_object(void *object) ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); wined3d_mutex_unlock(); @@ -127,14 +126,13 @@ static void wined3d_depth_stencil_state_destroy_object(void *object) ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); wined3d_mutex_unlock(); @@ -192,14 +190,13 @@ static void wined3d_rasterizer_state_destroy_object(void *object) ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b30a4108b0b..369f69913a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4155,6 +4155,26 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; +static inline ULONG wined3d_atomic_decrement_mutex_lock(volatile LONG *refcount) +{ + ULONG count, old_count = *refcount; + do + { + if ((count = old_count) == 1) + { + wined3d_mutex_lock(); + count = InterlockedDecrement(refcount); + if (count) wined3d_mutex_unlock(); + return count; + } + + old_count = InterlockedCompareExchange(refcount, count - 1, count); + } + while (old_count != count); + + return count - 1; +} + struct wined3d_client_resource { /* The resource's persistently mapped address, which we may use to perform

1 0

Dmitry Timoshkov : d2d1: Implement ID2D1Factory2::CreateStrokeStyle1().
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: ac34ebf891bb70185b30fac272b348073731520e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac34ebf891bb70185b30fac2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 6 16:29:00 2021 +0300 d2d1: Implement ID2D1Factory2::CreateStrokeStyle1(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 6 ++-- dlls/d2d1/factory.c | 35 +++++++++++++++++++--- dlls/d2d1/stroke.c | 75 ++++++++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac34ebf891bb70185b30…

1 0

Henri Verbeet : wined3d: Pass a wined3d_device_gl pointer to wined3d_device_create_primary_opengl_context_cs().
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: c22970af57bd804c5659ee51a21eab80bdbc3550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c22970af57bd804c5659ee51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 22:26:20 2021 -0600 wined3d: Pass a wined3d_device_gl pointer to wined3d_device_create_primary_opengl_context_cs(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 9864093c999..fc7a8964923 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4564,7 +4564,7 @@ static HRESULT adapter_gl_init_3d(struct wined3d_device *device) { TRACE("device %p.\n", device); - wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); + wined3d_cs_init_object(device->cs, wined3d_device_gl_create_primary_opengl_context_cs, wined3d_device_gl(device)); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!wined3d_swapchain_gl(device->swapchains[0])->context_count) return E_FAIL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c516594c269..067d54d58e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -989,17 +989,19 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) } } -void wined3d_device_create_primary_opengl_context_cs(void *object) +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) { - struct wined3d_device *device = object; + struct wined3d_device_gl *device_gl = object; struct wined3d_context_gl *context_gl; struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; + struct wined3d_device *device; HRESULT hr; - TRACE("device %p.\n", device); + TRACE("device %p.\n", device_gl); + device = &device_gl->d; swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; if (!(context = context_acquire(device, target, 0))) @@ -1032,7 +1034,7 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); + wined3d_device_gl_create_dummy_textures(device_gl, context_gl); wined3d_device_create_default_samplers(device, context); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 369f69913a8..e814cff5c39 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3920,7 +3920,6 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, @@ -3964,6 +3963,8 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo;

1 0