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

Davide Beatrici : winecoreaudio: Use standard allocator in AudioClient's Initialize.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 92a251a9afd76355b3429a0c175403fb1a0c9bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/92a251a9afd76355b3429a0c175403… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jun 25 00:35:52 2023 +0200 winecoreaudio: Use standard allocator in AudioClient's Initialize. --- dlls/winecoreaudio.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f7f72f43d83..995859fb5fd 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -416,7 +416,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) list_remove(&This->entry); sessions_unlock(); } - HeapFree(GetProcessHeap(), 0, This->vols); + free(This->vols); IMMDevice_Release(This->parent); IUnknown_Release(This->marshal); HeapFree(GetProcessHeap(), 0, This); @@ -605,7 +605,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float)); + This->vols = malloc(channel_count * sizeof(float)); if(!This->vols){ params.result = E_OUTOFMEMORY; goto end; @@ -622,7 +622,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, end: if(FAILED(params.result)){ stream_release(stream, NULL); - HeapFree(GetProcessHeap(), 0, This->vols); + free(This->vols); This->vols = NULL; }else{ This->stream = stream;

1 0

Davide Beatrici : wineoss: Use standard allocator in AudioClient's Initialize.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: a1cbc47bbc2dbc95e8834e24b641b63b879769a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1cbc47bbc2dbc95e8834e24b641b6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jun 25 00:36:15 2023 +0200 wineoss: Use standard allocator in AudioClient's Initialize. --- dlls/wineoss.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 5f2236ce63e..7a079917acb 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -398,7 +398,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) list_remove(&This->entry); sessions_unlock(); } - HeapFree(GetProcessHeap(), 0, This->vols); + free(This->vols); if(This->stream) stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); @@ -587,7 +587,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float)); + This->vols = malloc(channel_count * sizeof(float)); if(!This->vols){ params.result = E_OUTOFMEMORY; goto exit; @@ -600,7 +600,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: if(FAILED(params.result)){ stream_release(stream, NULL); - HeapFree(GetProcessHeap(), 0, This->vols); + free(This->vols); This->vols = NULL; } else { list_add_tail(&This->session->clients, &This->entry);

1 0

Davide Beatrici : winepulse: Move AudioClient's Initialize into mmdevapi.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: a15a066a094ad2b8cf668614cc73ab5685cf58e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a15a066a094ad2b8cf668614cc73ab… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 21 12:44:07 2023 +0200 winepulse: Move AudioClient's Initialize into mmdevapi. --- dlls/mmdevapi/audiosessionmanager.c | 6 ++ dlls/mmdevapi/client.c | 97 +++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/mmdevdrv.c | 136 ++---------------------------------- 6 files changed, 110 insertions(+), 135 deletions(-)

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's Initialize.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 964356e932484f58bf8768cd42a4a39e4689d0d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/964356e932484f58bf8768cd42a4a3… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 06:02:22 2023 +0200 winealsa: Use mmdevapi's AudioClient's Initialize. --- dlls/winealsa.drv/mmdevdrv.c | 139 +------------------------------------------ 1 file changed, 3 insertions(+), 136 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3b73ec91725..cff2aff261d 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -76,17 +76,11 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; -extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; - extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); -extern WCHAR *get_application_name(void); - -extern void set_stream_volumes(struct audio_client *This); - void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -429,40 +423,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) return ref; } -static void dump_fmt(const WAVEFORMATEX *fmt) -{ - TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); - switch(fmt->wFormatTag){ - case WAVE_FORMAT_PCM: - TRACE("WAVE_FORMAT_PCM"); - break; - case WAVE_FORMAT_IEEE_FLOAT: - TRACE("WAVE_FORMAT_IEEE_FLOAT"); - break; - case WAVE_FORMAT_EXTENSIBLE: - TRACE("WAVE_FORMAT_EXTENSIBLE"); - break; - default: - TRACE("Unknown"); - break; - } - TRACE(")\n"); - - TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec); - TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); - TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); - TRACE("cbSize: %u\n", fmt->cbSize); - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask); - TRACE("Samples: %04x\n", fmtex->Samples.wReserved); - TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); - } -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -542,103 +502,10 @@ HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, +extern HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, - const GUID *sessionguid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct create_stream_params params; - stream_handle stream; - unsigned int i, channel_count; - 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; - - 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; - } - - sessions_lock(); - - if(This->stream){ - sessions_unlock(); - return AUDCLNT_E_ALREADY_INITIALIZED; - } - - if(FAILED(params.result = main_loop_start())){ - sessions_unlock(); - return params.result; - } - - dump_fmt(fmt); - - 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; - - ALSA_CALL(create_stream, &params); - - free(name); - - if(FAILED(params.result)){ - sessions_unlock(); - return params.result; - } - - This->vols = malloc(channel_count * sizeof(float)); - if(!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); - if(FAILED(params.result)) - goto exit; - - list_add_tail(&This->session->clients, &This->entry); - -exit: - if(FAILED(params.result)){ - stream_release(stream, NULL); - free(This->vols); - This->vols = NULL; - }else{ - This->stream = stream; - This->channel_count = channel_count; - set_stream_volumes(This); - } - - sessions_unlock(); - - return params.result; -} + const GUID *sessionguid); extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *out); @@ -697,7 +564,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_QueryInterface, AudioClient_AddRef, AudioClient_Release, - AudioClient_Initialize, + client_Initialize, client_GetBufferSize, client_GetStreamLatency, client_GetCurrentPadding,

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's Initialize.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: f5d89202393384637ce54bfa477a4d84c40a80d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5d89202393384637ce54bfa477a4d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 06:02:44 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient's Initialize. --- dlls/winecoreaudio.drv/mmdevdrv.c | 139 +------------------------------------- 1 file changed, 3 insertions(+), 136 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 43c1a7a4cf9..b8c320563e6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -70,17 +70,11 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); -extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; - extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); -extern WCHAR *get_application_name(void); - -extern void set_stream_volumes(struct audio_client *This); - void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -424,40 +418,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) return ref; } -static void dump_fmt(const WAVEFORMATEX *fmt) -{ - TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); - switch(fmt->wFormatTag){ - case WAVE_FORMAT_PCM: - TRACE("WAVE_FORMAT_PCM"); - break; - case WAVE_FORMAT_IEEE_FLOAT: - TRACE("WAVE_FORMAT_IEEE_FLOAT"); - break; - case WAVE_FORMAT_EXTENSIBLE: - TRACE("WAVE_FORMAT_EXTENSIBLE"); - break; - default: - TRACE("Unknown"); - break; - } - TRACE(")\n"); - - TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec); - TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); - TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); - TRACE("cbSize: %u\n", fmt->cbSize); - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask); - TRACE("Samples: %04x\n", fmtex->Samples.wReserved); - TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); - } -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -537,103 +497,10 @@ HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, +extern HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, - const GUID *sessionguid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct create_stream_params params; - stream_handle stream; - UINT32 i, channel_count; - 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; - } - - 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; - - UNIX_CALL(create_stream, &params); - - free(name); - - if(FAILED(params.result)){ - sessions_unlock(); - return params.result; - } - - This->vols = malloc(channel_count * sizeof(float)); - if(!This->vols){ - params.result = E_OUTOFMEMORY; - goto end; - } - - for(i = 0; i < channel_count; ++i) - This->vols[i] = 1.f; - - params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); - if(FAILED(params.result)) goto end; - - list_add_tail(&This->session->clients, &This->entry); - -end: - if(FAILED(params.result)){ - stream_release(stream, NULL); - free(This->vols); - This->vols = NULL; - }else{ - This->stream = stream; - This->channel_count = channel_count; - set_stream_volumes(This); - } - - sessions_unlock(); - - return params.result; -} + const GUID *sessionguid); extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *frames); @@ -692,7 +559,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_QueryInterface, AudioClient_AddRef, AudioClient_Release, - AudioClient_Initialize, + client_Initialize, client_GetBufferSize, client_GetStreamLatency, client_GetCurrentPadding,

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's Initialize.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 5716a20d725c8ce99ccace3b543e60f3b83dc87a URL: https://gitlab.winehq.org/wine/wine/-/commit/5716a20d725c8ce99ccace3b543e60… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 06:03:09 2023 +0200 wineoss: Use mmdevapi's AudioClient's Initialize. --- dlls/wineoss.drv/mmdevdrv.c | 136 +------------------------------------------- 1 file changed, 3 insertions(+), 133 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 728c4c7779e..15e4308e67a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -82,17 +82,11 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; -extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; - extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); -extern WCHAR *get_application_name(void); - -extern void set_stream_volumes(struct audio_client *This); - void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -406,40 +400,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) return ref; } -static void dump_fmt(const WAVEFORMATEX *fmt) -{ - TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); - switch(fmt->wFormatTag){ - case WAVE_FORMAT_PCM: - TRACE("WAVE_FORMAT_PCM"); - break; - case WAVE_FORMAT_IEEE_FLOAT: - TRACE("WAVE_FORMAT_IEEE_FLOAT"); - break; - case WAVE_FORMAT_EXTENSIBLE: - TRACE("WAVE_FORMAT_EXTENSIBLE"); - break; - default: - TRACE("Unknown"); - break; - } - TRACE(")\n"); - - TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec); - TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); - TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); - TRACE("cbSize: %u\n", fmt->cbSize); - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask); - TRACE("Samples: %04x\n", fmtex->Samples.wReserved); - TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); - } -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -519,100 +479,10 @@ HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, +extern HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, - const GUID *sessionguid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct create_stream_params params; - stream_handle stream; - unsigned int i, channel_count; - 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; - } - - 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; - - OSS_CALL(create_stream, &params); - - free(name); - - if(FAILED(params.result)){ - sessions_unlock(); - return params.result; - } - - This->vols = malloc(channel_count * sizeof(float)); - if(!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; -} + const GUID *sessionguid); extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *frames); @@ -671,7 +541,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_QueryInterface, AudioClient_AddRef, AudioClient_Release, - AudioClient_Initialize, + client_Initialize, client_GetBufferSize, client_GetStreamLatency, client_GetCurrentPadding,

1 0

Jacek Caban : ntdll: Inherit ConsoleHandle only by CUI processes.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: dcf0bf1f383f8429136cb761f5170a04503a297b URL: https://gitlab.winehq.org/wine/wine/-/commit/dcf0bf1f383f8429136cb761f5170a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 21 13:43:20 2023 +0200 ntdll: Inherit ConsoleHandle only by CUI processes. --- dlls/kernel32/tests/console.c | 2 +- dlls/ntdll/unix/env.c | 5 +++-- dlls/ntdll/unix/process.c | 3 ++- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 24c1e5c69fd..4e164c11b3d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4951,7 +4951,7 @@ static void test_CreateProcessCUI(void) }, with_console_tests[] = { -/* 0*/ {FALSE, 0, NULL_STD, 0, TRUE}, +/* 0*/ {FALSE, 0, NULL_STD, 0}, {FALSE, DETACHED_PROCESS, NULL_STD, 0}, {FALSE, CREATE_NEW_CONSOLE, NULL_STD, 0}, {FALSE, CREATE_NO_WINDOW, NULL_STD, 0}, diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index fd505a7d2c2..8aa41aba183 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2128,7 +2128,7 @@ void init_startup_info(void) * create_startup_info */ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCESS_PARAMETERS *params, - DWORD *info_size ) + const pe_image_info_t *pe_info, DWORD *info_size ) { startup_info_t *info; UNICODE_STRING dos_image = *nt_image; @@ -2154,7 +2154,8 @@ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCES info->debug_flags = params->DebugFlags; info->console_flags = params->ConsoleFlags; - info->console = wine_server_obj_handle( params->ConsoleHandle ); + if (pe_info->subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) + info->console = wine_server_obj_handle( params->ConsoleHandle ); info->hstdin = wine_server_obj_handle( params->hStdInput ); info->hstdout = wine_server_obj_handle( params->hStdOutput ); info->hstderr = wine_server_obj_handle( params->hStdError ); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index fa8022d9968..91771705b67 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -802,7 +802,8 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ goto done; } if (!machine) machine = pe_info.machine; - if (!(startup_info = create_startup_info( attr.ObjectName, params, &startup_info_size ))) goto done; + if (!(startup_info = create_startup_info( attr.ObjectName, params, &pe_info, &startup_info_size ))) + goto done; env_size = get_env_size( params, &winedebug ); if ((status = alloc_object_attributes( process_attr, &objattr, &attr_len ))) goto done; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1f49d957e0d..6862d74b863 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -172,7 +172,7 @@ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HIDDEN; extern void init_startup_info(void) DECLSPEC_HIDDEN; extern void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCESS_PARAMETERS *params, - DWORD *info_size ) DECLSPEC_HIDDEN; + const pe_image_info_t *pe_info, DWORD *info_size ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern char *get_alternate_wineloader( WORD machine ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN;

1 0

Fabian Maurer : widl: Don't crash on nameless structs.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 0ce5584acc99d52842a04536806d9e0103f45c5a URL: https://gitlab.winehq.org/wine/wine/-/commit/0ce5584acc99d52842a04536806d9e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jun 23 21:15:49 2023 +0200 widl: Don't crash on nameless structs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49772 --- tools/widl/write_msft.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 457b20df259..a757af8adc9 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2225,6 +2225,9 @@ static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure) if (-1 < structure->typelib_idx) return; + if (!structure->name) + structure->name = gen_name(); + structure->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_RECORD, structure->name, structure->attrs); msft_typeinfo->typeinfo->size = 0;

1 0

Alexandre Julliard : packaging: Add Ubuntu 23.04.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: tools Branch: master Commit: 4f519f400c0a89ef334b26c8db226af8e9a5dba3 URL: https://gitlab.winehq.org/winehq/tools/-/commit/4f519f400c0a89ef334b26c8db2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 17:52:47 2023 +0200 packaging: Add Ubuntu 23.04. --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 3 ++- packaging/obs/rsync-filter | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 23ecbb6e..7f7adeb2 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -38,4 +38,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 33bfcebd..2f5f3b1a 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="36 37 bullseye bookworm bionic focal jammy kinetic" +distros="36 37 bullseye bookworm bionic focal jammy kinetic lunar" dry_run= build=1 @@ -258,6 +258,7 @@ do focal) add_deb ubuntu $i xUbuntu_20.04 ;; jammy) add_deb ubuntu $i xUbuntu_22.04 ;; kinetic) add_deb ubuntu $i xUbuntu_22.10 ;; + lunar) add_deb ubuntu $i xUbuntu_23.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index c174ff25..b4d96f55 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -18,6 +18,7 @@ + /ubuntu/dists/focal + /ubuntu/dists/jammy + /ubuntu/dists/kinetic ++ /ubuntu/dists/lunar - /ubuntu/dists/* - /ubuntu/*

1 0

Alexandre Julliard : packaging: Remove Ubuntu 18.04.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: tools Branch: master Commit: c6fe4df308a48223a2588a08a2c67134821317fd URL: https://gitlab.winehq.org/winehq/tools/-/commit/c6fe4df308a48223a2588a08a2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 16 14:00:20 2023 +0200 packaging: Remove Ubuntu 18.04. --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 7f7adeb2..e2e86bdf 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -22,10 +22,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Deb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 2f5f3b1a..63839a34 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="36 37 bullseye bookworm bionic focal jammy kinetic lunar" +distros="36 37 bullseye bookworm focal jammy kinetic lunar" dry_run= build=1 @@ -254,7 +254,6 @@ do 3?) add_rpm $i Fedora_$i ;; bullseye) add_deb debian $i Debian_11 stable ;; bookworm) add_deb debian $i Debian_Testing_standard testing ;; - bionic) add_deb ubuntu $i xUbuntu_18.04 ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; jammy) add_deb ubuntu $i xUbuntu_22.04 ;; kinetic) add_deb ubuntu $i xUbuntu_22.10 ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index b4d96f55..af1a8c6e 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -14,7 +14,6 @@ + /ubuntu + /ubuntu/dists -+ /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/jammy + /ubuntu/dists/kinetic

1 0