November 2023 - Wine-commits

Rémi Bernon : dmime: Introduce a new performance_get_channel helper.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 0e73870ecd9def5b15b4e61281558715e1195c5a URL: https://gitlab.winehq.org/wine/wine/-/commit/0e73870ecd9def5b15b4e612815587… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 15:25:13 2023 +0200 dmime: Introduce a new performance_get_channel helper. --- dlls/dmime/performance.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b46e5ae8609..7269cd07670 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -249,6 +249,14 @@ static void channel_block_free(struct wine_rb_entry *entry, void *context) free(b); } +static struct channel *performance_get_channel(struct performance *This, DWORD channel_num) +{ + DWORD block_num = channel_num / 16; + struct wine_rb_entry *entry; + if (!(entry = wine_rb_get(&This->channel_blocks, &block_num))) return NULL; + return WINE_RB_ENTRY_VALUE(entry, struct channel_block, entry)->channels + channel_num % 16; +} + static struct channel_block *channel_block_set(struct wine_rb_tree *tree, DWORD block_num, IDirectMusicPort *port, DWORD midi_group, BOOL only_set_new) { @@ -1052,19 +1060,27 @@ static HRESULT WINAPI performance_AssignPChannel(IDirectMusicPerformance8 *iface IDirectMusicPort *port, DWORD midi_group, DWORD midi_channel) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); - struct channel_block *block; + struct channel *channel; + HRESULT hr; FIXME("(%p)->(%ld, %p, %ld, %ld) semi-stub\n", This, channel_num, port, midi_group, midi_channel); if (!port) return E_POINTER; if (This->audio_paths_enabled) return DMUS_E_AUDIOPATHS_IN_USE; - block = channel_block_set(&This->channel_blocks, channel_num / 16, port, 0, TRUE); - if (block) { - block->channels[channel_num % 16].midi_group = midi_group; - block->channels[channel_num % 16].midi_channel = midi_channel; + if (!(channel = performance_get_channel(This, channel_num))) + { + if (FAILED(hr = IDirectMusicPerformance8_AssignPChannelBlock(iface, + channel_num / 16, port, 0))) + return hr; + if (!(channel = performance_get_channel(This, channel_num))) + return DMUS_E_NOT_FOUND; } + channel->midi_group = midi_group; + channel->midi_channel = midi_channel; + channel->port = port; + return S_OK; } @@ -1072,24 +1088,18 @@ static HRESULT WINAPI performance_PChannelInfo(IDirectMusicPerformance8 *iface, IDirectMusicPort **port, DWORD *midi_group, DWORD *midi_channel) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); - struct channel_block *block; - struct wine_rb_entry *entry; - DWORD block_num = channel_num / 16; - unsigned int index = channel_num % 16; + struct channel *channel; TRACE("(%p)->(%ld, %p, %p, %p)\n", This, channel_num, port, midi_group, midi_channel); - entry = wine_rb_get(&This->channel_blocks, &block_num); - if (!entry) - return E_INVALIDARG; - block = WINE_RB_ENTRY_VALUE(entry, struct channel_block, entry); - - if (port) { - *port = block->channels[index].port; + if (!(channel = performance_get_channel(This, channel_num))) return E_INVALIDARG; + if (port) + { + *port = channel->port; IDirectMusicPort_AddRef(*port); } - if (midi_group) *midi_group = block->channels[index].midi_group; - if (midi_channel) *midi_channel = block->channels[index].midi_channel; + if (midi_group) *midi_group = channel->midi_group; + if (midi_channel) *midi_channel = channel->midi_channel; return S_OK; }

1 0

Rémi Bernon : dmime: Simplify and rename channel_block_set to channel_block_init.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 467f3a2adbe40fcca4a18e32dc1fcdfd7e73fffe URL: https://gitlab.winehq.org/wine/wine/-/commit/467f3a2adbe40fcca4a18e32dc1fcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 15:38:12 2023 +0200 dmime: Simplify and rename channel_block_set to channel_block_init. --- dlls/dmime/performance.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 7269cd07670..4b169427371 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -257,32 +257,31 @@ static struct channel *performance_get_channel(struct performance *This, DWORD c return WINE_RB_ENTRY_VALUE(entry, struct channel_block, entry)->channels + channel_num % 16; } -static struct channel_block *channel_block_set(struct wine_rb_tree *tree, DWORD block_num, - IDirectMusicPort *port, DWORD midi_group, BOOL only_set_new) +static HRESULT channel_block_init(struct performance *This, DWORD block_num, + IDirectMusicPort *port, DWORD midi_group) { struct channel_block *block; struct wine_rb_entry *entry; - unsigned int i; + UINT i; - entry = wine_rb_get(tree, &block_num); - if (entry) { + if ((entry = wine_rb_get(&This->channel_blocks, &block_num))) block = WINE_RB_ENTRY_VALUE(entry, struct channel_block, entry); - if (only_set_new) - return block; - } else { - if (!(block = malloc(sizeof(*block)))) return NULL; + else + { + if (!(block = calloc(1, sizeof(*block)))) return E_OUTOFMEMORY; block->block_num = block_num; + wine_rb_put(&This->channel_blocks, &block_num, &block->entry); } - for (i = 0; i < 16; ++i) { - block->channels[i].port = port; - block->channels[i].midi_group = midi_group; - block->channels[i].midi_channel = i; + for (i = 0; i < ARRAY_SIZE(block->channels); ++i) + { + struct channel *channel = block->channels + i; + channel->midi_group = midi_group; + channel->midi_channel = i; + channel->port = port; } - if (!entry) - wine_rb_put(tree, &block->block_num, &block->entry); - return block; + return S_OK; } static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusicPerformance8 *iface) @@ -994,7 +993,10 @@ static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *par } for (i = 0; i < params->dwChannelGroups; i++) - channel_block_set(&perf->channel_blocks, i, port, i + 1, FALSE); + { + if (FAILED(hr = channel_block_init(perf, i, port, i + 1))) + ERR("Failed to init channel block, hr %#lx\n", hr); + } performance_update_latency_time(perf, port, NULL); return S_OK; @@ -1051,9 +1053,7 @@ static HRESULT WINAPI performance_AssignPChannelBlock(IDirectMusicPerformance8 * if (block_num > MAXDWORD / 16) return E_INVALIDARG; if (This->audio_paths_enabled) return DMUS_E_AUDIOPATHS_IN_USE; - channel_block_set(&This->channel_blocks, block_num, port, midi_group, FALSE); - - return S_OK; + return channel_block_init(This, block_num, port, midi_group); } static HRESULT WINAPI performance_AssignPChannel(IDirectMusicPerformance8 *iface, DWORD channel_num,

1 0

Rémi Bernon : dmime: Avoid leaking performance channel block ports.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 9fb8469bbe2a5f57eefcaaf1803cdcddcd8829ca URL: https://gitlab.winehq.org/wine/wine/-/commit/9fb8469bbe2a5f57eefcaaf1803cdc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 10 11:51:52 2023 +0100 dmime: Avoid leaking performance channel block ports. --- dlls/dmime/performance.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 4b169427371..0e817d232e3 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -245,8 +245,16 @@ static int channel_block_compare(const void *key, const struct wine_rb_entry *en static void channel_block_free(struct wine_rb_entry *entry, void *context) { - struct channel_block *b = WINE_RB_ENTRY_VALUE(entry, struct channel_block, entry); - free(b); + struct channel_block *block = WINE_RB_ENTRY_VALUE(entry, struct channel_block, entry); + UINT i; + + for (i = 0; i < ARRAY_SIZE(block->channels); i++) + { + struct channel *channel = block->channels + i; + if (channel->port) IDirectMusicPort_Release(channel->port); + } + + free(block); } static struct channel *performance_get_channel(struct performance *This, DWORD channel_num) @@ -278,7 +286,8 @@ static HRESULT channel_block_init(struct performance *This, DWORD block_num, struct channel *channel = block->channels + i; channel->midi_group = midi_group; channel->midi_channel = i; - channel->port = port; + if (channel->port) IDirectMusicPort_Release(channel->port); + if ((channel->port = port)) IDirectMusicPort_AddRef(channel->port); } return S_OK; @@ -992,6 +1001,8 @@ static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *par return hr; } + wine_rb_destroy(&perf->channel_blocks, channel_block_free, NULL); + for (i = 0; i < params->dwChannelGroups; i++) { if (FAILED(hr = channel_block_init(perf, i, port, i + 1))) @@ -999,6 +1010,7 @@ static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *par } performance_update_latency_time(perf, port, NULL); + IDirectMusicPort_Release(port); return S_OK; } @@ -1079,7 +1091,8 @@ static HRESULT WINAPI performance_AssignPChannel(IDirectMusicPerformance8 *iface channel->midi_group = midi_group; channel->midi_channel = midi_channel; - channel->port = port; + if (channel->port) IDirectMusicPort_Release(channel->port); + if ((channel->port = port)) IDirectMusicPort_AddRef(channel->port); return S_OK; }

1 0

Alexandre Julliard : Release 8.20.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 3a8d71041c159d76a76856867caa1de8ca297151 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a8d71041c159d76a76856867caa1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 21:54:48 2023 +0100 Release 8.20. --- .mailmap | 1 + ANNOUNCE | 825 +++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +- 4 files changed, 501 insertions(+), 345 deletions(-)

1 0

Tag wine-8.20 : Alexandre Julliard : Release 8.20
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: refs/tags/wine-8.20 Tag: 8cfb57d5faa68ec1b842ba193c46db774bb40d76 URL: https://gitlab.winehq.org/wine/wine/-/tags/8cfb57d5faa68ec1b842ba193c46db77… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 21:54:48 2023 +0100 Release 8.20

1 0

Alexandre Julliard : makefiles: Support arch-specific IDL flags.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: f8dde10ffd4cc59bfcaa59c93d3f2a74cd3d0d02 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8dde10ffd4cc59bfcaa59c93d3f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 11:06:26 2023 +0100 makefiles: Support arch-specific IDL flags. --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index e35de8a00f3..e9e4dbd35a6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2867,6 +2867,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames( defines ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); + if (arch) output_filenames( get_expanded_arch_var_array( make, "EXTRAIDLFLAGS", arch )); output_filename( source->filename ); output( "\n" ); strarray_addall( &deps, arch_deps );

1 0

Alexandre Julliard : widl: Make the alignment option generic instead of win32/win64-specific.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: a426b6b4a93dbe0869a83bd5c8d94cc95e1daebe URL: https://gitlab.winehq.org/wine/wine/-/commit/a426b6b4a93dbe0869a83bd5c8d94c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 11:06:38 2023 +0100 widl: Make the alignment option generic instead of win32/win64-specific. Support both --align and --packing for compatibility with midl. --- dlls/msdaps/Makefile.in | 5 +++-- tools/widl/typegen.c | 1 - tools/widl/widl.c | 27 ++++++++++----------------- tools/widl/widl.h | 3 +-- tools/widl/widl.man.in | 2 ++ 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 1a974266d11..bf1e5c8b3b4 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -1,6 +1,5 @@ MODULE = msdaps.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 -EXTRAIDLFLAGS = --win32-align=2 SOURCES = \ main.c \ @@ -9,4 +8,6 @@ SOURCES = \ row_server.idl \ usrmarshal.c -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ +i386_EXTRAIDLFLAGS = --packing=2 +arm_EXTRAIDLFLAGS = --packing=2 diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b3373ded11d..23db6555e9d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -234,7 +234,6 @@ static unsigned char get_basic_fc_signed(const type_t *type) static inline unsigned int clamp_align(unsigned int align) { - unsigned int packing = (pointer_size == 4) ? win32_packing : win64_packing; if(align > packing) align = packing; return align; } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index e37160e3869..9d3ea0c36bf 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -41,6 +41,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" " --acf=file Use ACF file\n" +" --align=n Set structure packing to 'n'\n" " -app_config Ignored, present for midl compatibility\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" @@ -61,6 +62,7 @@ static const char usage[] = " -o, --output=NAME Set the output file name\n" " -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n" " -p Generate proxy\n" +" --packing=n Set structure packing to 'n'\n" " --prefix-all=p Prefix names of client stubs / server functions with 'p'\n" " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" @@ -73,8 +75,6 @@ static const char usage[] = " -V Print version and exit\n" " -W Enable pedantic warnings\n" " --win32, --win64 Set the target architecture (Win32 or Win64)\n" -" --win32-align n Set win32 structure alignment to 'n'\n" -" --win64-align n Set win64 structure alignment to 'n'\n" " --winrt Enable Windows Runtime mode\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" @@ -106,8 +106,6 @@ int do_idfile = 0; int do_dlldata = 0; static int no_preprocess = 0; int old_names = 0; -int win32_packing = 8; -int win64_packing = 8; int winrt_mode = 0; int use_abi_namespace = 0; static int stdinc = 1; @@ -142,6 +140,7 @@ static const char *sysroot = ""; static FILE *idfile; +unsigned int packing = 8; unsigned int pointer_size = 0; time_t now; @@ -154,6 +153,7 @@ enum { DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, NOSTDINC_OPTION, + PACKING_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, @@ -164,14 +164,13 @@ enum { SYSROOT_OPTION, WIN32_OPTION, WIN64_OPTION, - WIN32_ALIGN_OPTION, - WIN64_ALIGN_OPTION }; static const char short_options[] = "b:cC:d:D:EhH:I:L:m:No:O:pP:rsS:tT:uU:VW"; static const struct long_option long_options[] = { { "acf", 1, ACF_OPTION }, + { "align", 1, PACKING_OPTION }, { "app_config", 0, APP_CONFIG_OPTION }, { "dlldata", 1, DLLDATA_OPTION }, { "dlldata-only", 0, DLLDATA_ONLY_OPTION }, @@ -181,6 +180,7 @@ static const struct long_option long_options[] = { { "ns_prefix", 0, RT_NS_PREFIX }, { "oldnames", 0, OLDNAMES_OPTION }, { "output", 0, 'o' }, + { "packing", 1, PACKING_OPTION }, { "prefix-all", 1, PREFIX_ALL_OPTION }, { "prefix-client", 1, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, PREFIX_SERVER_OPTION }, @@ -190,8 +190,6 @@ static const struct long_option long_options[] = { { "winrt", 0, RT_OPTION }, { "win32", 0, WIN32_OPTION }, { "win64", 0, WIN64_OPTION }, - { "win32-align", 1, WIN32_ALIGN_OPTION }, - { "win64-align", 1, WIN64_ALIGN_OPTION }, { NULL } }; @@ -532,15 +530,10 @@ static void option_callback( int optc, char *optarg ) case WIN64_OPTION: pointer_size = 8; break; - case WIN32_ALIGN_OPTION: - win32_packing = strtol(optarg, NULL, 0); - if(win32_packing != 2 && win32_packing != 4 && win32_packing != 8) - error("Packing must be one of 2, 4 or 8\n"); - break; - case WIN64_ALIGN_OPTION: - win64_packing = strtol(optarg, NULL, 0); - if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) - error("Packing must be one of 2, 4 or 8\n"); + case PACKING_OPTION: + packing = strtol(optarg, NULL, 0); + if(packing != 2 && packing != 4 && packing != 8) + error("Structure packing must be one of 2, 4 or 8\n"); break; case ACF_OPTION: acf_name = xstrdup(optarg); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 7595cfe7311..15ac74bf310 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -46,8 +46,6 @@ extern int do_regscript; extern int do_idfile; extern int do_dlldata; extern int old_names; -extern int win32_packing; -extern int win64_packing; extern int winrt_mode; extern int use_abi_namespace; @@ -69,6 +67,7 @@ extern char *regscript_name; extern char *regscript_token; extern const char *prefix_client; extern const char *prefix_server; +extern unsigned int packing; extern unsigned int pointer_size; extern time_t now; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 858b04a38e8..8c5442b621d 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -67,6 +67,8 @@ option can be specified multiple times. Generate a UUID file. The default output filename is \fIinfile\fB_i.c\fR. .PP .B Proxy/stub generation options: +.IP "\fB--align=\fIn\fB, --packing=\fIn\fR" +Set the structure packing to \fIn\fR. Supported values are 2, 4, and 8. .IP "\fB-c\fR" Generate a client stub file. The default output filename is \fIinfile\fB_c.c\fR. .IP "\fB-Os\fR"

1 0

Alexandre Julliard : configure: Remove no longer used WINE_TRY_SHLIB_FLAGS macro.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 3e498080944f624453151baa99d8201a4df04fa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e498080944f624453151baa99d820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 12:51:54 2023 +0100 configure: Remove no longer used WINE_TRY_SHLIB_FLAGS macro. --- aclocal.m4 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f5c9c0e6c42..a9bfeccece2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -261,20 +261,6 @@ LIBS=$ac_wine_check_headers_saved_libs]) AS_VAR_IF([ac_var],[yes],[$3],[$4])dnl AS_VAR_POPDEF([ac_var])]) -dnl **** Check if we can link an empty shared lib (no main) with special CFLAGS **** -dnl -dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) -dnl -AC_DEFUN([WINE_TRY_SHLIB_FLAGS], -[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl -ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])], - [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) -CFLAGS=$ac_wine_try_cflags_saved -AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl -AS_VAR_POPDEF([ac_var])]) - dnl **** Check whether we need to define a symbol on the compiler command line **** dnl dnl Usage: WINE_CHECK_DEFINE(name),[action-if-yes,[action-if-no]])

1 0

Alexandre Julliard : configure: Assume that pthread.h is present.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: c33f3506232df851e275e903c29817539ee167fb URL: https://gitlab.winehq.org/wine/wine/-/commit/c33f3506232df851e275e903c29817… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 20:52:04 2023 +0100 configure: Assume that pthread.h is present. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 20 +++++++------------- configure.ac | 15 ++++----------- include/config.h.in | 3 --- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/configure b/configure index f15c3e46d31..8bb34b7e2ce 100755 --- a/configure +++ b/configure @@ -4382,7 +4382,7 @@ fi # Check whether --with-pthread was given. if test ${with_pthread+y} then : - withval=$with_pthread; if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi + withval=$with_pthread; fi @@ -8082,12 +8082,6 @@ if test "x$ac_cv_header_port_h" = xyes then : printf "%s\n" "#define HAVE_PORT_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" -if test "x$ac_cv_header_pthread_h" = xyes -then : - printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default" if test "x$ac_cv_header_pwd_h" = xyes @@ -9059,9 +9053,7 @@ then : fi -ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "#ifdef HAVE_PTHREAD_H -#include <pthread.h> -#endif +ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "#include <pthread.h> " if test "x$ac_cv_header_pthread_np_h" = xyes then : @@ -13437,9 +13429,11 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: zydis libs: $ZYDIS_PE_LIBS" >&5 -if test "$ac_cv_header_pthread_h" = "yes" -then - ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" +if test "x$with_pthread" = xno +then : + +else $as_nop + ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" if test "x$ac_cv_func_pthread_create" = xyes then : diff --git a/configure.ac b/configure.ac index 5e1c65ab059..d32b672099d 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), [if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi]) AC_ARG_WITH(pcsclite, AS_HELP_STRING([--without-pcsclite],[do not use PCSC lite])) -AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), - [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) +AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library])) AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) @@ -438,7 +437,6 @@ AC_CHECK_HEADERS(\ netinet/tcp_fsm.h \ pcap/pcap.h \ port.h \ - pthread.h \ pwd.h \ sched.h \ scsi/scsi.h \ @@ -597,10 +595,7 @@ AC_CHECK_HEADERS([sys/thr.h],,, #include <sys/ucontext.h> #endif]) -AC_CHECK_HEADERS([pthread_np.h],,, -[#ifdef HAVE_PTHREAD_H -#include <pthread.h> -#endif]) +AC_CHECK_HEADERS([pthread_np.h],,,[#include <pthread.h>]) AC_CHECK_HEADERS([linux/videodev2.h],,, [#include <sys/time.h> @@ -1175,10 +1170,8 @@ WINE_EXTLIB_FLAGS(ZYDIS, zydis, zydis, "-I\$(top_srcdir)/libs/zydis/include") dnl **** Check for pthread **** -if test "$ac_cv_header_pthread_h" = "yes" -then - AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])]) -fi +AS_VAR_IF([with_pthread],[no],[], + [AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])])]) WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREAD_LIBS" = x], [pthread ${notice_platform}development files not found. Wine cannot support threads without libpthread.]) diff --git a/include/config.h.in b/include/config.h.in index fa234a82f84..157bf572df5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -318,9 +318,6 @@ /* Define to 1 if you have the `pthread_getthreadid_np' function. */ #undef HAVE_PTHREAD_GETTHREADID_NP -/* Define to 1 if you have the <pthread.h> header file. */ -#undef HAVE_PTHREAD_H - /* Define to 1 if you have the <pthread_np.h> header file. */ #undef HAVE_PTHREAD_NP_H

1 0

Alexandre Julliard : configure: Consistently use HOST_ARCH for platform checks.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: da2ae5832c4f91c45dec91243010512f6ef3234b URL: https://gitlab.winehq.org/wine/wine/-/commit/da2ae5832c4f91c45dec9124301051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 12:54:07 2023 +0100 configure: Consistently use HOST_ARCH for platform checks. --- aclocal.m4 | 9 +++---- configure | 77 ++++++++++++++++++++++++++++++------------------------------ configure.ac | 63 +++++++++++++++++++++++-------------------------- 3 files changed, 71 insertions(+), 78 deletions(-)

1 0