Rebase against 85cb1ff91ed4d48559c5500e2ccb0b15801edc05.

This commit is contained in:
Alistair Leslie-Hughes
2022-01-28 12:48:29 +11:00
parent b1a5648b37
commit cafb155af5
15 changed files with 96 additions and 90 deletions

View File

@@ -1,4 +1,4 @@
From c0a97e116da7c6868b74b66a19b65855521bf827 Mon Sep 17 00:00:00 2001
From 577f073b38a77cdcd35769cc2c60bd227d0a8314 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 1 Oct 2020 18:34:23 +1000
Subject: [PATCH] xactengine3_7/tests: Add Global settings test
@@ -13,10 +13,11 @@ Subject: [PATCH] xactengine3_7/tests: Add Global settings test
create mode 100644 dlls/xactengine3_7/tests/rsrc.rc
diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in
index c32b2562546..0da28c85922 100644
index 693c3687728..fbcb357524c 100644
--- a/dlls/xactengine3_7/tests/Makefile.in
+++ b/dlls/xactengine3_7/tests/Makefile.in
@@ -1,5 +1,8 @@
@@ -1,6 +1,9 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = xactengine3_7.dll
-IMPORTS = ole32
+IMPORTS = ole32 x3daudio1_7
@@ -70,7 +71,7 @@ index 00000000000..2c1961c727a
+/* @makedep: globals.xgs*/
+globals.xgs RCDATA "globals.xgs"
diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c
index 9b0d3defb09..8709ac18910 100644
index 6b04c36a9f0..7840764726e 100644
--- a/dlls/xactengine3_7/tests/xact3.c
+++ b/dlls/xactengine3_7/tests/xact3.c
@@ -90,11 +90,71 @@ static void test_interfaces(void)
@@ -146,5 +147,5 @@ index 9b0d3defb09..8709ac18910 100644
CoUninitialize();
}
--
2.28.0
2.34.1