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

Shaun Ren : sapi: Free completed buffers asynchronously in SpMMAudio.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: 7bced2878a55d388beaeae76d58d693391e4de24 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bced2878a55d388beaeae76d58d69… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue May 30 23:29:22 2023 -0400 sapi: Free completed buffers asynchronously in SpMMAudio. Also introduce async helpers. The buffers cannot be freed directly in wave_out_proc, because calling waveOut related functions in the callback could cause a deadlock. --- dlls/sapi/Makefile.in | 1 + dlls/sapi/async.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/mmaudio.c | 78 ++++++++++++++++++++- dlls/sapi/sapi_private.h | 24 +++++++ 4 files changed, 277 insertions(+), 1 deletion(-)

1 0

Shaun Ren : sapi: Implement ISpMMSysAudio::Write.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: ef730b6e41f04d2810bbc6cc869d9fdf1d789c1d URL: https://gitlab.winehq.org/wine/wine/-/commit/ef730b6e41f04d2810bbc6cc869d9f… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue May 30 23:58:32 2023 -0400 sapi: Implement ISpMMSysAudio::Write. --- dlls/sapi/mmaudio.c | 53 +++++++++++++++++++++++++++++++++++++++++++-- dlls/sapi/tests/mmaudio.c | 55 +++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 102 insertions(+), 6 deletions(-) diff --git a/dlls/sapi/mmaudio.c b/dlls/sapi/mmaudio.c index add670ff3dc..dadd767b9a1 100644 --- a/dlls/sapi/mmaudio.c +++ b/dlls/sapi/mmaudio.c @@ -400,9 +400,58 @@ static HRESULT WINAPI mmsysaudio_Read(ISpMMSysAudio *iface, void *pv, ULONG cb, static HRESULT WINAPI mmsysaudio_Write(ISpMMSysAudio *iface, const void *pv, ULONG cb, ULONG *cb_written) { - FIXME("(%p, %p, %lu, %p): stub.\n", iface, pv, cb, cb_written); + struct mmaudio *This = impl_from_ISpMMSysAudio(iface); + HRESULT hr = S_OK; + WAVEHDR *buf; - return E_NOTIMPL; + TRACE("(%p, %p, %lu, %p).\n", iface, pv, cb, cb_written); + + if (This->flow != FLOW_OUT) + return STG_E_ACCESSDENIED; + + if (cb_written) + *cb_written = 0; + + EnterCriticalSection(&This->cs); + + if (This->state == SPAS_CLOSED || This->state == SPAS_STOP) + { + LeaveCriticalSection(&This->cs); + return SP_AUDIO_STOPPED; + } + + if (!(buf = heap_alloc(sizeof(WAVEHDR) + cb))) + { + LeaveCriticalSection(&This->cs); + return E_OUTOFMEMORY; + } + memcpy((char *)(buf + 1), pv, cb); + buf->lpData = (char *)(buf + 1); + buf->dwBufferLength = cb; + buf->dwFlags = 0; + + if (waveOutPrepareHeader(This->hwave.out, buf, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) + { + LeaveCriticalSection(&This->cs); + heap_free(buf); + return E_FAIL; + } + + waveOutWrite(This->hwave.out, buf, sizeof(WAVEHDR)); + + EnterCriticalSection(&This->pending_cs); + ++This->pending_buf_count; + TRACE("pending_buf_count = %Iu\n", This->pending_buf_count); + LeaveCriticalSection(&This->pending_cs); + + ResetEvent(This->event); + + LeaveCriticalSection(&This->cs); + + if (cb_written) + *cb_written = cb; + + return hr; } static HRESULT WINAPI mmsysaudio_Seek(ISpMMSysAudio *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *new_pos) diff --git a/dlls/sapi/tests/mmaudio.c b/dlls/sapi/tests/mmaudio.c index 85a3570f490..38df432c181 100644 --- a/dlls/sapi/tests/mmaudio.c +++ b/dlls/sapi/tests/mmaudio.c @@ -163,7 +163,10 @@ static void test_audio_out(void) ISpMMSysAudio *mmaudio; GUID fmtid; WAVEFORMATEX *wfx = NULL; + WAVEFORMATEX wfx2; UINT devid; + char *buf = NULL; + ULONG written; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -182,6 +185,8 @@ static void test_audio_out(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(IsEqualGUID(&fmtid, &SPDFID_WaveFormatEx), "got %s.\n", wine_dbgstr_guid(&fmtid)); ok(wfx != NULL, "wfx == NULL.\n"); + ok(wfx->wFormatTag == WAVE_FORMAT_PCM, "got %u.\n", wfx->wFormatTag); + ok(wfx->cbSize == 0, "got %u.\n", wfx->cbSize); hr = ISpMMSysAudio_SetFormat(mmaudio, &fmtid, wfx); ok(hr == S_OK, "got %#lx.\n", hr); @@ -201,10 +206,12 @@ static void test_audio_out(void) hr = ISpMMSysAudio_SetFormat(mmaudio, &fmtid, wfx); ok(hr == S_OK, "got %#lx.\n", hr); - wfx->nChannels = wfx->nChannels == 1 ? 2 : 1; - wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nChannels * wfx->wBitsPerSample / 8; - wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; - hr = ISpMMSysAudio_SetFormat(mmaudio, &fmtid, wfx); + memcpy(&wfx2, wfx, sizeof(wfx2)); + wfx2.nChannels = wfx->nChannels == 1 ? 2 : 1; + wfx2.nAvgBytesPerSec = wfx2.nSamplesPerSec * wfx2.nChannels * wfx2.wBitsPerSample / 8; + wfx2.nBlockAlign = wfx2.nChannels * wfx2.wBitsPerSample / 8; + + hr = ISpMMSysAudio_SetFormat(mmaudio, &fmtid, &wfx2); ok(hr == SPERR_DEVICE_BUSY, "got %#lx.\n", hr); devid = 0xdeadbeef; @@ -215,7 +222,47 @@ static void test_audio_out(void) hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); ok(hr == S_OK, "got %#lx.\n", hr); + buf = calloc(1, wfx->nAvgBytesPerSec); + ok(buf != NULL, "failed to allocate buffer.\n"); + + hr = ISpMMSysAudio_Write(mmaudio, buf, wfx->nAvgBytesPerSec, NULL); + ok(hr == SP_AUDIO_STOPPED, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_STOP, 0); + todo_wine ok(hr == S_OK, "got %#lx.\n", hr); + if (hr == S_OK) + { + hr = ISpMMSysAudio_Write(mmaudio, buf, wfx->nAvgBytesPerSec, NULL); + ok(hr == SP_AUDIO_STOPPED, "got %#lx.\n", hr); + } + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_RUN, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_Write(mmaudio, buf, wfx->nAvgBytesPerSec, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + Sleep(200); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_RUN, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + written = 0xdeadbeef; + hr = ISpMMSysAudio_Write(mmaudio, buf, wfx->nAvgBytesPerSec * 200 / 1000, &written); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(written == wfx->nAvgBytesPerSec * 200 / 1000, "got %lu.\n", written); + + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + CoTaskMemFree(wfx); + free(buf); ISpMMSysAudio_Release(mmaudio); }

1 0

Shaun Ren : sapi: Implement ISpMMSysAudio::EventHandle.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: 7cd77b2a7890e6fbe97f52fe852e7dfa4e403570 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cd77b2a7890e6fbe97f52fe852e7d… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed May 31 00:09:50 2023 -0400 sapi: Implement ISpMMSysAudio::EventHandle. --- dlls/sapi/mmaudio.c | 6 ++++-- dlls/sapi/tests/mmaudio.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/mmaudio.c b/dlls/sapi/mmaudio.c index dadd767b9a1..d99bcb13672 100644 --- a/dlls/sapi/mmaudio.c +++ b/dlls/sapi/mmaudio.c @@ -728,9 +728,11 @@ static HRESULT WINAPI mmsysaudio_GetDefaultFormat(ISpMMSysAudio *iface, GUID *gu static HANDLE WINAPI mmsysaudio_EventHandle(ISpMMSysAudio *iface) { - FIXME("(%p): stub.\n", iface); + struct mmaudio *This = impl_from_ISpMMSysAudio(iface); - return NULL; + TRACE("(%p).\n", iface); + + return This->event; } static HRESULT WINAPI mmsysaudio_GetVolumeLevel(ISpMMSysAudio *iface, ULONG *level) diff --git a/dlls/sapi/tests/mmaudio.c b/dlls/sapi/tests/mmaudio.c index 38df432c181..7c72fb112bf 100644 --- a/dlls/sapi/tests/mmaudio.c +++ b/dlls/sapi/tests/mmaudio.c @@ -167,6 +167,8 @@ static void test_audio_out(void) UINT devid; char *buf = NULL; ULONG written; + DWORD start, end; + HANDLE event = NULL; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -258,6 +260,20 @@ static void test_audio_out(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(written == wfx->nAvgBytesPerSec * 200 / 1000, "got %lu.\n", written); + hr = ISpMMSysAudio_Write(mmaudio, buf, wfx->nAvgBytesPerSec * 200 / 1000, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + start = GetTickCount(); + + event = ISpMMSysAudio_EventHandle(mmaudio); + ok(event != NULL, "event == NULL.\n"); + + hr = WaitForSingleObject(event, 1000); + ok(hr == WAIT_OBJECT_0, "got %#lx.\n", hr); + + end = GetTickCount(); + ok(end - start <= 500, "waited for %lu ms.\n", end - start); + hr = ISpMMSysAudio_SetState(mmaudio, SPAS_CLOSED, 0); ok(hr == S_OK, "got %#lx.\n", hr);

1 0

Alexandre Julliard : kernelbase: Don't define stdcall functions on non-i386.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: c908ad6fcd19ec2bd8bb1df4086a7026df645c3e URL: https://gitlab.winehq.org/wine/wine/-/commit/c908ad6fcd19ec2bd8bb1df4086a70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 14 11:15:13 2023 +0200 kernelbase: Don't define stdcall functions on non-i386. --- dlls/kernelbase/debug.c | 9 ++++++++- dlls/kernelbase/thread.c | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index df1b9a63604..4353b0590f3 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -118,8 +118,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH DebugActiveProcessStop( DWORD pid ) /*********************************************************************** * DebugBreak (kernelbase.@) */ -#if defined(__i386__) || defined(__x86_64__) +#ifdef __i386__ __ASM_STDCALL_FUNC( DebugBreak, 0, "jmp " __ASM_STDCALL("DbgBreakPoint", 0) ) +#elif defined(__x86_64__) +__ASM_GLOBAL_FUNC( DebugBreak, "jmp " __ASM_NAME("DbgBreakPoint") ) #else void WINAPI DebugBreak(void) { @@ -347,7 +349,12 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou RtlRaiseException( &record ); } #endif + +#ifdef __i386__ __ASM_STDCALL_IMPORT(RaiseException,16) +#else +__ASM_GLOBAL_IMPORT(RaiseException) +#endif /******************************************************************* * RaiseFailFastException (kernelbase.@) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index ccedb62f930..bb1145e3f66 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -807,7 +807,7 @@ __ASM_STDCALL_FUNC( switch_fiber, 8, "movl 0xc4(%ecx),%esp\n\t" /* new->Esp */ "jmp *0xb8(%ecx)" ) /* new->Eip */ #elif defined(__x86_64__) -__ASM_STDCALL_FUNC( switch_fiber, 8, +__ASM_GLOBAL_FUNC( switch_fiber, "movq %rbx,0x90(%rcx)\n\t" /* old->Rbx */ "leaq 0x8(%rsp),%rax\n\t" "movq %rax,0x98(%rcx)\n\t" /* old->Rsp */ @@ -851,7 +851,7 @@ __ASM_STDCALL_FUNC( switch_fiber, 8, "movq 0x98(%rdx),%rsp\n\t" /* new->Rsp */ "jmp *0xf8(%rdx)" ) /* new->Rip */ #elif defined(__arm__) -__ASM_STDCALL_FUNC( switch_fiber, 8, +__ASM_GLOBAL_FUNC( switch_fiber, "str r4, [r0, #0x14]\n\t" /* old->R4 */ "str r5, [r0, #0x18]\n\t" /* old->R5 */ "str r6, [r0, #0x1c]\n\t" /* old->R6 */ @@ -874,7 +874,7 @@ __ASM_STDCALL_FUNC( switch_fiber, 8, "ldr r2, [r1, #0x40]\n\t" /* new->Pc */ "bx r2" ) #elif defined(__aarch64__) -__ASM_STDCALL_FUNC( switch_fiber, 8, +__ASM_GLOBAL_FUNC( switch_fiber, "stp x19, x20, [x0, #0xa0]\n\t" /* old->X19,X20 */ "stp x21, x22, [x0, #0xb0]\n\t" /* old->X21,X22 */ "stp x23, x24, [x0, #0xc0]\n\t" /* old->X23,X24 */

1 0

Alexandre Julliard : ntdll: Don't define stdcall functions on non-i386.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: 2b6e32f3585823c9708c70aa70aa70036ca8f957 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b6e32f3585823c9708c70aa70aa70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 14 11:15:36 2023 +0200 ntdll: Don't define stdcall functions on non-i386. --- dlls/ntdll/exception.c | 9 +++++++-- dlls/ntdll/signal_arm.c | 8 ++++---- dlls/ntdll/signal_arm64.c | 8 ++++---- dlls/ntdll/signal_x86_64.c | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index f6855bf651e..48d79c0cd18 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -670,7 +670,6 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) __ENDTRY return FALSE; } -__ASM_STDCALL_IMPORT(IsBadStringPtrA,8) /************************************************************* * IsBadStringPtrW @@ -692,8 +691,14 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) __ENDTRY return FALSE; } -__ASM_STDCALL_IMPORT(IsBadStringPtrW,8) +#ifdef __i386__ +__ASM_STDCALL_IMPORT(IsBadStringPtrA,8) +__ASM_STDCALL_IMPORT(IsBadStringPtrW,8) +#else +__ASM_GLOBAL_IMPORT(IsBadStringPtrA) +__ASM_GLOBAL_IMPORT(IsBadStringPtrW) +#endif /********************************************************************** * RtlGetEnabledExtendedFeatures (NTDLL.@) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 73759191bea..f5b2f8c1252 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -103,7 +103,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlCaptureContext, 4, +__ASM_GLOBAL_FUNC( RtlCaptureContext, "str r1, [r0, #0x8]\n\t" /* context->R1 */ "mov r1, #0x0200000\n\t" /* CONTEXT_ARM */ "add r1, r1, #0x7\n\t" /* CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_FLOATING_POINT */ @@ -1451,7 +1451,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlRaiseException, 4, +__ASM_GLOBAL_FUNC( RtlRaiseException, "push {r0, lr}\n\t" __ASM_EHABI(".save {r0, lr}\n\t") __ASM_SEH(".seh_save_regs {r0, lr}\n\t") @@ -1498,11 +1498,11 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "udf #0xfe; bx lr; nop; nop; nop; nop" ); +__ASM_GLOBAL_FUNC( DbgBreakPoint, "udf #0xfe; bx lr; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "udf #0xfe; bx lr; nop; nop; nop; nop" ); +__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "udf #0xfe; bx lr; nop; nop; nop; nop" ); #endif /* __arm__ */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a19aa2f54b0..dfc5c0e31ed 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -110,7 +110,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "ret") /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlCaptureContext, 8, +__ASM_GLOBAL_FUNC( RtlCaptureContext, "str xzr, [x0, #0x8]\n\t" /* context->X0 */ "stp x1, x2, [x0, #0x10]\n\t" /* context->X1,X2 */ "stp x3, x4, [x0, #0x20]\n\t" /* context->X3,X4 */ @@ -1489,7 +1489,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -__ASM_STDCALL_FUNC( RtlRaiseException, 4, +__ASM_GLOBAL_FUNC( RtlRaiseException, "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ "stp x29, x30, [sp]\n\t" __ASM_SEH(".seh_stackalloc 0x3b0\n\t") @@ -1535,14 +1535,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0xf000; ret" +__ASM_GLOBAL_FUNC( DbgBreakPoint, "brk #0xf000; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0xf000; ret" +__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "brk #0xf000; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d514ece8787..66cabfd5e64 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1614,14 +1614,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret" +__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret" +__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" );

1 0

Alexandre Julliard : wow64cpu: Don't define stdcall functions on non-i386.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: ed36f4bc8cbe9c4082bbfb739a41ac8503e256d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed36f4bc8cbe9c4082bbfb739a41ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 14 11:15:46 2023 +0200 wow64cpu: Don't define stdcall functions on non-i386. --- dlls/wow64cpu/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index aacd3ea4b85..5a679c56d1e 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -267,7 +267,7 @@ __ASM_GLOBAL_FUNC( unix_call_32to64, /********************************************************************** * BTCpuSimulate (wow64cpu.@) */ -__ASM_STDCALL_FUNC( BTCpuSimulate, 0, +__ASM_GLOBAL_FUNC( BTCpuSimulate, "subq $0x28,%rsp\n" __ASM_SEH(".seh_stackalloc 0x28\n\t") __ASM_SEH(".seh_endprologue\n\t")

1 0

Alexandre Julliard : include: Don't support stdcall functions on non-i386.
by Alexandre Julliard 14 Jun '23

14 Jun '23

Module: wine Branch: master Commit: 250efdf0c6315661fdce64c6516a32eba78f0875 URL: https://gitlab.winehq.org/wine/wine/-/commit/250efdf0c6315661fdce64c6516a32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 14 11:16:10 2023 +0200 include: Don't support stdcall functions on non-i386. --- include/wine/asm.h | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 61e197d9586..a158449d6a5 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -33,14 +33,6 @@ # define __ASM_LOCAL_LABEL(label) ".L" label #endif -#if defined(__WINE_PE_BUILD) && defined(__i386__) -# define __ASM_STDCALL(name,args) "_" name "@" #args -# define __ASM_FASTCALL(name,args) "@" name "@" #args -#else -# define __ASM_STDCALL(name,args) __ASM_NAME(name) -# define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name) -#endif - #if defined(__GCC_HAVE_DWARF2_CFI_ASM) || ((defined(__APPLE__) || defined(__clang__)) && defined(__GNUC__) && !defined(__SEH__)) # define __ASM_CFI(str) str #else @@ -102,29 +94,40 @@ __ASM_BLOCK_END #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) -#define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) -#define __ASM_FASTCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_FASTCALL(#name,args),code) /* import variables */ -#ifdef _WIN64 -#define __ASM_DEFINE_IMPORT(name) \ +#ifdef __WINE_PE_BUILD +# ifdef _WIN64 +# define __ASM_DEFINE_IMPORT(name) \ __ASM_BLOCK_BEGIN(__LINE__) \ asm(".data\n\t.balign 8\n\t.globl __imp_" name "\n__imp_" name ":\n\t.quad " name "\n\t.text"); \ __ASM_BLOCK_END -#else -#define __ASM_DEFINE_IMPORT(name) \ +# else +# define __ASM_DEFINE_IMPORT(name) \ __ASM_BLOCK_BEGIN(__LINE__) \ asm(".data\n\t.balign 4\n\t.globl __imp_" name "\n__imp_" name ":\n\t.long " name "\n\t.text"); \ __ASM_BLOCK_END +# endif +# define __ASM_GLOBAL_IMPORT(name) __ASM_DEFINE_IMPORT(__ASM_NAME(#name)) +#else +# define __ASM_GLOBAL_IMPORT(name) /* nothing */ #endif -#ifdef __WINE_PE_BUILD -#define __ASM_GLOBAL_IMPORT(name) __ASM_DEFINE_IMPORT(__ASM_NAME(#name)) -#define __ASM_STDCALL_IMPORT(name,args) __ASM_DEFINE_IMPORT(__ASM_STDCALL(#name,args)) -#else -#define __ASM_GLOBAL_IMPORT(name) /* nothing */ -#define __ASM_STDCALL_IMPORT(name,args) /* nothing */ +/* stdcall support */ + +#ifdef __i386__ +# ifdef __WINE_PE_BUILD +# define __ASM_STDCALL(name,args) "_" name "@" #args +# define __ASM_FASTCALL(name,args) "@" name "@" #args +# define __ASM_STDCALL_IMPORT(name,args) __ASM_DEFINE_IMPORT(__ASM_STDCALL(#name,args)) +# else +# define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name) +# define __ASM_STDCALL_IMPORT(name,args) /* nothing */ +# endif +# define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) +# define __ASM_FASTCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_FASTCALL(#name,args),code) #endif /* fastcall support */ @@ -188,10 +191,4 @@ #endif /* __i386__ */ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(__WINE_PE_BUILD) && !defined(__APPLE__) && !defined(__ANDROID__) -#define __ASM_OBSOLETE(func) __asm__( ".symver " #func "_obsolete," #func "@WINE_1.0" ) -#else -#undef __ASM_OBSOLETE -#endif - #endif /* __WINE_WINE_ASM_H */

1 0

Eric Pouech : kernel32/tests: Extend console inheritance tests.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: 766448f8ffe51b83105bd0795a5cbc7b8f7c8894 URL: https://gitlab.winehq.org/wine/wine/-/commit/766448f8ffe51b83105bd0795a5cbc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 13 14:40:10 2023 +0200 kernel32/tests: Extend console inheritance tests. - Define what the std handles are before inheriting them - Check access to parent console from child through std handles Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 212 +++++++++++++++++++++++++++++++----------- 1 file changed, 157 insertions(+), 55 deletions(-)

1 0

Rémi Bernon : server: Update desktop cursor window when cursor pos changes.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: 10f5ff7f06595bf9d1f487f91dbbd869e5105d26 URL: https://gitlab.winehq.org/wine/wine/-/commit/10f5ff7f06595bf9d1f487f91dbbd8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 10 18:12:13 2023 +0200 server: Update desktop cursor window when cursor pos changes. --- server/queue.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/server/queue.c b/server/queue.c index 57067dd6f51..74462ebedee 100644 --- a/server/queue.c +++ b/server/queue.c @@ -404,8 +404,16 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour return msg; } -static int update_desktop_cursor_pos( struct desktop *desktop, int x, int y ) +static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t win ) { + int updated = win != desktop->cursor.win; + desktop->cursor.win = win; + return updated; +} + +static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y ) +{ + struct thread_input *input; int updated; x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); @@ -415,6 +423,11 @@ static int update_desktop_cursor_pos( struct desktop *desktop, int x, int y ) desktop->cursor.y = y; desktop->cursor.last_change = get_tick_count(); + if (!win && (input = desktop->foreground_input)) win = input->capture; + if (!win || !is_window_visible( win ) || is_window_transparent( win )) + win = shallow_window_from_point( desktop, x, y ); + if (update_desktop_cursor_window( desktop, win )) updated = 1; + return updated; } @@ -427,7 +440,7 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) if ((device = current->process->rawinput_mouse) && (device->flags & RIDEV_NOLEGACY)) { - update_desktop_cursor_pos( desktop, x, y ); + update_desktop_cursor_pos( desktop, 0, x, y ); return; } @@ -1457,11 +1470,8 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys } /* update the desktop key state according to a mouse message flags */ -static void update_desktop_mouse_state( struct desktop *desktop, unsigned int flags, - int x, int y, lparam_t wparam ) +static void update_desktop_mouse_state( struct desktop *desktop, unsigned int flags, lparam_t wparam ) { - if (flags & MOUSEEVENTF_MOVE) - update_desktop_cursor_pos( desktop, x, y ); if (flags & MOUSEEVENTF_LEFTDOWN) update_input_key_state( desktop, desktop->keystate, WM_LBUTTONDOWN, wparam ); if (flags & MOUSEEVENTF_LEFTUP) @@ -1630,7 +1640,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg break; case QS_MOUSEMOVE: prepend_cursor_history( msg->x, msg->y, msg->time, msg_data->info ); - if (update_desktop_cursor_pos( desktop, msg->x, msg->y )) always_queue = 1; + if (update_desktop_cursor_pos( desktop, msg->win, msg->x, msg->y )) always_queue = 1; /* fallthrough */ case QS_MOUSEBUTTON: if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; @@ -1661,9 +1671,6 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } input = thread->queue->input; - if (win != desktop->cursor.win) always_queue = 1; - desktop->cursor.win = win; - if (!always_queue || merge_message( input, msg )) free_message( msg ); else { @@ -1887,7 +1894,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if ((device = current->process->rawinput_mouse) && (device->flags & RIDEV_NOLEGACY)) { - update_desktop_mouse_state( desktop, flags, x, y, input->mouse.data << 16 ); + if (flags & MOUSEEVENTF_MOVE) update_desktop_cursor_pos( desktop, win, x, y ); + update_desktop_mouse_state( desktop, flags, input->mouse.data << 16 ); return 0; }

1 0

Rémi Bernon : server: Keep track of the current desktop cursor handle.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: b04ef1993054a5e8dc3413beadf10150457a7b39 URL: https://gitlab.winehq.org/wine/wine/-/commit/b04ef1993054a5e8dc3413beadf101… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 22 11:50:13 2022 +0100 server: Keep track of the current desktop cursor handle. --- server/queue.c | 11 +++++++++++ server/user.h | 1 + 2 files changed, 12 insertions(+) diff --git a/server/queue.c b/server/queue.c index 74462ebedee..7428685f94f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -431,6 +431,11 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win return updated; } +static void update_desktop_cursor_handle( struct desktop *desktop, user_handle_t handle ) +{ + desktop->cursor.handle = handle; +} + /* set the cursor position and queue the corresponding mouse message */ static void set_cursor_pos( struct desktop *desktop, int x, int y ) { @@ -3356,6 +3361,12 @@ DECL_HANDLER(set_cursor) if (req->flags & SET_CURSOR_CLIP) set_clip_rectangle( desktop, &req->clip, 0 ); if (req->flags & SET_CURSOR_NOCLIP) set_clip_rectangle( desktop, NULL, 0 ); + if (req->flags & (SET_CURSOR_HANDLE | SET_CURSOR_COUNT)) + { + if (input->cursor_count < 0) update_desktop_cursor_handle( desktop, 0 ); + else update_desktop_cursor_handle( desktop, input->cursor ); + } + reply->new_x = desktop->cursor.x; reply->new_y = desktop->cursor.y; reply->new_clip = desktop->cursor.clip; diff --git a/server/user.h b/server/user.h index a18c94ec89d..f67e710938f 100644 --- a/server/user.h +++ b/server/user.h @@ -59,6 +59,7 @@ struct global_cursor rectangle_t clip; /* cursor clip rectangle */ unsigned int last_change; /* time of last position change */ user_handle_t win; /* window that contains the cursor */ + user_handle_t handle; /* last set cursor handle */ }; struct desktop

1 0