Rebase against 49cde0995827b24aa9c1ef1b6a0372797f4166e0.

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

@@ -1,4 +1,4 @@
-From 8a91b7a88d96f735f7236afeed90c376a18f0eea Mon Sep 17 00:00:00 2001
+From a0a3c410b4917a8e5dcab1a2060ccae7c3f8c1e8 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
@@ -6,15 +6,15 @@ Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
 
 Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=34579
 ---
- dlls/gdi32/dibdrv/graphics.c | 80 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/gdi32/dibdrv/graphics.c | 80 ++++++++++++++++++++++++++++++++++++
  dlls/gdi32/gdi_private.h     |  3 ++
  2 files changed, 83 insertions(+)
 
 diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
-index 7d71fbb..d269cc1 100644
+index 62906dcfaf0..4792b3018aa 100644
 --- a/dlls/gdi32/dibdrv/graphics.c
 +++ b/dlls/gdi32/dibdrv/graphics.c
-@@ -313,6 +313,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end
+@@ -312,6 +312,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end
      return pos - count;
  }
  
@@ -75,7 +75,7 @@ index 7d71fbb..d269cc1 100644
  /* backend for arc functions; extra_lines is -1 for ArcTo, 0 for Arc, 1 for Chord, 2 for Pie */
  static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
                        INT start_x, INT start_y, INT end_x, INT end_y, INT extra_lines )
-@@ -325,6 +379,22 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
+@@ -324,6 +378,22 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
      BOOL ret = TRUE;
      HRGN outline = 0, interior = 0;
  
@@ -98,7 +98,7 @@ index 7d71fbb..d269cc1 100644
      if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
  
      width = rect.right - rect.left;
-@@ -358,6 +428,16 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
+@@ -357,6 +427,16 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
          points[count].y = rect.top + height / 2;
          count++;
      }
@@ -116,17 +116,17 @@ index 7d71fbb..d269cc1 100644
      {
          HeapFree( GetProcessHeap(), 0, points );
 diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
-index 920cd1e..4949187 100644
+index db33f33110f..dd14a665bcc 100644
 --- a/dlls/gdi32/gdi_private.h
 +++ b/dlls/gdi32/gdi_private.h
-@@ -608,4 +608,7 @@ extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN;
- 
- extern HMODULE gdi32_module DECLSPEC_HIDDEN;
+@@ -25,4 +25,7 @@
+ void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN;
+ void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) 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;
 +
  #endif /* __WINE_GDI_PRIVATE_H */
 -- 
-1.9.1
+2.30.2
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6763ed84cf0629dd7d1495263e1e3ea9aaf3d663"
+	echo "49cde0995827b24aa9c1ef1b6a0372797f4166e0"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-6763ed84cf0629dd7d1495263e1e3ea9aaf3d663
+49cde0995827b24aa9c1ef1b6a0372797f4166e0