Rebase against a3209daea543104fbfac5900bf9ec0c05a0a43fc.

patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch

@@ -1,4 +1,4 @@
-From a75e31b9098b8d111ec06a8a3f08470ae8992606 Mon Sep 17 00:00:00 2001
+From ed6dabac0ebcbb188fb800021026992cb726bb88 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,7 +13,7 @@ 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 54046e85b88..a9b21279158 100644
 --- a/dlls/xactengine3_7/tests/Makefile.in
 +++ b/dlls/xactengine3_7/tests/Makefile.in
 @@ -1,5 +1,8 @@
@@ -21,7 +21,7 @@ index c32b2562546..0da28c85922 100644
 -IMPORTS = ole32
 +IMPORTS = ole32 x3daudio1_7
  
- C_SRCS = \
+ SOURCES = \
  	xact3.c
 +
 +RC_SRCS = \
@@ -70,10 +70,10 @@ 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 5daa18ca81b..7644ec1dfb8 100644
+index 48a5f0a4374..d1e168d1489 100644
 --- a/dlls/xactengine3_7/tests/xact3.c
 +++ b/dlls/xactengine3_7/tests/xact3.c
-@@ -261,11 +261,72 @@ static void test_notifications(void)
+@@ -287,11 +287,72 @@ static void test_notifications(void)
      DeleteFileW(filename);
  }
  
@@ -147,5 +147,5 @@ index 5daa18ca81b..7644ec1dfb8 100644
  
      CoUninitialize();
 -- 
-2.35.1
+2.42.0