diff --git a/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch b/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch index dfd97a68..35ca31c1 100644 --- a/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch +++ b/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch @@ -1,4 +1,4 @@ -From 599d50340aaf37f2eb39a789a4034e677d52e92c Mon Sep 17 00:00:00 2001 +From 51e513935e94ddd1113ad016be7eb4100829ddc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 29 Jul 2015 17:09:50 +0200 Subject: [PATCH] ddraw: Create rendering targets in video memory if possible. @@ -12,10 +12,10 @@ Based on a patch by Henri Verbeet. 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c -index 6b2abe3..dfd52a0 100644 +index 8467fbf4c..b9e13a49b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c -@@ -4209,7 +4209,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, +@@ -4235,7 +4235,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); @@ -24,7 +24,7 @@ index 6b2abe3..dfd52a0 100644 { *device = &object->IDirect3DDevice7_iface; } -@@ -4238,7 +4238,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, +@@ -4264,7 +4264,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); @@ -33,7 +33,7 @@ index 6b2abe3..dfd52a0 100644 { *device = &device_impl->IDirect3DDevice3_iface; } -@@ -4264,7 +4264,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, +@@ -4290,7 +4290,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); @@ -43,10 +43,10 @@ index 6b2abe3..dfd52a0 100644 *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h -index b035a7e..699f719 100644 +index 19f21a892..e2fe323b6 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h -@@ -303,6 +303,7 @@ struct d3d_device +@@ -304,6 +304,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; @@ -54,8 +54,8 @@ index b035a7e..699f719 100644 IUnknown *outer_unknown; struct wined3d_device *wined3d_device; -@@ -347,7 +348,7 @@ struct d3d_device - struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; +@@ -350,7 +351,7 @@ struct d3d_device + BOOL recording; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, @@ -64,10 +64,10 @@ index b035a7e..699f719 100644 enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c -index 0d48c7d..2bef17d 100644 +index 003ce1d2e..c5e303ee0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c -@@ -1854,7 +1854,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, +@@ -1850,7 +1850,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, return DDERR_INVALIDCAPS; } @@ -76,7 +76,7 @@ index 0d48c7d..2bef17d 100644 { WARN("Surface %p is not in video memory.\n", target_impl); wined3d_mutex_unlock(); -@@ -1930,7 +1930,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, +@@ -1926,7 +1926,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, return DDERR_INVALIDPIXELFORMAT; } @@ -85,7 +85,7 @@ index 0d48c7d..2bef17d 100644 { WARN("Surface %p is not in video memory.\n", target_impl); IDirectDrawSurface4_AddRef(target); -@@ -1979,7 +1979,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, +@@ -1975,7 +1975,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, return DDERR_INVALIDPIXELFORMAT; } @@ -94,7 +94,7 @@ index 0d48c7d..2bef17d 100644 { WARN("Surface %p is not in video memory.\n", target_impl); IDirectDrawSurface_AddRef(target); -@@ -6891,7 +6891,7 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device +@@ -6963,7 +6963,7 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device return WINED3D_ZB_TRUE; } @@ -103,7 +103,7 @@ index 0d48c7d..2bef17d 100644 struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const D3DMATRIX ident = -@@ -6914,6 +6914,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +@@ -6986,6 +6986,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; @@ -111,7 +111,7 @@ index 0d48c7d..2bef17d 100644 if (outer_unknown) device->outer_unknown = outer_unknown; -@@ -6964,14 +6965,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +@@ -7036,14 +7037,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } @@ -133,7 +133,7 @@ index 0d48c7d..2bef17d 100644 if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) -@@ -6994,7 +6999,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn +@@ -7066,7 +7071,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } @@ -142,7 +142,7 @@ index 0d48c7d..2bef17d 100644 { WARN("Surface %p is not in video memory.\n", target); return D3DERR_SURFACENOTINVIDMEM; -@@ -7012,7 +7017,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn +@@ -7084,7 +7089,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } @@ -152,7 +152,7 @@ index 0d48c7d..2bef17d 100644 WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c -index 8190442..c73981b 100644 +index 4e2faef86..03b97f0d6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -226,7 +226,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, @@ -164,7 +164,7 @@ index 8190442..c73981b 100644 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; -@@ -6162,7 +6162,39 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ +@@ -6166,7 +6166,39 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) { @@ -206,5 +206,5 @@ index 8190442..c73981b 100644 } else -- -1.9.1 +2.20.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 940dbe82..388d1a6b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "17056908acae1d5c7cf5d255ec232210abfe86da" + echo "8ee1e3453e2e714241bcaac0cd75f4af3f828c8d" } # Show version information @@ -7684,7 +7684,7 @@ fi # | dlls/xapofx1_4/Makefile.in, dlls/xapofx1_5/Makefile.in, dlls/xaudio2_0/Makefile.in, dlls/xaudio2_1/Makefile.in, # | dlls/xaudio2_2/Makefile.in, dlls/xaudio2_3/Makefile.in, dlls/xaudio2_4/Makefile.in, dlls/xaudio2_5/Makefile.in, # | dlls/xaudio2_6/Makefile.in, dlls/xaudio2_7/Makefile.in, dlls/xaudio2_7/xaudio_dll.c, dlls/xaudio2_7/xaudio_private.h, -# | dlls/xaudio2_8/Makefile.in, dlls/xaudio2_9/Makefile.in, include/config.h.in, include/mmreg.h +# | dlls/xaudio2_8/Makefile.in, dlls/xaudio2_9/Makefile.in, include/config.h.in # | if test "$enable_xaudio2_7_WMA_support" -eq 1; then patch_apply xaudio2_7-WMA_support/0001-xaudio2-Use-ffmpeg-to-convert-WMA-formats.patch diff --git a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch index d652fe35..031713f2 100644 --- a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch @@ -1,13 +1,13 @@ -From e9e9334afc2b59ee6ae5cc0a93fb375effca227a Mon Sep 17 00:00:00 2001 +From e62cddcd96e6606e9df2b2bab91c2c0b46e1a72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:41:02 +0200 Subject: [PATCH] dxgkrnl.sys: Add stub driver. --- configure.ac | 1 + - dlls/dxgkrnl.sys/Makefile.in | 6 ++++++ - dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 ++++++++++++++++++++++++++ - dlls/dxgkrnl.sys/main.c | 39 +++++++++++++++++++++++++++++++++++++++ + dlls/dxgkrnl.sys/Makefile.in | 6 +++++ + dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 +++++++++++++++++++++ + dlls/dxgkrnl.sys/main.c | 39 +++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 ++ 5 files changed, 74 insertions(+) create mode 100644 dlls/dxgkrnl.sys/Makefile.in @@ -15,10 +15,10 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver. create mode 100644 dlls/dxgkrnl.sys/main.c diff --git a/configure.ac b/configure.ac -index 301e374..309c114 100644 +index 9d044c749..9f8fa30d3 100644 --- a/configure.ac +++ b/configure.ac -@@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8) +@@ -3263,6 +3263,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8) WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) @@ -28,7 +28,7 @@ index 301e374..309c114 100644 WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in new file mode 100644 -index 0000000..e18ea70 +index 000000000..e18ea70a9 --- /dev/null +++ b/dlls/dxgkrnl.sys/Makefile.in @@ -0,0 +1,6 @@ @@ -40,7 +40,7 @@ index 0000000..e18ea70 + main.c diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec new file mode 100644 -index 0000000..8487664 +index 000000000..8487664f8 --- /dev/null +++ b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec @@ -0,0 +1,26 @@ @@ -72,7 +72,7 @@ index 0000000..8487664 +@ stub g_loggerInfo diff --git a/dlls/dxgkrnl.sys/main.c b/dlls/dxgkrnl.sys/main.c new file mode 100644 -index 0000000..c5639c2 +index 000000000..c5639c237 --- /dev/null +++ b/dlls/dxgkrnl.sys/main.c @@ -0,0 +1,39 @@ @@ -116,25 +116,25 @@ index 0000000..c5639c2 + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index a76bb0a..f0ff79f 100644 +index 48a9f4b91..1e97e8afb 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2553,6 +2553,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- +12,,dxgkrnl.sys,- 12,,fltmgr.sys,- + 12,,ksecdd.sys,- 12,,mountmgr.sys,- - 12,,ndis.sys,- -@@ -2648,6 +2649,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2602,6 +2603,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +12,,dxgkrnl.sys 12,,fltmgr.sys + 12,,ksecdd.sys, 12,,mountmgr.sys - 12,,ndis.sys -- -1.9.1 +2.20.1 diff --git a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch index b796fdb7..7560e1f2 100644 --- a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch @@ -1,13 +1,13 @@ -From 7aae5361e86f2d4734d7242c6fdf790a01aaca1c Mon Sep 17 00:00:00 2001 +From 97a04cdd0ee352140773036c90ffbf4a9082258c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:42:32 +0200 Subject: [PATCH] dxgmms1.sys: Add stub driver. --- configure.ac | 1 + - dlls/dxgmms1.sys/Makefile.in | 6 ++++++ + dlls/dxgmms1.sys/Makefile.in | 6 +++++ dlls/dxgmms1.sys/dxgmms1.sys.spec | 2 ++ - dlls/dxgmms1.sys/main.c | 39 +++++++++++++++++++++++++++++++++++++++ + dlls/dxgmms1.sys/main.c | 39 +++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 ++ 5 files changed, 50 insertions(+) create mode 100644 dlls/dxgmms1.sys/Makefile.in @@ -15,10 +15,10 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver. create mode 100644 dlls/dxgmms1.sys/main.c diff --git a/configure.ac b/configure.ac -index 309c114..655d93a 100644 +index 9f8fa30d3..732a9f744 100644 --- a/configure.ac +++ b/configure.ac -@@ -3317,6 +3317,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) +@@ -3264,6 +3264,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys) @@ -28,7 +28,7 @@ index 309c114..655d93a 100644 WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in new file mode 100644 -index 0000000..affb9ce +index 000000000..affb9ce95 --- /dev/null +++ b/dlls/dxgmms1.sys/Makefile.in @@ -0,0 +1,6 @@ @@ -40,7 +40,7 @@ index 0000000..affb9ce + main.c diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec new file mode 100644 -index 0000000..124b0bf +index 000000000..124b0bf94 --- /dev/null +++ b/dlls/dxgmms1.sys/dxgmms1.sys.spec @@ -0,0 +1,2 @@ @@ -48,7 +48,7 @@ index 0000000..124b0bf +@ stub VidSchInterface diff --git a/dlls/dxgmms1.sys/main.c b/dlls/dxgmms1.sys/main.c new file mode 100644 -index 0000000..686493d +index 000000000..686493d32 --- /dev/null +++ b/dlls/dxgmms1.sys/main.c @@ -0,0 +1,39 @@ @@ -92,25 +92,25 @@ index 0000000..686493d + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index f0ff79f..bd83ba2 100644 +index 1e97e8afb..ee720aed8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2605,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,dxgkrnl.sys,- +12,,dxgmms1.sys,- 12,,fltmgr.sys,- + 12,,ksecdd.sys,- 12,,mountmgr.sys,- - 12,,ndis.sys,- -@@ -2650,6 +2651,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2604,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,dxgkrnl.sys +12,,dxgmms1.sys 12,,fltmgr.sys + 12,,ksecdd.sys, 12,,mountmgr.sys - 12,,ndis.sys -- -1.9.1 +2.20.1 diff --git a/patches/xaudio2_7-WMA_support/0001-xaudio2-Use-ffmpeg-to-convert-WMA-formats.patch b/patches/xaudio2_7-WMA_support/0001-xaudio2-Use-ffmpeg-to-convert-WMA-formats.patch index bf70fa38..ad81db57 100644 --- a/patches/xaudio2_7-WMA_support/0001-xaudio2-Use-ffmpeg-to-convert-WMA-formats.patch +++ b/patches/xaudio2_7-WMA_support/0001-xaudio2-Use-ffmpeg-to-convert-WMA-formats.patch @@ -1,10 +1,10 @@ -From 6ea5706c091caa459ccb11f59ddda4f0bb8089d9 Mon Sep 17 00:00:00 2001 +From 9c762c7f5b077072cf5388c836bdbab519ff8241 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Thu, 31 May 2018 10:58:48 -0500 Subject: [PATCH] xaudio2: Use ffmpeg to convert WMA formats --- - configure.ac | 33 ++++ + configure.ac | 33 +++ dlls/x3daudio1_0/Makefile.in | 2 + dlls/x3daudio1_1/Makefile.in | 2 + dlls/x3daudio1_2/Makefile.in | 2 + @@ -26,19 +26,18 @@ Subject: [PATCH] xaudio2: Use ffmpeg to convert WMA formats dlls/xaudio2_5/Makefile.in | 3 +- dlls/xaudio2_6/Makefile.in | 3 +- dlls/xaudio2_7/Makefile.in | 3 +- - dlls/xaudio2_7/xaudio_dll.c | 370 ++++++++++++++++++++++++++++++++++++++-- + dlls/xaudio2_7/xaudio_dll.c | 370 +++++++++++++++++++++++++++++++- dlls/xaudio2_7/xaudio_private.h | 9 + dlls/xaudio2_8/Makefile.in | 3 +- dlls/xaudio2_9/Makefile.in | 3 +- include/config.h.in | 9 + - include/mmreg.h | 1 + - 28 files changed, 458 insertions(+), 20 deletions(-) + 27 files changed, 457 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac -index 44e91bc..b2c6147 100644 +index ffb3ca523..0fc260487 100644 --- a/configure.ac +++ b/configure.ac -@@ -43,6 +43,7 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) +@@ -42,6 +42,7 @@ 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)])) @@ -46,7 +45,7 @@ index 44e91bc..b2c6147 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])) -@@ -1834,6 +1835,38 @@ WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_ +@@ -1799,6 +1800,38 @@ WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_ [enable_l3codeca_acm]) test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} @@ -86,7 +85,7 @@ index 44e91bc..b2c6147 100644 if test "$ac_cv_header_AL_al_h" = "yes" then diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in -index 9b4ce21..6c2b005 100644 +index 9b4ce2189..6c2b0058b 100644 --- a/dlls/x3daudio1_0/Makefile.in +++ b/dlls/x3daudio1_0/Makefile.in @@ -1,5 +1,7 @@ @@ -98,7 +97,7 @@ index 9b4ce21..6c2b005 100644 C_SRCS = \ diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in -index d866dc3..e268e3c 100644 +index d866dc3dd..e268e3c5e 100644 --- a/dlls/x3daudio1_1/Makefile.in +++ b/dlls/x3daudio1_1/Makefile.in @@ -1,5 +1,7 @@ @@ -110,7 +109,7 @@ index d866dc3..e268e3c 100644 C_SRCS = \ diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in -index d5de11b..7584123 100644 +index d5de11b25..758412305 100644 --- a/dlls/x3daudio1_2/Makefile.in +++ b/dlls/x3daudio1_2/Makefile.in @@ -1,5 +1,7 @@ @@ -122,7 +121,7 @@ index d5de11b..7584123 100644 C_SRCS = \ diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in -index cfd2c6c..084336d 100644 +index cfd2c6c6c..084336d46 100644 --- a/dlls/x3daudio1_3/Makefile.in +++ b/dlls/x3daudio1_3/Makefile.in @@ -1,5 +1,7 @@ @@ -134,7 +133,7 @@ index cfd2c6c..084336d 100644 C_SRCS = \ diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in -index bd0eac7..691a71a 100644 +index bd0eac7fc..691a71ad2 100644 --- a/dlls/x3daudio1_4/Makefile.in +++ b/dlls/x3daudio1_4/Makefile.in @@ -1,5 +1,7 @@ @@ -146,7 +145,7 @@ index bd0eac7..691a71a 100644 C_SRCS = \ diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in -index dac67ae..cee7b4b 100644 +index dac67aef7..cee7b4b28 100644 --- a/dlls/x3daudio1_5/Makefile.in +++ b/dlls/x3daudio1_5/Makefile.in @@ -1,5 +1,7 @@ @@ -158,7 +157,7 @@ index dac67ae..cee7b4b 100644 C_SRCS = \ diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in -index 177fb8d..23876bd 100644 +index 177fb8d34..23876bd8a 100644 --- a/dlls/x3daudio1_6/Makefile.in +++ b/dlls/x3daudio1_6/Makefile.in @@ -1,5 +1,7 @@ @@ -170,7 +169,7 @@ index 177fb8d..23876bd 100644 C_SRCS = \ diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in -index 019588d..448a548 100644 +index 019588dce..448a54867 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,5 +1,7 @@ @@ -182,7 +181,7 @@ index 019588d..448a548 100644 C_SRCS = \ diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in -index f69ff86..e43cfcf 100644 +index f69ff86bd..e43cfcf0a 100644 --- a/dlls/xapofx1_1/Makefile.in +++ b/dlls/xapofx1_1/Makefile.in @@ -1,6 +1,8 @@ @@ -195,7 +194,7 @@ index f69ff86..e43cfcf 100644 C_SRCS = \ diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in -index d56a2be..bf4df8b 100644 +index d56a2be4b..bf4df8b09 100644 --- a/dlls/xapofx1_2/Makefile.in +++ b/dlls/xapofx1_2/Makefile.in @@ -1,6 +1,8 @@ @@ -208,7 +207,7 @@ index d56a2be..bf4df8b 100644 C_SRCS = \ diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in -index 1139520..4a3056d 100644 +index 1139520b7..4a3056d8d 100644 --- a/dlls/xapofx1_3/Makefile.in +++ b/dlls/xapofx1_3/Makefile.in @@ -1,6 +1,8 @@ @@ -221,7 +220,7 @@ index 1139520..4a3056d 100644 C_SRCS = \ diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in -index b49e464..36672e7 100644 +index b49e4643a..36672e776 100644 --- a/dlls/xapofx1_4/Makefile.in +++ b/dlls/xapofx1_4/Makefile.in @@ -1,6 +1,8 @@ @@ -234,7 +233,7 @@ index b49e464..36672e7 100644 C_SRCS = \ diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in -index 5055a16..f9244f5 100644 +index 5055a16fd..f9244f593 100644 --- a/dlls/xapofx1_5/Makefile.in +++ b/dlls/xapofx1_5/Makefile.in @@ -1,6 +1,8 @@ @@ -247,7 +246,7 @@ index 5055a16..f9244f5 100644 C_SRCS = \ diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in -index cf15c7b..d8d282b 100644 +index cf15c7bf0..d8d282bcd 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,7 +1,8 @@ @@ -261,7 +260,7 @@ index cf15c7b..d8d282b 100644 C_SRCS = \ diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in -index 32a5a62..a0d7bfc 100644 +index 32a5a62a2..a0d7bfc7c 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -1,7 +1,8 @@ @@ -275,7 +274,7 @@ index 32a5a62..a0d7bfc 100644 C_SRCS = \ diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in -index f20de2d..4ba7e6c 100644 +index f20de2d5f..4ba7e6c34 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -1,7 +1,8 @@ @@ -289,7 +288,7 @@ index f20de2d..4ba7e6c 100644 C_SRCS = \ diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in -index ca749f2..62c644f 100644 +index ca749f247..62c644f6e 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -1,7 +1,8 @@ @@ -303,7 +302,7 @@ index ca749f2..62c644f 100644 C_SRCS = \ diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in -index 0b74f68..b77753f 100644 +index 0b74f68fd..b77753fb0 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -1,7 +1,8 @@ @@ -317,7 +316,7 @@ index 0b74f68..b77753f 100644 C_SRCS = \ diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in -index 09356c9..bd68734 100644 +index 09356c94a..bd6873489 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -1,7 +1,8 @@ @@ -331,7 +330,7 @@ index 09356c9..bd68734 100644 C_SRCS = \ diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in -index e0ef588..1729509 100644 +index e0ef58815..17295098f 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -1,7 +1,8 @@ @@ -345,7 +344,7 @@ index e0ef588..1729509 100644 C_SRCS = \ diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in -index 2f2e232..41d307d 100644 +index 2f2e23200..41d307dca 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -1,7 +1,8 @@ @@ -359,7 +358,7 @@ index 2f2e232..41d307d 100644 C_SRCS = \ compat.c \ diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c -index 0bbe943..2e65f47 100644 +index 0bbe943f1..2e65f47ea 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -82,6 +82,11 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, @@ -810,7 +809,7 @@ index 0bbe943..2e65f47 100644 XA2Buffer *buf = &src->buffers[(src->first_buf + i) % XAUDIO2_MAX_QUEUED_BUFFERS]; total += buf->cur_end_bytes - buf->offs_bytes; diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h -index 5d3814fb..9cf7f00 100644 +index 5d3814fb9..9cf7f003c 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -29,6 +29,10 @@ @@ -837,7 +836,7 @@ index 5d3814fb..9cf7f00 100644 } XA2SourceImpl; diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in -index d4efc41..8ad071f 100644 +index d4efc41d5..8ad071f48 100644 --- a/dlls/xaudio2_8/Makefile.in +++ b/dlls/xaudio2_8/Makefile.in @@ -1,7 +1,8 @@ @@ -851,7 +850,7 @@ index d4efc41..8ad071f 100644 C_SRCS = \ diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in -index ceb2216..0243ed6 100644 +index ceb2216f5..0243ed674 100644 --- a/dlls/xaudio2_9/Makefile.in +++ b/dlls/xaudio2_9/Makefile.in @@ -1,7 +1,8 @@ @@ -865,10 +864,10 @@ index ceb2216..0243ed6 100644 C_SRCS = \ diff --git a/include/config.h.in b/include/config.h.in -index 545e0d6..e1ffa19 100644 +index a4cc23111..5c26873f2 100644 --- a/include/config.h.in +++ b/include/config.h.in -@@ -396,6 +396,15 @@ +@@ -381,6 +381,15 @@ /* Define to 1 if you have the `lgammaf' function. */ #undef HAVE_LGAMMAF @@ -884,18 +883,6 @@ index 545e0d6..e1ffa19 100644 /* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ #undef HAVE_LIBGETTEXTPO -diff --git a/include/mmreg.h b/include/mmreg.h -index e7d70bb..3e22079 100644 ---- a/include/mmreg.h -+++ b/include/mmreg.h -@@ -117,6 +117,7 @@ typedef struct _WAVEFORMATEX { - #define WAVE_FORMAT_MPEGLAYER3 0x0055 - #define WAVE_FORMAT_MSRT24 0x0082 /* Microsoft Corporation */ - #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 -+#define WAVE_FORMAT_MSAUDIO1 0x0160 - #define WAVE_FORMAT_WMAUDIO2 0x0161 - #define WAVE_FORMAT_WMAUDIO3 0x0162 - #define WAVE_FORMAT_WMAUDIO_LOSSLESS 0x0163 -- -1.9.1 +2.20.1