Rebase against 3e61c7127ed7eb764a8b308fd8897cbc26a93a4a

2025-01-28 22:04:43 -08:00 · 2019-03-19 08:43:30 +11:00 · 2019-03-19 08:43:30 +11:00 · 8e6af31b99
commit 8e6af31b99
parent 18e878bc40
11 changed files with 300 additions and 218 deletions
--- a/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch
+++ b/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch
@ -1,4 +1,4 @@
-From 58c4900ecbdb4dbf745c9af78c040d2cfdcff288 Mon Sep 17 00:00:00 2001
+From 51bdea50efa6951b86a91236c57fb8a95737d79d Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Tue, 19 Aug 2014 22:10:49 -0600
 Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
@ -7,14 +7,14 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
 ---
 configure.ac          | 12 ++++++++++++
 dlls/ntdll/file.c     | 22 +++++++++++++++++++++-
- include/wine/port.h   | 20 ++++++++++++++++++++
+ include/wine/port.h   |  8 ++++++++
 libs/port/Makefile.in |  3 ++-
 libs/port/xattr.c     | 39 +++++++++++++++++++++++++++++++++++++++
- 5 files changed, 94 insertions(+), 2 deletions(-)
+ 5 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 libs/port/xattr.c

 diff --git a/configure.ac b/configure.ac
-index 5c4e6fd..9e0dcf0 100644
+index 4967604..375d1d3 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -84,6 +84,7 @@ AC_ARG_WITH(udev,      AS_HELP_STRING([--without-udev],[do not use udev (plug an
@ -25,7 +25,7 @@ index 5c4e6fd..9e0dcf0 100644
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
 AC_ARG_WITH(xcursor,   AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
-@@ -703,6 +704,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+@@ -695,6 +696,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
 #include <sys/socket.h>
 #endif])
 
@ -44,7 +44,7 @@ index 5c4e6fd..9e0dcf0 100644
 
 AC_SUBST(DLLFLAGS,"-D_REENTRANT")
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index d0aaadf..27d2ce0 100644
+index e8775a3..ed25182 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
@@ -122,6 +122,22 @@ mode_t FILE_umask = 0;
@ -89,25 +89,13 @@ index d0aaadf..27d2ce0 100644
 }
 
 diff --git a/include/wine/port.h b/include/wine/port.h
-index 2f6e9eb..902d674 100644
+index d23e2b0..2be2afe 100644
 --- a/include/wine/port.h
 +++ b/include/wine/port.h
-@@ -335,6 +335,26 @@ int usleep (unsigned int useconds);
+@@ -335,6 +335,14 @@ int usleep (unsigned int useconds);
 
 extern int mkstemps(char *template, int suffix_len);
 
-+/* Process creation flags */
-+#ifndef _P_WAIT
-+# define _P_WAIT    0
-+# define _P_NOWAIT  1
-+# define _P_OVERLAY 2
-+# define _P_NOWAITO 3
-+# define _P_DETACH  4
-+#endif
-+#ifndef HAVE__SPAWNVP
-+extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
-+#endif
-+
 +/* Extended attribute functions */
 +
 +#ifndef XATTR_USER_PREFIX
--- a/patches/opencl-version_1_2/0001-opencl-Add-OpenCL-1.0-function-pointer-loader.patch
+++ b/patches/opencl-version_1_2/0001-opencl-Add-OpenCL-1.0-function-pointer-loader.patch
@ -1,21 +1,21 @@
-From 3d9a49e946e17ac814c3680fdf9e7983eb76183b Mon Sep 17 00:00:00 2001
+From e68537a9ede159797a7b2e2f92007a37323a1ffd Mon Sep 17 00:00:00 2001
 From: Nakarin Khankham <garuda2550@gmail.com>
 Date: Sat, 9 Mar 2019 21:37:24 +0700
-Subject: [PATCH 1/5] opencl: Add OpenCL 1.0 function pointer loader.
+Subject: [PATCH] opencl: Add OpenCL 1.0 function pointer loader.

 Signed-off-by: Nakarin Khankham <garuda2550@gmail.com>
 ---
 configure            |  56 +++++++++
 configure.ac         |   1 +
- dlls/opencl/opencl.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ dlls/opencl/opencl.c | 328 +++++++++++++++++++++++++++++++++++++++++++++++++++
 include/config.h.in  |   3 +
- 4 files changed, 381 insertions(+)
+ 4 files changed, 388 insertions(+)

 diff --git a/configure b/configure
-index 5a091db..1444fd4 100755
+index 3c976c9..be244ee 100755
 --- a/configure
 +++ b/configure
-@@ -11800,6 +11800,62 @@ if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" = xyes; then :
+@@ -11801,6 +11801,62 @@ if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" = xyes; then :
 
 fi
 
@ -79,10 +79,10 @@ index 5a091db..1444fd4 100755
 if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes; then :
   case "x$with_opencl" in
 diff --git a/configure.ac b/configure.ac
-index 87d8bf5..0f0a459 100644
+index 45c22dd..f6e6da2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1252,6 +1252,7 @@ dnl **** Check for OpenCL ****
+@@ -1264,6 +1264,7 @@ dnl **** Check for OpenCL ****
 if test "$ac_cv_header_CL_cl_h" = "yes"
 then
     AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(OPENCL_LIBS,["-lOpenCL"])])
@ -91,13 +91,21 @@ index 87d8bf5..0f0a459 100644
 WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes],
                  [OpenCL ${notice_platform}development files not found, OpenCL won't be supported.],
 diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c
-index 2d145bf..7d292c0 100644
+index 2d145bf..81feabb 100644
 --- a/dlls/opencl/opencl.c
 +++ b/dlls/opencl/opencl.c
-@@ -43,6 +43,327 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl);
+@@ -42,6 +42,334 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl);
+ /* TODO: Figure out how to provide GL context sharing before enabling OpenGL */
 #define OPENCL_WITH_GL 0
 
- 
+#ifndef SONAME_LIBOPENCL
+#if defined(HAVE_OPENCL_OPENCL_H)
+#define SONAME_LIBOPENCL "libOpenCL.dylib"
+#else
+#define SONAME_LIBOPENCL "libOpenCL.so"
+#endif
+#endif
+
 +/* Platform API */
 +static cl_int (*pclGetPlatformIDs)(cl_uint num_entries, cl_platform_id *platforms, cl_uint *num_platforms);
 +static cl_int (*pclGetPlatformInfo)(cl_platform_id platform, cl_platform_info param_name,
@ -418,10 +426,9 @@ index 2d145bf..7d292c0 100644
 +    return TRUE;
 +}
 +
-+
+ 
 /*---------------------------------------------------------------*/
 /* Platform API */
- 
 diff --git a/include/config.h.in b/include/config.h.in
 index b3df2f3..1330d30 100644
 --- a/include/config.h.in
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "05994cd6179626438ef26c13ee45323a6a1f66eb"
+	echo "3e61c7127ed7eb764a8b308fd8897cbc26a93a4a"
 }

 # Show version information
@ -358,7 +358,6 @@ patch_enable_all ()
 	enable_wineps_drv_PostScript_Fixes="$1"
 	enable_winepulse_PulseAudio_Support="$1"
 	enable_winex11_CandidateWindowPos="$1"
-	enable_winex11_ClipCursor="$1"
 	enable_winex11_DefaultDisplayFrequency="$1"
 	enable_winex11_MWM_Decorations="$1"
 	enable_winex11_UpdateLayeredWindow="$1"
@ -1225,9 +1224,6 @@ patch_enable ()
 		winex11-CandidateWindowPos)
 			enable_winex11_CandidateWindowPos="$2"
 			;;
-		winex11-ClipCursor)
-			enable_winex11_ClipCursor="$2"
-			;;
 		winex11-DefaultDisplayFrequency)
 			enable_winex11_DefaultDisplayFrequency="$2"
 			;;
@ -5264,7 +5260,7 @@ fi
 # |   *	[#46470] opencl: Add support for OpenCL 1.2.
 # |
 # | Modified files:
-# |   *	configure.ac, dlls/opencl/opencl.c, dlls/opencl/opencl.spec, include/config.h.in
+# |   *	configure, configure.ac, dlls/opencl/opencl.c, dlls/opencl/opencl.spec, include/config.h.in
 # |
 if test "$enable_opencl_version_1_2" -eq 1; then
 	patch_apply opencl-version_1_2/0001-opencl-Add-OpenCL-1.0-function-pointer-loader.patch
@ -7119,21 +7115,6 @@ if test "$enable_winex11_CandidateWindowPos" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset winex11-ClipCursor
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#38087] Fix multithreading issues with fullscreen clipping
-# |
-# | Modified files:
-# |   *	dlls/winex11.drv/mouse.c
-# |
-if test "$enable_winex11_ClipCursor" -eq 1; then
-	patch_apply winex11-ClipCursor/0001-winex11-Forward-all-clipping-requests-to-the-right-t.patch
-	(
-		printf '%s\n' '+    { "Sebastian Lackner", "winex11: Forward all clipping requests to the right thread (including fullscreen clipping).", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset winex11-DefaultDisplayFrequency
 # |
 # | Modified files:
@ -7652,11 +7633,15 @@ fi
 # | 	dlls/xaudio2_8/Makefile.in, dlls/xaudio2_9/Makefile.in, include/config.h.in, include/xapo.idl, include/xaudio2.idl
 # |
 if test "$enable_xaudio2_revert" -eq 1; then
-	patch_apply xaudio2-revert/0001-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch
-	patch_apply xaudio2-revert/0002-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch
-	patch_apply xaudio2-revert/0003-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch
-	patch_apply xaudio2-revert/0004-Revert-xaudio2-Rewrite-to-use-FAudio.patch
+	patch_apply xaudio2-revert/0001-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch
+	patch_apply xaudio2-revert/0002-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch
+	patch_apply xaudio2-revert/0003-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch
+	patch_apply xaudio2-revert/0004-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch
+	patch_apply xaudio2-revert/0005-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch
+	patch_apply xaudio2-revert/0006-Revert-xaudio2-Rewrite-to-use-FAudio.patch
 	(
+		printf '%s\n' '+    { "Alistair Leslie-Hughes", "Revert \"xaudio2_7/tests: Remove redundant not-NULL checks (coccinellery).\".", 1 },';
+		printf '%s\n' '+    { "Alistair Leslie-Hughes", "Revert \"xaudio2_7: Add a trailing '\''\\n'\'' to an ERR() message.\".", 1 },';
 		printf '%s\n' '+    { "Alistair Leslie-Hughes", "Revert \"xaudio2: IXAPO::Process out parameter should not be const.\".", 1 },';
 		printf '%s\n' '+    { "Alistair Leslie-Hughes", "Revert \"xaudio2: IXAudio23 needs its own interface, for XAUDIO23_VOICE_SENDS parameters.\".", 1 },';
 		printf '%s\n' '+    { "Alistair Leslie-Hughes", "Revert \"xaudio2: Fix uninitialized variable access (Valgrind).\".", 1 },';
--- a/patches/winex11-ClipCursor/0001-winex11-Forward-all-clipping-requests-to-the-right-t.patch
+++ b/patches/winex11-ClipCursor/0001-winex11-Forward-all-clipping-requests-to-the-right-t.patch
@ -1,75 +0,0 @@
-From ee44b1946cb7001cb47d43a60b3e37d9185705de Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 10 Mar 2015 04:29:04 +0100
-Subject: winex11: Forward all clipping requests to the right thread (including
- fullscreen clipping).
-
---
- dlls/winex11.drv/mouse.c | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
-index 5f5bdeb..bc20965 100644
--- a/dlls/winex11.drv/mouse.c
-+++ b/dlls/winex11.drv/mouse.c
-@@ -446,6 +446,8 @@ void reset_clipping_window(void)
-     ClipCursor( NULL );  /* make sure the clip rectangle is reset too */
- }
- 
-+BOOL CDECL X11DRV_ClipCursor( LPCRECT clip );
-+
- /***********************************************************************
-  *             clip_cursor_notify
-  *
-@@ -474,12 +476,10 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd )
-     }
-     else if (hwnd == GetForegroundWindow())  /* request to clip */
-     {
-        RECT clip, virtual_rect = get_virtual_screen_rect();
-+        RECT clip;
- 
-         GetClipCursor( &clip );
-        if (clip.left > virtual_rect.left || clip.right < virtual_rect.right ||
-            clip.top > virtual_rect.top   || clip.bottom < virtual_rect.bottom)
-            return grab_clipping_window( &clip );
-+        X11DRV_ClipCursor( &clip );
-     }
-     return 0;
- }
-@@ -1391,22 +1391,22 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip )
-     if (grab_pointer)
-     {
-         HWND foreground = GetForegroundWindow();
-+        DWORD tid, pid;
-+
-+        /* forward request to the foreground window if it's in a different thread */
-+        tid = GetWindowThreadProcessId( foreground, &pid );
-+        if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId())
-+        {
-+            TRACE( "forwarding clip request to %p\n", foreground );
-+            SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 );
-+            return TRUE;
-+        }
- 
-         /* we are clipping if the clip rectangle is smaller than the screen */
-         if (clip->left > virtual_rect.left || clip->right < virtual_rect.right ||
-             clip->top > virtual_rect.top || clip->bottom < virtual_rect.bottom)
-         {
-            DWORD tid, pid;
-
-            /* forward request to the foreground window if it's in a different thread */
-            tid = GetWindowThreadProcessId( foreground, &pid );
-            if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId())
-            {
-                TRACE( "forwarding clip request to %p\n", foreground );
-                SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 );
-                return TRUE;
-            }
-            else if (grab_clipping_window( clip )) return TRUE;
-+            if (grab_clipping_window( clip )) return TRUE;
-         }
-         else /* if currently clipping, check if we should switch to fullscreen clipping */
-         {
-- 
-2.3.1
-
--- a/patches/winex11-ClipCursor/definition
+++ b/patches/winex11-ClipCursor/definition
@ -1 +0,0 @@
-Fixes: [38087] Fix multithreading issues with fullscreen clipping
--- a/patches/xaudio2-revert/0001-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch
+++ b/patches/xaudio2-revert/0001-Revert-xaudio2_7-tests-Remove-redundant-not-NULL-che.patch
@ -0,0 +1,151 @@
+From b2c367b179c7e0eb1f2890428f7b02eeb323443f Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 19 Mar 2019 08:41:08 +1100
+Subject: [PATCH 1/6] Revert "xaudio2_7/tests: Remove redundant not-NULL checks
+ (coccinellery)."
+
+This reverts commit 61d825ca3ed57ddec4a07f2e62f87432386a8daf.
+---
+ dlls/xaudio2_7/tests/xaudio2.c | 104 +++++++++++++++++++++--------------------
+ 1 file changed, 54 insertions(+), 50 deletions(-)
+
+diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c
+index f2bffdf..4ead8d8 100644
+--- a/dlls/xaudio2_7/tests/xaudio2.c
+++ b/dlls/xaudio2_7/tests/xaudio2.c
+@@ -1000,9 +1000,28 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version)
+         return;
+     }
+ 
+-    for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){
+-        hr = pCreateFX(const_clsids[i], &fx_unk);
+-        ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr);
+    if(pCreateFX){
+        for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){
+            hr = pCreateFX(const_clsids[i], &fx_unk);
+            ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr);
+            if(SUCCEEDED(hr)){
+                IXAPO *xapo;
+                hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);
+                ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);
+                if(SUCCEEDED(hr))
+                    IXAPO_Release(xapo);
+                IUnknown_Release(fx_unk);
+            }
+
+            hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,
+                    &IID_IUnknown, (void**)&fx_unk);
+            ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);
+            if(SUCCEEDED(hr))
+                IUnknown_Release(fx_unk);
+        }
+
+        hr = pCreateFX(avm_clsids[version - 20], &fx_unk);
+        ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr);
+         if(SUCCEEDED(hr)){
+             IXAPO *xapo;
+             hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);
+@@ -1012,33 +1031,16 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version)
+             IUnknown_Release(fx_unk);
+         }
+ 
+-        hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,
+-                &IID_IUnknown, (void**)&fx_unk);
+-        ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);
+-        if(SUCCEEDED(hr))
+        hr = pCreateFX(ar_clsids[version - 20], &fx_unk);
+        ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr);
+        if(SUCCEEDED(hr)){
+            IXAPO *xapo;
+            hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);
+            ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);
+            if(SUCCEEDED(hr))
+                IXAPO_Release(xapo);
+             IUnknown_Release(fx_unk);
+-    }
+-
+-    hr = pCreateFX(avm_clsids[version - 20], &fx_unk);
+-    ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr);
+-    if(SUCCEEDED(hr)){
+-        IXAPO *xapo;
+-        hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);
+-        ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);
+-        if(SUCCEEDED(hr))
+-            IXAPO_Release(xapo);
+-        IUnknown_Release(fx_unk);
+-    }
+-
+-    hr = pCreateFX(ar_clsids[version - 20], &fx_unk);
+-    ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr);
+-    if(SUCCEEDED(hr)){
+-        IXAPO *xapo;
+-        hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);
+-        ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);
+-        if(SUCCEEDED(hr))
+-            IXAPO_Release(xapo);
+-        IUnknown_Release(fx_unk);
+        }
+     }
+ 
+     FreeLibrary(xapofxdll);
+@@ -1081,9 +1083,29 @@ static void test_xapo_creation_modern(const char *module)
+         return;
+     }
+ 
+-    for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){
+-        hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0);
+-        ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr);
+    if(pCreateFX){
+        for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){
+            hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0);
+            ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr);
+            if(SUCCEEDED(hr)){
+                IXAPO *xapo;
+                hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo);
+                ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr);
+                if(SUCCEEDED(hr))
+                    IXAPO_Release(xapo);
+                IUnknown_Release(fx_unk);
+            }
+
+            hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,
+                    &IID_IUnknown, (void**)&fx_unk);
+            ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);
+            if(SUCCEEDED(hr))
+                IUnknown_Release(fx_unk);
+        }
+
+        /* test legacy CLSID */
+        hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0);
+        ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr);
+         if(SUCCEEDED(hr)){
+             IXAPO *xapo;
+             hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo);
+@@ -1092,24 +1114,6 @@ static void test_xapo_creation_modern(const char *module)
+                 IXAPO_Release(xapo);
+             IUnknown_Release(fx_unk);
+         }
+-
+-        hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,
+-                &IID_IUnknown, (void**)&fx_unk);
+-        ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);
+-        if(SUCCEEDED(hr))
+-            IUnknown_Release(fx_unk);
+-    }
+-
+-    /* test legacy CLSID */
+-    hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0);
+-    ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr);
+-    if(SUCCEEDED(hr)){
+-        IXAPO *xapo;
+-        hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo);
+-        ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr);
+-        if(SUCCEEDED(hr))
+-            IXAPO_Release(xapo);
+-        IUnknown_Release(fx_unk);
+     }
+ 
+     pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter");
+-- 
+1.9.1
+
--- a/patches/xaudio2-revert/0002-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch
+++ b/patches/xaudio2-revert/0002-Revert-xaudio2_7-Add-a-trailing-n-to-an-ERR-message.patch
@ -0,0 +1,27 @@
+From 8ec79581dd76617305c663a7b51add3e42b8ddda Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 19 Mar 2019 08:41:09 +1100
+Subject: [PATCH 2/6] Revert "xaudio2_7: Add a trailing '\n' to an ERR()
+ message."
+
+This reverts commit e664c29351b63888a4e6f7192dad999bf85270fe.
+---
+ dlls/xaudio2_7/xapo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c
+index 9788cb3..3ccb3f1 100644
+--- a/dlls/xaudio2_7/xapo.c
+++ b/dlls/xaudio2_7/xapo.c
+@@ -337,7 +337,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo)
+             XAudio_Internal_Realloc
+         );
+ #endif
+-    ERR("Invalid XAPO CLSID!\n");
+    ERR("Invalid XAPO CLSID!");
+     return E_INVALIDARG;
+ }
+ 
+-- 
+1.9.1
+
--- a/patches/xaudio2-revert/0003-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch
+++ b/patches/xaudio2-revert/0003-Revert-xaudio2-IXAPO-Process-out-parameter-should-no.patch
@ -1,7 +1,7 @@
-From 00bd249b0e151241cc7d62310d4c99e5da1ec626 Mon Sep 17 00:00:00 2001
+From 5071ed20eaaa25c912fb5a2b416b9761907937fd Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sun, 3 Mar 2019 16:41:31 +1100
-Subject: [PATCH 1/4] Revert "xaudio2: IXAPO::Process out parameter should not
+Date: Tue, 19 Mar 2019 08:41:09 +1100
+Subject: [PATCH 3/6] Revert "xaudio2: IXAPO::Process out parameter should not
 be const."

 This reverts commit 53cd694e6a6b577635a3f524c7fc2bd0c1feaff3.
@ -11,7 +11,7 @@ This reverts commit 53cd694e6a6b577635a3f524c7fc2bd0c1feaff3.
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c
-index 3ccb3f190b0..ccad417ea5c 100644
+index 3ccb3f1..ccad417 100644
 --- a/dlls/xaudio2_7/xapo.c
 +++ b/dlls/xaudio2_7/xapo.c
@@ -175,7 +175,7 @@ static void WINAPI XAPOFX_UnlockForProcess(IXAPO *iface)
@ -24,7 +24,7 @@ index 3ccb3f190b0..ccad417ea5c 100644
     XA2XAPOFXImpl *This = impl_from_IXAPO(iface);
     TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params,
 diff --git a/include/xapo.idl b/include/xapo.idl
-index 7b28ac9f439..9c3ad15134c 100644
+index 7b28ac9..9c3ad15 100644
 --- a/include/xapo.idl
 +++ b/include/xapo.idl
@@ -118,7 +118,7 @@ interface IXAPO : IUnknown
@ -37,5 +37,5 @@ index 7b28ac9f439..9c3ad15134c 100644
 
     UINT32 CalcInputFrames(UINT32 output_frames);
 -- 
-2.20.1
+1.9.1

--- a/patches/xaudio2-revert/0004-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch
+++ b/patches/xaudio2-revert/0004-Revert-xaudio2-IXAudio23-needs-its-own-interface-for.patch
@ -1,19 +1,19 @@
-From 72861972a7bf4d167b4be3e418df7cf108016e8c Mon Sep 17 00:00:00 2001
+From e4e9861d161de0563d77b5e23457063e10bde2ea Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sun, 3 Mar 2019 16:41:36 +1100
-Subject: [PATCH 2/4] Revert "xaudio2: IXAudio23 needs its own interface, for
+Date: Tue, 19 Mar 2019 08:41:10 +1100
+Subject: [PATCH 4/6] Revert "xaudio2: IXAudio23 needs its own interface, for
 XAUDIO23_VOICE_SENDS parameters."

 This reverts commit b49b78db49d79bdd1358f2244a87d74db6350b73.
 ---
- dlls/xaudio2_7/compat.c         | 222 +-------------------------------
+ dlls/xaudio2_7/compat.c         | 222 +---------------------------------------
 dlls/xaudio2_7/xaudio_dll.c     |   4 -
 dlls/xaudio2_7/xaudio_private.h |   4 -
- include/xaudio2.idl             |  61 ---------
+ include/xaudio2.idl             |  61 -----------
 4 files changed, 5 insertions(+), 286 deletions(-)

 diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c
-index c4538ae3677..bc33cb92ed7 100644
+index c4538ae..bc33cb9 100644
 --- a/dlls/xaudio2_7/compat.c
 +++ b/dlls/xaudio2_7/compat.c
@@ -2488,222 +2488,6 @@ const IXAudio22Vtbl XAudio22_Vtbl = {
@ -254,7 +254,7 @@ index c4538ae3677..bc33cb92ed7 100644
     EnterCriticalSection(&This->mst.lock);
 
 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
-index 18306a16035..f338b56dc91 100644
+index 18306a1..f338b56 100644
 --- a/dlls/xaudio2_7/xaudio_dll.c
 +++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -1400,8 +1400,6 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid,
@ -276,7 +276,7 @@ index 18306a16035..f338b56dc91 100644
     object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl;
 #endif
 diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h
-index 46d842bf4c1..84bab8257d0 100644
+index 46d842b..84bab82 100644
 --- a/dlls/xaudio2_7/xaudio_private.h
 +++ b/dlls/xaudio2_7/xaudio_private.h
@@ -111,8 +111,6 @@ typedef struct _IXAudio2Impl {
@ -298,15 +298,13 @@ index 46d842bf4c1..84bab8257d0 100644
 extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN;
 #endif
 diff --git a/include/xaudio2.idl b/include/xaudio2.idl
-index 074454d4906..e97cf9948ba 100644
+index 074454d..e97cf99 100644
 --- a/include/xaudio2.idl
 +++ b/include/xaudio2.idl
-@@ -1050,67 +1050,6 @@ interface IXAudio22 : IUnknown
-         [in, defaultvalue(NULL)] void* pReserved);
- }
+@@ -1052,67 +1052,6 @@ interface IXAudio22 : IUnknown
 
-[
-    object,
+ [
+     object,
 -    uuid(8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb), /* all versions before 28 share IID_IXAudio */
 -]
 -/* XAudio2 2.3's IXAudio2 interface. Actually called IXAudio2 in the Nov 2008
@ -366,9 +364,11 @@ index 074454d4906..e97cf9948ba 100644
 -        [in, defaultvalue(NULL)] void* pReserved);
 -}
 -
- [
-     object,
+-[
+-    object,
     uuid(8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb),
+ ]
+ /* XAudio2 2.7's IXAudio2 interface. Actually called IXAudio2 in the Jun 2010
 -- 
-2.20.1
+1.9.1

--- a/patches/xaudio2-revert/0005-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch
+++ b/patches/xaudio2-revert/0005-Revert-xaudio2-Fix-uninitialized-variable-access-Val.patch
@ -1,7 +1,7 @@
-From 22e7e8495a592f776fd61246b7a7f65553c2fd99 Mon Sep 17 00:00:00 2001
+From 4acda3a1fc934bebe9d6fa14a66688c23d664c24 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sun, 3 Mar 2019 16:41:42 +1100
-Subject: [PATCH 3/4] Revert "xaudio2: Fix uninitialized variable access
+Date: Tue, 19 Mar 2019 08:41:11 +1100
+Subject: [PATCH 5/6] Revert "xaudio2: Fix uninitialized variable access
 (Valgrind)."

 This reverts commit ac8be6a1a24d49e1e32806b05dcf4591de5c691e.
@ -10,7 +10,7 @@ This reverts commit ac8be6a1a24d49e1e32806b05dcf4591de5c691e.
 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c
-index bc33cb92ed7..318f6685896 100644
+index bc33cb9..318f668 100644
 --- a/dlls/xaudio2_7/compat.c
 +++ b/dlls/xaudio2_7/compat.c
@@ -923,7 +923,7 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface,
@ -50,5 +50,5 @@ index bc33cb92ed7..318f6685896 100644
 
     if(pSendList){
 -- 
-2.20.1
+1.9.1

--- a/patches/xaudio2-revert/0006-Revert-xaudio2-Rewrite-to-use-FAudio.patch
+++ b/patches/xaudio2-revert/0006-Revert-xaudio2-Rewrite-to-use-FAudio.patch
@ -1,11 +1,11 @@
-From 3cce4616277c0edcf3d5224136dc994d664a6656 Mon Sep 17 00:00:00 2001
+From 40c4cf65ef1e6e54179f0287d40237cdf5e3f4e0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sun, 3 Mar 2019 16:41:48 +1100
-Subject: [PATCH 4/4] Revert "xaudio2: Rewrite to use FAudio."
+Date: Tue, 19 Mar 2019 08:41:11 +1100
+Subject: [PATCH 6/6] Revert "xaudio2: Rewrite to use FAudio."

 This reverts commit 3e390b1aafff47df63376a8ca4293c515d74f4ba.
 ---
- configure                         |  149 +-
+ configure                         |  149 +--
 configure.ac                      |   24 +-
 dlls/x3daudio1_0/Makefile.in      |    2 -
 dlls/x3daudio1_1/Makefile.in      |    2 -
@ -28,15 +28,15 @@ This reverts commit 3e390b1aafff47df63376a8ca4293c515d74f4ba.
 dlls/xaudio2_5/Makefile.in        |    6 +-
 dlls/xaudio2_6/Makefile.in        |    6 +-
 dlls/xaudio2_7/Makefile.in        |    5 +-
- dlls/xaudio2_7/compat.c           |  774 +++++----
+ dlls/xaudio2_7/compat.c           |  774 ++++++-----
 dlls/xaudio2_7/tests/xaudio2.c    |   59 +-
 dlls/xaudio2_7/x3daudio.c         |   36 +-
- dlls/xaudio2_7/xapo.c             |  405 -----
- dlls/xaudio2_7/xapofx.c           |  792 ++++++++-
+ dlls/xaudio2_7/xapo.c             |  405 ------
+ dlls/xaudio2_7/xapofx.c           |  792 ++++++++++-
 dlls/xaudio2_7/xaudio_allocator.c |   41 -
 dlls/xaudio2_7/xaudio_classes.idl |    7 +
- dlls/xaudio2_7/xaudio_dll.c       | 2604 +++++++++++++++++------------
- dlls/xaudio2_7/xaudio_private.h   |  174 +-
+ dlls/xaudio2_7/xaudio_dll.c       | 2604 ++++++++++++++++++++++---------------
+ dlls/xaudio2_7/xaudio_private.h   |  174 +--
 dlls/xaudio2_8/Makefile.in        |    5 +-
 dlls/xaudio2_9/Makefile.in        |    5 +-
 include/config.h.in               |    6 -
@ -45,7 +45,7 @@ This reverts commit 3e390b1aafff47df63376a8ca4293c515d74f4ba.
 delete mode 100644 dlls/xaudio2_7/xaudio_allocator.c

 diff --git a/configure b/configure
-index abac2895442..1d7b6614a34 100755
+index 3c976c9..a06f914 100755
 --- a/configure
 +++ b/configure
@@ -659,8 +659,6 @@ CUPS_LIBS
@ -65,7 +65,7 @@ index abac2895442..1d7b6614a34 100755
 with_float_abi
 with_fontconfig
 with_freetype
-@@ -1849,8 +1846,6 @@ UDEV_CFLAGS
+@@ -1834,8 +1831,6 @@ UDEV_CFLAGS
 UDEV_LIBS
 SDL2_CFLAGS
 SDL2_LIBS
@ -74,7 +74,7 @@ index abac2895442..1d7b6614a34 100755
 CAPI20_CFLAGS
 CAPI20_LIBS
 CUPS_CFLAGS
-@@ -2521,7 +2516,6 @@ Optional Packages:
+@@ -2506,7 +2501,6 @@ Optional Packages:
   --without-cups          do not use CUPS
   --without-curses        do not use (n)curses
   --without-dbus          do not use DBus (dynamic device support)
@ -82,7 +82,7 @@ index abac2895442..1d7b6614a34 100755
   --with-float-abi=abi    specify the ABI (soft|softfp|hard) for ARM platforms
   --without-fontconfig    do not use fontconfig
   --without-freetype      do not use the FreeType library
-@@ -2633,9 +2627,6 @@ Some influential environment variables:
+@@ -2614,9 +2608,6 @@ Some influential environment variables:
   UDEV_LIBS   Linker flags for libudev, overriding pkg-config
   SDL2_CFLAGS C compiler flags for sdl2, overriding pkg-config
   SDL2_LIBS   Linker flags for sdl2, overriding pkg-config
@ -92,7 +92,7 @@ index abac2895442..1d7b6614a34 100755
   CAPI20_CFLAGS
               C compiler flags for capi20, overriding pkg-config
   CAPI20_LIBS Linker flags for capi20, overriding pkg-config
-@@ -3868,12 +3859,6 @@ if test "${with_dbus+set}" = set; then :
+@@ -3849,12 +3840,6 @@ if test "${with_dbus+set}" = set; then :
 fi
 
 
@ -105,7 +105,7 @@ index abac2895442..1d7b6614a34 100755
 # Check whether --with-float-abi was given.
 if test "${with_float_abi+set}" = set; then :
   withval=$with_float_abi;
-@@ -14528,104 +14513,6 @@ esac
+@@ -14010,104 +13995,6 @@ esac
 
 fi
 
@ -210,7 +210,7 @@ index abac2895442..1d7b6614a34 100755
 if test "x$with_capi" != "xno"
 then
     if ${CAPI20_CFLAGS:+false} :; then :
-@@ -15695,8 +15582,40 @@ esac
+@@ -15177,8 +15064,40 @@ esac
 enable_openal32=${enable_openal32:-no}
 fi
 
@ -252,7 +252,7 @@ index abac2895442..1d7b6614a34 100755
     enable_x3daudio1_0=${enable_x3daudio1_0:-no}
     enable_x3daudio1_1=${enable_x3daudio1_1:-no}
     enable_x3daudio1_2=${enable_x3daudio1_2:-no}
-@@ -19692,8 +19611,6 @@ UDEV_CFLAGS = $UDEV_CFLAGS
+@@ -19021,8 +18940,6 @@ UDEV_CFLAGS = $UDEV_CFLAGS
 UDEV_LIBS = $UDEV_LIBS
 SDL2_CFLAGS = $SDL2_CFLAGS
 SDL2_LIBS = $SDL2_LIBS
@ -262,7 +262,7 @@ index abac2895442..1d7b6614a34 100755
 CAPI20_LIBS = $CAPI20_LIBS
 CUPS_CFLAGS = $CUPS_CFLAGS
 diff --git a/configure.ac b/configure.ac
-index bcfd438c768..53c86bd552c 100644
+index d5640ed..a76848b 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -43,7 +43,6 @@ AC_ARG_WITH(cups,      AS_HELP_STRING([--without-cups],[do not use CUPS]))
@ -273,7 +273,7 @@ index bcfd438c768..53c86bd552c 100644
 AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms]))
 AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]))
 AC_ARG_WITH(freetype,  AS_HELP_STRING([--without-freetype],[do not use the FreeType library]))
-@@ -1693,16 +1692,6 @@ fi
+@@ -1623,16 +1622,6 @@ fi
 WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"],
                  [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.])
 
@ -290,7 +290,7 @@ index bcfd438c768..53c86bd552c 100644
 dnl **** Check for capi4linux ****
 if test "x$with_capi" != "xno"
 then
-@@ -1867,8 +1856,19 @@ WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes],
+@@ -1797,8 +1786,19 @@ WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes],
                  [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.],
                  [enable_openal32])
 
@ -312,7 +312,7 @@ index bcfd438c768..53c86bd552c 100644
     enable_x3daudio1_1=${enable_x3daudio1_1:-no}
     enable_x3daudio1_2=${enable_x3daudio1_2:-no}
 diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in
-index d2305be6f17..9b4ce2189cf 100644
+index d2305be..9b4ce21 100644
 --- a/dlls/x3daudio1_0/Makefile.in
 +++ b/dlls/x3daudio1_0/Makefile.in
@@ -1,8 +1,6 @@
@ -325,7 +325,7 @@ index d2305be6f17..9b4ce2189cf 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in
-index efe8d74539f..d866dc3ddb9 100644
+index efe8d74..d866dc3 100644
 --- a/dlls/x3daudio1_1/Makefile.in
 +++ b/dlls/x3daudio1_1/Makefile.in
@@ -1,8 +1,6 @@
@ -338,7 +338,7 @@ index efe8d74539f..d866dc3ddb9 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in
-index 3b52e063fc0..d5de11b2585 100644
+index 3b52e06..d5de11b 100644
 --- a/dlls/x3daudio1_2/Makefile.in
 +++ b/dlls/x3daudio1_2/Makefile.in
@@ -1,8 +1,6 @@
@ -351,7 +351,7 @@ index 3b52e063fc0..d5de11b2585 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in
-index 9afd1e64312..cfd2c6c6c69 100644
+index 9afd1e6..cfd2c6c 100644
 --- a/dlls/x3daudio1_3/Makefile.in
 +++ b/dlls/x3daudio1_3/Makefile.in
@@ -1,8 +1,6 @@
@ -364,7 +364,7 @@ index 9afd1e64312..cfd2c6c6c69 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in
-index e481567cce0..bd0eac7fc6c 100644
+index e481567..bd0eac7 100644
 --- a/dlls/x3daudio1_4/Makefile.in
 +++ b/dlls/x3daudio1_4/Makefile.in
@@ -1,8 +1,6 @@
@ -377,7 +377,7 @@ index e481567cce0..bd0eac7fc6c 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in
-index 0a97959e7eb..dac67aef76d 100644
+index 0a97959..dac67ae 100644
 --- a/dlls/x3daudio1_5/Makefile.in
 +++ b/dlls/x3daudio1_5/Makefile.in
@@ -1,8 +1,6 @@
@ -390,7 +390,7 @@ index 0a97959e7eb..dac67aef76d 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in
-index c88374a381f..177fb8d34d8 100644
+index c88374a..177fb8d 100644
 --- a/dlls/x3daudio1_6/Makefile.in
 +++ b/dlls/x3daudio1_6/Makefile.in
@@ -1,8 +1,6 @@
@ -403,7 +403,7 @@ index c88374a381f..177fb8d34d8 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in
-index 267a93fd6da..019588dce0a 100644
+index 267a93f..019588d 100644
 --- a/dlls/x3daudio1_7/Makefile.in
 +++ b/dlls/x3daudio1_7/Makefile.in
@@ -1,8 +1,6 @@
@ -416,7 +416,7 @@ index 267a93fd6da..019588dce0a 100644
 C_SRCS = \
 	x3daudio.c
 diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in
-index df40978ecde..f69ff86bd9f 100644
+index df40978..f69ff86 100644
 --- a/dlls/xapofx1_1/Makefile.in
 +++ b/dlls/xapofx1_1/Makefile.in
@@ -2,12 +2,8 @@ EXTRADEFS = -DXAPOFX1_VER=1 -DXAUDIO2_VER=2
@ -434,7 +434,7 @@ index df40978ecde..f69ff86bd9f 100644
 
 RC_SRCS = version.rc
 diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in
-index 5e70ad2625a..d56a2be4bbe 100644
+index 5e70ad2..d56a2be 100644
 --- a/dlls/xapofx1_2/Makefile.in
 +++ b/dlls/xapofx1_2/Makefile.in
@@ -2,10 +2,6 @@ EXTRADEFS = -DXAPOFX1_VER=2 -DXAUDIO2_VER=3
@ -450,7 +450,7 @@ index 5e70ad2625a..d56a2be4bbe 100644
 -	xaudio_allocator.c
 +	xapofx.c
 diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in
-index 5cf91a7c2c0..1139520b73e 100644
+index 5cf91a7..1139520 100644
 --- a/dlls/xapofx1_3/Makefile.in
 +++ b/dlls/xapofx1_3/Makefile.in
@@ -2,12 +2,8 @@ EXTRADEFS = -DXAPOFX1_VER=3 -DXAUDIO2_VER=4
@ -468,7 +468,7 @@ index 5cf91a7c2c0..1139520b73e 100644
 
 RC_SRCS = version.rc
 diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in
-index ab1106fcf65..b49e4643af6 100644
+index ab1106f..b49e464 100644
 --- a/dlls/xapofx1_4/Makefile.in
 +++ b/dlls/xapofx1_4/Makefile.in
@@ -2,10 +2,6 @@ EXTRADEFS = -DXAPOFX1_VER=4 -DXAUDIO2_VER=6
@ -484,7 +484,7 @@ index ab1106fcf65..b49e4643af6 100644
 -	xaudio_allocator.c
 +	xapofx.c
 diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in
-index bda50c04866..5055a16fd54 100644
+index bda50c0..5055a16 100644
 --- a/dlls/xapofx1_5/Makefile.in
 +++ b/dlls/xapofx1_5/Makefile.in
@@ -2,10 +2,6 @@ EXTRADEFS = -DXAPOFX1_VER=5 -DXAUDIO2_VER=7
@ -500,7 +500,7 @@ index bda50c04866..5055a16fd54 100644
 -	xaudio_allocator.c
 +	xapofx.c
 diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in
-index 4f766b82450..cf15c7bf022 100644
+index 4f766b8..cf15c7b 100644
 --- a/dlls/xaudio2_0/Makefile.in
 +++ b/dlls/xaudio2_0/Makefile.in
@@ -1,14 +1,12 @@
@ -521,7 +521,7 @@ index 4f766b82450..cf15c7bf022 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in
-index 9e50adfa8e2..32a5a62a2ae 100644
+index 9e50adf..32a5a62 100644
 --- a/dlls/xaudio2_1/Makefile.in
 +++ b/dlls/xaudio2_1/Makefile.in
@@ -1,14 +1,12 @@
@ -542,7 +542,7 @@ index 9e50adfa8e2..32a5a62a2ae 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in
-index b7076fea4e1..f20de2d5f4e 100644
+index b7076fe..f20de2d 100644
 --- a/dlls/xaudio2_2/Makefile.in
 +++ b/dlls/xaudio2_2/Makefile.in
@@ -1,14 +1,12 @@
@ -563,7 +563,7 @@ index b7076fea4e1..f20de2d5f4e 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in
-index a1140f83363..ca749f247b1 100644
+index a1140f8..ca749f2 100644
 --- a/dlls/xaudio2_3/Makefile.in
 +++ b/dlls/xaudio2_3/Makefile.in
@@ -1,14 +1,12 @@
@ -584,7 +584,7 @@ index a1140f83363..ca749f247b1 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in
-index 6d1f5e4e71f..0b74f68fdc6 100644
+index 6d1f5e4..0b74f68 100644
 --- a/dlls/xaudio2_4/Makefile.in
 +++ b/dlls/xaudio2_4/Makefile.in
@@ -1,14 +1,12 @@
@ -605,7 +605,7 @@ index 6d1f5e4e71f..0b74f68fdc6 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in
-index d65b4bd1ed2..09356c94ac7 100644
+index d65b4bd..09356c9 100644
 --- a/dlls/xaudio2_5/Makefile.in
 +++ b/dlls/xaudio2_5/Makefile.in
@@ -1,14 +1,12 @@
@ -626,7 +626,7 @@ index d65b4bd1ed2..09356c94ac7 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in
-index 3bcc930e265..e0ef588158d 100644
+index 3bcc930..e0ef588 100644
 --- a/dlls/xaudio2_6/Makefile.in
 +++ b/dlls/xaudio2_6/Makefile.in
@@ -1,14 +1,12 @@
@ -647,7 +647,7 @@ index 3bcc930e265..e0ef588158d 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in
-index 294f841b019..2f2e2320072 100644
+index 294f841..2f2e232 100644
 --- a/dlls/xaudio2_7/Makefile.in
 +++ b/dlls/xaudio2_7/Makefile.in
@@ -1,15 +1,12 @@
@ -668,7 +668,7 @@ index 294f841b019..2f2e2320072 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c
-index 318f6685896..4980e25f2f1 100644
+index 318f668..4980e25 100644
 --- a/dlls/xaudio2_7/compat.c
 +++ b/dlls/xaudio2_7/compat.c
@@ -124,15 +124,15 @@ static XAUDIO2_SEND_DESCRIPTOR *convert_send_descriptors23(const XAUDIO23_VOICE_
@ -2817,7 +2817,7 @@ index 318f6685896..4980e25f2f1 100644
 
 static HRESULT WINAPI XA27_StartEngine(IXAudio27 *iface)
 diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c
-index 4ead8d8de47..0c1d9a78052 100644
+index 4ead8d8..0c1d9a7 100644
 --- a/dlls/xaudio2_7/tests/xaudio2.c
 +++ b/dlls/xaudio2_7/tests/xaudio2.c
@@ -524,7 +524,7 @@ static void test_buffer_callbacks(IXAudio2 *xa)
@ -2932,7 +2932,7 @@ index 4ead8d8de47..0c1d9a78052 100644
             ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);
             if(SUCCEEDED(hr))
 diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c
-index ee3367e092c..58f7062ad68 100644
+index ee3367e..58f7062 100644
 --- a/dlls/xaudio2_7/x3daudio.c
 +++ b/dlls/xaudio2_7/x3daudio.c
@@ -1,6 +1,5 @@
@ -3017,7 +3017,7 @@ index ee3367e092c..58f7062ad68 100644
 #endif /* XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER */
 diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c
 deleted file mode 100644
-index ccad417ea5c..00000000000
+index ccad417..0000000
 --- a/dlls/xaudio2_7/xapo.c
 +++ /dev/null
@@ -1,405 +0,0 @@
@ -3427,7 +3427,7 @@ index ccad417ea5c..00000000000
 -    return hr;
 -}
 diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c
-index 100ba02d3b5..e450851b259 100644
+index 100ba02..e450851 100644
 --- a/dlls/xaudio2_7/xapofx.c
 +++ b/dlls/xaudio2_7/xapofx.c
@@ -1,6 +1,5 @@
@ -4273,7 +4273,7 @@ index 100ba02d3b5..e450851b259 100644
         hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf);
 diff --git a/dlls/xaudio2_7/xaudio_allocator.c b/dlls/xaudio2_7/xaudio_allocator.c
 deleted file mode 100644
-index 41be48a80f3..00000000000
+index 41be48a..0000000
 --- a/dlls/xaudio2_7/xaudio_allocator.c
 +++ /dev/null
@@ -1,41 +0,0 @@
@ -4319,7 +4319,7 @@ index 41be48a80f3..00000000000
 -    return CoTaskMemRealloc(ptr, size);
 -}
 diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl
-index 17a59c35ccb..64e350f8d4f 100644
+index 17a59c3..64e350f 100644
 --- a/dlls/xaudio2_7/xaudio_classes.idl
 +++ b/dlls/xaudio2_7/xaudio_classes.idl
@@ -41,6 +41,13 @@ coclass AudioVolumeMeter { interface IUnknown; }
@ -4337,7 +4337,7 @@ index 17a59c35ccb..64e350f8d4f 100644
 
 #if XAUDIO2_VER == 6
 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
-index f338b56dc91..0bbe943f153 100644
+index f338b56..0bbe943 100644
 --- a/dlls/xaudio2_7/xaudio_dll.c
 +++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -1,7 +1,6 @@
@ -7623,7 +7623,7 @@ index f338b56dc91..0bbe943f153 100644
 }
 -#endif /* XAUDIO2_VER >= 8 */
 diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h
-index 84bab8257d0..5d3814fb9ef 100644
+index 84bab82..5d3814fb 100644
 --- a/dlls/xaudio2_7/xaudio_private.h
 +++ b/dlls/xaudio2_7/xaudio_private.h
@@ -1,6 +1,5 @@
@ -7879,7 +7879,7 @@ index 84bab8257d0..5d3814fb9ef 100644
 -extern void* XAudio_Internal_Realloc(void* ptr, size_t size) DECLSPEC_HIDDEN;
 +extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN;
 diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in
-index 566ddb6b3f1..d4efc41d5c3 100644
+index 566ddb6..d4efc41 100644
 --- a/dlls/xaudio2_8/Makefile.in
 +++ b/dlls/xaudio2_8/Makefile.in
@@ -1,16 +1,13 @@
@ -7901,7 +7901,7 @@ index 566ddb6b3f1..d4efc41d5c3 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in
-index 1a1982781a1..ceb2216f5a2 100644
+index 1a19827..ceb2216 100644
 --- a/dlls/xaudio2_9/Makefile.in
 +++ b/dlls/xaudio2_9/Makefile.in
@@ -1,16 +1,13 @@
@ -7923,10 +7923,10 @@ index 1a1982781a1..ceb2216f5a2 100644
 
 IDL_SRCS = xaudio_classes.idl
 diff --git a/include/config.h.in b/include/config.h.in
-index ff4f59d815e..5efea60e02e 100644
+index b3df2f3..261cda4 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -168,9 +168,6 @@
+@@ -159,9 +159,6 @@
 /* Define to 1 if you have the `fallocate' function. */
 #undef HAVE_FALLOCATE
 
@ -7936,7 +7936,7 @@ index ff4f59d815e..5efea60e02e 100644
 /* Define to 1 if you have the `ffs' function. */
 #undef HAVE_FFS
 
-@@ -1527,9 +1524,6 @@
+@@ -1392,9 +1389,6 @@
 /* Define to the soname of the libEGL library. */
 #undef SONAME_LIBEGL
 
@ -7947,5 +7947,5 @@ index ff4f59d815e..5efea60e02e 100644
 #undef SONAME_LIBFONTCONFIG
 
 -- 
-2.20.1
+1.9.1
				`@ -1 +0,0 @@`
				`Fixes: [38087] Fix multithreading issues with fullscreen clipping`