Release v9.0

Correct the warning thats issued when GetLastError wsa used for %u, changed to use the standard %lx format.

patches/advapi32-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch

@@ -45,7 +45,7 @@ index 5c00298d41e..d04f5645345 100644
 +
 +    status = LsaOpenPolicy( &machine, &object_attributes, POLICY_LOOKUP_NAMES, &handle);
 +    ok(status == RPC_NT_SERVER_UNAVAILABLE,
-+       "LsaOpenPolicy(POLICY_LOOKUP_NAMES) for invalid machine returned 0x%08x\n", status);
++       "LsaOpenPolicy(POLICY_LOOKUP_NAMES) for invalid machine returned 0x%08lx\n", status);
 +
      status = LsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle);
      ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,

patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch

@@ -1,4 +1,4 @@
-From eddc40dbf4048ceea1fda7f842adad340865723b Mon Sep 17 00:00:00 2001
+From e6c1c1fe3fe2f4fe7d3e421b94d925c40063af22 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 5 Jul 2019 13:20:23 +0800
 Subject: [PATCH] cryptext: Implement CryptExtOpenCER.
@@ -17,10 +17,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  create mode 100644 dlls/cryptext/tests/cryptext.c
 
 diff --git a/configure b/configure
-index 6425e4da5f8..c97671cdfc6 100755
+index ca6e87d4740..7033499399f 100755
 --- a/configure
 +++ b/configure
-@@ -21346,6 +21346,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -21660,6 +21660,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
  wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg
  wine_fn_config_makefile dlls/cryptdll enable_cryptdll
  wine_fn_config_makefile dlls/cryptext enable_cryptext
@@ -29,10 +29,10 @@ index 6425e4da5f8..c97671cdfc6 100755
  wine_fn_config_makefile dlls/cryptnet/tests enable_tests
  wine_fn_config_makefile dlls/cryptowinrt enable_cryptowinrt
 diff --git a/configure.ac b/configure.ac
-index b5a3b0069fb..73b1b1c8c2b 100644
+index cba55126869..57064a05fe5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2450,6 +2450,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -2477,6 +2477,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
@@ -41,7 +41,7 @@ index b5a3b0069fb..73b1b1c8c2b 100644
  WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptowinrt)
 diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
-index 0ec2b8a2045..76accca43eb 100644
+index 5598bfb78e0..acda4e4ac6d 100644
 --- a/dlls/cryptext/Makefile.in
 +++ b/dlls/cryptext/Makefile.in
 @@ -1,4 +1,5 @@
@@ -151,13 +151,13 @@ index 537ba66cd3b..a4314518eac 100644
 +}
 diff --git a/dlls/cryptext/tests/Makefile.in b/dlls/cryptext/tests/Makefile.in
 new file mode 100644
-index 00000000000..522fc60a4af
+index 00000000000..c3f4551fc00
 --- /dev/null
 +++ b/dlls/cryptext/tests/Makefile.in
 @@ -0,0 +1,4 @@
 +TESTDLL = cryptext.dll
 +
-+C_SRCS = \
++SOURCES = \
 +	cryptext.c
 diff --git a/dlls/cryptext/tests/cryptext.c b/dlls/cryptext/tests/cryptext.c
 new file mode 100644
@@ -227,5 +227,5 @@ index 00000000000..ab1007dbd82
 +    test_CryptExtOpenCER();
 +}
 -- 
-2.35.1
+2.43.0
 

patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch

@@ -39,7 +39,7 @@ index b81fb6863d3..75ee6d44a95 100644
 +        FIXME("Skinning vertices with two position elements not supported\n");
 +
 +    if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) {
-+        FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK);
++        FIXME("Vertex type %#lx not supported\n", skin->fvf & D3DFVF_POSITION_MASK);
 +        return E_FAIL;
 +    }
 +

patches/explorer-Video_Registry_Key/0001-explorer-Create-CurrentControlSet-Control-Video-regi.patch

@@ -24,7 +24,7 @@ index 30a79368c94..fc2069c389a 100644
 +    /* System\CurrentControlSet\Control\Video should be non-volatile */
 +    ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Video\\Wine",
 +                          0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL);
-+    ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret);
++    ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %lx\n", ret);
 +    RegDeleteKeyA(hkey1, "");
 +    RegCloseKey(hkey1);
 +

patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-virtual-memory-allocation-order.patch

@@ -1,4 +1,4 @@
-From 22f53694277313639b0ca00f6f075407839737e7 Mon Sep 17 00:00:00 2001
+From 8f9e309dc4b3e9c7328c86cc4993b9359f0e6839 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Mon, 25 Nov 2019 12:19:20 +0300
 Subject: [PATCH] ntdll: Force virtual memory allocation order.
@@ -16,10 +16,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46568
  1 file changed, 164 insertions(+), 246 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 30d0df85fba..a14bbb852f8 100644
+index cd1655d41b2..c0537375ab8 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1246,43 +1246,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
+@@ -1241,43 +1241,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
  }
  
  
@@ -71,7 +71,7 @@ index 30d0df85fba..a14bbb852f8 100644
  
  /***********************************************************************
   *           try_map_free_area
-@@ -1317,112 +1289,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1312,112 +1284,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
  }
  
  
@@ -184,7 +184,7 @@ index 30d0df85fba..a14bbb852f8 100644
  /***********************************************************************
   *           remove_reserved_area
   *
-@@ -1532,8 +1398,7 @@ static void free_view( struct file_view *view )
+@@ -1527,8 +1393,7 @@ static void free_view( struct file_view *view )
   */
  static void unregister_view( struct file_view *view )
  {
@@ -194,7 +194,7 @@ index 30d0df85fba..a14bbb852f8 100644
      wine_rb_remove( &views_tree, &view->entry );
  }
  
-@@ -1561,8 +1426,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
+@@ -1556,8 +1421,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
  static void register_view( struct file_view *view )
  {
      wine_rb_put( &views_tree, view->base, &view->entry );
@@ -204,7 +204,7 @@ index 30d0df85fba..a14bbb852f8 100644
  }
  
  
-@@ -1835,89 +1699,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
+@@ -1830,89 +1694,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
      return ptr;
  }
  
@@ -442,12 +442,12 @@ index 30d0df85fba..a14bbb852f8 100644
  }
  
  /***********************************************************************
-@@ -2020,48 +1971,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -2016,48 +1967,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
      }
      else
      {
 -        void *start = address_space_start;
--        void *end = user_space_limit;
+-        void *end = min( user_space_limit, host_addr_space_limit );
 -        size_t view_size, unmap_size;
 -
 +        limit_high = limit_high ? min( limit_high + 1, (UINT_PTR)user_space_limit) : (UINT_PTR)user_space_limit;
@@ -464,7 +464,7 @@ index 30d0df85fba..a14bbb852f8 100644
 -            goto done;
 -        }
  
--        if (start > address_space_start || end < address_space_limit || top_down)
+-        if (start > address_space_start || end < host_addr_space_limit || top_down)
 -        {
 -            if (!(ptr = map_free_area( start, end, size, top_down, get_unix_prot(vprot), align_mask )))
 -                return STATUS_NO_MEMORY;
@@ -495,7 +495,7 @@ index 30d0df85fba..a14bbb852f8 100644
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
      return status;
-@@ -3213,6 +3129,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
+@@ -3236,6 +3152,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
  done:
      server_leave_uninterrupted_section( &virtual_mutex, &sigset );
      if (needs_close) close( unix_handle );
@@ -503,7 +503,7 @@ index 30d0df85fba..a14bbb852f8 100644
      return res;
  }
  
-@@ -6110,6 +6027,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
+@@ -6143,6 +6060,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
          *ret = (ULONG_PTR)base;
          *size_ptr = size;
      }

patches/ntdll-ForceBottomUpAlloc/0004-ntdll-Exclude-natively-mapped-areas-from-free-areas-.patch

@@ -1,4 +1,4 @@
-From 7c62f566f9b48dacab5cc79dac496f498aaae68b Mon Sep 17 00:00:00 2001
+From d13a3f4498ddc7f10a1d435edb5c59b71dca1efc Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Fri, 1 Dec 2023 14:55:20 -0600
 Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
@@ -8,7 +8,7 @@ Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
  1 file changed, 95 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index a14bbb852f8..491597dcb76 100644
+index c0537375ab8..b4d7f6a580d 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
 @@ -127,6 +127,7 @@ struct file_view
@@ -19,8 +19,8 @@ index a14bbb852f8..491597dcb76 100644
  
  /* Conversion from VPROT_* to Win32 flags */
  static const BYTE VIRTUAL_Win32Flags[16] =
-@@ -180,6 +181,8 @@ static void *working_set_limit   = (void *)0x7fff0000;
- #endif
+@@ -175,6 +176,8 @@ static void *working_set_limit   = (void *)0x7fff0000;
+ static void *host_addr_space_limit;  /* top of the host virtual address space */
  
  static struct file_view *arm64ec_view;
 +static const ptrdiff_t max_try_map_step = 0x40000000;
@@ -28,7 +28,7 @@ index a14bbb852f8..491597dcb76 100644
  
  ULONG_PTR user_space_wow_limit = 0;
  struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000;
-@@ -1134,7 +1137,9 @@ static void dump_view( struct file_view *view )
+@@ -1129,7 +1132,9 @@ static void dump_view( struct file_view *view )
      BYTE prot = get_page_vprot( addr );
  
      TRACE( "View: %p - %p", addr, addr + view->size - 1 );
@@ -39,7 +39,7 @@ index a14bbb852f8..491597dcb76 100644
          TRACE( " (builtin image)\n" );
      else if (view->protect & VPROT_FREE_PLACEHOLDER)
          TRACE( " (placeholder)\n" );
-@@ -1254,6 +1259,8 @@ struct alloc_area
+@@ -1249,6 +1254,8 @@ struct alloc_area
      int unix_prot;
      BOOL top_down;
      UINT_PTR align_mask;
@@ -48,7 +48,7 @@ index a14bbb852f8..491597dcb76 100644
  };
  
  /***********************************************************************
-@@ -1262,9 +1269,12 @@ struct alloc_area
+@@ -1257,9 +1264,12 @@ struct alloc_area
   * Try mmaping some expected free memory region, eventually stepping and
   * retrying inside it, and return where it actually succeeded, or NULL.
   */
@@ -63,7 +63,7 @@ index a14bbb852f8..491597dcb76 100644
      void *ptr;
  
      while (start && base <= start && (char*)start + size <= (char*)end)
-@@ -1277,12 +1287,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1272,12 +1282,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
                   strerror(errno), start, (char *)start + size, unix_prot );
              return NULL;
          }
@@ -84,7 +84,7 @@ index a14bbb852f8..491597dcb76 100644
      }
  
      return NULL;
-@@ -1707,11 +1724,11 @@ static void *try_map_free_area_range( struct alloc_area *area, char *start, char
+@@ -1702,11 +1719,11 @@ static void *try_map_free_area_range( struct alloc_area *area, char *start, char
      {
          if (end - start < area->size) return NULL;
          alloc_start = ROUND_ADDR( end - area->size, area->align_mask );
@@ -98,7 +98,7 @@ index a14bbb852f8..491597dcb76 100644
  }
  
  static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char *end )
-@@ -1801,9 +1818,10 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
+@@ -1796,9 +1813,10 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
      struct range_entry *range, *ranges_start, *ranges_end;
      char *reserve_start, *reserve_end;
      struct alloc_area area;
@@ -110,7 +110,7 @@ index a14bbb852f8..491597dcb76 100644
  
      TRACE("limit %p-%p, size %p, top_down %#x.\n", limit_low, limit_high, (void *)size, top_down);
  
-@@ -1868,6 +1886,50 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
+@@ -1863,6 +1881,50 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
          if ((result = alloc_free_area_in_range( &area, base, end )))
              break;
      }
@@ -161,7 +161,7 @@ index a14bbb852f8..491597dcb76 100644
      return result;
  }
  
-@@ -1927,6 +1989,17 @@ failed:
+@@ -1922,6 +1984,17 @@ failed:
      return status;
  }
  
@@ -179,7 +179,7 @@ index a14bbb852f8..491597dcb76 100644
  /***********************************************************************
   *           map_view
   *
-@@ -1976,7 +2049,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -1972,7 +2045,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
          if (!align_mask) align_mask = granularity_mask;
  
          if (!(ptr = alloc_free_area( (void *)limit_low, (void *)limit_high, size, top_down, get_unix_prot( vprot ), align_mask )))
@@ -196,7 +196,7 @@ index a14bbb852f8..491597dcb76 100644
      }
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
-@@ -4255,7 +4336,12 @@ void virtual_set_force_exec( BOOL enable )
+@@ -4287,7 +4368,12 @@ void virtual_set_force_exec( BOOL enable )
          WINE_RB_FOR_EACH_ENTRY( view, &views_tree, struct file_view, entry )
          {
              /* file mappings are always accessible */

patches/ntdll-NtDevicePath/0001-ntdll-Implement-opening-files-through-nt-device-path.patch

@@ -44,7 +44,7 @@ index af67e8d75bf..608b64a32ad 100644
 +    GetWindowsDirectoryW( path, MAX_PATH );
 +    path[2] = 0;
 +    ok( QueryDosDeviceW( path, temp, MAX_PATH ),
-+        "QueryDosDeviceW failed with error %u\n", GetLastError() );
++        "QueryDosDeviceW failed with error %lx\n", GetLastError() );
 +    lstrcatW( temp, sepW );
 +    lstrcatW( temp, path+3 );
 +    lstrcatW( temp, sepW );
@@ -53,12 +53,12 @@ index af67e8d75bf..608b64a32ad 100644
 +    pRtlInitUnicodeString( &nameW, temp );
 +    status = pNtQueryFullAttributesFile( &attr, &info );
 +    ok( status == STATUS_SUCCESS,
-+        "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
++        "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
 +
 +    pRtlInitUnicodeString( &nameW, systemrootExplorerW );
 +    status = pNtQueryFullAttributesFile( &attr, &info );
 +    ok( status == STATUS_SUCCESS,
-+        "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
++        "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
  }
  
  static void open_file_test(void)

patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -81,14 +81,14 @@ index 442ad729540..dcdac2a936a 100644
 +
 +    size1 = size2 = MAX_PATH * sizeof(WCHAR);
 +    status = pRtlQueryPackageIdentity((HANDLE)~(ULONG_PTR)3, buf1, &size1, buf2, &size2, NULL);
-+    ok(status == STATUS_NOT_FOUND, "expected STATUS_NOT_FOUND, got %08x\n", status);
++    ok(status == STATUS_NOT_FOUND, "expected STATUS_NOT_FOUND, got %08lx\n", status);
 +
 +    CoInitializeEx(0, COINIT_APARTMENTTHREADED);
 +    hr = CoCreateInstance(&CLSID_ApplicationActivationManager, NULL, CLSCTX_LOCAL_SERVER,
 +                          &IID_IApplicationActivationManager, (void **)&manager);
 +    if (FAILED(hr))
 +    {
-+        todo_wine win_skip("Failed to create ApplicationActivationManager (%x)\n", hr);
++        todo_wine win_skip("Failed to create ApplicationActivationManager (%lx)\n", hr);
 +        goto done;
 +    }
 +
@@ -96,28 +96,28 @@ index 442ad729540..dcdac2a936a 100644
 +                                                           AO_NOERRORUI, &processid);
 +    if (FAILED(hr))
 +    {
-+        todo_wine win_skip("Failed to start program (%x)\n", hr);
++        todo_wine win_skip("Failed to start program (%lx)\n", hr);
 +        IApplicationActivationManager_Release(manager);
 +        goto done;
 +    }
 +
 +    process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE, FALSE, processid);
-+    ok(process != NULL, "OpenProcess failed with %u\n", GetLastError());
++    ok(process != NULL, "OpenProcess failed with %lx\n", GetLastError());
 +    ret = OpenProcessToken(process, TOKEN_QUERY, &token);
-+    ok(ret, "OpenProcessToken failed with error %u\n", GetLastError());
++    ok(ret, "OpenProcessToken failed with error %lx\n", GetLastError());
 +
 +    size1 = size2 = MAX_PATH * sizeof(WCHAR);
 +    status = pRtlQueryPackageIdentity(token, buf1, &size1, buf2, &size2, NULL);
-+    ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
++    ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
 +
 +    ok(!memcmp(buf1, fullnameW, sizeof(fullnameW) - sizeof(WCHAR)),
 +       "Expected buf1 to begin with %s, got %s\n", wine_dbgstr_w(fullnameW), wine_dbgstr_w(buf1));
-+    ok(size1 >= sizeof(WCHAR) && !(size1 % sizeof(WCHAR)), "Unexpected size1 = %lu\n", size1);
-+    ok(buf1[size1 / sizeof(WCHAR) - 1] == 0, "Expected buf1[%lu] == 0\n", size1 / sizeof(WCHAR) - 1);
++    ok(size1 >= sizeof(WCHAR) && !(size1 % sizeof(WCHAR)), "Unexpected size1 = %Iu\n", size1);
++    ok(buf1[size1 / sizeof(WCHAR) - 1] == 0, "Expected buf1[%Iu] == 0\n", size1 / sizeof(WCHAR) - 1);
 +
 +    ok(!lstrcmpW(buf2, appidW), "Expected buf2 to be %s, got %s\n", wine_dbgstr_w(appidW), wine_dbgstr_w(buf2));
-+    ok(size2 >= sizeof(WCHAR) && !(size2 % sizeof(WCHAR)), "Unexpected size2 = %lu\n", size2);
-+    ok(buf2[size2 / sizeof(WCHAR) - 1] == 0, "Expected buf2[%lu] == 0\n", size2 / sizeof(WCHAR) - 1);
++    ok(size2 >= sizeof(WCHAR) && !(size2 % sizeof(WCHAR)), "Unexpected size2 = %Iu\n", size2);
++    ok(buf2[size2 / sizeof(WCHAR) - 1] == 0, "Expected buf2[%Iu] == 0\n", size2 / sizeof(WCHAR) - 1);
 +
 +    CloseHandle(token);
 +    TerminateProcess(process, 0);

patches/odbc-remove-unixodbc/0004-odbc32-Add-initial-tests.patch

@@ -1,22 +1,22 @@
-From 648d4f13e26a076feca219b76111c03262504d95 Mon Sep 17 00:00:00 2001
+From 9491dc2b72947bef59d8fb191fdc27a96bcc1c68 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 3 Feb 2023 14:16:21 +1100
-Subject: [PATCH 04/42] odbc32: Add initial tests
+Subject: [PATCH] odbc32: Add initial tests
 
 ---
  configure                      |   1 +
  configure.ac                   |   1 +
- dlls/odbc32/tests/Makefile.in  |   4 +
+ dlls/odbc32/tests/Makefile.in  |   5 +
  dlls/odbc32/tests/connection.c | 165 +++++++++++++++++++++++++++++++++
- 4 files changed, 171 insertions(+)
+ 4 files changed, 172 insertions(+)
  create mode 100644 dlls/odbc32/tests/Makefile.in
  create mode 100644 dlls/odbc32/tests/connection.c
 
 diff --git a/configure b/configure
-index 66e607337db..40b93ce0490 100755
+index ca6e87d4740..027f3fbe53d 100755
 --- a/configure
 +++ b/configure
-@@ -21634,6 +21634,7 @@ wine_fn_config_makefile dlls/ntprint enable_ntprint
+@@ -22137,6 +22137,7 @@ wine_fn_config_makefile dlls/ntprint enable_ntprint
  wine_fn_config_makefile dlls/ntprint/tests enable_tests
  wine_fn_config_makefile dlls/objsel enable_objsel
  wine_fn_config_makefile dlls/odbc32 enable_odbc32
@@ -25,10 +25,10 @@ index 66e607337db..40b93ce0490 100755
  wine_fn_config_makefile dlls/odbccp32 enable_odbccp32
  wine_fn_config_makefile dlls/odbccp32/tests enable_tests
 diff --git a/configure.ac b/configure.ac
-index 1033af2e613..249ea8b3f05 100644
+index cba55126869..fc09d145ee7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2898,6 +2898,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntprint)
+@@ -2954,6 +2954,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntprint)
  WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
  WINE_CONFIG_MAKEFILE(dlls/objsel)
  WINE_CONFIG_MAKEFILE(dlls/odbc32)
@@ -38,14 +38,15 @@ index 1033af2e613..249ea8b3f05 100644
  WINE_CONFIG_MAKEFILE(dlls/odbccp32/tests)
 diff --git a/dlls/odbc32/tests/Makefile.in b/dlls/odbc32/tests/Makefile.in
 new file mode 100644
-index 00000000000..4d8716ed2ed
+index 00000000000..d7a300417a0
 --- /dev/null
 +++ b/dlls/odbc32/tests/Makefile.in
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,5 @@
 +TESTDLL   = odbc32.dll
 +IMPORTS   = odbc32
 +
-+C_SRCS = connection.c
++SOURCES = \
++	connection.c
 diff --git a/dlls/odbc32/tests/connection.c b/dlls/odbc32/tests/connection.c
 new file mode 100644
 index 00000000000..b04d93c42c5
@@ -218,5 +219,5 @@ index 00000000000..b04d93c42c5
 +    test_SQLGetDiagRec();
 +}
 -- 
-2.39.1
+2.43.0
 

patches/server-File_Permissions/0004-advapi32-tests-Add-tests-for-ACL-inheritance-in-Crea.patch

@@ -20,7 +20,7 @@ index 2147d0f1700..cd039c734e9 100644
 +    strcpy(tmpfile, tmpdir);
 +    lstrcatA(tmpfile, "/tmpdir");
 +    bret = CreateDirectoryA(tmpfile, NULL);
-+    ok(bret == TRUE, "CreateDirectoryA failed with error %u\n", GetLastError());
++    ok(bret == TRUE, "CreateDirectoryA failed with error %lx\n", GetLastError());
 +
 +    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
 +                                   OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
@@ -31,7 +31,7 @@ index 2147d0f1700..cd039c734e9 100644
 +                        0x1f01ff, TRUE, TRUE, TRUE, __LINE__);
 +    LocalFree(pSD);
 +    bret = RemoveDirectoryA(tmpfile);
-+    ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
++    ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
 +
 +    /* Test inheritance of ACLs in CreateDirectory with security descriptor */
 +    pSD = &sd;
@@ -49,7 +49,7 @@ index 2147d0f1700..cd039c734e9 100644
 +    sa.lpSecurityDescriptor = pSD;
 +    sa.bInheritHandle = TRUE;
 +    bret = CreateDirectoryA(tmpfile, &sa);
-+    ok(bret == TRUE, "CreateDirectoryA failed with error %u\n", GetLastError());
++    ok(bret == TRUE, "CreateDirectoryA failed with error %lx\n", GetLastError());
 +    HeapFree(GetProcessHeap(), 0, pDacl);
 +
 +    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
@@ -59,7 +59,7 @@ index 2147d0f1700..cd039c734e9 100644
 +    bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
 +    ok(bret, "GetAclInformation failed\n");
 +    todo_wine
-+    ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
++    ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
 +                               acl_size.AceCount);
 +    LocalFree(pSD);
 +
@@ -67,7 +67,7 @@ index 2147d0f1700..cd039c734e9 100644
 +    bret = RemoveDirectoryA(tmpfile);
 +    error = GetLastError();
 +    ok(bret == FALSE, "RemoveDirectoryA unexpected succeeded\n");
-+    ok(error == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %u\n", error);
++    ok(error == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %ld\n", error);
 +
 +    pSD = &sd;
 +    InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION);
@@ -80,11 +80,11 @@ index 2147d0f1700..cd039c734e9 100644
 +    ok(bret, "Failed to add ACL to security desciptor.\n");
 +    error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL,
 +                                   NULL, pDacl, NULL);
-+    ok(error == ERROR_SUCCESS, "SetNamedSecurityInfoA failed with error %u\n", error);
++    ok(error == ERROR_SUCCESS, "SetNamedSecurityInfoA failed with error %ld\n", error);
 +    HeapFree(GetProcessHeap(), 0, pDacl);
 +
 +    bret = RemoveDirectoryA(tmpfile);
-+    ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
++    ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
 +
  done:
      HeapFree(GetProcessHeap(), 0, user);

patches/server-File_Permissions/0005-advapi32-tests-Add-ACL-inheritance-tests-for-creatin.patch

@@ -14,7 +14,7 @@ index 36ef972..a0532f6 100644
 +++ b/dlls/advapi32/tests/security.c
 @@ -3474,6 +3474,82 @@ static void test_CreateDirectoryA(void)
      bret = RemoveDirectoryA(tmpfile);
-     ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
+     ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
  
 +    /* Test inheritance of ACLs in NtCreateFile(..., FILE_DIRECTORY_FILE, ...) without security descriptor */
 +    strcpy(tmpfile, tmpdir);
@@ -30,7 +30,7 @@ index 36ef972..a0532f6 100644
 +
 +    status = pNtCreateFile(&hTemp, GENERIC_READ | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL,
 +                           FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, NULL, 0);
-+    ok(!status, "NtCreateFile failed with %08x\n", status);
++    ok(!status, "NtCreateFile failed with %08lx\n", status);
 +    RtlFreeUnicodeString(&tmpfileW);
 +
 +    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
@@ -65,7 +65,7 @@ index 36ef972..a0532f6 100644
 +
 +    status = pNtCreateFile(&hTemp, GENERIC_READ | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL,
 +                           FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, NULL, 0);
-+    ok(!status, "NtCreateFile failed with %08x\n", status);
++    ok(!status, "NtCreateFile failed with %08lx\n", status);
 +    RtlFreeUnicodeString(&tmpfileW);
 +    HeapFree(GetProcessHeap(), 0, pDacl);
 +
@@ -76,18 +76,18 @@ index 36ef972..a0532f6 100644
 +    bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
 +    ok(bret, "GetAclInformation failed\n");
 +    todo_wine
-+    ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
++    ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
 +                               acl_size.AceCount);
 +    LocalFree(pSD);
 +
 +    error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
 +                                   OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
 +                                   (PSID *)&owner, NULL, &pDacl, NULL, &pSD);
-+    ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error);
++    ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
 +    bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
 +    ok(bret, "GetAclInformation failed\n");
 +    todo_wine
-+    ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
++    ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
 +                               acl_size.AceCount);
 +    LocalFree(pSD);
 +    CloseHandle(hTemp);

patches/server-File_Permissions/0006-ntdll-tests-Added-tests-for-open-behaviour-on-readon.patch

@@ -40,52 +40,52 @@ index 35fab8ca427..5d6f9b83152 100644
 +
 +    status = pNtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, FILE_ATTRIBUTE_READONLY,
 +                           FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_CREATE, 0, NULL, 0);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, GENERIC_WRITE,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_ACCESS_DENIED, "got %#x\n", status);
++    ok(status == STATUS_ACCESS_DENIED, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, GENERIC_READ,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, FILE_READ_ATTRIBUTES,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, FILE_WRITE_ATTRIBUTES,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    todo_wine ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, DELETE,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, READ_CONTROL,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, WRITE_DAC,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, WRITE_OWNER,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle(handle);
 +
 +    status = pNtOpenFile(&handle, SYNCHRONIZE,  &attr, &io,
 +                         FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
 +    CloseHandle( handle );
 +
 +    pRtlFreeUnicodeString(&nameW);

patches/server-File_Permissions/0007-server-FILE_WRITE_ATTRIBUTES-should-succeed-for-read.patch

@@ -16,8 +16,8 @@ index d365303..8ec367b 100644
  
      status = pNtOpenFile(&handle, FILE_WRITE_ATTRIBUTES,  &attr, &io,
                           FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
--    todo_wine ok(status == STATUS_SUCCESS, "got %#x\n", status);
-+    ok(status == STATUS_SUCCESS, "got %#x\n", status);
+-    todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status);
++    ok(status == STATUS_SUCCESS, "got %#lx\n", status);
      CloseHandle(handle);
  
      status = pNtOpenFile(&handle, DELETE,  &attr, &io,

patches/server-Inherited_ACLs/0001-server-Inherit-security-attributes-from-parent-direc.patch

@@ -39,7 +39,7 @@ index d2ce3803bf6..7794e6735f3 100644
 +                        0x1f01ff, FALSE, FALSE, FALSE, __LINE__);
      LocalFree(pSD);
      bret = RemoveDirectoryA(tmpfile);
-     ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
+     ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
 @@ -3859,7 +3859,7 @@ static void test_CreateDirectoryA(void)
      ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n");
      test_inherited_dacl(pDacl, admin_sid, user_sid,

patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch

@@ -36,7 +36,7 @@ index 4b9e02af826..1e82353cfd0 100644
      bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
      ok(bret, "GetAclInformation failed\n");
 -    todo_wine
-     ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
+     ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
                                 acl_size.AceCount);
      LocalFree(pSD);
 @@ -5024,23 +5021,22 @@ static void test_GetSecurityInfo(void)

patches/user32-LoadKeyboardLayoutEx/0001-user32-Added-LoadKeyboardLayoutEx-stub.patch

@@ -22,7 +22,7 @@ index 8b2ae805aa..a789108a86 100644
 + */
 +HKL WINAPI LoadKeyboardLayoutEx(DWORD unknown, const WCHAR *locale, UINT flags)
 +{
-+    FIXME("(%d, %s, %x) semi-stub!\n", unknown, debugstr_w(locale), flags);
++    FIXME("(%ld, %s, %x) semi-stub!\n", unknown, debugstr_w(locale), flags);
 +    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 +    return LoadKeyboardLayoutW(locale, flags);
 +}

patches/user32-Mouse_Message_Hwnd/0004-user32-tests-Add-tests-for-DC-region.patch

@@ -41,7 +41,7 @@ index f3e5c14ea6c..082ac59544a 100644
  
 +    static_win = CreateWindowA("static", "Title", WS_VISIBLE | WS_CHILD,
 +                          10, 10, 20, 20, hwnd, NULL, NULL, NULL);
-+    ok(static_win != NULL, "CreateWindowA failed %u\n", GetLastError());
++    ok(static_win != NULL, "CreateWindowA failed %lx\n", GetLastError());
 +
      SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
      SetWindowLongA(hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);

patches/vkd3d-latest/0001-Updated-vkd3d-to-45679a966c73669bdb7fa371569dcc34a44.patch

@@ -1,4 +1,4 @@
-From b68e960703095111f31a57b291a710a7be409745 Mon Sep 17 00:00:00 2001
+From 4ac1439386bfba7bf93556d32be02ae56643efb5 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 8 Dec 2023 13:21:19 +1100
 Subject: [PATCH] Updated vkd3d to 45679a966c73669bdb7fa371569dcc34a448d8d4.

patches/vkd3d-latest/0002-Updated-vkd3d-to-1015cc952e42828d79a68cfa0e659cac537.patch

@@ -1,4 +1,4 @@
-From 81c388b185d602d9c66222118abe9dcbd3742a47 Mon Sep 17 00:00:00 2001
+From e860d3e97d558b909a3162629d45926260497bab Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 13 Dec 2023 09:32:05 +1100
 Subject: [PATCH] Updated vkd3d to 1015cc952e42828d79a68cfa0e659cac53772676.

patches/vkd3d-latest/0003-Updated-vkd3d-to-21491d1bbb168da8aeaa7bdde6e5f182b22.patch

@@ -1,4 +1,4 @@
-From b2905d22ada20f34d244cac51b1e95f74f3fa85a Mon Sep 17 00:00:00 2001
+From 9f12a2158273f6dda33aa5e74fa2853acaeb5a63 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 14 Dec 2023 10:07:09 +1100
 Subject: [PATCH] Updated vkd3d to 21491d1bbb168da8aeaa7bdde6e5f182b2205558.