October 2015 - Wine-commits

Andrew Eikum : xaudio2_2: Add compatibility implementation and forward to xaudio2_7.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 831095ed9335bd75f29ff3d2ab1233ead6935b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831095ed9335bd75f29ff3d2a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:03 2015 -0500 xaudio2_2: Add compatibility implementation and forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/xaudio2_2/Makefile.in | 7 ++ dlls/xaudio2_2/xaudio2_2.spec | 4 + dlls/xaudio2_2/xaudio_classes.idl | 28 +++++ dlls/xaudio2_2/xaudio_dll.c | 52 ++++++++ dlls/xaudio2_7/compat.c | 252 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 7 ++ dlls/xaudio2_7/xaudio_dll.c | 17 ++- dlls/xaudio2_7/xaudio_private.h | 3 + include/xaudio2.idl | 85 +++++++++++++ 11 files changed, 454 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=831095ed9335bd75f29ff…

1 0

Andrew Eikum : xaudio2_1: Forward to xaudio2_7.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 24a371c9d6917e87e8f6781a233286a3c04469f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a371c9d6917e87e8f6781a2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:09 2015 -0500 xaudio2_1: Forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_1/Makefile.in | 7 ++++++ dlls/xaudio2_1/xaudio2_1.spec | 4 +++ dlls/xaudio2_1/xaudio_classes.idl | 28 +++++++++++++++++++++ dlls/xaudio2_1/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++ include/xaudio2.idl | 7 ++++++ 7 files changed, 101 insertions(+) diff --git a/configure b/configure index 5b5000d..34edcce 100755 --- a/configure +++ b/configure @@ -1374,6 +1374,7 @@ enable_xapofx1_1 enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 +enable_xaudio2_1 enable_xaudio2_2 enable_xaudio2_3 enable_xaudio2_4 @@ -17916,6 +17917,7 @@ wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 +wine_fn_config_dll xaudio2_1 enable_xaudio2_1 clean wine_fn_config_dll xaudio2_2 enable_xaudio2_2 clean wine_fn_config_dll xaudio2_3 enable_xaudio2_3 clean wine_fn_config_dll xaudio2_4 enable_xaudio2_4 clean diff --git a/configure.ac b/configure.ac index 51574db..d350ea6 100644 --- a/configure.ac +++ b/configure.ac @@ -3460,6 +3460,7 @@ WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) +WINE_CONFIG_DLL(xaudio2_1,,[clean]) WINE_CONFIG_DLL(xaudio2_2,,[clean]) WINE_CONFIG_DLL(xaudio2_3,,[clean]) WINE_CONFIG_DLL(xaudio2_4,,[clean]) diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in new file mode 100644 index 0000000..282513b --- /dev/null +++ b/dlls/xaudio2_1/Makefile.in @@ -0,0 +1,7 @@ +MODULE = xaudio2_1.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_1/xaudio2_1.spec b/dlls/xaudio2_1/xaudio2_1.spec new file mode 100644 index 0000000..cb263d4 --- /dev/null +++ b/dlls/xaudio2_1/xaudio2_1.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_1/xaudio_classes.idl b/dlls/xaudio2_1/xaudio_classes.idl new file mode 100644 index 0000000..de85c0b --- /dev/null +++ b/dlls/xaudio2_1/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +[ + helpstring("XAudio2.1 Class"), + threading(both), + uuid(e21a7345-eb21-468e-be50-804db97cf708) +] +coclass XAudio21 { interface IXAudio22; } diff --git a/dlls/xaudio2_1/xaudio_dll.c b/dlls/xaudio2_1/xaudio_dll.c new file mode 100644 index 0000000..7c95c28 --- /dev/null +++ b/dlls/xaudio2_1/xaudio_dll.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/include/xaudio2.idl b/include/xaudio2.idl index bd79718..5d4726a 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -31,6 +31,13 @@ coclass XAudio2 { } [ + uuid(e21a7345-eb21-468e-be50-804db97cf708) +] +coclass XAudio21 { + interface IUnknown; +} + +[ uuid(b802058a-464a-42db-bc10-b650d6f2586a) ] coclass XAudio22 {

1 0

Andrew Eikum : xapofx: Implement CreateFX.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: ad4ba76eb044a75b2a86a7738502a266caef2292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4ba76eb044a75b2a86a7738… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:13 2015 -0500 xapofx: Implement CreateFX. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xapofx1_1/xapofx1_1.spec | 2 +- dlls/xapofx1_3/xapofx1_3.spec | 2 +- dlls/xapofx1_4/xapofx1_4.spec | 2 +- dlls/xapofx1_5/Makefile.in | 1 + dlls/xapofx1_5/main.c | 11 +++++++++++ dlls/xapofx1_5/xapofx1_5.spec | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/xapofx1_1/xapofx1_1.spec b/dlls/xapofx1_1/xapofx1_1.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_1/xapofx1_1.spec +++ b/dlls/xapofx1_1/xapofx1_1.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_3/xapofx1_3.spec b/dlls/xapofx1_3/xapofx1_3.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_3/xapofx1_3.spec +++ b/dlls/xapofx1_3/xapofx1_3.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_4/xapofx1_4.spec b/dlls/xapofx1_4/xapofx1_4.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_4/xapofx1_4.spec +++ b/dlls/xapofx1_4/xapofx1_4.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in index e0c6e9a..d243802 100644 --- a/dlls/xapofx1_5/Makefile.in +++ b/dlls/xapofx1_5/Makefile.in @@ -1,4 +1,5 @@ MODULE = xapofx1_5.dll +IMPORTS = ole32 C_SRCS = \ main.c diff --git a/dlls/xapofx1_5/main.c b/dlls/xapofx1_5/main.c index 1b223ad..4865d31 100644 --- a/dlls/xapofx1_5/main.c +++ b/dlls/xapofx1_5/main.c @@ -19,8 +19,13 @@ #include <stdarg.h> +#include "initguid.h" #include "windef.h" #include "winbase.h" +#include "compobj.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -35,3 +40,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) +{ + TRACE("%s %p\n", debugstr_guid(clsid), out); + return CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); +} diff --git a/dlls/xapofx1_5/xapofx1_5.spec b/dlls/xapofx1_5/xapofx1_5.spec index 33269e3..9b768cb 100644 --- a/dlls/xapofx1_5/xapofx1_5.spec +++ b/dlls/xapofx1_5/xapofx1_5.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr)

1 0

Alexandre Julliard : patches: Add a new 'signoff' patch status.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: tools Branch: master Commit: 51d2ba45ef1e17b10a201d9d59484601bb049084 URL: http://source.winehq.org/git/tools.git/?a=commit;h=51d2ba45ef1e17b10a201d9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 22:02:03 2015 +0900 patches: Add a new 'signoff' patch status. --- patches/expire | 1 + patches/patches.css | 1 + patches/update | 2 ++ 3 files changed, 4 insertions(+) diff --git a/patches/expire b/patches/expire index f143ab1..e092a71 100755 --- a/patches/expire +++ b/patches/expire @@ -37,6 +37,7 @@ my %status_expiry = "split" => 7, "depend" => 7, "sequence" => 7, + "signoff" => 1, "superseded" => 1, "testcase" => 7, "testfail" => 7, diff --git a/patches/patches.css b/patches/patches.css index 745ec75..b47d244 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -154,6 +154,7 @@ tr.odd { background-color: #f8e8e8; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } +.signoff, .signoff :link, .signoff :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; } diff --git a/patches/update b/patches/update index 4ccc910..576b405 100755 --- a/patches/update +++ b/patches/update @@ -42,6 +42,7 @@ my %status_descr = "sequence" => "Bad sequence", "testcase" => "Needs tests", "testfail" => "Test failure", + "signoff" => "Sign-off", ); my @legend = @@ -57,6 +58,7 @@ my @legend = "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], + [ "signoff", "<ul><li>This is a Signed-off-by reply to another patch.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" .

1 0

Alexandre Julliard : patches: Display Signed-off-by information.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: tools Branch: master Commit: 7cc88583d998bb78c4833e5b45260d98a5e12810 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7cc88583d998bb78c4833e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 22:58:11 2015 +0900 patches: Display Signed-off-by information. --- patches/expire | 3 +++ patches/patches.css | 1 + patches/update | 27 +++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/patches/expire b/patches/expire index e092a71..a3b99c1 100755 --- a/patches/expire +++ b/patches/expire @@ -120,6 +120,7 @@ foreach my $file (sort readdir DIR) rename "$dir/$file", "$dir/OLD/$file"; rename "$dir/$file.status", "$dir/OLD/$file.status"; rename "$dir/$file.order", "$dir/OLD/$file.order"; + rename "$dir/$file.signoff", "$dir/OLD/$file.signoff"; rename "$dir/$file.testbot", "$dir/OLD/$file.testbot"; rename "$dir/$file.testfail", "$dir/OLD/$file.testfail"; } @@ -132,6 +133,7 @@ foreach my $file (sort readdir DIR) unlink "$dir/$file"; unlink "$dir/$file.status"; unlink "$dir/$file.order"; + unlink "$dir/$file.signoff"; unlink "$dir/$file.testbot"; unlink "$dir/$file.testfail"; } @@ -162,6 +164,7 @@ foreach my $file (sort readdir DIR) unlink "$dir/OLD/$file"; unlink "$dir/OLD/$file.status"; unlink "$dir/OLD/$file.order"; + unlink "$dir/OLD/$file.signoff"; unlink "$dir/OLD/$file.testbot"; unlink "$dir/OLD/$file.testfail"; } diff --git a/patches/patches.css b/patches/patches.css index b47d244..5706681 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -140,6 +140,7 @@ tr.odd { background-color: #f8e8e8; } .id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } +.checkmark { text-align: center; color:green; } .sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } .id :link, .sha1 :link, .subject :link { color: #A50D0D; text-decoration: none; } diff --git a/patches/update b/patches/update index 576b405..aa8d8c9 100755 --- a/patches/update +++ b/patches/update @@ -92,9 +92,9 @@ my %patches; sub format_author($) { - my $_ = shift; - if (/\s*((\"(.*)\")|(.*))\s*<(\S+\@\S+)>/) { return $3 || $4 || $5; } - return $_; + my $str = shift; + if ($str =~ /\s*((\"(.*)\")|(.*))\s*<(\S+\@\S+)>/) { return $3 || $4 || $5; } + return $str; } open INDEX, "> $dest/index.html.new" or die "cannot create $dest/index.html.new"; @@ -117,6 +117,7 @@ print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", + "<th class=\"status\">Sign</th>", "<th class=\"status\">Testbot</th>", "<th class=\"status\">Job ID</th></tr>\n"; @@ -130,7 +131,8 @@ foreach my $file (readdir DIR) { if (/^Subject: (.*)$/) { $patch{"subject"} = $1; } elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } - last if (defined $patch{"subject"} && defined $patch{"author"}); + elsif (/^Signed-off-by: (.*)$/) { push @{$patch{"signoff"}}, format_author($1); } + last if (/^---$/); } close PATCH; @@ -148,6 +150,15 @@ foreach my $file (readdir DIR) $patch{"order"} = <ORDER>; close ORDER; } + if (open SIGNOFF, "<$dir/$file.signoff") + { + while (<SIGNOFF>) + { + chomp; + push @{$patch{"signoff"}}, format_author($_); + } + close SIGNOFF; + } $patch{"testbot"} = ""; $patch{"testjob"} = ""; $patch{"testurl"} = ""; @@ -182,6 +193,14 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k escapeHTML($patch->{"author"}); printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", escapeHTML($patch->{"subject"}); + if (defined($patch->{"signoff"})) + { + printf INDEX "<td class=\"checkmark\"><a title=\"%s\">✓</a></td>", join("\n",@{$patch->{"signoff"}}); + } + else + { + printf INDEX "<td></td>"; + } if ($patch->{"testbot"} eq "Failed") { print INDEX "<td class=\"testbot botfail\"><a href=\"data/$file.testfail\">Failed</a></td>";

1 0

Alexandre Julliard : wine_release: Also register new version for the wine-staging product.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: tools Branch: master Commit: ab9c5ab1e03a4148050d91075e75a18e81f6b642 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ab9c5ab1e03a4148050d9107… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 3 22:14:50 2015 +0900 wine_release: Also register new version for the wine-staging product. --- wine_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine_release b/wine_release index f6991cb..38d9e74 100755 --- a/wine_release +++ b/wine_release @@ -83,6 +83,6 @@ then fi # add version to bugzilla table -echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql +echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1),(\"$version\",7)" | mysql # end

1 0

Alexandre Julliard : patches: Preserve In-Reply-To and References headers.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: tools Branch: master Commit: 3bbee01ef47bb2934c0ce81ca72e704a2693424a URL: http://source.winehq.org/git/tools.git/?a=commit;h=3bbee01ef47bb2934c0ce81c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 18:18:05 2015 +0900 patches: Preserve In-Reply-To and References headers. --- patches/filter | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches/filter b/patches/filter index 53ea86e..62e2a0d 100755 --- a/patches/filter +++ b/patches/filter @@ -165,5 +165,7 @@ printf "From: %s\n", encode_utf8($message->Email::Simple::header("from") || "(un printf "Subject: %s\n", encode_utf8($message->Email::Simple::header("subject") || "(none)"); printf "Message-Id: %s\n", $message->header("message-id"); printf "Date: %s\n", $message->header("date"); +printf "In-Reply-To: %s\n", $message->header("in-reply-to") if $message->header("in-reply-to"); +printf "References: %s\n", $message->header("references") if $message->header("references"); print "\n"; print join("\n",decode_parts($message->parts)), "\n";

1 0

Andrew Eikum : xaudio2_6: Forward to xaudio2_7.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 7d7b1176dae9aff25db1882ca29bfc298ab2a2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7b1176dae9aff25db1882ca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 08:49:54 2015 -0500 xaudio2_6: Forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_6/Makefile.in | 7 ++++++ dlls/xaudio2_6/xaudio2_6.spec | 4 +++ dlls/xaudio2_6/xaudio_classes.idl | 28 +++++++++++++++++++++ dlls/xaudio2_6/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 2 ++ include/xaudio2.idl | 7 ++++++ 8 files changed, 103 insertions(+) diff --git a/configure b/configure index 8af7bc8..cf5dc78 100755 --- a/configure +++ b/configure @@ -1377,6 +1377,7 @@ enable_xapofx1_5 enable_xaudio2_3 enable_xaudio2_4 enable_xaudio2_5 +enable_xaudio2_6 enable_xaudio2_7 enable_xaudio2_8 enable_xinput1_1 @@ -17917,6 +17918,7 @@ wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_3 enable_xaudio2_3 clean wine_fn_config_dll xaudio2_4 enable_xaudio2_4 clean wine_fn_config_dll xaudio2_5 enable_xaudio2_5 clean +wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test wine_fn_config_dll xaudio2_8 enable_xaudio2_8 diff --git a/configure.ac b/configure.ac index e420df7..bd98b6c 100644 --- a/configure.ac +++ b/configure.ac @@ -3463,6 +3463,7 @@ WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_3,,[clean]) WINE_CONFIG_DLL(xaudio2_4,,[clean]) WINE_CONFIG_DLL(xaudio2_5,,[clean]) +WINE_CONFIG_DLL(xaudio2_6,,[clean]) WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_TEST(dlls/xaudio2_7/tests) WINE_CONFIG_DLL(xaudio2_8) diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in new file mode 100644 index 0000000..c56b079 --- /dev/null +++ b/dlls/xaudio2_6/Makefile.in @@ -0,0 +1,7 @@ +MODULE = xaudio2_6.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_6/xaudio2_6.spec b/dlls/xaudio2_6/xaudio2_6.spec new file mode 100644 index 0000000..cb263d4 --- /dev/null +++ b/dlls/xaudio2_6/xaudio2_6.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_6/xaudio_classes.idl b/dlls/xaudio2_6/xaudio_classes.idl new file mode 100644 index 0000000..e54eed7 --- /dev/null +++ b/dlls/xaudio2_6/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +[ + helpstring("XAudio2.6 Class"), + threading(both), + uuid(3eda9b49-2085-498b-9bb2-39a6778493de) +] +coclass XAudio26 { interface IXAudio27; } diff --git a/dlls/xaudio2_6/xaudio_dll.c b/dlls/xaudio2_6/xaudio_dll.c new file mode 100644 index 0000000..7c95c28 --- /dev/null +++ b/dlls/xaudio2_6/xaudio_dll.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 23e0390..5453d25 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2466,6 +2466,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xaudio2_factory(24); }else if(IsEqualGUID(rclsid, &CLSID_XAudio25)){ factory = make_xaudio2_factory(25); + }else if(IsEqualGUID(rclsid, &CLSID_XAudio26)){ + factory = make_xaudio2_factory(26); }else if(IsEqualGUID(rclsid, &CLSID_XAudio2)){ factory = make_xaudio2_factory(27); }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter)) { diff --git a/include/xaudio2.idl b/include/xaudio2.idl index dfef62c..5de6622 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -52,6 +52,13 @@ coclass XAudio25 { } [ + uuid(3eda9b49-2085-498b-9bb2-39a6778493de) +] +coclass XAudio26 { + interface IUnknown; +} + +[ uuid(db05ea35-0329-4d4b-a53a-6dead03d3852) ] coclass XAudio2Debug {

1 0

Aric Stewart : gdi32/tests: Mark Hebrew stock font test as different, like Arabic.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: fc94e5dd5f9faaa36d084a8e4eeebf719cde2bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc94e5dd5f9faaa36d084a8e4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 2 09:00:11 2015 -0500 gdi32/tests: Mark Hebrew stock font test as different, like Arabic. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c7dd6e1..fd9bda3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5971,6 +5971,7 @@ static void test_stock_fonts(void) { { /* ANSI_FIXED_FONT */ { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, + { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_HEBREW}, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "Courier" }, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "Courier" }, { 0 }

1 0

Andrew Eikum : openal32: Prefer native version.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 7d6c6025923c039ac6a2458ca466290621238c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6c6025923c039ac6a2458ca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 09:02:56 2015 -0500 openal32: Prefer native version. Because openal contexts are global per-process, applications that use openal will conflict with Wine DLLs that use openal like xaudio2_7 now does. Windows does not ship an openal32, so all applications that use openal will ship their own copy of it. According to Chris Robinson, Windows native openal32 works fine in Wine, so we should just use that to avoid the problem. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/openal32/openal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 5a4e1e7..cd49b92 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -99,6 +99,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch(reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); #define LOADFUNC(x) x = alcGetProcAddress(NULL, #x)

1 0