From 871d14f88b7ef588c9980bdb2f3889e54cdb8323 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Wed, 28 Jul 2021 11:39:46 +0200
Subject: [PATCH] gdi32: Use get_dc_attr in GetGraphicsMode.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/gdi32/dc.c    | 16 ----------------
 dlls/gdi32/gdidc.c |  9 +++++++++
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 3f7806735e2..3725bd1abf6 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -982,22 +982,6 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp )
 }
 
 
-/***********************************************************************
- *		GetGraphicsMode (GDI32.@)
- */
-INT WINAPI GetGraphicsMode( HDC hdc )
-{
-    INT ret = 0;
-    DC * dc = get_dc_ptr( hdc );
-    if (dc)
-    {
-        ret = dc->attr->graphics_mode;
-        release_dc_ptr( dc );
-    }
-    return ret;
-}
-
-
 /***********************************************************************
  *           SetGraphicsMode    (GDI32.@)
  */
diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c
index 10ba4d1eaac..d16d6c8d94a 100644
--- a/dlls/gdi32/gdidc.c
+++ b/dlls/gdi32/gdidc.c
@@ -106,6 +106,15 @@ INT WINAPI SetBkMode( HDC hdc, INT mode )
     return ret;
 }
 
+/***********************************************************************
+ *		GetGraphicsMode (GDI32.@)
+ */
+INT WINAPI GetGraphicsMode( HDC hdc )
+{
+    DC_ATTR *dc_attr = get_dc_attr( hdc );
+    return dc_attr ? dc_attr->graphics_mode : 0;
+}
+
 /***********************************************************************
  *           GetLayout    (GDI32.@)
  */