Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
174e906a
Commit
174e906a
authored
Mar 16, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Get rid of the no longer used DC_SAVED flag.
parent
ac5a1802
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
17 deletions
+10
-17
dc.c
dlls/gdi32/dc.c
+10
-16
gdi_private.h
dlls/gdi32/gdi_private.h
+0
-1
No files found.
dlls/gdi32/dc.c
View file @
174e906a
...
...
@@ -384,7 +384,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev )
DC
*
newdc
,
*
dc
=
get_nulldrv_dc
(
dev
);
if
(
!
(
newdc
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
*
newdc
))))
return
0
;
newdc
->
flags
=
dc
->
flags
|
DC_SAVED
;
newdc
->
flags
=
dc
->
flags
;
newdc
->
layout
=
dc
->
layout
;
newdc
->
hPen
=
dc
->
hPen
;
newdc
->
hBrush
=
dc
->
hBrush
;
...
...
@@ -484,7 +484,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level )
if
(
!
PATH_AssignGdiPath
(
&
dc
->
path
,
&
dcs
->
path
))
return
FALSE
;
dc
->
flags
=
dcs
->
flags
&
~
DC_SAVED
;
dc
->
flags
=
dcs
->
flags
;
dc
->
layout
=
dcs
->
layout
;
dc
->
hDevice
=
dcs
->
hDevice
;
dc
->
ROPmode
=
dcs
->
ROPmode
;
...
...
@@ -827,16 +827,13 @@ BOOL WINAPI DeleteDC( HDC hdc )
free_dc_state
(
dcs
);
}
if
(
!
(
dc
->
flags
&
DC_SAVED
))
{
SelectObject
(
hdc
,
GetStockObject
(
BLACK_PEN
)
);
SelectObject
(
hdc
,
GetStockObject
(
WHITE_BRUSH
)
);
SelectObject
(
hdc
,
GetStockObject
(
SYSTEM_FONT
)
);
SelectObject
(
hdc
,
GetStockObject
(
DEFAULT_BITMAP
)
);
if
(
dc
->
funcs
->
pDeleteDC
)
dc
->
funcs
->
pDeleteDC
(
dc
->
physDev
);
dc
->
physDev
=
NULL
;
}
SelectObject
(
hdc
,
GetStockObject
(
BLACK_PEN
)
);
SelectObject
(
hdc
,
GetStockObject
(
WHITE_BRUSH
)
);
SelectObject
(
hdc
,
GetStockObject
(
SYSTEM_FONT
)
);
SelectObject
(
hdc
,
GetStockObject
(
DEFAULT_BITMAP
)
);
if
(
dc
->
funcs
->
pDeleteDC
)
dc
->
funcs
->
pDeleteDC
(
dc
->
physDev
);
dc
->
physDev
=
NULL
;
free_dc_ptr
(
dc
);
return
TRUE
;
}
...
...
@@ -1273,11 +1270,8 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData )
if
(
!
dc
)
return
FALSE
;
if
(
!
(
dc
->
flags
&
DC_SAVED
))
{
dc
->
dwHookData
=
dwHookData
;
dc
->
hookProc
=
hookProc
;
}
dc
->
dwHookData
=
dwHookData
;
dc
->
hookProc
=
hookProc
;
release_dc_ptr
(
dc
);
return
TRUE
;
}
...
...
dlls/gdi32/gdi_private.h
View file @
174e906a
...
...
@@ -318,7 +318,6 @@ typedef struct tagDC
}
DC
;
/* DC flags */
#define DC_SAVED 0x0002
/* It is a saved DC */
#define DC_BOUNDS_ENABLE 0x0008
/* Bounding rectangle tracking is enabled */
#define DC_BOUNDS_SET 0x0010
/* Bounding rectangle has been set */
...
...
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