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

Eric Pouech : oleau32/tests: Convert I8Copy to existing integer test scheme.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: c53980950b22c908b1488479b103bfad2e8d6d0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c53980950b22c908b1488479… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 11 09:06:22 2022 +0100 oleau32/tests: Convert I8Copy to existing integer test scheme. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 220a5f59c9f..1f8cafc82b8 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2057,33 +2057,13 @@ static void test_VarI8FromStr(void) static void test_VarI8Copy(void) { - HRESULT hres; - VARIANTARG vSrc, vDst; - LONGLONG in = 1; - if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; } - VariantInit(&vSrc); - VariantInit(&vDst); - V_VT(&vSrc) = VT_I8; - V_I8(&vSrc) = in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_I8 && V_I8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_I8(&vDst) >> 32), (UINT)V_I8(&vDst) ); - V_VT(&vSrc) = VT_I8|VT_BYREF; - V_I8REF(&vSrc) = &in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == (VT_I8|VT_BYREF) && V_I8REF(&vDst) == &in, - "ref hres 0x%X, type %d, ref (%p) %p\n", hres, V_VT(&vDst), &in, V_I8REF(&vDst)); - hres = VariantCopyInd(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_I8 && V_I8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_I8(&vDst) >> 32), (UINT)V_I8(&vDst) ); + COPYTEST(1ll, VT_I8, V_I8(&vSrc), V_I8(&vDst), V_I8REF(&vSrc), V_I8REF(&vDst), "%I64d"); } static void test_VarI8ChangeTypeEx(void)

1 0

Eric Pouech : winmm/tests: Enable compilation with long types.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: cb17000c3a321f863aeb5e72f43f939bcb96237a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb17000c3a321f863aeb5e72… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:23:07 2022 +0100 winmm/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/Makefile.in | 1 - dlls/winmm/tests/capture.c | 28 ++-- dlls/winmm/tests/joystick.c | 8 +- dlls/winmm/tests/mci.c | 58 ++++---- dlls/winmm/tests/mcicda.c | 56 ++++---- dlls/winmm/tests/midi.c | 164 +++++++++++------------ dlls/winmm/tests/mixer.c | 72 +++++----- dlls/winmm/tests/mmio.c | 306 +++++++++++++++++++++---------------------- dlls/winmm/tests/timer.c | 8 +- dlls/winmm/tests/wave.c | 42 +++--- 10 files changed, 371 insertions(+), 372 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb17000c3a321f863aeb…

1 0

Eric Pouech : user32/tests: Enable compilation with long types in listbox.c.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 1b41c490e4588982d9cfd02148802da13b5e3136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b41c490e4588982d9cfd021… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 11 09:12:28 2022 +0100 user32/tests: Enable compilation with long types in listbox.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 211 ++++++++++++++++++++++---------------------- 1 file changed, 106 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b41c490e4588982d9cf…

1 0

Eric Pouech : oleaut32/tests: Get rid of EXPECTI864 macro.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: baf2b29d2375cb8ed57d412f4efcff6f4e3d0835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf2b29d2375cb8ed57d412f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 11 09:06:07 2022 +0100 oleaut32/tests: Get rid of EXPECTI864 macro. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 995fd254208..a61907cc4bb 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -1875,11 +1875,6 @@ static void test_VarUI4ChangeTypeEx(void) (ULONG)((LONG64)(x) >> 32), (ULONG)((x) & 0xffffffff), \ (ULONG)(out >> 32), (ULONG)(out & 0xffffffff), hres) -#define EXPECTI864(x,y) \ - ok(hres == S_OK && (out >> 32) == (CONV_TYPE)(x) && (out & 0xffffffff) == (CONV_TYPE)(y), \ - "expected " #x "(%u,%u), got (%u,%u); hres=0x%08x\n", \ - (ULONG)(x), (ULONG)(y), \ - (ULONG)(out >> 32), (ULONG)(out & 0xffffffff), hres) static void test_VarI8FromI1(void) { @@ -2011,7 +2006,7 @@ static void test_VarI8FromUI8(void) CONVERT(VarI8FromUI8, 0); EXPECTI8(0); CONVERT(VarI8FromUI8, 1); EXPECTI8(1); - CONVERT_I8(VarI8FromUI8, 0x7fffffff, 0xffffffff); EXPECTI864(0x7fffffff, 0xffffffff); + CONVERT_I8(VarI8FromUI8, 0x7fffffff, 0xffffffff); EXPECTI8(0x7fffffffffffffffull); CONVERT_I8(VarI8FromUI8, 0x80000000, 0); EXPECT_OVERFLOW; } @@ -2313,8 +2308,8 @@ static void test_VarUI8FromStr(void) CONVERT_STR(VarUI8FromStr,"0",0); EXPECTI8(0); CONVERT_STR(VarUI8FromStr,"-1",0); EXPECT_OVERFLOW; CONVERT_STR(VarUI8FromStr,"2147483647",0); EXPECTI8(2147483647); - CONVERT_STR(VarUI8FromStr,"18446744073709551614",0); EXPECTI864(0xFFFFFFFF,0xFFFFFFFE); - CONVERT_STR(VarUI8FromStr,"18446744073709551615",0); EXPECTI864(0xFFFFFFFF,0xFFFFFFFF); + CONVERT_STR(VarUI8FromStr,"18446744073709551614",0); EXPECTI8(0xFFFFFFFFFFFFFFFEull); + CONVERT_STR(VarUI8FromStr,"18446744073709551615",0); EXPECTI8(0xFFFFFFFFFFFFFFFFull); CONVERT_STR(VarUI8FromStr,"18446744073709551616",0); EXPECT_OVERFLOW; CONVERT_STR(VarUI8FromStr,"-1.5",LOCALE_NOUSEROVERRIDE); EXPECT_OVERFLOW;

1 0

Jacek Caban : win32u: Move set_foreground_window implementation from user32.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 917a80182d94360482389e68cb9f5aafe9208964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917a80182d94360482389e68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 11 14:22:04 2022 +0100 win32u: Move set_foreground_window implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +- dlls/user32/focus.c | 199 +------------------------------------------ dlls/user32/user_main.c | 1 + dlls/win32u/input.c | 39 +++++++++ dlls/win32u/message.c | 19 +++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 + include/ntuser.h | 7 ++ 9 files changed, 73 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=917a80182d9436048238…

1 0

Zebediah Figura : d3d11: Report support for MapNoOverwriteOnDynamicConstantBuffer.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 1ca215ea04c2c592d4ff0f708ea558db7464d684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca215ea04c2c592d4ff0f70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 19:22:45 2022 -0600 d3d11: Report support for MapNoOverwriteOnDynamicConstantBuffer. 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/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 577a3de5bf8..7d2c2636f4b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4089,7 +4089,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->CopyWithOverlap = FALSE; options->ConstantBufferPartialUpdate = FALSE; options->ConstantBufferOffsetting = TRUE; - options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; + options->MapNoOverwriteOnDynamicConstantBuffer = TRUE; options->MapNoOverwriteOnDynamicBufferSRV = TRUE; options->MultisampleRTVWithForcedSampleCountOne = FALSE; options->SAD4ShaderInstructions = FALSE;

1 0

Rémi Bernon : winegstreamer: Introduce new H264 decoder transform stub.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 24e546779f4e0fa86b20fe0c4023b44f019fbd25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24e546779f4e0fa86b20fe0c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 9 09:53:06 2022 +0100 winegstreamer: Introduce new H264 decoder transform stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/h264_decoder.c | 276 +++++++++++++++++++++++++++ dlls/winegstreamer/mfplat.c | 29 ++- dlls/winegstreamer/winegstreamer_classes.idl | 6 + 6 files changed, 313 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24e546779f4e0fa86b20…

1 0

Matteo Bruni : d3d11: Report support for MapNoOverwriteOnDynamicBufferSRV.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 3dc960c8cc18cb434ed985439a68427f99e65b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc960c8cc18cb434ed98543… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 10 19:22:44 2022 -0600 d3d11: Report support for MapNoOverwriteOnDynamicBufferSRV. 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/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cda1a97f974..577a3de5bf8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4090,7 +4090,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->ConstantBufferPartialUpdate = FALSE; options->ConstantBufferOffsetting = TRUE; options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; - options->MapNoOverwriteOnDynamicBufferSRV = FALSE; + options->MapNoOverwriteOnDynamicBufferSRV = TRUE; options->MultisampleRTVWithForcedSampleCountOne = FALSE; options->SAD4ShaderInstructions = FALSE; options->ExtendedDoublesShaderInstructions = FALSE;

1 0

Zebediah Figura : wined3d: Trace GL buffer object creation more accurately.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 94c08e6dd1e72083fb9b42874e659b79978640af URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c08e6dd1e72083fb9b4287… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 17:07:06 2022 -0600 wined3d: Trace GL buffer object creation more accurately. 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/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f356bdc7ec..d14b40d8e3e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1080,6 +1080,7 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; wined3d_device_gl_allocator_unlock(device_gl); + TRACE("Allocated offset %Iu from buffer object %u.\n", block->offset, *id); return block; } @@ -1144,6 +1145,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win checkGLcall("buffer object creation"); return false; } + TRACE("Created buffer object %u.\n", id); wined3d_context_gl_bind_bo(context_gl, binding, id); if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) @@ -1158,7 +1160,6 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win checkGLcall("buffer object creation"); } - TRACE("Created buffer object %u.\n", id); bo->id = id; bo->memory = memory; bo->size = size;

1 0

Huw Davies : winealsa: Move is_started to the unixlib.
by Alexandre Julliard March 11, 2022

March 11, 2022

Module: wine Branch: master Commit: 7977f5321968aced4152098c27e3662519e1fc66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7977f5321968aced4152098c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 08:20:05 2022 +0000 winealsa: Move is_started to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 11 +++++++++++ dlls/winealsa.drv/mmdevdrv.c | 19 ++++--------------- dlls/winealsa.drv/unixlib.h | 7 +++++++ 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 870ec4db151..365f5637b20 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2182,6 +2182,16 @@ static NTSTATUS set_event_handle(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + return alsa_unlock_result(stream, &params->result, stream->started ? S_OK : S_FALSE); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -2204,4 +2214,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_frequency, get_position, set_event_handle, + is_started, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6dfa3ad013f..0f6a30e0f45 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -25,7 +25,6 @@ #include <stdarg.h> #include <stdio.h> #include <math.h> -#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -237,16 +236,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static void alsa_lock(struct alsa_stream *stream) -{ - pthread_mutex_lock(&stream->lock); -} - -static void alsa_unlock(struct alsa_stream *stream) -{ - pthread_mutex_unlock(&stream->lock); -} - static HRESULT alsa_stream_release(struct alsa_stream *stream, HANDLE timer_thread) { struct release_stream_params params; @@ -1640,6 +1629,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); + struct is_started_params params; ACImpl *client; TRACE("(%p)->(%p)\n", This, state); @@ -1656,14 +1646,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - alsa_lock(client->stream); - if(client->stream->started){ + params.stream = client->stream; + ALSA_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - alsa_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - alsa_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 89b53fbcb9a..b73f40c8282 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -216,6 +216,12 @@ struct set_event_handle_params HRESULT result; }; +struct is_started_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -238,6 +244,7 @@ enum alsa_funcs alsa_get_frequency, alsa_get_position, alsa_set_event_handle, + alsa_is_started, }; extern unixlib_handle_t alsa_handle;

1 0