Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 04:33:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gdi32]

Browse source 
- Move more region code from stubs into the appropriate file.
- Enable and fix more user code.


svn path=/trunk/; revision=44747
This commit is contained in:
James Tabor 2009-12-23 23:30:26 +00:00
parent 3180f15b3d
commit a73299ffde
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
reactos/dll/win32/gdi32/misc/stubs.c
View file

@ -1704,25 +1704,6 @@ GetFontData(HDC hdc,
return NtGdiGetFontData(hdc, dwTable, dwOffset, lpvBuffer, cbData); return NtGdiGetFontData(hdc, dwTable, dwOffset, lpvBuffer, cbData);
} }
/*
* @implemented
*
*/
DWORD
WINAPI
GetRegionData(HRGN hrgn,
DWORD nCount,
LPRGNDATA lpRgnData)
{
if (!lpRgnData)
{
nCount = 0;
}
return NtGdiGetRegionData(hrgn,nCount,lpRgnData);
}
INT INT
WINAPI WINAPI
NamedEscape(HDC hdc, NamedEscape(HDC hdc,

33
reactos/dll/win32/gdi32/objects/region.c
View file

@ -190,7 +190,7 @@ CreateEllipticRgnIndirect(
*/ */
HRGN HRGN
WINAPI WINAPI
CreateRectRgn(int x1, int y1, int x2,int y2) CreateRectRgn(int x1, int y1, int x2, int y2)
{ {
/* FIXME Some part need be done in user mode */ /* FIXME Some part need be done in user mode */
return NtGdiCreateRectRgn(x1,y1,x2,y2); return NtGdiCreateRectRgn(x1,y1,x2,y2);
@ -285,6 +285,24 @@ GetMetaRgn(HDC hdc,
return NtGdiGetRandomRgn(hdc, hrgn, METARGN); return NtGdiGetRandomRgn(hdc, hrgn, METARGN);
} }
/*
* @implemented
*
*/
DWORD
WINAPI
GetRegionData(HRGN hrgn,
DWORD nCount,
LPRGNDATA lpRgnData)
{
if (!lpRgnData)
{
nCount = 0;
}
return NtGdiGetRegionData(hrgn,nCount,lpRgnData);
}
/* /*
* @implemented * @implemented
* *
@ -294,10 +312,11 @@ WINAPI
GetRgnBox(HRGN hrgn, GetRgnBox(HRGN hrgn,
LPRECT prcOut) LPRECT prcOut)
{ {
#if 0
PRGN_ATTR Rgn_Attr; PRGN_ATTR Rgn_Attr;
if (!GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr))
if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr))
return NtGdiGetRgnBox(hrgn, prcOut); return NtGdiGetRgnBox(hrgn, prcOut);
if (Rgn_Attr->Flags == NULLREGION) if (Rgn_Attr->Flags == NULLREGION)
{ {
prcOut->left = 0; prcOut->left = 0;
@ -307,12 +326,12 @@ GetRgnBox(HRGN hrgn,
} }
else else
{ {
if (Rgn_Attr->Flags != SIMPLEREGION) return NtGdiGetRgnBox(hrgn, prcOut); if (Rgn_Attr->Flags != SIMPLEREGION)
*prcOut = Rgn_Attr->Rect; return NtGdiGetRgnBox(hrgn, prcOut);
/* WARNING! prcOut is never checked newbies! */
RtlCopyMemory( prcOut, &Rgn_Attr->Rect, sizeof(RECT));
} }
return Rgn_Attr->Flags; return Rgn_Attr->Flags;
#endif
return NtGdiGetRgnBox(hrgn, prcOut);
} }
/* /*