mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 070cfc358c8ed67ba08a49ae78c20205ab4e2d00
This commit is contained in:
Alistair Leslie-Hughes
parent
fb40c21c72
commit
01a3c15320
@ -1,15 +1,15 @@
|
||||
From 24eef5afe7137b3d6f8463513066d1866d1832cf Mon Sep 17 00:00:00 2001
|
||||
From 3bca4e54eaf2496dadfa3ebced16c76d563a1926 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 10:20:50 +1000
|
||||
Subject: [PATCH 20/27] dsdmo: Implement IDirectSoundFXEcho SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXEcho SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/echo.c | 20 ++++++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 31 +++++++++++++++++++++++++++++++
|
||||
2 files changed, 49 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 32 ++++++++++++++++++++++++++++++++
|
||||
2 files changed, 50 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/echo.c b/dlls/dsdmo/echo.c
|
||||
index e9add8a019..f0084dca24 100644
|
||||
index e9add8a019e..f0084dca24d 100644
|
||||
--- a/dlls/dsdmo/echo.c
|
||||
+++ b/dlls/dsdmo/echo.c
|
||||
@@ -352,9 +352,25 @@ static ULONG WINAPI echofx_Release(IDirectSoundFXEcho *iface)
|
||||
@ -41,12 +41,12 @@ index e9add8a019..f0084dca24 100644
|
||||
|
||||
static HRESULT WINAPI echofx_GetAllParameters(IDirectSoundFXEcho *iface, DSFXEcho *echo)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index f03b5ccedb..fd5c5a5835 100644
|
||||
index 073e3addb1f..b502f7598f7 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1397,6 +1397,37 @@ static void test_echo_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay);
|
||||
}
|
||||
@@ -1480,6 +1480,38 @@ static void test_echo_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXEcho", (IUnknown *)echo, &IID_IDirectSoundFXEcho);
|
||||
|
||||
+ rc = IDirectSoundFXEcho_SetAllParameters(echo, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -78,10 +78,11 @@ index f03b5ccedb..fd5c5a5835 100644
|
||||
+ ok(params.fRightDelay == 500.0f,"got %f\n", params.fRightDelay);
|
||||
+ ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXEcho_Release(echo);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
From b2270412e6ba81f561b70ca455444158a32303a6 Mon Sep 17 00:00:00 2001
|
||||
From dee460be6585aaf94221575e676745f4d7806aaf Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 11:06:11 +1000
|
||||
Subject: [PATCH 21/27] dsdmo: Implement IDirectSoundFXGargle SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXGargle SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/gargle.c | 17 +++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 27 +++++++++++++++++++++++++++
|
||||
2 files changed, 42 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 28 ++++++++++++++++++++++++++++
|
||||
2 files changed, 43 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/gargle.c b/dlls/dsdmo/gargle.c
|
||||
index 458ca8a323..03358ec535 100644
|
||||
index 458ca8a3234..03358ec5352 100644
|
||||
--- a/dlls/dsdmo/gargle.c
|
||||
+++ b/dlls/dsdmo/gargle.c
|
||||
@@ -352,9 +352,22 @@ static ULONG WINAPI garglefx_Release(IDirectSoundFXGargle *iface)
|
||||
@ -38,12 +38,12 @@ index 458ca8a323..03358ec535 100644
|
||||
|
||||
static HRESULT WINAPI garglefx_GetAllParameters(IDirectSoundFXGargle *iface, DSFXGargle *gargle)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index fd5c5a5835..c634854532 100644
|
||||
index b502f7598f7..cf77d2375e5 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1451,6 +1451,33 @@ static void test_gargle_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "got %d\n", params.dwWaveShape);
|
||||
}
|
||||
@@ -1537,6 +1537,34 @@ static void test_gargle_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXGargle", (IUnknown *)gargle, &IID_IDirectSoundFXGargle);
|
||||
|
||||
+ rc = IDirectSoundFXGargle_SetAllParameters(gargle, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -71,10 +71,11 @@ index fd5c5a5835..c634854532 100644
|
||||
+ ok(params.dwRateHz == 800, "got %d\n", params.dwRateHz);
|
||||
+ ok(params.dwWaveShape == DSFXGARGLE_WAVE_SQUARE, "got %d\n", params.dwWaveShape);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXGargle_Release(gargle);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
From 84ff817f06cbd61346273de9a214b6a513e59ca0 Mon Sep 17 00:00:00 2001
|
||||
From 7a940d2c6837c40e130d00536ce3068a4a07a297 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 11:48:31 +1000
|
||||
Subject: [PATCH 22/27] dsdmo: Implement IDirectSoundFXChorus SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXChorus SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/chorus.c | 22 ++++++++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 31 +++++++++++++++++++++++++++++++
|
||||
2 files changed, 51 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 32 ++++++++++++++++++++++++++++++++
|
||||
2 files changed, 52 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/chorus.c b/dlls/dsdmo/chorus.c
|
||||
index 03195d247d..979074f2f5 100644
|
||||
index 03195d247db..979074f2f5a 100644
|
||||
--- a/dlls/dsdmo/chorus.c
|
||||
+++ b/dlls/dsdmo/chorus.c
|
||||
@@ -352,9 +352,27 @@ static ULONG WINAPI chrousfx_Release(IDirectSoundFXChorus *iface)
|
||||
@ -43,12 +43,12 @@ index 03195d247d..979074f2f5 100644
|
||||
|
||||
static HRESULT WINAPI chrousfx_GetAllParameters(IDirectSoundFXChorus *iface, DSFXChorus *chorus)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index c634854532..d68e4a50f8 100644
|
||||
index cf77d2375e5..ecd755e0330 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1506,6 +1506,37 @@ static void test_chorus_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.lPhase == 3, "got %d\n", params.lPhase);
|
||||
}
|
||||
@@ -1595,6 +1595,38 @@ static void test_chorus_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXChorus", (IUnknown *)chorus, &IID_IDirectSoundFXChorus);
|
||||
|
||||
+ rc = IDirectSoundFXChorus_SetAllParameters(chorus, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -80,10 +80,11 @@ index c634854532..d68e4a50f8 100644
|
||||
+ ok(params.fDelay == 16.0f, "got %f\n", params.fDelay);
|
||||
+ ok(params.lPhase == 3, "got %d\n", params.lPhase);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXChorus_Release(chorus);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
From 865d05785612e7a098793613cdda907337ea01ad Mon Sep 17 00:00:00 2001
|
||||
From 00e59f2589dc4a44b990c6455b0bdc6e38b97db1 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 13:44:41 +1000
|
||||
Subject: [PATCH 23/27] dsdmo: Implement IDirectSoundFXFlanger
|
||||
SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXFlanger SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/flanger.c | 21 +++++++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 31 +++++++++++++++++++++++++++++++
|
||||
2 files changed, 50 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 32 ++++++++++++++++++++++++++++++++
|
||||
2 files changed, 51 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/flanger.c b/dlls/dsdmo/flanger.c
|
||||
index a647c862fa..e1012b8d1c 100644
|
||||
index a647c862fa9..e1012b8d1ce 100644
|
||||
--- a/dlls/dsdmo/flanger.c
|
||||
+++ b/dlls/dsdmo/flanger.c
|
||||
@@ -352,9 +352,26 @@ static ULONG WINAPI flangerfx_Release(IDirectSoundFXFlanger *iface)
|
||||
@ -43,12 +42,12 @@ index a647c862fa..e1012b8d1c 100644
|
||||
|
||||
static HRESULT WINAPI flangerfx_GetAllParameters(IDirectSoundFXFlanger *iface, DSFXFlanger *flanger)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index d68e4a50f8..bdcf609c8f 100644
|
||||
index ecd755e0330..4e4aa8a795a 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1565,6 +1565,37 @@ static void test_flanger_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.lPhase == 2, "got %d\n", params.lPhase);
|
||||
}
|
||||
@@ -1657,6 +1657,38 @@ static void test_flanger_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXFlanger", (IUnknown *)flanger, &IID_IDirectSoundFXFlanger);
|
||||
|
||||
+ rc = IDirectSoundFXFlanger_SetAllParameters(flanger, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -80,10 +79,11 @@ index d68e4a50f8..bdcf609c8f 100644
|
||||
+ ok(params.fDelay == 2.0f, "got %f\n", params.fDelay);
|
||||
+ ok(params.lPhase == 2, "got %d\n", params.lPhase);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXFlanger_Release(flanger);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
From 538eda25bbc197fbdf0f0da58ca64b5b56b91a8a Mon Sep 17 00:00:00 2001
|
||||
From df349f6697236a1405f7c6df3be9af9c56b88dd3 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 13:57:45 +1000
|
||||
Subject: [PATCH 24/27] dsdmo: Implement IDirectSoundFXDistortion
|
||||
SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXDistortion SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/distortion.c | 19 +++++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 29 +++++++++++++++++++++++++++++
|
||||
2 files changed, 46 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 30 ++++++++++++++++++++++++++++++
|
||||
2 files changed, 47 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/distortion.c b/dlls/dsdmo/distortion.c
|
||||
index e6952c3fe1..d5014adce0 100644
|
||||
index e6952c3fe1c..d5014adce00 100644
|
||||
--- a/dlls/dsdmo/distortion.c
|
||||
+++ b/dlls/dsdmo/distortion.c
|
||||
@@ -352,9 +352,24 @@ static ULONG WINAPI distortionfx_Release(IDirectSoundFXDistortion *iface)
|
||||
@ -41,12 +40,12 @@ index e6952c3fe1..d5014adce0 100644
|
||||
|
||||
static HRESULT WINAPI distortionfx_GetAllParameters(IDirectSoundFXDistortion *iface, DSFXDistortion *distortion)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index bdcf609c8f..2d1e35699a 100644
|
||||
index 4e4aa8a795a..3a89a2308f6 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1622,6 +1622,35 @@ static void test_distortion_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff);
|
||||
}
|
||||
@@ -1717,6 +1717,36 @@ static void test_distortion_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXDistortion", (IUnknown *)distortion, &IID_IDirectSoundFXDistortion);
|
||||
|
||||
+ rc = IDirectSoundFXDistortion_SetAllParameters(distortion, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -76,10 +75,11 @@ index bdcf609c8f..2d1e35699a 100644
|
||||
+ ok(params.fPostEQBandwidth == 2400.0f, "got %f\n", params.fPostEQBandwidth);
|
||||
+ ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXDistortion_Release(distortion);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
From 8e3ea54a9fa46fb1de19990dcf1dc4f458d5622a Mon Sep 17 00:00:00 2001
|
||||
From 5479103312056237494503e0d45fd90a7ae023e4 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 14:13:30 +1000
|
||||
Subject: [PATCH 25/27] dsdmo: Implement IDirectSoundFXCompressor
|
||||
SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXCompressor SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/compressor.c | 19 +++++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 29 +++++++++++++++++++++++++++++
|
||||
2 files changed, 46 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 30 ++++++++++++++++++++++++++++++
|
||||
2 files changed, 47 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/compressor.c b/dlls/dsdmo/compressor.c
|
||||
index 36f8c198d0..71005b1fa3 100644
|
||||
index 36f8c198d03..71005b1fa37 100644
|
||||
--- a/dlls/dsdmo/compressor.c
|
||||
+++ b/dlls/dsdmo/compressor.c
|
||||
@@ -352,9 +352,24 @@ static ULONG WINAPI compressorfx_Release(IDirectSoundFXCompressor *iface)
|
||||
@ -41,12 +40,12 @@ index 36f8c198d0..71005b1fa3 100644
|
||||
|
||||
static HRESULT WINAPI compressorfx_GetAllParameters(IDirectSoundFXCompressor *iface, DSFXCompressor *compressor)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index 2d1e35699a..779ad1b111 100644
|
||||
index 3a89a2308f6..aea2d3ba2a9 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1677,6 +1677,35 @@ static void test_compressor_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay);
|
||||
}
|
||||
@@ -1775,6 +1775,36 @@ static void test_compressor_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXCompressor", (IUnknown *)compressor, &IID_IDirectSoundFXCompressor);
|
||||
|
||||
+ rc = IDirectSoundFXCompressor_SetAllParameters(compressor, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -76,10 +75,11 @@ index 2d1e35699a..779ad1b111 100644
|
||||
+ ok(params.fRatio == 3.0f, "got %f\n", params.fRatio);
|
||||
+ ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXCompressor_Release(compressor);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
From 2ad74643881e4ff5abf75fc140df45ea8cc0d6c8 Mon Sep 17 00:00:00 2001
|
||||
From d8ede09bcd5f5e29e1ea1d6543e4cf1de9806835 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 14:32:24 +1000
|
||||
Subject: [PATCH 26/27] dsdmo: Implement IDirectSoundFXParamEq
|
||||
SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXParamEq SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/parameq.c | 17 +++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 26 ++++++++++++++++++++++++++
|
||||
2 files changed, 41 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 27 +++++++++++++++++++++++++++
|
||||
2 files changed, 42 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/parameq.c b/dlls/dsdmo/parameq.c
|
||||
index 5b6a066fd3..b8e2addf9f 100644
|
||||
index 5b6a066fd3c..b8e2addf9f4 100644
|
||||
--- a/dlls/dsdmo/parameq.c
|
||||
+++ b/dlls/dsdmo/parameq.c
|
||||
@@ -352,9 +352,22 @@ static ULONG WINAPI parameqfx_Release(IDirectSoundFXParamEq *iface)
|
||||
@ -39,12 +38,12 @@ index 5b6a066fd3..b8e2addf9f 100644
|
||||
|
||||
static HRESULT WINAPI parameqfx_GetAllParameters(IDirectSoundFXParamEq *iface, DSFXParamEq *param)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index 779ad1b111..df1b748db0 100644
|
||||
index aea2d3ba2a9..68a48dc285d 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1730,6 +1730,32 @@ static void test_parameq_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.fGain == 0.0f, "got %f\n", params.fGain);
|
||||
}
|
||||
@@ -1831,6 +1831,33 @@ static void test_parameq_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXParamEq", (IUnknown *)parameq, &IID_IDirectSoundFXParamEq);
|
||||
|
||||
+ rc = IDirectSoundFXParamEq_SetAllParameters(parameq, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -71,10 +70,11 @@ index 779ad1b111..df1b748db0 100644
|
||||
+ ok(params.fBandwidth == 12.0f, "got %f\n", params.fBandwidth);
|
||||
+ ok(params.fGain == -10.0f, "got %f\n", params.fGain);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXParamEq_Release(parameq);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
From bc7cbc008eb335bdc1c3d3045a3ada1889f1cd71 Mon Sep 17 00:00:00 2001
|
||||
From bae98635c83c1aa1f3457096267698985e9931a8 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Mon, 9 Sep 2019 14:53:58 +1000
|
||||
Subject: [PATCH 27/27] dsdmo: Implement IDirectSoundFXI3DL2Reverb
|
||||
SetAllParameters.
|
||||
Subject: [PATCH] dsdmo: Implement IDirectSoundFXI3DL2Reverb SetAllParameters.
|
||||
|
||||
---
|
||||
dlls/dsdmo/reverb2.c | 24 ++++++++++++++++++++++--
|
||||
dlls/dsound/tests/dsound8.c | 33 +++++++++++++++++++++++++++++++++
|
||||
2 files changed, 55 insertions(+), 2 deletions(-)
|
||||
dlls/dsound/tests/dsound8.c | 34 ++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 56 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/dsdmo/reverb2.c b/dlls/dsdmo/reverb2.c
|
||||
index 44a6b5f1b4..52d83882ee 100644
|
||||
index 44a6b5f1b40..52d83882ee3 100644
|
||||
--- a/dlls/dsdmo/reverb2.c
|
||||
+++ b/dlls/dsdmo/reverb2.c
|
||||
@@ -352,9 +352,29 @@ static ULONG WINAPI reverb2_Release(IDirectSoundFXI3DL2Reverb *iface)
|
||||
@ -46,12 +45,12 @@ index 44a6b5f1b4..52d83882ee 100644
|
||||
|
||||
static HRESULT WINAPI reverb2_GetAllParameters(IDirectSoundFXI3DL2Reverb *iface, DSFXI3DL2Reverb *reverb)
|
||||
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
|
||||
index df1b748db0..88ed4d9d4c 100644
|
||||
index 68a48dc285d..6bb2766acf5 100644
|
||||
--- a/dlls/dsound/tests/dsound8.c
|
||||
+++ b/dlls/dsound/tests/dsound8.c
|
||||
@@ -1787,6 +1787,39 @@ static void test_reverb_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference);
|
||||
}
|
||||
@@ -1891,6 +1891,40 @@ static void test_reverb_parameters(IDirectSoundBuffer8 *secondary8)
|
||||
|
||||
test_dsfx_interfaces("FXI3DL2Reverb", (IUnknown *)reverb, &IID_IDirectSoundFXI3DL2Reverb);
|
||||
|
||||
+ rc = IDirectSoundFXI3DL2Reverb_SetAllParameters(reverb, NULL);
|
||||
+ ok(rc == E_POINTER, "got: %08x\n", rc);
|
||||
@ -85,10 +84,11 @@ index df1b748db0..88ed4d9d4c 100644
|
||||
+ ok(params.flDensity == 100.0f, "got %f\n", params.flDensity);
|
||||
+ ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
IDirectSoundFXI3DL2Reverb_Release(reverb);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6c2c2f49eddd7133f6854845f54349ea2511250b Mon Sep 17 00:00:00 2001
|
||||
From d7997c1fffbf407f08fc18464c2fe3f17a3038a4 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 22 Jul 2017 07:21:45 +0200
|
||||
Subject: [PATCH] ntdll: Improve heap allocation performance. (v2)
|
||||
@ -9,12 +9,12 @@ Subject: [PATCH] ntdll: Improve heap allocation performance. (v2)
|
||||
2 files changed, 234 insertions(+), 96 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ad4f0e05a..f8a1c8de4 100644
|
||||
index 0ce3cb5c573..2fa1c7d4223 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2745,6 +2745,15 @@ then
|
||||
AC_DEFINE(HAVE___BUILTIN_CLZ, 1, [Define to 1 if you have the `__builtin_clz' built-in function.])
|
||||
fi
|
||||
@@ -2790,6 +2790,15 @@ AC_CHECK_FUNCS(\
|
||||
)
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
+dnl Check for __builtin_ctzl
|
||||
+AC_CACHE_CHECK([for __builtin_ctzl], ac_cv_have___builtin_ctzl,
|
||||
@ -29,7 +29,7 @@ index ad4f0e05a..f8a1c8de4 100644
|
||||
AC_CACHE_CHECK([for __builtin_popcount], ac_cv_have___builtin_popcount,
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_popcount(1)]])],
|
||||
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
|
||||
index 3eaeea2d1..4b694ed7e 100644
|
||||
index db5c039bb76..f51dc63f371 100644
|
||||
--- a/dlls/ntdll/heap.c
|
||||
+++ b/dlls/ntdll/heap.c
|
||||
@@ -3,6 +3,7 @@
|
||||
@ -325,7 +325,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
}
|
||||
|
||||
|
||||
@@ -881,6 +948,15 @@ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL qui
|
||||
@@ -880,6 +947,15 @@ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL qui
|
||||
}
|
||||
|
||||
|
||||
@ -341,7 +341,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
/***********************************************************************
|
||||
* HEAP_CreateSubHeap
|
||||
*/
|
||||
@@ -888,7 +964,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
@@ -887,7 +963,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
SIZE_T commitSize, SIZE_T totalSize )
|
||||
{
|
||||
SUBHEAP *subheap;
|
||||
@ -349,7 +349,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
unsigned int i;
|
||||
|
||||
if (!address)
|
||||
@@ -949,17 +1024,21 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
@@ -948,17 +1023,21 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
subheap->headerSize = ROUND_SIZE( sizeof(HEAP) );
|
||||
list_add_head( &heap->subheap_list, &subheap->entry );
|
||||
|
||||
@ -381,7 +381,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
|
||||
/* Initialize critical section */
|
||||
|
||||
@@ -1002,6 +1081,34 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
@@ -1001,6 +1080,34 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
}
|
||||
|
||||
|
||||
@ -416,7 +416,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
/***********************************************************************
|
||||
* HEAP_FindFreeBlock
|
||||
*
|
||||
@@ -1011,26 +1118,39 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
@@ -1010,26 +1117,39 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
|
||||
static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size,
|
||||
SUBHEAP **ppSubHeap )
|
||||
{
|
||||
@ -468,7 +468,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
}
|
||||
|
||||
/* If no block was found, attempt to grow the heap */
|
||||
@@ -1076,13 +1196,10 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size,
|
||||
@@ -1075,13 +1195,10 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size,
|
||||
*/
|
||||
static BOOL HEAP_IsValidArenaPtr( const HEAP *heap, const ARENA_FREE *ptr )
|
||||
{
|
||||
@ -482,7 +482,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -1094,7 +1211,7 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
|
||||
@@ -1093,7 +1210,7 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
|
||||
{
|
||||
DWORD flags = subheap->heap->flags;
|
||||
SIZE_T size;
|
||||
@ -491,7 +491,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
char *heapEnd = (char *)subheap->base + subheap->size;
|
||||
|
||||
/* Check for unaligned pointers */
|
||||
@@ -1111,7 +1228,8 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
|
||||
@@ -1110,7 +1227,8 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
|
||||
return FALSE;
|
||||
}
|
||||
/* Check size flags */
|
||||
@ -501,7 +501,7 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
(pArena->size & ARENA_FLAG_PREV_FREE))
|
||||
{
|
||||
ERR("Heap %p: bad flags %08x for free arena %p\n",
|
||||
@@ -1125,34 +1243,45 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
|
||||
@@ -1124,34 +1242,45 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena )
|
||||
ERR("Heap %p: bad size %08lx for free arena %p\n", subheap->heap, size, pArena );
|
||||
return FALSE;
|
||||
}
|
||||
@ -556,5 +556,5 @@ index 3eaeea2d1..4b694ed7e 100644
|
||||
subheap->heap, prev, pArena );
|
||||
return FALSE;
|
||||
--
|
||||
2.21.0
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
From 78ca8c020c1fefe80de805b096b02a4418f062a8 Mon Sep 17 00:00:00 2001
|
||||
From d56a94164cbe82bd3760a921e6eff029b62af63e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 20 Jan 2017 01:42:07 +0100
|
||||
Subject: ole32: Implement returning a name in IEnumSTATPROPSTG.
|
||||
Subject: [PATCH] ole32: Implement returning a name in IEnumSTATPROPSTG.
|
||||
|
||||
---
|
||||
dlls/ole32/enumx.c | 16 ++++++++++++++--
|
||||
dlls/ole32/enumx.h | 5 ++++-
|
||||
dlls/ole32/stg_prop.c | 29 +++++++++++++++++++++++++++--
|
||||
3 files changed, 45 insertions(+), 5 deletions(-)
|
||||
dlls/ole32/stg_prop.c | 25 ++++++++++++++++++++++++-
|
||||
3 files changed, 42 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c
|
||||
index 4279ca81fa9..2b53810dad9 100644
|
||||
@ -88,21 +88,10 @@ index da76e13769b..8a2a2b354d8 100644
|
||||
|
||||
#endif
|
||||
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
|
||||
index e90e1ed4eda..bfc052966ab 100644
|
||||
index 989e68b830d..eb98a7d2516 100644
|
||||
--- a/dlls/ole32/stg_prop.c
|
||||
+++ b/dlls/ole32/stg_prop.c
|
||||
@@ -2393,7 +2393,9 @@ static HRESULT create_EnumSTATPROPSETSTG(
|
||||
|
||||
enumx = enumx_allocate(&IID_IEnumSTATPROPSETSTG,
|
||||
&IEnumSTATPROPSETSTG_Vtbl,
|
||||
- sizeof (STATPROPSETSTG));
|
||||
+ sizeof (STATPROPSETSTG),
|
||||
+ (IUnknown*)&This->base.IStorage_iface,
|
||||
+ NULL);
|
||||
|
||||
/* add all the property set elements into a list */
|
||||
r = IStorage_EnumElements(stg, 0, NULL, 0, &penum);
|
||||
@@ -2486,6 +2488,27 @@ static HRESULT WINAPI IEnumSTATPROPSTG_fnClone(
|
||||
@@ -2571,6 +2571,27 @@ static HRESULT WINAPI IEnumSTATPROPSTG_fnClone(
|
||||
return enumx_Clone((enumx_impl*)iface, (enumx_impl**)ppenum);
|
||||
}
|
||||
|
||||
@ -130,7 +119,7 @@ index e90e1ed4eda..bfc052966ab 100644
|
||||
static BOOL prop_enum_stat(const void *k, const void *v, void *extra, void *arg)
|
||||
{
|
||||
enumx_impl *enumx = arg;
|
||||
@@ -2512,7 +2535,9 @@ static HRESULT create_EnumSTATPROPSTG(
|
||||
@@ -2597,7 +2618,9 @@ static HRESULT create_EnumSTATPROPSTG(
|
||||
|
||||
enumx = enumx_allocate(&IID_IEnumSTATPROPSTG,
|
||||
&IEnumSTATPROPSTG_Vtbl,
|
||||
@ -142,5 +131,5 @@ index e90e1ed4eda..bfc052966ab 100644
|
||||
dictionary_enumerate(This->propid_to_prop, prop_enum_stat, enumx);
|
||||
|
||||
--
|
||||
2.11.0
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "88d30985ddd534e8bafed531e619846bc8d10839"
|
||||
echo "070cfc358c8ed67ba08a49ae78c20205ab4e2d00"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user