wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against fabde842ede40fc53cf6f5743d5b477841f7b11c.

Browse Source
This commit is contained in:
Zebediah Figura 2019-04-12 19:34:16 -05:00
parent 8f56ffcf57
commit a36ea2ace3
4 changed files with 143 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "0cb79db12ac7c48477518dcff269ccc5d6b745e0"
echo "fabde842ede40fc53cf6f5743d5b477841f7b11c"
}
# Show version information
@ -1697,37 +1697,6 @@ if test "$enable_wined3d_Indexed_Vertex_Blending" -eq 1; then
enable_wined3d_SWVP_shaders=1
fi
if test "$enable_wined3d_CSMT_Main" -eq 1; then
if test "$enable_d3d11_Deferred_Context" -gt 1; then
abort "Patchset d3d11-Deferred_Context disabled, but wined3d-CSMT_Main depends on that."
fi
if test "$enable_d3d9_Tests" -gt 1; then
abort "Patchset d3d9-Tests disabled, but wined3d-CSMT_Main depends on that."
fi
if test "$enable_wined3d_Accounting" -gt 1; then
abort "Patchset wined3d-Accounting disabled, but wined3d-CSMT_Main depends on that."
fi
if test "$enable_wined3d_DXTn" -gt 1; then
abort "Patchset wined3d-DXTn disabled, but wined3d-CSMT_Main depends on that."
fi
if test "$enable_wined3d_Dual_Source_Blending" -gt 1; then
abort "Patchset wined3d-Dual_Source_Blending disabled, but wined3d-CSMT_Main depends on that."
fi
if test "$enable_wined3d_Silence_FIXMEs" -gt 1; then
abort "Patchset wined3d-Silence_FIXMEs disabled, but wined3d-CSMT_Main depends on that."
fi
if test "$enable_wined3d_UAV_Counters" -gt 1; then
abort "Patchset wined3d-UAV_Counters disabled, but wined3d-CSMT_Main depends on that."
fi
enable_d3d11_Deferred_Context=1
enable_d3d9_Tests=1
enable_wined3d_Accounting=1
enable_wined3d_DXTn=1
enable_wined3d_Dual_Source_Blending=1
enable_wined3d_Silence_FIXMEs=1
enable_wined3d_UAV_Counters=1
fi
if test "$enable_wineboot_ProxySettings" -eq 1; then
if test "$enable_wineboot_DriveSerial" -gt 1; then
abort "Patchset wineboot-DriveSerial disabled, but wineboot-ProxySettings depends on that."
@ -6782,6 +6751,20 @@ if test "$enable_wined3d_Accounting" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-CSMT_Main
# |
# | Modified files:
# | * dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/wined3d_private.h
# |
if test "$enable_wined3d_CSMT_Main" -eq 1; then
patch_apply wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
patch_apply wined3d-CSMT_Main/0045-wined3d-Improve-wined3d_cs_emit_update_sub_resource.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Reset context before destruction.", 1 },';
printf '%s\n' '+ { "Michael Müller", "wined3d: Improve wined3d_cs_emit_update_sub_resource.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-Dual_Source_Blending
# |
# | Modified files:
@ -6797,50 +6780,6 @@ if test "$enable_wined3d_Dual_Source_Blending" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-Silence_FIXMEs
# |
# | Modified files:
# | * dlls/wined3d/surface.c, dlls/wined3d/texture.c
# |
if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then
patch_apply wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch
patch_apply wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch
(
printf '%s\n' '+ { "Christian Costa", "wined3d: Print FIXME only once in surface_cpu_blt.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Silence extremely noisy FIXME in wined3d_texture_add_dirty_region.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-UAV_Counters
# |
# | Modified files:
# | * dlls/d3d11/device.c, dlls/wined3d/cs.c, dlls/wined3d/device.c
# |
if test "$enable_wined3d_UAV_Counters" -eq 1; then
patch_apply wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Remaining UAV counter changes.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-CSMT_Main
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * nvcuda-CUDA_Support, nvapi-Stub_DLL, d3d11-Deferred_Context, d3d9-Tests, wined3d-Accounting, wined3d-
# | WINED3DFMT_B8G8R8X8_UNORM, wined3d-DXTn, wined3d-Dual_Source_Blending, wined3d-Silence_FIXMEs, wined3d-UAV_Counters
# |
# | Modified files:
# | * dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/wined3d_private.h
# |
if test "$enable_wined3d_CSMT_Main" -eq 1; then
patch_apply wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
patch_apply wined3d-CSMT_Main/0045-wined3d-Improve-wined3d_cs_emit_update_sub_resource.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Reset context before destruction.", 1 },';
printf '%s\n' '+ { "Michael Müller", "wined3d: Improve wined3d_cs_emit_update_sub_resource.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-SWVP-shaders
# |
# | This patchset fixes the following Wine bugs:
@ -6910,6 +6849,32 @@ if test "$enable_wined3d_Restore_DirectX10_Support" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-Silence_FIXMEs
# |
# | Modified files:
# | * dlls/wined3d/surface.c, dlls/wined3d/texture.c
# |
if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then
patch_apply wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch
patch_apply wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch
(
printf '%s\n' '+ { "Christian Costa", "wined3d: Print FIXME only once in surface_cpu_blt.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Silence extremely noisy FIXME in wined3d_texture_add_dirty_region.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-UAV_Counters
# |
# | Modified files:
# | * dlls/d3d11/device.c, dlls/wined3d/cs.c, dlls/wined3d/device.c
# |
if test "$enable_wined3d_UAV_Counters" -eq 1; then
patch_apply wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Remaining UAV counter changes.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-WINED3D_RS_COLORWRITEENABLE
# |
# | Modified files:

27
patches/wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
View File

@ -1,24 +1,27 @@
From 25629ab322f251afa9ae5495212c84a00f5af00f Mon Sep 17 00:00:00 2001
From 657f0e0b86c4b3f2fad5e5bd893ba104fb6bdf7f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 19 Feb 2017 08:29:23 +0100
Subject: wined3d: Reset context before destruction.
---
dlls/wined3d/device.c | 1 +
1 file changed, 1 insertion(+)
dlls/wined3d/device.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index aa24d7f4c37..1bf7db30b3d 100644
index 361ac6b1e..44c51833c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1200,6 +1200,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device)
@@ -1211,7 +1211,10 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
if (no3d)
device->blitter->ops->blitter_destroy(device->blitter, NULL);
else
+ {
+ context_set_current(NULL);
wined3d_device_delete_opengl_contexts(device);
+ }
wine_rb_clear(&device->samplers, device_free_sampler, NULL);
+ context_set_current(NULL);
wined3d_device_delete_opengl_contexts(device);
if (device->fb.depth_stencil)
if ((view = device->fb.depth_stencil))
{
--
2.11.0
2.21.0

7
patches/wined3d-CSMT_Main/definition
View File

@ -1,7 +0,0 @@
Depends: wined3d-Accounting
Depends: wined3d-DXTn
Depends: wined3d-Silence_FIXMEs
Depends: wined3d-UAV_Counters
Depends: wined3d-Dual_Source_Blending
Depends: d3d9-Tests
Depends: d3d11-Deferred_Context

174
patches/xaudio2-revert/0006-Revert-xaudio2-Rewrite-to-use-FAudio.patch
View File

@ -1,11 +1,11 @@
From 40c4cf65ef1e6e54179f0287d40237cdf5e3f4e0 Mon Sep 17 00:00:00 2001
From 7c2ba2192c4575c08d7f939bd983d1e70a978a3b Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 19 Mar 2019 08:41:11 +1100
Subject: [PATCH 6/6] Revert "xaudio2: Rewrite to use FAudio."
Subject: [PATCH] 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 3c976c9..a06f914 100755
index c21c70d0f..f69a2614a 100755
--- a/configure
+++ b/configure
@@ -659,8 +659,6 @@ CUPS_LIBS
@ -65,7 +65,7 @@ index 3c976c9..a06f914 100755
with_float_abi
with_fontconfig
with_freetype
@@ -1834,8 +1831,6 @@ UDEV_CFLAGS
@@ -1837,8 +1834,6 @@ UDEV_CFLAGS
UDEV_LIBS
SDL2_CFLAGS
SDL2_LIBS
@ -74,7 +74,7 @@ index 3c976c9..a06f914 100755
CAPI20_CFLAGS
CAPI20_LIBS
CUPS_CFLAGS
@@ -2506,7 +2501,6 @@ Optional Packages:
@@ -2509,7 +2504,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 3c976c9..a06f914 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
@@ -2614,9 +2608,6 @@ Some influential environment variables:
@@ -2618,9 +2612,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 3c976c9..a06f914 100755
CAPI20_CFLAGS
C compiler flags for capi20, overriding pkg-config
CAPI20_LIBS Linker flags for capi20, overriding pkg-config
@@ -3849,12 +3840,6 @@ if test "${with_dbus+set}" = set; then :
@@ -3853,12 +3844,6 @@ if test "${with_dbus+set}" = set; then :
fi
@ -105,7 +105,7 @@ index 3c976c9..a06f914 100755
# Check whether --with-float-abi was given.
if test "${with_float_abi+set}" = set; then :
withval=$with_float_abi;
@@ -14010,104 +13995,6 @@ esac
@@ -14651,104 +14636,6 @@ esac
fi
@ -210,7 +210,7 @@ index 3c976c9..a06f914 100755
if test "x$with_capi" != "xno"
then
if ${CAPI20_CFLAGS:+false} :; then :
@@ -15177,8 +15064,40 @@ esac
@@ -15818,8 +15705,40 @@ esac
enable_openal32=${enable_openal32:-no}
fi
@ -252,7 +252,7 @@ index 3c976c9..a06f914 100755
enable_x3daudio1_0=${enable_x3daudio1_0:-no}
enable_x3daudio1_1=${enable_x3daudio1_1:-no}
enable_x3daudio1_2=${enable_x3daudio1_2:-no}
@@ -19021,8 +18940,6 @@ UDEV_CFLAGS = $UDEV_CFLAGS
@@ -19591,8 +19510,6 @@ UDEV_CFLAGS = $UDEV_CFLAGS
UDEV_LIBS = $UDEV_LIBS
SDL2_CFLAGS = $SDL2_CFLAGS
SDL2_LIBS = $SDL2_LIBS
@ -262,10 +262,10 @@ index 3c976c9..a06f914 100755
CAPI20_LIBS = $CAPI20_LIBS
CUPS_CFLAGS = $CUPS_CFLAGS
diff --git a/configure.ac b/configure.ac
index d5640ed..a76848b 100644
index 02e7e9ec4..c5984b084 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS]))
@@ -42,7 +42,6 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS]))
AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]),
[if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi])
AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)]))
@ -273,7 +273,7 @@ index d5640ed..a76848b 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]))
@@ -1623,16 +1622,6 @@ fi
@@ -1650,16 +1649,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 d5640ed..a76848b 100644
dnl **** Check for capi4linux ****
if test "x$with_capi" != "xno"
then
@@ -1797,8 +1786,19 @@ WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes],
@@ -1824,8 +1813,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 d5640ed..a76848b 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 d2305be..9b4ce21 100644
index d2305be6f..9b4ce2189 100644
--- a/dlls/x3daudio1_0/Makefile.in
+++ b/dlls/x3daudio1_0/Makefile.in
@@ -1,8 +1,6 @@
@ -325,7 +325,7 @@ index d2305be..9b4ce21 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in
index efe8d74..d866dc3 100644
index efe8d7453..d866dc3dd 100644
--- a/dlls/x3daudio1_1/Makefile.in
+++ b/dlls/x3daudio1_1/Makefile.in
@@ -1,8 +1,6 @@
@ -338,7 +338,7 @@ index efe8d74..d866dc3 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in
index 3b52e06..d5de11b 100644
index 3b52e063f..d5de11b25 100644
--- a/dlls/x3daudio1_2/Makefile.in
+++ b/dlls/x3daudio1_2/Makefile.in
@@ -1,8 +1,6 @@
@ -351,7 +351,7 @@ index 3b52e06..d5de11b 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in
index 9afd1e6..cfd2c6c 100644
index 9afd1e643..cfd2c6c6c 100644
--- a/dlls/x3daudio1_3/Makefile.in
+++ b/dlls/x3daudio1_3/Makefile.in
@@ -1,8 +1,6 @@
@ -364,7 +364,7 @@ index 9afd1e6..cfd2c6c 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in
index e481567..bd0eac7 100644
index e481567cc..bd0eac7fc 100644
--- a/dlls/x3daudio1_4/Makefile.in
+++ b/dlls/x3daudio1_4/Makefile.in
@@ -1,8 +1,6 @@
@ -377,7 +377,7 @@ index e481567..bd0eac7 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in
index 0a97959..dac67ae 100644
index 0a97959e7..dac67aef7 100644
--- a/dlls/x3daudio1_5/Makefile.in
+++ b/dlls/x3daudio1_5/Makefile.in
@@ -1,8 +1,6 @@
@ -390,7 +390,7 @@ index 0a97959..dac67ae 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in
index c88374a..177fb8d 100644
index c88374a38..177fb8d34 100644
--- a/dlls/x3daudio1_6/Makefile.in
+++ b/dlls/x3daudio1_6/Makefile.in
@@ -1,8 +1,6 @@
@ -403,7 +403,7 @@ index c88374a..177fb8d 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in
index 267a93f..019588d 100644
index 267a93fd6..019588dce 100644
--- a/dlls/x3daudio1_7/Makefile.in
+++ b/dlls/x3daudio1_7/Makefile.in
@@ -1,8 +1,6 @@
@ -416,7 +416,7 @@ index 267a93f..019588d 100644
C_SRCS = \
x3daudio.c
diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in
index df40978..f69ff86 100644
index df40978ec..f69ff86bd 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 df40978..f69ff86 100644
RC_SRCS = version.rc
diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in
index 5e70ad2..d56a2be 100644
index 5e70ad262..d56a2be4b 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 5e70ad2..d56a2be 100644
- xaudio_allocator.c
+ xapofx.c
diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in
index 5cf91a7..1139520 100644
index 5cf91a7c2..1139520b7 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 5cf91a7..1139520 100644
RC_SRCS = version.rc
diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in
index ab1106f..b49e464 100644
index ab1106fcf..b49e4643a 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 ab1106f..b49e464 100644
- xaudio_allocator.c
+ xapofx.c
diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in
index bda50c0..5055a16 100644
index bda50c048..5055a16fd 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 bda50c0..5055a16 100644
- xaudio_allocator.c
+ xapofx.c
diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in
index 4f766b8..cf15c7b 100644
index 4f766b824..cf15c7bf0 100644
--- a/dlls/xaudio2_0/Makefile.in
+++ b/dlls/xaudio2_0/Makefile.in
@@ -1,14 +1,12 @@
@ -521,7 +521,7 @@ index 4f766b8..cf15c7b 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in
index 9e50adf..32a5a62 100644
index 9e50adfa8..32a5a62a2 100644
--- a/dlls/xaudio2_1/Makefile.in
+++ b/dlls/xaudio2_1/Makefile.in
@@ -1,14 +1,12 @@
@ -542,7 +542,7 @@ index 9e50adf..32a5a62 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in
index b7076fe..f20de2d 100644
index b7076fea4..f20de2d5f 100644
--- a/dlls/xaudio2_2/Makefile.in
+++ b/dlls/xaudio2_2/Makefile.in
@@ -1,14 +1,12 @@
@ -563,7 +563,7 @@ index b7076fe..f20de2d 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in
index a1140f8..ca749f2 100644
index a1140f833..ca749f247 100644
--- a/dlls/xaudio2_3/Makefile.in
+++ b/dlls/xaudio2_3/Makefile.in
@@ -1,14 +1,12 @@
@ -584,7 +584,7 @@ index a1140f8..ca749f2 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in
index 6d1f5e4..0b74f68 100644
index 6d1f5e4e7..0b74f68fd 100644
--- a/dlls/xaudio2_4/Makefile.in
+++ b/dlls/xaudio2_4/Makefile.in
@@ -1,14 +1,12 @@
@ -605,7 +605,7 @@ index 6d1f5e4..0b74f68 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in
index d65b4bd..09356c9 100644
index d65b4bd1e..09356c94a 100644
--- a/dlls/xaudio2_5/Makefile.in
+++ b/dlls/xaudio2_5/Makefile.in
@@ -1,14 +1,12 @@
@ -626,7 +626,7 @@ index d65b4bd..09356c9 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in
index 3bcc930..e0ef588 100644
index 3bcc930e2..e0ef58815 100644
--- a/dlls/xaudio2_6/Makefile.in
+++ b/dlls/xaudio2_6/Makefile.in
@@ -1,14 +1,12 @@
@ -647,7 +647,7 @@ index 3bcc930..e0ef588 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in
index 294f841..2f2e232 100644
index 294f841b0..2f2e23200 100644
--- a/dlls/xaudio2_7/Makefile.in
+++ b/dlls/xaudio2_7/Makefile.in
@@ -1,15 +1,12 @@
@ -668,7 +668,7 @@ index 294f841..2f2e232 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c
index 318f668..4980e25 100644
index 318f66858..4980e25f2 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 318f668..4980e25 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 4ead8d8..0c1d9a7 100644
index 4ead8d8de..0c1d9a780 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 4ead8d8..0c1d9a7 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 ee3367e..58f7062 100644
index ee3367e09..58f7062ad 100644
--- a/dlls/xaudio2_7/x3daudio.c
+++ b/dlls/xaudio2_7/x3daudio.c
@@ -1,6 +1,5 @@
@ -3017,7 +3017,7 @@ index ee3367e..58f7062 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 ccad417..0000000
index ccad417ea..000000000
--- a/dlls/xaudio2_7/xapo.c
+++ /dev/null
@@ -1,405 +0,0 @@
@ -3427,7 +3427,7 @@ index ccad417..0000000
- return hr;
-}
diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c
index 100ba02..e450851 100644
index 100ba02d3..e450851b2 100644
--- a/dlls/xaudio2_7/xapofx.c
+++ b/dlls/xaudio2_7/xapofx.c
@@ -1,6 +1,5 @@
@ -4273,7 +4273,7 @@ index 100ba02..e450851 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 41be48a..0000000
index 41be48a80..000000000
--- a/dlls/xaudio2_7/xaudio_allocator.c
+++ /dev/null
@@ -1,41 +0,0 @@
@ -4319,7 +4319,7 @@ index 41be48a..0000000
- return CoTaskMemRealloc(ptr, size);
-}
diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl
index 17a59c3..64e350f 100644
index 17a59c35c..64e350f8d 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 17a59c3..64e350f 100644
#if XAUDIO2_VER == 6
diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index f338b56..0bbe943 100644
index 43f0c0a67..6dc0d8fd9 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -1,7 +1,6 @@
@ -4393,8 +4393,8 @@ index f338b56..0bbe943 100644
+#endif
#if XAUDIO2_VER != 0 && defined(__i386__)
/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */
@@ -71,9 +82,38 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start,
/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi;
@@ -76,9 +87,38 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start,
"ret" )
#endif
@ -4436,7 +4436,7 @@ index f338b56..0bbe943 100644
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved)
{
@@ -84,6 +124,20 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved)
@@ -89,6 +129,20 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved)
case DLL_PROCESS_ATTACH:
instance = hinstDLL;
DisableThreadLibraryCalls( hinstDLL );
@ -4457,7 +4457,7 @@ index f338b56..0bbe943 100644
break;
}
return TRUE;
@@ -106,579 +160,250 @@ HRESULT WINAPI DllUnregisterServer(void)
@@ -111,579 +165,250 @@ HRESULT WINAPI DllUnregisterServer(void)
return __wine_unregister_resources(instance);
}
@ -5174,7 +5174,7 @@ index f338b56..0bbe943 100644
}
static HRESULT WINAPI XA2SRC_SetOutputMatrix(IXAudio2SourceVoice *iface,
@@ -686,39 +411,68 @@ static HRESULT WINAPI XA2SRC_SetOutputMatrix(IXAudio2SourceVoice *iface,
@@ -691,39 +416,68 @@ static HRESULT WINAPI XA2SRC_SetOutputMatrix(IXAudio2SourceVoice *iface,
UINT32 DestinationChannels, const float *pLevelMatrix,
UINT32 OperationSet)
{
@ -5258,7 +5258,7 @@ index f338b56..0bbe943 100644
LeaveCriticalSection(&This->lock);
}
@@ -726,98 +480,380 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface)
@@ -731,98 +485,380 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface)
static HRESULT WINAPI XA2SRC_Start(IXAudio2SourceVoice *iface, UINT32 Flags,
UINT32 OperationSet)
{
@ -5659,7 +5659,7 @@ index f338b56..0bbe943 100644
}
static const IXAudio2SourceVoiceVtbl XAudio2SourceVoice_Vtbl = {
@@ -852,408 +888,134 @@ static const IXAudio2SourceVoiceVtbl XAudio2SourceVoice_Vtbl = {
@@ -857,408 +893,134 @@ static const IXAudio2SourceVoiceVtbl XAudio2SourceVoice_Vtbl = {
XA2SRC_SetSourceSampleRate
};
@ -6101,7 +6101,7 @@ index f338b56..0bbe943 100644
}
static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface,
@@ -1261,58 +1023,60 @@ static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface,
@@ -1266,58 +1028,60 @@ static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface,
UINT32 DestinationChannels, const float *pLevelMatrix,
UINT32 OperationSet)
{
@ -6185,7 +6185,7 @@ index f338b56..0bbe943 100644
}
static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = {
@@ -1338,49 +1102,190 @@ static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = {
@@ -1343,49 +1107,190 @@ static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = {
XA2M_GetChannelMask
};
@ -6411,7 +6411,7 @@ index f338b56..0bbe943 100644
static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid,
void **ppvObject)
{
@@ -1421,7 +1326,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid,
@@ -1426,7 +1331,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid,
static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface)
{
IXAudio2Impl *This = impl_from_IXAudio2(iface);
@ -6420,7 +6420,7 @@ index f338b56..0bbe943 100644
TRACE("(%p)->(): Refcount now %u\n", This, ref);
return ref;
}
@@ -1429,21 +1334,48 @@ static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface)
@@ -1434,21 +1339,48 @@ static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface)
static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface)
{
IXAudio2Impl *This = impl_from_IXAudio2(iface);
@ -6475,7 +6475,7 @@ index f338b56..0bbe943 100644
This->lock.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&This->lock);
@@ -1470,8 +1402,8 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface,
@@ -1475,8 +1407,8 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface,
}
}
@ -6486,7 +6486,7 @@ index f338b56..0bbe943 100644
This->cbs[i] = pCallback;
@@ -1490,11 +1422,6 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface,
@@ -1495,11 +1427,6 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface,
EnterCriticalSection(&This->lock);
@ -6498,7 +6498,7 @@ index f338b56..0bbe943 100644
for(i = 0; i < This->ncbs; ++i){
if(This->cbs[i] == pCallback)
break;
@@ -1509,40 +1436,20 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface,
@@ -1514,40 +1441,20 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface,
LeaveCriticalSection(&This->lock);
}
@ -6550,7 +6550,7 @@ index f338b56..0bbe943 100644
}
static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface,
@@ -1552,44 +1459,94 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface,
@@ -1557,44 +1464,94 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface,
const XAUDIO2_EFFECT_CHAIN *pEffectChain)
{
IXAudio2Impl *This = impl_from_IXAudio2(iface);
@ -6660,7 +6660,7 @@ index f338b56..0bbe943 100644
LeaveCriticalSection(&src->lock);
@@ -1614,10 +1571,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,
@@ -1619,10 +1576,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,
const XAUDIO2_VOICE_SENDS *pSendList,
const XAUDIO2_EFFECT_CHAIN *pEffectChain)
{
@ -6672,7 +6672,7 @@ index f338b56..0bbe943 100644
TRACE("(%p)->(%p, %u, %u, 0x%x, %u, %p, %p)\n", This, ppSubmixVoice,
inputChannels, inputSampleRate, flags, processingStage, pSendList,
@@ -1625,33 +1580,46 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,
@@ -1630,33 +1585,46 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,
EnterCriticalSection(&This->lock);
@ -6734,7 +6734,7 @@ index f338b56..0bbe943 100644
LeaveCriticalSection(&sub->lock);
#if XAUDIO2_VER == 0
@@ -1669,46 +1637,25 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,
@@ -1674,46 +1642,25 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,
return S_OK;
}
@ -6798,7 +6798,7 @@ index f338b56..0bbe943 100644
return 0;
}
@@ -1719,60 +1666,251 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface,
@@ -1724,60 +1671,251 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface,
AUDIO_STREAM_CATEGORY streamCategory)
{
IXAudio2Impl *This = impl_from_IXAudio2(iface);
@ -7074,7 +7074,7 @@ index f338b56..0bbe943 100644
}
static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface)
@@ -1781,7 +1919,7 @@ static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface)
@@ -1786,7 +1924,7 @@ static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface)
TRACE("(%p)->()\n", This);
@ -7083,7 +7083,7 @@ index f338b56..0bbe943 100644
}
static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface,
@@ -1791,7 +1929,7 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface,
@@ -1796,7 +1934,7 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface,
TRACE("(%p)->(0x%x): stub!\n", This, operationSet);
@ -7092,7 +7092,7 @@ index f338b56..0bbe943 100644
}
static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface,
@@ -1801,7 +1939,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface,
@@ -1806,7 +1944,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface,
TRACE("(%p)->(%p): stub!\n", This, pPerfData);
@ -7101,7 +7101,7 @@ index f338b56..0bbe943 100644
}
static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface,
@@ -1810,9 +1948,7 @@ static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface,
@@ -1815,9 +1953,7 @@ static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface,
{
IXAudio2Impl *This = impl_from_IXAudio2(iface);
@ -7112,7 +7112,7 @@ index f338b56..0bbe943 100644
}
/* XAudio2 2.8 */
@@ -1833,8 +1969,6 @@ static const IXAudio2Vtbl XAudio2_Vtbl =
@@ -1838,8 +1974,6 @@ static const IXAudio2Vtbl XAudio2_Vtbl =
IXAudio2Impl_SetDebugConfiguration
};
@ -7121,7 +7121,7 @@ index f338b56..0bbe943 100644
struct xaudio2_cf {
IClassFactory IClassFactory_iface;
LONG ref;
@@ -1878,6 +2012,79 @@ static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface)
@@ -1883,6 +2017,79 @@ static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface)
return ref;
}
@ -7201,7 +7201,7 @@ index f338b56..0bbe943 100644
static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter,
REFIID riid, void **ppobj)
{
@@ -1897,6 +2104,7 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p
@@ -1902,6 +2109,7 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p
return E_OUTOFMEMORY;
object->IXAudio2_iface.lpVtbl = &XAudio2_Vtbl;
@ -7209,7 +7209,7 @@ index f338b56..0bbe943 100644
#if XAUDIO2_VER == 0
object->IXAudio20_iface.lpVtbl = &XAudio20_Vtbl;
@@ -1906,48 +2114,38 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p
@@ -1911,48 +2119,38 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p
object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl;
#endif
@ -7275,7 +7275,7 @@ index f338b56..0bbe943 100644
TRACE("Created XAudio version %u: %p\n", 20 + XAUDIO2_VER, object);
return hr;
@@ -1969,9 +2167,7 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl =
@@ -1974,9 +2172,7 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl =
XAudio2CF_LockServer
};
@ -7286,7 +7286,7 @@ index f338b56..0bbe943 100644
{
HRESULT hr;
struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf));
@@ -1983,13 +2179,6 @@ static inline HRESULT make_xaudio2_factory(REFIID riid, void **ppv)
@@ -1988,13 +2184,6 @@ static inline HRESULT make_xaudio2_factory(REFIID riid, void **ppv)
return hr;
}
@ -7300,7 +7300,7 @@ index f338b56..0bbe943 100644
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
{
TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
@@ -2022,11 +2211,18 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
@@ -2027,11 +2216,18 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
IsEqualGUID(rclsid, &CLSID_AudioReverb25) ||
IsEqualGUID(rclsid, &CLSID_AudioReverb26) ||
IsEqualGUID(rclsid, &CLSID_AudioReverb27))
@ -7320,7 +7320,7 @@ index f338b56..0bbe943 100644
#if XAUDIO2_VER >= 8
HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR proc)
{
@@ -2055,36 +2251,284 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p
@@ -2060,36 +2256,284 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p
return S_OK;
}
@ -7623,7 +7623,7 @@ index f338b56..0bbe943 100644
}
-#endif /* XAUDIO2_VER >= 8 */
diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h
index 84bab82..5d3814fb 100644
index 84bab8257..5d3814fb9 100644
--- a/dlls/xaudio2_7/xaudio_private.h
+++ b/dlls/xaudio2_7/xaudio_private.h
@@ -1,6 +1,5 @@
@ -7879,7 +7879,7 @@ index 84bab82..5d3814fb 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 566ddb6..d4efc41 100644
index 566ddb6b3..d4efc41d5 100644
--- a/dlls/xaudio2_8/Makefile.in
+++ b/dlls/xaudio2_8/Makefile.in
@@ -1,16 +1,13 @@
@ -7901,7 +7901,7 @@ index 566ddb6..d4efc41 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in
index 1a19827..ceb2216 100644
index 1a1982781..ceb2216f5 100644
--- a/dlls/xaudio2_9/Makefile.in
+++ b/dlls/xaudio2_9/Makefile.in
@@ -1,16 +1,13 @@
@ -7923,10 +7923,10 @@ index 1a19827..ceb2216 100644
IDL_SRCS = xaudio_classes.idl
diff --git a/include/config.h.in b/include/config.h.in
index b3df2f3..261cda4 100644
index aeb571ab9..f8ec5ce51 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -159,9 +159,6 @@
@@ -150,9 +150,6 @@
/* Define to 1 if you have the `fallocate' function. */
#undef HAVE_FALLOCATE
@ -7936,7 +7936,7 @@ index b3df2f3..261cda4 100644
/* Define to 1 if you have the `ffs' function. */
#undef HAVE_FFS
@@ -1392,9 +1389,6 @@
@@ -1344,9 +1341,6 @@
/* Define to the soname of the libEGL library. */
#undef SONAME_LIBEGL
@ -7947,5 +7947,5 @@ index b3df2f3..261cda4 100644
#undef SONAME_LIBFONTCONFIG
--
1.9.1
2.21.0