[PATCH 0/3] MR2632: gdi: Support stock brushes in EMR_FILLRGN and EMR_FRAMERGN.

[PATCH 1/3] gdi32: Factor out function for obtaining gdi object handle.

[Piotr Caban]

From: Piotr Caban

---
 dlls/gdi32/enhmetafile.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index adbc9b296e7..608995ef5e2 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -768,6 +768,12 @@ static BOOL emr_produces_output(int type)
     }
 }

+static HGDIOBJ get_object_handle(HANDLETABLE *handletable, DWORD i)
+{
+    if (i & 0x80000000)
+        return GetStockObject( i & 0x7fffffff );
+    return handletable->objectHandle[i];
+}

/*****************************************************************************
  *           PlayEnhMetaFileRecord  (GDI32.@)
@@ -899,19 +905,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
     case EMR_SELECTOBJECT:
       {
    const EMRSELECTOBJECT *pSelectObject = (const EMRSELECTOBJECT *)mr;
-	if( pSelectObject->ihObject & 0x80000000 ) {
-	  /* High order bit is set - it's a stock object
-	   * Strip the high bit to get the index.
-	   * See MSDN article Q142319
-	   */
-	  SelectObject( hdc, GetStockObject( pSelectObject->ihObject &
-					     0x7fffffff ) );
-	} else {
-	  /* High order bit wasn't set - not a stock object
-	   */
-	      SelectObject( hdc,
-			(handletable->objectHandle)[pSelectObject->ihObject] );
-	}
+	SelectObject( hdc, get_object_handle(handletable, pSelectObject->ihObject) );
    break;
       }
     case EMR_DELETEOBJECT:
@@ -1297,11 +1291,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
       {
    const EMRSELECTPALETTE *lpSelectPal = (const EMRSELECTPALETTE *)mr;

-	if( lpSelectPal->ihPal & 0x80000000 ) {
-		SelectPalette( hdc, GetStockObject(lpSelectPal->ihPal & 0x7fffffff), TRUE);
-	} else {
-		SelectPalette( hdc, (handletable->objectHandle)[lpSelectPal->ihPal], TRUE);
-	}
+	SelectPalette( hdc, get_object_handle(handletable, lpSelectPal->ihPal), TRUE );
    break;
       }

[PATCH 2/3] gdi32: Support stock brush in EMR_FILLRGN.

[Piotr Caban]

From: Piotr Caban

---
 dlls/gdi32/enhmetafile.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index 608995ef5e2..51f3a306094 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -2191,9 +2191,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
     {
    const EMRFILLRGN *pFillRgn = (const EMRFILLRGN *)mr;
    HRGN hRgn = ExtCreateRegion(NULL, pFillRgn->cbRgnData, (const RGNDATA *)pFillRgn->RgnData);
-	FillRgn(hdc,
-		hRgn,
-		(handletable->objectHandle)[pFillRgn->ihBrush]);
+	FillRgn(hdc, hRgn, get_object_handle(handletable, pFillRgn->ihBrush));
    DeleteObject(hRgn);
    break;
     }

[PATCH 3/3] gdi32: Support stock brush in EMR_FRAMERGN.

[Piotr Caban]

From: Piotr Caban

---
 dlls/gdi32/enhmetafile.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index 51f3a306094..bab0d5739cc 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -2200,11 +2200,8 @@ BOOL WINAPI PlayEnhMetaFileRecord(
     {
    const EMRFRAMERGN *pFrameRgn = (const EMRFRAMERGN *)mr;
    HRGN hRgn = ExtCreateRegion(NULL, pFrameRgn->cbRgnData, (const RGNDATA *)pFrameRgn->RgnData);
-	FrameRgn(hdc,
-		 hRgn,
-		 (handletable->objectHandle)[pFrameRgn->ihBrush],
-		 pFrameRgn->szlStroke.cx,
-		 pFrameRgn->szlStroke.cy);
+	FrameRgn(hdc, hRgn, get_object_handle(handletable, pFrameRgn->ihBrush),
+		 pFrameRgn->szlStroke.cx, pFrameRgn->szlStroke.cy);
    DeleteObject(hRgn);
    break;
     }

[PATCH 0/3] MR2632: gdi: Support stock brushes in EMR_FILLRGN and EMR_FRAMERGN. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.