March 2020 - Wine-Commits - list.winehq.org

Vijay Kiran Kamuju : wmvcore: Add semi-stub implementation for WMIsContentProtected.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: f0dbd3addc3140e3b92785ca42c1c1df00469f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0dbd3addc3140e3b92785ca… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 29 21:55:59 2020 +0100 wmvcore: Add semi-stub implementation for WMIsContentProtected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48683 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++++ dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 12 ++++++++++++ include/wmsdkidl.idl | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 8af34e22b6..2b5a4555a3 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -338,6 +338,23 @@ static void test_urlextension(void) todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); } +static void test_iscontentprotected(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + BOOL drm; + + hr = WMIsContentProtected(NULL, NULL); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(NULL, &drm); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(mp3file, NULL); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(mp3file, &drm); + ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); + ok(drm == FALSE, "got %0dx\n", drm); +} + START_TEST(wmvcore) { HRESULT hr; @@ -353,6 +370,7 @@ START_TEST(wmvcore) test_profile_manager_interfaces(); test_WMCreateWriterPriv(); test_urlextension(); + test_iscontentprotected(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 65e0807b61..8c3e62bbb1 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -17,4 +17,4 @@ @ stub WMCreateWriterNetworkSink @ stdcall WMCreateWriterPriv(ptr) @ stub WMCreateWriterPushSink -@ stub WMIsContentProtected +@ stdcall WMIsContentProtected(wstr ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index af23ab88b8..4dafcf8055 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -86,6 +86,18 @@ HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **lic return E_NOTIMPL; } +HRESULT WINAPI WMIsContentProtected(const WCHAR *filename, BOOL *protected) +{ + FIXME("(%s %p): semi-stub\n", wine_dbgstr_w(filename), protected); + + if (!filename || !protected) + return E_INVALIDARG; + + *protected = FALSE; + + return S_FALSE; +} + typedef struct { IWMProfileManager2 IWMProfileManager2_iface; LONG ref; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 4ee166a9d4..d1e0445470 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1896,6 +1896,7 @@ cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") cpp_quote("HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**);") cpp_quote("HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**);") cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") +cpp_quote("HRESULT WINAPI WMIsContentProtected(const WCHAR*, BOOL*);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Francois Gouget : testbot/PatchUtils: Detect when make_fir needs to be run.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: tools Branch: master Commit: 53ac3623936a0f48554c162c8e1a2d4e81dca608 URL: https://source.winehq.org/git/tools.git/?a=commit;h=53ac3623936a0f48554c162… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:55:21 2020 +0100 testbot/PatchUtils: Detect when make_fir needs to be run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 85df900..8a6982c 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -148,6 +148,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeFir}) + { + InfoMsg "\nRunning make_fir\n"; + system("cd '$DataDir/$Dir/dlls/dsound/' && set -x && ./make_fir"); + if ($? != 0) + { + LogMsg "make_fir failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index eaa9868..44b3f97 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=) + { + $Impacts->{MakeFir} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) { $Impacts->{MakeErrors} = 1;

1 0

Francois Gouget : testbot/WinePatchesMLSubmit: Add a semi-colon.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: tools Branch: master Commit: 93e5c34f072c1061c413b1df6f4beb13149997e7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=93e5c34f072c1061c413b1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:54:20 2020 +0100 testbot/WinePatchesMLSubmit: Add a semi-colon. It's at the end of a block and thus optional but all other blocks have one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WinePatchesMLSubmit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 4797e98..92c769f 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -65,7 +65,7 @@ if (defined $ErrMessage) { # The Engine will pick up the email later so return success anyway. # But still log the issue so it can be checked out. - LogMsg "$ErrMessage\n" + LogMsg "$ErrMessage\n"; } exit 0;

1 0

Francois Gouget : testbot/build: Simplify the --no-rm handling.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: tools Branch: master Commit: 443e63563411f8edd6caedf20ae7aab9213e2772 URL: https://source.winehq.org/git/tools.git/?a=commit;h=443e63563411f8edd6caedf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:55:03 2020 +0100 testbot/build: Simplify the --no-rm handling. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 6 ++++-- testbot/bin/build/WineReconfig.pl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f0ed128..62644e1 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -40,6 +40,8 @@ sub BEGIN $::BuildEnv = 1; } +use File::Path; + use Build::Utils; use WineTestBot::Config; use WineTestBot::Missions; @@ -53,13 +55,13 @@ sub BuildNative($) { my ($NoRm) = @_; + rmtree "$DataDir/wine-native" if (!$NoRm); mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); system("cd '$DataDir/wine-native' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount __tooldeps__"); @@ -77,6 +79,7 @@ sub BuildCross($$$) my ($TaskMissions, $NoRm, $Build) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate @@ -84,7 +87,6 @@ sub BuildCross($$$) my $CPUCount = GetCPUCount(); my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount buildtests"); if ($? != 0) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 835be46..ad0d429 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,6 +54,7 @@ sub BuildWine($$$$;$) my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not @@ -62,7 +63,6 @@ sub BuildWine($$$$;$) my $CPUCount = GetCPUCount(); $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". "time make -j$CPUCount"); if ($? != 0)

1 0

Francois Gouget : testbot/web: Remove the old job submit page.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: tools Branch: master Commit: 7d763278df8dad54c1acd4e966e32ed4affefdac URL: https://source.winehq.org/git/tools.git/?a=commit;h=7d763278df8dad54c1acd4e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:57:00 2020 +0100 testbot/web: Remove the old job submit page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 3 +- testbot/web/OldSubmit.pl | 1043 ------------------------------- 2 files changed, 1 insertion(+), 1045 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=7d763278df8dad54c1a…

1 0

Francois Gouget : testbot/LogUtils: Handle child process crashes.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: tools Branch: master Commit: c0be1870cb2a80620939ae364049686fba924854 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c0be1870cb2a80620939ae3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 17 00:02:47 2020 +0100 testbot/LogUtils: Handle child process crashes. Make sure they are included in the failure count, highlighted as failures and sanitized before comparison for the new failures detection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48651 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 57229bc..99c30e0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -327,7 +327,7 @@ sub GetReportLineCategory($) if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or $Line =~ /Fatal: test .* does not exist/ or $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or + $Line =~ /: unhandled exception [0-9a-fA-F]{8} (?:at|in) / or $Line =~ /^Unhandled exception: /) { return "error"; @@ -627,6 +627,13 @@ sub ParseWineTestReport($$$) _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or + $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) + { + _CheckUnit($LogInfo, $Cur, $1, "child exception"); + $Cur->{LineFailures}++; + } elsif (($Cur->{Unit} ne "" and $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or $Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) @@ -1054,6 +1061,8 @@ sub _GetLineKey($) or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ # or the process id in Wine's exc_filter() lines or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ + # or child process id + or $Line =~ s/^([_.a-z0-9]+:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ # The exact amount of data printed does not change the error or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/;

1 0

Zebediah Figura : winegstreamer: Allocate media type format blocks with CoTaskMemAlloc().
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 57492f55fdf17444c68ef57525240d8dbd4b4baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=57492f55fdf17444c68ef575… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:13 2020 -0500 winegstreamer: Allocate media type format blocks with CoTaskMemAlloc(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e9548e80e4..0b00fc5339 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -121,7 +121,7 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * if (!gst_audio_info_from_caps (&ainfo, caps)) return FALSE; - wfe = heap_alloc(sizeof(*wfe)); + wfe = CoTaskMemAlloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; amt->majortype = MEDIATYPE_Audio; amt->subtype = MEDIASUBTYPE_PCM; @@ -186,7 +186,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * nom = vinfo.fps_n; denom = vinfo.fps_d; - vih = heap_alloc(sizeof(*vih)); + vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; amt->formattype = FORMAT_VideoInfo; @@ -225,14 +225,14 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * break; default: FIXME("Unhandled type %s.\n", vinfo.finfo->name); - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } switch (amt->subtype.Data1) {

1 0

Jacek Caban : ucrtbase/tests: Use more functions directly.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: c2ee20c95bea55069d32cfa69a95ae3e4486a02b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2ee20c95bea55069d32cfa6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 21:12:57 2020 +0100 ucrtbase/tests: Use more functions directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 122 ++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2ee20c95bea55069d32…

1 0

Francois Gouget : configure: Add an option to enable -Werror.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 85100cfc7a03a0fc32fd98241d9cf462eaae5988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85100cfc7a03a0fc32fd9824… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:29:21 2020 +0100 configure: Add an option to enable -Werror. --maintainer-mode already enables -Werror but it it incompatible with out-of-tree builds. Calling configure with CFLAGS=-Werror causes it to misdetect some functions like llrint() due to redefinition warnings. And setting CFLAGS when invoking make risks losing compiler options like -g -O2. So add a --enable-werror configure option to allow cleanly using -Werror. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 13 +++++++++++-- configure.ac | 10 +++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/configure b/configure index bb2fccd1fc..76cfea1c07 100755 --- a/configure +++ b/configure @@ -841,6 +841,7 @@ enable_win16 enable_win64 enable_tests enable_maintainer_mode +enable_werror with_alsa with_capi with_cms @@ -2537,6 +2538,7 @@ Optional Features: --disable-tests do not build the regression tests --enable-maintainer-mode enable maintainer-specific build rules + --enable-werror treat compilation warnings as errors --disable-largefile omit support for large files Optional Packages: @@ -3861,6 +3863,11 @@ if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; fi +# Check whether --enable-werror was given. +if test "${enable_werror+set}" = set; then : + enableval=$enable_werror; +fi + # Check whether --with-alsa was given. @@ -6790,6 +6797,8 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } with_gettext=yes with_gettextpo=yes + + enable_werror=yes fi test "x$with_gettext" != xno || MSGFMT=false @@ -10582,7 +10591,7 @@ if test "x$ac_cv_crosscflags__Wl__delayload_autoconftest_dll" = xyes; then : fi - if test "x$enable_maintainer_mode" = xyes + if test "x$enable_werror" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 $as_echo_n "checking whether the cross-compiler supports -Werror... " >&6; } @@ -17691,7 +17700,7 @@ fi ;; CFLAGS=$saved_CFLAGS - if test "x$enable_maintainer_mode" = "xyes" + if test "x$enable_werror" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 $as_echo_n "checking whether the compiler supports -Werror... " >&6; } diff --git a/configure.ac b/configure.ac index 7c3c6d2b67..f722ac5d04 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) +AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[treat compilation warnings as errors])) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) @@ -373,6 +374,9 @@ else dnl Maintainer mode requires gettext with_gettext=yes with_gettextpo=yes + + dnl Maintainer mode wants -Werror + enable_werror=yes fi test "x$with_gettext" != xno || MSGFMT=false @@ -1092,7 +1096,7 @@ then WINE_TRY_CROSSCFLAGS([-Wl,-delayload,autoconftest.dll], [AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) - if test "x$enable_maintainer_mode" = xyes + if test "x$enable_werror" = "xyes" then WINE_TRY_CROSSCFLAGS([-Werror]) fi @@ -2080,8 +2084,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= CFLAGS=$saved_CFLAGS - dnl Enable -Werror for maintainer mode - if test "x$enable_maintainer_mode" = "xyes" + dnl Enable -Werror + if test "x$enable_werror" = "xyes" then WINE_TRY_CFLAGS([-Werror]) fi

1 0

Francois Gouget : kernel32/tests: Clean up the argv[0] tests and improve coverage.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 435b41ec7c87d7b1eb6c51a538c3624110a39a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=435b41ec7c87d7b1eb6c51a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:29:45 2020 +0100 kernel32/tests: Clean up the argv[0] tests and improve coverage. The argv[0] tests mostly care about the value of argvA0 in the child process. So remove most of the extra arguments and use the remaining ones to check other aspects. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c5ff473d30..264f737178 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -910,9 +910,9 @@ static void test_CommandLine(void) ok(!info.dwProcessId, "unexpected dwProcessId %04x\n", info.dwProcessId); ok(!info.dwThreadId, "unexpected dwThreadId %04x\n", info.dwThreadId); - /* the basics */ + /* the basics; not getting confused by the leading and trailing " */ get_file_name(resfile); - sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* Check that the effective STARTUPINFOA parameters are not modified */ ok(startup.cb == sizeof(startup), "unexpected cb %d\n", startup.cb); @@ -927,10 +927,9 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); - okChildInt("Arguments", "argcA", 6); + okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); - okChildString("Arguments", "argvA5", "\""); - okChildString("Arguments", "argvA6", NULL); + okChildString("Arguments", "argvA5", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); DeleteFileA(resfile); @@ -955,10 +954,12 @@ static void test_CommandLine(void) release_memory(); DeleteFileA(resfile); - /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ + /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0] + * and " escaping. + */ get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, "./%s process dump \"%s\" \"\"\"\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -969,13 +970,16 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); sprintf(buffer, "./%s", exename); + okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA0", buffer); + okChildString("Arguments", "argvA4", "\""); + okChildString("Arguments", "argvA5", NULL); release_memory(); DeleteFileA(resfile); get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, ".\\%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, ".\\%s process dump \"%s\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -996,8 +1000,8 @@ static void test_CommandLine(void) *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); /* Use exename to avoid buffer containing things like 'C:' */ - if (p) sprintf(buffer, "..%s/%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); - else sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + if (p) sprintf(buffer, "..%s/%s process dump \"%s\"", p, exename, resfile); + else sprintf(buffer, "./%s process dump \"%s\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -1022,7 +1026,7 @@ static void test_CommandLine(void) /* Use exename to avoid buffer containing things like 'C:' */ if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); - sprintf(buffer2, "dummy process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", resfile); + sprintf(buffer2, "dummy process dump \"%s\"", resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError());

1 0