July 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : wininet/tests: Update issuer check for winehq.org certificate.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 839839b36e7738eb6d5cfb0db82e746fc3204dae URL: https://gitlab.winehq.org/wine/wine/-/commit/839839b36e7738eb6d5cfb0db82e74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 22:00:33 2024 +0200 wininet/tests: Update issuer check for winehq.org certificate. --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 705f89f28ba..c63e44a6841 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6786,7 +6786,6 @@ static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" "Let's Encrypt\r\n" - "R3" }; static const cert_struct_test_t test_winehq_com_cert = { @@ -6879,7 +6878,7 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(size == sizeof(info), "size = %lu\n", size); ok(!strcmp(info.lpszSubjectInfo, test->ex_subject), "lpszSubjectInfo = %s\n", info.lpszSubjectInfo); - ok(!strcmp(info.lpszIssuerInfo, test->ex_issuer), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); + ok(!strncmp(info.lpszIssuerInfo, test->ex_issuer, strlen(test->ex_issuer)), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName);

1 0

Ziqing Hui : winegstreamer/video_encoder: Use MF_ATTRIBUTES_MATCH_INTERSECTION to compare input type.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 40c0dd65b071939c30137c1c820720d32d28d949 URL: https://gitlab.winehq.org/wine/wine/-/commit/40c0dd65b071939c30137c1c820720… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 9 10:33:58 2024 +0800 winegstreamer/video_encoder: Use MF_ATTRIBUTES_MATCH_INTERSECTION to compare input type. MF_MT_INTERLACE_MODE, MF_MT_VIDEO_NOMINAL_RANGE and MF_MT_PIXEL_ASPECT_RATIO are not required in input type. However, if they appears, they should match output type. --- dlls/winegstreamer/video_encoder.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index ee27175ee4f..1bfe26261af 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -280,6 +280,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM struct video_encoder *encoder = impl_from_IMFTransform(iface); IMFMediaType *good_input_type; GUID major, subtype; + UINT64 ratio; BOOL result; HRESULT hr; ULONG i; @@ -317,10 +318,14 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (i == encoder->input_type_count) return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &ratio)) + || FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &ratio))) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(hr = video_encoder_create_input_type(encoder, &subtype, &good_input_type))) return hr; hr = IMFMediaType_Compare(good_input_type, (IMFAttributes *)type, - MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + MF_ATTRIBUTES_MATCH_INTERSECTION, &result); IMFMediaType_Release(good_input_type); if (FAILED(hr) || !result) return MF_E_INVALIDMEDIATYPE;

1 0

Ziqing Hui : winegstreamer/wg_transform: Introduce transform_create_decoder_elements.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: ce431f9e3fce416d3e1d3506a16f1c578a9630fc URL: https://gitlab.winehq.org/wine/wine/-/commit/ce431f9e3fce416d3e1d3506a16f1c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jul 5 11:10:48 2024 +0800 winegstreamer/wg_transform: Introduce transform_create_decoder_elements. --- dlls/winegstreamer/wg_transform.c | 80 ++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 76dbd347064..8b710e68e70 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -468,11 +468,55 @@ static GstCaps *transform_get_parsed_caps(GstCaps *caps, const char *media_type) return parsed_caps; } +static bool transform_create_decoder_elements(struct wg_transform *transform, + const gchar *input_mime, const gchar *output_mime, GstElement **first, GstElement **last) +{ + GstCaps *parsed_caps = NULL, *sink_caps = NULL; + GstElement *element; + bool ret = false; + + if (!strcmp(input_mime, "audio/x-raw") || !strcmp(input_mime, "video/x-raw")) + return true; + + if (!(parsed_caps = transform_get_parsed_caps(transform->input_caps, input_mime))) + return false; + + /* Since we append conversion elements, we don't want to filter decoders + * based on the actual output caps now. Matching decoders with the + * raw output media type should be enough. + */ + if (!(sink_caps = gst_caps_new_empty_simple(output_mime))) + goto done; + + if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, transform->input_caps, parsed_caps)) + && !append_element(transform->container, element, first, last)) + goto done; + else if (!element) + { + gst_caps_unref(parsed_caps); + parsed_caps = gst_caps_ref(transform->input_caps); + } + + if (!(element = find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, parsed_caps, sink_caps)) + || !append_element(transform->container, element, first, last)) + goto done; + + set_max_threads(element); + + ret = true; + +done: + if (sink_caps) + gst_caps_unref(sink_caps); + if (parsed_caps) + gst_caps_unref(parsed_caps); + return ret; +} + NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; GstElement *first = NULL, *last = NULL, *element; - GstCaps *sink_caps = NULL, *parsed_caps = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; const gchar *input_mime, *output_mime; GstPadTemplate *template = NULL; @@ -531,34 +575,9 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_query_function(transform->my_sink, transform_sink_query_cb); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); - if (!(parsed_caps = transform_get_parsed_caps(transform->input_caps, input_mime))) - goto out; - - /* Since we append conversion elements, we don't want to filter decoders - * based on the actual output caps now. Matching decoders with the - * raw output media type should be enough. - */ - if (!(sink_caps = gst_caps_new_empty_simple(output_mime))) + if (!transform_create_decoder_elements(transform, input_mime, output_mime, &first, &last)) goto out; - if (strcmp(input_mime, "audio/x-raw") && strcmp(input_mime, "video/x-raw")) - { - if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, transform->input_caps, parsed_caps)) - && !append_element(transform->container, element, &first, &last)) - goto out; - else if (!element) - { - gst_caps_unref(parsed_caps); - parsed_caps = gst_caps_ref(transform->input_caps); - } - - if (!(element = find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, parsed_caps, sink_caps)) - || !append_element(transform->container, element, &first, &last)) - goto out; - - set_max_threads(element); - } - if (g_str_has_prefix(output_mime, "audio/")) { if (strcmp(output_mime, "audio/x-raw")) @@ -632,9 +651,6 @@ NTSTATUS wg_transform_create(void *args) || !push_event(transform->my_src, event)) goto out; - gst_caps_unref(parsed_caps); - gst_caps_unref(sink_caps); - GST_INFO("Created winegstreamer transform %p.", transform); params->transform = (wg_transform_t)(ULONG_PTR)transform; return STATUS_SUCCESS; @@ -650,10 +666,6 @@ out: gst_object_unref(transform->my_src); if (transform->input_caps) gst_caps_unref(transform->input_caps); - if (parsed_caps) - gst_caps_unref(parsed_caps); - if (sink_caps) - gst_caps_unref(sink_caps); if (transform->allocator) wg_allocator_destroy(transform->allocator); if (transform->drain_query)

1 0

Ziqing Hui : winegstreamer/video_encoder: Set output info cbSize in SetOutputType.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: c50ab1119371e41f8ed98242e8a94d9551cdbe2e URL: https://gitlab.winehq.org/wine/wine/-/commit/c50ab1119371e41f8ed98242e8a94d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 9 10:45:52 2024 +0800 winegstreamer/video_encoder: Set output info cbSize in SetOutputType. --- dlls/winegstreamer/video_encoder.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 1bfe26261af..e15c799d81f 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -367,6 +367,7 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF { IMFMediaType_Release(encoder->output_type); encoder->output_type = NULL; + memset(&encoder->output_info, 0, sizeof(encoder->output_info)); } if (encoder->wg_transform) { @@ -412,6 +413,11 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF /* FIXME: Add MF_MT_MPEG_SEQUENCE_HEADER attribute. */ + /* FIXME: Hardcode a size that native uses for 1920 * 1080. + * And hope it's large enough to make things work for now. + * The right way is to calculate it based on frame width and height. */ + encoder->output_info.cbSize = 0x3bc400; + if (encoder->wg_transform) { wg_transform_destroy(encoder->wg_transform); @@ -627,10 +633,6 @@ HRESULT h264_encoder_create(REFIID riid, void **out) h264_encoder_output_types, ARRAY_SIZE(h264_encoder_output_types), &encoder))) return hr; - /* FIXME: Hardcode a size that is large enough to make things work for now. - * The right way is to calculate the size based on output frame size. */ - encoder->output_info.cbSize = 0x3bc400; - TRACE("Created h264 encoder transform %p.\n", &encoder->IMFTransform_iface); hr = IMFTransform_QueryInterface(&encoder->IMFTransform_iface, riid, out);

1 0

Ziqing Hui : winegstreamer/wg_transform: Introduce transform_create_converter_elements.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: f6168343815296a93c11ebe5944ed509b950005c URL: https://gitlab.winehq.org/wine/wine/-/commit/f6168343815296a93c11ebe5944ed5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jul 5 11:19:05 2024 +0800 winegstreamer/wg_transform: Introduce transform_create_converter_elements. --- dlls/winegstreamer/wg_transform.c | 100 +++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 45 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 8b710e68e70..a30a773ca1e 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -513,10 +513,62 @@ done: return ret; } +static bool transform_create_converter_elements(struct wg_transform *transform, + const gchar *output_mime, GstElement **first, GstElement **last) +{ + GstElement *element; + + if (g_str_has_prefix(output_mime, "audio/")) + { + if (strcmp(output_mime, "audio/x-raw")) + { + GST_FIXME("output caps %"GST_PTR_FORMAT" not implemented!", transform->output_caps); + return false; + } + else + { + /* The MF audio decoder transforms allow decoding to various formats + * as well as resampling the audio at the same time, whereas + * GStreamer decoder plugins usually only support decoding to a + * single format and at the original rate. + * + * The WMA decoder transform also has output samples interleaved on + * Windows, whereas GStreamer avdec_wmav2 output uses + * non-interleaved format. + */ + if (!(element = create_element("audioconvert", "base")) + || !append_element(transform->container, element, first, last)) + return false; + if (!(element = create_element("audioresample", "base")) + || !append_element(transform->container, element, first, last)) + return false; + } + } + + if (g_str_has_prefix(output_mime, "video/")) + { + if (strcmp(output_mime, "video/x-raw")) + { + GST_FIXME("output caps %"GST_PTR_FORMAT" not implemented!", transform->output_caps); + return false; + } + else + { + if (!(element = create_element("videoconvert", "base")) + || !append_element(transform->container, element, first, last)) + return false; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); + } + } + + return true; +} + NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; - GstElement *first = NULL, *last = NULL, *element; + GstElement *first = NULL, *last = NULL; NTSTATUS status = STATUS_UNSUCCESSFUL; const gchar *input_mime, *output_mime; GstPadTemplate *template = NULL; @@ -577,50 +629,8 @@ NTSTATUS wg_transform_create(void *args) if (!transform_create_decoder_elements(transform, input_mime, output_mime, &first, &last)) goto out; - - if (g_str_has_prefix(output_mime, "audio/")) - { - if (strcmp(output_mime, "audio/x-raw")) - { - GST_FIXME("output caps %"GST_PTR_FORMAT" not implemented!", transform->output_caps); - goto out; - } - else - { - /* The MF audio decoder transforms allow decoding to various formats - * as well as resampling the audio at the same time, whereas - * GStreamer decoder plugins usually only support decoding to a - * single format and at the original rate. - * - * The WMA decoder transform also has output samples interleaved on - * Windows, whereas GStreamer avdec_wmav2 output uses - * non-interleaved format. - */ - if (!(element = create_element("audioconvert", "base")) - || !append_element(transform->container, element, &first, &last)) - goto out; - if (!(element = create_element("audioresample", "base")) - || !append_element(transform->container, element, &first, &last)) - goto out; - } - } - - if (g_str_has_prefix(output_mime, "video/")) - { - if (strcmp(output_mime, "video/x-raw")) - { - GST_FIXME("output caps %"GST_PTR_FORMAT" not implemented!", transform->output_caps); - goto out; - } - else - { - if (!(element = create_element("videoconvert", "base")) - || !append_element(transform->container, element, &first, &last)) - goto out; - /* Let GStreamer choose a default number of threads. */ - gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); - } - } + if (!transform_create_converter_elements(transform, output_mime, &first, &last)) + goto out; if (!link_src_to_element(transform->my_src, first)) goto out;

1 0

Alexandre Julliard : ntdll: Implement ProcessPendingCrossProcessEmulatorWork on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 81e680e87dd9e4d53728b4693ba56ed909fcd5bd URL: https://gitlab.winehq.org/wine/wine/-/commit/81e680e87dd9e4d53728b4693ba56e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:36:39 2024 +0200 ntdll: Implement ProcessPendingCrossProcessEmulatorWork on ARM64EC. Copied from the corresponding code in wow64.dll. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm64ec.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9147cdca3cd..78afe2f49f5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -460,6 +460,7 @@ @ stub PfxInitialize @ stub PfxInsertPrefix @ stub PfxRemovePrefix +@ stdcall -arch=arm64ec ProcessPendingCrossProcessEmulatorWork() # @ stub PropertyLengthAsVariant @ stub RtlAbortRXact @ stdcall RtlAbsoluteToSelfRelativeSD(ptr ptr ptr) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index b4938bfab2e..b5ecb643bdb 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -42,7 +42,9 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ static void (WINAPI *pBTCpu64FlushInstructionCache)(const void*,SIZE_T); static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); +static void (WINAPI *pBTCpu64NotifyMemoryDirty)(void*,SIZE_T); static void (WINAPI *pBTCpu64NotifyReadFile)(HANDLE,void*,SIZE_T,BOOL,NTSTATUS); +static void (WINAPI *pFlushInstructionCacheHeavy)(const void*,SIZE_T); static NTSTATUS (WINAPI *pNotifyMapViewOfSection)(void*,void*,void*,SIZE_T,ULONG,ULONG); static void (WINAPI *pNotifyMemoryAlloc)(void*,SIZE_T,ULONG,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyMemoryFree)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); @@ -151,7 +153,9 @@ NTSTATUS arm64ec_process_init( HMODULE module ) #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) GET_PTR( BTCpu64FlushInstructionCache ); GET_PTR( BTCpu64IsProcessorFeaturePresent ); + GET_PTR( BTCpu64NotifyMemoryDirty ); GET_PTR( BTCpu64NotifyReadFile ); + GET_PTR( FlushInstructionCacheHeavy ); GET_PTR( NotifyMapViewOfSection ); GET_PTR( NotifyMemoryAlloc ); GET_PTR( NotifyMemoryFree ); @@ -162,6 +166,9 @@ NTSTATUS arm64ec_process_init( HMODULE module ) GET_PTR( UpdateProcessorInformation ); #undef GET_PTR + info->NativeMachineType = IMAGE_FILE_MACHINE_ARM64; + info->EmulatedMachineType = IMAGE_FILE_MACHINE_AMD64; + if (pProcessInit) status = pProcessInit(); if (!status) { @@ -706,6 +713,74 @@ static NTSTATUS WINAPI LdrpSetX64Information( ULONG type, ULONG_PTR input, void } +/********************************************************************** + * ProcessPendingCrossProcessEmulatorWork (ntdll.@) + */ +void WINAPI ProcessPendingCrossProcessEmulatorWork(void) +{ + struct arm64ec_shared_info *info = (struct arm64ec_shared_info *)(RtlGetCurrentPeb() + 1); + CROSS_PROCESS_WORK_LIST *list = (void *)info->CrossProcessWorkList; + CROSS_PROCESS_WORK_ENTRY *entry; + BOOLEAN flush = FALSE; + UINT next; + + if (!list) return; + entry = RtlWow64PopAllCrossProcessWorkFromWorkList( &list->work_list, &flush ); + + if (flush) + { + if (pFlushInstructionCacheHeavy) pFlushInstructionCacheHeavy( NULL, 0 ); + while (entry) + { + next = entry->next; + RtlWow64PushCrossProcessWorkOntoFreeList( &list->free_list, entry ); + entry = next ? CROSS_PROCESS_LIST_ENTRY( &list->work_list, next ) : NULL; + } + return; + } + + while (entry) + { + switch (entry->id) + { + case CrossProcessPreVirtualAlloc: + case CrossProcessPostVirtualAlloc: + if (!pNotifyMemoryAlloc) break; + pNotifyMemoryAlloc( (void *)entry->addr, entry->size, entry->args[0], entry->args[1], + entry->id == CrossProcessPostVirtualAlloc, entry->args[2] ); + break; + case CrossProcessPreVirtualFree: + case CrossProcessPostVirtualFree: + if (!pNotifyMemoryFree) break; + pNotifyMemoryFree( (void *)entry->addr, entry->size, entry->args[0], + entry->id == CrossProcessPostVirtualFree, entry->args[1] ); + break; + case CrossProcessPreVirtualProtect: + case CrossProcessPostVirtualProtect: + if (!pNotifyMemoryProtect) break; + pNotifyMemoryProtect( (void *)entry->addr, entry->size, entry->args[0], + entry->id == CrossProcessPostVirtualProtect, entry->args[1] ); + break; + case CrossProcessFlushCache: + if (!pBTCpu64FlushInstructionCache) break; + pBTCpu64FlushInstructionCache( (void *)entry->addr, entry->size ); + break; + case CrossProcessFlushCacheHeavy: + if (!pFlushInstructionCacheHeavy) break; + pFlushInstructionCacheHeavy( (void *)entry->addr, entry->size ); + break; + case CrossProcessMemoryWrite: + if (!pBTCpu64NotifyMemoryDirty) break; + pBTCpu64NotifyMemoryDirty( (void *)entry->addr, entry->size ); + break; + } + next = entry->next; + RtlWow64PushCrossProcessWorkOntoFreeList( &list->free_list, entry ); + entry = next ? CROSS_PROCESS_LIST_ENTRY( &list->work_list, next ) : NULL; + } +} + + /********************************************************************** * virtual_unwind */

1 0

Alexandre Julliard : ntdll: Call the read file callback on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 8136f581c4b1967778965311716d2519e05f9c58 URL: https://gitlab.winehq.org/wine/wine/-/commit/8136f581c4b1967778965311716d25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:35:18 2024 +0200 ntdll: Call the read file callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 529d0cdaedb..b4938bfab2e 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ static void (WINAPI *pBTCpu64FlushInstructionCache)(const void*,SIZE_T); static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); +static void (WINAPI *pBTCpu64NotifyReadFile)(HANDLE,void*,SIZE_T,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pNotifyMapViewOfSection)(void*,void*,void*,SIZE_T,ULONG,ULONG); static void (WINAPI *pNotifyMemoryAlloc)(void*,SIZE_T,ULONG,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyMemoryFree)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); @@ -150,6 +151,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) GET_PTR( BTCpu64FlushInstructionCache ); GET_PTR( BTCpu64IsProcessorFeaturePresent ); + GET_PTR( BTCpu64NotifyReadFile ); GET_PTR( NotifyMapViewOfSection ); GET_PTR( NotifyMemoryAlloc ); GET_PTR( NotifyMemoryFree ); @@ -367,7 +369,7 @@ DEFINE_SYSCALL(NtQueueApcThread, (HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 DEFINE_SYSCALL(NtQueueApcThreadEx, (HANDLE handle, HANDLE reserve_handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_WRAPPED_SYSCALL(NtRaiseException, (EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *context, BOOL first_chance)) DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) -DEFINE_SYSCALL(NtReadFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key)) +DEFINE_WRAPPED_SYSCALL(NtReadFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadFileScatter, (HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadVirtualMemory, (HANDLE process, const void *addr, void *buffer, SIZE_T size, SIZE_T *bytes_read)) DEFINE_SYSCALL(NtRegisterThreadTerminatePort, (HANDLE handle)) @@ -609,6 +611,18 @@ NTSTATUS SYSCALL_API NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, return syscall_NtRaiseException( rec, &arm_ctx, first_chance ); } +NTSTATUS SYSCALL_API NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, void *buffer, ULONG length, + LARGE_INTEGER *offset, ULONG *key ) +{ + NTSTATUS status; + + if (pBTCpu64NotifyReadFile) pBTCpu64NotifyReadFile( handle, buffer, length, FALSE, 0 ); + status = syscall_NtReadFile( handle, event, apc, apc_user, io, buffer, length, offset, key ); + if (pBTCpu64NotifyReadFile) pBTCpu64NotifyReadFile( handle, buffer, length, TRUE, status ); + return status; +} + NTSTATUS SYSCALL_API NtSetContextThread( HANDLE handle, const CONTEXT *context ) { ARM64_NT_CONTEXT arm_ctx;

1 0

Alexandre Julliard : ntdll: Call the section map callbacks on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 7ede7821a38a03fe41bf408411f9852765eddc91 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ede7821a38a03fe41bf408411f985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:34:30 2024 +0200 ntdll: Call the section map callbacks on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 74 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 839bf3a1572..529d0cdaedb 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -42,9 +42,11 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ static void (WINAPI *pBTCpu64FlushInstructionCache)(const void*,SIZE_T); static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); +static NTSTATUS (WINAPI *pNotifyMapViewOfSection)(void*,void*,void*,SIZE_T,ULONG,ULONG); static void (WINAPI *pNotifyMemoryAlloc)(void*,SIZE_T,ULONG,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyMemoryFree)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyMemoryProtect)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); +static void (WINAPI *pNotifyUnmapViewOfSection)(void*,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); @@ -148,9 +150,11 @@ NTSTATUS arm64ec_process_init( HMODULE module ) #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) GET_PTR( BTCpu64FlushInstructionCache ); GET_PTR( BTCpu64IsProcessorFeaturePresent ); + GET_PTR( NotifyMapViewOfSection ); GET_PTR( NotifyMemoryAlloc ); GET_PTR( NotifyMemoryFree ); GET_PTR( NotifyMemoryProtect ); + GET_PTR( NotifyUnmapViewOfSection ); GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); GET_PTR( UpdateProcessorInformation ); @@ -293,8 +297,8 @@ DEFINE_SYSCALL(NtLockFile, (HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void DEFINE_SYSCALL(NtLockVirtualMemory, (HANDLE process, PVOID *addr, SIZE_T *size, ULONG unknown)) DEFINE_SYSCALL(NtMakePermanentObject, (HANDLE handle)) DEFINE_SYSCALL(NtMakeTemporaryObject, (HANDLE handle)) -DEFINE_SYSCALL(NtMapViewOfSection, (HANDLE handle, HANDLE process, PVOID *addr_ptr, ULONG_PTR zero_bits, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, SECTION_INHERIT inherit, ULONG alloc_type, ULONG protect)) -DEFINE_SYSCALL(NtMapViewOfSectionEx, (HANDLE handle, HANDLE process, PVOID *addr_ptr, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count)) +DEFINE_WRAPPED_SYSCALL(NtMapViewOfSection, (HANDLE handle, HANDLE process, PVOID *addr_ptr, ULONG_PTR zero_bits, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, SECTION_INHERIT inherit, ULONG alloc_type, ULONG protect)) +DEFINE_WRAPPED_SYSCALL(NtMapViewOfSectionEx, (HANDLE handle, HANDLE process, PVOID *addr_ptr, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count)) DEFINE_SYSCALL(NtNotifyChangeDirectoryFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *iosb, void *buffer, ULONG buffer_size, ULONG filter, BOOLEAN subtree)) DEFINE_SYSCALL(NtNotifyChangeKey, (HANDLE key, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG filter, BOOLEAN subtree, void *buffer, ULONG length, BOOLEAN async)) DEFINE_SYSCALL(NtNotifyChangeMultipleKeys, (HANDLE key, ULONG count, OBJECT_ATTRIBUTES *attr, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG filter, BOOLEAN subtree, void *buffer, ULONG length, BOOLEAN async)) @@ -425,8 +429,8 @@ DEFINE_SYSCALL(NtUnloadDriver, (const UNICODE_STRING *name)) DEFINE_SYSCALL(NtUnloadKey, (OBJECT_ATTRIBUTES *attr)) DEFINE_SYSCALL(NtUnlockFile, (HANDLE handle, IO_STATUS_BLOCK *io_status, LARGE_INTEGER *offset, LARGE_INTEGER *count, ULONG *key)) DEFINE_SYSCALL(NtUnlockVirtualMemory, (HANDLE process, PVOID *addr, SIZE_T *size, ULONG unknown)) -DEFINE_SYSCALL(NtUnmapViewOfSection, (HANDLE process, PVOID addr)) -DEFINE_SYSCALL(NtUnmapViewOfSectionEx, (HANDLE process, PVOID addr, ULONG flags)) +DEFINE_WRAPPED_SYSCALL(NtUnmapViewOfSection, (HANDLE process, PVOID addr)) +DEFINE_WRAPPED_SYSCALL(NtUnmapViewOfSectionEx, (HANDLE process, PVOID addr, ULONG flags)) DEFINE_SYSCALL(NtWaitForAlertByThreadId, (const void *address, const LARGE_INTEGER *timeout)) DEFINE_SYSCALL(NtWaitForDebugEvent, (HANDLE handle, BOOLEAN alertable, LARGE_INTEGER *timeout, DBGUI_WAIT_STATE_CHANGE *state)) DEFINE_SYSCALL(NtWaitForKeyedEvent, (HANDLE handle, const void *key, BOOLEAN alertable, const LARGE_INTEGER *timeout)) @@ -530,6 +534,46 @@ NTSTATUS SYSCALL_API NtGetContextThread( HANDLE handle, CONTEXT *context ) return status; } +static void notify_map_view_of_section( HANDLE handle, void *addr, SIZE_T size, ULONG alloc, + ULONG protect, NTSTATUS *ret_status ) +{ + SECTION_IMAGE_INFORMATION info; + NTSTATUS status; + + if (!pNotifyMapViewOfSection) return; + if (!NtCurrentTeb()->Tib.ArbitraryUserPointer) return; + if (NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL )) return; + status = pNotifyMapViewOfSection( NULL, addr, NULL, size, alloc, protect ); + if (NT_SUCCESS(status)) return; + NtUnmapViewOfSection( GetCurrentProcess(), addr ); + *ret_status = status; +} + +NTSTATUS SYSCALL_API NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_ptr, + ULONG_PTR zero_bits, SIZE_T commit_size, + const LARGE_INTEGER *offset, SIZE_T *size_ptr, + SECTION_INHERIT inherit, ULONG alloc_type, ULONG protect ) +{ + NTSTATUS status = syscall_NtMapViewOfSection( handle, process, addr_ptr, zero_bits, commit_size, + offset, size_ptr, inherit, alloc_type, protect ); + + if (NT_SUCCESS(status) && RtlIsCurrentProcess( process )) + notify_map_view_of_section( handle, *addr_ptr, *size_ptr, alloc_type, protect, &status ); + return status; +} + +NTSTATUS SYSCALL_API NtMapViewOfSectionEx( HANDLE handle, HANDLE process, PVOID *addr_ptr, + const LARGE_INTEGER *offset, SIZE_T *size_ptr, ULONG alloc_type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count ) +{ + NTSTATUS status = syscall_NtMapViewOfSectionEx( handle, process, addr_ptr, offset, size_ptr, + alloc_type, protect, parameters, count ); + + if (NT_SUCCESS(status) && RtlIsCurrentProcess( process )) + notify_map_view_of_section( handle, *addr_ptr, *size_ptr, alloc_type, protect, &status ); + return status; +} + NTSTATUS SYSCALL_API NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG new_prot, ULONG *old_prot ) { @@ -573,6 +617,28 @@ NTSTATUS SYSCALL_API NtSetContextThread( HANDLE handle, const CONTEXT *context ) return syscall_NtSetContextThread( handle, &arm_ctx ); } +NTSTATUS SYSCALL_API NtUnmapViewOfSection( HANDLE process, void *addr ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (is_current && pNotifyUnmapViewOfSection) pNotifyUnmapViewOfSection( addr, FALSE, 0 ); + status = syscall_NtUnmapViewOfSection( process, addr ); + if (is_current && pNotifyUnmapViewOfSection) pNotifyUnmapViewOfSection( addr, TRUE, status ); + return status; +} + +NTSTATUS SYSCALL_API NtUnmapViewOfSectionEx( HANDLE process, void *addr, ULONG flags ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (is_current && pNotifyUnmapViewOfSection) pNotifyUnmapViewOfSection( addr, FALSE, 0 ); + status = syscall_NtUnmapViewOfSectionEx( process, addr, flags ); + if (is_current && pNotifyUnmapViewOfSection) pNotifyUnmapViewOfSection( addr, TRUE, status ); + return status; +} + void * const arm64ec_syscalls[] = {

1 0

Alexandre Julliard : ntdll: Call the flush instruction cache callback on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 8ff25221ea72843b91d1b52a1dad140770b26263 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ff25221ea72843b91d1b52a1dad14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:24:54 2024 +0200 ntdll: Call the flush instruction cache callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 98817351f45..bcd903a3381 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -40,6 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ +static void (WINAPI *pBTCpu64FlushInstructionCache)(const void*,SIZE_T); static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); @@ -142,6 +143,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) __os_arm64x_dispatch_ret = RtlFindExportedRoutineByName( module, "RetToEntryThunk" ); #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) + GET_PTR( BTCpu64FlushInstructionCache ); GET_PTR( BTCpu64IsProcessorFeaturePresent ); GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); @@ -483,6 +485,8 @@ NTSTATUS SYSCALL_API NtFlushInstructionCache( HANDLE process, const void *addr, { if (!RtlIsCurrentProcess( process )) send_cross_process_notification( process, CrossProcessFlushCache, addr, size, 0 ); + else if (pBTCpu64FlushInstructionCache) + pBTCpu64FlushInstructionCache( addr, size ); } return status; }

1 0

Alexandre Julliard : ntdll: Call the processor information callback on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 145a2403efabbcc9f49c6436279ea90b86bd2921 URL: https://gitlab.winehq.org/wine/wine/-/commit/145a2403efabbcc9f49c6436279ea9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:23:50 2024 +0200 ntdll: Call the processor information callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index b48255678de..3abfd3a0f8a 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); +static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); static inline CHPE_V2_CPU_AREA_INFO *get_arm64ec_cpu_area(void) { @@ -140,6 +141,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); + GET_PTR( UpdateProcessorInformation ); #undef GET_PTR if (pProcessInit) status = pProcessInit(); @@ -332,7 +334,7 @@ DEFINE_SYSCALL(NtQuerySemaphore, (HANDLE handle, SEMAPHORE_INFORMATION_CLASS cla DEFINE_SYSCALL(NtQuerySymbolicLinkObject, (HANDLE handle, UNICODE_STRING *target, ULONG *length)) DEFINE_SYSCALL(NtQuerySystemEnvironmentValue, (UNICODE_STRING *name, WCHAR *buffer, ULONG length, ULONG *retlen)) DEFINE_SYSCALL(NtQuerySystemEnvironmentValueEx, (UNICODE_STRING *name, GUID *vendor, void *buffer, ULONG *retlen, ULONG *attrib)) -DEFINE_SYSCALL(NtQuerySystemInformation, (SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size)) +DEFINE_WRAPPED_SYSCALL(NtQuerySystemInformation, (SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size)) DEFINE_SYSCALL(NtQuerySystemInformationEx, (SYSTEM_INFORMATION_CLASS class, void *query, ULONG query_len, void *info, ULONG size, ULONG *ret_size)) DEFINE_SYSCALL(NtQuerySystemTime, (LARGE_INTEGER *time)) DEFINE_SYSCALL(NtQueryTimer, (HANDLE handle, TIMER_INFORMATION_CLASS class, void *info, ULONG len, ULONG *ret_len)) @@ -513,6 +515,13 @@ NTSTATUS SYSCALL_API NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SI if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualProtect, *addr_ptr, *size_ptr, 2, new_prot, status ); +} + +NTSTATUS SYSCALL_API NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size ) +{ + NTSTATUS status = syscall_NtQuerySystemInformation( class, info, size, ret_size ); + + if (!status && class == SystemCpuInformation && pUpdateProcessorInformation) pUpdateProcessorInformation( info ); return status; } @@ -1274,7 +1283,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size ) { - return NtQuerySystemInformation( class, info, size, ret_size ); + return syscall_NtQuerySystemInformation( class, info, size, ret_size ); }

1 0