Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
15ef3941
Commit
15ef3941
authored
Apr 07, 2011
by
Huw Davies
Committed by
Alexandre Julliard
Apr 07, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Add support for DC pens.
parent
842d4993
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletion
+19
-1
dc.c
dlls/gdi32/dibdrv/dc.c
+1
-1
dibdrv.h
dlls/gdi32/dibdrv/dibdrv.h
+1
-0
objects.c
dlls/gdi32/dibdrv/objects.c
+17
-0
No files found.
dlls/gdi32/dibdrv/dc.c
View file @
15ef3941
...
@@ -216,7 +216,7 @@ const DC_FUNCTIONS dib_driver =
...
@@ -216,7 +216,7 @@ const DC_FUNCTIONS dib_driver =
NULL
,
/* pSetBkColor */
NULL
,
/* pSetBkColor */
NULL
,
/* pSetBkMode */
NULL
,
/* pSetBkMode */
NULL
,
/* pSetDCBrushColor */
NULL
,
/* pSetDCBrushColor */
NULL
,
/* pSetDCPenColor */
dibdrv_SetDCPenColor
,
/* pSetDCPenColor */
NULL
,
/* pSetDIBColorTable */
NULL
,
/* pSetDIBColorTable */
NULL
,
/* pSetDIBits */
NULL
,
/* pSetDIBits */
NULL
,
/* pSetDIBitsToDevice */
NULL
,
/* pSetDIBitsToDevice */
...
...
dlls/gdi32/dibdrv/dibdrv.h
View file @
15ef3941
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
*/
*/
extern
HPEN
CDECL
dibdrv_SelectPen
(
PHYSDEV
dev
,
HPEN
hpen
)
DECLSPEC_HIDDEN
;
extern
HPEN
CDECL
dibdrv_SelectPen
(
PHYSDEV
dev
,
HPEN
hpen
)
DECLSPEC_HIDDEN
;
extern
COLORREF
CDECL
dibdrv_SetDCPenColor
(
PHYSDEV
dev
,
COLORREF
color
)
DECLSPEC_HIDDEN
;
static
inline
dibdrv_physdev
*
get_dibdrv_pdev
(
PHYSDEV
dev
)
static
inline
dibdrv_physdev
*
get_dibdrv_pdev
(
PHYSDEV
dev
)
{
{
...
...
dlls/gdi32/dibdrv/objects.c
View file @
15ef3941
...
@@ -56,6 +56,9 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
...
@@ -56,6 +56,9 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
HeapFree
(
GetProcessHeap
(),
0
,
elp
);
HeapFree
(
GetProcessHeap
(),
0
,
elp
);
}
}
if
(
hpen
==
GetStockObject
(
DC_PEN
))
logpen
.
lopnColor
=
GetDCPenColor
(
dev
->
hdc
);
pdev
->
pen_color
=
pdev
->
dib
.
funcs
->
colorref_to_pixel
(
&
pdev
->
dib
,
logpen
.
lopnColor
);
pdev
->
pen_color
=
pdev
->
dib
.
funcs
->
colorref_to_pixel
(
&
pdev
->
dib
,
logpen
.
lopnColor
);
pdev
->
defer
|=
DEFER_PEN
;
pdev
->
defer
|=
DEFER_PEN
;
...
@@ -73,3 +76,17 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
...
@@ -73,3 +76,17 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
return
next
->
funcs
->
pSelectPen
(
next
,
hpen
);
return
next
->
funcs
->
pSelectPen
(
next
,
hpen
);
}
}
/***********************************************************************
* dibdrv_SetDCPenColor
*/
COLORREF
CDECL
dibdrv_SetDCPenColor
(
PHYSDEV
dev
,
COLORREF
color
)
{
PHYSDEV
next
=
GET_NEXT_PHYSDEV
(
dev
,
pSetDCPenColor
);
dibdrv_physdev
*
pdev
=
get_dibdrv_pdev
(
dev
);
if
(
GetCurrentObject
(
dev
->
hdc
,
OBJ_PEN
)
==
GetStockObject
(
DC_PEN
))
pdev
->
pen_color
=
pdev
->
dib
.
funcs
->
colorref_to_pixel
(
&
pdev
->
dib
,
color
);
return
next
->
funcs
->
pSetDCPenColor
(
next
,
color
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment