wine-devel

wine-devel@winehq.org

4 participants
84401 discussions

Re: [PATCH v2 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Nikolay Sivov (＠nsivov) 10 May '22

10 May '22

On Tue May 10 13:43:09 2022 +0000, Giovanni Mascellani wrote: > That patch looks sensible to me. Did you actually manage to get a crash > out of that? It's always reproducible if you run e.g. test_sample_allocator_sysmem() alone, without initializing queues. I'll send something for this. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/29#note_755

1 0

Re: [PATCH v2 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Giovanni Mascellani (＠giomasce) 10 May '22

10 May '22

On Tue May 10 13:43:09 2022 +0000, Nikolay Sivov wrote: > Turns out I missed a problem with this. When queues are shut down, > releasing result object reenters sample release method, and potentially > destroys it. On return original call continues, and uses critical > section that has been just destroyed. > Attaching a possible fix for this. > [2.diff](/uploads/94a959648e483587b11172a6cc34b015/2.diff) That patch looks sensible to me. Did you actually manage to get a crash out of that? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/29#note_754

1 0

Wine on Windows
by Игорь Чебаненко 10 May '22

10 May '22

I want to compile Wine in 64 bit Windows (Windows Vista and later). I want to compile it with Open Watcom (Win32 C/C++ Installer): http://openwatcom.org/download.php How to do that? Any ideas?

2 1

[PATCH] vulkan-1/tests: Fix test failures on llvmpipe.
by Zhiyi Zhang 10 May '22

10 May '22

This happens because the llvmpipe virtual GPU is not in the RandR provider list when there is a hardware GPU driving the screen. So LUID for the llvmpipe is not generated in such cases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52931 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Another way of handling this is hiding the llvmpipe Vulkan device when there is a hardware GPU. dlls/vulkan-1/tests/vulkan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 11d20120d1d..b9a36a55653 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -212,11 +212,16 @@ static void test_enumerate_physical_device2(void) trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08lx:%08lx.\n", properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); + todo_wine_if(!id.deviceLUIDValid && strstr(properties2.properties.deviceName, "llvmpipe")) ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); - /* If deviceLUIDValid is VK_TRUE, deviceNodeMask must contain exactly one bit according - * to the Vulkan specification */ - ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)), - "Expect deviceNodeMask to have only one bit set, got %#x.\n", id.deviceNodeMask); + if (id.deviceLUIDValid == VK_TRUE) + { + /* If deviceLUIDValid is VK_TRUE, deviceNodeMask must contain exactly one bit + * according to the Vulkan specification */ + ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)), + "Expect deviceNodeMask to have only one bit set, got %#x.\n", + id.deviceNodeMask); + } } } -- 2.34.1

1 0

[PATCH 0/4] MR41: mf: Register video processor transform and fix a few broken tests.
by Rémi Bernon (＠rbernon) 10 May '22

10 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/41

3 5

[PATCH 0/1] MR50: mfplat: Allow NULL length pointer in IMFAttributes::GetAllocatedString
by Andrew Eikum (＠aeikum) 10 May '22

10 May '22

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/50

3 2

[PATCH vkd3d 1/8] tests: Add additional subtests to implicit array initialization.
by Giovanni Mascellani 09 May '22

09 May '22

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - Simplified tests that are expected to fail. - Addeed a tests for implicit arrays in a typedef. - Added a test for an array of complex elements. - Moved all tests not expected to fail to the top. - Removed the 'Implicit array of elements of size 0 with broadcast initialization' test. Replaced with a simple 'Broadcast to an implicit array' test from zf. - Calling 'implicit arrays' as 'implicit size arrays' now. --- ...lsl-initializer-implicit-array.shader_test | 223 +++++++++++++++++- 1 file changed, 222 insertions(+), 1 deletion(-) diff --git a/tests/hlsl-initializer-implicit-array.shader_test b/tests/hlsl-initializer-implicit-array.shader_test index d2b94da4..648825eb 100644 --- a/tests/hlsl-initializer-implicit-array.shader_test +++ b/tests/hlsl-initializer-implicit-array.shader_test @@ -2,6 +2,7 @@ float4 main() : SV_TARGET { float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80}; + return arr[1]; } @@ -10,9 +11,229 @@ todo draw quad todo probe all rgba (50, 60, 70, 80) +[pixel shader] +float4 main() : sv_target +{ + float4 arr1[2] = {1, 2, 3, 4, 5, 6, 7, 8}; + float4 arr2[] = arr1; + + return arr2[1]; +} + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +float4 main() : sv_target +{ + float2 arr[][3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return float4(arr[1][0], arr[1][1]); +} + +[test] +todo draw quad +todo probe all rgba (7.0, 8.0, 9.0, 10.0) + + +[pixel shader] +struct foo +{ + float3 foo1; + float4 foo2; +}; + +struct bar +{ + struct foo aa; + int2 bb; + float4 cc[2]; +}; + +float4 main() : SV_TARGET +{ + struct bar p[] = { + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + }; + return p[0].aa.foo2 + p[1].cc[1]; +} + +[test] +todo draw quad +todo probe all rgba (318.0, 320.0, 322.0, 324.0) + + [pixel shader fail] +// Incompatible number of arguments in implicit size array initializer float4 main() : SV_TARGET { float4 arr[] = {10, 20, 30, 40, 50, 60, 70}; - return arr[0]; + + return 0.0; +} + + +[pixel shader fail] +// Incompatible number of arguments in implicit size array initializer +float4 main() : SV_TARGET +{ + float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80, 90}; + + return 0.0; +} + +[pixel shader fail] +// Implicit size inner array +float4 main() : sv_target +{ + float2 arr[3][] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array without initializer +float4 main() : sv_target +{ + float4 arr[]; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as struct member +struct foobar +{ + int a; + float4 arr[]; +}; + +float4 main() : sv_target +{ + struct foobar s; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as function argument +float4 fun(float4 arr[]) +{ + return 1.0; +} +float4 main() : sv_target +{ + float4 arr[3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + return fun(arr); +} + + +[pixel shader fail] +// Implicit size array as function return type +// Note: explicit size arrays are not allowed either. +float4[] fun() +{ + float4 ret[2] = {1, 2, 3, 4, 5, 6, 7, 8}; + + return ret; +} + +float4 main() : sv_target +{ fun(); + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as a cast +float4 main() : sv_target +{ + float2 arr1[4] = {1, 2, 3, 4, 5, 6, 7, 8}; + float4 arr2[2] = (float4 []) arr1; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as a typedef +typedef float4 arrtype[]; + +float4 main() : sv_target +{ + arrtype arr1 = {1, 2, 3, 4, 5, 6, 7, 8}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[] = {1, 2, 3, 4}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0, without initializer +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[]; + + return 0.0; +} + + +[pixel shader fail] +// Broadcast to an implicit size array +float4 main() : sv_target +{ + int a[4] = (int[]) 0; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array with an initializer of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + float4 arr[] = (struct emp) 42; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0 with initializer of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[] = (struct emp) 42; + + return 0.0; } -- 2.36.0

2 16

Deouis mon inscription, je ne comprend pas ce que je reçois
by Yonnel BALEZ 09 May '22

09 May '22

2 1

[PATCH 1/2] dlls/winepulse.drv-longtypes: use correct integral type
by Eric Pouech 09 May '22

09 May '22

avoiding as much as possible long types in unixlib part Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/pulse.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 18009435f1f2..e97a04d6a8d7 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -250,7 +250,7 @@ typedef struct tagLANGANDCODEPAGE WORD wCodePage; } LANGANDCODEPAGE; -static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, DWORD *len) +static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len) { WCHAR pn[37]; swprintf(pn, ARRAY_SIZE(pn), L"\\StringFileInfo\\%04x%04x\\ProductName", lang->wLanguage, lang->wCodePage); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index f685e2047e74..6309a27f42b0 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -87,7 +87,7 @@ typedef struct _PhysDevice { enum phys_device_bus_type bus_type; USHORT vendor_id, product_id; EndpointFormFactor form; - DWORD channel_mask; + UINT channel_mask; UINT index; char pulse_name[0]; } PhysDevice; @@ -252,7 +252,7 @@ static NTSTATUS pulse_get_endpoint_ids(void *args) struct get_endpoint_ids_params *params = args; struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; struct endpoint *endpoint = params->endpoints; - DWORD len, name_len, needed; + size_t len, name_len, needed; unsigned int offset; PhysDevice *dev; @@ -393,10 +393,10 @@ fail: return E_FAIL; } -static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) +static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) { int i; - DWORD mask = 0; + UINT mask = 0; for (i = 0; i < map->channels; ++i) { switch (map->map[i]) { @@ -452,9 +452,9 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - DWORD channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *name) { - DWORD len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name), name_len = strlen(name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); WCHAR *wname; @@ -485,7 +485,7 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { struct list *speaker; - DWORD channel_mask; + UINT channel_mask; if (!i || !i->name || !i->name[0]) return; @@ -516,7 +516,7 @@ static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eo * would report for a given channel layout. */ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIBLE *fmt) { - DWORD pa_mask = pulse_channel_map_to_channel_mask(pa_map); + UINT pa_mask = pulse_channel_map_to_channel_mask(pa_map); TRACE("got mask for PA: 0x%x\n", pa_mask); @@ -772,7 +772,7 @@ fail: return STATUS_SUCCESS; } -static DWORD get_channel_mask(unsigned int channels) +static UINT get_channel_mask(unsigned int channels) { switch(channels) { case 0: @@ -845,8 +845,8 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV break; case WAVE_FORMAT_EXTENSIBLE: { WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE*)fmt; - DWORD mask = wfe->dwChannelMask; - DWORD i = 0, j; + UINT mask = wfe->dwChannelMask; + unsigned i = 0, j; if (fmt->cbSize != (sizeof(*wfe) - sizeof(*fmt)) && fmt->cbSize != sizeof(*wfe)) break; if (IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) &&

2 3

[PATCH 0/5] MR49: MPEG audio decoder
by Anton Baskanov (＠baskanov) 09 May '22

09 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/49

3 6

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-devel