mirror of
https://github.com/reactos/reactos.git
synced 2024-08-01 09:01:13 +00:00
- Fix included headers in GDI for PSDK compatibility
- Fix some incorrect definitions. - Remove more quintuplicated header nonsense... svn path=/trunk/; revision=16815
This commit is contained in:
parent
f5ef0f7c0f
commit
6870957b9a
|
@ -1,12 +0,0 @@
|
||||||
|
|
||||||
#ifndef H_WIN32K_DEBUG
|
|
||||||
#define H_WIN32K_DEBUG
|
|
||||||
|
|
||||||
#ifdef CHECKED_BUILD
|
|
||||||
#define FIXME(S) DbgPrint ("win32k: FIXME at: File:%s line:%d reason:%s", __FILE__, __LINE__, S)
|
|
||||||
#else
|
|
||||||
#define FIXME(S)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,72 +0,0 @@
|
||||||
/*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
|
||||||
* PROJECT: ReactOS kernel
|
|
||||||
* FILE: include/internal/debug.h
|
|
||||||
* PURPOSE: Useful debugging macros
|
|
||||||
* PROGRAMMER: David Welch (welch@mcmail.com)
|
|
||||||
* UPDATE HISTORY:
|
|
||||||
* 28/05/98: Created
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NOTE: Define NDEBUG before including this header to disable debugging
|
|
||||||
* macros
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __INTERNAL_DEBUG
|
|
||||||
#define __INTERNAL_DEBUG
|
|
||||||
|
|
||||||
#define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;); } while(0);
|
|
||||||
|
|
||||||
/* FIXME: should probably remove this later */
|
|
||||||
#if !defined(CHECKED) && !defined(NDEBUG)
|
|
||||||
#define CHECKED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef NASSERT
|
|
||||||
#ifndef assert
|
|
||||||
#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); KeBugCheck(0); }
|
|
||||||
#endif
|
|
||||||
#ifndef ASSERT
|
|
||||||
#define ASSERT(x) assert(x)
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#ifndef assert
|
|
||||||
#define assert(x)
|
|
||||||
#endif
|
|
||||||
#ifndef ASSERT
|
|
||||||
#define ASSERT(x)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef DBG
|
|
||||||
#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
|
|
||||||
#define CHECKPOINT1 DbgPrint("%s:%d\n",__FILE__,__LINE__);
|
|
||||||
#else
|
|
||||||
#define DPRINT1(args...)
|
|
||||||
#define CHECKPOINT1(args...)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __NTOSKRNL__
|
|
||||||
#define DPRINT_CHECKS
|
|
||||||
#else
|
|
||||||
#define DPRINT_CHECKS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef NDEBUG
|
|
||||||
#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
|
|
||||||
#define CHECKPOINT DbgPrint("%s:%d\n",__FILE__,__LINE__);
|
|
||||||
#else
|
|
||||||
#define DPRINT(args...)
|
|
||||||
#define CHECKPOINT
|
|
||||||
#endif /* NDEBUG */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* FUNCTION: Assert a maximum value for the current irql
|
|
||||||
* ARGUMENTS:
|
|
||||||
* x = Maximum irql
|
|
||||||
*/
|
|
||||||
#define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x))
|
|
||||||
#define assert_irql(x) assert(KeGetCurrentIrql()<=(x))
|
|
||||||
|
|
||||||
#endif /* __INTERNAL_DEBUG */
|
|
|
@ -2,7 +2,7 @@
|
||||||
#ifndef __WIN32K_DRIVER_H
|
#ifndef __WIN32K_DRIVER_H
|
||||||
#define __WIN32K_DRIVER_H
|
#define __WIN32K_DRIVER_H
|
||||||
|
|
||||||
#include <ddk/winddi.h>
|
#include <winddi.h>
|
||||||
|
|
||||||
typedef BOOL (STDCALL *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA);
|
typedef BOOL (STDCALL *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA);
|
||||||
typedef DHPDEV (STDCALL *PGD_ENABLEPDEV)(DEVMODEW *,
|
typedef DHPDEV (STDCALL *PGD_ENABLEPDEV)(DEVMODEW *,
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include <win32k/dc.h>
|
#include <win32k/dc.h>
|
||||||
#include <win32k/coord.h>
|
#include <win32k/coord.h>
|
||||||
#include <win32k/bitmaps.h>
|
#include <win32k/bitmaps.h>
|
||||||
#include <win32k/debug.h>
|
|
||||||
#include <win32k/fillshap.h>
|
#include <win32k/fillshap.h>
|
||||||
#include <win32k/font.h>
|
#include <win32k/font.h>
|
||||||
#include <win32k/icm.h>
|
#include <win32k/icm.h>
|
||||||
|
|
|
@ -9,12 +9,14 @@
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
/* SDK/DDK/NDK Headers. */
|
/* SDK/DDK/NDK Headers. */
|
||||||
|
#define NTOS_MODE_USER
|
||||||
|
#define __GDI32__
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <ddraw.h>
|
#include <ddraw.h>
|
||||||
#include <ddk/winddi.h>
|
#include <ddrawi.h>
|
||||||
#include <ddk/prntfont.h>
|
#include <winddi.h>
|
||||||
|
#include <prntfont.h>
|
||||||
#include <ddrawgdi.h>
|
#include <ddrawgdi.h>
|
||||||
#define NTOS_MODE_USER
|
|
||||||
#include <ndk/ntndk.h>
|
#include <ndk/ntndk.h>
|
||||||
|
|
||||||
/* Win32K External Headers */
|
/* Win32K External Headers */
|
||||||
|
|
|
@ -1200,7 +1200,7 @@ CheckColorsInGamut(
|
||||||
/*
|
/*
|
||||||
* @unimplemented
|
* @unimplemented
|
||||||
*/
|
*/
|
||||||
HANDLE
|
HCOLORSPACE
|
||||||
STDCALL
|
STDCALL
|
||||||
GetColorSpace(
|
GetColorSpace(
|
||||||
HDC hDc
|
HDC hDc
|
||||||
|
@ -1215,7 +1215,7 @@ GetColorSpace(
|
||||||
/*
|
/*
|
||||||
* @unimplemented
|
* @unimplemented
|
||||||
*/
|
*/
|
||||||
BOOL
|
HCOLORSPACE
|
||||||
STDCALL
|
STDCALL
|
||||||
SetColorSpace(
|
SetColorSpace(
|
||||||
HDC a0,
|
HDC a0,
|
||||||
|
@ -3950,7 +3950,7 @@ HWND hWnd
|
||||||
/*
|
/*
|
||||||
* @unimplemented
|
* @unimplemented
|
||||||
*/
|
*/
|
||||||
BOOL STDCALL DdGetDC(
|
HDC STDCALL DdGetDC(
|
||||||
LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
|
LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
|
||||||
LPPALETTEENTRY pColorTable
|
LPPALETTEENTRY pColorTable
|
||||||
)
|
)
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "precomp.h"
|
#include "precomp.h"
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <win32k/debug1.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue