November 2023 - Wine-commits

Ziqing Hui : winegstreamer: Implement wg_muxer_finalize.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: b496a354fab1d662267241e6237854aa2153fb5a URL: https://gitlab.winehq.org/wine/wine/-/commit/b496a354fab1d662267241e6237854… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 9 11:18:41 2023 +0800 winegstreamer: Implement wg_muxer_finalize. --- dlls/winegstreamer/wg_muxer.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index bbe4d4d1f9d..0055d9ef16c 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -63,6 +63,9 @@ struct wg_muxer GstBuffer *buffer; pthread_mutex_t mutex; + pthread_cond_t cond; + + bool eos; guint64 offset; /* Write offset of the output buffer generated by muxer. */ struct list streams; @@ -175,6 +178,13 @@ static gboolean muxer_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *ev switch (event->type) { + case GST_EVENT_EOS: + pthread_mutex_lock(&muxer->mutex); + muxer->eos = true; + pthread_mutex_unlock(&muxer->mutex); + pthread_cond_signal(&muxer->cond); + break; + case GST_EVENT_SEGMENT: pthread_mutex_lock(&muxer->mutex); @@ -248,6 +258,7 @@ NTSTATUS wg_muxer_create(void *args) list_init(&muxer->streams); muxer->offset = GST_BUFFER_OFFSET_NONE; pthread_mutex_init(&muxer->mutex, NULL); + pthread_cond_init(&muxer->cond, NULL); if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; if (!(muxer->output_queue = gst_atomic_queue_new(8))) @@ -287,6 +298,7 @@ out: gst_atomic_queue_unref(muxer->output_queue); if (muxer->container) gst_object_unref(muxer->container); + pthread_cond_destroy(&muxer->cond); pthread_mutex_destroy(&muxer->mutex); free(muxer); @@ -317,6 +329,7 @@ NTSTATUS wg_muxer_destroy(void *args) gst_element_set_state(muxer->container, GST_STATE_NULL); gst_object_unref(muxer->container); + pthread_cond_destroy(&muxer->cond); pthread_mutex_destroy(&muxer->mutex); free(muxer); @@ -526,6 +539,22 @@ NTSTATUS wg_muxer_read_data(void *args) NTSTATUS wg_muxer_finalize(void *args) { - GST_FIXME("Not implemented."); - return STATUS_NOT_IMPLEMENTED; + struct wg_muxer *muxer = get_muxer(*(wg_muxer_t *)args); + struct wg_muxer_stream *stream; + + /* Notify each stream of EOS. */ + LIST_FOR_EACH_ENTRY(stream, &muxer->streams, struct wg_muxer_stream, entry) + { + if (!push_event(stream->my_src, gst_event_new_segment_done(GST_FORMAT_BYTES, -1)) + || !push_event(stream->my_src, gst_event_new_eos())) + return STATUS_UNSUCCESSFUL; + } + + /* Wait for muxer EOS. */ + pthread_mutex_lock(&muxer->mutex); + while (!muxer->eos) + pthread_cond_wait(&muxer->cond, &muxer->mutex); + pthread_mutex_unlock(&muxer->mutex); + + return STATUS_SUCCESS; }

1 0

Nikolay Sivov : oleaut32: Always reset return type for VarMod().
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 5e9663c064cbfdc39dac885b1954d351141ee349 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e9663c064cbfdc39dac885b1954d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 26 23:32:46 2023 +0100 oleaut32: Always reset return type for VarMod(). --- dlls/oleaut32/tests/vartest.c | 7 +++++++ dlls/oleaut32/variant.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c2b5b4113d7..4751070827c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3518,8 +3518,15 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected hres = pVarMod( left, right, &result ); ok_(__FILE__,line)( hres == expres, "wrong result %lx/%lx\n", hres, expres ); if (hres == S_OK) + { ok_(__FILE__,line)( is_expected_variant( &result, expected ), "got %s expected %s\n", variantstr(&result), variantstr(expected) ); + } + else + { + ok_(__FILE__,line)( V_VT(&result) == VT_EMPTY, "Unexpected type %d.\n", V_VT(&result) ); + ok_(__FILE__,line)( V_I4(&result) == 0x12345, "Unexpected value %ld.\n", V_I4(&result) ); + } } #define VARMOD(vt1,vt2,val1,val2,rvt,rval) \ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 9e1fefe9705..bb1e83e9b7e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5410,6 +5410,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) VariantInit(&tempRight); VariantInit(&lv); VariantInit(&rv); + V_VT(result) = VT_EMPTY; TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result);

1 0

Zhiyi Zhang : ntdll: Fix an out-of-bounds read (Coverity).
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 1ab1c9708745b9cbf5f9540cd799ebff654362d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ab1c9708745b9cbf5f9540cd799eb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:26:58 2023 +0800 ntdll: Fix an out-of-bounds read (Coverity). class FileRenameInformationEx to FileKnownFolderInformation could cause an out-of-bounds read of info_sizes. --- dlls/ntdll/unix/file.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 98e50082904..ee68e4dee9b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4264,7 +4264,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { - static const size_t info_sizes[] = + static const size_t info_sizes[FileMaximumInformation] = { 0, sizeof(FILE_DIRECTORY_INFORMATION), /* FileDirectoryInformation */ @@ -4331,6 +4331,18 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, 0, /* FileHardLinkFullIdInformation */ 0, /* FileIdExtdBothDirectoryInformation */ 0, /* FileDispositionInformationEx */ + 0, /* FileRenameInformationEx */ + 0, /* FileRenameInformationExBypassAccessCheck */ + 0, /* FileDesiredStorageClassInformation */ + 0, /* FileStatInformation */ + 0, /* FileMemoryPartitionInformation */ + 0, /* FileStatLxInformation */ + 0, /* FileCaseSensitiveInformation */ + 0, /* FileLinkInformationEx */ + 0, /* FileLinkInformationExBypassAccessCheck */ + 0, /* FileStorageReserveIdInformation */ + 0, /* FileCaseSensitiveInformationForceAccessCheck */ + 0, /* FileKnownFolderInformation */ }; struct stat st;

1 0

Zhiyi Zhang : wbemprox: Fix a memory leak (Coverity).
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: a2fdae65a173668186a828447688fa2404a3ac49 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2fdae65a173668186a828447688fa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:07:41 2023 +0800 wbemprox: Fix a memory leak (Coverity). When LsaLookupSids() fails with STATUS_NONE_MAPPED or STATUS_SOME_NOT_MAPPED, the memory returned by the domain parameter should be freed. --- dlls/wbemprox/builtin.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e751299e4e6..31df1f5c920 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3982,6 +3982,7 @@ static enum fill_status fill_sid( struct table *table, const struct expr *cond ) const WCHAR *str; struct record_sid *rec; UINT len; + NTSTATUS status; if (!(str = find_sid_str( cond ))) return FILL_STATUS_FAILED; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -3996,10 +3997,12 @@ static enum fill_status fill_sid( struct table *table, const struct expr *cond ) LocalFree( sid ); return FILL_STATUS_FAILED; } - if (LsaLookupSids( handle, 1, &sid, &domain, &name )) + if ((status = LsaLookupSids( handle, 1, &sid, &domain, &name ))) { LocalFree( sid ); LsaClose( handle ); + if (status == STATUS_NONE_MAPPED || status == STATUS_SOME_NOT_MAPPED) + LsaFreeMemory( domain ); return FILL_STATUS_FAILED; }

1 0

Rémi Bernon : win32u: Initialize sysparams before winstation.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 7175d8855af8bdf30440c15e60681ea9df9e0382 URL: https://gitlab.winehq.org/wine/wine/-/commit/7175d8855af8bdf30440c15e60681e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 19:05:38 2023 +0100 win32u: Initialize sysparams before winstation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55843 --- dlls/win32u/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 396e2285797..1fb5044b2e5 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -249,8 +249,8 @@ DLGPROC get_dialog_proc( DLGPROC ret, BOOL ansi ) static void init_user(void) { gdi_init(); - winstation_init(); sysparams_init(); + winstation_init(); register_desktop_class(); }

1 0

Rémi Bernon : win32u: Remove unnecessary config_key lazy initializations.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 8e4c196c14779194b42f2c235c8f421c0d2f94c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e4c196c14779194b42f2c235c8f42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 19:12:36 2023 +0100 win32u: Remove unnecessary config_key lazy initializations. --- dlls/win32u/sysparams.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 471403440b6..d0fb0f6415a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -565,8 +565,7 @@ static BOOL adapter_get_registry_settings( const struct adapter *adapter, DEVMOD mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; - else if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_REGISTRY_SETTINGS, mode ); @@ -585,7 +584,6 @@ static BOOL adapter_set_registry_settings( const struct adapter *adapter, const mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { @@ -614,8 +612,7 @@ static BOOL adapter_get_current_settings( const struct adapter *adapter, DEVMODE mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; - else if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode ); @@ -634,7 +631,6 @@ static BOOL adapter_set_current_settings( const struct adapter *adapter, const D mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else {

1 0

Jacek Caban : configure: Fix action-if-no handling in WINE_TRY_PE_CFLAGS macro.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: cf29f40ce41ab4611aed9e9ca58d7f5d62ff47e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf29f40ce41ab4611aed9e9ca58d7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 19:58:40 2023 +0100 configure: Fix action-if-no handling in WINE_TRY_PE_CFLAGS macro. --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index 11d7e3a3bef..5f1e7bbdbf3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -218,7 +218,7 @@ int __cdecl mainCRTStartup(void) { return 0; }]])], [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) CFLAGS=$ac_wine_try_cflags_saved ac_exeext=$ac_wine_try_cflags_saved_exeext]) -AS_VAR_IF([ac_var],[yes],[m4_default([$2], [AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $1"])], [$3])])dnl +AS_VAR_IF([ac_var],[yes],[m4_default([$2], [AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $1"])])], [$3])dnl AS_VAR_POPDEF([ac_var]) }]) dnl **** Check whether the given MinGW header is available ****

1 0

Jacek Caban : configure: Use --no-default-config option on clang when available.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 471d7178ae019df0bf5db03b73e6ac7fd3ff99f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/471d7178ae019df0bf5db03b73e6ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 19:59:38 2023 +0100 configure: Use --no-default-config option on clang when available. Some distros arbitrary flags into clang config files without guarding it for applicable targets, which breaks cross compilation. --- configure | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 19 ++++++++++++++----- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/configure b/configure index e6fa429c8bf..3b8ec628bfb 100755 --- a/configure +++ b/configure @@ -10654,10 +10654,46 @@ then : esac fi llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" + llvm_extra_ldflags="" case $llvm_target in *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;; esac - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh` + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config" >&5 +printf %s "checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs $llvm_extra_cflags $llvm_cflags --no-default-config" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + llvm_extra_cflags="$llvm_extra_cflags --no-default-config" + llvm_extra_ldflags="--no-default-config" +else $as_nop + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags" >&5 printf %s "checking whether $CC supports $llvm_extra_cflags $llvm_cflags... " >&6; } if eval test \${$as_ac_var+y} @@ -10689,11 +10725,19 @@ eval ac_res=\$$as_ac_var printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : - target=$llvm_target - eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" - as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" - CFLAGS="$llvm_extra_cflags $llvm_cflags" + as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags $llvm_cflags" +else $as_nop + llvm_extra_cflags="" +fi } fi } + if test -n "$llvm_extra_cflags" + then + target=$llvm_target + eval "${wine_arch}_DELAYLOADFLAG=\"-Wl,-delayload,\"" + as_fn_append ${wine_arch}_EXTRACFLAGS " $llvm_extra_cflags" + as_fn_append ${wine_arch}_LDFLAGS " $llvm_extra_ldflags" + CFLAGS="$llvm_extra_cflags $llvm_cflags" + fi eval "${wine_arch}_TARGET=\$target" fi diff --git a/configure.ac b/configure.ac index 8d92e4c8ab2..074086c586b 100644 --- a/configure.ac +++ b/configure.ac @@ -893,14 +893,23 @@ do esac fi llvm_extra_cflags="-target $llvm_target -fuse-ld=lld" + llvm_extra_ldflags="" case $llvm_target in *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;; esac - WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags], - [target=$llvm_target - AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) - AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) - CFLAGS="$llvm_extra_cflags $llvm_cflags"]) + WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags --no-default-config], + [llvm_extra_cflags="$llvm_extra_cflags --no-default-config" + llvm_extra_ldflags="--no-default-config"], + [WINE_TRY_PE_CFLAGS([$llvm_extra_cflags $llvm_cflags],[], + [llvm_extra_cflags=""])]) + if test -n "$llvm_extra_cflags" + then + target=$llvm_target + AS_VAR_SET([${wine_arch}_DELAYLOADFLAG],["-Wl,-delayload,"]) + AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" $llvm_extra_cflags"]) + AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" $llvm_extra_ldflags"]) + CFLAGS="$llvm_extra_cflags $llvm_cflags" + fi AS_VAR_SET([${wine_arch}_TARGET],[$target])]) AS_VAR_POPDEF([wine_cv_crosscc])

1 0

Jacek Caban : winegcc: Support --no-default-config argument.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 0c7a1be11bb562b0e386b23cd4e05894a6fb5efc URL: https://gitlab.winehq.org/wine/wine/-/commit/0c7a1be11bb562b0e386b23cd4e058… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 20:37:22 2023 +0100 winegcc: Support --no-default-config argument. --- tools/winegcc/winegcc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dc085a2ed0f..56fe179c92b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -177,6 +177,7 @@ struct options int unwind_tables; int strip; int pic; + int no_default_config; const char* wine_objdir; const char* winebuild; const char* output_name; @@ -299,6 +300,7 @@ static struct strarray build_tool_name( struct options *opts, enum tool tool ) } strarray_add( &ret, "-Wno-unused-command-line-argument" ); strarray_add( &ret, "-fuse-ld=lld" ); + if (opts->no_default_config) strarray_add( &ret, "--no-default-config" ); } return ret; } @@ -1851,6 +1853,11 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", opts.args.str[i]+1) == 0) linking = -1; + else if (!strcmp( "-no-default-config", opts.args.str[i] + 1 )) + { + opts.no_default_config = 1; + raw_compiler_arg = raw_linker_arg = 1; + } else if (is_option( &opts, i, "--sysroot", &option_arg )) { opts.sysroot = option_arg;

1 0

Esme Povirk : user32/tests: Add a simpler test for SetParent's internal message.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 9587214b205c6cabb8df9812a2e67f22c5531368 URL: https://gitlab.winehq.org/wine/wine/-/commit/9587214b205c6cabb8df9812a2e67f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Nov 24 20:29:35 2023 +0000 user32/tests: Add a simpler test for SetParent's internal message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54037 test_SendMessage_other_thread(2), which is supposed to show that Windows doesn't use an internal sent message for SetParent, tacks this onto another more complex test, which introduces a race condition (see Comment 2 on the bug). I am not sure if it can be fixed in the existing function, perhaps it can and I just can't keep track of all the moving parts well enough, but I see no need to make it so difficult. --- dlls/user32/tests/msg.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8517ede31dd..66db16f2392 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19856,6 +19856,55 @@ static void test_SendMessage_other_thread(int thread_n) CloseHandle(wnd_event.getmessage_complete); } +static DWORD WINAPI SetParent_thread(void *param) +{ + struct wnd_event *wnd_event = param; + + if (winetest_debug > 1) trace("thread: started\n"); + SetEvent(wnd_event->start_event); + + /* this leads to sending an internal message under Wine */ + if (winetest_debug > 1) trace("thread: call SetParent\n"); + SetParent(wnd_event->hwnd, wnd_event->hwnd); + + return 0; +} + +static void test_setparent_status(void) +{ + HANDLE hthread; + struct wnd_event wnd_event; + DWORD ret; + + wnd_event.start_event = CreateEventA(NULL, 0, 0, NULL); + + wnd_event.hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event.hwnd != 0, "CreateWindowEx failed\n"); + + ret = GetQueueStatus(QS_SENDMESSAGE); + ok(ret == 0, "wrong status %08lx\n", ret); + + hthread = CreateThread(NULL, 0, SetParent_thread, &wnd_event, 0, NULL); + ok(hthread != NULL, "CreateThread failed, error %ld\n", GetLastError()); + + WaitForSingleObject(wnd_event.start_event, INFINITE); + + /* background thread's SetParent should complete allowing the thread to exit */ + ret = MsgWaitForMultipleObjects(1, &hthread, FALSE, 1000, QS_SENDMESSAGE); + todo_wine ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjects returned %08lx\n", ret); + + /* QS_SENDMESSAGE status should not have been set by SetParent */ + ret = GetQueueStatus(QS_SENDMESSAGE); + todo_wine ok(ret == 0, "wrong status %08lx\n", ret); + + DestroyWindow(wnd_event.hwnd); + + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + CloseHandle(wnd_event.start_event); +} + static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { DWORD flags = InSendMessageEx( NULL ); @@ -20248,6 +20297,7 @@ START_TEST(msg) test_winevents(); test_SendMessage_other_thread(1); test_SendMessage_other_thread(2); + test_setparent_status(); test_InSendMessage(); test_SetFocus(); test_SetParent();

1 0