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

Fixed DRIVER_FUNCTIONS this struct are being passdown to ms dxg.sys and it access it direcly so we need it match eacly windows xp/2003 layout

Browse source 
Fixed DRIVER_BuildDDIFunctions it now setup all api from the drv to DRIVER_FUNCTIONS struct. it is update to windows 2003, we can now use all hw acc api that exists in the drv.
we do not doing that yet. 



svn path=/trunk/; revision=33217
This commit is contained in:
Magnus Olsen 2008-05-01 16:36:42 +00:00
parent 99eaa62157
commit fdc64df76a
5 changed files with 162 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/include/ddk/winddi.h
View file

@ -337,6 +337,7 @@ typedef struct _DRIVEROBJ {
#define INDEX_DrvOffset 6L #define INDEX_DrvOffset 6L
#define INDEX_DrvResetPDEV 7L #define INDEX_DrvResetPDEV 7L
#define INDEX_DrvDisableDriver 8L #define INDEX_DrvDisableDriver 8L
#define INDEX_DrvUnknown1 9L
#define INDEX_DrvCreateDeviceBitmap 10L #define INDEX_DrvCreateDeviceBitmap 10L
#define INDEX_DrvDeleteDeviceBitmap 11L #define INDEX_DrvDeleteDeviceBitmap 11L
#define INDEX_DrvRealizeBrush 12L #define INDEX_DrvRealizeBrush 12L
@ -348,6 +349,7 @@ typedef struct _DRIVEROBJ {
#define INDEX_DrvBitBlt 18L #define INDEX_DrvBitBlt 18L
#define INDEX_DrvCopyBits 19L #define INDEX_DrvCopyBits 19L
#define INDEX_DrvStretchBlt 20L #define INDEX_DrvStretchBlt 20L
#define INDEX_DrvUnknown2 21L
#define INDEX_DrvSetPalette 22L #define INDEX_DrvSetPalette 22L
#define INDEX_DrvTextOut 23L #define INDEX_DrvTextOut 23L
#define INDEX_DrvEscape 24L #define INDEX_DrvEscape 24L
@ -362,8 +364,10 @@ typedef struct _DRIVEROBJ {
#define INDEX_DrvStartPage 33L #define INDEX_DrvStartPage 33L
#define INDEX_DrvEndDoc 34L #define INDEX_DrvEndDoc 34L
#define INDEX_DrvStartDoc 35L #define INDEX_DrvStartDoc 35L
#define INDEX_DrvUnknown3 36L
#define INDEX_DrvGetGlyphMode 37L #define INDEX_DrvGetGlyphMode 37L
#define INDEX_DrvSynchronize 38L #define INDEX_DrvSynchronize 38L
#define INDEX_DrvUnknown4 39L
#define INDEX_DrvSaveScreenBits 40L #define INDEX_DrvSaveScreenBits 40L
#define INDEX_DrvGetModes 41L #define INDEX_DrvGetModes 41L
#define INDEX_DrvFree 42L #define INDEX_DrvFree 42L
@ -387,6 +391,7 @@ typedef struct _DRIVEROBJ {
#define INDEX_DrvEnableDirectDraw 60L #define INDEX_DrvEnableDirectDraw 60L
#define INDEX_DrvDisableDirectDraw 61L #define INDEX_DrvDisableDirectDraw 61L
#define INDEX_DrvQuerySpoolType 62L #define INDEX_DrvQuerySpoolType 62L
#define INDEX_DrvUnknown5 63L
#define INDEX_DrvIcmCreateColorTransform 64L #define INDEX_DrvIcmCreateColorTransform 64L
#define INDEX_DrvIcmDeleteColorTransform 65L #define INDEX_DrvIcmDeleteColorTransform 65L
#define INDEX_DrvIcmCheckBitmapBits 66L #define INDEX_DrvIcmCheckBitmapBits 66L
@ -3622,6 +3627,7 @@ typedef DHPDEV
IN LPWSTR pwszDeviceName, IN LPWSTR pwszDeviceName,
IN HANDLE hDriver); IN HANDLE hDriver);
#endif #endif
typedef HSURF typedef HSURF
(APIENTRY *PFN_DrvEnableSurface)( (APIENTRY *PFN_DrvEnableSurface)(
IN DHPDEV dhpdev); IN DHPDEV dhpdev);

2
reactos/include/reactos/drivers/directx/directxint.h
View file

@ -140,7 +140,7 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL
/* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verified to match Windows XP, pvmList /* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verified to match Windows XP, pvmList
/* 0x038 */ DWORD dwNumFourCC; /* 0x038 */ DWORD dwNumFourCC;
/* 0x03C */ PDWORD pdwFourCC; /* 0x03C */ PDWORD pdwFourCC;
/* 0x040 */ DD_HALINFO ddHalInfo; /* 0x040 */ DD_HALINFO ddHalInfo; // 0x040 <-- verified to match Windows XP, ddHalInfo
/* 0x1E0 */ ULONG unk_1e0[46]; /* 0x1E0 */ ULONG unk_1e0[46];
/* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks
/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks /* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks

192
reactos/include/reactos/win32k/ntgdityp.h
View file

@ -531,102 +531,102 @@ typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG);
// //
typedef struct _DRIVER_FUNCTIONS typedef struct _DRIVER_FUNCTIONS
{ {
PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra PGD_ENABLEPDEV EnablePDEV;
PGD_ENABLEPDEV EnablePDEV; PGD_COMPLETEPDEV CompletePDEV;
PGD_COMPLETEPDEV CompletePDEV; PGD_DISABLEPDEV DisablePDEV;
PGD_DISABLEPDEV DisablePDEV; PGD_ENABLESURFACE EnableSurface;
PGD_ENABLESURFACE EnableSurface; PGD_DISABLESURFACE DisableSurface;
PGD_DISABLESURFACE DisableSurface; PGD_ASSERTMODE AssertMode;
PGD_ASSERTMODE AssertMode; PGD_OFFSET Offset;
PGD_OFFSET Offset; PGD_RESETPDEV ResetPDEV;
PGD_RESETPDEV ResetPDEV; PGD_DISABLEDRIVER DisableDriver;
PGD_DISABLEDRIVER DisableDriver; PVOID Unknown1;
PVOID Unknown0; PGD_CREATEDEVICEBITMAP CreateDeviceBitmap;
PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap;
PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; PGD_REALIZEBRUSH RealizeBrush;
PGD_REALIZEBRUSH RealizeBrush; PGD_DITHERCOLOR DitherColor;
PGD_DITHERCOLOR DitherColor; PGD_STROKEPATH StrokePath;
PGD_STROKEPATH StrokePath; PGD_FILLPATH FillPath;
PGD_FILLPATH FillPath; PGD_STROKEANDFILLPATH StrokeAndFillPath;
PGD_STROKEANDFILLPATH StrokeAndFillPath; PGD_PAINT Paint;
PGD_PAINT Paint; PGD_BITBLT BitBlt;
PGD_BITBLT BitBlt; PGD_COPYBITS CopyBits;
PGD_COPYBITS CopyBits; PGD_STRETCHBLT StretchBlt;
PGD_STRETCHBLT StretchBlt; PVOID Unknown2;
PVOID Unknown1; PGD_SETPALETTE SetPalette;
PGD_SETPALETTE SetPalette; PGD_TEXTOUT TextOut;
PGD_TEXTOUT TextOut; PGD_ESCAPE Escape;
PGD_ESCAPE Escape; PGD_DRAWESCAPE DrawEscape;
PGD_DRAWESCAPE DrawEscape; PGD_QUERYFONT QueryFont;
PGD_QUERYFONT QueryFont; PGD_QUERYFONTTREE QueryFontTree;
PGD_QUERYFONTTREE QueryFontTree; PGD_QUERYFONTDATA QueryFontData;
PGD_QUERYFONTDATA QueryFontData; PGD_SETPOINTERSHAPE SetPointerShape;
PGD_SETPOINTERSHAPE SetPointerShape; PGD_MOVEPOINTER MovePointer;
PGD_MOVEPOINTER MovePointer; PGD_LINETO LineTo;
PGD_LINETO LineTo; PGD_SENDPAGE SendPage;
PGD_SENDPAGE SendPage; PGD_STARTPAGE StartPage;
PGD_STARTPAGE StartPage; PGD_ENDDOC EndDoc;
PGD_ENDDOC EndDoc; PGD_STARTDOC StartDoc;
PGD_STARTDOC StartDoc; PVOID Unknown3;
PVOID Unknown2; PGD_GETGLYPHMODE GetGlyphMode;
PGD_GETGLYPHMODE GetGlyphMode; PGD_SYNCHRONIZE Synchronize;
PGD_SYNCHRONIZE Synchronize; PVOID Unknown4;
PVOID Unknown3; PGD_SAVESCREENBITS SaveScreenBits;
PGD_SAVESCREENBITS SaveScreenBits; PGD_GETMODES GetModes;
PGD_GETMODES GetModes; PGD_FREE Free;
PGD_FREE Free; PGD_DESTROYFONT DestroyFont;
PGD_DESTROYFONT DestroyFont; PGD_QUERYFONTCAPS QueryFontCaps;
PGD_QUERYFONTCAPS QueryFontCaps; PGD_LOADFONTFILE LoadFontFile;
PGD_LOADFONTFILE LoadFontFile; PGD_UNLOADFONTFILE UnloadFontFile;
PGD_UNLOADFONTFILE UnloadFontFile; PGD_FONTMANAGEMENT FontManagement;
PGD_FONTMANAGEMENT FontManagement; PGD_QUERYTRUETYPETABLE QueryTrueTypeTable;
PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline;
PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; PGD_GETTRUETYPEFILE GetTrueTypeFile;
PGD_GETTRUETYPEFILE GetTrueTypeFile; PGD_QUERYFONTFILE QueryFontFile;
PGD_QUERYFONTFILE QueryFontFile; PFN_DrvMovePanning MovePanning;
PFN_DrvMovePanning MovePanning; PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths;
PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; PGD_SETPIXELFORMAT SetPixelFormat;
PGD_SETPIXELFORMAT SetPixelFormat; PGD_DESCRIBEPIXELFORMAT DescribePixelFormat;
PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; PGD_SWAPBUFFERS SwapBuffers;
PGD_SWAPBUFFERS SwapBuffers; PGD_STARTBANDING StartBanding;
PGD_STARTBANDING StartBanding; PGD_NEXTBAND NextBand;
PGD_NEXTBAND NextBand; PGD_GETDIRECTDRAWINFO GetDirectDrawInfo;
PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; PGD_ENABLEDIRECTDRAW EnableDirectDraw;
PGD_ENABLEDIRECTDRAW EnableDirectDraw; PGD_DISABLEDIRECTDRAW DisableDirectDraw;
PGD_DISABLEDIRECTDRAW DisableDirectDraw; PGD_QUERYSPOOLTYPE QuerySpoolType;
PGD_QUERYSPOOLTYPE QuerySpoolType; PVOID Unknown5;
PVOID Unknown4; PFN_DrvIcmCreateColorTransform IcmCreateColorTransform;
PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform;
PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits;
PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp;
PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; PGD_GRADIENTFILL GradientFill;
PGD_GRADIENTFILL GradientFill; PGD_STRETCHBLTROP StretchBltROP;
PGD_STRETCHBLTROP StretchBltROP; PFN_DrvPlgBlt PlgBlt;
PFN_DrvPlgBlt PlgBlt; PGD_ALPHABLEND AlphaBlend;
PGD_ALPHABLEND AlphaBlend; PVOID SynthesizeFont;
PVOID SynthesizeFont; PVOID GetSynthesizedFontFiles;
PVOID Unknown5; PGD_TRANSPARENTBLT TransparentBlt;
PVOID GetSynthesizedFontFiles; PFN_DrvQueryPerBandInfo QueryPerBandInfo;
PVOID Unknown6; PFN_DrvQueryDeviceSupport QueryDeviceSupport;
PGD_TRANSPARENTBLT TransparentBlt; PVOID Reserved1;
PFN_DrvQueryPerBandInfo QueryPerBandInfo; PVOID Reserved2;
PFN_DrvQueryDeviceSupport QueryDeviceSupport; PVOID Reserved3;
PVOID Reserved1; PVOID Reserved4;
PVOID Reserved2; PVOID Reserved5;
PVOID Reserved3; PVOID Reserved6;
PVOID Reserved4; PVOID Reserved7;
PVOID Reserved5; PVOID Reserved8;
PVOID Reserved6; PFN_DrvDeriveSurface DeriveSurface;
PVOID Reserved7; PFN_DrvQueryGlyphAttrs QueryGlyphAttrs;
PVOID Reserved8; PFN_DrvNotify Notify;
PFN_DrvDeriveSurface DeriveSurface; PGD_SYNCHRONIZESURFACE SynchronizeSurface;
PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; PFN_DrvResetDevice ResetDevice;
PFN_DrvNotify Notify; PVOID Reserved9;
PGD_SYNCHRONIZESURFACE SynchronizeSurface; PVOID Reserved10;
PFN_DrvResetDevice ResetDevice; PVOID Reserved11; /* 92 */
PVOID Reserved9;
PVOID Reserved10; /* ReactOS specify */
PVOID Reserved11; PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra
} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS;
#endif #endif

37
reactos/subsystems/win32/win32k/misc/driver.c
View file

@ -31,6 +31,7 @@
/* #define TRACE_DRV_CALLS to get a log of all calls into the display driver. */ /* #define TRACE_DRV_CALLS to get a log of all calls into the display driver. */
#undef TRACE_DRV_CALLS #undef TRACE_DRV_CALLS
typedef struct _GRAPHICS_DRIVER typedef struct _GRAPHICS_DRIVER
{ {
PWSTR Name; PWSTR Name;
@ -391,7 +392,6 @@ BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
PDRIVER_FUNCTIONS DF) PDRIVER_FUNCTIONS DF)
{ {
BEGIN_FUNCTION_MAP(); BEGIN_FUNCTION_MAP();
DRIVER_FUNCTION(EnablePDEV); DRIVER_FUNCTION(EnablePDEV);
DRIVER_FUNCTION(CompletePDEV); DRIVER_FUNCTION(CompletePDEV);
DRIVER_FUNCTION(DisablePDEV); DRIVER_FUNCTION(DisablePDEV);
@ -401,6 +401,7 @@ BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
DRIVER_FUNCTION(Offset); DRIVER_FUNCTION(Offset);
DRIVER_FUNCTION(ResetPDEV); DRIVER_FUNCTION(ResetPDEV);
DRIVER_FUNCTION(DisableDriver); DRIVER_FUNCTION(DisableDriver);
DRIVER_FUNCTION(Unknown1);
DRIVER_FUNCTION(CreateDeviceBitmap); DRIVER_FUNCTION(CreateDeviceBitmap);
DRIVER_FUNCTION(DeleteDeviceBitmap); DRIVER_FUNCTION(DeleteDeviceBitmap);
DRIVER_FUNCTION(RealizeBrush); DRIVER_FUNCTION(RealizeBrush);
@ -410,10 +411,9 @@ BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
DRIVER_FUNCTION(StrokeAndFillPath); DRIVER_FUNCTION(StrokeAndFillPath);
DRIVER_FUNCTION(Paint); DRIVER_FUNCTION(Paint);
DRIVER_FUNCTION(BitBlt); DRIVER_FUNCTION(BitBlt);
DRIVER_FUNCTION(TransparentBlt);
DRIVER_FUNCTION(CopyBits); DRIVER_FUNCTION(CopyBits);
DRIVER_FUNCTION(StretchBlt); DRIVER_FUNCTION(StretchBlt);
DRIVER_FUNCTION(StretchBltROP); DRIVER_FUNCTION(Unknown2);
DRIVER_FUNCTION(SetPalette); DRIVER_FUNCTION(SetPalette);
DRIVER_FUNCTION(TextOut); DRIVER_FUNCTION(TextOut);
DRIVER_FUNCTION(Escape); DRIVER_FUNCTION(Escape);
@ -428,8 +428,10 @@ BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
DRIVER_FUNCTION(StartPage); DRIVER_FUNCTION(StartPage);
DRIVER_FUNCTION(EndDoc); DRIVER_FUNCTION(EndDoc);
DRIVER_FUNCTION(StartDoc); DRIVER_FUNCTION(StartDoc);
DRIVER_FUNCTION(Unknown3);
DRIVER_FUNCTION(GetGlyphMode); DRIVER_FUNCTION(GetGlyphMode);
DRIVER_FUNCTION(Synchronize); DRIVER_FUNCTION(Synchronize);
DRIVER_FUNCTION(Unknown4);
DRIVER_FUNCTION(SaveScreenBits); DRIVER_FUNCTION(SaveScreenBits);
DRIVER_FUNCTION(GetModes); DRIVER_FUNCTION(GetModes);
DRIVER_FUNCTION(Free); DRIVER_FUNCTION(Free);
@ -452,11 +454,36 @@ BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED,
DRIVER_FUNCTION(EnableDirectDraw); DRIVER_FUNCTION(EnableDirectDraw);
DRIVER_FUNCTION(DisableDirectDraw); DRIVER_FUNCTION(DisableDirectDraw);
DRIVER_FUNCTION(QuerySpoolType); DRIVER_FUNCTION(QuerySpoolType);
DRIVER_FUNCTION(Unknown5);
DRIVER_FUNCTION(IcmCreateColorTransform);
DRIVER_FUNCTION(IcmDeleteColorTransform);
DRIVER_FUNCTION(IcmCheckBitmapBits);
DRIVER_FUNCTION(IcmSetDeviceGammaRamp); DRIVER_FUNCTION(IcmSetDeviceGammaRamp);
DRIVER_FUNCTION(GradientFill); DRIVER_FUNCTION(GradientFill);
DRIVER_FUNCTION(SynchronizeSurface); DRIVER_FUNCTION(StretchBltROP);
DRIVER_FUNCTION(PlgBlt);
DRIVER_FUNCTION(AlphaBlend); DRIVER_FUNCTION(AlphaBlend);
DRIVER_FUNCTION(SynthesizeFont);
DRIVER_FUNCTION(GetSynthesizedFontFiles);
DRIVER_FUNCTION(TransparentBlt);
DRIVER_FUNCTION(QueryPerBandInfo);
DRIVER_FUNCTION(QueryDeviceSupport);
DRIVER_FUNCTION(Reserved1);
DRIVER_FUNCTION(Reserved2);
DRIVER_FUNCTION(Reserved3);
DRIVER_FUNCTION(Reserved4);
DRIVER_FUNCTION(Reserved5);
DRIVER_FUNCTION(Reserved6);
DRIVER_FUNCTION(Reserved7);
DRIVER_FUNCTION(Reserved8);
DRIVER_FUNCTION(DeriveSurface);
DRIVER_FUNCTION(QueryGlyphAttrs);
DRIVER_FUNCTION(Notify);
DRIVER_FUNCTION(SynchronizeSurface);
DRIVER_FUNCTION(ResetDevice);
DRIVER_FUNCTION(Reserved9);
DRIVER_FUNCTION(Reserved10);
DRIVER_FUNCTION(Reserved11);
END_FUNCTION_MAP(); END_FUNCTION_MAP();
return TRUE; return TRUE;

2
reactos/subsystems/win32/win32k/ntddraw/dxeng.c
View file

@ -737,6 +737,8 @@ DxEngCleanDC(HDC hdc)
/************************************************************************/ /************************************************************************/
BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask)
{ {
DPRINT1("ReactX Calling : DxEngSetDCOwner \n");
return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE);
} }