[greatlrd] 29803: puting back dc.h and driver.h to win32k/include as jimtablor requested. we need move PDC only to ntgdihdl.h.

Author: greatlrd
Date: Tue Oct 23 03:21:23 2007
New Revision: 29803

URL: http://svn.reactos.org/svn/reactos?rev=29803&view=rev
Log:
puting back dc.h and driver.h to win32k/include as jimtablor requested.
we need move PDC only to ntgdihdl.h.

Added:
    branches/reactx/reactos/subsystems/win32/win32k/include/dc.h
      - copied unchanged from r29785,
branches/reactx/reactos/subsystems/win32/win32k/include/dc.h
    branches/reactx/reactos/subsystems/win32/win32k/include/driver.h
      - copied unchanged from r29785,
branches/reactx/reactos/subsystems/win32/win32k/include/driver.h
Removed:
    branches/reactx/reactos/include/reactos/win32k/win32kdc.h
    branches/reactx/reactos/include/reactos/win32k/win32kdriver.h
Modified:
    branches/reactx/reactos/subsystems/win32/win32k/include/dib.h
    branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h

Removed: branches/reactx/reactos/include/reactos/win32k/win32kdc.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/…
==============================================================================
--- branches/reactx/reactos/include/reactos/win32k/win32kdc.h (original)
+++ branches/reactx/reactos/include/reactos/win32k/win32kdc.h (removed)
@@ -1,185 +1,0 @@
-
-#ifndef __WIN32K_DC_H
-#define __WIN32K_DC_H
-
-#include <reactos/win32k/win32kdriver.h>
-
-typedef enum tagGdiPathState
-{
-   PATH_Null,
-   PATH_Open,
-   PATH_Closed
-} GdiPathState;
-
-typedef struct tagGdiPath
-{
-   GdiPathState state;
-   POINT      *pPoints;
-   BYTE         *pFlags;
-   int          numEntriesUsed, numEntriesAllocated;
-   BOOL       newStroke;
-} GdiPath;
-
-typedef struct _WIN_DC_INFO
-{
-  int  flags;
-  HRGN  hClipRgn;     /* Clip region (may be 0) */
-  HRGN  hVisRgn;      /* Visible region (must never be 0) */
-  HRGN  hGCClipRgn;   /* GC clip region (ClipRgn AND VisRgn) */
-  HBITMAP  hBitmap;
-  HBITMAP  hFirstBitmap; /* Bitmap selected at creation of the DC */
-
-/* #if 0 */
-    HANDLE      hDevice;
-    HPALETTE    hPalette;
-
-    GdiPath       path;
-/* #endif */
-
-  RECT   totalExtent;
-  BYTE   bitsPerPixel;
-
-  INT  DCOrgX;            /* DC origin */
-  INT  DCOrgY;
-  INT  ArcDirection;
-
-  XFORM  xformWorld2Wnd;    /* World-to-window transformation */
-  XFORM  xformWorld2Vport;  /* World-to-viewport transformation */
-  XFORM  xformVport2World;  /* Inverse of the above transformation */
-  BOOL  vport2WorldValid;  /* Is xformVport2World valid? */
-} WIN_DC_INFO;
-
-  /* DC flags */
-#define DC_MEMORY     0x0001   /* It is a memory DC */
-#define DC_SAVED      0x0002   /* It is a saved DC */
-#define DC_DIRTY      0x0004   /* hVisRgn has to be updated */
-#define DC_THUNKHOOK  0x0008   /* DC hook is in the 16-bit code */
-
-#define  GDI_DC_TYPE  (1)
-
-typedef struct _DC
-{
-  HGDIOBJ     hHmgr;
-  PVOID       pvEntry;
-  ULONG       lucExcLock;
-  ULONG       Tid;
-
-  DHPDEV      PDev;
-  INT         DC_Type;
-  INT         DC_Flags;
-  PDC_ATTR    pDc_Attr;
-  DC_ATTR     Dc_Attr;
-
-  HDC         hSelf;
-  HDC         hNext;
-  HSURF       FillPatternSurfaces[HS_DDI_MAX];
-  PGDIINFO    GDIInfo;
-  PDEVINFO    DevInfo;
-  HDEV        GDIDevice;
-
-  DRIVER_FUNCTIONS  DriverFunctions;
-  UNICODE_STRING    DriverName;
-  HANDLE      DeviceDriver;
-
-  CLIPOBJ     *CombinedClip;
-
-  XLATEOBJ    *XlateBrush;
-  XLATEOBJ    *XlatePen;
-
-  INT         saveLevel;
-  BOOL        IsIC;
-
-  HPALETTE    PalIndexed;
-
-  WIN_DC_INFO w;
-  
-  HANDLE      hFile;  
-  LPENHMETAHEADER emh;
-} DC, *PDC;
-
-typedef struct _GDIPOINTER /* should stay private to ENG */
-{
-  /* private GDI pointer handling information, required for software emulation */
-  BOOL Enabled;
-  POINTL Pos;
-  SIZEL Size;
-  POINTL HotSpot;
-  XLATEOBJ *XlateObject;
-  HSURF ColorSurface;
-  HSURF MaskSurface;
-  HSURF SaveSurface;
-  int  ShowPointer; /* counter negtive  do not show the mouse postive show the mouse */
-  
-  /* public pointer information */
-  RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */
-  PGD_MOVEPOINTER MovePointer;
-  ULONG Status;
-} GDIPOINTER, *PGDIPOINTER;
-
-typedef struct
-{
-  HANDLE Handle;
-  DHPDEV PDev;
-  DEVMODEW DMW;
-  HSURF FillPatterns[HS_DDI_MAX];
-  GDIINFO GDIInfo;
-  DEVINFO DevInfo;
-  DRIVER_FUNCTIONS DriverFunctions;
-  PFILE_OBJECT VideoFileObject;
-  BOOLEAN PreparedDriver;
-  ULONG DisplayNumber;
-
-  GDIPOINTER Pointer;
-
-  /* Stuff to keep track of software cursors; win32k gdi part */
-  UINT SafetyRemoveLevel; /* at what level was the cursor removed?
-			     0 for not removed */
-  UINT SafetyRemoveCount;
-} GDIDEVICE;
-
-/*  Internal functions  */
-
-#define  DC_LockDc(hDC)  \
-  ((PDC) GDIOBJ_LockObj (GdiHandleTable, (HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC))
-#define  DC_UnlockDc(pDC)  \
-  GDIOBJ_UnlockObjByPtr (GdiHandleTable, pDC)
-
-NTSTATUS FASTCALL InitDcImpl(VOID);
-HDC  FASTCALL RetrieveDisplayHDC(VOID);
-HDC  FASTCALL DC_AllocDC(PUNICODE_STRING  Driver);
-VOID FASTCALL DC_InitDC(HDC  DCToInit);
-HDC  FASTCALL DC_FindOpenDC(PUNICODE_STRING  Driver);
-VOID FASTCALL DC_FreeDC(HDC);
-VOID FASTCALL DC_AllocateDcAttr(HDC);
-VOID FASTCALL DC_FreeDcAttr(HDC);
-BOOL INTERNAL_CALL DC_Cleanup(PVOID ObjectBody);
-HDC  FASTCALL DC_GetNextDC (PDC pDC);
-VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC);
-VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner);
-VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC);
-VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC);
-
-VOID FASTCALL DC_UpdateXforms(PDC  dc);
-BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest);
-
-BOOL FASTCALL DCU_UpdateUserXForms(PDC, ULONG);
-BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC, FLONG);
-BOOL FASTCALL DCU_SynchDcAttrtoUser(HDC, FLONG);
-BOOL FASTCALL DCU_SyncDcAttrtoW32k(PDC, FLONG);
-BOOL FASTCALL DCU_SynchDcAttrtoW32k(HDC, FLONG);
-
-VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt);
-VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt);
-VOID FASTCALL IntGetWindowExtEx(PDC dc, LPSIZE pt);
-VOID FASTCALL IntGetWindowOrgEx(PDC dc, LPPOINT pt);
-
-NTSTATUS STDCALL NtGdiFlushUserBatch(VOID);
-
-/* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs
15/9-2006*/
-typedef struct
-{
-  LPENHMETAHEADER  emh;
-  BOOL    on_disk;   /* true if metafile is on disk */
-} DD_ENHMETAFILEOBJ, *PDD_ENHMETAFILEOBJ;
-
-#endif /* __WIN32K_DC_H */

Removed: branches/reactx/reactos/include/reactos/win32k/win32kdriver.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/…
==============================================================================
--- branches/reactx/reactos/include/reactos/win32k/win32kdriver.h (original)
+++ branches/reactx/reactos/include/reactos/win32k/win32kdriver.h (removed)
@@ -1,190 +1,0 @@
-
-#ifndef __WIN32K_DRIVER_H
-#define __WIN32K_DRIVER_H
-
-#include <winddi.h>
-
-typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA);
-typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW  *,
-                                 LPWSTR,
-                                 ULONG,
-                                 HSURF  *,
-                                 ULONG,
-                                 ULONG  *,
-                                 ULONG,
-                                 DEVINFO  *,
-                                 LPWSTR,
-                                 LPWSTR,
-                                 HANDLE);
-typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV);
-typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); 
-typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV);
-typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV);
-typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL);
-typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG);
-typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV);
-typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID);
-typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); 
-typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); 
-typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*,
RECTL*, BLENDOBJ*);
-typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*,
-                                 XLATEOBJ*, ULONG); 
-typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); 
-typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*,
-                               BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); 
-typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*,
-                             POINTL*, MIX, ULONG); 
-typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*,
-                                      XFORMOBJ*, BRUSHOBJ*, PLINEATTRS,
-                                      BRUSHOBJ*, POINTL*, MIX, ULONG); 
-typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); 
-typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*,
-                           XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*,
-                           POINTL*, ROP4); 
-typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*,
-                                           RECTL*, RECTL*, ULONG, ULONG);
-typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*,
-                             RECTL*, POINTL*); 
-typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*,
-                               XLATEOBJ*, COLORADJUSTMENT*, POINTL*,
-                               RECTL*, RECTL*, POINTL*, ULONG);
-typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*,
-                                          XLATEOBJ*, COLORADJUSTMENT*, POINTL*,
-                                          RECTL*, RECTL*, POINTL*, ULONG,
-                                          BRUSHOBJ*, DWORD);
-typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); 
-typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*,
-                            RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); 
-typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); 
-typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, 
-                                PVOID *); 
-typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); 
-typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); 
-typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*,
-                                  PVOID, ULONG); 
-typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*,
-                                     LONG, LONG, LONG, LONG, RECTL*, ULONG); 
-typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); 
-typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG,
-                           LONG, RECTL*, MIX);
-typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*);
-typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*);
-typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG);
-typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD);
-typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*);
-typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*);
-typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*);
-typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW);
-typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG);
-typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*);
-typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG);
-typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG);
-typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG);
-typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID,
-                                    ULONG, PVOID);
-typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG,
-                                       PBYTE);
-typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL,
-                                         GLYPHDATA*, ULONG, TTPOLYGONHEADER*);
-typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG);
-typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG);
-typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *,
-                                       PVOID *, ULONG);
-typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG);
-typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG,
-                                        PPIXELFORMATDESCRIPTOR);
-typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ);
-typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*);
-typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*);
-
-typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*,
PDWORD, PDWORD);
-typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS,
PDD_PALETTECALLBACKS);
-typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV);
-
-typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR);
-
-typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG,
PVOID, ULONG, RECTL*, POINTL*, ULONG);
-
-typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG);
-
-typedef struct _DRIVER_FUNCTIONS
-{
-  PGD_ENABLEDRIVER  EnableDriver;
-  PGD_ENABLEPDEV  EnablePDEV;
-  PGD_COMPLETEPDEV  CompletePDEV;
-  PGD_DISABLEPDEV  DisablePDEV;
-  PGD_ENABLESURFACE  EnableSurface;
-  PGD_DISABLESURFACE  DisableSurface;
-  PGD_ASSERTMODE  AssertMode;
-  PGD_OFFSET  Offset;
-  PGD_RESETPDEV  ResetPDEV;
-  PGD_DISABLEDRIVER  DisableDriver;
-  PGD_CREATEDEVICEBITMAP  CreateDeviceBitmap;
-  PGD_DELETEDEVICEBITMAP  DeleteDeviceBitmap;
-  PGD_REALIZEBRUSH  RealizeBrush;
-  PGD_DITHERCOLOR  DitherColor;
-  PGD_STROKEPATH  StrokePath;
-  PGD_FILLPATH  FillPath;
-  PGD_STROKEANDFILLPATH  StrokeAndFillPath;
-  PGD_PAINT  Paint;
-  PGD_BITBLT  BitBlt;
-  PGD_TRANSPARENTBLT TransparentBlt;
-  PGD_COPYBITS  CopyBits;
-  PGD_STRETCHBLT  StretchBlt;
-  PGD_STRETCHBLTROP  StretchBltROP;
-  PGD_SETPALETTE  SetPalette;
-  PGD_TEXTOUT  TextOut;
-  PGD_ESCAPE  Escape;
-  PGD_DRAWESCAPE  DrawEscape;
-  PGD_QUERYFONT  QueryFont;
-  PGD_QUERYFONTTREE  QueryFontTree;
-  PGD_QUERYFONTDATA  QueryFontData;
-  PGD_SETPOINTERSHAPE  SetPointerShape;
-  PGD_MOVEPOINTER  MovePointer;
-  PGD_LINETO  LineTo;
-  PGD_SENDPAGE  SendPage;
-  PGD_STARTPAGE  StartPage;
-  PGD_ENDDOC  EndDoc;
-  PGD_STARTDOC  StartDoc;
-  PGD_GETGLYPHMODE  GetGlyphMode;
-  PGD_SYNCHRONIZE  Synchronize;
-  PGD_SAVESCREENBITS  SaveScreenBits;
-  PGD_GETMODES  GetModes;
-  PGD_FREE  Free;
-  PGD_DESTROYFONT  DestroyFont;
-  PGD_QUERYFONTCAPS  QueryFontCaps;
-  PGD_LOADFONTFILE  LoadFontFile;
-  PGD_UNLOADFONTFILE  UnloadFontFile;
-  PGD_FONTMANAGEMENT  FontManagement;
-  PGD_QUERYTRUETYPETABLE  QueryTrueTypeTable;
-  PGD_QUERYTRUETYPEOUTLINE  QueryTrueTypeOutline;
-  PGD_GETTRUETYPEFILE  GetTrueTypeFile;
-  PGD_QUERYFONTFILE  QueryFontFile;
-  PGD_QUERYADVANCEWIDTHS  QueryAdvanceWidths;
-  PGD_SETPIXELFORMAT  SetPixelFormat;
-  PGD_DESCRIBEPIXELFORMAT  DescribePixelFormat;
-  PGD_SWAPBUFFERS  SwapBuffers;
-  PGD_STARTBANDING  StartBanding;
-  PGD_NEXTBAND  NextBand;
-  PGD_GETDIRECTDRAWINFO  GetDirectDrawInfo;
-  PGD_ENABLEDIRECTDRAW  EnableDirectDraw;
-  PGD_DISABLEDIRECTDRAW  DisableDirectDraw;
-  PGD_QUERYSPOOLTYPE  QuerySpoolType;
-  PGD_GRADIENTFILL  GradientFill;
-  PGD_SYNCHRONIZESURFACE SynchronizeSurface;
-  PGD_ALPHABLEND AlphaBlend;
-} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS;
-
-BOOL  DRIVER_RegisterDriver(LPCWSTR  Name, PGD_ENABLEDRIVER  EnableDriver);
-PGD_ENABLEDRIVER  DRIVER_FindExistingDDIDriver(LPCWSTR  Name);
-PGD_ENABLEDRIVER  DRIVER_FindDDIDriver(LPCWSTR  Name);
-PFILE_OBJECT DRIVER_FindMPDriver(ULONG  DisplayNumber);
-BOOL  DRIVER_BuildDDIFunctions(PDRVENABLEDATA  DED, 
-                               PDRIVER_FUNCTIONS  DF);
-BOOL  DRIVER_UnregisterDriver(LPCWSTR  Name);
-INT  DRIVER_ReferenceDriver (LPCWSTR  Name);
-INT  DRIVER_UnreferenceDriver (LPCWSTR  Name);
-
-#endif
-
-

Modified: branches/reactx/reactos/subsystems/win32/win32k/include/dib.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/include/dib.h (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/include/dib.h Tue Oct 23 03:21:23
2007
@@ -1,7 +1,7 @@
 #ifndef _WIN32K_DIB_H
 #define _WIN32K_DIB_H
 
-#include <reactos/win32k/win32kdc.h>
+#include "dc.h"
 
 INT FASTCALL
 DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);

Modified: branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/include/gdifloat.h Tue Oct 23 03:21:23
2007
@@ -1,7 +1,7 @@
 #ifndef __WIN32K_FLOAT_H
 #define __WIN32K_FLOAT_H
 
-#include <reactos/win32k/win32kdc.h>
+#include "dc.h"
 #include "math.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H