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

Francisco Casas : vkd3d-shader/hlsl: Lower dot for non-float types.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: vkd3d Branch: master Commit: 6cfa8cf85904a6c329608073823af7d7a7d99be6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6cfa8cf85904a6c329608073823af… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed May 24 01:01:38 2023 -0400 vkd3d-shader/hlsl: Lower dot for non-float types. --- libs/vkd3d-shader/hlsl_codegen.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 3d41524f..9774ca08 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2389,6 +2389,55 @@ static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void return true; } +static bool lower_int_dot(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *mult, *comps[4] = {0}, *res; + struct hlsl_type *type = instr->data_type; + struct hlsl_ir_expr *expr; + unsigned int i, dimx; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + if (expr->op != HLSL_OP2_DOT) + return false; + + if (type->base_type == HLSL_TYPE_INT || type->base_type == HLSL_TYPE_UINT) + { + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + assert(arg1->data_type->dimx == arg2->data_type->dimx); + dimx = arg1->data_type->dimx; + + if (!(mult = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, arg1, arg2))) + return false; + list_add_before(&instr->entry, &mult->entry); + + for (i = 0; i < dimx; ++i) + { + unsigned int s = hlsl_swizzle_from_writemask(1 << i); + + if (!(comps[i] = hlsl_new_swizzle(ctx, s, 1, mult, &instr->loc))) + return false; + list_add_before(&instr->entry, &comps[i]->entry); + } + + res = comps[0]; + for (i = 1; i < dimx; ++i) + { + if (!(res = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, res, comps[i]))) + return false; + list_add_before(&instr->entry, &res->entry); + } + + hlsl_replace_node(instr, res); + return true; + } + + return false; +} + static bool lower_float_modulus(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_node *arg1, *arg2, *mul1, *neg1, *ge, *neg2, *div, *mul2, *frc, *cond; @@ -3936,6 +3985,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, lower_narrowing_casts, body, NULL); hlsl_transform_ir(ctx, lower_casts_to_bool, body, NULL); + hlsl_transform_ir(ctx, lower_int_dot, body, NULL); hlsl_transform_ir(ctx, lower_int_division, body, NULL); hlsl_transform_ir(ctx, lower_int_modulus, body, NULL); hlsl_transform_ir(ctx, lower_int_abs, body, NULL);

1 0

Francisco Casas : vkd3d-shader/hlsl: Support non-constant vector indexing.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: vkd3d Branch: master Commit: ebf7573571d4bfcd3f38846886106f204fd7f0e8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ebf7573571d4bfcd3f38846886106… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon May 8 18:25:18 2023 -0400 vkd3d-shader/hlsl: Support non-constant vector indexing. Non-constant vector indexing is not solved with relative addressing in the register indexes because this indexation cannot be at the level of register-components. Mathematical operations must be used instead. --- libs/vkd3d-shader/hlsl.c | 13 ++++ libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl_codegen.c | 88 +++++++++++++++++++++++++- tests/array-index-expr.shader_test | 36 +++++------ tests/expr-indexing.shader_test | 22 +++---- tests/hlsl-matrix-indexing.shader_test | 6 +- tests/hlsl-vector-indexing-uniform.shader_test | 4 +- 7 files changed, 134 insertions(+), 37 deletions(-)

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

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

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

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

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

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

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

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's GetService.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: 59b175d96c90578b6aa9a43f141bc12b5e635360 URL: https://gitlab.winehq.org/wine/wine/-/commit/59b175d96c90578b6aa9a43f141bc1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 25 10:53:58 2023 +0200 wineoss: Use mmdevapi's AudioClient's GetService. --- dlls/wineoss.drv/mmdevdrv.c | 87 ++------------------------------------------- 1 file changed, 3 insertions(+), 84 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 23a116f0c45..188bf37aac9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -858,89 +858,8 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, - void **ppv) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - sessions_lock(); - - if(!This->stream){ - sessions_unlock(); - return AUDCLNT_E_NOT_INITIALIZED; - } - - if(IsEqualIID(riid, &IID_IAudioRenderClient)){ - if(This->dataflow != eRender){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); - *ppv = &This->IAudioRenderClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ - if(This->dataflow != eCapture){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); - *ppv = &This->IAudioCaptureClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioClock)){ - IAudioClock_AddRef(&This->IAudioClock_iface); - *ppv = &This->IAudioClock_iface; - }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ - IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); - *ppv = &This->IAudioStreamVolume_iface; - }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); - - *ppv = &This->session_wrapper->IAudioSessionControl2_iface; - }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); - - *ppv = &This->session_wrapper->IChannelAudioVolume_iface; - }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); - - *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; - } - - if(*ppv){ - sessions_unlock(); - return S_OK; - } - - sessions_unlock(); - - FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} +extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, + void **ppv); extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category, BOOL *offload_capable); @@ -979,7 +898,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_Stop, AudioClient_Reset, AudioClient_SetEventHandle, - AudioClient_GetService, + client_GetService, client_IsOffloadCapable, client_SetClientProperties, client_GetBufferSizeLimits,

1 0