[ros-diffs] [jimtabor] 28239: Removed NtGdiGetRelAbs. Use GetDCDWord in gdi32. Update ntgdibad.h.

Author: jimtabor
Date: Wed Aug  8 06:20:43 2007
New Revision: 28239

URL: http://svn.reactos.org/svn/reactos?rev=28239&view=rev
Log:
Removed NtGdiGetRelAbs. Use GetDCDWord in gdi32. Update ntgdibad.h.

Modified:
    trunk/reactos/dll/win32/gdi32/include/gdi32p.h
    trunk/reactos/dll/win32/gdi32/objects/dc.c
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/subsystems/win32/win32k/objects/dc.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original)
+++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Wed Aug  8 06:20:43 2007
@@ -151,6 +151,14 @@
 NTAPI
 GdiConvertToDevmodeW(DEVMODEA *dm);
 
+DWORD
+STDCALL
+GetAndSetDCDWord( HDC, INT, DWORD, DWORD, DWORD, DWORD );
+
+DWORD
+STDCALL
+GetDCDWord( HDC, INT, DWORD);
+
 VOID
 NTAPI
 LogFontA2W(

Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/dc.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/dc.c Wed Aug  8 06:20:43 2007
@@ -300,7 +300,7 @@
          DWORD dwIgnore
            )
 {
-  return NtGdiGetRelAbs(hdc);
+  return GetDCDWord( hdc, GdiGetRelAbs, 0);
 }
 
 
@@ -334,7 +334,7 @@
        }
     }
   }
-// Ret = NtGdiGetAndSetDCDword( hDC, u, dwIn, (DWORD*) &u );                
+  Ret = NtGdiGetAndSetDCDword( hDC, u, dwIn, (DWORD*) &u );                
   if (Ret) 
      return u;
   else 
@@ -350,7 +350,7 @@
 STDCALL
 GetDCDWord( HDC hDC, INT u, DWORD Result )
 {
-  BOOL Ret = TRUE; //NtGdiGetDCDword( hDC, u, (DWORD*) &u );
+  BOOL Ret = NtGdiGetDCDword( hDC, u, (DWORD*) &u );
   if (!Ret) return Result;
   else return u;
 }

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Aug  8 06:20:43 2007
@@ -466,9 +466,6 @@
 INT STDCALL  NtGdiGetROP2(HDC  hDC);
 
 /* Should be done in user-mode using shared GDI Objects. */
-INT STDCALL  NtGdiGetRelAbs(HDC  hDC);
-
-/* Should be done in user-mode using shared GDI Objects. */
 INT
 STDCALL
 NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set);

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug  8 06:20:43 2007
@@ -1800,7 +1800,6 @@
     return iRetCount;
 }
 
-DC_GET_VAL( INT, NtGdiGetRelAbs, Dc_Attr.lRelAbs )
 DC_GET_VAL( INT, NtGdiGetROP2, Dc_Attr.jROP2 )
 DC_GET_VAL( INT, NtGdiGetStretchBltMode, Dc_Attr.jStretchBltMode )
 DC_GET_VAL( UINT, NtGdiGetTextAlign, Dc_Attr.lTextAlign )
@@ -2159,6 +2158,7 @@
     case GdiGetJournal:
       break;
     case GdiGetRelAbs:
+      SafeResult = dc->Dc_Attr.lRelAbs;
       break;
     case GdiGetBreakExtra:
       break;

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug  8 06:20:43 2007
@@ -816,7 +816,6 @@
 NtGdiGetPixelFormat                     1
 NtGdiGetPolyFillMode                    1
 NtGdiGetROP2                            1
-NtGdiGetRelAbs                          1
 NtGdiGetSetTextCharExtra                3
 NtGdiGetStretchBltMode                  1
 NtGdiGetSystemPaletteEntries            4