wine-commits September 2023

wine-commits@winehq.org

1 participants
920 discussions

Rémi Bernon : dmsynth: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 3b5160c97567ceb13d719219e45972f07f990fbb URL: https://gitlab.winehq.org/wine/wine/-/commit/3b5160c97567ceb13d719219e45972… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:44:17 2023 +0200 dmsynth: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmsynth/dmsynth_main.c | 22 ---------------------- dlls/dmsynth/dmsynth_private.h | 7 ------- dlls/dmsynth/synth.c | 2 -- dlls/dmsynth/synthsink.c | 2 -- 4 files changed, 33 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index a5e2e605419..edeaab8474e 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); -LONG DMSYNTH_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); @@ -62,15 +60,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMSYNTH_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMSYNTH_UnlockModule(); - return 1; /* non-heap based object */ } @@ -90,12 +84,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); - return S_OK; } @@ -111,16 +99,6 @@ static IClassFactoryImpl Synth_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMu static IClassFactoryImpl SynthSink_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicSynthSinkImpl}; -/****************************************************************** - * DllCanUnloadNow (DMSYNTH.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return DMSYNTH_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMSYNTH.@) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index c21a9e84a84..3a3e76dfaf4 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -80,13 +80,6 @@ struct IDirectMusicSynthSinkImpl { BOOL active; }; -/********************************************************************** - * Dll lifetime tracking declaration for dmsynth.dll - */ -extern LONG DMSYNTH_refCount; -static inline void DMSYNTH_LockModule(void) { InterlockedIncrement( &DMSYNTH_refCount ); } -static inline void DMSYNTH_UnlockModule(void) { InterlockedDecrement( &DMSYNTH_refCount ); } - /***************************************************************************** * Misc. */ diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 2c46abf661b..bcfc6e0ab37 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -83,7 +83,6 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) if (This->latency_clock) IReferenceClock_Release(This->latency_clock); HeapFree(GetProcessHeap(), 0, This); - DMSYNTH_UnlockModule(); } return ref; @@ -750,7 +749,6 @@ HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->caps.dwEffectFlags = DMUS_EFFECT_REVERB; lstrcpyW(obj->caps.wszDescription, L"Microsoft Synthesizer"); - DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface); diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index abc422f2b10..b9d9a31012c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -81,7 +81,6 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa if (This->master_clock) IReferenceClock_Release(This->master_clock); HeapFree(GetProcessHeap(), 0, This); - DMSYNTH_UnlockModule(); } return ref; @@ -317,7 +316,6 @@ HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) return hr; } - DMSYNTH_LockModule(); hr = IDirectMusicSynthSink_QueryInterface(&obj->IDirectMusicSynthSink_iface, riid, ret_iface); IDirectMusicSynthSink_Release(&obj->IDirectMusicSynthSink_iface);

1 0

Rémi Bernon : dmsynth: Remove unnecessary comments.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 23b8988464135b3979270ed0993b51f35fc1f718 URL: https://gitlab.winehq.org/wine/wine/-/commit/23b8988464135b3979270ed0993b51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 24 11:05:32 2023 +0200 dmsynth: Remove unnecessary comments. --- dlls/dmsynth/synth.c | 4 ---- dlls/dmsynth/synthsink.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index b579c15c66e..2c46abf661b 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -33,7 +33,6 @@ static inline IDirectMusicSynth8Impl *impl_from_IDirectMusicSynth8(IDirectMusicS return CONTAINING_RECORD(iface, IDirectMusicSynth8Impl, IDirectMusicSynth8_iface); } -/* IDirectMusicSynth8Impl IUnknown part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(IDirectMusicSynth8 *iface, REFIID riid, void **ret_iface) { @@ -90,7 +89,6 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) return ref; } -/* IDirectMusicSynth8Impl IDirectMusicSynth part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -539,7 +537,6 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend(IDirectMusicSynth8 *iface return S_OK; } -/* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice(IDirectMusicSynth8 *iface, REFERENCE_TIME ref_time, DWORD voice_id, DWORD channel_group, DWORD channel, DWORD dwDLId, LONG prPitch, LONG vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, @@ -725,7 +722,6 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { DMSynthImpl_IKsControl_KsEvent }; -/* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) { IDirectMusicSynth8Impl *obj; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 825ad86013c..abc422f2b10 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -30,7 +30,6 @@ static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirect return CONTAINING_RECORD(iface, IDirectMusicSynthSinkImpl, IDirectMusicSynthSink_iface); } -/* IDirectMusicSynthSinkImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(IDirectMusicSynthSink *iface, REFIID riid, void **ret_iface) { @@ -88,7 +87,6 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa return ref; } -/* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *iface, IDirectMusicSynth *synth) { @@ -295,7 +293,6 @@ static const IKsControlVtbl DMSynthSinkImpl_IKsControl_Vtbl = { DMSynthSinkImpl_IKsControl_KsEvent }; -/* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *obj;

1 0

Jacob Czekalla : comctl32/status: Invalidate entire status bar on WM_SIZE.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 1accde204fd3f046c2ff56b67051ee71442188ba URL: https://gitlab.winehq.org/wine/wine/-/commit/1accde204fd3f046c2ff56b67051ee… Author: Jacob Czekalla <jacobczekalla(a)gmail.com> Date: Tue Aug 29 10:27:42 2023 -0400 comctl32/status: Invalidate entire status bar on WM_SIZE. --- dlls/comctl32/status.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 5251f3677b0..3e1bc4902ff 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1068,8 +1068,9 @@ STATUSBAR_WMSize (STATUS_INFO *infoPtr, WORD flags) width = parent_rect.right - parent_rect.left; x = parent_rect.left; y = parent_rect.bottom - infoPtr->height; - MoveWindow (infoPtr->Self, x, y, width, infoPtr->height, TRUE); + MoveWindow(infoPtr->Self, x, y, width, infoPtr->height, FALSE); STATUSBAR_SetPartBounds (infoPtr); + InvalidateRect(infoPtr->Self, NULL, FALSE); return TRUE; }

1 0

Alexandre Julliard : oleaut32/tests: Mark the win9x behavior as todo on Wine.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: db43ece90ae653a1e857dee7f448190730915c38 URL: https://gitlab.winehq.org/wine/wine/-/commit/db43ece90ae653a1e857dee7f44819… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 23:29:36 2023 +0200 oleaut32/tests: Mark the win9x behavior as todo on Wine. --- dlls/oleaut32/tests/usrmarshal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index bb08ba1a1e3..922736b1591 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1625,6 +1625,7 @@ static void test_marshal_VARIANT(void) wirev = (DWORD*)buffer; wirev = check_variant_header(wirev, &v, next - buffer); + todo_wine_if( *wirev == (DWORD)(DWORD_PTR)V_UNKNOWN(&v) /* win9x */) ok(*wirev == (DWORD)(DWORD_PTR)V_UNKNOWN(&v) + 1, "wv[5] %08lx\n", *wirev); wirev++; ok(*wirev == next - buffer - 0x20, "wv[6] %08lx\n", *wirev); @@ -1693,6 +1694,7 @@ static void test_marshal_VARIANT(void) ok(*wirev == 4, "wv[5] %08lx\n", *wirev); wirev++; + todo_wine_if( *wirev == (DWORD)(DWORD_PTR)heap_unknown /* win9x */) ok(*wirev == (DWORD)(DWORD_PTR)heap_unknown + 1, "wv[6] %08lx\n", *wirev); wirev++; ok(*wirev == next - buffer - 0x24, "wv[7] %08lx\n", *wirev);

1 0

Alexandre Julliard : kernel32/tests: Also remove stack pointer checks on 64-bit.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 8103907d54b4050589b18a93948b56a44b004abe URL: https://gitlab.winehq.org/wine/wine/-/commit/8103907d54b4050589b18a93948b56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 23:21:58 2023 +0200 kernel32/tests: Also remove stack pointer checks on 64-bit. --- dlls/kernel32/tests/process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index dfb47a84745..c298b9ab0fa 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3261,7 +3261,6 @@ static void test_SuspendProcessNewThread(void) ok( !ctx.R13, "r13 is not zero %Ix\n", ctx.R13 ); ok( !ctx.R14, "r14 is not zero %Ix\n", ctx.R14 ); ok( !ctx.R15, "r15 is not zero %Ix\n", ctx.R15 ); - ok( !((ctx.Rsp + 0x28) & 0xfff), "rsp is not at top of stack page %Ix\n", ctx.Rsp ); ok( ctx.EFlags == 0x200, "wrong flags %08lx\n", ctx.EFlags ); ok( ctx.MxCsr == 0x1f80, "wrong mxcsr %08lx\n", ctx.MxCsr ); ok( ctx.FltSave.ControlWord == 0x27f, "wrong control %08x\n", ctx.FltSave.ControlWord ); @@ -3410,7 +3409,6 @@ static void test_SuspendProcessState(void) ok( !ctx.R13, "r13 is not zero %Ix\n", ctx.R13 ); ok( !ctx.R14, "r14 is not zero %Ix\n", ctx.R14 ); ok( !ctx.R15, "r15 is not zero %Ix\n", ctx.R15 ); - ok( !((ctx.Rsp + 0x28) & 0xfff), "rsp is not at top of stack page %Ix\n", ctx.Rsp ); ok( ctx.EFlags == 0x200, "wrong flags %08lx\n", ctx.EFlags ); ok( ctx.MxCsr == 0x1f80, "wrong mxcsr %08lx\n", ctx.MxCsr ); ok( ctx.FltSave.ControlWord == 0x27f, "wrong control %08x\n", ctx.FltSave.ControlWord );

1 0

Conor McCarthy : vkd3d-shader: Handle size in bytes in spirv_compiler_emit_cbv_declaration().
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: vkd3d Branch: master Commit: 3badab208686e8b75ca3dd3beb744db4041349c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3badab208686e8b75ca3dd3beb744… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Sep 1 13:30:09 2023 +1000 vkd3d-shader: Handle size in bytes in spirv_compiler_emit_cbv_declaration(). The caller passes a byte size now. --- libs/vkd3d-shader/spirv.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f93960d6..95f6914a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5564,7 +5564,7 @@ static uint32_t spirv_compiler_build_descriptor_variable(struct spirv_compiler * } static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler, - const struct vkd3d_shader_register_range *range, unsigned int register_id, unsigned int size) + const struct vkd3d_shader_register_range *range, unsigned int register_id, unsigned int size_in_bytes) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t vec4_id, array_type_id, length_id, struct_id, var_id; @@ -5572,6 +5572,7 @@ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler, struct vkd3d_push_constant_buffer_binding *push_cb; struct vkd3d_descriptor_variable_info var_info; struct vkd3d_symbol reg_symbol; + unsigned int size; struct vkd3d_shader_register reg = { @@ -5580,18 +5581,19 @@ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler, .idx_count = 1, }; + size = size_in_bytes / (VKD3D_VEC4_SIZE * sizeof(uint32_t)); + if ((push_cb = spirv_compiler_find_push_constant_buffer(compiler, range))) { /* Push constant buffers are handled in * spirv_compiler_emit_push_constant_buffers(). */ - unsigned int cb_size_in_bytes = size * VKD3D_VEC4_SIZE * sizeof(uint32_t); push_cb->reg = reg; push_cb->size = size; - if (cb_size_in_bytes > push_cb->pc.size) + if (size_in_bytes > push_cb->pc.size) { WARN("Constant buffer size %u exceeds push constant size %u.\n", - cb_size_in_bytes, push_cb->pc.size); + size_in_bytes, push_cb->pc.size); } return; }

1 0

Conor McCarthy : vkd3d-shader: Match only UAV descriptors in vkd3d_shader_scan_add_uav_flag().
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: vkd3d Branch: master Commit: bad4c74002dff20cacb2eaa42e31d9e9a29409ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bad4c74002dff20cacb2eaa42e31d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Sep 1 12:44:44 2023 +1000 vkd3d-shader: Match only UAV descriptors in vkd3d_shader_scan_add_uav_flag(). Fixes compilation failures in Cyberpunk 2077 due to missing UAV counter flag. --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 273a543a..0c3422f6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -705,7 +705,8 @@ static void vkd3d_shader_scan_add_uav_flag(const struct vkd3d_shader_scan_contex for (i = 0; i < context->scan_descriptor_info->descriptor_count; ++i) { - if (context->scan_descriptor_info->descriptors[i].register_id == range_id) + if (context->scan_descriptor_info->descriptors[i].type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV + && context->scan_descriptor_info->descriptors[i].register_id == range_id) { context->scan_descriptor_info->descriptors[i].flags |= flag; break;

1 0

Alexandre Julliard : Wine release 8.15
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: website Branch: master Commit: ac239e2898de716a21633c21e5b5250987a7e637 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/ac239e2898de716a21633c21e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 21:49:48 2023 +0200 Wine release 8.15 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023090101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023090101.xml b/news/en/2023090101.xml new file mode 100644 index 00000000..40dacafb --- /dev/null +++ b/news/en/2023090101.xml @@ -0,0 +1,16 @@ +<news> +<date>September 1, 2023</date> +<title>Wine 8.15 Released</title> +<body> + The Wine development release 8.15 is now available. + <a href="{$root}/announce/8.15">What's new</a> in this release: +<ul> + <li>Support for TEXT print processor.</li> + <li>Cycle Collection support in MSHTML.</li> + <li>Cross-process memory notifications in Wow64.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.15.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

Tag wine-8.15 : Alexandre Julliard : Release 8.15
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: refs/tags/wine-8.15 Tag: d89afd7e6d02170b36a15687bc3c9a4b6ac42f7b URL: https://gitlab.winehq.org/wine/wine/-/tags/d89afd7e6d02170b36a15687bc3c9a4b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 21:41:24 2023 +0200 Release 8.15

1 0

Alexandre Julliard : Release 8.15.
by Alexandre Julliard 01 Sep '23

01 Sep '23

Module: wine Branch: master Commit: 0cea9c78fa89366e3dbeb0629179f359cbf17b92 URL: https://gitlab.winehq.org/wine/wine/-/commit/0cea9c78fa89366e3dbeb0629179f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 21:36:35 2023 +0200 Release 8.15. --- ANNOUNCE | 945 +++++++++++++++++++++----------------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 329 insertions(+), 639 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2023