[PATCH v2 0/1] MR8126: include: Do not register classes from xapofx or x3daudio dlls.
Alternatively we can avoid "makedep register" for these DLLs by using a separate IDL in dlls/xaudio2_7/. -- v2: xaudio2: Do not register classes from xapofx or x3daudio dlls. https://gitlab.winehq.org/wine/wine/-/merge_requests/8126
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/xaudio2_0/Makefile.in | 3 ++- dlls/xaudio2_1/Makefile.in | 3 ++- dlls/xaudio2_2/Makefile.in | 3 ++- dlls/xaudio2_3/Makefile.in | 3 ++- dlls/xaudio2_4/Makefile.in | 3 ++- dlls/xaudio2_5/Makefile.in | 3 ++- dlls/xaudio2_6/Makefile.in | 3 ++- dlls/xaudio2_7/Makefile.in | 3 ++- dlls/xaudio2_7/xaudio_classes.idl | 1 - dlls/xaudio2_7/xaudio_register.idl | 24 ++++++++++++++++++++++++ 10 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 dlls/xaudio2_7/xaudio_register.idl diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index 64a0efd3925..18721ae94be 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ xapo.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in index ebfe545f31e..97fbed467f4 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ xapo.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in index 3bc76019aff..11dfabc8439 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ xapo.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in index dec87cf0bcd..ea979c2041a 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ xapo.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in index 37c0a361a7a..e94796cbca0 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ xapo.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in index 75ec4a32d4e..acc5b35e6fd 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ xapo.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in index ba84d189fc4..9e6e8448138 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -8,4 +8,5 @@ SOURCES = \ xapo.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index 0d88bfe6dd3..e1e21766328 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -9,4 +9,5 @@ SOURCES = \ xapofx.c \ xaudio_allocator.c \ xaudio_classes.idl \ - xaudio_dll.c + xaudio_dll.c \ + xaudio_register.idl diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index a8dc5fdb148..eb9967b6cb2 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -19,7 +19,6 @@ */ #pragma makedep header -#pragma makedep register #include "xaudio2.idl" #include "xaudio2fx.idl" diff --git a/dlls/xaudio2_7/xaudio_register.idl b/dlls/xaudio2_7/xaudio_register.idl new file mode 100644 index 00000000000..6bd643d9453 --- /dev/null +++ b/dlls/xaudio2_7/xaudio_register.idl @@ -0,0 +1,24 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Guillaume Charifi + * + * 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 + +#include "xaudio2.idl" +#include "xaudio2fx.idl" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8126
Alternatively we can avoid "makedep register" for these DLLs by using a separate IDL in dlls/xaudio2_7/.
That seems better than creating a bunch of empty registration scripts.
Done now, sorry about the delay -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8126#note_109415
participants (2)
-
Elizabeth Figura -
Elizabeth Figura (＠zfigura)