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
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
Lorenzo Ferrillo
wine
Commits
56331e2a
Commit
56331e2a
authored
13 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
gdi32: Don't allow Get/SetDeviceGammaRamp on DIBs or memory DCs.
parent
bf718448
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/gdi32/dibdrv/dc.c
+20
-2
20 additions, 2 deletions
dlls/gdi32/dibdrv/dc.c
dlls/gdi32/driver.c
+2
-0
2 additions, 0 deletions
dlls/gdi32/driver.c
dlls/gdi32/tests/dc.c
+25
-2
25 additions, 2 deletions
dlls/gdi32/tests/dc.c
dlls/winex11.drv/xvidmode.c
+10
-0
10 additions, 0 deletions
dlls/winex11.drv/xvidmode.c
with
57 additions
and
4 deletions
dlls/gdi32/dibdrv/dc.c
+
20
−
2
View file @
56331e2a
...
...
@@ -417,6 +417,15 @@ static INT dibdrv_DescribePixelFormat( PHYSDEV dev, INT fmt, UINT size, PIXELFOR
return
0
;
}
/***********************************************************************
* dibdrv_GetDeviceGammaRamp
*/
static
BOOL
dibdrv_GetDeviceGammaRamp
(
PHYSDEV
dev
,
void
*
ramp
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
/***********************************************************************
* dibdrv_GetPixelFormat
*/
...
...
@@ -426,6 +435,15 @@ static INT dibdrv_GetPixelFormat( PHYSDEV dev )
return
0
;
}
/***********************************************************************
* dibdrv_SetDeviceGammaRamp
*/
static
BOOL
dibdrv_SetDeviceGammaRamp
(
PHYSDEV
dev
,
void
*
ramp
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
/***********************************************************************
* dibdrv_SetPixelFormat
*/
...
...
@@ -598,7 +616,7 @@ const struct gdi_dc_funcs dib_driver =
NULL
,
/* pGetCharABCWidthsI */
NULL
,
/* pGetCharWidth */
NULL
,
/* pGetDeviceCaps */
NULL
,
/* pGetDeviceGammaRamp */
dibdrv_GetDeviceGammaRamp
,
/* pGetDeviceGammaRamp */
NULL
,
/* pGetFontData */
NULL
,
/* pGetFontUnicodeRanges */
NULL
,
/* pGetGlyphIndices */
...
...
@@ -660,7 +678,7 @@ const struct gdi_dc_funcs dib_driver =
dibdrv_SetDIBColorTable
,
/* pSetDIBColorTable */
NULL
,
/* pSetDIBitsToDevice */
dibdrv_SetDeviceClipping
,
/* pSetDeviceClipping */
NULL
,
/* pSetDeviceGammaRamp */
dibdrv_SetDeviceGammaRamp
,
/* pSetDeviceGammaRamp */
NULL
,
/* pSetLayout */
NULL
,
/* pSetMapMode */
NULL
,
/* pSetMapperFlags */
...
...
This diff is collapsed.
Click to expand it.
dlls/gdi32/driver.c
+
2
−
0
View file @
56331e2a
...
...
@@ -355,6 +355,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap )
static
BOOL
nulldrv_GetDeviceGammaRamp
(
PHYSDEV
dev
,
void
*
ramp
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
...
...
@@ -587,6 +588,7 @@ static DWORD nulldrv_SetLayout( PHYSDEV dev, DWORD layout )
static
BOOL
nulldrv_SetDeviceGammaRamp
(
PHYSDEV
dev
,
void
*
ramp
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
...
...
This diff is collapsed.
Click to expand it.
dlls/gdi32/tests/dc.c
+
25
−
2
View file @
56331e2a
...
...
@@ -305,22 +305,39 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr )
DESKTOPVERTRES
,
DESKTOPHORZRES
,
BLTALIGNMENT
,
SHADEBLENDCAPS
,
COLORMGMTCAPS
SHADEBLENDCAPS
};
unsigned
int
i
;
WORD
ramp
[
3
][
256
];
BOOL
ret
;
if
(
GetObjectType
(
hdc
)
==
OBJ_METADC
)
{
for
(
i
=
0
;
i
<
sizeof
(
caps
)
/
sizeof
(
caps
[
0
]);
i
++
)
ok
(
GetDeviceCaps
(
hdc
,
caps
[
i
]
)
==
(
caps
[
i
]
==
TECHNOLOGY
?
DT_METAFILE
:
0
),
"wrong caps on %s for %u: %u
\n
"
,
descr
,
caps
[
i
],
GetDeviceCaps
(
hdc
,
caps
[
i
]
)
);
SetLastError
(
0xdeadbeef
);
ret
=
GetDeviceGammaRamp
(
hdc
,
&
ramp
);
ok
(
!
ret
,
"GetDeviceGammaRamp succeeded on %s
\n
"
,
descr
);
ok
(
GetLastError
()
==
ERROR_INVALID_PARAMETER
||
broken
(
GetLastError
()
==
0xdeadbeef
),
/* nt4 */
"wrong error %u on %s
\n
"
,
GetLastError
(),
descr
);
}
else
{
for
(
i
=
0
;
i
<
sizeof
(
caps
)
/
sizeof
(
caps
[
0
]);
i
++
)
ok
(
GetDeviceCaps
(
hdc
,
caps
[
i
]
)
==
GetDeviceCaps
(
ref_dc
,
caps
[
i
]
),
"mismatched caps on %s for %u: %u/%u
\n
"
,
descr
,
caps
[
i
],
GetDeviceCaps
(
hdc
,
caps
[
i
]
),
GetDeviceCaps
(
ref_dc
,
caps
[
i
]
)
);
SetLastError
(
0xdeadbeef
);
ret
=
GetDeviceGammaRamp
(
hdc
,
&
ramp
);
ok
(
!
ret
,
"GetDeviceGammaRamp succeeded on %s
\n
"
,
descr
);
ok
(
GetLastError
()
==
ERROR_INVALID_PARAMETER
||
broken
(
GetLastError
()
==
0xdeadbeef
),
/* nt4 */
"wrong error %u on %s
\n
"
,
GetLastError
(),
descr
);
}
if
(
GetObjectType
(
hdc
)
==
OBJ_MEMDC
)
{
char
buffer
[
sizeof
(
BITMAPINFOHEADER
)
+
256
*
sizeof
(
RGBQUAD
)];
...
...
@@ -342,6 +359,12 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr )
"mismatched caps on %s and DIB for %u: %u/%u
\n
"
,
descr
,
caps
[
i
],
GetDeviceCaps
(
hdc
,
caps
[
i
]
),
GetDeviceCaps
(
ref_dc
,
caps
[
i
]
)
);
SetLastError
(
0xdeadbeef
);
ret
=
GetDeviceGammaRamp
(
hdc
,
&
ramp
);
ok
(
!
ret
,
"GetDeviceGammaRamp succeeded on %s
\n
"
,
descr
);
ok
(
GetLastError
()
==
ERROR_INVALID_PARAMETER
||
broken
(
GetLastError
()
==
0xdeadbeef
),
/* nt4 */
"wrong error %u on %s
\n
"
,
GetLastError
(),
descr
);
SelectObject
(
hdc
,
old
);
DeleteObject
(
dib
);
}
...
...
This diff is collapsed.
Click to expand it.
dlls/winex11.drv/xvidmode.c
+
10
−
0
View file @
56331e2a
...
...
@@ -424,6 +424,11 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp)
*/
BOOL
X11DRV_GetDeviceGammaRamp
(
PHYSDEV
dev
,
LPVOID
ramp
)
{
if
(
GetObjectType
(
dev
->
hdc
)
==
OBJ_MEMDC
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
#ifdef SONAME_LIBXXF86VM
return
X11DRV_XF86VM_GetGammaRamp
(
ramp
);
#else
...
...
@@ -440,6 +445,11 @@ BOOL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp)
*/
BOOL
X11DRV_SetDeviceGammaRamp
(
PHYSDEV
dev
,
LPVOID
ramp
)
{
if
(
GetObjectType
(
dev
->
hdc
)
==
OBJ_MEMDC
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
FALSE
;
}
#ifdef SONAME_LIBXXF86VM
return
X11DRV_XF86VM_SetGammaRamp
(
ramp
);
#else
...
...
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