wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Bernhard Kölbl : mf/tests: Test for copier node in topology using evr.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: b843ec9f686bcd820ad336695728218ce335025f URL: https://gitlab.winehq.org/wine/wine/-/commit/b843ec9f686bcd820ad33669572821… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Nov 2 20:41:11 2022 +0100 mf/tests: Test for copier node in topology using evr. --- dlls/mf/tests/mf.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ba4afddc7d2..ce9a2db55a9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3581,19 +3581,51 @@ static void test_topology_loader_evr(void) hr = IMFTopologyNode_GetNodeType(node, &node_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (node_type == MF_TOPOLOGY_OUTPUT_NODE) + switch (node_type) + { + case MF_TOPOLOGY_OUTPUT_NODE: { value = 1; hr = IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_STREAMID, &value); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!value, "Unexpected stream id %u.\n", value); + break; } - else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + case MF_TOPOLOGY_TRANSFORM_NODE: + { + IMFAttributes *attrs; + IMFTransform *copier; + IUnknown *obj; + + hr = IMFTopologyNode_GetObject(node, (IUnknown **)&obj); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IUnknown_QueryInterface(obj, &IID_IMFTransform, (void **)&copier); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_GetAttributes(copier, &attrs); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attrs, &MFT_SUPPORT_DYNAMIC_FORMAT_CHANGE, &value); + ok(value == 1, "Unexpected dynamic state support state %u.\n", value); + + IMFAttributes_Release(attrs); + IMFTransform_Release(copier); + IUnknown_Release(obj); + break; + } + case MF_TOPOLOGY_SOURCESTREAM_NODE: { value64 = 1; hr = IMFTopologyNode_GetUINT64(node, &MF_TOPONODE_MEDIASTART, &value64); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!value64, "Unexpected value.\n"); + break; + } + default: + ok(0, "Got unexpected node type %u.\n", node_type); + break; } IMFTopologyNode_Release(node);

1 0

Rémi Bernon : mf: Add some topology source node checks in IMFMediaSession_SetTopology.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 49d87a5c928b9717d25417334a12c14a20176cfa URL: https://gitlab.winehq.org/wine/wine/-/commit/49d87a5c928b9717d25417334a12c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 2 17:34:48 2022 +0200 mf: Add some topology source node checks in IMFMediaSession_SetTopology. --- dlls/mf/session.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/mf/tests/mf.c | 17 -------- 2 files changed, 120 insertions(+), 23 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d5ff3384299..a20d411f17a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1939,20 +1939,134 @@ static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventTyp return IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, ext_type, hr, value); } +static HRESULT session_check_stream_descriptor(IMFPresentationDescriptor *pd, IMFStreamDescriptor *sd) +{ + IMFStreamDescriptor *selected_sd; + DWORD i, count; + BOOL selected; + HRESULT hr; + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(pd, &count))) + { + WARN("Failed to get stream descriptor count, hr %#lx.\n", hr); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; + } + + for (i = 0; i < count; ++i) + { + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, i, + &selected, &selected_sd))) + { + WARN("Failed to get stream descriptor %lu, hr %#lx.\n", i, hr); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; + } + IMFStreamDescriptor_Release(selected_sd); + + if (selected_sd == sd) + { + if (selected) + return S_OK; + + WARN("Presentation descriptor %p stream %p is not selected.\n", pd, sd); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; + } + } + + WARN("Failed to find stream descriptor %lu, hr %#lx.\n", i, hr); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; +} + +static HRESULT session_check_topology(IMFTopology *topology) +{ + MF_TOPOLOGY_TYPE node_type; + IMFTopologyNode *node; + WORD node_count, i; + HRESULT hr; + + if (!topology) + return S_OK; + + if (FAILED(IMFTopology_GetNodeCount(topology, &node_count)) + || node_count == 0) + return E_INVALIDARG; + + for (i = 0; i < node_count; ++i) + { + if (FAILED(hr = IMFTopology_GetNode(topology, i, &node))) + break; + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + { + IMFTopologyNode_Release(node); + break; + } + + switch (node_type) + { + case MF_TOPOLOGY_SOURCESTREAM_NODE: + { + IMFPresentationDescriptor *pd; + IMFStreamDescriptor *sd; + IMFMediaSource *source; + + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_SOURCE, &IID_IMFMediaSource, + (void **)&source))) + { + WARN("Missing MF_TOPONODE_SOURCE, hr %#lx.\n", hr); + IMFTopologyNode_Release(node); + return MF_E_TOPO_MISSING_SOURCE; + } + IMFMediaSource_Release(source); + + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, + &IID_IMFPresentationDescriptor, (void **)&pd))) + { + WARN("Missing MF_TOPONODE_PRESENTATION_DESCRIPTOR, hr %#lx.\n", hr); + IMFTopologyNode_Release(node); + return MF_E_TOPO_MISSING_PRESENTATION_DESCRIPTOR; + } + + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, + &IID_IMFStreamDescriptor, (void **)&sd))) + { + WARN("Missing MF_TOPONODE_STREAM_DESCRIPTOR, hr %#lx.\n", hr); + IMFPresentationDescriptor_Release(pd); + IMFTopologyNode_Release(node); + return MF_E_TOPO_MISSING_STREAM_DESCRIPTOR; + } + + hr = session_check_stream_descriptor(pd, sd); + IMFPresentationDescriptor_Release(pd); + IMFStreamDescriptor_Release(sd); + if (FAILED(hr)) + { + IMFTopologyNode_Release(node); + return hr; + } + + break; + } + + default: + break; + } + + IMFTopologyNode_Release(node); + } + + return hr; +} + static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) { struct media_session *session = impl_from_IMFMediaSession(iface); struct session_op *op; - WORD node_count = 0; HRESULT hr; TRACE("%p, %#lx, %p.\n", iface, flags, topology); - if (topology) - { - if (FAILED(IMFTopology_GetNodeCount(topology, &node_count)) || node_count == 0) - return E_INVALIDARG; - } + if (FAILED(hr = session_check_topology(topology))) + return hr; if (FAILED(hr = create_session_op(SESSION_CMD_SET_TOPOLOGY, &op))) return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 004f7b50f59..ba4afddc7d2 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2145,29 +2145,13 @@ static void test_media_session_events(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_SetTopology(session, 0, topology); - todo_wine ok(hr == MF_E_TOPO_MISSING_SOURCE, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { - hr = wait_media_event(session, callback, MESessionTopologySet, 1000, &propvar); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - PropVariantClear(&propvar); - handler.enum_count = handler.set_current_count = 0; - } source = create_test_source(pd); init_source_node(source, -1, src_node, pd, sd); hr = IMFMediaSession_SetTopology(session, 0, topology); - todo_wine ok(hr == MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { - hr = wait_media_event(session, callback, MESessionTopologySet, 1000, &propvar); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - PropVariantClear(&propvar); - handler.enum_count = handler.set_current_count = 0; - } hr = IMFMediaSession_ClearTopologies(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2177,7 +2161,6 @@ static void test_media_session_events(void) hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!media_sink.shutdown, "media sink is shutdown.\n"); media_sink.shutdown = FALSE;

1 0

Rémi Bernon : mf: Always enumerate branch source types for transform nodes.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 616ae1e38d15672a0ab59a35c1578713718d3229 URL: https://gitlab.winehq.org/wine/wine/-/commit/616ae1e38d15672a0ab59a35c15787… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 3 17:34:14 2022 +0200 mf: Always enumerate branch source types for transform nodes. --- dlls/mf/tests/mf.c | 6 +++--- dlls/mf/topology_loader.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c9f8fe96f8b..004f7b50f59 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2986,13 +2986,13 @@ static void test_topology_loader(void) /* Float -> PCM, refuse input type, add converter */ .input_type = &audio_float_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_DIRECT, .source_method = -1, .expected_result = MF_E_NO_MORE_TYPES, - .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER, }, { /* Float -> PCM, refuse input type, add converter, allow resampler output type */ .input_type = &audio_float_44100, .output_type = &audio_pcm_48000_resampler, .sink_method = MF_CONNECT_DIRECT, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER, }, { @@ -3449,7 +3449,7 @@ todo_wine { else ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); - todo_wine_if((test->flags & LOADER_NO_CURRENT_OUTPUT) && !(test->flags & LOADER_SET_MEDIA_TYPES)) + todo_wine_if(test->flags & LOADER_NO_CURRENT_OUTPUT) ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); if (handler.current_type) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index ab694379237..0c42a93511b 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -498,7 +498,7 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch)); else hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, - branch, enumerate_source_types); + branch, enumerate_source_types || node_type == MF_TOPOLOGY_TRANSFORM_NODE); topology_branch_destroy(branch); if (FAILED(hr))

1 0

Alex Henrie : uuid: Add propkey.h.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 08ec06da5423498ff0515d1659eb774b7731e36c URL: https://gitlab.winehq.org/wine/wine/-/commit/08ec06da5423498ff0515d1659eb77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 7 21:32:00 2022 -0700 uuid: Add propkey.h. Needed to compile Tera Term. --- dlls/dsound/dsound_main.c | 3 ++- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/mmdevdrv.c | 2 +- libs/uuid/uuid.c | 1 + programs/winecfg/audio.c | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 215588393d8..69cbec72ea3 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -55,10 +55,11 @@ #include "oleidl.h" #include "shobjidl.h" #include "strmif.h" +#include "propkey.h" #include "initguid.h" +#include "propkeydef.h" #include "ksmedia.h" -#include "propkey.h" #include "devpkey.h" #include "dsound_private.h" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 99dd45c7638..20a27d501d3 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -28,9 +28,9 @@ #include "winreg.h" #include "winternl.h" #include "propsys.h" +#include "propkey.h" #include "initguid.h" #include "ole2.h" -#include "propkey.h" #include "mmdeviceapi.h" #include "devpkey.h" #include "mmsystem.h" diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index d8bfdc80cd8..6e138ac4529 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -36,11 +36,11 @@ #include "dshow.h" #include "dsound.h" #include "propsys.h" +#include "propkey.h" #include "initguid.h" #include "ks.h" #include "ksmedia.h" -#include "propkey.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "endpointvolume.h" diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c index 1ba0397414e..ce97520eee0 100644 --- a/libs/uuid/uuid.c +++ b/libs/uuid/uuid.c @@ -92,6 +92,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" #include "devguid.h" +#include "propkey.h" #define __WINE_INIT_NPI_MODULEID #include "netiodef.h" diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index cd73703a0dd..3387e5843a0 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -40,8 +40,9 @@ #include <mmddk.h> #include "ole2.h" -#include "initguid.h" #include "propkey.h" +#include "initguid.h" +#include "propkeydef.h" #include "devpkey.h" #include "mmdeviceapi.h" #include "audioclient.h"

1 0

Brendan Shanks : winealsa: Set name of internal threads.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: cf978c9a94866fda4de77fb9458213e760b5bc4c URL: https://gitlab.winehq.org/wine/wine/-/commit/cf978c9a94866fda4de77fb9458213… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 2 14:52:10 2022 -0700 winealsa: Set name of internal threads. --- dlls/winealsa.drv/midi.c | 2 ++ dlls/winealsa.drv/mmdevdrv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 81d8312d237..1c441161d7e 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -114,6 +114,8 @@ static DWORD WINAPI notify_thread(void *p) struct notify_context notify; BOOL quit; + SetThreadDescription(GetCurrentThread(), L"winealsa_midi_notify"); + params.notify = &notify; params.quit = &quit; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 03499a3e40e..99dd45c7638 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -238,6 +238,8 @@ static DWORD WINAPI alsa_timer_thread(void *user) struct timer_loop_params params; struct ACImpl *This = user; + SetThreadDescription(GetCurrentThread(), L"winealsa_timer"); + params.stream = This->stream; ALSA_CALL(timer_loop, &params);

1 0

Brendan Shanks : winepulse: Set name of internal threads.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: de2483e255081adbc1e9a33c34f0e168e78b4563 URL: https://gitlab.winehq.org/wine/wine/-/commit/de2483e255081adbc1e9a33c34f0e1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 18 12:02:04 2022 -0700 winepulse: Set name of internal threads. --- dlls/winepulse.drv/mmdevdrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index d1d9eee068b..d8bfdc80cd8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -234,6 +234,7 @@ static DWORD CALLBACK pulse_mainloop_thread(void *event) { struct main_loop_params params; params.event = event; + SetThreadDescription(GetCurrentThread(), L"winepulse_mainloop"); pulse_call(main_loop, &params); return 0; } @@ -359,6 +360,7 @@ static DWORD WINAPI pulse_timer_cb(void *user) struct timer_loop_params params; ACImpl *This = user; params.stream = This->pulse_stream; + SetThreadDescription(GetCurrentThread(), L"winepulse_timer_loop"); pulse_call(timer_loop, &params); return 0; }

1 0

Brendan Shanks : dsound: Set name of internal threads.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 28b6acd155fbf4fb24a601d9c9adb8addd4c4b79 URL: https://gitlab.winehq.org/wine/wine/-/commit/28b6acd155fbf4fb24a601d9c9adb8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 2 14:23:35 2022 -0700 dsound: Set name of internal threads. --- dlls/dsound/capture.c | 2 ++ dlls/dsound/mixer.c | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2c3dd83e86d..6ddae8286cd 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -951,6 +951,8 @@ static DWORD WINAPI DSOUND_capture_thread(void *user) DWORD ret, wait_ms; REFERENCE_TIME period; + SetThreadDescription(GetCurrentThread(), L"wine_dsound_capture"); + hr = IAudioClient_GetDevicePeriod(buffer->device->client, &period, NULL); if(FAILED(hr)){ WARN("GetDevicePeriod failed: %08lx\n", hr); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 05b2bfbf8c3..5d5c4981fa2 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -783,6 +783,7 @@ DWORD CALLBACK DSOUND_mixthread(void *p) { DirectSoundDevice *dev = p; TRACE("(%p)\n", dev); + SetThreadDescription(GetCurrentThread(), L"wine_dsound_mixer"); while (dev->ref) { DWORD ret;

1 0

Alexandre Julliard : kernelbase: Update timezone data to version 2022f.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 8f8127390423b65b5861122ec4a9d8136ba796b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f8127390423b65b5861122ec4a9d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 12:25:32 2022 +0100 kernelbase: Update timezone data to version 2022f. --- dlls/kernelbase/kernelbase.rgs | 134 ++++++++++++++++++++++++++++------------- tools/make_unicode | 4 +- 2 files changed, 93 insertions(+), 45 deletions(-)

1 0

Alexandre Julliard : nls: Update locale data to CLDR version 42.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 198de0dcb8a4268d555452382e8c15c558e6d2cf URL: https://gitlab.winehq.org/wine/wine/-/commit/198de0dcb8a4268d555452382e8c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 11:48:36 2022 +0100 nls: Update locale data to CLDR version 42. --- nls/locale.nls | Bin 738786 -> 742598 bytes tools/make_unicode | 17 +++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 9ad47b1872e..22f96a93b24 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 165afe53b62..d651c850c95 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,7 +26,7 @@ use Encode; use Time::Local qw(timegm_modern); my $UNIVERSION = "15.0.0"; -my $CLDRVERSION = "41"; +my $CLDRVERSION = "42"; my $ISO639VERSION = "20220120"; my $TZVERSION = "2022a"; @@ -39,7 +39,7 @@ my %data_files = idna => { url => "https://www.unicode.org/Public/idna/$UNIVERSION/IdnaMappingTable.txt", name => "IdnaMappingTable-$UNIVERSION.txt", sha => "cc8522199541d60326a42a8f91f8748fd15630a42502dd2cf4878e81e2066ead" }, cldr => { url => "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.…", - sha => "a2b7aee281ad2f497d47995808cf5e8f24123b0814ca47f7a824556aec8a0d91" }, + sha => "275c37b1373a1c8461c14d2fe9e3b7b47ba24ea89e3fdd2dedfe0547ab2f07dc" }, cldr33 => { url => "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip", sha => "fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9" }, sorting => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6… 10 Sorting Weight Table.txt", @@ -1156,8 +1156,8 @@ my @locales = { name => "nus-SS" }, { name => "nyn", sopentypelang => "NKL" }, { name => "nyn-UG" }, - { name => "oc", lcid => 0x00000082, oemcp => 850, ebcdiccp => 20297, dir => "seed" }, - { name => "oc-FR", lcid => 0x00000482, dir => "seed" }, + { name => "oc", lcid => 0x00000082, oemcp => 850, ebcdiccp => 20297 }, + { name => "oc-FR", lcid => 0x00000482 }, { name => "oc-Latn", alias => "oc" }, { name => "oc-Latn-FR", alias => "oc-FR" }, { name => "om", lcid => 0x00000072, sopentypelang => "ORO" }, @@ -1309,8 +1309,8 @@ my @locales = { name => "smn-FI", lcid => 0x0000243b }, { name => "smn-Latn", alias => "smn" }, { name => "smn-Latn-FI", alias => "smn-FI" }, - { name => "sms", lcid => 0x0000743b, sparent => "se", ebcdiccp => 20278, dir => "seed", sopentypelang => "SKS" }, - { name => "sms-FI", lcid => 0x0000203b, dir => "seed" }, + { name => "sms", lcid => 0x0000743b, sparent => "se", ebcdiccp => 20278, sopentypelang => "SKS" }, + { name => "sms-FI", lcid => 0x0000203b }, { name => "sms-Latn", alias => "sms" }, { name => "sms-Latn-FI", alias => "sms-FI" }, { name => "sn", sopentypelang => "SNA0" }, @@ -4404,6 +4404,7 @@ sub convert_time_format($) my $fmt = shift; $fmt =~ s/a+/tt/; $fmt =~ s/B+/tt/; + $fmt =~ s/\x{202f}/ /; return $fmt; } @@ -4720,8 +4721,8 @@ sub build_locale_data() my $sneginfinity = $sposinfinity ? "-$sposinfinity" : ""; my $sgrouping = format_to_grouping( loc_query( $loc, "/ldml/numbers/decimalFormats[\@numberSystem='latn']/decimalFormatLength[not(\@type)]/decimalFormat/pattern" )); my $percentformat = loc_query( $loc, "/ldml/numbers/percentFormats[\@numberSystem='latn']/percentFormatLength[not(\@type)]/percentFormat/pattern" ); - my $currencyformat = loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='accounting']/pattern" ) || - loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='standard']/pattern" ); + my $currencyformat = loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='accounting']/pattern[not(\@alt)]" ) || + loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='standard']/pattern[not(\@alt)]" ); my $smongrouping = format_to_grouping( $currencyformat ); my ($icurrency, $inegcurr) = parse_currency_format( $sname, $currencyformat ); my ($ipospercent, $inegpercent) = parse_percent_format( $percentformat );

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.37.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 162acdaed08a869e11ee284b641a789c3c83f098 URL: https://gitlab.winehq.org/wine/wine/-/commit/162acdaed08a869e11ee284b641a78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 11:05:50 2022 +0100 xslt: Import upstream release 1.1.37. --- libs/xslt/libxslt/functions.c | 12 ++++++++---- libs/xslt/libxslt/keys.c | 2 +- libs/xslt/libxslt/numbers.c | 14 ++++++++++---- libs/xslt/libxslt/pattern.c | 22 +++++++++++----------- libs/xslt/libxslt/transform.c | 4 ++-- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/libs/xslt/libxslt/functions.c b/libs/xslt/libxslt/functions.c index fa8b6d93b20..ed2b002362d 100644 --- a/libs/xslt/libxslt/functions.c +++ b/libs/xslt/libxslt/functions.c @@ -608,7 +608,8 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) switch (nargs) { case 3: - CAST_TO_STRING; + if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING)) + xmlXPathStringFunction(ctxt, 1); decimalObj = valuePop(ctxt); ncname = xsltSplitQName(sheet->dict, decimalObj->stringval, &prefix); if (prefix != NULL) { @@ -634,13 +635,16 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) } /* Intentional fall-through */ case 2: - CAST_TO_STRING; + if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING)) + xmlXPathStringFunction(ctxt, 1); formatObj = valuePop(ctxt); - CAST_TO_NUMBER; + if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_NUMBER)) + xmlXPathNumberFunction(ctxt, 1); numberObj = valuePop(ctxt); break; default: - XP_ERROR(XPATH_INVALID_ARITY); + xmlXPathErr(ctxt, XPATH_INVALID_ARITY); + return; } if (formatValues != NULL) { diff --git a/libs/xslt/libxslt/keys.c b/libs/xslt/libxslt/keys.c index ecef5382638..ca0779c5be2 100644 --- a/libs/xslt/libxslt/keys.c +++ b/libs/xslt/libxslt/keys.c @@ -310,7 +310,7 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name, current = end = 0; while (match[current] != 0) { start = current; - while (IS_BLANK_CH(match[current])) + while (xmlIsBlank_ch(match[current])) current++; end = current; while ((match[end] != 0) && (match[end] != '|')) { diff --git a/libs/xslt/libxslt/numbers.c b/libs/xslt/libxslt/numbers.c index 4cb21254f4f..9c74f0d48d5 100644 --- a/libs/xslt/libxslt/numbers.c +++ b/libs/xslt/libxslt/numbers.c @@ -92,6 +92,12 @@ xsltUTF8Charcmp(xmlChar *utf1, xmlChar *utf2) { return xmlStrncmp(utf1, utf2, len); } +static int +xsltIsLetterDigit(int val) { + return xmlIsBaseCharQ(val) || xmlIsIdeographicQ(val) || + xmlIsDigitQ(val); +} + /***** Stop temp insert *****/ /************************************************************************ * * @@ -347,8 +353,8 @@ xsltNumberFormatTokenize(const xmlChar *format, * Insert initial non-alphanumeric token. * There is always such a token in the list, even if NULL */ - while (! (IS_LETTER(val=xmlStringCurrentChar(NULL, format+ix, &len)) || - IS_DIGIT(val)) ) { + while (!xsltIsLetterDigit(val = xmlStringCurrentChar(NULL, format+ix, + &len))) { if (format[ix] == 0) /* if end of format string */ break; /* while */ ix += len; @@ -414,7 +420,7 @@ xsltNumberFormatTokenize(const xmlChar *format, * to correspond to the Letter and Digit classes from XML (and * one wonders why XSLT doesn't refer to these instead). */ - while (IS_LETTER(val) || IS_DIGIT(val)) { + while (xsltIsLetterDigit(val)) { ix += len; val = xmlStringCurrentChar(NULL, format+ix, &len); } @@ -423,7 +429,7 @@ xsltNumberFormatTokenize(const xmlChar *format, * Insert temporary non-alphanumeric final tooken. */ j = ix; - while (! (IS_LETTER(val) || IS_DIGIT(val))) { + while (!xsltIsLetterDigit(val)) { if (val == 0) break; /* while */ ix += len; diff --git a/libs/xslt/libxslt/pattern.c b/libs/xslt/libxslt/pattern.c index 1944661c7f3..da3444f230e 100644 --- a/libs/xslt/libxslt/pattern.c +++ b/libs/xslt/libxslt/pattern.c @@ -1192,7 +1192,7 @@ xsltCompMatchClearCache(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp) { #define CUR_PTR ctxt->cur #define SKIP_BLANKS \ - while (IS_BLANK_CH(CUR)) NEXT + while (xmlIsBlank_ch(CUR)) NEXT #define CURRENT (*ctxt->cur) #define NEXT ((*ctxt->cur) ? ctxt->cur++: ctxt->cur) @@ -1235,11 +1235,11 @@ xsltScanLiteral(xsltParserContextPtr ctxt) { NEXT; cur = q = CUR_PTR; val = xmlStringCurrentChar(NULL, cur, &len); - while ((IS_CHAR(val)) && (val != '"')) { + while ((xmlIsCharQ(val)) && (val != '"')) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } - if (!IS_CHAR(val)) { + if (!xmlIsCharQ(val)) { ctxt->error = 1; return(NULL); } else { @@ -1251,11 +1251,11 @@ xsltScanLiteral(xsltParserContextPtr ctxt) { NEXT; cur = q = CUR_PTR; val = xmlStringCurrentChar(NULL, cur, &len); - while ((IS_CHAR(val)) && (val != '\'')) { + while ((xmlIsCharQ(val)) && (val != '\'')) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } - if (!IS_CHAR(val)) { + if (!xmlIsCharQ(val)) { ctxt->error = 1; return(NULL); } else { @@ -1264,7 +1264,6 @@ xsltScanLiteral(xsltParserContextPtr ctxt) { cur += len; CUR_PTR = cur; } else { - /* XP_ERROR(XPATH_START_LITERAL_ERROR); */ ctxt->error = 1; return(NULL); } @@ -1290,14 +1289,15 @@ xsltScanNCName(xsltParserContextPtr ctxt) { cur = q = CUR_PTR; val = xmlStringCurrentChar(NULL, cur, &len); - if (!IS_LETTER(val) && (val != '_')) + if (!xmlIsBaseCharQ(val) && !xmlIsIdeographicQ(val) && (val != '_')) return(NULL); - while ((IS_LETTER(val)) || (IS_DIGIT(val)) || + while (xmlIsBaseCharQ(val) || xmlIsIdeographicQ(val) || + xmlIsDigitQ(val) || (val == '.') || (val == '-') || (val == '_') || - (IS_COMBINING(val)) || - (IS_EXTENDER(val))) { + xmlIsCombiningQ(val) || + xmlIsExtenderQ(val)) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } @@ -1853,7 +1853,7 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc, current = end = 0; while (pattern[current] != 0) { start = current; - while (IS_BLANK_CH(pattern[current])) + while (xmlIsBlank_ch(pattern[current])) current++; end = current; level = 0; diff --git a/libs/xslt/libxslt/transform.c b/libs/xslt/libxslt/transform.c index 2d8fd7f9abd..cb43bb47d99 100644 --- a/libs/xslt/libxslt/transform.c +++ b/libs/xslt/libxslt/transform.c @@ -3637,12 +3637,12 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node, element = elements; while (*element != 0) { - while (IS_BLANK_CH(*element)) + while (xmlIsBlank_ch(*element)) element++; if (*element == 0) break; end = element; - while ((*end != 0) && (!IS_BLANK_CH(*end))) + while ((*end != 0) && (!xmlIsBlank_ch(*end))) end++; element = xmlStrndup(element, end - element); if (element) {

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 November 2022