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
431a96f4
Commit
431a96f4
authored
Jan 13, 2004
by
Vincent Béron
Committed by
Alexandre Julliard
Jan 13, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get rid of a W->A crosscall (ResetDCA->ResetDCW).
parent
8349acab
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
8 deletions
+19
-8
init.c
dlls/wineps/init.c
+4
-2
gdi.h
include/gdi.h
+1
-1
dc.c
objects/dc.c
+14
-5
No files found.
dlls/wineps/init.c
View file @
431a96f4
...
...
@@ -384,11 +384,13 @@ BOOL PSDRV_DeleteDC( PSDRV_PDEVICE *physDev )
/**********************************************************************
* ResetDC (WINEPS.@)
*/
HDC
PSDRV_ResetDC
(
PSDRV_PDEVICE
*
physDev
,
const
DEVMODE
A
*
lpInitData
)
HDC
PSDRV_ResetDC
(
PSDRV_PDEVICE
*
physDev
,
const
DEVMODE
W
*
lpInitData
)
{
if
(
lpInitData
)
{
HRGN
hrgn
;
PSDRV_MergeDevmodes
(
physDev
->
Devmode
,
(
PSDRV_DEVMODEA
*
)
lpInitData
,
physDev
->
pi
);
DEVMODEA
*
devmodeA
=
DEVMODEdupWtoA
(
PSDRV_Heap
,
lpInitData
);
PSDRV_MergeDevmodes
(
physDev
->
Devmode
,
(
PSDRV_DEVMODEA
*
)
devmodeA
,
physDev
->
pi
);
HeapFree
(
PSDRV_Heap
,
0
,
devmodeA
);
PSDRV_UpdateDevCaps
(
physDev
);
hrgn
=
CreateRectRgn
(
0
,
0
,
physDev
->
horzRes
,
physDev
->
vertRes
);
SelectVisRgn16
(
HDC_16
(
physDev
->
hdc
),
HRGN_16
(
hrgn
));
...
...
include/gdi.h
View file @
431a96f4
...
...
@@ -250,7 +250,7 @@ typedef struct tagDC_FUNCS
UINT
(
*
pRealizeDefaultPalette
)(
PHYSDEV
);
UINT
(
*
pRealizePalette
)(
PHYSDEV
,
HPALETTE
,
BOOL
);
BOOL
(
*
pRectangle
)(
PHYSDEV
,
INT
,
INT
,
INT
,
INT
);
HDC
(
*
pResetDC
)(
PHYSDEV
,
const
DEVMODE
A
*
);
HDC
(
*
pResetDC
)(
PHYSDEV
,
const
DEVMODE
W
*
);
BOOL
(
*
pRestoreDC
)(
PHYSDEV
,
INT
);
BOOL
(
*
pRoundRect
)(
PHYSDEV
,
INT
,
INT
,
INT
,
INT
,
INT
,
INT
);
INT
(
*
pSaveDC
)(
PHYSDEV
);
...
...
objects/dc.c
View file @
431a96f4
...
...
@@ -812,9 +812,9 @@ BOOL WINAPI DeleteDC( HDC hdc )
/***********************************************************************
* ResetDC
A
(GDI32.@)
* ResetDC
W
(GDI32.@)
*/
HDC
WINAPI
ResetDC
A
(
HDC
hdc
,
const
DEVMODEA
*
devmode
)
HDC
WINAPI
ResetDC
W
(
HDC
hdc
,
const
DEVMODEW
*
devmode
)
{
DC
*
dc
;
HDC
ret
=
hdc
;
...
...
@@ -829,11 +829,20 @@ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode )
/***********************************************************************
* ResetDC
W
(GDI32.@)
* ResetDC
A
(GDI32.@)
*/
HDC
WINAPI
ResetDC
W
(
HDC
hdc
,
const
DEVMODEW
*
devmode
)
HDC
WINAPI
ResetDC
A
(
HDC
hdc
,
const
DEVMODEA
*
devmode
)
{
return
ResetDCA
(
hdc
,
(
const
DEVMODEA
*
)
devmode
);
/* FIXME */
DEVMODEW
*
devmodeW
;
HDC
ret
;
if
(
devmode
)
devmodeW
=
GdiConvertToDevmodeW
(
devmode
);
else
devmodeW
=
NULL
;
ret
=
ResetDCW
(
hdc
,
devmodeW
);
if
(
devmodeW
)
HeapFree
(
GetProcessHeap
(),
0
,
devmodeW
);
return
ret
;
}
...
...
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