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

Eric Pouech : cmd: Let redirections be handled by node instead of command.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: cd50aa7d9c123f7be190f5f76d8d78e6a7cbac47 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd50aa7d9c123f7be190f5f76d8d78… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 17 11:33:21 2024 +0200 cmd: Let redirections be handled by node instead of command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 6 ++--- programs/cmd/wcmd.h | 12 ++++++--- programs/cmd/wcmdmain.c | 71 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 65 insertions(+), 24 deletions(-)

1 0

Eric Pouech : cmd: Add more tests about CALL and variable expansion.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 560521c14b2b8904451af06bb868c6a8b4348a73 URL: https://gitlab.winehq.org/wine/wine/-/commit/560521c14b2b8904451af06bb868c6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 25 08:53:46 2024 +0200 cmd: Add more tests about CALL and variable expansion. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 21 +++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d5397560bc6..ebcec489b7c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2785,6 +2785,27 @@ call if 1==1 ( echo ... and else! ) call call call echo passed +set WINE_FOO=WINE_BAR +set WINE_BAR=abc +call echo %%%WINE_FOO%%% +call cmd.exe /c echo %%%WINE_FOO%%% +call echo %%%%%WINE_FOO%%%%% +call cmd.exe /c echo %%%%%WINE_FOO%%%%% + +set WINE_BAR=abc +set WINE_FOO=%%WINE_BAR%% + +call :call_expand %WINE_FOO% %%WINE_FOO%% %%%WINE_FOO%%% +goto :call_expand_done + +:call_expand +set WINE_BAR=def +echo %1 %2 %3 +call echo %1 %2 %3 +exit /b 0 + +:call_expand_done + cd .. & rd /s/q foobar echo --- mixing batch and builtins diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0102c3bcbc5..146dbb5ad0a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1585,6 +1585,12 @@ Line two Get if ... and else! passed +abc +abc +%WINE_BAR% +(a)todo_wine@abc +(a)todo_wine@abc %WINE_BAR% %WINE_BAR% +(a)todo_wine@abc def def --- mixing batch and builtins bar(a)space@ @todo_wine(a)foo

1 0

Paul Gofman : winepulse.drv: Implement pulse_get_loopback_capture_device().
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 0bb23c2c91cca3da599eb3710c5e0cf20c01aa45 URL: https://gitlab.winehq.org/wine/wine/-/commit/0bb23c2c91cca3da599eb3710c5e0c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 17 17:22:14 2024 -0600 winepulse.drv: Implement pulse_get_loopback_capture_device(). --- dlls/winepulse.drv/pulse.c | 112 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index dac1b40257f..263d0f1a45a 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2199,6 +2199,89 @@ static NTSTATUS pulse_is_format_supported(void *args) return STATUS_SUCCESS; } +static void sink_name_info_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) +{ + uint32_t *current_device_index = userdata; + pulse_broadcast(); + + if (!i || !i->name || !i->name[0]) + return; + *current_device_index = i->index; +} + +struct find_monitor_of_sink_cb_param +{ + struct get_loopback_capture_device_params *params; + uint32_t current_device_index; +}; + +static void find_monitor_of_sink_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) +{ + struct find_monitor_of_sink_cb_param *p = userdata; + unsigned int len; + + pulse_broadcast(); + + if (!i || !i->name || !i->name[0]) + return; + if (i->monitor_of_sink != p->current_device_index) + return; + + len = strlen(i->name) + 1; + if (len <= p->params->ret_device_len) + { + memcpy(p->params->ret_device, i->name, len); + p->params->result = STATUS_SUCCESS; + return; + } + p->params->ret_device_len = len; + p->params->result = STATUS_BUFFER_TOO_SMALL; +} + +static NTSTATUS pulse_get_loopback_capture_device(void *args) +{ + struct get_loopback_capture_device_params *params = args; + uint32_t current_device_index = PA_INVALID_INDEX; + struct find_monitor_of_sink_cb_param p; + const char *device_name; + char *name; + + pulse_lock(); + + if (!pulse_ml) + { + pulse_unlock(); + ERR("Called without main loop running.\n"); + params->result = E_INVALIDARG; + return STATUS_SUCCESS; + } + + name = wstr_to_str(params->name); + params->result = pulse_connect(name); + free(name); + + if (FAILED(params->result)) + { + pulse_unlock(); + return STATUS_SUCCESS; + } + + device_name = params->device; + if (device_name && !device_name[0]) device_name = NULL; + + params->result = E_FAIL; + wait_pa_operation_complete(pa_context_get_sink_info_by_name(pulse_ctx, device_name, &sink_name_info_cb, &current_device_index)); + if (current_device_index != PA_INVALID_INDEX) + { + p.current_device_index = current_device_index; + p.params = params; + wait_pa_operation_complete(pa_context_get_source_info_list(pulse_ctx, &find_monitor_of_sink_cb, &p)); + } + + pulse_unlock(); + return STATUS_SUCCESS; +} + static NTSTATUS pulse_get_mix_format(void *args) { struct get_mix_format_params *params = args; @@ -2517,7 +2600,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_get_capture_buffer, pulse_release_capture_buffer, pulse_is_format_supported, - pulse_not_implemented, + pulse_get_loopback_capture_device, pulse_get_mix_format, pulse_get_device_period, pulse_get_buffer_size, @@ -2709,6 +2792,31 @@ static NTSTATUS pulse_wow64_is_format_supported(void *args) return STATUS_SUCCESS; } +static NTSTATUS pulse_wow64_get_loopback_capture_device(void *args) +{ + struct + { + PTR32 name; + PTR32 device; + PTR32 ret_device; + UINT32 ret_device_len; + HRESULT result; + } *params32 = args; + + struct get_loopback_capture_device_params params = + { + .name = ULongToPtr(params32->name), + .device = ULongToPtr(params32->device), + .ret_device = ULongToPtr(params32->ret_device), + .ret_device_len = params32->ret_device_len, + }; + + pulse_get_loopback_capture_device(&params); + params32->result = params.result; + params32->ret_device_len = params.ret_device_len; + return STATUS_SUCCESS; +} + static NTSTATUS pulse_wow64_get_mix_format(void *args) { struct @@ -2989,7 +3097,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_wow64_get_capture_buffer, pulse_release_capture_buffer, pulse_wow64_is_format_supported, - pulse_not_implemented, + pulse_wow64_get_loopback_capture_device, pulse_wow64_get_mix_format, pulse_wow64_get_device_period, pulse_wow64_get_buffer_size,

1 0

Paul Gofman : winepulse.drv: Factor out wait_pa_operation_complete().
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: cc27bc6d34fc8d77c2cfdfd97f1a5e95e0676d8c URL: https://gitlab.winehq.org/wine/wine/-/commit/cc27bc6d34fc8d77c2cfdfd97f1a5e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 17 18:41:09 2024 -0600 winepulse.drv: Factor out wait_pa_operation_complete(). --- dlls/winepulse.drv/pulse.c | 51 +++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 9d3363e2638..dac1b40257f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -203,6 +203,17 @@ static char *wstr_to_str(const WCHAR *wstr) return str; } +static BOOL wait_pa_operation_complete(pa_operation *o) +{ + if (!o) + return FALSE; + + while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) + pulse_cond_wait(); + pa_operation_unref(o); + return TRUE; +} + /* Following pulseaudio design here, mainloop has the lock taken whenever * it is handling something for pulse, and the lock is required whenever * doing any pa_* call that can affect the state in any way @@ -1548,7 +1559,6 @@ static NTSTATUS pulse_timer_loop(void *args) pa_usec_t last_time; UINT32 adv_bytes; int success; - pa_operation *o; pulse_lock(); delay.QuadPart = -stream->mmdev_period_usec * 10; @@ -1566,13 +1576,7 @@ static NTSTATUS pulse_timer_loop(void *args) delay.QuadPart = -stream->mmdev_period_usec * 10; - o = pa_stream_update_timing_info(stream->stream, pulse_op_cb, &success); - if (o) - { - while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse_cond_wait(); - pa_operation_unref(o); - } + wait_pa_operation_complete(pa_stream_update_timing_info(stream->stream, pulse_op_cb, &success)); err = pa_stream_get_time(stream->stream, &now); if (err == 0) { @@ -1653,7 +1657,6 @@ static NTSTATUS pulse_start(void *args) struct start_params *params = args; struct pulse_stream *stream = handle_get_stream(params->stream); int success; - pa_operation *o; params->result = S_OK; pulse_lock(); @@ -1682,14 +1685,7 @@ static NTSTATUS pulse_start(void *args) if (pa_stream_is_corked(stream->stream)) { - o = pa_stream_cork(stream->stream, 0, pulse_op_cb, &success); - if (o) - { - while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse_cond_wait(); - pa_operation_unref(o); - } - else + if (!wait_pa_operation_complete(pa_stream_cork(stream->stream, 0, pulse_op_cb, &success))) success = 0; if (!success) params->result = E_FAIL; @@ -1708,7 +1704,6 @@ static NTSTATUS pulse_stop(void *args) { struct stop_params *params = args; struct pulse_stream *stream = handle_get_stream(params->stream); - pa_operation *o; int success; pulse_lock(); @@ -1729,14 +1724,7 @@ static NTSTATUS pulse_stop(void *args) params->result = S_OK; if (stream->dataflow == eRender) { - o = pa_stream_cork(stream->stream, 1, pulse_op_cb, &success); - if (o) - { - while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse_cond_wait(); - pa_operation_unref(o); - } - else + if (!wait_pa_operation_complete(pa_stream_cork(stream->stream, 1, pulse_op_cb, &success))) success = 0; if (!success) params->result = E_FAIL; @@ -1779,15 +1767,8 @@ static NTSTATUS pulse_reset(void *args) /* If there is still data in the render buffer it needs to be removed from the server */ int success = 0; if (stream->held_bytes) - { - pa_operation *o = pa_stream_flush(stream->stream, pulse_op_cb, &success); - if (o) - { - while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse_cond_wait(); - pa_operation_unref(o); - } - } + wait_pa_operation_complete(pa_stream_flush(stream->stream, pulse_op_cb, &success)); + if (success || !stream->held_bytes) { stream->clock_lastpos = stream->clock_written = 0;

1 0

Paul Gofman : mmdevapi: Stub AUDCLNT_STREAMFLAGS_LOOPBACK support.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 9fec6e7dfa801a2401e1b17ef7b2dc4e088ff80a URL: https://gitlab.winehq.org/wine/wine/-/commit/9fec6e7dfa801a2401e1b17ef7b2dc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 17 15:27:05 2024 -0600 mmdevapi: Stub AUDCLNT_STREAMFLAGS_LOOPBACK support. --- dlls/mmdevapi/client.c | 35 +++++++++++++++++++++++++++++++++++ dlls/mmdevapi/unixlib.h | 10 ++++++++++ dlls/winealsa.drv/alsa.c | 2 ++ dlls/winecoreaudio.drv/coreaudio.c | 2 ++ dlls/wineoss.drv/oss.c | 2 ++ dlls/winepulse.drv/pulse.c | 2 ++ 6 files changed, 53 insertions(+) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 70fd176f3a7..860c31f4b49 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -21,6 +21,9 @@ #define COBJMACROS +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include <wchar.h> #include <audiopolicy.h> @@ -402,6 +405,38 @@ static HRESULT stream_init(struct audio_client *client, const BOOLEAN force_def_ return params.result; } + if (flags & AUDCLNT_STREAMFLAGS_LOOPBACK) { + struct get_loopback_capture_device_params params; + + if (client->dataflow != eRender) { + sessions_unlock(); + return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + } + + params.device = client->device_name; + params.name = name = get_application_name(); + params.ret_device_len = 0; + params.ret_device = NULL; + params.result = E_NOTIMPL; + wine_unix_call(get_loopback_capture_device, &params); + while (params.result == STATUS_BUFFER_TOO_SMALL) { + free(params.ret_device); + params.ret_device = malloc(params.ret_device_len); + wine_unix_call(get_loopback_capture_device, &params); + } + free(name); + if (FAILED(params.result)) { + sessions_unlock(); + free(params.ret_device); + if (params.result == E_NOTIMPL) + FIXME("get_loopback_capture_device is not supported by backend.\n"); + return params.result; + } + free(client->device_name); + client->device_name = params.ret_device; + client->dataflow = eCapture; + } + if (FAILED(params.result = adjust_timing(client, force_def_period, &duration, &period, mode, flags, fmt))) { sessions_unlock(); return params.result; diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h index d83ed918a51..4cb4c881bcf 100644 --- a/dlls/mmdevapi/unixlib.h +++ b/dlls/mmdevapi/unixlib.h @@ -140,6 +140,15 @@ struct is_format_supported_params HRESULT result; }; +struct get_loopback_capture_device_params +{ + const WCHAR *name; + const char *device; + char *ret_device; + UINT32 ret_device_len; + HRESULT result; +}; + struct get_mix_format_params { const char *device; @@ -313,6 +322,7 @@ enum unix_funcs get_capture_buffer, release_capture_buffer, is_format_supported, + get_loopback_capture_device, get_mix_format, get_device_period, get_buffer_size, diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index a24cb56d1d8..970db59ad12 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2491,6 +2491,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = alsa_get_capture_buffer, alsa_release_capture_buffer, alsa_is_format_supported, + alsa_not_implemented, alsa_get_mix_format, alsa_get_device_period, alsa_get_buffer_size, @@ -2947,6 +2948,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_wow64_get_capture_buffer, alsa_release_capture_buffer, alsa_wow64_is_format_supported, + alsa_not_implemented, alsa_wow64_get_mix_format, alsa_wow64_get_device_period, alsa_wow64_get_buffer_size, diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index deb9df1b45a..db5e1116bf8 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1837,6 +1837,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unix_get_capture_buffer, unix_release_capture_buffer, unix_is_format_supported, + unix_not_implemented, unix_get_mix_format, unix_get_device_period, unix_get_buffer_size, @@ -2292,6 +2293,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_wow64_get_capture_buffer, unix_release_capture_buffer, unix_wow64_is_format_supported, + unix_not_implemented, unix_wow64_get_mix_format, unix_wow64_get_device_period, unix_wow64_get_buffer_size, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 819e876606c..a017d242a98 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1691,6 +1691,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = oss_get_capture_buffer, oss_release_capture_buffer, oss_is_format_supported, + oss_not_implemented, oss_get_mix_format, oss_get_device_period, oss_get_buffer_size, @@ -2186,6 +2187,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_get_capture_buffer, oss_release_capture_buffer, oss_wow64_is_format_supported, + oss_not_implemented, oss_wow64_get_mix_format, oss_wow64_get_device_period, oss_wow64_get_buffer_size, diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 068245f03b2..9d3363e2638 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2536,6 +2536,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_get_capture_buffer, pulse_release_capture_buffer, pulse_is_format_supported, + pulse_not_implemented, pulse_get_mix_format, pulse_get_device_period, pulse_get_buffer_size, @@ -3007,6 +3008,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_wow64_get_capture_buffer, pulse_release_capture_buffer, pulse_wow64_is_format_supported, + pulse_not_implemented, pulse_wow64_get_mix_format, pulse_wow64_get_device_period, pulse_wow64_get_buffer_size,

1 0

Paul Gofman : mmdevapi: Adjust timing after main loop start in client_Initialize().
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 0ca742689729f0a547facf2bd8e046711c57b12c URL: https://gitlab.winehq.org/wine/wine/-/commit/0ca742689729f0a547facf2bd8e046… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 17 19:16:01 2024 -0600 mmdevapi: Adjust timing after main loop start in client_Initialize(). --- dlls/mmdevapi/client.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 4a205632b12..70fd176f3a7 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -390,9 +390,6 @@ static HRESULT stream_init(struct audio_client *client, const BOOLEAN force_def_ return E_INVALIDARG; } - if (FAILED(params.result = adjust_timing(client, force_def_period, &duration, &period, mode, flags, fmt))) - return params.result; - sessions_lock(); if (client->stream) { @@ -405,6 +402,11 @@ static HRESULT stream_init(struct audio_client *client, const BOOLEAN force_def_ return params.result; } + if (FAILED(params.result = adjust_timing(client, force_def_period, &duration, &period, mode, flags, fmt))) { + sessions_unlock(); + return params.result; + } + params.name = name = get_application_name(); params.device = client->device_name; params.flow = client->dataflow;

1 0

Alexandre Julliard : makedep: Generate rules for make depend.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 4303bd4450e5e8982852852c3be1433cbf26a26d URL: https://gitlab.winehq.org/wine/wine/-/commit/4303bd4450e5e8982852852c3be143… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 11:32:20 2024 +0200 makedep: Generate rules for make depend. --- configure | 17 +++-------------- configure.ac | 18 +++++------------- tools/makedep.c | 16 ++++++++++++++-- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 2373cf89da8..e27f98a8a67 100755 --- a/configure +++ b/configure @@ -809,7 +809,6 @@ BISON FLEX SED_CMD RUNTESTFLAGS -MAKEDEP toolsdir x86_64_DISABLED_SUBDIRS x86_64_DELAYLOADFLAG @@ -6464,8 +6463,6 @@ else fi toolsdir=$wine_cv_toolsdir -MAKEDEP=$wine_makedep - RUNTESTFLAGS="-q -P wine" SED_CMD="LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'" @@ -23116,19 +23113,12 @@ ac_config_commands="$ac_config_commands Makefile" SHELL=/bin/sh + as_fn_append wine_rules " all: wine @echo \"Wine build complete.\" -.INIT: Makefile -.MAKEFILEDEPS: -all: Makefile -Makefile: config.status \$(MAKEDEP) +Makefile: config.status @./config.status Makefile -depend: \$(MAKEDEP) - \$(MAKEDEP)$makedep_flags" - - -as_fn_append wine_rules " config.status: ${wine_srcdir}configure @./config.status --recheck include/config.h: include/stamp-h @@ -23220,7 +23210,7 @@ tags ctags: rm -f tags (test -d .git && git ls-files || find -L $srcdir -name '*.[ch]' -print) | xargs ctags -a \$(TAGSFLAGS) dummy: -.PHONY: depend dummy install-manpages" +.PHONY: dummy" printf "%s\n" " done" >&6 cat >confcache <<\_ACEOF @@ -24023,7 +24013,6 @@ x86_64_TARGET = $x86_64_TARGET x86_64_DELAYLOADFLAG = $x86_64_DELAYLOADFLAG x86_64_DISABLED_SUBDIRS = $x86_64_DISABLED_SUBDIRS toolsdir = $toolsdir -MAKEDEP = $MAKEDEP RUNTESTFLAGS = $RUNTESTFLAGS SED_CMD = $SED_CMD FLEX = $FLEX diff --git a/configure.ac b/configure.ac index 43bba37a39b..798ed738d97 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,6 @@ else AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi AC_SUBST(toolsdir,[$wine_cv_toolsdir]) -AC_SUBST(MAKEDEP,[$wine_makedep]) AC_SUBST(RUNTESTFLAGS,["-q -P wine"]) AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"]) @@ -3625,21 +3624,14 @@ dnl Main makefile AC_SUBST(SHELL,[/bin/sh]) +dnl Rules for re-running configure + WINE_APPEND_RULE( [all: wine @echo \"Wine build complete.\" -.INIT: Makefile -.MAKEFILEDEPS: -all: Makefile -Makefile: config.status \$(MAKEDEP) +Makefile: config.status @./config.status Makefile -depend: \$(MAKEDEP) - \$(MAKEDEP)$makedep_flags]) - -dnl Rules for re-running configure - -WINE_APPEND_RULE( -[config.status: ${wine_srcdir}configure +config.status: ${wine_srcdir}configure @./config.status --recheck include/config.h: include/stamp-h include/stamp-h: ${wine_srcdir}include/config.h.in config.status @@ -3734,7 +3726,7 @@ tags ctags: rm -f tags (test -d .git && git ls-files || find -L $srcdir -name '*.[[ch]]' -print) | xargs ctags -a \$(TAGSFLAGS) dummy: -.PHONY: depend dummy install-manpages]) +.PHONY: dummy]) AS_ECHO(" done") >&AS_MESSAGE_FD AC_OUTPUT diff --git a/tools/makedep.c b/tools/makedep.c index a1534e8e9da..25ddb92f7fa 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4189,6 +4189,7 @@ static void output_top_makefile( struct makefile *make ) FILE *src_file; unsigned int i; int found = 0; + const char *makedep; output_file_name = obj_dir_path( make, output_makefile_name ); output_file = create_temp_file( output_file_name ); @@ -4206,10 +4207,21 @@ static void output_top_makefile( struct makefile *make ) if (!found) output( "\n%s (everything below this line is auto-generated; DO NOT EDIT!!)\n", separator ); if (silent_rules) output_silent_rules(); + + /* add special targets for makefile and dependencies */ + + output( ".INIT: Makefile\n" ); + output( ".MAKEFILEDEPS:\n" ); + output( ".SUFFIXES:\n" ); + makedep = strmake( "%s%s",tools_dir_path( make, "makedep" ), tools_ext ); + output( "Makefile: %s\n", makedep ); + output( "depend: %s\n", makedep ); + output( "\t%s%s\n", makedep, + silent_rules ? " -S" : "" ); + strarray_add( &make->phony_targets, "depend" ); + for (i = 0; i < subdirs.count; i++) output_sources( submakes[i] ); output_sources( make ); - /* disable implicit rules */ - output( ".SUFFIXES:\n" ); fclose( output_file ); output_file = NULL;

1 0

Alexandre Julliard : makedep: Generate a compile_commands.json file.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 65880e0c8c8f5cd699af6d80bf890d23f6c5d856 URL: https://gitlab.winehq.org/wine/wine/-/commit/65880e0c8c8f5cd699af6d80bf890d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 10:37:46 2024 +0200 makedep: Generate a compile_commands.json file. --- configure | 3 +- configure.ac | 3 +- tools/makedep.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 118 insertions(+), 19 deletions(-) diff --git a/configure b/configure index e27f98a8a67..9ef4dfef5a4 100755 --- a/configure +++ b/configure @@ -21924,7 +21924,7 @@ ac_config_commands="$ac_config_commands include/stamp-h" printf %s "creating Makefile rules..." >&6 -makedep_flags="" +makedep_flags=" -C" test "x$enable_silent_rules" = xyes && makedep_flags="$makedep_flags -S" wine_srcdir= @@ -23094,6 +23094,7 @@ test "x$enable_tools" = xno || wine_fn_config_makefile tools/wrc enable_wrc as_fn_append CONFIGURE_TARGETS " TAGS" as_fn_append CONFIGURE_TARGETS " tags" as_fn_append CONFIGURE_TARGETS " autom4te.cache" +as_fn_append CONFIGURE_TARGETS " compile_commands.json" as_fn_append CONFIGURE_TARGETS " config.log" as_fn_append CONFIGURE_TARGETS " config.status" as_fn_append CONFIGURE_TARGETS " include/config.h" diff --git a/configure.ac b/configure.ac index 798ed738d97..6f48132b22a 100644 --- a/configure.ac +++ b/configure.ac @@ -2410,7 +2410,7 @@ AH_BOTTOM([#endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD -makedep_flags="" +makedep_flags=" -C" test "x$enable_silent_rules" = xyes && makedep_flags="$makedep_flags -S" wine_srcdir= @@ -3578,6 +3578,7 @@ dnl Main ignore file WINE_IGNORE_FILE(TAGS) WINE_IGNORE_FILE(tags) WINE_IGNORE_FILE(autom4te.cache) +WINE_IGNORE_FILE(compile_commands.json) WINE_IGNORE_FILE(config.log) WINE_IGNORE_FILE(config.status) WINE_IGNORE_FILE(include/config.h) diff --git a/tools/makedep.c b/tools/makedep.c index 25ddb92f7fa..c185030ea66 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -240,14 +240,27 @@ static const char *output_makefile_name = "Makefile"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; +static int compile_commands_mode; static int silent_rules; static int input_line; static int output_column; static FILE *output_file; +struct compile_command +{ + struct list entry; + const char *cmd; + const char *source; + const char *obj; + struct strarray args; +}; + +static struct list compile_commands = LIST_INIT( compile_commands ); + static const char Usage[] = "Usage: makedep [options]\n" "Options:\n" + " -C Generate compile_commands.json along with the makefile\n" " -S Generate Automake-style silent rules\n" " -fxxx Store output in file 'xxx' (default: Makefile)\n"; @@ -552,6 +565,26 @@ static char *concat_paths( const char *base, const char *path ) } +/******************************************************************* + * escape_cstring + */ +static const char *escape_cstring( const char *str ) +{ + char *ret; + unsigned int i = 0, j = 0; + + if (!strpbrk( str, "\\\"" )) return str; + ret = xmalloc( 2 * strlen(str) + 1 ); + while (str[i]) + { + if (str[i] == '\\' || str[i] == '"') ret[j++] = '\\'; + ret[j++] = str[i++]; + } + ret[j] = 0; + return ret; +} + + /******************************************************************* * is_native_arch_disabled * @@ -3166,7 +3199,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou unsigned int arch ) { const char *obj_name, *var_cc, *var_cflags; - struct strarray arch_cflags = empty_strarray; + struct strarray cflags = empty_strarray; if (make->disabled[arch] && !(source->file->flags & FLAG_C_IMPLIB)) return; @@ -3197,46 +3230,46 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou else strarray_add( &make->clean_files, obj_name ); + if (!source->use_msvcrt) strarray_addall( &cflags, make->unix_cflags ); if ((source->file->flags & FLAG_ARM64EC_X64) && !strcmp( archs.str[arch], "arm64ec" )) { var_cc = "$(x86_64_CC)"; var_cflags = "$(x86_64_CFLAGS)"; - strarray_add( &arch_cflags, "-D__arm64ec_x64__" ); - strarray_addall( &arch_cflags, get_expanded_make_var_array( top_makefile, "x86_64_EXTRACFLAGS" )); + strarray_add( &cflags, "-D__arm64ec_x64__" ); + strarray_addall( &cflags, get_expanded_make_var_array( top_makefile, "x86_64_EXTRACFLAGS" )); } else { var_cc = arch_make_variable( "CC", arch ); var_cflags = arch_make_variable( "CFLAGS", arch ); - strarray_addall( &arch_cflags, make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); + strarray_addall( &cflags, make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); } - output( "%s: %s\n", obj_dir_path( make, obj_name ), source->filename ); - output( "\t%s%s -c -o $@ %s", cmd_prefix( "CC" ), var_cc, source->filename ); - output_filenames( defines ); - if (!source->use_msvcrt) output_filenames( make->unix_cflags ); - output_filenames( arch_cflags ); - if (!arch) { if (source->file->flags & FLAG_C_UNIX) { - output_filenames( unix_dllflags ); + strarray_addall( &cflags, unix_dllflags ); } else if (make->module || make->testdll) { - output_filenames( dll_flags ); - if (source->use_msvcrt) output_filenames( msvcrt_flags ); + strarray_addall( &cflags, dll_flags ); + if (source->use_msvcrt) strarray_addall( &cflags, msvcrt_flags ); if (!unix_lib_supported && make->module && is_crt_module( make->module )) - output_filename( "-fno-builtin" ); + strarray_add( &cflags, "-fno-builtin" ); } } else { - if (make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); + if (make->module && is_crt_module( make->module )) strarray_add( &cflags, "-fno-builtin" ); } - output_filenames( cpp_flags ); + strarray_addall( &cflags, cpp_flags ); + + output( "%s: %s\n", obj_dir_path( make, obj_name ), source->filename ); + output( "\t%s%s -c -o $@ %s", cmd_prefix( "CC" ), var_cc, source->filename ); + output_filenames( defines ); + output_filenames( cflags ); output_filename( var_cflags ); output( "\n" ); @@ -3254,6 +3287,29 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou root_src_dir_path( "tools/runtest" ), make->testdll, obj_dir_path( make, arch_module_name( test_exe, arch )), obj ); } + + if (!(source->file->flags & FLAG_GENERATED)) + { + struct compile_command *cmd = malloc( sizeof(*cmd) ); + + cmd->source = source->filename; + cmd->obj = obj_dir_path( make, obj_name ); + cmd->args = empty_strarray; + strarray_addall( &cmd->args, defines ); + strarray_addall( &cmd->args, cflags ); + + if ((source->file->flags & FLAG_ARM64EC_X64) && !strcmp( archs.str[arch], "arm64ec" )) + { + cmd->cmd = get_expanded_make_variable( make, "x86_64_CC" ); + strarray_add( &cmd->args, get_expanded_make_variable( make, "x86_64_CFLAGS" )); + } + else + { + cmd->cmd = get_expanded_arch_var( make, "CC", arch ); + strarray_add( &cmd->args, get_expanded_arch_var( make, "CFLAGS", arch )); + } + list_add_tail( &compile_commands, &cmd->entry ); + } } @@ -4043,6 +4099,41 @@ static void output_linguas( const struct makefile *make ) } +/******************************************************************* + * output_compile_commands + */ +static void output_compile_commands( const char *dest ) +{ + struct compile_command *cmd; + unsigned int i; + const char *dir; + char buffer[PATH_MAX]; + + output_file = create_temp_file( dest ); + + getcwd( buffer, sizeof(buffer) ); + dir = escape_cstring( buffer ); + + output( "[\n" ); + LIST_FOR_EACH_ENTRY( cmd, &compile_commands, struct compile_command, entry ) + { + output( " {\n" ); + output( " \"command\": \"%s -c -o %s %s", cmd->cmd, cmd->obj, cmd->source ); + for (i = 0; i < cmd->args.count; i++) output( " %s", escape_cstring( cmd->args.str[i] )); + output( "\",\n" ); + output( " \"file\": \"%s\",\n", cmd->source ); + output( " \"output\": \"%s\",\n", cmd->obj ); + output( " \"directory\": \"%s\"\n", dir ); + output( " }%s\n", list_next( &compile_commands, &cmd->entry ) ? "," : "" ); + } + output( "]\n" ); + + if (fclose( output_file )) fatal_perror( "write" ); + output_file = NULL; + rename_temp_file( dest ); +} + + /******************************************************************* * output_testlist */ @@ -4216,7 +4307,8 @@ static void output_top_makefile( struct makefile *make ) makedep = strmake( "%s%s",tools_dir_path( make, "makedep" ), tools_ext ); output( "Makefile: %s\n", makedep ); output( "depend: %s\n", makedep ); - output( "\t%s%s\n", makedep, + output( "\t%s%s%s\n", makedep, + compile_commands_mode ? " -C" : "", silent_rules ? " -S" : "" ); strarray_add( &make->phony_targets, "depend" ); @@ -4396,6 +4488,9 @@ static int parse_option( const char *opt ) case 'f': if (opt[2]) output_makefile_name = opt + 2; break; + case 'C': + compile_commands_mode = 1; + break; case 'S': silent_rules = 1; break; @@ -4550,5 +4645,7 @@ int main( int argc, char *argv[] ) output_dependencies( top_makefile ); for (i = 0; i < subdirs.count; i++) output_dependencies( submakes[i] ); + if (compile_commands_mode) output_compile_commands( "compile_commands.json" ); + return 0; }

1 0

Paul Gofman : mmdevapi: Store device_name as a pointer in struct audio_client.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 103cd4fa7a3e707c6966ca0975a92f4accdf0144 URL: https://gitlab.winehq.org/wine/wine/-/commit/103cd4fa7a3e707c6966ca0975a92f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 17 18:12:34 2024 -0600 mmdevapi: Store device_name as a pointer in struct audio_client. --- dlls/mmdevapi/client.c | 9 ++++----- dlls/mmdevapi/mmdevdrv.h | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 132b6abae5e..4a205632b12 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -623,6 +623,7 @@ static ULONG WINAPI client_Release(IAudioClient3 *iface) if (This->stream) stream_release(This->stream, This->timer_thread); + free(This->device_name); free(This); } @@ -1492,7 +1493,6 @@ HRESULT AudioClient_Create(GUID *guid, IMMDevice *device, IAudioClient **out) struct audio_client *This; char *name; EDataFlow dataflow; - size_t size; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), device, out); @@ -1507,15 +1507,13 @@ HRESULT AudioClient_Create(GUID *guid, IMMDevice *device, IAudioClient **out) return E_UNEXPECTED; } - size = strlen(name) + 1; - This = calloc(1, FIELD_OFFSET(struct audio_client, device_name[size])); + This = calloc(1, sizeof(*This)); if (!This) { free(name); return E_OUTOFMEMORY; } - memcpy(This->device_name, name, size); - free(name); + This->device_name = name; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; @@ -1529,6 +1527,7 @@ HRESULT AudioClient_Create(GUID *guid, IMMDevice *device, IAudioClient **out) hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->marshal); if (FAILED(hr)) { + free(This->device_name); free(This); return hr; } diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index 42b01443ff0..7683867a9c1 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -80,7 +80,5 @@ struct audio_client { struct audio_session_wrapper *session_wrapper; struct list entry; - - /* Keep at end */ - char device_name[0]; + char *device_name; };

1 0

Alexandre Julliard : makedep: Remove the -R option.
by Alexandre Julliard June 26, 2024

June 26, 2024

Module: wine Branch: master Commit: 29555a1feacaa2b13eee8aad334cde059a5ac702 URL: https://gitlab.winehq.org/wine/wine/-/commit/29555a1feacaa2b13eee8aad334cde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 10:31:27 2024 +0200 makedep: Remove the -R option. --- tools/makedep.c | 69 ++++----------------------------------------------------- 1 file changed, 4 insertions(+), 65 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index cf22bc7bf07..a1534e8e9da 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -240,16 +240,14 @@ static const char *output_makefile_name = "Makefile"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; -static int relative_dir_mode; static int silent_rules; static int input_line; static int output_column; static FILE *output_file; static const char Usage[] = - "Usage: makedep [options] [directories]\n" + "Usage: makedep [options]\n" "Options:\n" - " -R from to Compute the relative path between two directories\n" " -S Generate Automake-style silent rules\n" " -fxxx Store output in file 'xxx' (default: Makefile)\n"; @@ -493,52 +491,6 @@ static char *replace_substr( const char *str, const char *start, size_t len, con } -/******************************************************************* - * get_relative_path - * - * Determine where the destination path is located relative to the 'from' path. - */ -static char *get_relative_path( const char *from, const char *dest ) -{ - const char *start; - char *ret, *p; - unsigned int dotdots = 0; - - /* a path of "." is equivalent to an empty path */ - if (!strcmp( from, "." )) from = ""; - - for (;;) - { - while (*from == '/') from++; - while (*dest == '/') dest++; - start = dest; /* save start of next path element */ - if (!*from) break; - - while (*from && *from != '/' && *from == *dest) { from++; dest++; } - if ((!*from || *from == '/') && (!*dest || *dest == '/')) continue; - - /* count remaining elements in 'from' */ - do - { - dotdots++; - while (*from && *from != '/') from++; - while (*from == '/') from++; - } - while (*from); - break; - } - - if (!start[0] && !dotdots) return NULL; /* empty path */ - - ret = xmalloc( 3 * dotdots + strlen( start ) + 1 ); - for (p = ret; dotdots; dotdots--, p += 3) memcpy( p, "../", 3 ); - - if (start[0]) strcpy( p, start ); - else p[-1] = 0; /* remove trailing slash */ - return ret; -} - - /******************************************************************* * get_root_relative_path * @@ -4432,9 +4384,6 @@ static int parse_option( const char *opt ) case 'f': if (opt[2]) output_makefile_name = opt + 2; break; - case 'R': - relative_dir_mode = 1; - break; case 'S': silent_rules = 1; break; @@ -4479,22 +4428,12 @@ int main( int argc, char *argv[] ) else i++; } - if (relative_dir_mode) + if (argc > 1) { - char *relpath; - - if (argc != 3) - { - fprintf( stderr, "Option -R needs two directories\n%s", Usage ); - exit( 1 ); - } - relpath = get_relative_path( argv[1], argv[2] ); - printf( "%s\n", relpath ? relpath : "." ); - exit( 0 ); + fprintf( stderr, "Unknown argument '%s'\n%s", argv[1], Usage ); + exit(1); } - if (argc > 1) fatal_error( "Directory arguments not supported in this mode\n" ); - atexit( cleanup_files ); init_signals( exit_on_signal );

1 0