September 2019 - Wine-commits

Julian Rüger : German translation for release 4.0.2.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: website Branch: master Commit: 80cf80b97dcf846c7556d291c75c6a0bea9c3491 URL: https://source.winehq.org/git/website.git/?a=commit;h=80cf80b97dcf846c7556d… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Sep 4 11:14:11 2019 +0200 German translation for release 4.0.2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019082301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2019082301.xml b/news/de/2019082301.xml new file mode 100644 index 0000000..dc638ee --- /dev/null +++ b/news/de/2019082301.xml @@ -0,0 +1,12 @@ +<news> +<date>23. August 2019</date> +<title>Wine 4.0.2 freigegeben</title> +<body> + Die Wartungsversion 4.0.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.0.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.0/wine-4.0.2.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.13.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: website Branch: master Commit: 7d5119a802590adc908bd46ea8d92c3f8a91a99e URL: https://source.winehq.org/git/website.git/?a=commit;h=7d5119a802590adc908bd… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Sep 4 10:55:18 2019 +0200 German translation for release 4.13. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019080201.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2019080201.xml b/news/de/2019080201.xml new file mode 100644 index 0000000..f1ad954 --- /dev/null +++ b/news/de/2019080201.xml @@ -0,0 +1,14 @@ +<news> +<date>2. August 2019</date> +<title>Wine 4.13 freigegeben</title> +<body> + Die Entwicklungsversion 4.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Passport-HTTP-Umleitungen.</li> + <li>Eine Menge Header-Updates.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.13.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation of WineConf announcement.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: website Branch: master Commit: 54ed92f349e18d397165aabf9c497e35758714f3 URL: https://source.winehq.org/git/website.git/?a=commit;h=54ed92f349e18d397165a… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Sep 4 11:06:22 2019 +0200 German translation of WineConf announcement. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019080901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2019080901.xml b/news/de/2019080901.xml new file mode 100644 index 0000000..d50faa9 --- /dev/null +++ b/news/de/2019080901.xml @@ -0,0 +1,14 @@ +<news> +<date>9. August 2019</date> +<title>WineConf 2019</title> +<body> +Das Wine-Projekt ist erfreut verkünden zu können, dass die diesjährige WineConf 2019 +vom 12. - 13. Oktober in Toronto, Kanada stattfinden wird. +WineConf ist die jährliche Konferenz des Wine-Projekts, bei der sich +Mitglieder der Wine-Community, der breiteren Freie-Software-Bewegung und interessierte +Anwender treffen, um sich bei Essen und Getränken auszutauschen. Traditionell finden +auch Vorträge einiger Teilnehmer statt, sowie formelle und informelle Diskussionen +zu diversen Themen über und um Wine. +Weitere Details dazu auf der <a href="https://wiki.winehq.org/WineConf2019">WineConf2019-Seite</a> +im Wine-Wiki. +</body></news>

1 0

Francois Gouget : testbot: Centralize the $PATH cleanup.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: tools Branch: master Commit: 1ee59b55d259bfd260e867ffcc7e0b284caeb7ca URL: https://source.winehq.org/git/tools.git/?a=commit;h=1ee59b55d259bfd260e867f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 4 15:36:58 2019 +0200 testbot: Centralize the $PATH cleanup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 - testbot/bin/Janitor.pl | 2 -- testbot/bin/LibvirtTool.pl | 2 -- testbot/bin/WineRunBuild.pl | 2 -- testbot/bin/WineRunReconfig.pl | 2 -- testbot/bin/WineRunTask.pl | 2 -- testbot/bin/WineRunWineTest.pl | 2 -- testbot/bin/WineSendLog.pl | 2 -- testbot/lib/WineTestBot/Config.pm | 2 ++ testbot/lib/WineTestBot/VMs.pm | 1 - testbot/scripts/CheckWineTestBot.pl | 2 -- 11 files changed, 2 insertions(+), 18 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 9ffdf96..81d3afc 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -741,7 +741,6 @@ sub main() exit 1; } - $ENV{PATH} = "/usr/bin:/bin"; $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index e766285..537a0dc 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -76,8 +76,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - # Grab the command line options my ($Usage, $DryRun); while (@ARGV) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a078fcb..4000c14 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -87,8 +87,6 @@ EOF # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - # Grab the command line options my ($Usage, $Action, $VMKey); while (@ARGV) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b1349f0..fdcf770 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -72,8 +72,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 378bd94..493ab10 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -73,8 +73,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index e6112fd..6a71849 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -103,8 +103,6 @@ sub TakeScreenshot($$) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index a74877a..74b974a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -102,8 +102,6 @@ sub TakeScreenshot($$) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 28644fb..721122e 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -406,8 +406,6 @@ EOF # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index d6267de..b72968c 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -71,6 +71,8 @@ $BinDir = "$::RootDir/bin"; # Sanitize the environment for system() & co delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec +$ENV{PATH} = "/usr/bin:/bin"; + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6770547..5d738e2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -447,7 +447,6 @@ sub Run($$$$$$) WineTestBot::Log::LogMsg("Starting child: @$Args\n"); $ChildSetup->($VM, $SetupData); - $ENV{PATH} = "/usr/bin:/bin"; exec(@$Args) or WineTestBot::Log::LogMsg("Unable to exec $Tool: $!\n"); diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 0af2550..3ca4fde 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -38,8 +38,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Engine::Notify; -$ENV{PATH} = "/usr/bin:/bin"; - my $rc = 0; if (! PingEngine()) {

1 0

Francois Gouget : testbot: Centralize adding ccache to $PATH for build scripts.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: tools Branch: master Commit: 0d401a38ec6632ac4b602efff4afe6acc8c47fc4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d401a38ec6632ac4b602ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 4 15:37:17 2019 +0200 testbot: Centralize adding ccache to $PATH for build scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 -- testbot/bin/build/Reconfig.pl | 2 -- testbot/bin/build/WineReconfig.pl | 2 -- testbot/bin/build/WineTest.pl | 2 -- testbot/lib/Build/Utils.pm | 2 ++ testbot/lib/WineTestBot/Config.pm | 5 +++++ 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 894686d..f23b733 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -114,8 +114,6 @@ sub BuildTestExecutables($$$) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my ($Usage, $PatchFile, $MissionStatement); while (@ARGV) { diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index c43fbda..72725bf 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -110,8 +110,6 @@ sub UpdateWineBuilds($$) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); while (@ARGV) { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 4e03c31..9f0544e 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -142,8 +142,6 @@ sub UpdateWinePrefixes($) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); while (@ARGV) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index f848157..a399736 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -209,8 +209,6 @@ sub TestExe($$$) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my $Action = ""; my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); while (@ARGV) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 61b47a7..d31db82 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -40,6 +40,8 @@ use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Utils; +WineTestBot::Config::PrependPaths("/usr/lib/ccache"); + # # Logging and error handling diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b72968c..b68c4f5 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -73,6 +73,11 @@ $BinDir = "$::RootDir/bin"; delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec $ENV{PATH} = "/usr/bin:/bin"; +sub PrependPaths(@) +{ + map { $ENV{PATH} = "$_:$ENV{PATH}" if (-d $_) } reverse @_; +} + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1;

1 0

Francois Gouget : testbot: Switch to the zstd compression algorithm in BackupVM.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: tools Branch: master Commit: 84adbe64cb3a65afda1372d5b1915edacc336762 URL: https://source.winehq.org/git/tools.git/?a=commit;h=84adbe64cb3a65afda1372d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 4 15:38:16 2019 +0200 testbot: Switch to the zstd compression algorithm in BackupVM. This requires borgbackup >= 1.1.4 (e.g. from Debian 10). The compression drops a few percentage points compared to the previous lzma settings but this makes restoration much faster. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/BackupVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index d7e5483..124e222 100755 --- a/testbot/scripts/BackupVM +++ b/testbot/scripts/BackupVM @@ -318,7 +318,7 @@ if [ -n "$opt_borg" ] then borg_opts="" [ -n "$opt_verbose" ] && borg_opts="$borg_opts --verbose" - dry_run $nice borg create --progress --stats -C lzma,9 \ + dry_run $nice borg create --progress --stats -C zstd,22 \ "$opt_borg::$backup" $all_paths rc_borg=$? if [ $rc_borg -ne 0 ]

1 0

Zhiyi Zhang : winemac.drv: Fix build with older macOS SDKs.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: 0d23ecd9ec8a0c24e5444e0fc9cf6933cc39c960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d23ecd9ec8a0c24e5444e0f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 2 12:04:21 2019 +0800 winemac.drv: Fix build with older macOS SDKs. macOS SDKs older than 10.11 doesn't support Metal. macOS 10.11 and 10.12 SDK support Metal but don't support registryID in MTLDevice protocol. Recommend using 10.13+ SDK. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 40 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 ++++++++++++ dlls/winemac.drv/cocoa_display.m | 5 ++--- include/config.h.in | 3 +++ 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a52e346..0c54e27 100755 --- a/configure +++ b/configure @@ -8954,6 +8954,46 @@ rm -f core conftest.err conftest.$ac_objext \ fi + if test "$ac_cv_header_Metal_Metal_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether MTLDevice protocol supports registryID property" >&5 +$as_echo_n "checking whether MTLDevice protocol supports registryID property... " >&6; } + ac_ext=m +ac_cpp='$OBJCPP $CPPFLAGS' +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objc_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <Metal/Metal.h> +int +main () +{ +id<MTLDevice> device; device.registryID; + ; + return 0; +} +_ACEOF +if ac_fn_objc_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_MTLDEVICE_REGISTRYID 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi + if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" then ac_save_LIBS="$LIBS" diff --git a/configure.ac b/configure.ac index 1592812..b39b6b2 100644 --- a/configure.ac +++ b/configure.ac @@ -859,6 +859,18 @@ case $host_os in AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore") fi + dnl Check for MTLDevice registryID property + if test "$ac_cv_header_Metal_Metal_h" = "yes" + then + AC_MSG_CHECKING([whether MTLDevice protocol supports registryID property]) + AC_LANG_PUSH([Objective C]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Metal/Metal.h>]], [[id<MTLDevice> device; device.registryID;]])], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_MTLDEVICE_REGISTRYID, 1, [Define if MTLDevice protocol has registryID property.])], + [AC_MSG_RESULT(no)]) + AC_LANG_POP([Objective C]) + fi + dnl Enable Mac driver on Mac OS X 10.6 or later if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" then diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 3863557..9d95eee 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -21,7 +21,7 @@ #include "config.h" #import <AppKit/AppKit.h> -#ifdef HAVE_METAL_METAL_H +#ifdef HAVE_MTLDEVICE_REGISTRYID #import <Metal/Metal.h> #endif #include "macdrv_cocoa.h" @@ -234,7 +234,7 @@ done: return ret; } -#ifdef HAVE_METAL_METAL_H +#ifdef HAVE_MTLDEVICE_REGISTRYID /*********************************************************************** * macdrv_get_gpu_info_from_registry_id @@ -337,7 +337,6 @@ done: static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) { - TRACE("Metal support not compiled in\n"); return -1; } diff --git a/include/config.h.in b/include/config.h.in index 924e11e..5f690df 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -584,6 +584,9 @@ /* Define to 1 if you have the <mpg123.h> header file. */ #undef HAVE_MPG123_H +/* Define if MTLDevice protocol has registryID property. */ +#undef HAVE_MTLDEVICE_REGISTRYID + /* Define to 1 if you have the <ncurses.h> header file. */ #undef HAVE_NCURSES_H

1 0

Piotr Caban : wbemdisp: Handle NULL signatures in init_members.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: 5e4472d425b2efdcb94a197dd480b3a8a6f235fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4472d425b2efdcb94a197d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 2 23:49:43 2019 +0200 wbemdisp: Handle NULL signatures in init_members. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47709 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 5e22989..a9ef161 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -618,8 +618,8 @@ static HRESULT init_members( struct object *object ) { count++; SysFreeString( name ); - IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); + if (sig_in) IWbemClassObject_Release( sig_in ); + if (sig_out) IWbemClassObject_Release( sig_out ); } IWbemClassObject_EndMethodEnumeration( object->object ); } @@ -657,8 +657,8 @@ static HRESULT init_members( struct object *object ) IWbemClassObject_EndMethodEnumeration( object->object ); goto error; } - IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); + if (sig_in) IWbemClassObject_Release( sig_in ); + if (sig_out) IWbemClassObject_Release( sig_out ); TRACE( "added method %s\n", debugstr_w(name) ); } IWbemClassObject_EndMethodEnumeration( object->object );

1 0

Zebediah Figura : amstream/tests: Add more tests for media types.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: bfc668833e269e58b0c8df9de0adb96cd781e553 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc668833e269e58b0c8df9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 2 20:24:02 2019 -0500 amstream/tests: Add more tests for media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 175 +++++++++++++++++++++++++++++++++++------ 1 file changed, 151 insertions(+), 24 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 000bb40..75862e7 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1039,34 +1039,10 @@ static void test_media_streams(void) ok(nb_pins == expected_nb_pins, "Number of pins is %u instead of %u\n", nb_pins, expected_nb_pins); for (i = 0; i < min(nb_pins, expected_nb_pins); i++) { - IEnumMediaTypes* enum_media_types; - AM_MEDIA_TYPE* media_types[10]; - ULONG nb_media_types; IPin* pin; - PIN_INFO info; - WCHAR id[40]; - - /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ - id[0] = 'I'; - StringFromGUID2(i ? &MSPID_PrimaryAudio : &MSPID_PrimaryVideo, id + 1, 39); hr = IPin_ConnectedTo(pins[i], &pin); ok(hr == VFW_E_NOT_CONNECTED, "IPin_ConnectedTo returned: %x\n", hr); - hr = IPin_QueryPinInfo(pins[i], &info); - ok(hr == S_OK, "IPin_QueryPinInfo returned: %x\n", hr); - IBaseFilter_Release(info.pFilter); - ok(info.dir == PINDIR_INPUT, "Pin direction is %u instead of %u\n", info.dir, PINDIR_INPUT); - ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); - hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); - ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, ARRAY_SIZE(media_types), media_types, &nb_media_types); - ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); - ok(nb_media_types > 0, "nb_media_types should be >0\n"); - IEnumMediaTypes_Release(enum_media_types); - hr = IMediaStream_QueryInterface(i ? audio_stream : video_stream, &IID_IPin, (void **)&pin); - ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); - ok(pin == pins[i], "Pin is %p instead of %p\n", pins[i], pin); - IPin_Release(pin); IPin_Release(pins[i]); } IEnumPins_Release(enum_pins); @@ -1780,6 +1756,156 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER req_vih = {}; + static const WAVEFORMATEX expect_wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nAvgBytesPerSec = 11025 * 2, + .nBlockAlign = 2, + .wBitsPerSample = 16, + .cbSize = 0, + }; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IEnumMediaTypes *enummt; + IMediaStream *stream; + AM_MEDIA_TYPE *pmt; + ULONG ref, count; + unsigned int i; + HRESULT hr; + IPin *pin; + + static const GUID *rejected_subtypes[] = + { + &MEDIASUBTYPE_RGB1, + &MEDIASUBTYPE_RGB4, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB555, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + &MEDIASUBTYPE_ARGB32, + &MEDIASUBTYPE_ARGB1555, + &MEDIASUBTYPE_ARGB4444, + &GUID_NULL, + }; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB8), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 10000, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + pmt->formattype = FORMAT_VideoInfo; + pmt->cbFormat = sizeof(VIDEOINFOHEADER); + pmt->pbFormat = (BYTE *)&req_vih; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Stream; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + for (i = 0; i < ARRAY_SIZE(rejected_subtypes); ++i) + { + pmt->subtype = *rejected_subtypes[i]; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x for subtype %s.\n", + hr, wine_dbgstr_guid(rejected_subtypes[i])); + } + + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + IMediaStream_Release(stream); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(count == 1, "Got count %u.\n", count); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + } + + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + IMediaStream_Release(stream); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_IDirectDrawStreamSample(void) { DDSURFACEDESC desc = { sizeof(desc) }; @@ -2158,6 +2284,7 @@ START_TEST(amstream) test_pin_info(); test_initialize(); test_enum_media_types(); + test_media_types(); test_IDirectDrawStreamSample(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL);

1 0

Zebediah Figura : amstream: Move audio and ddraw streams into separate files.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: 3537f73f21a96f0b0d630170ba079f25495def2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3537f73f21a96f0b0d630170… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 2 20:24:03 2019 -0500 amstream: Move audio and ddraw streams into separate files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/Makefile.in | 3 +- dlls/amstream/audiostream.c | 701 +++++++++++++++++++++++++ dlls/amstream/{mediastream.c => ddrawstream.c} | 690 +----------------------- 3 files changed, 705 insertions(+), 689 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3537f73f21a96f0b0d63…

1 0