mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against 8bd5fe30014c2aa60f0c4570db4ef936e8c51245.
This commit is contained in:
Alistair Leslie-Hughes
parent
cbdc68f558
commit
215d78f8e1
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "10b17932fa829fac10a5e6717d96ed5d56de80fe"
|
||||
echo "8bd5fe30014c2aa60f0c4570db4ef936e8c51245"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -6329,40 +6329,31 @@ fi
|
||||
# | dlls/xactengine3_5/xactengine3_5.spec, dlls/xactengine3_6/Makefile.in, dlls/xactengine3_6/xactengine3_6.spec,
|
||||
# | dlls/xactengine3_7/Makefile.in, dlls/xactengine3_7/xactengine3_7.spec, dlls/xaudio2_7/Makefile.in,
|
||||
# | dlls/xaudio2_7/tests/Makefile.in, dlls/xaudio2_7/tests/globals.xgs, dlls/xaudio2_7/tests/rsrc.rc,
|
||||
# | dlls/xaudio2_7/tests/xact.c, dlls/xaudio2_7/tests/xaudio2.c, dlls/xaudio2_7/xact_classes.idl, dlls/xaudio2_7/xact_dll.c,
|
||||
# | include/Makefile.in, include/xact3.idl
|
||||
# | dlls/xaudio2_7/tests/xact.c, dlls/xaudio2_7/tests/xaudio2.c, dlls/xaudio2_7/xact_classes.idl, dlls/xaudio2_7/xact_dll.c
|
||||
# |
|
||||
if test "$enable_xactengine_initial" -eq 1; then
|
||||
patch_apply xactengine-initial/0001-include-Add-xact3.idl.patch
|
||||
patch_apply xactengine-initial/0002-xaudio2-Add-support-for-xactengine3.patch
|
||||
patch_apply xactengine-initial/0003-xaudio2_7-Support-older-XACT3Engine-interfaces.patch
|
||||
patch_apply xactengine-initial/0004-xaudio2_7-IXACT3Engine-Initialize-return-valid-error.patch
|
||||
patch_apply xactengine-initial/0005-xaudio2_7-IXACT3Engine-CreateSoundBank-return-correc.patch
|
||||
patch_apply xactengine-initial/0006-xaudio2_7-Always-return-S_OK-in-IXACT34Cue-Destroy.patch
|
||||
patch_apply xactengine-initial/0007-xaudio2_7-Dont-cast-interface-pointers.patch
|
||||
patch_apply xactengine-initial/0008-include-Add-XACTNOTIFICATIONTYPE_-values.patch
|
||||
patch_apply xactengine-initial/0009-xaudio2_7-unwrap-structure-based-of-it-s-type.patch
|
||||
patch_apply xactengine-initial/0010-xaudio2_7-Correct-callback-to-windows-function.patch
|
||||
patch_apply xactengine-initial/0011-xaudio2_7-Initial-IXACT3Engine-tests.patch
|
||||
patch_apply xactengine-initial/0013-xaudio2_7-Trace-FAudio-version-being-used.patch
|
||||
patch_apply xactengine-initial/0014-include-Add-XACTENGINE_-error-codes.patch
|
||||
patch_apply xactengine-initial/0015-include-Add-XACT-defines.patch
|
||||
patch_apply xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Ethan Lee", "include: Add xact3.idl.", 1 },';
|
||||
printf '%s\n' '+ { "Ethan Lee", "xaudio2: Add support for xactengine3.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Support older XACT3Engine interfaces.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: IXACT3Engine Initialize return valid error code.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: IXACT3Engine CreateSoundBank return correct HRESULT values.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Always return S_OK in IXACT34Cue Destroy.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Dont cast interface pointers.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Add XACTNOTIFICATIONTYPE_* values.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Unwrap structure based of it'\''s type.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Correct callback to windows function.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Initial IXACT3Engine tests.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Trace FAudio version being used.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Add XACTENGINE_* error codes.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "include: Add XACT defines.", 1 },';
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7/tests: Add more tests.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,45 +0,0 @@
|
||||
From 5975c1051ef759adc1f8303fde7e3b60b0535ff7 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Thu, 9 Jan 2020 08:30:23 +1100
|
||||
Subject: [PATCH] include: Add XACTNOTIFICATIONTYPE_* values
|
||||
|
||||
---
|
||||
include/xact3.idl | 22 ++++++++++++++++++----
|
||||
1 file changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/xact3.idl b/include/xact3.idl
|
||||
index c49718ff39..e05f476cb9 100644
|
||||
--- a/include/xact3.idl
|
||||
+++ b/include/xact3.idl
|
||||
@@ -266,10 +266,24 @@ typedef struct XACT_RUNTIME_PARAMETERS
|
||||
|
||||
cpp_quote("#include <poppack.h>")
|
||||
|
||||
-static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4;
|
||||
-static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6;
|
||||
-static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7;
|
||||
-static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16;
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEPREPARED = 1;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEPLAY = 2;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUESTOP = 3;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MARKER = 5;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED = 8;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GLOBALVARIABLECHANGED = 9;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GUICONNECTED = 10;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_GUIDISCONNECTED = 11;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEPREPARED = 12;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEPLAY = 13;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVESTOP = 14;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVELOOPED = 15;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;")
|
||||
|
||||
[
|
||||
object,
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
From 554e9f407e5e722c88b703be987c3ac30dc6a41c Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Thu, 16 Jan 2020 13:46:14 +1100
|
||||
Subject: [PATCH] include: Add XACTENGINE_* error codes
|
||||
|
||||
---
|
||||
include/xact3.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 46 insertions(+)
|
||||
|
||||
diff --git a/include/xact3.idl b/include/xact3.idl
|
||||
index e05f476cb9..87fd2e86f5 100644
|
||||
--- a/include/xact3.idl
|
||||
+++ b/include/xact3.idl
|
||||
@@ -545,3 +545,49 @@ interface IXACT3Wave
|
||||
|
||||
HRESULT GetProperties(XACT_WAVE_INSTANCE_PROPERTIES *pProperties);
|
||||
}
|
||||
+
|
||||
+cpp_quote("#define FACILITY_XACTENGINE 0xAC7")
|
||||
+cpp_quote("#define XACTENGINEERROR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_XACTENGINE, n)")
|
||||
+
|
||||
+cpp_quote("#define XACTENGINE_E_OUTOFMEMORY E_OUTOFMEMORY")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDARG E_INVALIDARG")
|
||||
+cpp_quote("#define XACTENGINE_E_NOTIMPL E_NOTIMPL")
|
||||
+cpp_quote("#define XACTENGINE_E_FAIL E_FAIL")
|
||||
+
|
||||
+cpp_quote("#define XACTENGINE_E_ALREADYINITIALIZED XACTENGINEERROR(0x001)")
|
||||
+cpp_quote("#define XACTENGINE_E_NOTINITIALIZED XACTENGINEERROR(0x002)")
|
||||
+cpp_quote("#define XACTENGINE_E_EXPIRED XACTENGINEERROR(0x003)")
|
||||
+cpp_quote("#define XACTENGINE_E_NONOTIFICATIONCALLBACK XACTENGINEERROR(0x004)")
|
||||
+cpp_quote("#define XACTENGINE_E_NOTIFICATIONREGISTERED XACTENGINEERROR(0x005)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDUSAGE XACTENGINEERROR(0x006)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDDATA XACTENGINEERROR(0x007)")
|
||||
+cpp_quote("#define XACTENGINE_E_INSTANCELIMITFAILTOPLAY XACTENGINEERROR(0x008)")
|
||||
+cpp_quote("#define XACTENGINE_E_NOGLOBALSETTINGS XACTENGINEERROR(0x009)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDVARIABLEINDEX XACTENGINEERROR(0x00a)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDCATEGORY XACTENGINEERROR(0x00b)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDCUEINDEX XACTENGINEERROR(0x00c)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDWAVEINDEX XACTENGINEERROR(0x00d)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDTRACKINDEX XACTENGINEERROR(0x00e)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDSOUNDOFFSETORINDEX XACTENGINEERROR(0x00f)")
|
||||
+cpp_quote("#define XACTENGINE_E_READFILE XACTENGINEERROR(0x010)")
|
||||
+cpp_quote("#define XACTENGINE_E_UNKNOWNEVENT XACTENGINEERROR(0x011)")
|
||||
+cpp_quote("#define XACTENGINE_E_INCALLBACK XACTENGINEERROR(0x012)")
|
||||
+cpp_quote("#define XACTENGINE_E_NOWAVEBANK XACTENGINEERROR(0x013)")
|
||||
+cpp_quote("#define XACTENGINE_E_SELECTVARIATION XACTENGINEERROR(0x014)")
|
||||
+cpp_quote("#define XACTENGINE_E_MULTIPLEAUDITIONENGINES XACTENGINEERROR(0x015)")
|
||||
+cpp_quote("#define XACTENGINE_E_WAVEBANKNOTPREPARED XACTENGINEERROR(0x016)")
|
||||
+cpp_quote("#define XACTENGINE_E_NORENDERER XACTENGINEERROR(0x017)")
|
||||
+cpp_quote("#define XACTENGINE_E_INVALIDENTRYCOUNT XACTENGINEERROR(0x018)")
|
||||
+cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDCUEEND XACTENGINEERROR(0x019)")
|
||||
+cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDWAVEEND XACTENGINEERROR(0x01a)")
|
||||
+cpp_quote("#define XACTENGINE_E_NOFRIENDLYNAMES XACTENGINEERROR(0x01b)")
|
||||
+
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_WRITEFILE XACTENGINEERROR(0x101)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_NOSOUNDBANK XACTENGINEERROR(0x102)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDRPCINDEX XACTENGINEERROR(0x103)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGDATA XACTENGINEERROR(0x104)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_UNKNOWNCOMMAND XACTENGINEERROR(0x105)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDDSPINDEX XACTENGINEERROR(0x106)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGWAVE XACTENGINEERROR(0x107)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_CREATEDIRECTORYFAILED XACTENGINEERROR(0x108)")
|
||||
+cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDSESSION XACTENGINEERROR(0x109)")
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
From ccb258005d6e7c6be189ef19c7919caea0502336 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Sat, 18 Jan 2020 18:45:24 +1100
|
||||
Subject: [PATCH] include: Add XACT defines
|
||||
|
||||
---
|
||||
include/xact3.idl | 37 +++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 37 insertions(+)
|
||||
|
||||
diff --git a/include/xact3.idl b/include/xact3.idl
|
||||
index 87fd2e86f5..c193ecf831 100644
|
||||
--- a/include/xact3.idl
|
||||
+++ b/include/xact3.idl
|
||||
@@ -21,6 +21,9 @@ import "xaudio2.idl";
|
||||
|
||||
import "xact3wb.h";
|
||||
|
||||
+cpp_quote("#include <limits.h>")
|
||||
+cpp_quote("#include <float.h>")
|
||||
+
|
||||
[
|
||||
uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e)
|
||||
]
|
||||
@@ -285,6 +288,40 @@ cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED
|
||||
cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;")
|
||||
cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;")
|
||||
|
||||
+cpp_quote("static const XACTTIME XACTTIME_MIN = INT_MIN;")
|
||||
+cpp_quote("static const XACTTIME XACTTIME_MAX = INT_MAX;")
|
||||
+cpp_quote("static const XACTTIME XACTTIME_INFINITE = INT_MAX;")
|
||||
+cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_INFINITE = 0xff;")
|
||||
+cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MIN = 0x00;")
|
||||
+cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MAX = 0xfe;")
|
||||
+cpp_quote("static const XACTINDEX XACTINDEX_MIN = 0x00;")
|
||||
+cpp_quote("static const XACTINDEX XACTINDEX_MAX = 0xfffe;")
|
||||
+cpp_quote("static const XACTINDEX XACTINDEX_INVALID = 0xffff;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MIN = 0x00;")
|
||||
+cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MAX = 0xff;")
|
||||
+cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MIN = -FLT_MAX;")
|
||||
+cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MAX = FLT_MAX;")
|
||||
+cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MIN = 0x0000;")
|
||||
+cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MAX = 0xfffe;")
|
||||
+cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_INVALID = 0xffff;")
|
||||
+cpp_quote("static const XACTCATEGORY XACTCATEGORY_MIN = 0x0;")
|
||||
+cpp_quote("static const XACTCATEGORY XACTCATEGORY_MAX = 0xfffe;")
|
||||
+cpp_quote("static const XACTCATEGORY XACTCATEGORY_INVALID = 0xffff;")
|
||||
+cpp_quote("static const XACTCHANNEL XACTCHANNEL_MIN = 0;")
|
||||
+cpp_quote("static const XACTCHANNEL XACTCHANNEL_MAX = 0xff;")
|
||||
+cpp_quote("static const XACTPITCH XACTPITCH_MIN = -1200;")
|
||||
+cpp_quote("static const XACTPITCH XACTPITCH_MAX = 1200;")
|
||||
+cpp_quote("static const XACTPITCH XACTPITCH_MIN_TOTAL = -2400;")
|
||||
+cpp_quote("static const XACTPITCH XACTPITCH_MAX_TOTAL = 2400;")
|
||||
+cpp_quote("static const XACTVOLUME XACTVOLUME_MIN = 0.0f;")
|
||||
+cpp_quote("static const XACTVOLUME XACTVOLUME_MAX = 16777216.0f;")
|
||||
+cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MIN = -FLT_MAX;")
|
||||
+cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MAX = FLT_MAX;")
|
||||
+cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MIN = 0x00;")
|
||||
+cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MAX = 0xfe;")
|
||||
+cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_INFINITE = 0xff;")
|
||||
+cpp_quote("static const DWORD XACTWAVEALIGNMENT_MIN = 2048;")
|
||||
+
|
||||
[
|
||||
object,
|
||||
local,
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -1 +1 @@
|
||||
10b17932fa829fac10a5e6717d96ed5d56de80fe
|
||||
8bd5fe30014c2aa60f0c4570db4ef936e8c51245
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user