Rebase against f63ecaedc72f3580e7016ba71a480025e4d86e99.

patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch

@@ -1,4 +1,4 @@
-From bd090a3f2ad10406f2e5172f87c3e64d3122298a Mon Sep 17 00:00:00 2001
+From 12860d721c1d0b07d717da5816713832fad3b6a8 Mon Sep 17 00:00:00 2001
 From: Daniel Wendt <daniel.wendt@linux.com>
 Date: Fri, 15 Nov 2013 12:52:37 +0100
 Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
@@ -116,12 +116,12 @@ index c6f11ae6a69..e4a5f7bab8b 100644
      {
          HeapFree( GetProcessHeap(), 0, points );
 diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
-index 53a4ba267d4..5938f047eb7 100644
+index 489f4475736..d830261e13e 100644
 --- a/dlls/gdi32/gdi_private.h
 +++ b/dlls/gdi32/gdi_private.h
-@@ -148,4 +148,7 @@ extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDE
- extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN;
- extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN;
+@@ -175,4 +175,7 @@ extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HI
+ extern BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN;
+ extern BOOL EMFDC_SetWindowOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN;
  
 +BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform ) DECLSPEC_HIDDEN;
 +BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation ) DECLSPEC_HIDDEN;

patches/ntdll-Junction_Points/0015-kernelbase-Convert-FILE_FLAG_OPEN_REPARSE_POINT-for-.patch

@@ -1,4 +1,4 @@
-From 78a4666b1a010b45f8ac13cd4be3d4cdecb3dfdc Mon Sep 17 00:00:00 2001
+From 38208bd58f6c39d87fec031bd9cc996d60416614 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Sun, 22 Nov 2020 22:35:50 -0700
 Subject: [PATCH] kernelbase: Convert FILE_FLAG_OPEN_REPARSE_POINT for passing
@@ -9,11 +9,11 @@ Subject: [PATCH] kernelbase: Convert FILE_FLAG_OPEN_REPARSE_POINT for passing
  1 file changed, 2 insertions(+)
 
 diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
-index e0a75c2ad08..7eabf5aa211 100644
+index d21ad299d1f..eecc23f48fc 100644
 --- a/dlls/kernelbase/file.c
 +++ b/dlls/kernelbase/file.c
-@@ -725,6 +725,8 @@ static UINT get_nt_file_options( DWORD attributes )
-         options |= FILE_RANDOM_ACCESS;
+@@ -727,6 +727,8 @@ static UINT get_nt_file_options( DWORD attributes )
+         options |= FILE_SEQUENTIAL_ONLY;
      if (attributes & FILE_FLAG_WRITE_THROUGH)
          options |= FILE_WRITE_THROUGH;
 +    if (attributes & FILE_FLAG_OPEN_REPARSE_POINT)

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "3f2850aeaa159270384764843cdb1dc3cbe902c6"
+	echo "f63ecaedc72f3580e7016ba71a480025e4d86e99"
 }
 
 # Show version information
@@ -3733,12 +3733,11 @@ fi
 # |   *	[#33037] Visual Studio 6 can't be installed with WinVer >= Win2K (missing HKEY_PERFORMANCE_DATA 230, process object)
 # |
 # | Modified files:
-# |   *	dlls/advapi32/tests/registry.c, loader/wine.inf.in
+# |   *	loader/wine.inf.in
 # |
 if test "$enable_wine_inf_Performance" -eq 1; then
 	patch_apply wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch
 	patch_apply wine.inf-Performance/0002-wine.inf-Add-Counters-to-the-perflib-key-as-an-alias.patch
-	patch_apply wine.inf-Performance/0003-advapi32-tests-Add-test-for-perflib-registry-key.patch
 fi
 
 # Patchset wineboot-HKEY_DYN_DATA

patches/wine.inf-Performance/0003-advapi32-tests-Add-test-for-perflib-registry-key.patch

@@ -1,63 +0,0 @@
-From 5a0796af64d474437f7c26620efe6560f8961b55 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 29 May 2017 01:59:36 +0200
-Subject: advapi32/tests: Add test for perflib registry key.
-
----
- dlls/advapi32/tests/registry.c | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index ddde9059222..f6b7736c83c 100644
---- a/dlls/advapi32/tests/registry.c
-+++ b/dlls/advapi32/tests/registry.c
-@@ -3293,6 +3293,38 @@ static void test_classesroot_mask(void)
-     RegCloseKey( hkey );
- }
- 
-+static void test_perflib_key(void)
-+{
-+    DWORD size;
-+    LONG ret;
-+    HKEY key;
-+
-+    ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009", &key);
-+    ok(ret == ERROR_SUCCESS, "RegOpenKeyA failed with error %u\n", ret);
-+
-+    ret = RegQueryValueExA(key, "Counter", NULL, NULL, NULL, &size);
-+    if (ret != ERROR_SUCCESS)
-+    {
-+        skip("Perflib\\009\\Counter does not exist, skipping perflib test\n");
-+        goto done;
-+    }
-+    ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed with error %u\n", ret);
-+
-+    /* Windows only compares the first few characters of the value name.
-+     * On Windows XP / 2003, it is sufficient to use "Cou", newer versions
-+     * require a longer substring. */
-+
-+    ret = RegQueryValueExA(key, "Counters", NULL, NULL, NULL, &size);
-+    ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed with error %u\n", ret);
-+    ret = RegQueryValueExA(key, "Counter2", NULL, NULL, NULL, &size);
-+    todo_wine ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed with error %u\n", ret);
-+    ret = RegQueryValueExA(key, "CounterWine", NULL, NULL, NULL, &size);
-+    todo_wine ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed with error %u\n", ret);
-+
-+done:
-+    RegCloseKey(key);
-+}
-+
- static void test_deleted_key(void)
- {
-     HKEY hkey, hkey2;
-@@ -3741,6 +3773,7 @@ START_TEST(registry)
-     test_classesroot();
-     test_classesroot_enum();
-     test_classesroot_mask();
-+    test_perflib_key();
-     test_reg_save_key();
-     test_reg_load_key();
-     test_reg_unload_key();
--- 
-2.12.2
-

staging/upstream-commit

@@ -1 +1 @@
-3f2850aeaa159270384764843cdb1dc3cbe902c6
+f63ecaedc72f3580e7016ba71a480025e4d86e99