Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sebastian Mayr
wine
Commits
fe2dcf74
Commit
fe2dcf74
authored
20 years ago
by
Andreas Mohr
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Several GDI object handling functions are defined to take a HGDIOBJ
instead of a HANDLE.
parent
ca942f16
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/wingdi.h
+17
-17
17 additions, 17 deletions
include/wingdi.h
objects/gdiobj.c
+6
-6
6 additions, 6 deletions
objects/gdiobj.c
with
23 additions
and
23 deletions
include/wingdi.h
+
17
−
17
View file @
fe2dcf74
...
...
@@ -3312,18 +3312,18 @@ BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
BOOL
WINAPI
GetCharWidthFloatA
(
HDC
,
UINT
,
UINT
,
PFLOAT
);
BOOL
WINAPI
GetCharWidthFloatW
(
HDC
,
UINT
,
UINT
,
PFLOAT
);
#define GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat)
INT
WINAPI
GetClipBox
(
HDC
,
LPRECT
);
INT
WINAPI
GetClipRgn
(
HDC
,
HRGN
);
BOOL
WINAPI
GetColorAdjustment
(
HDC
,
LPCOLORADJUSTMENT
);
H
ANDLE
WINAPI
GetCurrentObject
(
HDC
,
UINT
);
BOOL
WINAPI
GetCurrentPositionEx
(
HDC
,
LPPOINT
);
INT
WINAPI
GetDeviceCaps
(
HDC
,
INT
);
BOOL
WINAPI
GetDeviceGammaRamp
(
HDC
,
LPVOID
);
COLORREF
WINAPI
GetDCBrushColor
(
HDC
);
BOOL
WINAPI
GetDCOrgEx
(
HDC
,
LPPOINT
);
COLORREF
WINAPI
GetDCPenColor
(
HDC
);
UINT
WINAPI
GetDIBColorTable
(
HDC
,
UINT
,
UINT
,
RGBQUAD
*
);
INT
WINAPI
GetDIBits
(
HDC
,
HBITMAP
,
UINT
,
UINT
,
LPVOID
,
LPBITMAPINFO
,
UINT
);
INT
WINAPI
GetClipBox
(
HDC
,
LPRECT
);
INT
WINAPI
GetClipRgn
(
HDC
,
HRGN
);
BOOL
WINAPI
GetColorAdjustment
(
HDC
,
LPCOLORADJUSTMENT
);
H
GDIOBJ
WINAPI
GetCurrentObject
(
HDC
,
UINT
);
BOOL
WINAPI
GetCurrentPositionEx
(
HDC
,
LPPOINT
);
INT
WINAPI
GetDeviceCaps
(
HDC
,
INT
);
BOOL
WINAPI
GetDeviceGammaRamp
(
HDC
,
LPVOID
);
COLORREF
WINAPI
GetDCBrushColor
(
HDC
);
BOOL
WINAPI
GetDCOrgEx
(
HDC
,
LPPOINT
);
COLORREF
WINAPI
GetDCPenColor
(
HDC
);
UINT
WINAPI
GetDIBColorTable
(
HDC
,
UINT
,
UINT
,
RGBQUAD
*
);
INT
WINAPI
GetDIBits
(
HDC
,
HBITMAP
,
UINT
,
UINT
,
LPVOID
,
LPBITMAPINFO
,
UINT
);
HENHMETAFILE
WINAPI
GetEnhMetaFileA
(
LPCSTR
);
HENHMETAFILE
WINAPI
GetEnhMetaFileW
(
LPCWSTR
);
#define GetEnhMetaFile WINELIB_NAME_AW(GetEnhMetaFile)
...
...
@@ -3358,12 +3358,12 @@ INT WINAPI GetMetaRgn(HDC,HRGN);
BOOL
WINAPI
GetMiterLimit
(
HDC
,
PFLOAT
);
DWORD
WINAPI
GetNearestColor
(
HDC
,
DWORD
);
UINT
WINAPI
GetNearestPaletteIndex
(
HPALETTE
,
COLORREF
);
INT
WINAPI
GetObjectA
(
H
ANDLE
,
INT
,
LPVOID
);
INT
WINAPI
GetObjectW
(
H
ANDLE
,
INT
,
LPVOID
);
INT
WINAPI
GetObjectA
(
H
GDIOBJ
,
INT
,
LPVOID
);
INT
WINAPI
GetObjectW
(
H
GDIOBJ
,
INT
,
LPVOID
);
#define GetObject WINELIB_NAME_AW(GetObject)
DWORD
WINAPI
GetObjectType
(
H
ANDLE
);
UINT
WINAPI
GetOutlineTextMetricsA
(
HDC
,
UINT
,
LPOUTLINETEXTMETRICA
);
UINT
WINAPI
GetOutlineTextMetricsW
(
HDC
,
UINT
,
LPOUTLINETEXTMETRICW
);
DWORD
WINAPI
GetObjectType
(
H
GDIOBJ
);
UINT
WINAPI
GetOutlineTextMetricsA
(
HDC
,
UINT
,
LPOUTLINETEXTMETRICA
);
UINT
WINAPI
GetOutlineTextMetricsW
(
HDC
,
UINT
,
LPOUTLINETEXTMETRICW
);
#define GetOutlineTextMetrics WINELIB_NAME_AW(GetOutlineTextMetrics)
UINT
WINAPI
GetPaletteEntries
(
HPALETTE
,
UINT
,
UINT
,
LPPALETTEENTRY
);
INT
WINAPI
GetPath
(
HDC
,
LPPOINT
,
LPBYTE
,
INT
);
...
...
This diff is collapsed.
Click to expand it.
objects/gdiobj.c
+
6
−
6
View file @
fe2dcf74
...
...
@@ -1017,7 +1017,7 @@ HGDIOBJ WINAPI GetStockObject( INT obj )
/***********************************************************************
* GetObject (GDI.82)
*/
INT16
WINAPI
GetObject16
(
H
ANDLE
16
handle16
,
INT16
count
,
LPVOID
buffer
)
INT16
WINAPI
GetObject16
(
H
GDIOBJ
16
handle16
,
INT16
count
,
LPVOID
buffer
)
{
GDIOBJHDR
*
ptr
;
HGDIOBJ
handle
=
HGDIOBJ_32
(
handle16
);
...
...
@@ -1041,7 +1041,7 @@ INT16 WINAPI GetObject16( HANDLE16 handle16, INT16 count, LPVOID buffer )
/***********************************************************************
* GetObjectA (GDI32.@)
*/
INT
WINAPI
GetObjectA
(
H
ANDLE
handle
,
INT
count
,
LPVOID
buffer
)
INT
WINAPI
GetObjectA
(
H
GDIOBJ
handle
,
INT
count
,
LPVOID
buffer
)
{
GDIOBJHDR
*
ptr
;
INT
result
=
0
;
...
...
@@ -1061,7 +1061,7 @@ INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer )
/***********************************************************************
* GetObjectW (GDI32.@)
*/
INT
WINAPI
GetObjectW
(
H
ANDLE
handle
,
INT
count
,
LPVOID
buffer
)
INT
WINAPI
GetObjectW
(
H
GDIOBJ
handle
,
INT
count
,
LPVOID
buffer
)
{
GDIOBJHDR
*
ptr
;
INT
result
=
0
;
...
...
@@ -1081,7 +1081,7 @@ INT WINAPI GetObjectW( HANDLE handle, INT count, LPVOID buffer )
/***********************************************************************
* GetObjectType (GDI32.@)
*/
DWORD
WINAPI
GetObjectType
(
H
ANDLE
handle
)
DWORD
WINAPI
GetObjectType
(
H
GDIOBJ
handle
)
{
GDIOBJHDR
*
ptr
;
INT
result
=
0
;
...
...
@@ -1141,9 +1141,9 @@ DWORD WINAPI GetObjectType( HANDLE handle )
/***********************************************************************
* GetCurrentObject (GDI32.@)
*/
H
ANDLE
WINAPI
GetCurrentObject
(
HDC
hdc
,
UINT
type
)
H
GDIOBJ
WINAPI
GetCurrentObject
(
HDC
hdc
,
UINT
type
)
{
H
ANDLE
ret
=
0
;
H
GDIOBJ
ret
=
0
;
DC
*
dc
=
DC_GetDCPtr
(
hdc
);
if
(
dc
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment