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

[WIN32K]

Browse source 
Make internal GDI headers C++ compatible, get rid of USER dependencies

svn path=/trunk/; revision=66889
This commit is contained in:
Timo Kreuzer 2015-03-25 22:32:22 +00:00
parent 12e465be82
commit 8123f0d8b5
7 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/gdi/eng/driverobj.h
View file

@ -22,5 +22,5 @@ FORCEINLINE
PEDRIVEROBJ PEDRIVEROBJ
DRIVEROBJ_TryLockObject(HDRVOBJ hdo) DRIVEROBJ_TryLockObject(HDRVOBJ hdo)
{ {
return GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE); return (PEDRIVEROBJ)GDIOBJ_TryLockObject(hdo, GDIObjType_DRVOBJ_TYPE);
} }

2
reactos/win32ss/gdi/eng/eng.h
View file

@ -32,7 +32,7 @@ IntEngMaskBlt(
VOID VOID
FASTCALL FASTCALL
IntEngWindowChanged( IntEngWindowChanged(
_In_ PWND Window, _In_ struct _WND *Window,
_In_ FLONG flChanged); _In_ FLONG flChanged);
ULONGLONG ULONGLONG

5
reactos/win32ss/gdi/eng/engobjects.h
View file

@ -40,9 +40,14 @@
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/
/* EXtended CLip and Window Region Object */ /* EXtended CLip and Window Region Object */
#ifdef __cplusplus
typedef struct _XCLIPOBJ : _WNDOBJ
{
#else
typedef struct _XCLIPOBJ typedef struct _XCLIPOBJ
{ {
WNDOBJ; WNDOBJ;
#endif
PVOID pClipRgn; /* prgnRao_ or (prgnVis_ if (prgnRao_ == z)) */ PVOID pClipRgn; /* prgnRao_ or (prgnVis_ if (prgnRao_ == z)) */
RECTL rclClipRgn; RECTL rclClipRgn;
PVOID pscanClipRgn; /* Ptr to regions rect buffer based on iDirection. */ PVOID pscanClipRgn; /* Ptr to regions rect buffer based on iDirection. */

5
reactos/win32ss/gdi/eng/mapping.h
View file

@ -16,9 +16,14 @@ typedef struct _FILEVIEW
PVOID pSection; PVOID pSection;
} FILEVIEW, *PFILEVIEW; } FILEVIEW, *PFILEVIEW;
#ifdef __cplusplus
typedef struct _FONTFILEVIEW : FILEVIEW
{
#else
typedef struct _FONTFILEVIEW typedef struct _FONTFILEVIEW
{ {
FILEVIEW; FILEVIEW;
#endif
DWORD reserved[2]; DWORD reserved[2];
PWSTR pwszPath; PWSTR pwszPath;
SIZE_T ulRegionSize; SIZE_T ulRegionSize;

2
reactos/win32ss/gdi/ntgdi/dc.h
View file

@ -220,7 +220,7 @@ DC_LockDc(HDC hdc)
{ {
PDC pdc; PDC pdc;
pdc = GDIOBJ_LockObject(hdc, GDIObjType_DC_TYPE); pdc = (PDC)GDIOBJ_LockObject(hdc, GDIObjType_DC_TYPE);
if (pdc) if (pdc)
{ {
ASSERT((GDI_HANDLE_GET_TYPE(pdc->BaseObject.hHmgr) == GDILoObjType_LO_DC_TYPE) || ASSERT((GDI_HANDLE_GET_TYPE(pdc->BaseObject.hHmgr) == GDILoObjType_LO_DC_TYPE) ||

2
reactos/win32ss/gdi/ntgdi/gdidebug.h
View file

@ -125,6 +125,7 @@ GdiDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult);
#define ID_Win32PreServiceHook 'WSH0' #define ID_Win32PreServiceHook 'WSH0'
#define ID_Win32PostServiceHook 'WSH1' #define ID_Win32PostServiceHook 'WSH1'
#ifndef __cplusplus
FORCEINLINE void FORCEINLINE void
GdiDbgAssertNoLocks(char * pszFile, ULONG nLine) GdiDbgAssertNoLocks(char * pszFile, ULONG nLine)
{ {
@ -139,6 +140,7 @@ GdiDbgAssertNoLocks(char * pszFile, ULONG nLine)
ASSERT(FALSE); ASSERT(FALSE);
} }
} }
#endif // __cplusplus
#endif #endif

4
reactos/win32ss/gdi/ntgdi/palette.h
View file

@ -1,5 +1,9 @@
#pragma once #pragma once
#ifdef _MSC_VER
#pragma warning(disable:4200) // zero-sized array in struct/union
#endif // _MSC_VER
// Palette mode flags // Palette mode flags
enum _PALFLAGS enum _PALFLAGS
{ {