Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-13 14:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix gdi32:SetSysColors apitest

Browse source 
svn path=/trunk/; revision=51110
This commit is contained in:
Rafal Harabien 2011-03-21 14:52:08 +00:00
parent 347b8aee6f
commit f561f03d31
3 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsystems/win32/win32k/include/intgdi.h
View file

@ -156,8 +156,8 @@ IntGdiCombineTransform(LPXFORM XFormResult,
/* Stock objects */
BOOL FASTCALL
IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors);
VOID FASTCALL
IntSetSysColors(UINT nColors, CONST INT *Elements, CONST COLORREF *Colors);
HGDIOBJ FASTCALL
IntGetSysColorBrush(INT Object);

50
reactos/subsystems/win32/win32k/ntuser/ntstubs.c
View file

@ -538,36 +538,40 @@ NtUserSetSysColors(
IN CONST COLORREF *lpaRgbValues,
FLONG Flags)
{
DWORD Ret = FALSE;
NTSTATUS Status = STATUS_SUCCESS;
UserEnterExclusive();
_SEH2_TRY
{
ProbeForRead(lpaElements,
DWORD Ret = TRUE;
NTSTATUS Status = STATUS_SUCCESS;
if (cElements == 0)
return TRUE;
UserEnterExclusive();
_SEH2_TRY
{
ProbeForRead(lpaElements,
sizeof(INT),
1);
ProbeForRead(lpaRgbValues,
sizeof(INT),
ProbeForRead(lpaRgbValues,
sizeof(COLORREF),
1);
// Developers: We are thread locked and calling gdi.
Ret = IntSetSysColors(cElements, (INT*)lpaElements, (COLORREF*)lpaRgbValues);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
IntSetSysColors(cElements, lpaElements, lpaRgbValues);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
}
_SEH2_END;
if (!NT_SUCCESS(Status))
{
}
_SEH2_END;
if (!NT_SUCCESS(Status))
{
SetLastNtError(Status);
Ret = FALSE;
}
if (Ret)
{
UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0);
}
UserLeave();
return Ret;
}
if (Ret)
{
UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0);
}
UserLeave();
return Ret;
}
DWORD

5
reactos/subsystems/win32/win32k/objects/stockobj.c
View file

@ -216,8 +216,8 @@ NtGdiGetStockObject(INT Object)
return ((Object < 0) || (NB_STOCK_OBJECTS <= Object)) ? NULL : StockObjects[Object];
}
BOOL FASTCALL
IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors)
VOID FASTCALL
IntSetSysColors(UINT nColors, CONST INT *Elements, CONST COLORREF *Colors)
{
UINT i;
@ -234,7 +234,6 @@ IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors)
Elements++;
Colors++;
}
return nColors > 0;
}
HGDIOBJ FASTCALL