Release v9.10

Hoepfully fixes the macos compile error.

patches/Compiler_Warnings/0002-combase-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,17 +1,17 @@
-From 31ad180c1c96e6e9a2e666ebbe90c3d8b78cefa4 Mon Sep 17 00:00:00 2001
+From 61f65bb6024f63c6ab278ae6c9844d2d38339be8 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 16 Feb 2024 11:01:45 +1100
 Subject: [PATCH] combase: Avoid implicit cast of interface pointer.
 
 ---
- dlls/combase/string.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ dlls/combase/string.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/combase/string.c b/dlls/combase/string.c
-index 1345870cf2f..dda6ab78141 100644
+index 1345870cf2f..e60ea251011 100644
 --- a/dlls/combase/string.c
 +++ b/dlls/combase/string.c
-@@ -55,7 +55,7 @@ static inline struct hstring_private *impl_from_HSTRING(HSTRING string)
+@@ -55,12 +55,12 @@ static inline struct hstring_private *impl_from_HSTRING(HSTRING string)
  
  static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *header)
  {
@@ -20,6 +20,12 @@ index 1345870cf2f..dda6ab78141 100644
  }
  
  static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer)
+ {
+-    return CONTAINING_RECORD(buffer, struct hstring_private, buffer);
++    return CONTAINING_RECORD( (void*)buffer, struct hstring_private, buffer);
+ }
+ 
+ static BOOL alloc_string(UINT32 len, HSTRING *out)
 -- 
 2.43.0
 

patches/Compiler_Warnings/0003-d2d1-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,4 +1,4 @@
-From ef7171d2eb01b4b8aaf8c4c608ceebd698d96e3c Mon Sep 17 00:00:00 2001
+From b0fb00cbd4ec71e184cf066a4f30002d646ceebe Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:54:26 +0100
 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
@@ -8,11 +8,13 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
  dlls/d2d1/brush.c              |  8 ++++----
  dlls/d2d1/d2d1_private.h       |  2 +-
  dlls/d2d1/dc_render_target.c   |  2 +-
+ dlls/d2d1/device.c             |  2 +-
+ dlls/d2d1/effect.c             | 10 +++++-----
  dlls/d2d1/geometry.c           | 12 ++++++------
  dlls/d2d1/hwnd_render_target.c |  2 +-
  dlls/d2d1/state_block.c        |  2 +-
  dlls/d2d1/stroke.c             |  2 +-
- 8 files changed, 16 insertions(+), 16 deletions(-)
+ 10 files changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
 index e5048611519..8e031290528 100644
@@ -66,10 +68,10 @@ index 75cd72b5b9f..314123373b7 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
 diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
-index c0ac5ba9a44..e171c1c6bd8 100644
+index 58507fd2c0b..c2c7026052c 100644
 --- a/dlls/d2d1/d2d1_private.h
 +++ b/dlls/d2d1/d2d1_private.h
-@@ -697,7 +697,7 @@ struct d2d_factory
+@@ -702,7 +702,7 @@ struct d2d_factory
  
  static inline struct d2d_factory *unsafe_impl_from_ID2D1Factory(ID2D1Factory *iface)
  {
@@ -91,6 +93,57 @@ index aa0c715baa5..31389b15cf8 100644
  }
  
  static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
+diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
+index 75da15c99a5..cf2fb530466 100644
+--- a/dlls/d2d1/device.c
++++ b/dlls/d2d1/device.c
+@@ -4516,7 +4516,7 @@ struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface)
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (ID2D1Device1Vtbl *)&d2d_device_vtbl);
+-    return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device6_iface);
++    return CONTAINING_RECORD((ID2D1Device6*)iface, struct d2d_device, ID2D1Device6_iface);
+ }
+ 
+ void d2d_device_init(struct d2d_device *device, struct d2d_factory *factory, IDXGIDevice *dxgi_device)
+diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c
+index cebc492d895..a5e33c0ad9b 100644
+--- a/dlls/d2d1/effect.c
++++ b/dlls/d2d1/effect.c
+@@ -22,28 +22,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
+ 
+ static inline struct d2d_transform *impl_from_ID2D1OffsetTransform(ID2D1OffsetTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_transform *impl_from_ID2D1BlendTransform(ID2D1BlendTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_transform *impl_from_ID2D1BorderTransform(ID2D1BorderTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_transform *impl_from_ID2D1BoundsAdjustmentTransform(
+         ID2D1BoundsAdjustmentTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_vertex_buffer *impl_from_ID2D1VertexBuffer(ID2D1VertexBuffer *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_vertex_buffer, ID2D1VertexBuffer_iface);
++    return CONTAINING_RECORD((ID2D1VertexBuffer*)iface, struct d2d_vertex_buffer, ID2D1VertexBuffer_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_vertex_buffer_QueryInterface(ID2D1VertexBuffer *iface,
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
 index 3da3ad2e65b..849a2cd2762 100644
 --- a/dlls/d2d1/geometry.c

patches/Compiler_Warnings/0020-combase-tests-Avoid-implicit-cast-of-interface-point.patch

@@ -0,0 +1,45 @@
+From 53cc7a0c9e6d6abe983d7f9d70f83f36ccc1c0a5 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sun, 19 May 2024 14:49:44 +1000
+Subject: [PATCH] combase/tests: Avoid implicit cast of interface pointer.
+
+---
+ dlls/combase/tests/string.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c
+index ceb8ffa6e09..76863c2f4dd 100644
+--- a/dlls/combase/tests/string.c
++++ b/dlls/combase/tests/string.c
+@@ -509,7 +509,7 @@ static void test_hstring_struct(void)
+ 
+     ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string.\n");
+ 
+-    prv = CONTAINING_RECORD(str, struct hstring_private, header);
++    prv = CONTAINING_RECORD((void*)str, struct hstring_private, header);
+ 
+     ok(prv->header.flags == 0, "Expected 0 in flags field, got %#x.\n", prv->header.flags);
+     ok(prv->header.length == 6, "Expected 6 in length field, got %u.\n", prv->header.length);
+@@ -520,7 +520,7 @@ static void test_hstring_struct(void)
+ 
+     ok(WindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string.\n");
+ 
+-    prv2 = CONTAINING_RECORD(str2, struct hstring_private, header);
++    prv2 = CONTAINING_RECORD((void*)str2, struct hstring_private, header);
+ 
+     ok(prv->refcount == 2, "Expected 2 in refcount, got %lu.\n", prv->refcount);
+     ok(prv2->refcount == 2, "Expected 2 in refcount, got %lu.\n", prv2->refcount);
+@@ -534,8 +534,8 @@ static void test_hstring_struct(void)
+ 
+     ok(WindowsCreateStringReference(input_string, 6, &hdr, &str) == S_OK, "Failed to create string ref.\n");
+ 
+-    prv = CONTAINING_RECORD(&hdr, struct hstring_private, header);
+-    prv2 = CONTAINING_RECORD(str, struct hstring_private, header);
++    prv = CONTAINING_RECORD((void*)&hdr, struct hstring_private, header);
++    prv2 = CONTAINING_RECORD((void*)str, struct hstring_private, header);
+ 
+     ok(prv == prv2, "Pointers not identical.\n");
+     ok(prv2->header.flags == 1, "Expected HSTRING_REFERENCE_FLAG to be set, got %#x.\n", prv2->header.flags);
+-- 
+2.43.0
+

patches/user32-rawinput-mouse/0004-server-Add-send_hardware_message-flags-for-rawinput-.patch

@@ -1,7 +1,7 @@
-From 5e9af0573526693cbc98ad8282b5f2023c6b5bf7 Mon Sep 17 00:00:00 2001
+From 84025e765979320128422a50d5f892e8f501b2df Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Mon, 26 Aug 2019 14:37:20 +0200
-Subject: [PATCH 4/7] server: Add send_hardware_message flags for rawinput
+Subject: [PATCH] server: Add send_hardware_message flags for rawinput
  translation.
 
 ---
@@ -11,10 +11,10 @@ Subject: [PATCH 4/7] server: Add send_hardware_message flags for rawinput
  3 files changed, 15 insertions(+), 8 deletions(-)
 
 diff --git a/include/ntuser.h b/include/ntuser.h
-index f947fec7fea..4ded432bd99 100644
+index ff45ffa2bc8..bc51f04af6e 100644
 --- a/include/ntuser.h
 +++ b/include/ntuser.h
-@@ -1423,6 +1423,10 @@ struct hid_packet
+@@ -1440,6 +1440,10 @@ struct hid_packet
  
  C_ASSERT(sizeof(struct hid_packet) == offsetof(struct hid_packet, data[0]));
  
@@ -26,10 +26,10 @@ index f947fec7fea..4ded432bd99 100644
  {
      UINT flags;
 diff --git a/server/protocol.def b/server/protocol.def
-index 7b21aa16636..8e483bf3bbf 100644
+index 1fdedd161ff..4d199a6407c 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -2126,7 +2126,7 @@ enum message_type
+@@ -2164,7 +2164,7 @@ enum message_type
  @REQ(send_hardware_message)
      user_handle_t   win;       /* window handle */
      hw_input_t      input;     /* input data */
@@ -38,7 +38,7 @@ index 7b21aa16636..8e483bf3bbf 100644
      VARARG(report,bytes);      /* HID report data */
  @REPLY
      int             wait;      /* do we need to wait for a reply? */
-@@ -2135,7 +2135,6 @@ enum message_type
+@@ -2173,7 +2173,6 @@ enum message_type
      int             new_x;     /* new cursor position */
      int             new_y;
  @END
@@ -47,10 +47,10 @@ index 7b21aa16636..8e483bf3bbf 100644
  
  /* Get a message from the current queue */
 diff --git a/server/queue.c b/server/queue.c
-index 67c03c10b40..0687a7feac1 100644
+index ac863fd439b..c38d91ba28c 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -1983,7 +1983,7 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
+@@ -2019,7 +2019,7 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
  
  /* queue a hardware message for a mouse event */
  static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
@@ -59,7 +59,7 @@ index 67c03c10b40..0687a7feac1 100644
  {
      const struct rawinput_device *device;
      struct hardware_msg_data *msg_data;
-@@ -2038,7 +2038,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
+@@ -2075,7 +2075,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
          y = desktop->cursor.y;
      }
  
@@ -68,7 +68,7 @@ index 67c03c10b40..0687a7feac1 100644
      {
          memset( &raw_msg, 0, sizeof(raw_msg) );
          raw_msg.foreground = foreground;
-@@ -2060,6 +2060,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
+@@ -2097,6 +2097,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
          return 0;
      }
  
@@ -77,7 +77,7 @@ index 67c03c10b40..0687a7feac1 100644
      for (i = 0; i < ARRAY_SIZE( messages ); i++)
      {
          if (!messages[i]) continue;
-@@ -2091,7 +2093,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
+@@ -2128,7 +2130,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
  
  /* queue a hardware message for a keyboard event */
  static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
@@ -86,16 +86,16 @@ index 67c03c10b40..0687a7feac1 100644
  {
      struct hw_msg_source source = { IMDT_KEYBOARD, origin };
      const struct rawinput_device *device;
-@@ -2168,7 +2170,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
-         break;
+@@ -2232,7 +2234,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
+        }
      }
  
--    if ((foreground = get_foreground_thread( desktop, win )))
-+    if (!(send_flags & SEND_HWMSG_NO_RAW) && (foreground = get_foreground_thread( desktop, win )))
+-    if (!unicode && (foreground = get_foreground_thread( desktop, win )))
++    if (!(send_flags & SEND_HWMSG_NO_RAW) && ((!unicode && (foreground = get_foreground_thread( desktop, win )))))
      {
          struct rawinput_message raw_msg = {0};
          raw_msg.foreground = foreground;
-@@ -2189,6 +2191,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
+@@ -2253,6 +2255,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
          return 0;
      }
  
@@ -104,7 +104,7 @@ index 67c03c10b40..0687a7feac1 100644
      if (!(msg = alloc_hardware_message( input->kbd.info, source, time, 0 ))) return 0;
      msg_data = msg->data;
  
-@@ -2936,10 +2940,10 @@ DECL_HANDLER(send_hardware_message)
+@@ -3004,10 +3008,10 @@ DECL_HANDLER(send_hardware_message)
      switch (req->input.type)
      {
      case INPUT_MOUSE:

patches/vkd3d-latest/0001-Updated-vkd3d-to-36c123c0056abd227ddfaac37a2a0902ac2.patch

@@ -0,0 +1,53 @@
+From b49259919505ae15004ad6f3a42582f8436c9edd Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 7 Mar 2024 10:40:41 +1100
+Subject: [PATCH] Updated vkd3d to 36c123c0056abd227ddfaac37a2a0902ac2f4bc5.
+
+1.12 Release
+---
+ libs/vkd3d/include/private/vkd3d_common.h        | 2 +-
+ libs/vkd3d/libs/vkd3d-common/blob.c              | 1 +
+ libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h
+index a9d709d10fe..2d950b4f7aa 100644
+--- a/libs/vkd3d/include/private/vkd3d_common.h
++++ b/libs/vkd3d/include/private/vkd3d_common.h
+@@ -233,7 +233,7 @@ static inline unsigned int vkd3d_popcount(unsigned int v)
+ {
+ #ifdef _MSC_VER
+     return __popcnt(v);
+-#elif defined(__MINGW32__)
++#elif defined(HAVE_BUILTIN_POPCOUNT)
+     return __builtin_popcount(v);
+ #else
+     v -= (v >> 1) & 0x55555555;
+diff --git a/libs/vkd3d/libs/vkd3d-common/blob.c b/libs/vkd3d/libs/vkd3d-common/blob.c
+index f60ef7db769..c2c6ad67804 100644
+--- a/libs/vkd3d/libs/vkd3d-common/blob.c
++++ b/libs/vkd3d/libs/vkd3d-common/blob.c
+@@ -20,6 +20,7 @@
+ #define WIDL_C_INLINE_WRAPPERS
+ #endif
+ #define COBJMACROS
++
+ #define CONST_VTABLE
+ #include "vkd3d.h"
+ #include "vkd3d_blob.h"
+diff --git a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
+index 14a3fa778e5..46c0da2a2d7 100644
+--- a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
++++ b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
+@@ -23,6 +23,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ 
++/* VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); */
++
+ static inline int char_to_int(char c)
+ {
+     if ('0' <= c && c <= '9')
+-- 
+2.43.0
+

staging/VERSION

@@ -1 +1 @@
-Wine Staging 9.9
+Wine Staging 9.10

staging/upstream-commit

@@ -1 +1 @@
-fd1da4521e68042cbb3ce88124415c22761ae9dd
+951e0e27a743e52c75c7fedc0b1eaa9eb77e6bb6