wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

[PATCH] mfplat/sample: Fix use-after-free of a critical section.
by Nikolay Sivov 10 May '22

10 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/sample.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index ed39b5f7297..687ada1a477 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -183,22 +183,25 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface) { struct sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedDecrement(&sample->attributes.ref); + IRtwqAsyncResult *tracked_result = NULL; HRESULT hr; EnterCriticalSection(&sample->attributes.cs); if (sample->tracked_result && sample->tracked_refcount == refcount) { - IRtwqAsyncResult *tracked_result = sample->tracked_result; + tracked_result = sample->tracked_result; sample->tracked_result = NULL; sample->tracked_refcount = 0; /* Call could fail if queue system is not initialized, it's not critical. */ if (FAILED(hr = RtwqInvokeCallback(tracked_result))) WARN("Failed to invoke tracking callback, hr %#lx.\n", hr); - IRtwqAsyncResult_Release(tracked_result); } LeaveCriticalSection(&sample->attributes.cs); + if (tracked_result) + IRtwqAsyncResult_Release(tracked_result); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) -- 2.35.1

1 0

[PATCH] mf/session: Do not request more samples when SA sample becomes available.
by Nikolay Sivov 10 May '22

10 May '22

The issue here is that upstream nodes get their request counters increased while sink hasn't requested any. This causes desync between sink request counters and upstream node counters, potentially causing sample drops and sink waiting forever for samples that will never come. Case like that is easy to reproduce with mfplay-based player, where occasionally end-of-presentation condition does not trigger, but new samples are coming in. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 71 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 85b63f767fe..a78e7cfc473 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2369,6 +2369,8 @@ static HRESULT WINAPI session_commands_callback_GetParameters(IMFAsyncCallback * return E_NOTIMPL; } +static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node); + static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); @@ -2411,7 +2413,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output))) { - session_request_sample_from_node(session, upstream_node, upstream_output); + session_deliver_pending_samples(session, upstream_node); IMFTopologyNode_Release(upstream_node); } } @@ -2952,19 +2954,19 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (sample) + if (topo_node->u.sink.requests) { - if (topo_node->u.sink.requests) + if (sample) { if (FAILED(hr = IMFStreamSink_ProcessSample(topo_node->object.sink_stream, sample))) WARN("Stream sink failed to process sample, hr %#lx.\n", hr); - topo_node->u.sink.requests--; } - } - else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, - NULL, NULL))) - { - WARN("Failed to place sink marker, hr %#lx.\n", hr); + else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, + NULL, NULL))) + { + WARN("Failed to place sink marker, hr %#lx.\n", hr); + } + topo_node->u.sink.requests--; } break; case MF_TOPOLOGY_TRANSFORM_NODE: @@ -3048,6 +3050,57 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } } +static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node) +{ + struct sample *sample_entry, *sample_entry2; + IMFTopologyNode *downstream_node; + struct topo_node *topo_node; + MF_TOPOLOGY_TYPE node_type; + DWORD downstream_input; + TOPOID node_id; + unsigned int i; + + IMFTopologyNode_GetNodeType(node, &node_type); + IMFTopologyNode_GetTopoNodeID(node, &node_id); + + topo_node = session_get_node_by_id(session, node_id); + + switch (node_type) + { + case MF_TOPOLOGY_TRANSFORM_NODE: + + transform_node_pull_samples(session, topo_node); + + /* Push down all available output. */ + for (i = 0; i < topo_node->u.transform.output_count; ++i) + { + if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) + { + WARN("Failed to get connected node for output %u.\n", i); + continue; + } + + LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples, + struct sample, entry) + { + if (!topo_node->u.transform.outputs[i].requests) + break; + + session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); + topo_node->u.transform.outputs[i].requests--; + + transform_release_sample(sample_entry); + } + + IMFTopologyNode_Release(downstream_node); + } + break; + default: + FIXME("Unexpected node type %u.\n", node_type); + } +} + + static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output) { IMFTopologyNode *downstream_node, *upstream_node; -- 2.35.1

1 0

[PATCH 0/5] MR51: Fix handling of dbghelp's basic type
by eric pouech (＠epo) 10 May '22

10 May '22

Wine's dbghelp's implementation differ from native regarding basic types' handling (the basic types like char, int, long...) - Wine's dbghelp exposes a name for such a type, while native doesn't - parsing of basic type from dwarf & pdb don't always exactly return the correct information. Two examples (among others) of discrepancies: - in C, under Windows assumption, char, signed char and unsigned char are mapped to 2 types (as char = signed char); while in C++, they are mapped to three different types (char and signed char are two different types). Wine's dbhelp doesn't report correctly the C++ char types, and the char/signed char is broken too. - MS compiler shamelessly maps WCHAR to btWChar (basic type), while it's a typedef to unsigned short (which is mapped to btInt of size 2) This series's result is that Wine dbghelp's now returns the same basic types as native. (Tested with most of the C & C++ basic types) This requires: - to implement the re-generation of the basic types' name in WineDbg. This is done by adding data model tables (ILP32, LP64 and LLP64), and picking up the right one depending on current executable. Option is also added in WineDbg to force a(nother) data model. This is only used when printing types, not when reading/writing integer values as this (mostly) relies on the size of the integer. - fixing the pdb and dwarf backends in dbghelp to retarget the correct base types (for C and C++ basic types) - removing the name field from dbghelp's struct symt_basic allowed some simplification inside dbghelp: + all basic types are now only allocated once across every compilation unit and module) (small speed and memory consumption gain) + dwarf's backend used a basic type cache which is also removed Note: when using a basic type in WineDbg (like casting an integral value to another integral value), this serie doesn't change the data model used for getting the type's size. The data model used is currently ILP32 on 32 bit, and always LP64 on 64 bit. Yet to come serie shall use the current data model instead. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/51

2 5

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

[PATCH v5 0/3] NtQueryDirectoryObject multiple entires case (#52585)
by Jinoh Kang 08 May '22

08 May '22

This is a split off resend of Zebediah's original patch. v3: original patch by Zebediah Figura v3 -> v4: split patch v4 -> v5: fix author Zebediah Figura (3): server: Don't set error in find_object_index if the object is not found. ntdll: Implement reading multiple entries in NtQueryDirectoryObject. server: Generalize get_directory_entries to single_entry case. dlls/ntdll/tests/om.c | 57 +++++++++----------- dlls/ntdll/unix/sync.c | 116 +++++++++++++++++++++++++++-------------- server/directory.c | 76 +++++++++++++++++++++------ server/object.c | 1 - server/protocol.def | 20 ++++--- server/trace.c | 34 ++++++++++++ 6 files changed, 209 insertions(+), 95 deletions(-) -- 2.34.1

2 4

[PATCH 0/3] NtQueryDirectoryObject multiple entires case (#52585)
by Jinoh Kang 08 May '22

08 May '22

This is a split off resend of Zebediah's original patch. Jinoh Kang (2): server: Don't set error in find_object_index if the object is not found. server: Generalize get_directory_entries to single_entry case. Zebediah Figura (1): ntdll: Implement reading multiple entries in NtQueryDirectoryObject. dlls/ntdll/tests/om.c | 57 +++++++++----------- dlls/ntdll/unix/sync.c | 116 +++++++++++++++++++++++++++-------------- server/directory.c | 76 +++++++++++++++++++++------ server/object.c | 1 - server/protocol.def | 20 ++++--- server/trace.c | 34 ++++++++++++ 6 files changed, 209 insertions(+), 95 deletions(-) -- 2.34.1

1 3

[PATCH 0/4] MR47: kernel32/tests: Add tests for CancelSynchronousIo.
by Daniel Lehman (＠dlehman25) 07 May '22

07 May '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/47

2 4

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

07 May '22

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) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/29#note_743

1 0

[PATCH 0/1] MR45: ntdll: Always prefer native signal restorer over the custom one.
by Jinoh Kang (＠iamahuman) 07 May '22

07 May '22

A few months after commit 1b1ea639cd6 (ntdll: Use a custom signal restorer for Android., 2014-07-17) has been introduced, bionic rolled its own signal restorer. The patch is at: https://android-review.googlesource.com/c/platform/bionic/+/107692 In general, rolling our own signal restorer is not a good idea since it interferes with unwinding. GDB seems especially unhappy when the signal restorer's name isn't exactly "__restore_rt". Fix this by using the custom signal restorer only if the vDSO has disappeared and libc doesn't supply its own signal restorer. This also removes Android-specific code, although there aren't many libcs out there that lack a backup signal restorer. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/45

2 1

Wine staging 7.8 release
by Alistair Leslie-Hughes 07 May '22

07 May '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.8 (550 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * server: Create message queue and thread input in set_key_state. * server: Lock thread input keystate whenever it is modified. * server: Create message queue and thread input in get_key_state. Added: * [48121] Improve Alt+tab for unity games. Updated: * winex11-_NET_ACTIVE_WINDOW * user32-Mouse_Message_Hwnd * user32-rawinput-mouse * api-iteration-tokens Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2] kernelbase: Add RaiseFailFastException stub.
by Brendan Shanks 06 May '22

06 May '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Fix format string for DWORD parameter. dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/debug.c | 8 ++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bc5913b6d7d..b7da3b68db7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1197,7 +1197,7 @@ @ stdcall -import QueueUserAPC(ptr long long) @ stdcall -import QueueUserWorkItem(ptr ptr long) @ stdcall -import RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall -import RaiseFailFastException(ptr ptr long) @ stdcall -import ReadConsoleA(long ptr long ptr ptr) @ stdcall -import ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 6848d5af125..9e954e3ffbe 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -303,6 +303,14 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou } __ASM_STDCALL_IMPORT(RaiseException,16) +/******************************************************************* + * RaiseFailFastException (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH RaiseFailFastException( EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags ) +{ + FIXME( "(%p, %p, %ld) stub\n", record, context, flags ); + TerminateProcess( GetCurrentProcess(), STATUS_FAIL_FAST_EXCEPTION ); +} /*********************************************************************** * SetUnhandledExceptionFilter (kernelbase.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 854797ddeb0..ab580e03594 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1264,7 +1264,7 @@ # @ stub QuirkIsEnabledForPackage4 # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall RaiseFailFastException(ptr ptr long) @ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) -- 2.32.0 (Apple Git-132)

1 0

[PATCH 0/4] Some small registry access fixes
by Torge Matthies 06 May '22

06 May '22

I had these in my patch repo for quite a while. Patch 1 shouldn't need explanation. The problem fixed by patch 2 and 3 is that sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger than the actual minimum size required to get all the requested info, because those structs include an array of size 1 as their last member, which is intended to be a variable length array. Fixing these size calculations removes one allocation in wineserver and reduces the amount of data transmitted by 1 - 2 bytes. Patch 4 just reduces the amount of data transmitted from wineserver for each update_display_cache_from_registry call, which is called every time the display device lists are locked. Torge Matthies (4): ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey. ntdll: Calculate buffer sizes from registry structs correctly. win32u: Calculate buffer sizes from registry structs correctly. win32u: Query basic instead of full key information to get the LastWriteTime. dlls/ntdll/reg.c | 10 +++++----- dlls/ntdll/unix/system.c | 2 +- dlls/win32u/sysparams.c | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) -- 2.36.0

1 4

[PATCH v2 1/2] jscript: Handle detached scope objects 'this' in all calls.
by Gabriel Ivăncescu 06 May '22

06 May '22

Not just for interpreted functions. And set to undefined in ES5+ modes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 234852-234853. dlls/jscript/engine.c | 12 ++++-------- dlls/jscript/function.c | 30 ++++++++++++++++++++++++------ dlls/jscript/tests/api.js | 2 ++ dlls/jscript/tests/lang.js | 3 +++ dlls/mshtml/tests/es5.js | 15 +++++++++++++++ 5 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 73b9d86..83005eb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3300,16 +3300,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } } - /* ECMA-262 3rd Edition 11.2.3.7 */ + /* FIXME: Workaround for ES5 mode because we don't have the JS global == window yet */ if(this_obj) { - jsdisp_t *jsthis; + jsdisp_t *jsthis = to_jsdisp(this_obj); - jsthis = iface_to_jsdisp(this_obj); - if(jsthis) { - if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) - this_obj = NULL; - jsdisp_release(jsthis); - } + if(jsthis && jsthis->builtin_info->class == JSCLASS_GLOBAL) + this_obj = NULL; } if(ctx->call_ctx && (flags & EXEC_EVAL)) { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 12511bb..942ec9d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,6 +247,24 @@ void detach_arguments_object(jsdisp_t *args_disp) jsdisp_release(frame->arguments_obj); } +/* ECMA-262 3rd Edition 11.2.3.7 + ECMA-262 5.1 Edition 11.2.3.6 */ +static inline HRESULT call(script_ctx_t *ctx, FunctionInstance *function, jsval_t vthis, unsigned flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsdisp_t *jsthis; + + if(is_object_instance(vthis) && (jsthis = to_jsdisp(get_object(vthis)))) { + if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) { + if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) + vthis = jsval_null(); + }else if(jsthis->builtin_info->class == JSCLASS_NONE) + vthis = jsval_undefined(); + } + + return function->vtbl->call(ctx, function, vthis, flags, argc, argv, r); +} + HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; @@ -256,7 +274,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi assert(is_class(func_this, JSCLASS_FUNCTION)); function = function_from_jsdisp(func_this); - return function->vtbl->call(function->dispex.ctx, function, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); + return call(function->dispex.ctx, function, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -378,7 +396,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi if(SUCCEEDED(hres)) { if(function) { - hres = function->vtbl->call(ctx, function, this_val, flags, cnt, args, r); + hres = call(ctx, function, this_val, flags, cnt, args, r); }else { jsval_t res; hres = disp_call_value(ctx, get_object(vthis), is_object_instance(this_val) ? get_object(this_val) : NULL, @@ -429,7 +447,7 @@ static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig cnt = argc-1; } - hres = function->vtbl->call(ctx, function, this_val, flags, cnt, argv + 1, r); + hres = call(ctx, function, this_val, flags, cnt, argv + 1, r); jsval_release(this_val); return hres; @@ -483,7 +501,7 @@ HRESULT Function_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar return E_FAIL; } - return function->vtbl->call(ctx, function, vthis, flags, argc, argv, r); + return call(ctx, function, vthis, flags, argc, argv, r); } HRESULT Function_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -839,8 +857,8 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsva memcpy(call_args + function->argc, argv, argc * sizeof(*call_args)); } - hres = function->target->vtbl->call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(), - flags, call_argc, call_args, r); + hres = call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(), + flags, call_argc, call_args, r); heap_free(call_args); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e81bbea..1368f39 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2634,6 +2634,8 @@ testException(function() {null.toString();}, "E_OBJECT_EXPECTED"); testException(function() {RegExp.prototype.toString.call(new Object());}, "E_REGEXP_EXPECTED"); testException(function() {/a/.lastIndex();}, "E_NOT_FUNC"); testException(function() {"a".length();}, "E_NOT_FUNC"); +testException(function() {((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())();}, "E_NOT_NUM"); +testException(function() {((function() { var f = Object.prototype.hasOwnProperty; return (function() { return f("f"); }); })())();}, "E_OBJECT_EXPECTED"); testException(function() { return arguments.callee(); }, "E_STACK_OVERFLOW"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index cf08423..67e4576 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -310,6 +310,9 @@ argumentsTest(); ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); })(1,2); +tmp = ((function() { var f = function() {return this}; return (function() { return f(); }); })())(); +ok(tmp === this, "detached scope function call this != global this"); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;"); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8238e5d..fb756ac 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1784,6 +1784,21 @@ sync_test("let scope instances", function() { ok(f() == 2, "f() = " + f()); }); +sync_test("builtins detached scope this", function() { + try { + ((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())(); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_NUMBER_EXPECTED, "Number.toString threw " + n); + } + + var r = ((function() { var f = Object.prototype.toString; return (function() { return f(); }); })())(); + ok(r === "[object Undefined]", "Object.toString returned " + r); + + var r = ((function() { return (function() { return this; }); })())(); + ok(r === window, "detached scope this = " + r); +}); + sync_test("functions scope", function() { function f(){ return 1; } function f(){ return 2; } -- 2.34.1

2 3

Re: [PATCH v3 0/9] MR44: winex11: PE conversion - approved
by Alexandre Julliard (＠julliard) 06 May '22

06 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/44

1 0

Re: [PATCH v2 0/1] MR42: dllhost: Try to load the dll server's factory at the start. - approved
by Alexandre Julliard (＠julliard) 06 May '22

06 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/42

1 0

Re: [PATCH v6 0/10] MR22: winegstreamer: Implement more sample attributes and timestamps. - approved
by Alexandre Julliard (＠julliard) 06 May '22

06 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/22

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