From 31f85ca295720f4d3598db77a865571a91c0940e Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Mon, 22 Oct 2007 19:42:53 +0000 Subject: [PATCH] start activate code in dxg.sys fixed compiling issue with win32kdc.h FIXME : win32k.sys and dxg.sys compiling are broken at moment svn path=/branches/reactx/; revision=29790 --- reactos/drivers/directx/dxg/main.c | 23 +++++++++++++++++++---- reactos/include/reactos/win32k/win32kdc.h | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/reactos/drivers/directx/dxg/main.c b/reactos/drivers/directx/dxg/main.c index c3d458a1657..c345d48873f 100644 --- a/reactos/drivers/directx/dxg/main.c +++ b/reactos/drivers/directx/dxg/main.c @@ -12,6 +12,21 @@ #include +ULONG gcDxgFuncs = 0x5C; +ULONG gcMaxDdHmgr = 0; +ULONG gcSizeDdHmgr = 0; +gcDummyPageRefCnt = 0; + +HSEMAPHORE *ghsemHmgr = NULL; +VOID * gpDummyPage; + +DRVFN gaDxgFuncs [] = +{ + {0, (PFN) NULL} +}; + + + NTSTATUS DriverEntry(IN PVOID Context1, @@ -29,12 +44,12 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, PULONG DirectDrawContext, PEPROCESS Proc ) { -#if 0 + PDRVFN drv_func; /* Test see if the data is vaild we got from win32k.sys */ - if (size_EngDrv != sizeof(DRVENABLEDATA)) || - (size_DXG_INDEX_API != sizeof(DRVENABLEDATA)) + if ((SizeEngDrv != sizeof(DRVENABLEDATA)) || + (SizeDxgDrv != sizeof(DRVENABLEDATA))) { return STATUS_BUFFER_TOO_SMALL; } @@ -56,7 +71,7 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, { return STATUS_INTERNAL_ERROR; } - +#if 0 /* * Check if all drv functions are sorted right * and if it really are exported diff --git a/reactos/include/reactos/win32k/win32kdc.h b/reactos/include/reactos/win32k/win32kdc.h index cd4c7442b1e..a4d612d9005 100644 --- a/reactos/include/reactos/win32k/win32kdc.h +++ b/reactos/include/reactos/win32k/win32kdc.h @@ -2,7 +2,7 @@ #ifndef __WIN32K_DC_H #define __WIN32K_DC_H -#include "driver.h" +#include typedef enum tagGdiPathState {