wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Francisco Casas : tests: Test indexing temps.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: vkd3d Branch: master Commit: f24598c9a09fcfa48b5321cba0299bbea160d55c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f24598c9a09fcfa48b5321cba0299… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu May 4 18:12:29 2023 -0400 tests: Test indexing temps. --- tests/array-index-expr.shader_test | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/array-index-expr.shader_test b/tests/array-index-expr.shader_test index 716c6d04..0c607677 100644 --- a/tests/array-index-expr.shader_test +++ b/tests/array-index-expr.shader_test @@ -72,3 +72,28 @@ 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) + + +[pixel shader todo] +uniform float2 i; + +float4 main() : sv_target +{ + float4 f[3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return f[i.x + i.y]; +} + +[test] +uniform 0 float4 0 0 0 0 +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 4.0) +uniform 0 float4 1 0 0 0 +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) +uniform 0 float4 0 1 0 0 +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) +uniform 0 float4 1 1 0 0 +todo draw quad +todo probe all rgba (9.0, 10.0, 11.0, 12.0)

1 0

Francisco Casas : tests: Test non-constant vector indexing.
by Alexandre Julliard 07 Jun '23

07 Jun '23

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

Alex Henrie : wineusb: Fix memory leaks on error paths in usb_submit_urb (scan-build).
by Alexandre Julliard 06 Jun '23

06 Jun '23

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

Akihiro Sagawa : winex11: Ignore BadWindow errors caused by XConfigureWindow.
by Alexandre Julliard 06 Jun '23

06 Jun '23

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

André Zwing : wow64: Ignore Thumb flag when parsing ARM syscall number.
by Alexandre Julliard 06 Jun '23

06 Jun '23

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 06 Jun '23

06 Jun '23

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 06 Jun '23

06 Jun '23

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@Concurrency@@YAXI@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 06 Jun '23

06 Jun '23

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@Concurrency@@QAE@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 06 Jun '23

06 Jun '23

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 select request.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: 6b5561b60104a912d30a87c69af15d4c611efcab URL: https://gitlab.winehq.org/wine/wine/-/commit/6b5561b60104a912d30a87c69af15d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 16:06:37 2023 +0200 server: Send the APC call data as vararg in the select request. --- dlls/ntdll/unix/server.c | 18 +++++++++++++----- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/request.h | 8 +++----- server/thread.c | 23 ++++++++++++++++------- server/trace.c | 4 ++-- tools/make_requests | 1 - 7 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index fe57b622f94..5348b07fe13 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -691,10 +691,15 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT int cookie; obj_handle_t apc_handle = 0; BOOL suspend_context = !!context; - apc_call_t call; apc_result_t result; sigset_t old_set; int signaled; + data_size_t reply_size; + struct + { + apc_call_t call; + context_t context[2]; + } reply_data; memset( &result, 0, sizeof(result) ); @@ -718,16 +723,17 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT wine_server_add_data( req, context, ctx_size ); suspend_context = FALSE; /* server owns the context now */ } - if (context) wine_server_set_reply( req, context, 2 * sizeof(*context) ); + wine_server_set_reply( req, &reply_data, + context ? sizeof(reply_data) : sizeof(reply_data.call) ); ret = server_call_unlocked( req ); signaled = reply->signaled; apc_handle = reply->apc_handle; - call = reply->call; + reply_size = wine_server_reply_size( reply ); } SERVER_END_REQ; if (ret != STATUS_KERNEL_APC) break; - invoke_system_apc( &call, &result, FALSE ); + invoke_system_apc( &reply_data.call, &result, FALSE ); /* don't signal multiple times */ if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) @@ -740,7 +746,9 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); - if (ret == STATUS_USER_APC) *user_apc = call.user; + if (ret == STATUS_USER_APC) *user_apc = reply_data.call.user; + if (reply_size > sizeof(reply_data.call)) + memcpy( context, reply_data.context, reply_size - sizeof(reply_data.call) ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 340512a054e..5a14a3c4370 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1381,9 +1381,9 @@ struct select_request struct select_reply { struct reply_header __header; - apc_call_t call; obj_handle_t apc_handle; int signaled; + /* VARARG(call,apc_call); */ /* VARARG(contexts,contexts); */ }; #define SELECT_ALERTABLE 1 @@ -6413,7 +6413,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 773 +#define SERVER_PROTOCOL_VERSION 774 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 7995f481e19..4237737ab40 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1221,9 +1221,9 @@ typedef struct VARARG(data,select_op,size); /* operation-specific data */ VARARG(contexts,contexts); /* suspend context(s) */ @REPLY - apc_call_t call; /* APC call arguments */ obj_handle_t apc_handle; /* handle to next APC */ int signaled; /* were the handles immediately signaled? */ + VARARG(call,apc_call); /* APC call arguments */ VARARG(contexts,contexts); /* suspend context(s) */ @END #define SELECT_ALERTABLE 1 diff --git a/server/request.h b/server/request.h index b13381d3fe1..ea08babdda8 100644 --- a/server/request.h +++ b/server/request.h @@ -689,7 +689,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = C_ASSERT( sizeof(abstime_t) == 8 ); C_ASSERT( sizeof(affinity_t) == 8 ); -C_ASSERT( sizeof(apc_call_t) == 48 ); C_ASSERT( sizeof(apc_param_t) == 8 ); C_ASSERT( sizeof(apc_result_t) == 40 ); C_ASSERT( sizeof(async_data_t) == 40 ); @@ -909,10 +908,9 @@ C_ASSERT( FIELD_OFFSET(struct select_request, timeout) == 24 ); C_ASSERT( FIELD_OFFSET(struct select_request, size) == 32 ); C_ASSERT( FIELD_OFFSET(struct select_request, prev_apc) == 36 ); C_ASSERT( sizeof(struct select_request) == 40 ); -C_ASSERT( FIELD_OFFSET(struct select_reply, call) == 8 ); -C_ASSERT( FIELD_OFFSET(struct select_reply, apc_handle) == 56 ); -C_ASSERT( FIELD_OFFSET(struct select_reply, signaled) == 60 ); -C_ASSERT( sizeof(struct select_reply) == 64 ); +C_ASSERT( FIELD_OFFSET(struct select_reply, apc_handle) == 8 ); +C_ASSERT( FIELD_OFFSET(struct select_reply, signaled) == 12 ); +C_ASSERT( sizeof(struct select_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, manual_reset) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, initial_state) == 20 ); diff --git a/server/thread.c b/server/thread.c index 5299f6c042d..3e35b27f694 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1658,17 +1658,19 @@ DECL_HANDLER(select) reply->signaled = select_on( &select_op, op_size, req->cookie, req->flags, req->timeout ); - if (get_error() == STATUS_USER_APC) + if (get_error() == STATUS_USER_APC && get_reply_max_size() >= sizeof(apc_call_t)) { apc = thread_dequeue_apc( current, 0 ); - reply->call = apc->call; + set_reply_data( &apc->call, sizeof(apc->call) ); release_object( apc ); } - else if (get_error() == STATUS_KERNEL_APC) + else if (get_error() == STATUS_KERNEL_APC && get_reply_max_size() >= sizeof(apc_call_t)) { apc = thread_dequeue_apc( current, 1 ); if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - reply->call = apc->call; + { + set_reply_data( &apc->call, sizeof(apc->call) ); + } else { apc->executed = 1; @@ -1676,16 +1678,23 @@ DECL_HANDLER(select) } release_object( apc ); } - else if (reply->signaled && get_reply_max_size() >= sizeof(context_t) && + else if (reply->signaled && get_reply_max_size() >= sizeof(apc_call_t) + sizeof(context_t) && current->context && current->suspend_cookie == req->cookie) { ctx = current->context; if (ctx->regs[CTX_NATIVE].flags || ctx->regs[CTX_WOW].flags) { - data_size_t size = (ctx->regs[CTX_WOW].flags ? 2 : 1) * sizeof(context_t); + apc_call_t *data; + data_size_t size = sizeof(*data) + (ctx->regs[CTX_WOW].flags ? 2 : 1) * sizeof(context_t); unsigned int flags = system_flags & ctx->regs[CTX_NATIVE].flags; + if (flags) set_thread_context( current, &ctx->regs[CTX_NATIVE], flags ); - set_reply_data( ctx->regs, min( size, get_reply_max_size() )); + size = min( size, get_reply_max_size() ); + if ((data = set_reply_data_size( size ))) + { + memset( data, 0, sizeof(*data) ); + memcpy( data + 1, ctx->regs, size - sizeof(*data) ); + } } release_object( ctx ); current->context = NULL; diff --git a/server/trace.c b/server/trace.c index 7cd6f8938d3..96b8992f351 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1752,9 +1752,9 @@ static void dump_select_request( const struct select_request *req ) static void dump_select_reply( const struct select_reply *req ) { - dump_apc_call( " call=", &req->call ); - fprintf( stderr, ", apc_handle=%04x", req->apc_handle ); + fprintf( stderr, " apc_handle=%04x", req->apc_handle ); fprintf( stderr, ", signaled=%d", req->signaled ); + dump_varargs_apc_call( ", call=", cur_size ); dump_varargs_contexts( ", contexts=", cur_size ); } diff --git a/tools/make_requests b/tools/make_requests index 158b2006ae5..e5db1c7fc0a 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -45,7 +45,6 @@ my %formats = "timeout_t" => [ 8, 8, "&dump_timeout" ], "abstime_t" => [ 8, 8, "&dump_abstime" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ], - "apc_call_t" => [ 48, 8, "&dump_apc_call" ], "apc_result_t" => [ 40, 8, "&dump_apc_result" ], "async_data_t" => [ 40, 8, "&dump_async_data" ], "irp_params_t" => [ 32, 8, "&dump_irp_params" ],

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
64
Older →

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 June 2023