Release v8.16

patches/ddraw-GetPickRecords/definition

@@ -0,0 +1,2 @@
+Fixes: [10729] ddraw: Implement Pick() and GetPickRecords().
+

patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch

@@ -1,4 +1,4 @@
-From 9eccf33cb881c2e847a22a72f1c8d8b10886d531 Mon Sep 17 00:00:00 2001
+From 87bf08071997f446498bdea2d18d1bb539a1990e Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 2 Dec 2022 14:41:30 +1100
 Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download
@@ -10,7 +10,7 @@ Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download
  3 files changed, 93 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
-index 7cdc1534866..39f6cdce790 100644
+index 6102fd5ec2f..da40b58ad9b 100644
 --- a/dlls/dmime/dmime_private.h
 +++ b/dlls/dmime/dmime_private.h
 @@ -71,6 +71,8 @@ extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerfor
@@ -23,25 +23,25 @@ index 7cdc1534866..39f6cdce790 100644
   * Auxiliary definitions
   */
 diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
-index d69a27540d6..5578c3e523b 100644
+index 1f8de0837d5..622939f3553 100644
 --- a/dlls/dmime/performance.c
 +++ b/dlls/dmime/performance.c
-@@ -252,6 +252,13 @@ static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(I
-     return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface);
+@@ -253,6 +253,13 @@ static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusi
+     return CONTAINING_RECORD(iface, struct performance, IDirectMusicPerformance8_iface);
  }
  
 +IDirectSound *get_dsound_interface(IDirectMusicPerformance8* iface)
 +{
-+    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
++    struct performance *This = impl_from_IDirectMusicPerformance8(iface);
 +    return This->dsound;
 +}
 +
 +
  /* IDirectMusicPerformance8 IUnknown part: */
- static HRESULT WINAPI IDirectMusicPerformance8Impl_QueryInterface(IDirectMusicPerformance8 *iface,
-         REFIID riid, void **ppv)
+ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface)
+ {
 diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
-index 6bf9f3abf0c..0ea0c15c5e0 100644
+index 39a5333fbbb..ce49ddc9940 100644
 --- a/dlls/dmime/segment.c
 +++ b/dlls/dmime/segment.c
 @@ -37,6 +37,7 @@ typedef struct IDirectMusicSegment8Impl {

patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch

@@ -1,4 +1,4 @@
-From 8f92585ece53fbcd940fe028dd7ee24d6b854ec3 Mon Sep 17 00:00:00 2001
+From 43007318a6303312b6226c9ede009e4299826af3 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 12 Dec 2022 15:20:10 +1100
 Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx
@@ -10,7 +10,7 @@ Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx
  3 files changed, 26 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
-index 39f6cdce790..6cd45697e2f 100644
+index da40b58ad9b..4532528f535 100644
 --- a/dlls/dmime/dmime_private.h
 +++ b/dlls/dmime/dmime_private.h
 @@ -72,6 +72,7 @@ extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffe
@@ -22,15 +22,15 @@ index 39f6cdce790..6cd45697e2f 100644
  /*****************************************************************************
   * Auxiliary definitions
 diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
-index 5578c3e523b..03e59e95af3 100644
+index 622939f3553..c7b149f0686 100644
 --- a/dlls/dmime/performance.c
 +++ b/dlls/dmime/performance.c
-@@ -1043,13 +1043,26 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer
-         __int64 i64StartTime, IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom,
-         IUnknown *pAudioPath)
+@@ -1028,13 +1028,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface,
+         WCHAR *pwzSegmentName, IUnknown *pTransition, DWORD dwFlags, __int64 i64StartTime,
+         IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom, IUnknown *pAudioPath)
  {
--        IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
-+    IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
+-        struct performance *This = impl_from_IDirectMusicPerformance8(iface);
++    struct performance *This = impl_from_IDirectMusicPerformance8(iface);
 +    IDirectMusicSegment8 *segment;
 +    IDirectSoundBuffer *buffer;
 +    HRESULT hr;
@@ -57,9 +57,9 @@ index 5578c3e523b..03e59e95af3 100644
 +    return S_OK;
  }
  
- static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformance8 *iface,
+ static HRESULT WINAPI performance_StopEx(IDirectMusicPerformance8 *iface, IUnknown *pObjectToStop,
 diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
-index 0ea0c15c5e0..b21f93bbfc6 100644
+index ce49ddc9940..ad121736acd 100644
 --- a/dlls/dmime/segment.c
 +++ b/dlls/dmime/segment.c
 @@ -47,6 +47,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu

patches/dnsapi_dns_records/0001-dnsapi-tests-Add-some-tests-for-DNS_TYPE_SRV-message.patch

@@ -1,96 +0,0 @@
-From fcf816014b4f7ce60b544f5a50a5a88ade3b055b Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Thu, 1 Jun 2023 14:30:10 +0300
-Subject: [PATCH] dnsapi/tests: Add some tests for DNS_TYPE_SRV messages.
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
----
- dlls/dnsapi/tests/record.c | 65 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 65 insertions(+)
-
-diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
-index 20738de3618..8abcdadaacc 100644
---- a/dlls/dnsapi/tests/record.c
-+++ b/dlls/dnsapi/tests/record.c
-@@ -193,6 +193,28 @@ static BYTE msg_types[] =  /* various record types */
- /* KEY */   0xc0, 0x0c, 0x00, 0x19, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x00, 0x06, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
- /* TXT */   0x01, 't', 0x01, 'x', 0x00, 0x00, 0x10, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x00, 0x09, 0x02, 'z', 'y', 0x00, 0x04, 'X', 'Y', 0xc3, 0xa9
- };
-+static BYTE msg_question_srv[] =  /* SRV question only */
-+{
-+    0x12, 0x34, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+    5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00,0x00,0x00,0x21,0x00
-+};
-+static BYTE msg_answer_srv[] =  /* SRV answer only */
-+{
-+    0x12, 0x34, 0x81, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+    5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00,
-+    0x00,0x21,0x00,0x01,0x04,0x05,0x06,0x07,
-+    0x00,0x15,0x00,0x00,0x00,0x00,0x01,0x85,
-+    2,'d','c',6,'w','i','n','e','h','q',3,'o','r','g',0x00
-+};
-+static BYTE msg_full_srv[] =  /* SRV question + answer */
-+{
-+    0x12, 0x34, 0x81, 0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+    5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00,
-+    0x00,0x21,0x00,0x01,
-+    0xc0,0x0c,0x00,0x21,0x00,0x01,0x04,0x05,0x06,0x07,
-+    0x00,0x15,0x00,0x00,0x00,0x00,0x01,0x85,
-+    2,'d','c',6,'w','i','n','e','h','q',3,'o','r','g',0x00
-+};
- 
- static void test_DnsExtractRecordsFromMessage(void)
- {
-@@ -200,6 +222,49 @@ static void test_DnsExtractRecordsFromMessage(void)
-     DNS_RECORDA *rec, *r;
-     DNS_RECORDW *recW, *rW;
- 
-+    rec = NULL;
-+    ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_full_srv, sizeof(msg_full_srv), &rec );
-+    todo_wine
-+    ok( !ret, "failed %ld\n", ret );
-+    todo_wine
-+    ok( rec != NULL, "record not set\n" );
-+    if (!rec) goto next;
-+    ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
-+    ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
-+    ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
-+    ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
-+    todo_wine
-+    ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
-+    ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
-+    ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
-+    ok( !rec->pNext, "next record %p\n", rec->pNext );
-+    DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
-+
-+next:
-+    rec = (void *)0xdeadbeef;
-+    ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_question_srv, sizeof(msg_question_srv), &rec );
-+    ok( !ret, "failed %ld\n", ret );
-+    ok( !rec, "record %p\n", rec );
-+
-+    rec = NULL;
-+    ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_answer_srv, sizeof(msg_answer_srv), &rec );
-+    todo_wine
-+    ok( !ret, "failed %ld\n", ret );
-+    todo_wine
-+    ok( rec != NULL, "record not set\n" );
-+    if (!rec) goto next2;
-+    ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
-+    ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
-+    ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
-+    ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
-+    todo_wine
-+    ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
-+    ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
-+    ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
-+    ok( !rec->pNext, "next record %p\n", rec->pNext );
-+    DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
-+
-+next2:
-     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty) - 1, &rec );
-     ok( ret == ERROR_INVALID_PARAMETER || broken(ret == DNS_ERROR_BAD_PACKET) /* win7 */,
-         "failed %ld\n", ret );
--- 
-2.40.1
-

patches/dnsapi_dns_records/0002-dnsapi-Accept-name-records-of-exact-size-at-the-end-.patch

@@ -1,72 +0,0 @@
-From 3c5ac02e18d5898d68c01f6a58996dc47e5582db Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Thu, 1 Jun 2023 14:32:55 +0300
-Subject: [PATCH] dnsapi: Accept name records of exact size at the end of the
- packet.
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
----
- dlls/dnsapi/record.c       | 2 +-
- dlls/dnsapi/tests/record.c | 8 --------
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
-index 01786842b73..cfd55a44852 100644
---- a/dlls/dnsapi/record.c
-+++ b/dlls/dnsapi/record.c
-@@ -199,7 +199,7 @@ static const BYTE *get_name( const BYTE *base, const BYTE *end, const BYTE *ptr,
-             return NULL;
-         }
-     }
--    if (ptr >= end) return NULL;
-+    if (ptr > end) return NULL;
-     if (out == name) *out++ = '.';
-     *out = 0;
-     return next ? next : ptr;
-diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
-index 8abcdadaacc..340d10f6024 100644
---- a/dlls/dnsapi/tests/record.c
-+++ b/dlls/dnsapi/tests/record.c
-@@ -224,11 +224,8 @@ static void test_DnsExtractRecordsFromMessage(void)
- 
-     rec = NULL;
-     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_full_srv, sizeof(msg_full_srv), &rec );
--    todo_wine
-     ok( !ret, "failed %ld\n", ret );
--    todo_wine
-     ok( rec != NULL, "record not set\n" );
--    if (!rec) goto next;
-     ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
-     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
-     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
-@@ -240,7 +237,6 @@ static void test_DnsExtractRecordsFromMessage(void)
-     ok( !rec->pNext, "next record %p\n", rec->pNext );
-     DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
- 
--next:
-     rec = (void *)0xdeadbeef;
-     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_question_srv, sizeof(msg_question_srv), &rec );
-     ok( !ret, "failed %ld\n", ret );
-@@ -248,11 +244,8 @@ next:
- 
-     rec = NULL;
-     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_answer_srv, sizeof(msg_answer_srv), &rec );
--    todo_wine
-     ok( !ret, "failed %ld\n", ret );
--    todo_wine
-     ok( rec != NULL, "record not set\n" );
--    if (!rec) goto next2;
-     ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName );
-     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
-     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
-@@ -264,7 +257,6 @@ next:
-     ok( !rec->pNext, "next record %p\n", rec->pNext );
-     DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList );
- 
--next2:
-     ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty) - 1, &rec );
-     ok( ret == ERROR_INVALID_PARAMETER || broken(ret == DNS_ERROR_BAD_PACKET) /* win7 */,
-         "failed %ld\n", ret );
--- 
-2.40.1
-

patches/dnsapi_dns_records/0003-dnsapi-Set-correct-wDataLength-for-DNS_TYPE_SRV-reco.patch

@@ -1,49 +0,0 @@
-From 623038324e863d3438243f75f5726291e5ee3ac2 Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Thu, 1 Jun 2023 14:48:23 +0300
-Subject: [PATCH] dnsapi: Set correct wDataLength for DNS_TYPE_SRV records.
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
----
- dlls/dnsapi/record.c       | 4 ++++
- dlls/dnsapi/tests/record.c | 2 --
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
-index cfd55a44852..1b4cbfeac0f 100644
---- a/dlls/dnsapi/record.c
-+++ b/dlls/dnsapi/record.c
-@@ -1046,6 +1046,10 @@ static DNS_STATUS extract_rdata( const BYTE *base, const BYTE *end, const BYTE *
-         if (!get_name( base, end, pos, name )) return DNS_ERROR_BAD_PACKET;
-         if (!(r->Data.SRV.pNameTarget = strdupX( name, in, out ))) return ERROR_NOT_ENOUGH_MEMORY;
-         r->wDataLength = sizeof(DNS_SRV_DATAA);
-+        if (out == DnsCharSetUnicode)
-+            r->wDataLength += (wcslen( (const WCHAR *)r->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR);
-+        else
-+            r->wDataLength += strlen( r->Data.SRV.pNameTarget ) + 1;
-         break;
- 
-     case DNS_TYPE_HINFO:
-diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
-index 340d10f6024..d340c064554 100644
---- a/dlls/dnsapi/tests/record.c
-+++ b/dlls/dnsapi/tests/record.c
-@@ -230,7 +230,6 @@ static void test_DnsExtractRecordsFromMessage(void)
-     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
-     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
-     ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
--    todo_wine
-     ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
-     ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
-     ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
-@@ -250,7 +249,6 @@ static void test_DnsExtractRecordsFromMessage(void)
-     ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section );
-     ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet );
-     ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType );
--    todo_wine
-     ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength );
-     ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl );
-     ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget );
--- 
-2.40.1
-

patches/dnsapi_dns_records/definition

@@ -1 +0,0 @@
-Fixes: [54998] - DnsQuery(DNS_TYPE_SRV) fails to parse some of the server answers

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0001-fltmgr.sys-Implement-FltBuildDefaultSecurityDescript.patch

@@ -1,7 +1,7 @@
-From 93d33e5934d8d71db35025f5046d8d44ac1182cc Mon Sep 17 00:00:00 2001
+From 2a8ffcea70c41f013660d2b6168ab694c70246c0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sun, 29 Aug 2021 13:26:53 +1000
-Subject: [PATCH 1/3] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
+Subject: [PATCH] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
@@ -12,7 +12,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  4 files changed, 79 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in
-index ba106a43831..bb1f34b4896 100644
+index 6ebd48d9412..ae0e812cb22 100644
 --- a/dlls/fltmgr.sys/Makefile.in
 +++ b/dlls/fltmgr.sys/Makefile.in
 @@ -1,5 +1,6 @@
@@ -20,8 +20,8 @@ index ba106a43831..bb1f34b4896 100644
  EXTRADLLFLAGS = -Wl,--subsystem,native
 +IMPORTS = ntoskrnl
  
- C_SRCS = \
- 	main.c
+ SOURCES = \
+ 	fltmgr.sys.spec \
 diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
 index 39ce6798178..8943b9f85cf 100644
 --- a/dlls/fltmgr.sys/fltmgr.sys.spec
@@ -45,7 +45,7 @@ index 39ce6798178..8943b9f85cf 100644
  @ stub FltGetBottomInstance
  @ stub FltGetContexts
 diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index e1016a4989c..79f810570da 100644
+index e1016a4989c..68f242ab8e8 100644
 --- a/dlls/fltmgr.sys/main.c
 +++ b/dlls/fltmgr.sys/main.c
 @@ -23,7 +23,6 @@
@@ -136,7 +136,7 @@ index e1016a4989c..79f810570da 100644
 +}
 \ No newline at end of file
 diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h
-index 8ebebfa2e81..9ece0990810 100644
+index 49c9d55dbaa..e5483d5a3fa 100644
 --- a/include/ddk/fltkernel.h
 +++ b/include/ddk/fltkernel.h
 @@ -653,7 +653,8 @@ typedef struct _FLT_REGISTRATION

patches/vkd3d-latest/0001-Update-vkd3d-to-771e442af16228a977eebba82224f06f6d02.patch

@@ -1,4 +1,4 @@
-From de371a0eaab2304c0c9f1facb9941d712949686d Mon Sep 17 00:00:00 2001
+From ffc72a34adff66a7e763f682288f95498b8b5f28 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 17 May 2023 08:35:40 +1000
 Subject: [PATCH] Update vkd3d to 771e442af16228a977eebba82224f06f6d0202fe

patches/vkd3d-latest/0002-Updated-vkd3d-to-4f2e07a45d0cdb82b1cbba0cfe95c87a697.patch

@@ -1,4 +1,4 @@
-From 07a8a6254b68c41da1dbdd64c15d5c40868f44d4 Mon Sep 17 00:00:00 2001
+From f0dc4e3e02203e62ced4488f216509a27a81a8e0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 28 Jun 2023 16:27:03 +1000
 Subject: [PATCH] Updated vkd3d to 4f2e07a45d0cdb82b1cbba0cfe95c87a69799865.

patches/vkd3d-latest/0003-Updated-vkd3d-to-622311da8e87c60110329044e29b88dd524.patch

@@ -1,4 +1,4 @@
-From 08931d59f470aef0def6f683a1dc25f8546c78e2 Mon Sep 17 00:00:00 2001
+From e6120e9ab920e7db19231334703f46b3479a23d9 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 24 Aug 2023 08:49:26 +1000
 Subject: [PATCH] Updated vkd3d to 622311da8e87c60110329044e29b88dd524e28e7.

patches/vkd3d-latest/0004-Updated-vkd3d-to-269747dbf3ee32bf23e6d1ab388d2a058ca.patch

@@ -1,4 +1,4 @@
-From 247ab6630dc34db194033b3721d30246c8fb8012 Mon Sep 17 00:00:00 2001
+From 5d17ecf1f2fc977fe26e8a7acaf54e9d60b97204 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 29 Aug 2023 07:21:37 +1000
 Subject: [PATCH] Updated vkd3d to 269747dbf3ee32bf23e6d1ab388d2a058ca90f9f.

patches/vkd3d-latest/0005-Updated-vkd3d-to-a597dc8755af5d2ef4826f1b570927379af.patch

@@ -1,4 +1,4 @@
-From 464fcf91e1a7e67b22c83e29d0ea3ec5dceecd35 Mon Sep 17 00:00:00 2001
+From f8bcf91aa485c43f4e5080bdf21f3c399e15a186 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 31 Aug 2023 09:08:26 +1000
 Subject: [PATCH] Updated vkd3d to a597dc8755af5d2ef4826f1b570927379afc5824.

patches/vkd3d-latest/0006-Updated-vkd3d-to-ee28861837c825818ace2e1e50825ade87a.patch

@@ -0,0 +1,432 @@
+From d781aee2d58e59b61a34fefef0a4ce4b527a6c99 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 16 Sep 2023 07:19:25 +1000
+Subject: [PATCH] Updated vkd3d to ee28861837c825818ace2e1e50825ade87a9c723.
+
+---
+ libs/vkd3d/libs/vkd3d-shader/d3d_asm.c        |   2 +-
+ libs/vkd3d/libs/vkd3d-shader/d3dbc.c          |   4 -
+ libs/vkd3d/libs/vkd3d-shader/hlsl.c           |   3 +-
+ libs/vkd3d/libs/vkd3d-shader/hlsl.h           |   9 +-
+ libs/vkd3d/libs/vkd3d-shader/hlsl.y           |  56 +++++++++-
+ libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c   | 100 ++++++++++++++++++
+ libs/vkd3d/libs/vkd3d-shader/spirv.c          |  10 +-
+ libs/vkd3d/libs/vkd3d-shader/tpf.c            |  25 +++++
+ .../libs/vkd3d-shader/vkd3d_shader_main.c     |   3 +-
+ 9 files changed, 197 insertions(+), 15 deletions(-)
+
+diff --git a/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
+index d72402eb250..f0c386f1b3a 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
++++ b/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
+@@ -714,7 +714,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler,
+                 break;
+ 
+             case VKD3D_DECL_USAGE_TEXCOORD:
+-                shader_addline(buffer, "texture%u", semantic->usage_idx);
++                shader_addline(buffer, "texcoord%u", semantic->usage_idx);
+                 break;
+ 
+             case VKD3D_DECL_USAGE_TANGENT:
+diff --git a/libs/vkd3d/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d/libs/vkd3d-shader/d3dbc.c
+index 2b02d51f59a..d5104ae9b79 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/d3dbc.c
++++ b/libs/vkd3d/libs/vkd3d-shader/d3dbc.c
+@@ -1982,10 +1982,6 @@ static void write_sm1_sampler_dcl(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu
+ 
+     switch (sampler_dim)
+     {
+-        case HLSL_SAMPLER_DIM_1D:
+-            res_type = VKD3D_SM1_RESOURCE_TEXTURE_1D;
+-            break;
+-
+         case HLSL_SAMPLER_DIM_2D:
+             res_type = VKD3D_SM1_RESOURCE_TEXTURE_2D;
+             break;
+diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl.c b/libs/vkd3d/libs/vkd3d-shader/hlsl.c
+index b8cf6813f67..5fe9047bf25 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/hlsl.c
++++ b/libs/vkd3d/libs/vkd3d-shader/hlsl.c
+@@ -2486,7 +2486,8 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op)
+         [HLSL_OP2_RSHIFT]      = ">>",
+ 
+         [HLSL_OP3_DP2ADD]      = "dp2add",
+-        [HLSL_OP3_LERP]        = "lerp",
++        [HLSL_OP3_MOVC]        = "movc",
++        [HLSL_OP3_TERNARY]     = "ternary",
+     };
+ 
+     return op_names[op];
+diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl.h b/libs/vkd3d/libs/vkd3d-shader/hlsl.h
+index 73b08ee3ea0..2cde5d58eba 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/hlsl.h
++++ b/libs/vkd3d/libs/vkd3d-shader/hlsl.h
+@@ -550,8 +550,15 @@ enum hlsl_ir_expr_op
+     HLSL_OP2_NEQUAL,
+     HLSL_OP2_RSHIFT,
+ 
++    /* DP2ADD(a, b, c) computes the scalar product of a.xy and b.xy,
++     * then adds c. */
+     HLSL_OP3_DP2ADD,
+-    HLSL_OP3_LERP,
++    /* MOVC(a, b, c) returns c if a is bitwise zero and b otherwise.
++     * TERNARY(a, b, c) returns c if a == 0 and b otherwise.
++     * They differ for floating point numbers, because
++     * -0.0 == 0.0, but it is not bitwise zero. */
++    HLSL_OP3_MOVC,
++    HLSL_OP3_TERNARY,
+ };
+ 
+ #define HLSL_MAX_OPERANDS 3
+diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl.y b/libs/vkd3d/libs/vkd3d-shader/hlsl.y
+index 161d1ab42c3..fb6d485ea69 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/hlsl.y
++++ b/libs/vkd3d/libs/vkd3d-shader/hlsl.y
+@@ -2913,6 +2913,7 @@ static bool intrinsic_fmod(struct hlsl_ctx *ctx, const struct parse_initializer
+         const struct vkd3d_shader_location *loc)
+ {
+     struct hlsl_ir_node *x, *y, *div, *abs, *frac, *neg_frac, *ge, *select, *zero;
++    struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = { 0 };
+     static const struct hlsl_constant_value zero_value;
+ 
+     if (!(x = intrinsic_float_convert_arg(ctx, params, params->args[0], loc)))
+@@ -2940,7 +2941,10 @@ static bool intrinsic_fmod(struct hlsl_ctx *ctx, const struct parse_initializer
+     if (!(ge = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_GEQUAL, div, zero, loc)))
+         return false;
+ 
+-    if (!(select = hlsl_add_conditional(ctx, params->instrs, ge, frac, neg_frac)))
++    operands[0] = ge;
++    operands[1] = frac;
++    operands[2] = neg_frac;
++    if (!(select = add_expr(ctx, params->instrs, HLSL_OP3_TERNARY, operands, x->data_type, loc)))
+         return false;
+ 
+     return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, select, y, loc);
+@@ -3453,7 +3457,42 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *
+ 
+     if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1],
+             hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc)))
+-        coords = params->args[1];
++    {
++        return false;
++    }
++
++    /* tex1D() functions never produce 1D resource declarations. For newer profiles half offset
++       is used for the second coordinate, while older ones appear to replicate first coordinate.*/
++    if (dim == HLSL_SAMPLER_DIM_1D)
++    {
++        struct hlsl_ir_load *load;
++        struct hlsl_ir_node *half;
++        struct hlsl_ir_var *var;
++        unsigned int idx = 0;
++
++        if (!(var = hlsl_new_synthetic_var(ctx, "coords", hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 2), loc)))
++            return false;
++
++        initialize_var_components(ctx, params->instrs, var, &idx, coords);
++        if (shader_profile_version_ge(ctx, 4, 0))
++        {
++            if (!(half = hlsl_new_float_constant(ctx, 0.5f, loc)))
++                return false;
++            hlsl_block_add_instr(params->instrs, half);
++
++            initialize_var_components(ctx, params->instrs, var, &idx, half);
++        }
++        else
++            initialize_var_components(ctx, params->instrs, var, &idx, coords);
++
++        if (!(load = hlsl_new_var_load(ctx, var, loc)))
++            return false;
++        hlsl_block_add_instr(params->instrs, &load->node);
++
++        coords = &load->node;
++
++        dim = HLSL_SAMPLER_DIM_2D;
++    }
+ 
+     load_params.coords = coords;
+     load_params.resource = params->args[0];
+@@ -3466,6 +3505,12 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *
+     return true;
+ }
+ 
++static bool intrinsic_tex1D(struct hlsl_ctx *ctx,
++        const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
++{
++    return intrinsic_tex(ctx, params, loc, "tex1D", HLSL_SAMPLER_DIM_1D);
++}
++
+ static bool intrinsic_tex2D(struct hlsl_ctx *ctx,
+         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
+ {
+@@ -3652,6 +3697,7 @@ intrinsic_functions[] =
+     {"smoothstep",                          3, true,  intrinsic_smoothstep},
+     {"sqrt",                                1, true,  intrinsic_sqrt},
+     {"step",                                2, true,  intrinsic_step},
++    {"tex1D",                              -1, false, intrinsic_tex1D},
+     {"tex2D",                              -1, false, intrinsic_tex2D},
+     {"tex3D",                              -1, false, intrinsic_tex3D},
+     {"texCUBE",                            -1, false, intrinsic_texCUBE},
+@@ -6555,6 +6601,7 @@ conditional_expr:
+             struct hlsl_ir_node *cond = node_from_block($1);
+             struct hlsl_ir_node *first = node_from_block($3);
+             struct hlsl_ir_node *second = node_from_block($5);
++            struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = { 0 };
+             struct hlsl_type *common_type;
+ 
+             hlsl_block_add_block($1, $3);
+@@ -6571,7 +6618,10 @@ conditional_expr:
+             if (!(second = add_implicit_conversion(ctx, $1, second, common_type, &@5)))
+                 YYABORT;
+ 
+-            if (!hlsl_add_conditional(ctx, $1, cond, first, second))
++            args[0] = cond;
++            args[1] = first;
++            args[2] = second;
++            if (!add_expr(ctx, $1, HLSL_OP3_TERNARY, args, common_type, &@1))
+                 YYABORT;
+             $$ = $1;
+         }
+diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c
+index 710d2908166..be024842164 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c
++++ b/libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c
+@@ -934,6 +934,55 @@ static struct hlsl_ir_node *add_zero_mipmap_level(struct hlsl_ctx *ctx, struct h
+     return &coords_load->node;
+ }
+ 
++/* hlsl_ir_swizzle nodes that directly point to a matrix value are only a parse-time construct that
++ * represents matrix swizzles (e.g. mat._m01_m23) before we know if they will be used in the lhs of
++ * an assignment or as a value made from different components of the matrix. The former cases should
++ * have already been split into several separate assignments, but the latter are lowered by this
++ * pass. */
++static bool lower_matrix_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block)
++{
++    struct hlsl_ir_swizzle *swizzle;
++    struct hlsl_ir_load *var_load;
++    struct hlsl_deref var_deref;
++    struct hlsl_type *matrix_type;
++    struct hlsl_ir_var *var;
++    unsigned int x, y, k, i;
++
++    if (instr->type != HLSL_IR_SWIZZLE)
++        return false;
++    swizzle = hlsl_ir_swizzle(instr);
++    matrix_type = swizzle->val.node->data_type;
++    if (matrix_type->class != HLSL_CLASS_MATRIX)
++        return false;
++
++    if (!(var = hlsl_new_synthetic_var(ctx, "matrix-swizzle", instr->data_type, &instr->loc)))
++        return false;
++    hlsl_init_simple_deref_from_var(&var_deref, var);
++
++    for (i = 0; i < instr->data_type->dimx; ++i)
++    {
++        struct hlsl_block store_block;
++        struct hlsl_ir_node *load;
++
++        y = (swizzle->swizzle >> (8 * i + 4)) & 0xf;
++        x = (swizzle->swizzle >> 8 * i) & 0xf;
++        k = y * matrix_type->dimx + x;
++
++        if (!(load = hlsl_add_load_component(ctx, block, swizzle->val.node, k, &instr->loc)))
++            return false;
++
++        if (!hlsl_new_store_component(ctx, &store_block, &var_deref, i, load))
++            return false;
++        hlsl_block_add_block(block, &store_block);
++    }
++
++    if (!(var_load = hlsl_new_var_load(ctx, var, &instr->loc)))
++        return false;
++    hlsl_block_add_instr(block, &var_load->node);
++
++    return true;
++}
++
+ /* hlsl_ir_index nodes are a parse-time construct used to represent array indexing and struct
+  * record access before knowing if they will be used in the lhs of an assignment --in which case
+  * they are lowered into a deref-- or as the load of an element within a larger value.
+@@ -2391,6 +2440,54 @@ static bool lower_round(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *
+     return true;
+ }
+ 
++/* Use 'movc' for the ternary operator. */
++static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
++{
++    struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], *replacement;
++    struct hlsl_ir_node *zero, *cond, *first, *second;
++    struct hlsl_constant_value zero_value = { 0 };
++    struct hlsl_ir_expr *expr;
++    struct hlsl_type *type;
++
++    if (instr->type != HLSL_IR_EXPR)
++        return false;
++
++    expr = hlsl_ir_expr(instr);
++    if (expr->op != HLSL_OP3_TERNARY)
++        return false;
++
++    cond = expr->operands[0].node;
++    first = expr->operands[1].node;
++    second = expr->operands[2].node;
++
++    if (cond->data_type->base_type == HLSL_TYPE_FLOAT)
++    {
++        if (!(zero = hlsl_new_constant(ctx, cond->data_type, &zero_value, &instr->loc)))
++            return false;
++        list_add_tail(&instr->entry, &zero->entry);
++
++        memset(operands, 0, sizeof(operands));
++        operands[0] = zero;
++        operands[1] = cond;
++        type = cond->data_type;
++        type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_BOOL, type->dimx, type->dimy);
++        if (!(cond = hlsl_new_expr(ctx, HLSL_OP2_NEQUAL, operands, type, &instr->loc)))
++            return false;
++        list_add_before(&instr->entry, &cond->entry);
++    }
++
++    memset(operands, 0, sizeof(operands));
++    operands[0] = cond;
++    operands[1] = first;
++    operands[2] = second;
++    if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_MOVC, operands, first->data_type, &instr->loc)))
++        return false;
++    list_add_before(&instr->entry, &replacement->entry);
++
++    hlsl_replace_node(instr, replacement);
++    return true;
++}
++
+ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
+ {
+     struct hlsl_type *type = instr->data_type, *arg_type;
+@@ -4247,6 +4344,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
+ 
+     while (hlsl_transform_ir(ctx, lower_calls, body, NULL));
+ 
++    lower_ir(ctx, lower_matrix_swizzles, body);
+     hlsl_transform_ir(ctx, lower_index_loads, body, NULL);
+ 
+     LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry)
+@@ -4349,6 +4447,8 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
+     hlsl_transform_ir(ctx, track_object_components_usage, body, NULL);
+     sort_synthetic_separated_samplers_first(ctx);
+ 
++    if (profile->major_version >= 4)
++        hlsl_transform_ir(ctx, lower_ternary, body, NULL);
+     if (profile->major_version < 4)
+     {
+         hlsl_transform_ir(ctx, lower_division, body, NULL);
+diff --git a/libs/vkd3d/libs/vkd3d-shader/spirv.c b/libs/vkd3d/libs/vkd3d-shader/spirv.c
+index f93960d6d54..95f6914acb7 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/spirv.c
++++ b/libs/vkd3d/libs/vkd3d-shader/spirv.c
+@@ -5564,7 +5564,7 @@ static uint32_t spirv_compiler_build_descriptor_variable(struct spirv_compiler *
+ }
+ 
+ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler,
+-        const struct vkd3d_shader_register_range *range, unsigned int register_id, unsigned int size)
++        const struct vkd3d_shader_register_range *range, unsigned int register_id, unsigned int size_in_bytes)
+ {
+     struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
+     uint32_t vec4_id, array_type_id, length_id, struct_id, var_id;
+@@ -5572,6 +5572,7 @@ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler,
+     struct vkd3d_push_constant_buffer_binding *push_cb;
+     struct vkd3d_descriptor_variable_info var_info;
+     struct vkd3d_symbol reg_symbol;
++    unsigned int size;
+ 
+     struct vkd3d_shader_register reg =
+     {
+@@ -5580,18 +5581,19 @@ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler,
+         .idx_count = 1,
+     };
+ 
++    size = size_in_bytes / (VKD3D_VEC4_SIZE * sizeof(uint32_t));
++
+     if ((push_cb = spirv_compiler_find_push_constant_buffer(compiler, range)))
+     {
+         /* Push constant buffers are handled in
+          * spirv_compiler_emit_push_constant_buffers().
+          */
+-        unsigned int cb_size_in_bytes = size * VKD3D_VEC4_SIZE * sizeof(uint32_t);
+         push_cb->reg = reg;
+         push_cb->size = size;
+-        if (cb_size_in_bytes > push_cb->pc.size)
++        if (size_in_bytes > push_cb->pc.size)
+         {
+             WARN("Constant buffer size %u exceeds push constant size %u.\n",
+-                    cb_size_in_bytes, push_cb->pc.size);
++                    size_in_bytes, push_cb->pc.size);
+         }
+         return;
+     }
+diff --git a/libs/vkd3d/libs/vkd3d-shader/tpf.c b/libs/vkd3d/libs/vkd3d-shader/tpf.c
+index 7949be150bf..045fb6c5f64 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/tpf.c
++++ b/libs/vkd3d/libs/vkd3d-shader/tpf.c
+@@ -4341,6 +4341,26 @@ static void write_sm4_binary_op_with_two_destinations(const struct tpf_writer *t
+     write_sm4_instruction(tpf, &instr);
+ }
+ 
++static void write_sm4_ternary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opcode opcode,
++        const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2,
++        const struct hlsl_ir_node *src3)
++{
++    struct sm4_instruction instr;
++
++    memset(&instr, 0, sizeof(instr));
++    instr.opcode = opcode;
++
++    sm4_dst_from_node(&instr.dsts[0], dst);
++    instr.dst_count = 1;
++
++    sm4_src_from_node(&instr.srcs[0], src1, instr.dsts[0].writemask);
++    sm4_src_from_node(&instr.srcs[1], src2, instr.dsts[0].writemask);
++    sm4_src_from_node(&instr.srcs[2], src3, instr.dsts[0].writemask);
++    instr.src_count = 3;
++
++    write_sm4_instruction(tpf, &instr);
++}
++
+ static void write_sm4_ld(const struct tpf_writer *tpf, const struct hlsl_ir_node *dst,
+         const struct hlsl_deref *resource, const struct hlsl_ir_node *coords,
+         const struct hlsl_ir_node *sample_index, const struct hlsl_ir_node *texel_offset,
+@@ -4702,6 +4722,7 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex
+ {
+     const struct hlsl_ir_node *arg1 = expr->operands[0].node;
+     const struct hlsl_ir_node *arg2 = expr->operands[1].node;
++    const struct hlsl_ir_node *arg3 = expr->operands[2].node;
+     const struct hlsl_type *dst_type = expr->node.data_type;
+     struct vkd3d_string_buffer *dst_type_string;
+ 
+@@ -5127,6 +5148,10 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex
+                     &expr->node, arg1, arg2);
+             break;
+ 
++        case HLSL_OP3_MOVC:
++            write_sm4_ternary_op(tpf, VKD3D_SM4_OP_MOVC, &expr->node, arg1, arg2, arg3);
++            break;
++
+         default:
+             hlsl_fixme(tpf->ctx, &expr->node.loc, "SM4 %s expression.", debug_hlsl_expr_op(expr->op));
+     }
+diff --git a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
+index a70894a160d..9d8fa82fb86 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
++++ b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
+@@ -705,7 +705,8 @@ static void vkd3d_shader_scan_add_uav_flag(const struct vkd3d_shader_scan_contex
+ 
+     for (i = 0; i < context->scan_descriptor_info->descriptor_count; ++i)
+     {
+-        if (context->scan_descriptor_info->descriptors[i].register_id == range_id)
++        if (context->scan_descriptor_info->descriptors[i].type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV
++                && context->scan_descriptor_info->descriptors[i].register_id == range_id)
+         {
+             context->scan_descriptor_info->descriptors[i].flags |= flag;
+             break;
+-- 
+2.40.1
+

patches/wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch

@@ -1,4 +1,4 @@
-From a84eae8891c0ad4558842c63c8279b270e6e1767 Mon Sep 17 00:00:00 2001
+From 5e22907c02cb6778555995421a0b8eb8e382ff3a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 16 Mar 2014 03:19:39 +0100
 Subject: [PATCH] wineboot: Add some generic hardware in HKEY_DYN_DATA\Config
@@ -9,11 +9,11 @@ Subject: [PATCH] wineboot: Add some generic hardware in HKEY_DYN_DATA\Config
  1 file changed, 100 insertions(+)
 
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 09925bfa235..1c2731b977f 100644
+index 728c41fffa9..beb29db4653 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
-@@ -595,16 +595,116 @@ static void create_hardware_registry_keys(void)
-     HeapFree( GetProcessHeap(), 0, power_info );
+@@ -763,16 +763,116 @@ static void create_hardware_registry_keys(void)
+     free( power_info );
  }
  
 +struct dyndata_enum_key{
@@ -130,5 +130,5 @@ index 09925bfa235..1c2731b977f 100644
  
  /* create the platform-specific environment registry keys */
 -- 
-2.26.2
+2.40.1
 

patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch

@@ -38,7 +38,7 @@ index 1ab50a27596..2024f2aba23 100644
 +        TRACE("Downloading (glReadPixels) texture %p, %u, level %u, format %#x, type %#x, data %p.\n",
 +                src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr);
 +
-+        wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, &src_texture->resource, src_sub_resource_idx, NULL,
++        wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, &src_texture->resource, src_sub_resource_idx, NULL,
 +                0, sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB));
 +        wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER);
 +        context_invalidate_state(context, STATE_FRAMEBUFFER);

patches/winemenubuilder-associations/0001-winemenubuilder-Create-.desktop-files-for-programs-t.patch

@@ -1,4 +1,4 @@
-From 88814d059f53ba2575568d252f4da7539ee50c01 Mon Sep 17 00:00:00 2001
+From f8f76a379516681dd481dd6634f2ea8a4b0f130e Mon Sep 17 00:00:00 2001
 From: Alex Henrie <alexhenrie24@gmail.com>
 Date: Sun, 7 May 2023 22:34:15 -0600
 Subject: [PATCH] winemenubuilder: Create .desktop files for programs that open
@@ -6,27 +6,27 @@ Subject: [PATCH] winemenubuilder: Create .desktop files for programs that open
 
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22904
 ---
- programs/winemenubuilder/winemenubuilder.c | 164 ++++++++++++---------
- 1 file changed, 96 insertions(+), 68 deletions(-)
+ programs/winemenubuilder/winemenubuilder.c | 163 ++++++++++++---------
+ 1 file changed, 95 insertions(+), 68 deletions(-)
 
 diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
-index c16d22e2a57..b06eae422ff 100644
+index 9459b77b502..77acf943c42 100644
 --- a/programs/winemenubuilder/winemenubuilder.c
 +++ b/programs/winemenubuilder/winemenubuilder.c
 @@ -1831,10 +1831,13 @@ static BOOL has_association_changed(LPCWSTR extensionW, const WCHAR *mimeType, c
              ret = TRUE;
-         heap_free(value);
+         free(value);
  
 -        value = reg_get_valW(assocKey, extensionW, L"ProgID");
 -        if (!value || wcscmp(value, progId))
 -            ret = TRUE;
--        heap_free(value);
+-        free(value);
 +        if (progId)
 +        {
 +            value = reg_get_valW(assocKey, extensionW, L"ProgID");
 +            if (!value || wcscmp(value, progId))
 +                ret = TRUE;
-+            heap_free(value);
++            free(value);
 +        }
  
          value = reg_get_valW(assocKey, extensionW, L"AppName");
@@ -111,7 +111,7 @@ index c16d22e2a57..b06eae422ff 100644
              if (commandW == NULL)
                  /* no command => no application is associated */
                  goto end;
-@@ -2101,78 +2119,88 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
+@@ -2101,78 +2119,87 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
                  /* command is on the exclude list => desktop integration is not desirable */
                  goto end;
  
@@ -180,8 +180,7 @@ index c16d22e2a57..b06eae422ff 100644
 +                        heap_free(flattened_mime);
                      }
 -                    extract_icon(iconW, index, flattened_mime, FALSE);
--                    heap_free(flattened_mime);
-+
+-                    free(flattened_mime);
 +                    write_freedesktop_mime_type_entry(packages_dir, winTypeW, mimeType, friendlyDocNameW);
 +                    hasChanged = TRUE;
                  }
@@ -224,7 +223,7 @@ index c16d22e2a57..b06eae422ff 100644
 -            if (wine_rb_get(&mimeProgidTree, mimeProgId))
 +            if (has_association_changed(winTypeW, mimeType, progIdW, friendlyAppName, openWithIcon))
              {
--                heap_free(mimeProgId);
+-                free(mimeProgId);
 -                goto end;
 -            }
 -            entry = xmalloc(sizeof(struct rb_string_entry));
@@ -250,14 +249,14 @@ index c16d22e2a57..b06eae422ff 100644
 -                    update_association(extensionW, mimeType, progIdW, friendlyAppName, desktopPath, openWithIcon);
 +                    update_association(winTypeW, mimeType, progIdW, friendlyAppName, desktopPath, openWithIcon);
                  }
-                 heap_free(desktopPath);
+                 free(desktopPath);
              }
-@@ -2189,7 +2217,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
-             heap_free(mimeType);
-             heap_free(progIdW);
+@@ -2189,7 +2216,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
+             free(mimeType);
+             free(progIdW);
          }
--        heap_free(extensionW);
-+        heap_free(winTypeW);
+-        free(extensionW);
++        free(winTypeW);
      }
  
      wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL);

patches/winmm-mciSendCommandA/0001-winmm-Do-not-crash-in-Win-9X-mode-when-an-invalid-de.patch

@@ -1,18 +1,18 @@
-From f32d9d5f3b9b4b3e54037211f5d561681ed589fa Mon Sep 17 00:00:00 2001
+From da3cf82252881cb1e4315bd0ecb44bd27ee5520f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Mar 2016 16:15:50 +0100
 Subject: [PATCH] winmm: Do not crash in Win 9X mode when an invalid device ptr
  is passed to MCI_OPEN.
 
 ---
- dlls/winmm/mci.c | 42 ++++++++++++++++++++----------------------
- 1 file changed, 20 insertions(+), 22 deletions(-)
+ dlls/winmm/mci.c | 44 +++++++++++++++++++++-----------------------
+ 1 file changed, 21 insertions(+), 23 deletions(-)
 
 diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
-index 2aa74fd4127..5b8463286e5 100644
+index 959801aa835..c56a69def11 100644
 --- a/dlls/winmm/mci.c
 +++ b/dlls/winmm/mci.c
-@@ -209,7 +209,7 @@ static LPWSTR MCI_strdupAtoW( LPCSTR str )
+@@ -204,7 +204,7 @@ static LPWSTR MCI_strdupAtoW( LPCSTR str )
      return ret;
  }
  
@@ -21,7 +21,7 @@ index 2aa74fd4127..5b8463286e5 100644
  {
      if (msg < DRV_RESERVED) return 0;
  
-@@ -252,8 +252,12 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -247,8 +247,12 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
              MCI_ANIM_OPEN_PARMSW *mci_openW;
              DWORD_PTR *ptr;
  
@@ -29,13 +29,13 @@ index 2aa74fd4127..5b8463286e5 100644
 +                (GetVersion() & 0x80000000) && IsBadStringPtrA(mci_openA->lpstrDeviceType, -1))
 +                return MCIERR_MISSING_COMMAND_STRING;
 +
-             ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD_PTR) + sizeof(*mci_openW));
+             ptr = malloc(sizeof(DWORD_PTR) + sizeof(*mci_openW));
 -            if (!ptr) return -1;
 +            if (!ptr) return MCIERR_OUT_OF_MEMORY;
  
              *ptr++ = *dwParam2; /* save the previous pointer */
              *dwParam2 = (DWORD_PTR)ptr;
-@@ -283,7 +287,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -278,7 +282,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
              if (HIWORD(dwParam1))
                  memcpy(&mci_openW->dwStyle, &mci_openA->dwStyle, sizeof(MCI_ANIM_OPEN_PARMSW) - sizeof(MCI_OPEN_PARMSW));
          }
@@ -44,16 +44,18 @@ index 2aa74fd4127..5b8463286e5 100644
  
      case MCI_WINDOW:
          if (dwParam1 & MCI_ANIM_WINDOW_TEXT)
-@@ -292,7 +296,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -286,8 +290,8 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+             MCI_ANIM_WINDOW_PARMSA *mci_windowA = (MCI_ANIM_WINDOW_PARMSA *)*dwParam2;
              MCI_ANIM_WINDOW_PARMSW *mci_windowW;
  
-             mci_windowW = HeapAlloc(GetProcessHeap(), 0, sizeof(*mci_windowW));
+-            mci_windowW = malloc(sizeof(*mci_windowW));
 -            if (!mci_windowW) return -1;
++            mci_windowW = malloc( sizeof(*mci_windowW));
 +            if (!mci_windowW) return MCIERR_OUT_OF_MEMORY;
  
              *dwParam2 = (DWORD_PTR)mci_windowW;
  
-@@ -304,8 +308,6 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -299,8 +303,6 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
                  mci_windowW->hWnd = mci_windowA->hWnd;
              if (dwParam1 & MCI_ANIM_WINDOW_STATE)
                  mci_windowW->nCmdShow = mci_windowA->nCmdShow;
@@ -62,34 +64,34 @@ index 2aa74fd4127..5b8463286e5 100644
          }
          return 0;
  
-@@ -317,7 +319,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -312,7 +314,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
              DWORD_PTR *ptr;
  
-             ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(*mci_sysinfoW) + sizeof(DWORD_PTR));
+             ptr = malloc(sizeof(*mci_sysinfoW) + sizeof(DWORD_PTR));
 -            if (!ptr) return -1;
 +            if (!ptr) return MCIERR_OUT_OF_MEMORY;
  
              *ptr++ = *dwParam2; /* save the previous pointer */
              *dwParam2 = (DWORD_PTR)ptr;
-@@ -331,7 +333,6 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
-             mci_sysinfoW->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, mci_sysinfoW->dwRetSize * sizeof(WCHAR));
+@@ -326,7 +328,6 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+             mci_sysinfoW->lpstrReturn = malloc(mci_sysinfoW->dwRetSize * sizeof(WCHAR));
              mci_sysinfoW->dwNumber = mci_sysinfoA->dwNumber;
              mci_sysinfoW->wDeviceType = mci_sysinfoA->wDeviceType;
 -            return 1;
          }
          return 0;
      case MCI_INFO:
-@@ -341,7 +342,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -336,7 +337,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
              DWORD_PTR *ptr;
  
-             ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(*mci_infoW) + sizeof(DWORD_PTR));
+             ptr = malloc(sizeof(*mci_infoW) + sizeof(DWORD_PTR));
 -            if (!ptr) return -1;
 +            if (!ptr) return MCIERR_OUT_OF_MEMORY;
  
              *ptr++ = *dwParam2; /* save the previous pointer */
              *dwParam2 = (DWORD_PTR)ptr;
-@@ -355,8 +356,8 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
-             mci_infoW->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, mci_infoW->dwRetSize * sizeof(WCHAR));
+@@ -350,8 +351,8 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+             mci_infoW->lpstrReturn = malloc(mci_infoW->dwRetSize * sizeof(WCHAR));
              if (dwParam1 & MCI_DGV_INFO_ITEM)
                  mci_infoW->dwItem = mci_infoA->dwItem;
 -            return 1;
@@ -98,16 +100,16 @@ index 2aa74fd4127..5b8463286e5 100644
      case MCI_SAVE:
      case MCI_LOAD:
      case MCI_CAPTURE:
-@@ -366,7 +367,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -361,7 +362,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
              MCI_OVLY_LOAD_PARMSW *mci_loadW;
  
-             mci_loadW = HeapAlloc(GetProcessHeap(), 0, sizeof(*mci_loadW));
+             mci_loadW = malloc(sizeof(*mci_loadW));
 -            if (!mci_loadW) return -1;
 +            if (!mci_loadW) return MCIERR_OUT_OF_MEMORY;
  
              *dwParam2 = (DWORD_PTR)mci_loadW;
              if (dwParam1 & MCI_NOTIFY)
-@@ -377,8 +378,8 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -372,8 +373,8 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
                  (MCI_CAPTURE == msg && dwParam1 & MCI_DGV_CAPTURE_AT) ||
                  (MCI_RESTORE == msg && dwParam1 & MCI_DGV_RESTORE_AT))
                  mci_loadW->rc = mci_loadA->rc;
@@ -117,10 +119,10 @@ index 2aa74fd4127..5b8463286e5 100644
      case MCI_SOUND:
      case MCI_ESCAPE:
          {   /* All these commands have the same layout: callback + string */
-@@ -386,14 +387,14 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
+@@ -381,14 +382,14 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
              MCI_VD_ESCAPE_PARMSW *mci_vd_escapeW;
  
-             mci_vd_escapeW = HeapAlloc(GetProcessHeap(), 0, sizeof(*mci_vd_escapeW));
+             mci_vd_escapeW = malloc(sizeof(*mci_vd_escapeW));
 -            if (!mci_vd_escapeW) return -1;
 +            if (!mci_vd_escapeW) return MCIERR_OUT_OF_MEMORY;
  
@@ -134,7 +136,7 @@ index 2aa74fd4127..5b8463286e5 100644
      case MCI_SETAUDIO:
      case MCI_SETVIDEO:
          if (!(dwParam1 & (MCI_DGV_SETVIDEO_QUALITY | MCI_DGV_SETVIDEO_ALG
-@@ -506,7 +507,6 @@ static void MCI_UnmapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR dwParam2,
+@@ -501,7 +502,6 @@ static void MCI_UnmapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR dwParam2,
          break;
  
      default:
@@ -142,7 +144,7 @@ index 2aa74fd4127..5b8463286e5 100644
          break;
      }
  }
-@@ -2289,20 +2289,18 @@ DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1,
+@@ -2282,20 +2282,18 @@ DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1,
  DWORD WINAPI mciSendCommandA(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
  {
      DWORD ret;
@@ -169,5 +171,5 @@ index 2aa74fd4127..5b8463286e5 100644
  }
  
 -- 
-2.34.1
+2.40.1
 

staging/VERSION

@@ -1 +1 @@
-Wine Staging 8.15
+Wine Staging 8.16