June 2023 - Wine-Commits - list.winehq.org

Francisco Casas : tests: Test non-constant vector indexing.
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: vkd3d Branch: master Commit: 8d7cc8c84e07d5158020efcf5f2e8b408407774d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d7cc8c84e07d5158020efcf5f2e8… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu May 4 14:03:30 2023 -0400 tests: Test non-constant vector indexing. --- tests/array-index-expr.shader_test | 49 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/array-index-expr.shader_test b/tests/array-index-expr.shader_test index 8dda0c99..716c6d04 100644 --- a/tests/array-index-expr.shader_test +++ b/tests/array-index-expr.shader_test @@ -23,3 +23,52 @@ todo probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 1 1 0 0 todo draw quad todo probe all rgba (9.0, 10.0, 11.0, 12.0) + + +[pixel shader todo] +uniform float i; + +float4 main() : SV_TARGET +{ + float4 arr = float4(11.0, 12.0, 13.0, 14.0); + return arr[i]; +} + +[test] +uniform 0 float 0 +todo draw quad +todo probe all rgba (11.0, 11.0, 11.0, 11.0) +uniform 0 float 1 +todo draw quad +todo probe all rgba (12.0, 12.0, 12.0, 12.0) +uniform 0 float 2 +todo draw quad +todo probe all rgba (13.0, 13.0, 13.0, 13.0) +uniform 0 float 3 +todo draw quad +todo probe all rgba (14.0, 14.0, 14.0, 14.0) + + +[pixel shader todo] +uniform float i; + +float4 main() : SV_TARGET +{ + int4 arr_i = int4(21, 22, 23, 24); + bool4 arr_b = bool4(true, false, true, false); + return float4(arr_i[i], arr_b[i], arr_i[3 - i], arr_b[3 - i]); +} + +[test] +uniform 0 float 0 +todo draw quad +todo probe all rgba (21.0, 1.0, 24.0, 0.0) +uniform 0 float 1 +todo draw quad +todo probe all rgba (22.0, 0.0, 23.0, 1.0) +uniform 0 float 2 +todo draw quad +todo probe all rgba (23.0, 1.0, 22.0, 0.0) +uniform 0 float 3 +todo draw quad +todo probe all rgba (24.0, 0.0, 21.0, 1.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Introduce transform_derefs().
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: vkd3d Branch: master Commit: 441902bb85dac81fb1d83facc7367830ce804956 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/441902bb85dac81fb1d83facc7367… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu May 4 15:06:58 2023 -0400 vkd3d-shader/hlsl: Introduce transform_derefs(). --- libs/vkd3d-shader/hlsl_codegen.c | 77 +++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2b6c595a..3d41524f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -123,15 +123,14 @@ static struct hlsl_ir_node *new_offset_instr_from_deref(struct hlsl_ctx *ctx, st } /* TODO: remove when no longer needed, only used for transform_deref_paths_into_offsets() */ -static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_deref *deref, +static bool replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_ir_node *instr) { const struct hlsl_type *type; struct hlsl_ir_node *offset; struct hlsl_block block; - if (!deref->var) - return; + assert(deref->var); /* register offsets shouldn't be used before this point is reached. */ assert(!deref->offset.node); @@ -143,45 +142,19 @@ static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_der if (type->class == HLSL_CLASS_STRUCT || type->class == HLSL_CLASS_ARRAY) { hlsl_cleanup_deref(deref); - return; + return true; } deref->offset_regset = hlsl_type_get_regset(type); if (!(offset = new_offset_instr_from_deref(ctx, &block, deref, &instr->loc))) - return; + return false; list_move_before(&instr->entry, &block.instrs); hlsl_cleanup_deref(deref); hlsl_src_from_node(&deref->offset, offset); -} - -/* TODO: remove when no longer needed. */ -static bool transform_deref_paths_into_offsets(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) -{ - switch(instr->type) - { - case HLSL_IR_LOAD: - replace_deref_path_with_offset(ctx, &hlsl_ir_load(instr)->src, instr); - return true; - case HLSL_IR_STORE: - replace_deref_path_with_offset(ctx, &hlsl_ir_store(instr)->lhs, instr); - return true; - - case HLSL_IR_RESOURCE_LOAD: - replace_deref_path_with_offset(ctx, &hlsl_ir_resource_load(instr)->resource, instr); - replace_deref_path_with_offset(ctx, &hlsl_ir_resource_load(instr)->sampler, instr); - return true; - - case HLSL_IR_RESOURCE_STORE: - replace_deref_path_with_offset(ctx, &hlsl_ir_resource_store(instr)->resource, instr); - return true; - - default: - return false; - } - return false; + return true; } /* Split uniforms into two variables representing the constant and temp @@ -600,6 +573,44 @@ bool hlsl_transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, return progress; } +static bool transform_instr_derefs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + bool res; + bool (*func)(struct hlsl_ctx *ctx, struct hlsl_deref *, struct hlsl_ir_node *) = context; + + switch(instr->type) + { + case HLSL_IR_LOAD: + res = func(ctx, &hlsl_ir_load(instr)->src, instr); + return res; + + case HLSL_IR_STORE: + res = func(ctx, &hlsl_ir_store(instr)->lhs, instr); + return res; + + case HLSL_IR_RESOURCE_LOAD: + res = func(ctx, &hlsl_ir_resource_load(instr)->resource, instr); + if (hlsl_ir_resource_load(instr)->sampler.var) + res |= func(ctx, &hlsl_ir_resource_load(instr)->sampler, instr); + return res; + + case HLSL_IR_RESOURCE_STORE: + res = func(ctx, &hlsl_ir_resource_store(instr)->resource, instr); + return res; + + default: + return false; + } + return false; +} + +static bool transform_derefs(struct hlsl_ctx *ctx, + bool (*func)(struct hlsl_ctx *ctx, struct hlsl_deref *, struct hlsl_ir_node *), + struct hlsl_block *block) +{ + return hlsl_transform_ir(ctx, transform_instr_derefs, block, func); +} + struct recursive_call_ctx { const struct hlsl_ir_function_decl **backtrace; @@ -3956,7 +3967,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, track_object_components_usage, body, NULL); /* TODO: move forward, remove when no longer needed */ - hlsl_transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); + transform_derefs(ctx, replace_deref_path_with_offset, body); while (hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL)); do

1 0

Akihiro Sagawa : winex11: Ignore BadWindow errors caused by XConfigureWindow.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: dcb123fac840ace40355d11000fdf93fcfff0861 URL: https://gitlab.winehq.org/wine/wine/-/commit/dcb123fac840ace40355d11000fdf9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 6 22:25:10 2023 +0900 winex11: Ignore BadWindow errors caused by XConfigureWindow. This typically happens when resizing a D3D child window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54810 --- dlls/winex11.drv/x11drv_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index b0630a06926..929be92ff7a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -228,6 +228,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes || + event->request_code == X_ConfigureWindow || event->request_code == X_SendEvent) && (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE;

1 0

Alex Henrie : wineusb: Fix memory leaks on error paths in usb_submit_urb (scan-build).
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 9e3f1a15066c78010a5d17be3fdefa612549d117 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e3f1a15066c78010a5d17be3fdefa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 00:02:12 2023 -0600 wineusb: Fix memory leaks on error paths in usb_submit_urb (scan-build). --- dlls/wineusb.sys/unixlib.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index 8116e46c67c..95220dd3828 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -449,7 +449,10 @@ static NTSTATUS usb_submit_urb(void *args) transfer_ctx->transfer_buffer = params->transfer_buffer; if (!(transfer = libusb_alloc_transfer(0))) + { + free(transfer_ctx); return STATUS_NO_MEMORY; + } irp->Tail.Overlay.DriverContext[0] = transfer; if (pipe.type == UsbdPipeTypeBulk) @@ -465,6 +468,7 @@ static NTSTATUS usb_submit_urb(void *args) else { WARN("Invalid pipe type %#x.\n", pipe.type); + free(transfer_ctx); libusb_free_transfer(transfer); return USBD_STATUS_INVALID_PIPE_HANDLE; } @@ -489,11 +493,15 @@ static NTSTATUS usb_submit_urb(void *args) transfer_ctx->transfer_buffer = params->transfer_buffer; if (!(transfer = libusb_alloc_transfer(0))) + { + free(transfer_ctx); return STATUS_NO_MEMORY; + } irp->Tail.Overlay.DriverContext[0] = transfer; if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) { + free(transfer_ctx); libusb_free_transfer(transfer); return STATUS_NO_MEMORY; } @@ -549,11 +557,15 @@ static NTSTATUS usb_submit_urb(void *args) FIXME("Unhandled flags %#x.\n", (int)req->TransferFlags); if (!(transfer = libusb_alloc_transfer(0))) + { + free(transfer_ctx); return STATUS_NO_MEMORY; + } irp->Tail.Overlay.DriverContext[0] = transfer; if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) { + free(transfer_ctx); libusb_free_transfer(transfer); return STATUS_NO_MEMORY; }

1 0

André Zwing : wow64: Ignore Thumb flag when parsing ARM syscall number.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 02fcbeb5a16844dd4640e9eec67650f9b1a428ff URL: https://gitlab.winehq.org/wine/wine/-/commit/02fcbeb5a16844dd4640e9eec67650… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue Jun 6 18:00:14 2023 +0200 wow64: Ignore Thumb flag when parsing ARM syscall number. --- dlls/wow64/syscall.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 06dd9822a08..23f8915aa64 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -639,6 +639,7 @@ NTSTATUS WINAPI wow64_NtWow64IsProcessorFeaturePresent( UINT *args ) */ static DWORD get_syscall_num( const BYTE *syscall ) { + WORD *arm_syscall = (WORD *)((ULONG_PTR)syscall & ~1); DWORD id = ~0u; if (!syscall) return id; @@ -650,9 +651,9 @@ static DWORD get_syscall_num( const BYTE *syscall ) break; case IMAGE_FILE_MACHINE_ARMNT: - if (*(WORD *)syscall == 0xb40f) + if (*arm_syscall == 0xb40f) { - DWORD inst = *(DWORD *)((WORD *)syscall + 1); + DWORD inst = *(DWORD *)(arm_syscall + 1); id = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); }

1 0

Joshua Ashton : winevulkan: Include function name in asserts.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: fc7e2041134505f9c122a34c2662490f025a574e URL: https://gitlab.winehq.org/wine/wine/-/commit/fc7e2041134505f9c122a34c266249… Author: Joshua Ashton <joshua(a)froggi.es> Date: Mon Jun 5 23:49:53 2023 +0100 winevulkan: Include function name in asserts. It is really useful to see at a glance what function is segfaulting/crashing here when debugging games/apps. This code is generated, and when generating WineVulkan against different Vulkan spec versions, etc it may be misleading that the Line: referred to by the assert dialog does not match what is generated locally on a different machine for the same Wine version/commit. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- dlls/winevulkan/loader_thunks.c | 594 ++++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 2 +- 2 files changed, 298 insertions(+), 298 deletions(-)

1 0

Piotr Caban : msvcr100: Use Context blocking functions in Concurrency::wait().
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 01c3f4dc65338c265a82d1fe61f1feb462c28ef6 URL: https://gitlab.winehq.org/wine/wine/-/commit/01c3f4dc65338c265a82d1fe61f1fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 5 21:07:14 2023 +0200 msvcr100: Use Context blocking functions in Concurrency::wait(). --- dlls/msvcrt/concurrency.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d30faf34681..66adef1fa6d 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3459,14 +3459,33 @@ bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock *this) return TryEnterCriticalSection(&this->cs); } +static void WINAPI wait_timeout(TP_CALLBACK_INSTANCE *instance, void *arg, TP_TIMER *timer) +{ + Context *ctx = arg; + + call_Context_Unblock(ctx); +} + /* ?wait(a)Concurrency@@YAXI(a)Z */ void __cdecl Concurrency_wait(unsigned int time) { - static int once; + Context *ctx = get_current_context(); + TP_TIMER *tp_timer; + FILETIME ft; - if (!once++) FIXME("(%d) stub!\n", time); + TRACE("(%d)\n", time); - Sleep(time); + tp_timer = CreateThreadpoolTimer(wait_timeout, ctx, NULL); + if(!tp_timer) { + FIXME("throw exception?\n"); + Sleep(time); + return; + } + set_timeout(&ft, time); + SetThreadpoolTimer(tp_timer, &ft, 0, 0); + + call_Context_Block(ctx); + CloseThreadpoolTimer(tp_timer); } #if _MSVCR_VER>=110

1 0

Piotr Caban : msvcr100: Use Context blocking functions in event class.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 3ef786f46a09331713db405c1c1ada7f01f1578a URL: https://gitlab.winehq.org/wine/wine/-/commit/3ef786f46a09331713db405c1c1ada… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 5 20:49:23 2023 +0200 msvcr100: Use Context blocking functions in event class. --- dlls/msvcrt/concurrency.c | 77 +++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d41832f6763..d30faf34681 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -299,6 +299,7 @@ typedef struct thread_wait_entry typedef struct thread_wait { + Context *ctx; void *signaled; LONG pending_waits; thread_wait_entry entries[1]; @@ -417,8 +418,6 @@ static CRITICAL_SECTION default_scheduler_cs = { &default_scheduler_cs_debug, -1 static SchedulerPolicy default_scheduler_policy; static ThreadScheduler *default_scheduler; -static HANDLE keyed_event; - static void create_default_scheduler(void); /* ??0improper_lock(a)Concurrency@@QAE(a)PBD@Z */ @@ -2561,6 +2560,17 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th return this; } +static void set_timeout(FILETIME *ft, unsigned int timeout) +{ + LARGE_INTEGER to; + + GetSystemTimeAsFileTime(ft); + to.QuadPart = ((LONGLONG)ft->dwHighDateTime << 32) + + ft->dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; + ft->dwHighDateTime = to.QuadPart >> 32; + ft->dwLowDateTime = to.QuadPart; +} + #if _MSVCR_VER >= 110 static void WINAPI timeout_unlock(TP_CALLBACK_INSTANCE *instance, void *ctx, TP_TIMER *timer) { @@ -2594,21 +2604,16 @@ bool __thiscall critical_section_try_lock_for( last = InterlockedExchangePointer(&this->tail, q); if(last) { TP_TIMER *tp_timer; - LARGE_INTEGER to; FILETIME ft; last->next = q; - GetSystemTimeAsFileTime(&ft); - to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + - ft.dwLowDateTime + (LONGLONG)timeout * TICKSPERMSEC; - ft.dwHighDateTime = to.QuadPart >> 32; - ft.dwLowDateTime = to.QuadPart; tp_timer = CreateThreadpoolTimer(timeout_unlock, q, NULL); if(!tp_timer) { FIXME("throw exception?\n"); return FALSE; } + set_timeout(&ft, timeout); SetThreadpoolTimer(tp_timer, &ft, 0, 0); call_Context_Block(q->ctx); @@ -2790,13 +2795,6 @@ unsigned int __cdecl _GetConcurrency(void) return val; } -static inline PLARGE_INTEGER evt_timeout(PLARGE_INTEGER pTime, unsigned int timeout) -{ - if(timeout == COOPERATIVE_TIMEOUT_INFINITE) return NULL; - pTime->QuadPart = (ULONGLONG)timeout * -TICKSPERMSEC; - return pTime; -} - static void evt_add_queue(thread_wait_entry **head, thread_wait_entry *entry) { entry->next = *head; @@ -2833,11 +2831,18 @@ static inline int evt_transition(void **state, void *from, void *to) return InterlockedCompareExchangePointer(state, to, from) == from; } +static void WINAPI evt_timeout(TP_CALLBACK_INSTANCE *instance, void *ctx, TP_TIMER *timer) +{ + thread_wait *wait = ctx; + + if(evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) + call_Context_Unblock(wait->ctx); +} + static size_t evt_wait(thread_wait *wait, event **events, int count, bool wait_all, unsigned int timeout) { + TP_TIMER *tp_timer = NULL; int i; - NTSTATUS status; - LARGE_INTEGER ntto; wait->signaled = EVT_RUNNING; wait->pending_waits = wait_all ? count : 1; @@ -2860,13 +2865,30 @@ static size_t evt_wait(thread_wait *wait, event **events, int count, bool wait_a if(!timeout) return evt_end_wait(wait, events, count); + if (timeout != COOPERATIVE_TIMEOUT_INFINITE) + { + FILETIME ft; + + tp_timer = CreateThreadpoolTimer(evt_timeout, wait, NULL); + if(!tp_timer) { + FIXME("throw exception?\n"); + return COOPERATIVE_WAIT_TIMEOUT; + } + set_timeout(&ft, timeout); + SetThreadpoolTimer(tp_timer, &ft, 0, 0); + } + if(!evt_transition(&wait->signaled, EVT_RUNNING, EVT_WAITING)) return evt_end_wait(wait, events, count); - status = NtWaitForKeyedEvent(keyed_event, wait, 0, evt_timeout(&ntto, timeout)); + call_Context_Block(wait->ctx); - if(status && !evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) - NtWaitForKeyedEvent(keyed_event, wait, 0, NULL); + if (tp_timer) + { + SetThreadpoolTimer(tp_timer, NULL, 0, 0); + WaitForThreadpoolTimerCallbacks(tp_timer, TRUE); + CloseThreadpoolTimer(tp_timer); + } return evt_end_wait(wait, events, count); } @@ -2878,14 +2900,6 @@ event* __thiscall event_ctor(event *this) { TRACE("(%p)\n", this); - if(!keyed_event) { - HANDLE event; - - NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); - if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) - NtClose(event); - } - this->waiters = NULL; this->signaled = FALSE; critical_section_ctor(&this->cs); @@ -2950,7 +2964,7 @@ void __thiscall event_set(event *this) for(entry=wakeup; entry; entry=next) { next = entry->next; entry->next = entry->prev = NULL; - NtReleaseKeyedEvent(keyed_event, entry->wait, 0, NULL); + call_Context_Unblock(entry->wait->ctx); } } @@ -2969,6 +2983,7 @@ size_t __thiscall event_wait(event *this, unsigned int timeout) critical_section_unlock(&this->cs); if(!timeout) return signaled ? 0 : COOPERATIVE_WAIT_TIMEOUT; + wait.ctx = get_current_context(); return signaled ? 0 : evt_wait(&wait, &this, 1, FALSE, timeout); } @@ -2985,6 +3000,7 @@ int __cdecl event_wait_for_multiple(event **events, size_t count, bool wait_all, return 0; wait = operator_new(FIELD_OFFSET(thread_wait, entries[count])); + wait->ctx = get_current_context(); ret = evt_wait(wait, events, count, wait_all, timeout); operator_delete(wait); @@ -3683,9 +3699,6 @@ void msvcrt_free_concurrency(void) ThreadScheduler_dtor(default_scheduler); operator_delete(default_scheduler); } - - if(keyed_event) - NtClose(keyed_event); } void msvcrt_free_scheduler_thread(void)

1 0

Piotr Caban : make_unicode: Don't use Türkiye as it can't be encoded in some locales.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: 8b442c29a30b0d48a8734fd66047cb25223ffd1e URL: https://gitlab.winehq.org/wine/wine/-/commit/8b442c29a30b0d48a8734fd66047cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 6 16:18:29 2023 +0200 make_unicode: Don't use Türkiye as it can't be encoded in some locales. --- nls/locale.nls | Bin 745142 -> 745154 bytes tools/make_unicode | 1 + 2 files changed, 1 insertion(+) diff --git a/nls/locale.nls b/nls/locale.nls index 0a397e9ea61..bc028035a8b 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 4dde6c010ee..69dce31df47 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -4677,6 +4677,7 @@ sub build_locale_data() my $snativelangname = loc_query( $loc, "/ldml/localeDisplayNames/languages/language[\@type='$language' and not(\@alt)]" ); my $snativectryname = loc_query( $loc, "/ldml/localeDisplayNames/territories/territory[\@type='$territory' and not(\@alt)]" ); $sengcountry =~ s/South Korea/Korea/; + $sengcountry =~ s/T\xfcrkiye/Turkey/; $snativelangname ||= $senglanguage; $snativectryname ||= $sengcountry; if ($script)

1 0

Alexandre Julliard : server: Send the APC call data as vararg in the queue_apc request.
by Alexandre Julliard June 6, 2023

June 6, 2023

Module: wine Branch: master Commit: e3049f11fad715c65d8b62fcdaed660e39ffde5d URL: https://gitlab.winehq.org/wine/wine/-/commit/e3049f11fad715c65d8b62fcdaed66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 15:55:51 2023 +0200 server: Send the APC call data as vararg in the queue_apc request. To make it possible to support a larger structure. --- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/thread.c | 13 +++++++------ include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/request.h | 3 +-- server/thread.c | 8 ++++++-- server/trace.c | 14 +++++++++++++- 7 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 227784448d3..fe57b622f94 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -819,7 +819,7 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a SERVER_START_REQ( queue_apc ) { req->handle = wine_server_obj_handle( process ); - req->call = *call; + wine_server_add_data( req, call, sizeof(*call) ); if (!(ret = wine_server_call( req ))) { handle = wine_server_ptr_handle( reply->handle ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3e2be2feaff..6eabfb9a834 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1680,19 +1680,20 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 ULONG_PTR arg2, ULONG_PTR arg3 ) { unsigned int ret; + apc_call_t call; SERVER_START_REQ( queue_apc ) { req->handle = wine_server_obj_handle( handle ); if (func) { - req->call.type = APC_USER; - req->call.user.func = wine_server_client_ptr( func ); - req->call.user.args[0] = arg1; - req->call.user.args[1] = arg2; - req->call.user.args[2] = arg3; + call.type = APC_USER; + call.user.func = wine_server_client_ptr( func ); + call.user.args[0] = arg1; + call.user.args[1] = arg2; + call.user.args[2] = arg3; + wine_server_add_data( req, &call, sizeof(call) ); } - else req->call.type = APC_NONE; /* wake up only */ ret = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 881b6022086..340512a054e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1236,7 +1236,7 @@ struct queue_apc_request { struct request_header __header; obj_handle_t handle; - apc_call_t call; + /* VARARG(call,apc_call); */ }; struct queue_apc_reply { @@ -6413,7 +6413,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 772 +#define SERVER_PROTOCOL_VERSION 773 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 49fe8012606..7995f481e19 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1133,7 +1133,7 @@ typedef struct /* Queue an APC for a thread or process */ @REQ(queue_apc) obj_handle_t handle; /* thread or process handle */ - apc_call_t call; /* call arguments */ + VARARG(call,apc_call); /* call arguments */ @REPLY obj_handle_t handle; /* APC handle */ int self; /* run APC in caller itself? */ diff --git a/server/request.h b/server/request.h index 07a5546d008..b13381d3fe1 100644 --- a/server/request.h +++ b/server/request.h @@ -861,8 +861,7 @@ C_ASSERT( sizeof(struct resume_thread_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct resume_thread_reply, count) == 8 ); C_ASSERT( sizeof(struct resume_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct queue_apc_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct queue_apc_request, call) == 16 ); -C_ASSERT( sizeof(struct queue_apc_request) == 64 ); +C_ASSERT( sizeof(struct queue_apc_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct queue_apc_reply, handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct queue_apc_reply, self) == 12 ); C_ASSERT( sizeof(struct queue_apc_reply) == 16 ); diff --git a/server/thread.c b/server/thread.c index 9e29cf617f5..5299f6c042d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -514,7 +514,8 @@ static struct thread_apc *create_apc( struct object *owner, const apc_call_t *ca if ((apc = alloc_object( &thread_apc_ops ))) { - apc->call = *call_data; + if (call_data) apc->call = *call_data; + else apc->call.type = APC_NONE; apc->caller = NULL; apc->owner = owner; apc->executed = 0; @@ -1701,8 +1702,11 @@ DECL_HANDLER(queue_apc) struct thread *thread = NULL; struct process *process = NULL; struct thread_apc *apc; + const apc_call_t *call = get_req_data(); - if (!(apc = create_apc( NULL, &req->call ))) return; + if (get_req_data_size() < sizeof(*call)) call = NULL; + + if (!(apc = create_apc( NULL, call ))) return; switch (apc->call.type) { diff --git a/server/trace.c b/server/trace.c index 2950edac3e5..7cd6f8938d3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -540,6 +540,18 @@ static void dump_varargs_ushorts( const char *prefix, data_size_t size ) remove_data( size ); } +static void dump_varargs_apc_call( const char *prefix, data_size_t size ) +{ + const apc_call_t *call = cur_data; + + if (size >= sizeof(*call)) + { + dump_apc_call( prefix, call ); + size = sizeof(*call); + } + remove_data( size ); +} + static void dump_varargs_apc_result( const char *prefix, data_size_t size ) { const apc_result_t *result = cur_data; @@ -1640,7 +1652,7 @@ static void dump_resume_thread_reply( const struct resume_thread_reply *req ) static void dump_queue_apc_request( const struct queue_apc_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); - dump_apc_call( ", call=", &req->call ); + dump_varargs_apc_call( ", call=", cur_size ); } static void dump_queue_apc_reply( const struct queue_apc_reply *req )

1 0