GDI functions: HANDLE -> HGDIOBJ

[Andreas Mohr]

Hi all,

several GDI object handling functions are defined to take a HGDIOBJ
instead of a more general HANDLE, so correct them to be defined that way.

-- 
Linux - for free and even cheaper than that :-)
-------------- next part --------------
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.106
diff -u -r1.106 wingdi.h
--- include/wingdi.h	18 May 2004 20:43:29 -0000	1.106
+++ include/wingdi.h	8 Jul 2004 12:39:42 -0000
@@ -3315,7 +3315,7 @@
 INT       WINAPI GetClipBox(HDC,LPRECT);
 INT       WINAPI GetClipRgn(HDC,HRGN);
 BOOL      WINAPI GetColorAdjustment(HDC, LPCOLORADJUSTMENT);
-HANDLE    WINAPI GetCurrentObject(HDC,UINT);
+HGDIOBJ    WINAPI GetCurrentObject(HDC,UINT);
 BOOL      WINAPI GetCurrentPositionEx(HDC,LPPOINT);
 INT       WINAPI GetDeviceCaps(HDC,INT);
 BOOL      WINAPI GetDeviceGammaRamp(HDC,LPVOID);
@@ -3358,10 +3358,10 @@
 BOOL        WINAPI GetMiterLimit(HDC, PFLOAT);
 DWORD       WINAPI GetNearestColor(HDC,DWORD);
 UINT        WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF);
-INT         WINAPI GetObjectA(HANDLE,INT,LPVOID);
-INT         WINAPI GetObjectW(HANDLE,INT,LPVOID);
+INT         WINAPI GetObjectA(HGDIOBJ,INT,LPVOID);
+INT         WINAPI GetObjectW(HGDIOBJ,INT,LPVOID);
 #define     GetObject WINELIB_NAME_AW(GetObject)
-DWORD     WINAPI GetObjectType(HANDLE);
+DWORD     WINAPI GetObjectType(HGDIOBJ);
 UINT      WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
 UINT      WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
 #define     GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics)
Index: objects/gdiobj.c
===================================================================
RCS file: /home/wine/wine/objects/gdiobj.c,v
retrieving revision 1.98
diff -u -r1.98 gdiobj.c
--- objects/gdiobj.c	1 Jun 2004 19:43:07 -0000	1.98
+++ objects/gdiobj.c	8 Jul 2004 12:39:44 -0000
@@ -1017,7 +1017,7 @@
 /***********************************************************************
  *           GetObject    (GDI.82)
  */
-INT16 WINAPI GetObject16( HANDLE16 handle16, INT16 count, LPVOID buffer )
+INT16 WINAPI GetObject16( HGDIOBJ16 handle16, INT16 count, LPVOID buffer )
 {
     GDIOBJHDR * ptr;
     HGDIOBJ handle = HGDIOBJ_32( handle16 );
@@ -1041,7 +1041,7 @@
 /***********************************************************************
  *           GetObjectA    (GDI32.@)
  */
-INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer )
+INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer )
 {
     GDIOBJHDR * ptr;
     INT result = 0;
@@ -1061,7 +1061,7 @@
 /***********************************************************************
  *           GetObjectW    (GDI32.@)
  */
-INT WINAPI GetObjectW( HANDLE handle, INT count, LPVOID buffer )
+INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer )
 {
     GDIOBJHDR * ptr;
     INT result = 0;
@@ -1081,7 +1081,7 @@
 /***********************************************************************
  *           GetObjectType    (GDI32.@)
  */
-DWORD WINAPI GetObjectType( HANDLE handle )
+DWORD WINAPI GetObjectType( HGDIOBJ handle )
 {
     GDIOBJHDR * ptr;
     INT result = 0;
@@ -1141,9 +1141,9 @@
 /***********************************************************************
  *           GetCurrentObject    	(GDI32.@)
  */
-HANDLE WINAPI GetCurrentObject(HDC hdc,UINT type)
+HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type)
 {
-    HANDLE ret = 0;
+    HGDIOBJ ret = 0;
     DC * dc = DC_GetDCPtr( hdc );
 
     if (dc)