wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Zebediah Figura : msi/tests: Test deferral of RegisterFonts and UnregisterFonts.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: a364e1a9c8aeba972f13f1af13cd0643b9a05a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a364e1a9c8aeba972f13f1af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 25 21:18:14 2018 -0500 msi/tests: Test deferral of RegisterFonts and UnregisterFonts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 32 ++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 48 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 43d76a3..91cf3e1 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -799,13 +799,26 @@ static const char font_install_exec_seq_dat[] = "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterFonts\t\t4100\n" + "rf_immediate\tNOT REMOVE\t4101\n" + "rf_deferred\tNOT REMOVE\t4102\n" "UnregisterFonts\t\t4200\n" + "uf_immediate\tREMOVE\t4201\n" + "uf_deferred\tREMOVE\t4202\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6300\n" "PublishProduct\t\t6400\n" "InstallFinalize\t\t6600"; +static const char font_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rf_immediate\t1\tcustom.dll\tfont_absent\n" + "rf_deferred\t1025\tcustom.dll\tfont_present\n" + "uf_immediate\t1\tcustom.dll\tfont_present\n" + "uf_deferred\t1025\tcustom.dll\tfont_absent\n"; + static const char vp_property_dat[] = "Property\tValue\n" "s72\tl0\n" @@ -2054,6 +2067,7 @@ static const msi_table font_tables[] = ADD_TABLE(font_file), ADD_TABLE(font), ADD_TABLE(font_install_exec_seq), + ADD_TABLE(font_custom_action), ADD_TABLE(font_media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 566ab1a..306a8f3 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1642,3 +1642,35 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +static const char font_key[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"; + +UINT WINAPI font_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + res = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI font_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, "msi test font", NULL); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index d302d05..b28b393 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall font_present(long) +@ stdcall font_absent(long) @ stdcall mov_present(long) @ stdcall mov_absent(long) @ stdcall odbc_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of RegisterExtensionInfo and UnregisterExtensionInfo.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: 884d146b3243f01f00efb527bf3f3f578344da94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=884d146b3243f01f00efb527… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 25 21:18:13 2018 -0500 msi/tests: Test deferral of RegisterExtensionInfo and UnregisterExtensionInfo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 50 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9c8f016..43d76a3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1538,12 +1538,25 @@ static const char rei_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "UnregisterExtensionInfo\t\t3000\n" + "uei_immediate\tREMOVE\t3001\n" + "uei_deferred\tREMOVE\t3002\n" "RegisterExtensionInfo\t\t4000\n" + "rei_immediate\tNOT REMOVE\t4001\n" + "rei_deferred\tNOT REMOVE\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rei_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rei_immediate\t1\tcustom.dll\trei_absent\n" + "rei_deferred\t1025\tcustom.dll\trei_present\n" + "uei_immediate\t1\tcustom.dll\trei_present\n" + "uei_deferred\t1025\tcustom.dll\trei_absent\n"; + static const char rpi_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2210,6 +2223,7 @@ static const msi_table rei_tables[] = ADD_TABLE(rei_verb), ADD_TABLE(rei_progid), ADD_TABLE(rei_install_exec_seq), + ADD_TABLE(rei_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index a3dd904..566ab1a 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1608,3 +1608,37 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } + +UINT WINAPI rei_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI rei_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &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 75f665e..d302d05 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -25,6 +25,8 @@ @ stdcall pub_absent(long) @ stdcall rci_present(long) @ stdcall rci_absent(long) +@ stdcall rei_present(long) +@ stdcall rei_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of RegisterClassInfo and UnregisterClassInfo.
by Alexandre Julliard 28 May '18

28 May '18

Module: wine Branch: master Commit: fc6bd87375a945aa456505c9b83d2e7e08c2f891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc6bd87375a945aa456505c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 25 21:18:12 2018 -0500 msi/tests: Test deferral of RegisterClassInfo and UnregisterClassInfo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Francois Gouget : testbot/build: Rely on Wine' s makefiles and simplify Reconfig.pl.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: 34dd35b033170686a264fb86567e98f934bf0854 URL: https://source.winehq.org/git/tools.git/?a=commit;h=34dd35b033170686a264fb8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:10:01 2018 +0200 testbot/build: Rely on Wine's makefiles and simplify Reconfig.pl. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7b0755a..322638e 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)

1 0

Francois Gouget : testbot/build: Rely on Wine' s makefiles and simplify Build.pl.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: 603027bebc8d118f767e5cf83eb17246258bf9e9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=603027bebc8d118f767e5cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:09:15 2018 +0200 testbot/build: Rely on Wine's makefiles and simplify Build.pl. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ce27baa..c72489c 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); }

1 0

Francois Gouget : testbot/web: Simplify Submit.pl by reusing the patch analyser.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: c8c39093db145febee93744d720a04c5d92e59c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c8c39093db145febee93744… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:06:29 2018 +0200 testbot/web: Simplify Submit.pl by reusing the patch analyser. Also standardize on the TestUnit terminology. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 94 +++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 74 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3b80841..cf85078 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -35,6 +35,7 @@ use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Engine::Notify; +use WineTestBot::PatchUtils; use WineTestBot::Utils; use WineTestBot::VMs; @@ -510,7 +511,7 @@ sub DetermineFileType($$) my $ErrMessage = undef; my $FileType = "unknown"; my $DllBaseName = undef; - my $TestSet = undef; + my $TestUnit = undef; if (! sysopen(FH, $FileName, O_RDONLY)) { return ("Unable to open $FileName", "unknown", undef, undef); @@ -563,76 +564,21 @@ sub DetermineFileType($$) if ($FileType eq "unknown") { - if (open (FH, "<$FileName")) + my $Impacts = GetPatchImpact($FileName); + if ($Impacts->{UnitCount} == 0) { - my $Line; - my $PatchFound = !1; - my $PrevPlus = !1; - my $PrevMinus = !1; - while (defined($Line = <FH>)) - { - if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) - { - $FileType = "patch$1"; - my $ThisDllBaseName = $2; - my $ThisTestSet = $3; - if ($ThisTestSet =~ m/^(.*)\.c$/) - { - $ThisTestSet = $1; - } - else - { - $ThisTestSet = undef; - } - - if ((defined($DllBaseName) && $DllBaseName ne $ThisDllBaseName) || - (defined($TestSet) && defined($ThisTestSet) && - $TestSet ne $ThisTestSet)) - { - $ErrMessage = "Patch contains changes to multiple tests"; - } - else - { - if (defined($ThisDllBaseName)) - { - $DllBaseName = $ThisDllBaseName; - } - if (defined($ThisTestSet)) - { - $TestSet = $ThisTestSet; - } - } - } - elsif ($Line =~ m/^\+\+\+ /) - { - if ($PrevMinus) - { - $PatchFound = 1; - $PrevMinus = !1; - } - $PrevPlus = 1; - } - elsif ($Line =~ m/^--- /) - { - if ($PrevPlus) - { - $PatchFound = 1; - $PrevPlus = !1; - } - $PrevMinus = 1; - } - else - { - $PrevPlus = !1; - $PrevMinus = !1; - } - } - close FH; - - if ($FileType eq "unknown" && $PatchFound) - { - $ErrMessage = "Patch doesn't affect tests"; - } + $ErrMessage = "Patch doesn't affect tests"; + } + elsif ($Impacts->{UnitCount} > 1) + { + $ErrMessage = "Patch contains changes to multiple tests"; + } + else + { + my $TestInfo = (values %{$Impacts->{Tests}})[0]; + $FileType = $TestInfo->{Type}; + $DllBaseName = $TestInfo->{Module}; + $TestUnit = (keys %{$TestInfo->{Units}})[0]; } } elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip") @@ -641,7 +587,7 @@ sub DetermineFileType($$) $FileType = "unknown"; } - return ($ErrMessage, $FileType, $DllBaseName, $TestSet); + return ($ErrMessage, $FileType, $DllBaseName, $TestUnit); } sub OnPage1Next($) @@ -686,7 +632,7 @@ sub OnPage1Next($) } close OUTFILE; - my ($ErrMessage, $FileType, $DllBaseName, $TestSet) = $self->DetermineFileType($StagingFile); + my ($ErrMessage, $FileType, $DllBaseName, $TestUnit) = $self->DetermineFileType($StagingFile); if (defined($ErrMessage)) { $self->{ErrField} = "File"; @@ -712,9 +658,9 @@ sub OnPage1Next($) } $self->{TestExecutable} .= "_test.exe"; } - if (defined($TestSet)) + if (defined($TestUnit)) { - $self->{CmdLineArg} = $TestSet; + $self->{CmdLineArg} = $TestUnit; } } else

1 0

Francois Gouget : testbot/build: Add support for test helper dlls and make the patch parser reusable.
by Alexandre Julliard 28 May '18

28 May '18

Module: tools Branch: master Commit: 569b5f5b47fdfc0d37f9e8139d3ad4e31be60412 URL: https://source.winehq.org/git/tools.git/?a=commit;h=569b5f5b47fdfc0d37f9e81… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 28 15:06:14 2018 +0200 testbot/build: Add support for test helper dlls and make the patch parser reusable. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=569b5f5b47fdfc0d37f…

1 0

Alexandre Julliard : Wine release 3.9
by Alexandre Julliard 25 May '18

25 May '18

Module: website Branch: master Commit: 035f93ad5be5573b61a4e91ac600c30baeeaa687 URL: https://source.winehq.org/git/website.git/?a=commit;h=035f93ad5be5573b61a4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:41:29 2018 +0200 Wine release 3.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018052501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018052501.xml b/news/en/2018052501.xml new file mode 100644 index 0000000..463dd1d --- /dev/null +++ b/news/en/2018052501.xml @@ -0,0 +1,17 @@ +<news> +<date>May 25, 2018</date> +<title>Wine 3.9 Released</title> +<body> + The Wine development release 3.9 is now available. + <a href="{$root}/announce/3.9">What's new</a> in this release: +<ul> + <li>OpenGL core contexts enabled by default in Direct 3D.</li> + <li>Beginnings of Direct 3D 12 implementation using vkd3d.</li> + <li>More support for the Task Scheduler.</li> + <li>Some more Task Dialog support.</li> + <li>Better arrow support in GdiPlus.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.9 : Alexandre Julliard : Release 3.9
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: refs/tags/wine-3.9 Tag: 0bcc25fc88131d726401979c68d64567157d4c55 URL: https://source.winehq.org/git/wine.git/?a=tag;h=0bcc25fc88131d726401979c68d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:38:57 2018 +0200 Release 3.9

1 0

Alexandre Julliard : Release 3.9.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 59994c94092efb70fcbec0cb147401609d125e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59994c94092efb70fcbec0cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:38:57 2018 +0200 Release 3.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 623 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 351 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59994c94092efb70fcbe…

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018