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

Elizabeth Figura : ntdll: Use file_complete_async() in NtFsControlFile().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 0db0f6180d3837212b59b53a90757a389df2d611 URL: https://gitlab.winehq.org/wine/wine/-/commit/0db0f6180d3837212b59b53a90757a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 22:30:16 2024 -0500 ntdll: Use file_complete_async() in NtFsControlFile(). --- dlls/ntdll/unix/file.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c9a0b023d23..b8fb4f19e13 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6182,6 +6182,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { + ULONG_PTR size = 0; NTSTATUS status; TRACE( "(%p,%p,%p,%p,%p,0x%08x,%p,0x%08x,%p,0x%08x)\n", @@ -6225,7 +6226,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap buffer->StartingVcn.QuadPart = 1; buffer->Extents[0].NextVcn.QuadPart = 0; buffer->Extents[0].Lcn.QuadPart = 0; - io->Information = sizeof(RETRIEVAL_POINTERS_BUFFER); + size = sizeof(RETRIEVAL_POINTERS_BUFFER); status = STATUS_SUCCESS; } else @@ -6259,7 +6260,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap memset( info, 0, sizeof(*info) ); memcpy( info->ObjectId, &st.st_dev, sizeof(st.st_dev) ); memcpy( info->ObjectId + 8, &st.st_ino, sizeof(st.st_ino) ); - io->Information = sizeof(*info); + size = sizeof(*info); } else status = STATUS_BUFFER_TOO_SMALL; break; @@ -6267,7 +6268,6 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap case FSCTL_SET_SPARSE: TRACE("FSCTL_SET_SPARSE: Ignoring request\n"); - io->Information = 0; status = STATUS_SUCCESS; break; default: @@ -6275,7 +6275,8 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap in_buffer, in_size, out_buffer, out_size ); } - if (!NT_ERROR(status) && status != STATUS_PENDING) io->Status = status; + if (!NT_ERROR(status) && status != STATUS_PENDING) + file_complete_async( handle, event, apc, apc_context, io, status, size ); return status; }

1 0

Aida Jonikienė : ntdll: Fix params_mask type in NtRaiseHardError().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 5eafe53e5449a5a2602d947a3f1d0864a2f6e476 URL: https://gitlab.winehq.org/wine/wine/-/commit/5eafe53e5449a5a2602d947a3f1d08… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Tue Mar 5 10:06:23 2024 +0200 ntdll: Fix params_mask type in NtRaiseHardError(). Real-world app testing reveals that parameter isn't used as a pointer (so change it to an integer). --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm64ec.c | 2 +- dlls/ntdll/unix/system.c | 4 ++-- include/winternl.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f82146c6d39..9147cdca3cd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -340,7 +340,7 @@ @ stdcall -syscall NtQueueApcThread(long ptr long long long) @ stdcall -syscall NtQueueApcThreadEx(long long ptr long long long) @ stdcall -syscall NtRaiseException(ptr ptr long) -@ stdcall -syscall NtRaiseHardError(long long ptr ptr long ptr) +@ stdcall -syscall NtRaiseHardError(long long long ptr long ptr) @ stdcall -syscall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) # @ stub NtReadRequestData @@ -1389,7 +1389,7 @@ @ stdcall -private -syscall ZwQueueApcThread(long ptr long long long) NtQueueApcThread @ stdcall -private -syscall ZwQueueApcThreadEx(long long ptr long long long) NtQueueApcThreadEx @ stdcall -private -syscall ZwRaiseException(ptr ptr long) NtRaiseException -@ stdcall -private -syscall ZwRaiseHardError(long long ptr ptr long ptr) NtRaiseHardError +@ stdcall -private -syscall ZwRaiseHardError(long long long ptr long ptr) NtRaiseHardError @ stdcall -private -syscall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile @ stdcall -private -syscall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter # @ stub ZwReadRequestData diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 44b026fc044..393d5f7e697 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -270,7 +270,7 @@ DEFINE_SYSCALL(NtQueryVolumeInformationFile, (HANDLE handle, IO_STATUS_BLOCK *io DEFINE_SYSCALL(NtQueueApcThread, (HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_SYSCALL(NtQueueApcThreadEx, (HANDLE handle, HANDLE reserve_handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_WRAPPED_SYSCALL(NtRaiseException, (EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *context, BOOL first_chance)) -DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, UNICODE_STRING *params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) +DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) DEFINE_SYSCALL(NtReadFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadFileScatter, (HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadVirtualMemory, (HANDLE process, const void *addr, void *buffer, SIZE_T size, SIZE_T *bytes_read)) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index eb5e60af7b9..efb6e7f4579 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -4073,10 +4073,10 @@ NTSTATUS WINAPI NtDisplayString( UNICODE_STRING *string ) * NtRaiseHardError (NTDLL.@) */ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count, - UNICODE_STRING *params_mask, void **params, + ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response ) { - FIXME( "%08x stub\n", (int)status ); + FIXME( "%#08x %u %#x %p %u %p: stub\n", (int)status, (int)count, (int)params_mask, params, option, response ); return STATUS_NOT_IMPLEMENTED; } diff --git a/include/winternl.h b/include/winternl.h index 22cdceeaedb..8406d4b8d46 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4564,7 +4564,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVO NTSYSAPI NTSTATUS WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); -NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,PUNICODE_STRING,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); +NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,ULONG,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); NTSYSAPI NTSTATUS WINAPI NtReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG);

1 0

Alex Henrie : ntdll: Don't special-case default values in RtlQueryRegistryValues.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 7053e0f641bd992d03219e54f7f5b2803d8b391c URL: https://gitlab.winehq.org/wine/wine/-/commit/7053e0f641bd992d03219e54f7f5b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 23 21:48:45 2024 -0600 ntdll: Don't special-case default values in RtlQueryRegistryValues. Additional tests reveal that RTL_QUERY_REGISTRY_DIRECT does work with non-string default values, it just requires a pointer to the value and it doesn't infer the size automatically. That means that the same code can be used to handle both default and non-default values. --- dlls/ntdll/reg.c | 102 ++++++++++++++++++++++++------------------------- dlls/ntdll/tests/reg.c | 89 ++++++++++++++++++++++++++++++++---------- 2 files changed, 118 insertions(+), 73 deletions(-)

1 0

Davide Beatrici : mmdevapi: Return errors early in adjust_timing().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 5dcb879df1aa18dab2c97a0b963aafbf7079a68f URL: https://gitlab.winehq.org/wine/wine/-/commit/5dcb879df1aa18dab2c97a0b963aaf… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 19 02:51:58 2024 +0200 mmdevapi: Return errors early in adjust_timing(). --- dlls/mmdevapi/client.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index ed635bcf98a..1058c639ff9 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -140,21 +140,21 @@ static HRESULT adjust_timing(struct audio_client *client, const WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)fmt; if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + return AUDCLNT_E_UNSUPPORTED_FORMAT; else { if (*period == 0) *period = def_period; if (*period < min_period || *period > 5000000) - hr = AUDCLNT_E_INVALID_DEVICE_PERIOD; + return AUDCLNT_E_INVALID_DEVICE_PERIOD; else if (*duration > 20000000) /* The smaller the period, the lower this limit. */ - hr = AUDCLNT_E_BUFFER_SIZE_ERROR; + return AUDCLNT_E_BUFFER_SIZE_ERROR; else if (flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { if (*duration != *period) - hr = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - hr = AUDCLNT_E_DEVICE_IN_USE; + return AUDCLNT_E_DEVICE_IN_USE; } else if (*duration < 8 * *period) *duration = 8 * *period; /* May grow above 2s. */ }

1 0

Davide Beatrici : mmdevapi: Introduce helper stream_init().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 73a501ab46581be49be0bcd52db93fb7c0dec8a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/73a501ab46581be49be0bcd52db93f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 20 19:58:07 2024 +0200 mmdevapi: Introduce helper stream_init(). --- dlls/mmdevapi/client.c | 183 ++++++++++++++++++++++++++----------------------- 1 file changed, 96 insertions(+), 87 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 1058c639ff9..7a141f03e19 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -355,6 +355,100 @@ skip: return wcsdup(name); } +static HRESULT stream_init(struct audio_client *client, + const AUDCLNT_SHAREMODE mode, const DWORD flags, + REFERENCE_TIME duration, REFERENCE_TIME period, + const WAVEFORMATEX *fmt, const GUID *sessionguid) +{ + struct create_stream_params params; + UINT32 i, channel_count; + stream_handle stream; + WCHAR *name; + + if (!fmt) + return E_POINTER; + + dump_fmt(fmt); + + if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) + return E_INVALIDARG; + + if (flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | + AUDCLNT_STREAMFLAGS_LOOPBACK | + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | + AUDCLNT_STREAMFLAGS_NOPERSIST | + AUDCLNT_STREAMFLAGS_RATEADJUST | + AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) { + FIXME("Unknown flags: %08lx\n", flags); + return E_INVALIDARG; + } + + if (FAILED(params.result = adjust_timing(client, &duration, &period, mode, flags, fmt))) + return params.result; + + sessions_lock(); + + if (client->stream) { + sessions_unlock(); + return AUDCLNT_E_ALREADY_INITIALIZED; + } + + if (FAILED(params.result = main_loop_start())) { + sessions_unlock(); + return params.result; + } + + params.name = name = get_application_name(); + params.device = client->device_name; + params.flow = client->dataflow; + params.share = mode; + params.flags = flags; + params.duration = duration; + params.period = period; + params.fmt = fmt; + params.channel_count = &channel_count; + params.stream = &stream; + + wine_unix_call(create_stream, &params); + + free(name); + + if (FAILED(params.result)) { + sessions_unlock(); + return params.result; + } + + if (!(client->vols = malloc(channel_count * sizeof(*client->vols)))) { + params.result = E_OUTOFMEMORY; + goto exit; + } + + for (i = 0; i < channel_count; i++) + client->vols[i] = 1.f; + + params.result = get_audio_session(sessionguid, client->parent, channel_count, &client->session); + +exit: + if (FAILED(params.result)) { + stream_release(stream, NULL); + free(client->vols); + client->vols = NULL; + } else { + list_add_tail(&client->session->clients, &client->entry); + client->stream = stream; + client->channel_count = channel_count; + set_stream_volumes(client); + } + + sessions_unlock(); + + return params.result; +} + static HRESULT WINAPI capture_QueryInterface(IAudioCaptureClient *iface, REFIID riid, void **ppv) { struct audio_client *This = impl_from_IAudioCaptureClient(iface); @@ -537,97 +631,12 @@ static HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE const WAVEFORMATEX *fmt, const GUID *sessionguid) { struct audio_client *This = impl_from_IAudioClient3(iface); - struct create_stream_params params; - UINT32 i, channel_count; - stream_handle stream; - WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); - if (!fmt) - return E_POINTER; - - dump_fmt(fmt); - - if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return E_INVALIDARG; - - if (flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | - AUDCLNT_STREAMFLAGS_LOOPBACK | - AUDCLNT_STREAMFLAGS_EVENTCALLBACK | - AUDCLNT_STREAMFLAGS_NOPERSIST | - AUDCLNT_STREAMFLAGS_RATEADJUST | - AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | - AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | - AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) { - FIXME("Unknown flags: %08lx\n", flags); - return E_INVALIDARG; - } - - if (FAILED(params.result = adjust_timing(This, &duration, &period, mode, flags, fmt))) - return params.result; - - sessions_lock(); - - if (This->stream) { - sessions_unlock(); - return AUDCLNT_E_ALREADY_INITIALIZED; - } - - if (FAILED(params.result = main_loop_start())) { - sessions_unlock(); - return params.result; - } - - params.name = name = get_application_name(); - params.device = This->device_name; - params.flow = This->dataflow; - params.share = mode; - params.flags = flags; - params.duration = duration; - params.period = period; - params.fmt = fmt; - params.channel_count = &channel_count; - params.stream = &stream; - - wine_unix_call(create_stream, &params); - - free(name); - - if (FAILED(params.result)) { - sessions_unlock(); - return params.result; - } - - if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) { - params.result = E_OUTOFMEMORY; - goto exit; - } - - for (i = 0; i < channel_count; i++) - This->vols[i] = 1.f; - - params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); - -exit: - if (FAILED(params.result)) { - stream_release(stream, NULL); - free(This->vols); - This->vols = NULL; - } else { - list_add_tail(&This->session->clients, &This->entry); - This->stream = stream; - This->channel_count = channel_count; - set_stream_volumes(This); - } - - sessions_unlock(); - - return params.result; + return stream_init(This, mode, flags, duration, period, fmt, sessionguid); } static HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *out) @@ -1025,7 +1034,7 @@ static HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, D return E_POINTER; duration = period_frames * (REFERENCE_TIME)10000000 / format->nSamplesPerSec; - return client_Initialize(iface, AUDCLNT_SHAREMODE_SHARED, flags, duration, 0, format, session_guid); + return stream_init(This, AUDCLNT_SHAREMODE_SHARED, flags, duration, 0, format, session_guid); } const IAudioClient3Vtbl AudioClient3_Vtbl =

1 0

Davide Beatrici : mmdevapi: Complete IAudioClient3_InitializeSharedAudioStream.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 9d046996cb2f150c39cfe341f6a8a29513d00736 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d046996cb2f150c39cfe341f6a8a2… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 20 20:00:02 2024 +0200 mmdevapi: Complete IAudioClient3_InitializeSharedAudioStream. --- dlls/mmdevapi/client.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 7a141f03e19..1d6eefd5dbb 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -117,7 +117,7 @@ static HRESULT get_periods(struct audio_client *client, return params.result; } -static HRESULT adjust_timing(struct audio_client *client, +static HRESULT adjust_timing(struct audio_client *client, const BOOLEAN force_def_period, REFERENCE_TIME *duration, REFERENCE_TIME *period, const AUDCLNT_SHAREMODE mode, const DWORD flags, const WAVEFORMATEX *fmt) @@ -133,7 +133,10 @@ static HRESULT adjust_timing(struct audio_client *client, TRACE("Device periods: %lu default and %lu minimum\n", (ULONG)def_period, (ULONG)min_period); if (mode == AUDCLNT_SHAREMODE_SHARED) { - *period = def_period; + if (*period == 0 || force_def_period) + *period = def_period; + else if (*period < min_period) + return AUDCLNT_E_INVALID_DEVICE_PERIOD; if (*duration < 3 * *period) *duration = 3 * *period; } else { @@ -355,7 +358,7 @@ skip: return wcsdup(name); } -static HRESULT stream_init(struct audio_client *client, +static HRESULT stream_init(struct audio_client *client, const BOOLEAN force_def_period, const AUDCLNT_SHAREMODE mode, const DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, const GUID *sessionguid) @@ -387,7 +390,7 @@ static HRESULT stream_init(struct audio_client *client, return E_INVALIDARG; } - if (FAILED(params.result = adjust_timing(client, &duration, &period, mode, flags, fmt))) + if (FAILED(params.result = adjust_timing(client, force_def_period, &duration, &period, mode, flags, fmt))) return params.result; sessions_lock(); @@ -636,7 +639,7 @@ static HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); - return stream_init(This, mode, flags, duration, period, fmt, sessionguid); + return stream_init(This, TRUE, mode, flags, duration, period, fmt, sessionguid); } static HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *out) @@ -1027,14 +1030,16 @@ static HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, D const GUID *session_guid) { struct audio_client *This = impl_from_IAudioClient3(iface); - REFERENCE_TIME duration; - FIXME("(%p)->(0x%lx, %u, %p, %s) - partial stub\n", This, flags, period_frames, format, debugstr_guid(session_guid)); + REFERENCE_TIME period; + + TRACE("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); if (!format) return E_POINTER; - duration = period_frames * (REFERENCE_TIME)10000000 / format->nSamplesPerSec; - return stream_init(This, AUDCLNT_SHAREMODE_SHARED, flags, duration, 0, format, session_guid); + period = period_frames * (REFERENCE_TIME)10000000 / format->nSamplesPerSec; + + return stream_init(This, FALSE, AUDCLNT_SHAREMODE_SHARED, flags, 0, period, format, session_guid); } const IAudioClient3Vtbl AudioClient3_Vtbl =

1 0

Davide Beatrici : mmdevapi: Complete IAudioClient3_GetSharedModeEnginePeriod.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 235d527fa51b7d1ef25f9944d2bd69f05f67ce96 URL: https://gitlab.winehq.org/wine/wine/-/commit/235d527fa51b7d1ef25f9944d2bd69… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 20 20:03:51 2024 +0200 mmdevapi: Complete IAudioClient3_GetSharedModeEnginePeriod. --- dlls/mmdevapi/client.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 1d6eefd5dbb..e0344aefa54 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -1002,17 +1002,23 @@ static HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface, UINT32 *max_period_frames) { struct audio_client *This = impl_from_IAudioClient3(iface); - FIXME("(%p)->(%p, %p, %p, %p, %p) - partial stub\n", + REFERENCE_TIME def_period, min_period; + HRESULT hr; + + TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames, min_period_frames, max_period_frames); - *default_period_frames = - *min_period_frames = - *max_period_frames = - format->nSamplesPerSec / 100; /* ~10ms */ - *unit_period_frames = 1; - return S_OK; + if (FAILED(hr = get_periods(This, &def_period, &min_period))) + return hr; + + *default_period_frames = def_period * format->nSamplesPerSec / (REFERENCE_TIME)10000000; + *min_period_frames = min_period * format->nSamplesPerSec / (REFERENCE_TIME)10000000; + *max_period_frames = *default_period_frames; + *unit_period_frames = 1; + + return hr; } static HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,

1 0

Davide Beatrici : mmdevapi: Implement IAudioClient3_GetCurrentSharedModeEnginePeriod.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: b34b5d84a6b5387a5d44cad34558676f01de5f4f URL: https://gitlab.winehq.org/wine/wine/-/commit/b34b5d84a6b5387a5d44cad3455867… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 21 22:38:56 2024 +0200 mmdevapi: Implement IAudioClient3_GetCurrentSharedModeEnginePeriod. --- dlls/mmdevapi/client.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index e0344aefa54..132b6abae5e 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -1026,8 +1026,18 @@ static HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *ifa UINT32 *cur_period_frames) { struct audio_client *This = impl_from_IAudioClient3(iface); - FIXME("(%p)->(%p, %p) - stub\n", This, cur_format, cur_period_frames); - return E_NOTIMPL; + UINT32 dummy; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); + + if (!cur_format || !cur_period_frames) + return E_POINTER; + + if (FAILED(hr = client_GetMixFormat(iface, cur_format))) + return hr; + + return client_GetSharedModeEnginePeriod(iface, *cur_format, cur_period_frames, &dummy, &dummy, &dummy); } static HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags,

1 0

Eric Pouech : cmd: Factorize code for reading a new line for parser.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 8ad0923515122533423f9135d0880939a7455b27 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ad0923515122533423f9135d08809… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed May 1 14:53:47 2024 +0200 cmd: Factorize code for reading a new line for parser. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 173 +++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 96 deletions(-)

1 0

Eric Pouech : cmd: Remove unrelated parameter to WCMD_show_prompt.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: f45588c57f5650df548430fc77192824c82044ac URL: https://gitlab.winehq.org/wine/wine/-/commit/f45588c57f5650df548430fc771928… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 6 10:11:55 2024 +0200 cmd: Remove unrelated parameter to WCMD_show_prompt. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index aa7a74cc104..d97aff3bcd3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -322,8 +322,8 @@ void WCMD_print_error (void) { * */ -static void WCMD_show_prompt (BOOL newLine) { - +static void WCMD_show_prompt(void) +{ int status; WCHAR out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH]; WCHAR *p, *q; @@ -335,10 +335,6 @@ static void WCMD_show_prompt (BOOL newLine) { } p = prompt_string; q = out_string; - if (newLine) { - *q++ = '\r'; - *q++ = '\n'; - } *q = '\0'; while (*p != '\0') { if (*p != '$') { @@ -2570,7 +2566,8 @@ static WCHAR *fetch_next_line(BOOL feed, BOOL first_line, HANDLE from, WCHAR* bu const size_t len = wcslen(L"echo."); size_t curr_size = wcslen(buffer); size_t min_len = curr_size < len ? curr_size : len; - WCMD_show_prompt(TRUE); + WCMD_output_asis(L"\r\n"); + WCMD_show_prompt(); WCMD_output_asis(buffer); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ @@ -3644,7 +3641,6 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) WCHAR *cmd = NULL; WCHAR string[1024]; WCHAR envvar[4]; - BOOL promptNewLine = TRUE; BOOL opt_q; int opt_t = 0; WCHAR comspec[MAX_PATH]; @@ -3998,16 +3994,17 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) interactive = TRUE; if (!opt_k) WCMD_version (); + if (echo_mode) WCMD_output_asis(L"\r\n"); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect in place, may occur */ - if (echo_mode) WCMD_show_prompt(promptNewLine); + if (echo_mode) WCMD_show_prompt(); if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) break; WCMD_process_commands(toExecute, FALSE, FALSE); node_dispose_tree(toExecute); - promptNewLine = !!toExecute; + if (toExecute && echo_mode) WCMD_output_asis(L"\r\n"); toExecute = NULL; } return 0;

1 0