ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Several GDI object handling functions are defined to take a HGDIOBJ 

instead of a HANDLE.
This commit is contained in:
Andreas Mohr 2004-07-08 20:17:59 +00:00 committed by Alexandre Julliard
parent ca942f1625
commit fe2dcf7439
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/wingdi.h
View File

@ -3312,18 +3312,18 @@ BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT); BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT); BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
#define GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat) #define GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat)
INT WINAPI GetClipBox(HDC,LPRECT); INT WINAPI GetClipBox(HDC,LPRECT);
INT WINAPI GetClipRgn(HDC,HRGN); INT WINAPI GetClipRgn(HDC,HRGN);
BOOL WINAPI GetColorAdjustment(HDC, LPCOLORADJUSTMENT); BOOL WINAPI GetColorAdjustment(HDC, LPCOLORADJUSTMENT);
HANDLE WINAPI GetCurrentObject(HDC,UINT); HGDIOBJ WINAPI GetCurrentObject(HDC,UINT);
BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT); BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT);
INT WINAPI GetDeviceCaps(HDC,INT); INT WINAPI GetDeviceCaps(HDC,INT);
BOOL WINAPI GetDeviceGammaRamp(HDC,LPVOID); BOOL WINAPI GetDeviceGammaRamp(HDC,LPVOID);
COLORREF WINAPI GetDCBrushColor(HDC); COLORREF WINAPI GetDCBrushColor(HDC);
BOOL WINAPI GetDCOrgEx(HDC,LPPOINT); BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
COLORREF WINAPI GetDCPenColor(HDC); COLORREF WINAPI GetDCPenColor(HDC);
UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*); UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
INT WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,LPVOID,LPBITMAPINFO,UINT); INT WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,LPVOID,LPBITMAPINFO,UINT);
HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR); HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR);
HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR); HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR);
#define GetEnhMetaFile WINELIB_NAME_AW(GetEnhMetaFile) #define GetEnhMetaFile WINELIB_NAME_AW(GetEnhMetaFile)
@ -3358,12 +3358,12 @@ INT WINAPI GetMetaRgn(HDC,HRGN);
BOOL WINAPI GetMiterLimit(HDC, PFLOAT); BOOL WINAPI GetMiterLimit(HDC, PFLOAT);
DWORD WINAPI GetNearestColor(HDC,DWORD); DWORD WINAPI GetNearestColor(HDC,DWORD);
UINT WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF); UINT WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF);
INT WINAPI GetObjectA(HANDLE,INT,LPVOID); INT WINAPI GetObjectA(HGDIOBJ,INT,LPVOID);
INT WINAPI GetObjectW(HANDLE,INT,LPVOID); INT WINAPI GetObjectW(HGDIOBJ,INT,LPVOID);
#define GetObject WINELIB_NAME_AW(GetObject) #define GetObject WINELIB_NAME_AW(GetObject)
DWORD WINAPI GetObjectType(HANDLE); DWORD WINAPI GetObjectType(HGDIOBJ);
UINT WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA); UINT WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
UINT WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW); UINT WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
#define GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics) #define GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics)
UINT WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY); UINT WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
INT WINAPI GetPath(HDC,LPPOINT,LPBYTE,INT); INT WINAPI GetPath(HDC,LPPOINT,LPBYTE,INT);

12
objects/gdiobj.c
View File

@ -1017,7 +1017,7 @@ HGDIOBJ WINAPI GetStockObject( INT obj )
/*********************************************************************** /***********************************************************************
* GetObject (GDI.82) * GetObject (GDI.82)
*/ */
INT16 WINAPI GetObject16( HANDLE16 handle16, INT16 count, LPVOID buffer ) INT16 WINAPI GetObject16( HGDIOBJ16 handle16, INT16 count, LPVOID buffer )
{ {
GDIOBJHDR * ptr; GDIOBJHDR * ptr;
HGDIOBJ handle = HGDIOBJ_32( handle16 ); HGDIOBJ handle = HGDIOBJ_32( handle16 );
@ -1041,7 +1041,7 @@ INT16 WINAPI GetObject16( HANDLE16 handle16, INT16 count, LPVOID buffer )
/*********************************************************************** /***********************************************************************
* GetObjectA (GDI32.@) * GetObjectA (GDI32.@)
*/ */
INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer ) INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer )
{ {
GDIOBJHDR * ptr; GDIOBJHDR * ptr;
INT result = 0; INT result = 0;
@ -1061,7 +1061,7 @@ INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer )
/*********************************************************************** /***********************************************************************
* GetObjectW (GDI32.@) * GetObjectW (GDI32.@)
*/ */
INT WINAPI GetObjectW( HANDLE handle, INT count, LPVOID buffer ) INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer )
{ {
GDIOBJHDR * ptr; GDIOBJHDR * ptr;
INT result = 0; INT result = 0;
@ -1081,7 +1081,7 @@ INT WINAPI GetObjectW( HANDLE handle, INT count, LPVOID buffer )
/*********************************************************************** /***********************************************************************
* GetObjectType (GDI32.@) * GetObjectType (GDI32.@)
*/ */
DWORD WINAPI GetObjectType( HANDLE handle ) DWORD WINAPI GetObjectType( HGDIOBJ handle )
{ {
GDIOBJHDR * ptr; GDIOBJHDR * ptr;
INT result = 0; INT result = 0;
@ -1141,9 +1141,9 @@ DWORD WINAPI GetObjectType( HANDLE handle )
/*********************************************************************** /***********************************************************************
* GetCurrentObject (GDI32.@) * 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 ); DC * dc = DC_GetDCPtr( hdc );
if (dc) if (dc)