From c2d96a3c911de50e17362cd06ec147f017f7a971 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 21 Apr 2025 07:24:55 +1000
Subject: [PATCH] Rebase against 040e1333b1f4cf73d6877daec15495a8be42324a.

---
 ...ws2_32-tests-Add-test-for-AF_UNIX-sockets.patch | 14 +++++++-------
 staging/upstream-commit                            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/ws2_32-af_unix/0006-ws2_32-tests-Add-test-for-AF_UNIX-sockets.patch b/patches/ws2_32-af_unix/0006-ws2_32-tests-Add-test-for-AF_UNIX-sockets.patch
index de0451dc..7d948c73 100644
--- a/patches/ws2_32-af_unix/0006-ws2_32-tests-Add-test-for-AF_UNIX-sockets.patch
+++ b/patches/ws2_32-af_unix/0006-ws2_32-tests-Add-test-for-AF_UNIX-sockets.patch
@@ -1,4 +1,4 @@
-From 87f55f51f9985ed20a718d1db3a440b30376bbf3 Mon Sep 17 00:00:00 2001
+From 967bb126734f126d3023f23b90c082e410ef177c Mon Sep 17 00:00:00 2001
 From: Ally Sommers <dropbear.sh@gmail.com>
 Date: Thu, 30 Jan 2025 23:50:25 +0100
 Subject: [PATCH] ws2_32/tests: Add test for AF_UNIX sockets.
@@ -9,7 +9,7 @@ Bug: https://bugs.winehq.org/show_bug.cgi?id=52568
  1 file changed, 292 insertions(+)
 
 diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index 4fd5fc00cdd..510cbfc17f5 100644
+index 2ca5b9fc8b2..c6147be7e10 100644
 --- a/dlls/ws2_32/tests/sock.c
 +++ b/dlls/ws2_32/tests/sock.c
 @@ -29,6 +29,7 @@
@@ -20,7 +20,7 @@ index 4fd5fc00cdd..510cbfc17f5 100644
  #include <wsnwlink.h>
  #include <mswsock.h>
  #include <mstcpip.h>
-@@ -14373,6 +14374,296 @@ static void test_send_buffering(void)
+@@ -14463,6 +14464,296 @@ static void test_send_buffering(void)
      closesocket(client);
  }
  
@@ -314,17 +314,17 @@ index 4fd5fc00cdd..510cbfc17f5 100644
 +    }
 +}
 +
- START_TEST( sock )
+ static void test_valid_handle(void)
  {
-     int i;
-@@ -14457,6 +14748,7 @@ START_TEST( sock )
+     HANDLE duplicated, invalid;
+@@ -14595,6 +14886,7 @@ START_TEST( sock )
      test_tcp_sendto_recvfrom();
      test_broadcast();
      test_send_buffering();
 +    test_afunix();
+     test_valid_handle();
  
      /* There is apparently an obscure interaction between this test and
-      * test_WSAGetOverlappedResult().
 -- 
 2.47.2
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index b0a3779f..1fb120b8 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-661cc2a1dec5e44e074702707272228178f21487
+040e1333b1f4cf73d6877daec15495a8be42324a