May 2018 - Wine-Devel - list.winehq.org

[PATCH 2/2] regedit: Pass NULL instead of the address of an empty WCHAR
by Hugh McMaster May 28, 2018

May 28, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 89a5ec04ad..72a20787d7 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -192,9 +192,8 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, DWORD valueDataLen; LPWSTR buffer = NULL; LONG lRet; - WCHAR empty = 0; - lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, lpType, 0, &valueDataLen); + lRet = RegQueryValueExW(hKey, valueName ? valueName : NULL, NULL, lpType, NULL, &valueDataLen); if (lRet) { if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; @@ -413,12 +412,11 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) BOOL result = FALSE; LONG lRet; HKEY hKey; - WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet) return FALSE; - lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); + lRet = RegDeleteValueW(hKey, valueName ? valueName : NULL); if (lRet && valueName) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); } -- 2.17.0

1 0

[PATCH 1/2] regedit: Confirm whether to delete a registry value from framewnd.c
by Hugh McMaster May 28, 2018

May 28, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 10 +--------- programs/regedit/framewnd.c | 18 ++++++++++-------- programs/regedit/main.h | 2 +- programs/regedit/regedit.rc | 2 +- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 1459624883..89a5ec04ad 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -408,24 +408,16 @@ done: return result; } -BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox) +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { BOOL result = FALSE; LONG lRet; HKEY hKey; - LPCWSTR visibleValueName = valueName ? valueName : g_pszDefaultValueName; WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet) return FALSE; - if (showMessageBox) - { - if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_VALUE_TITLE, IDS_DELETE_VALUE_TEXT, - visibleValueName) != IDYES) - goto done; - } - lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); if (lRet && valueName) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index a6777fade4..ed0c5bbfc8 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -803,15 +803,17 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) unsigned int num_selected, index, focus_idx; WCHAR *keyPath; - if (!(num_selected = SendMessageW(g_pChildWnd->hListWnd, LVM_GETSELECTEDCOUNT, 0, 0L))) + num_selected = SendMessageW(g_pChildWnd->hListWnd, LVM_GETSELECTEDCOUNT, 0, 0L); + + if (!num_selected) break; + else if (num_selected == 1) + index = IDS_DELETE_VALUE_TEXT; + else + index = IDS_DELETE_VALUE_TEXT_MULTIPLE; - if (num_selected > 1) - { - if (messagebox(hWnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_VALUE_TITLE, - IDS_DELETE_VALUE_TEXT_MULTIPLE) != IDYES) - break; - } + if (messagebox(hWnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_VALUE_TITLE, index) != IDYES) + break; keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); @@ -821,7 +823,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) while (index != -1) { WCHAR *valueName = GetItemText(g_pChildWnd->hListWnd, index); - if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName, num_selected == 1)) + if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName)) { heap_free(valueName); break; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 6e901b3ac2..55317be338 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -129,7 +129,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); -BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc index a3e0a01c20..4e629b7d87 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -206,7 +206,7 @@ BEGIN IDS_UNSUPPORTED_TYPE "Unable to edit registry keys of this type (%1!u!)." IDS_TOO_BIG_VALUE "The value is too big (%1!u!)." IDS_DELETE_VALUE_TITLE "Confirm Value Delete" - IDS_DELETE_VALUE_TEXT "Are you sure you want to delete the registry value '%1'?" + IDS_DELETE_VALUE_TEXT "Are you sure you want to delete the selected registry value?" IDS_DELETE_VALUE_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_DELETE_KEY_TITLE "Confirm Key Delete" IDS_DELETE_KEY_TEXT "Are you sure you want to delete this registry key and all of its subkeys?" -- 2.17.0

1 0

[PATCH] testbot/build: Rely on Wine's makefiles and simplify Reconfig.pl.
by Francois Gouget May 28, 2018

May 28, 2018

The 'make depend' step is not needed. Also add a comment to explain why we rebuild from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 7b0755a04..322638eb1 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -144,10 +144,11 @@ sub BuildTestLauncher() sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + + # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype && " . - " time make -j$ncpus depend && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -166,10 +167,11 @@ sub BuildCross($) my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); + + # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " time make -j$ncpus depend && " . " time make -j$ncpus programs/winetest " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) -- 2.17.0

1 0

[PATCH] testbot/build: Rely on Wine's makefiles and simplify Build.pl.
by Francois Gouget May 28, 2018

May 28, 2018

Assume the dependencies in Wine's makefiles work and let them decide whether to re-run configure, update include files or rebuild some dlls before the test executable, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 185 +++++-------------------------------- 1 file changed, 25 insertions(+), 160 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index ce27baab1..c72489c40 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -70,57 +70,34 @@ sub FatalError(@) exit 1; } -sub ApplyPatch($$$) +sub ApplyPatch($) { - my ($PatchFile, $PatchType, $BaseName) = @_; - - my $NeedBuildNative = !1; - my $NeedMakeMakefiles = !1; - my $NeedMakefile = 0; - my $NeedMakeInclude = !1; - my $NeedBuildDeps = !1; - my $NeedImplib = !1; - my $NeedAutoconf = !1; - my $NeedConfigure = !1; + my ($PatchFile) = @_; + + my ($NeedMakeMakefiles, $NeedAutoconf, $HasConfigure, $NeedBuildNative); if (open (FH, "<$PatchFile")) { my $Line; while (defined($Line = <FH>) && - (! $NeedBuildNative || ! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || - ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) + (!$NeedMakeMakefiles || !$NeedAutoconf || !$HasConfigure || + !$NeedBuildNative)) { - if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) - { - $NeedMakefile = 1; - } - elsif ($Line =~ m=^diff.*include/.*\.idl=) - { - $NeedMakeInclude = 1; - } - elsif ($Line =~ m=^diff.*\.spec=) - { - $NeedBuildDeps = 1; - } - elsif ($PatchType eq "dlls" && $Line =~ m=^diff.*$BaseName/Makefile\.in=) - { - $NeedImplib = 1; - } - elsif ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) + if ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) { $NeedAutoconf = 1; } elsif ($Line =~ m=^diff.*configure=) { - $NeedConfigure = 1; + $HasConfigure = 1; } elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || $Line =~ m=diff.*tools/make_makefiles=) { - $NeedMakeMakefiles = $NeedConfigure = 1; + $NeedMakeMakefiles = 1; } elsif ($Line =~ m=^diff.*tools/makedep\.c=) { - $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; + $NeedMakeMakefiles = $NeedBuildNative = 1; } elsif ($Line =~ m=^diff.*tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)=) { @@ -138,7 +115,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); + return -1; } if ($NeedMakeMakefiles) @@ -150,41 +127,24 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); + return -1; } } - if ($NeedAutoconf && ! $NeedConfigure) + if ($NeedAutoconf && !$HasConfigure) { InfoMsg "Running autoconf\n"; system("( cd $DataDir/wine && set -x && " . - " autoconf --output configure configure.ac " . + " autoconf " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure, $NeedBuildNative); - } - $NeedConfigure = 1; - } - - if ($NeedImplib) - { - if (open (FH, "<$DataDir/wine/$PatchType/$BaseName/Makefile.in")) - { - $NeedImplib = !1; - my $Line; - while (defined($Line = <FH>) && ! $NeedImplib) - { - $NeedImplib = ($Line =~ m/^\s*IMPORTLIB\s*=.*$BaseName/) - } - close FH; + return -1; } } - return ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure, $NeedBuildNative); + return $NeedBuildNative; } my $ncpus; @@ -203,9 +163,6 @@ sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . - " rm -rf * && " . - " time ../wine/configure --enable-win64 --without-x --without-freetype && " . - " time make -j$ncpus depend && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); @@ -218,94 +175,9 @@ sub BuildNative() return 1; } -sub BuildTestExecutable($$$$$$$$) +sub BuildTestExecutable($$$) { - my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile, - $NeedMakeInclude, $NeedBuildDeps, $NeedImplib) = @_; - - if ($NeedConfigure) - { - InfoMsg "Reconfigure $Bits-bit crossbuild\n"; - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Reconfigure of $Bits-bit crossbuild failed\n"; - return !1; - } - } - - if ($NeedMakeInclude || $NeedConfigure) - { - InfoMsg "Recreating include/Makefile\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus include/Makefile " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Recreation of include/Makefile failed\n"; - return !1; - } - - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus include " . - ") >> $LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Make in include dir failed\n"; - return !1; - } - } - - if ($NeedImplib || $NeedConfigure) - { - InfoMsg "Rebuilding $BaseName import lib\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus $PatchType/$BaseName/Makefile " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Unable to regenerate $PatchType/$BaseName/Makefile\n"; - } - else - { - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - InfoMsg "Make of import library failed\n"; - } - } - } - - if ($NeedMakefile || $NeedConfigure) - { - InfoMsg "Recreating tests/Makefile\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus $PatchType/$BaseName/tests/Makefile " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Recreation of tests/Makefile failed\n"; - return !1; - } - } - - if ($NeedBuildDeps) - { - InfoMsg "Making build dependencies\n"; - system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus __builddeps__ " . - ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) - { - LogMsg "Making build dependencies failed\n"; - return !1; - } - } + my ($BaseName, $PatchType, $Bits) = @_; my $TestsDir = "$PatchType/$BaseName/tests"; my $TestExecutable = "$TestsDir/$BaseName"; @@ -316,13 +188,13 @@ sub BuildTestExecutable($$$$$$$$) $TestExecutable .= "_test.exe"; unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "Making test executable\n"; + InfoMsg "Building the $Bits-bit test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus -C $TestsDir " . + " time make -j$ncpus $TestsDir " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { - LogMsg "Make failed\n"; + LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; return !1; } if (! -f "$DataDir/build-mingw${Bits}/$TestExecutable") @@ -408,9 +280,8 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -my ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure, $NeedBuildNative) = ApplyPatch($PatchFile, $PatchType, $BaseName); -if ($NeedMakefile < 0) +my $NeedBuildNative = ApplyPatch($PatchFile); +if ($NeedBuildNative < 0) { exit(1); } @@ -426,17 +297,11 @@ if ($NeedBuildNative) } } -if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32, - $NeedConfigure, 0 < $NeedMakefile, - $NeedMakeInclude, $NeedBuildDeps, - $NeedImplib)) +if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) { exit(1); } -if ($Run64 && ! BuildTestExecutable($BaseName, $PatchType, 64, - $NeedConfigure, 0 < $NeedMakefile, - $NeedMakeInclude, $NeedBuildDeps, - $NeedImplib)) +if ($Run64 && ! BuildTestExecutable($BaseName, $PatchType, 64)) { exit(1); } -- 2.17.0

1 0

[PATCH 1/2] testbot/build: Add support for test helper dlls and make the patch parser reusable.
by Francois Gouget May 28, 2018

May 28, 2018

Don't mistake the helper dlls C source files for test units. Also correctly handle patches that add or remove (i.e. rename) a resource file or helper dll. And move the patch parser to its own module so it can be reused, including by processes that don't use / have access to the database. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note that helper dlls will only be correctly handled once both Reconfig.pl, for testlist.c on the build VM, and Patches, on the TestBot Engine, have been updated. However mixing the old and new versions of either should not be worse than the current situation and only impact patches to helper dlls. testbot/bin/build/Reconfig.pl | 19 ++- testbot/lib/WineTestBot/PatchUtils.pm | 224 ++++++++++++++++++++++++++ testbot/lib/WineTestBot/Patches.pm | 102 +----------- 3 files changed, 247 insertions(+), 98 deletions(-) create mode 100644 testbot/lib/WineTestBot/PatchUtils.pm diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 7e267091b..7b0755a04 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -68,10 +68,21 @@ sub GitPull() return !1; } - system("( cd $DataDir/wine && ". - " ls dlls/*/tests/*.c programs/*/tests/*.c | ". - " egrep -v '/testlist.c\$' >../testlist.txt ". - ") >>$LogDir/Reconfig.log 2>&1"); + if (open(my $fh, ">", "$DataDir/testlist.txt")) + { + foreach my $TestFile (glob("$DataDir/wine/*/*/tests/*.c"), + glob("$DataDir/wine/*/*/tests/*.spec")) + { + next if ($TestFile =~ m=/testlist\.c$=); + $TestFile =~ s=^$DataDir/wine/==; + print $fh "$TestFile\n"; + } + close($fh); + } + else + { + LogMsg "Could not open 'testlist.txt' for writing: $!\n"; + } return 1; } diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm new file mode 100644 index 000000000..74599ba30 --- /dev/null +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -0,0 +1,224 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2018 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package WineTestBot::PatchUtils; + +=head1 NAME + +WineTestBot::PatchUtils - Parse and analyze patches. + +=head1 DESCRIPTION + +Provides functions to parse patches and figure out which impact they have on +the Wine builds. + +=cut + +use Exporter 'import'; +our @EXPORT = qw(GetPatchImpact); + +use WineTestBot::Config; + + +=pod +=over 12 + +=item C<GetTestList()> + +Returns a hashtable containing the list of the source files for a given module. +This structure is built from the latest/testlist.txt file. + +=back +=cut + +sub GetTestList() +{ + my $TestList = {}; + if (open(my $File, "<", "$DataDir/latest/testlist.txt")) + { + while (my $TestFileName = <$File>) + { + chomp $TestFileName; + if ($TestFileName =~ m~^\w+/([^/]+)/tests/([^/]+)$~) + { + my ($Module, $File) = ($1, $2); + $TestList->{$Module}->{$File} = 1; + } + } + close($File); + } + return $TestList; +} + +sub _AddTest($$$) +{ + my ($Impacts, $Path, $Change) = @_; + + return if ($Path !~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~); + my ($Root, $Module, $File) = ($1, $2, $3); + + my $Tests = $Impacts->{Tests}; + if (!$Tests->{$Module}) + { + my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" : + "${Module}_test"; + $Tests->{$Module} = { + "Type" => "patch$Root", + "Module" => $Module, + "Path" => "$Root/$Module/tests", + "ExeBase" => $ExeBase, + }; + } + + # Assume makefile modifications may break the build but not the tests. + return if ($File eq "Makefile.in"); + + if (!$Tests->{$Module}->{Files}) + { + my $TestList = ( $Impacts->{TestList} ||= GetTestList() ); + foreach my $File (keys %{$TestList->{$Module}}) + { + $Tests->{$Module}->{Files}->{$File} = 0; # not modified + } + } + $Tests->{$Module}->{Files}->{$File} = $Change; +} + +sub dumpstr($) +{ + my ($Str) = @_; + return defined $Str ? "[$Str]" : "<undef>"; +} + +=pod +=over 12 + +=item C<GetPatchImpact()> + +Analyzes a patch and returns a hashtable describing the impact it has on the +Wine build: whether it requires updating the makefiles, re-running autoconf or +configure, whether it impacts the tests, etc. + +=back +=cut + +sub GetPatchImpact($) +{ + my ($PatchFileName) = @_; + + my $fh; + return undef if (!open($fh, "<", $PatchFileName)); + + my $Impacts = { Tests => {} }; + my ($Path, $Change); + while (my $Line = <$fh>) + { + if ($Line =~ m=^--- /dev/null$=) + { + $Change = "new"; + } + elsif ($Line =~ m~^--- \w+/([^/]+/[^/]+/tests/[^/\s]+)$~) + { + $Path = $1; + } + elsif ($Line =~ m~^\+\+\+ /dev/null$~) + { + _AddTest($Impacts, $Path, "rm") if (defined $Path); + $Path = undef; + $Change = ""; + } + elsif ($Line =~ m~^\+\+\+ \w+/(\w+/[^/]+/tests/[^/\s]+)$~) + { + _AddTest($Impacts, $1, $Change || "modify"); + $Path = undef; + $Change = ""; + } + else + { + $Path = undef; + $Change = ""; + } + } + close($fh); + + $Impacts->{ModuleCount} = 0; + $Impacts->{UnitCount} = 0; + foreach my $Module (keys %{$Impacts->{Tests}}) + { + my $TestInfo = $Impacts->{Tests}->{$Module}; + + # For each module, identify modifications to non-C files and helper dlls + my $AllUnits; + foreach my $File (keys %{$TestInfo->{Files}}) + { + # Skip unmodified files + next if (!$TestInfo->{Files}->{$File}); + + my $Base = $File; + if ($Base !~ s/(?:\.c|\.spec)$//) + { + # Any change to a non-C non-Spec file can potentially impact all tests + $AllUnits = 1; + last; + } + if (exists $TestInfo->{Files}->{"$Base.spec"} and + ($TestInfo->{Files}->{"$Base.c"} or + $TestInfo->{Files}->{"$Base.spec"})) + { + # Any change to a helper dll can potentially impact all tests + $AllUnits = 1; + last; + } + } + + $TestInfo->{Units} = {}; + foreach my $File (keys %{$TestInfo->{Files}}) + { + # Skip unmodified files + next if (!$AllUnits and !$TestInfo->{Files}->{$File}); + + my $Base = $File; + # Non-C files are not test units + next if ($Base !~ s/(?:\.c|\.spec)$//); + # Helper dlls are not test units + next if (exists $TestInfo->{Files}->{"$Base.spec"}); + + if ($AllUnits) + { + # All test units are impacted indirectly and must be rerun + $TestInfo->{Units}->{$Base} = 1; + } + elsif ($TestInfo->{Files}->{$File} and + $TestInfo->{Files}->{$File} ne "rm") + { + # Only new/modified test units are impacted + $TestInfo->{Units}->{$Base} = 1; + } + } + + $TestInfo->{UnitCount} = scalar(%{$TestInfo->{Units}}); + if ($TestInfo->{UnitCount}) + { + $Impacts->{ModuleCount}++; + $Impacts->{UnitCount} += $TestInfo->{UnitCount}; + } + } + + return $Impacts; +} diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b15668732..d4a5e0b17 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -41,6 +41,7 @@ use File::Basename; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::PatchUtils; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::VMs; @@ -109,36 +110,6 @@ sub FromSubmission($$) } -=pod -=over 12 - -=item C<GetTestList()> - -Returns a hashtable containing the list of the source files for a given module. -This structure is built from the latest/testlist.txt file. - -=back -=cut - -sub GetTestList() -{ - my $TestList = {}; - if (open(my $File, "<", "$DataDir/latest/testlist.txt")) - { - while (my $TestFileName = <$File>) - { - chomp $TestFileName; - if ($TestFileName =~ m~^(?:dlls|programs)/([^/]+)/tests/[^/]+\.c$~) - { - my $Module = $1; - push @{$TestList->{$Module}}, $TestFileName; - } - } - close($File); - } - return $TestList; -} - =pod =over 12 @@ -161,38 +132,8 @@ sub Submit($$$) { my ($self, $PatchFileName, $IsSet) = @_; - # See also OnSubmit() in web/Submit.pl - my (%Modules, %Deleted); - if (open(BODY, "<$DataDir/patches/" . $self->Id)) - { - my ($Line, $Modified); - while (defined($Line = <BODY>)) - { - if ($Line =~ m~^\-\-\- .*/((?:dlls|programs)/[^/]+/tests/[^/\s]+)~) - { - $Modified = $1; - } - elsif ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) - { - my ($FileType, $Module, $Unit) = ("patch$1", $2, $3); - # Assume makefile modifications may break the build but not the tests - next if ($Unit eq "Makefile.in"); - $Unit = "" if ($Unit !~ s/\.c$//); - $Modules{$Module}{$Unit} = $FileType; - } - elsif ($Line =~ m~^\+\+\+ /dev/null~ and defined $Modified) - { - $Deleted{$Modified} = 1; - } - else - { - $Modified = undef; - } - } - close BODY; - } - - if (! scalar(%Modules)) + my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id); + if (!$Impacts->{UnitCount}) { $self->Disposition(($IsSet ? "Set" : "Patch") . " doesn't affect tests"); @@ -214,35 +155,11 @@ sub Submit($$$) $User = GetBatchUser(); } - my $TestList; - foreach my $Module (keys %Modules) - { - next if (!defined $Modules{$Module}{""}); - - # The patch modifies non-C files so rerun all that module's test units - $TestList = GetTestList() if (!$TestList); - next if (!defined $TestList->{$Module}); - - # If we don't find which tests to rerun then run the module test - # executable without argument. It probably won't work but will make the - # issue clearer to the developer. - my $FileType = $Modules{$Module}{""}; - foreach my $TestFileName (@{$TestList->{$Module}}) - { - if (!$Deleted{$TestFileName} and - $TestFileName =~ m~^(?:dlls|programs)/\Q$Module\E/tests/([^/]+)\.c$~) - { - my $Unit = $1; - $Modules{$Module}{$Unit} = $FileType; - delete $Modules{$Module}{""}; - } - } - } - my $Disposition = "Submitted job "; my $First = 1; - foreach my $Module (sort keys %Modules) + foreach my $Module (sort keys %{$Impacts->{Tests}}) { + my $TestInfo = $Impacts->{Tests}->{$Module}; my $Jobs = CreateJobs(); # Create a new job for this patch @@ -264,8 +181,7 @@ sub Submit($$$) # Create a link to the patch file in the staging dir my $StagingFileName = CreateNewLink($PatchFileName, "$DataDir/staging", "_patch.diff"); $NewStep->FileName(basename($StagingFileName)); - my @Keys = keys %{$Modules{$Module}}; - $NewStep->FileType($Modules{$Module}{$Keys[0]}); + $NewStep->FileType($TestInfo->{Type}); $NewStep->InStaging(1); $NewStep->Type("build"); $NewStep->DebugLevel(0); @@ -287,7 +203,7 @@ sub Submit($$$) return $ErrMessage; } - foreach my $Unit (sort keys %{$Modules{$Module}}) + foreach my $Unit (sort keys %{$TestInfo->{Units}}) { # Add 32 and 64-bit tasks foreach my $Bits ("32", "64") @@ -300,9 +216,7 @@ sub Submit($$$) # Create the corresponding Step $NewStep = $Steps->Add(); $NewStep->PreviousNo(1); - my $FileName = $Module; - $FileName .= ".exe" if ($Modules{$Module}{$Unit} eq "patchprograms"); - $FileName .= "_test"; + my $FileName = $TestInfo->{ExeBase}; $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); -- 2.17.0

1 1

[PATCH] odbccp32: Fix memory leak in SQLGetInstalledDrivers() (Coverity).
by Józef Kucia May 28, 2018

May 28, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/odbccp32/odbccp32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 862237c67768..f54674c32f1a 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -572,7 +572,10 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) ret = SQLGetInstalledDriversW(wbuf, size, &written); if (!ret) + { + heap_free(wbuf); return FALSE; + } *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL); -- 2.16.1

1 0

[PATCH 1/4] msi/tests: Test deferral of RegisterClassInfo and UnregisterClassInfo.
by Zebediah Figura May 28, 2018

May 28, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 59 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 3d74704..9c8f016 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1463,12 +1463,25 @@ static const char rci_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "UnregisterClassInfo\t\t3000\n" + "uci_immediate\tREMOVE\t3001\n" + "uci_deferred\tREMOVE\t3002\n" "RegisterClassInfo\t\t4000\n" + "rci_immediate\tNOT REMOVE\t4001\n" + "rci_deferred\tNOT REMOVE\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rci_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rci_immediate\t1\tcustom.dll\trci_absent\n" + "rci_deferred\t1025\tcustom.dll\trci_present\n" + "uci_immediate\t1\tcustom.dll\trci_present\n" + "uci_deferred\t1025\tcustom.dll\trci_absent\n"; + static const char rei_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2181,6 +2194,7 @@ static const msi_table rci_tables[] = ADD_TABLE(rci_appid), ADD_TABLE(rci_class), ADD_TABLE(rci_install_exec_seq), + ADD_TABLE(rci_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index cfb368f..a3dd904 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1565,3 +1565,46 @@ todo_wine return ERROR_SUCCESS; } + +UINT WINAPI rci_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "FileType\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI rci_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", + 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "FileType\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); +} + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index d8b5f08..75f665e 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -23,6 +23,8 @@ @ stdcall ppc_absent(long) @ stdcall pub_present(long) @ stdcall pub_absent(long) +@ stdcall rci_present(long) +@ stdcall rci_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long) -- 2.7.4

3 11

[PATCH 1/2] winex11: Introduce GAMMA_RAMP_SIZE.
by Józef Kucia May 28, 2018

May 28, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/x11drv.h | 8 +++++--- dlls/winex11.drv/xvidmode.c | 12 ++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6781d6073a7d..85a05a904aae 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -114,11 +114,13 @@ typedef struct int exposures; /* count of graphics exposures operations */ } X11DRV_PDEVICE; +#define GAMMA_RAMP_SIZE 256 + struct x11drv_gamma_ramp { - WORD red[256]; - WORD green[256]; - WORD blue[256]; + WORD red[GAMMA_RAMP_SIZE]; + WORD green[GAMMA_RAMP_SIZE]; + WORD blue[GAMMA_RAMP_SIZE]; }; static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev ) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 0020b08e70b3..63282e727bc9 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -202,7 +202,7 @@ void X11DRV_XF86VM_Init(void) pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), &xf86vm_gammaramp_size); if (X11DRV_check_error()) xf86vm_gammaramp_size = 0; - if (xf86vm_gammaramp_size == 256) + if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) xf86vm_use_gammaramp = TRUE; } #endif /* X_XF86VidModeSetGammaRamp */ @@ -250,16 +250,16 @@ sym_not_found: #ifdef X_XF86VidModeSetGamma -static void GenerateRampFromGamma(WORD ramp[256], float gamma) +static void GenerateRampFromGamma(WORD ramp[GAMMA_RAMP_SIZE], float gamma) { float r_gamma = 1/gamma; unsigned i; TRACE("gamma is %f\n", r_gamma); - for (i=0; i<256; i++) + for (i=0; i<GAMMA_RAMP_SIZE; i++) ramp[i] = pow(i/255.0, r_gamma) * 65535.0; } -static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) +static BOOL ComputeGammaFromRamp(WORD ramp[GAMMA_RAMP_SIZE], float *gamma) { float r_x, r_y, r_lx, r_ly, r_d, r_v, r_e, g_avg, g_min, g_max; unsigned i, f, l, g_n, c; @@ -342,7 +342,7 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp) if (xf86vm_major < 2) return FALSE; /* no gamma control */ #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), 256, + return pXF86VidModeGetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, ramp->red, ramp->green, ramp->blue); #endif if (pXF86VidModeGetGamma(gdi_display, DefaultScreen(gdi_display), &gamma)) @@ -367,7 +367,7 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(struct x11drv_gamma_ramp *ramp) !ComputeGammaFromRamp(ramp->blue, &gamma.blue)) return FALSE; #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_use_gammaramp) - return pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), 256, + return pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), GAMMA_RAMP_SIZE, ramp->red, ramp->green, ramp->blue); #endif return pXF86VidModeSetGamma(gdi_display, DefaultScreen(gdi_display), &gamma); -- 2.16.1

1 1

[PATCH 0/4] Return SMBIOS info from GetSystemFirmwareTable on Linux
by Alex Henrie May 28, 2018

May 28, 2018

This patch set addresses bug 11908, bug 44305, and others. It reconstructs the SMBIOS table from the SMBIOS values that the kernel exposes to userspace. Because some BIOSes have more than one of each type of SMBIOS struct, and not every BIOS has every type of struct, I have chosen to declare each struct separately. This will allow for a more sophisticated implementation in the future. It will also allow implementations for other platforms (e.g. Mac OS) to implement one or two of the structs without having to implement them all at once. Testing on Windows revealed that the id parameter to GetSystemFirmwareTable is ignored if the provider parameter is RSMB. For more information, see the SMBIOS specification: https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.2.0.… Alex Henrie (4): kernel32: Return BIOS info from GetSystemFirmwareTable on Linux kernel32: Return system info from GetSystemFirmwareTable on Linux kernel32: Return board info from GetSystemFirmwareTable on Linux kernel32: Return chassis info from GetSystemFirmwareTable on Linux dlls/kernel32/process.c | 294 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 293 insertions(+), 1 deletion(-) -- 2.17.0

1 4

Wine staging 3.9 release
by Alistair Leslie-Hughes May 27, 2018

May 27, 2018

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.9 (895 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Fixes * Fixed regression in framerates with DX10/11 games. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Hacknet, Bendy and Ink Machine. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

4 3