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
61f4767a
Commit
61f4767a
authored
May 31, 2012
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Don't implement the gamma ramp functions in the DIB driver.
parent
13b2a3b9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
24 deletions
+14
-24
dc.c
dlls/gdi32/dc.c
+12
-4
dc.c
dlls/gdi32/dibdrv/dc.c
+2
-20
No files found.
dlls/gdi32/dc.c
View file @
61f4767a
...
@@ -1245,8 +1245,12 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr)
...
@@ -1245,8 +1245,12 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr)
TRACE
(
"%p, %p
\n
"
,
hDC
,
ptr
);
TRACE
(
"%p, %p
\n
"
,
hDC
,
ptr
);
if
(
dc
)
if
(
dc
)
{
{
PHYSDEV
physdev
=
GET_DC_PHYSDEV
(
dc
,
pGetDeviceGammaRamp
);
if
(
GetObjectType
(
hDC
)
!=
OBJ_MEMDC
)
ret
=
physdev
->
funcs
->
pGetDeviceGammaRamp
(
physdev
,
ptr
);
{
PHYSDEV
physdev
=
GET_DC_PHYSDEV
(
dc
,
pGetDeviceGammaRamp
);
ret
=
physdev
->
funcs
->
pGetDeviceGammaRamp
(
physdev
,
ptr
);
}
else
SetLastError
(
ERROR_INVALID_PARAMETER
);
release_dc_ptr
(
dc
);
release_dc_ptr
(
dc
);
}
}
return
ret
;
return
ret
;
...
@@ -1263,8 +1267,12 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr)
...
@@ -1263,8 +1267,12 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr)
TRACE
(
"%p, %p
\n
"
,
hDC
,
ptr
);
TRACE
(
"%p, %p
\n
"
,
hDC
,
ptr
);
if
(
dc
)
if
(
dc
)
{
{
PHYSDEV
physdev
=
GET_DC_PHYSDEV
(
dc
,
pSetDeviceGammaRamp
);
if
(
GetObjectType
(
hDC
)
!=
OBJ_MEMDC
)
ret
=
physdev
->
funcs
->
pSetDeviceGammaRamp
(
physdev
,
ptr
);
{
PHYSDEV
physdev
=
GET_DC_PHYSDEV
(
dc
,
pSetDeviceGammaRamp
);
ret
=
physdev
->
funcs
->
pSetDeviceGammaRamp
(
physdev
,
ptr
);
}
else
SetLastError
(
ERROR_INVALID_PARAMETER
);
release_dc_ptr
(
dc
);
release_dc_ptr
(
dc
);
}
}
return
ret
;
return
ret
;
...
...
dlls/gdi32/dibdrv/dc.c
View file @
61f4767a
...
@@ -392,24 +392,6 @@ static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags )
...
@@ -392,24 +392,6 @@ static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags )
return
DCB_RESET
;
/* we don't have device-specific bounds */
return
DCB_RESET
;
/* we don't have device-specific bounds */
}
}
/***********************************************************************
* dibdrv_GetDeviceGammaRamp
*/
static
BOOL
dibdrv_GetDeviceGammaRamp
(
PHYSDEV
dev
,
void
*
ramp
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
/***********************************************************************
* dibdrv_SetDeviceGammaRamp
*/
static
BOOL
dibdrv_SetDeviceGammaRamp
(
PHYSDEV
dev
,
void
*
ramp
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
const
struct
gdi_dc_funcs
dib_driver
=
const
struct
gdi_dc_funcs
dib_driver
=
{
{
NULL
,
/* pAbortDoc */
NULL
,
/* pAbortDoc */
...
@@ -453,7 +435,7 @@ const struct gdi_dc_funcs dib_driver =
...
@@ -453,7 +435,7 @@ const struct gdi_dc_funcs dib_driver =
NULL
,
/* pGetCharABCWidthsI */
NULL
,
/* pGetCharABCWidthsI */
NULL
,
/* pGetCharWidth */
NULL
,
/* pGetCharWidth */
NULL
,
/* pGetDeviceCaps */
NULL
,
/* pGetDeviceCaps */
dibdrv_GetDeviceGammaRamp
,
/* pGetDeviceGammaRamp */
NULL
,
/* pGetDeviceGammaRamp */
NULL
,
/* pGetFontData */
NULL
,
/* pGetFontData */
NULL
,
/* pGetFontUnicodeRanges */
NULL
,
/* pGetFontUnicodeRanges */
NULL
,
/* pGetGlyphIndices */
NULL
,
/* pGetGlyphIndices */
...
@@ -515,7 +497,7 @@ const struct gdi_dc_funcs dib_driver =
...
@@ -515,7 +497,7 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_SetDCPenColor
,
/* pSetDCPenColor */
dibdrv_SetDCPenColor
,
/* pSetDCPenColor */
NULL
,
/* pSetDIBitsToDevice */
NULL
,
/* pSetDIBitsToDevice */
dibdrv_SetDeviceClipping
,
/* pSetDeviceClipping */
dibdrv_SetDeviceClipping
,
/* pSetDeviceClipping */
dibdrv_SetDeviceGammaRamp
,
/* pSetDeviceGammaRamp */
NULL
,
/* pSetDeviceGammaRamp */
NULL
,
/* pSetLayout */
NULL
,
/* pSetLayout */
NULL
,
/* pSetMapMode */
NULL
,
/* pSetMapMode */
NULL
,
/* pSetMapperFlags */
NULL
,
/* pSetMapperFlags */
...
...
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