Author: greatlrd Date: Sun Oct 14 17:58:37 2007 New Revision: 29563
URL: http://svn.reactos.org/svn/reactos?rev=29563&view=rev Log: Redirect all dx mocomp api (done)
Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c
Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/... ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Oct 14 17:58:37 2007 @@ -37,7 +37,6 @@ typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE);
typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); - typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA);
@@ -51,10 +50,8 @@ typedef DWORD (NTAPI *PGD_DXDDLOCK)( typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)( typedef DWORD (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)( -typedef DWORD (NTAPI *PGD_DXDDQUERYMOCOMPSTATUS)( typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)( typedef DWORD (NTAPI *PGD_DXDDRELEASEDC)( -typedef DWORD (NTAPI *PGD_DXDDRENDERMOCOMP)( typedef DWORD (NTAPI *PGD_DXDDRESETVISRGN)( typedef DWORD (NTAPI *PGD_DXDDSETCOLORKEY)( typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)( @@ -196,24 +193,7 @@
}
-HANDLE -STDCALL -NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) -{ - PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateMoComp, pfnDdCreateMoComp); - - if (pfnDdCreateMoComp == NULL) - { - DPRINT1("Warring no pfnDdCreateMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateMoComp"); - return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); -} +
DWORD @@ -281,25 +261,7 @@ return pfnDdAttachSurface(hSurfaceFrom,hSurfaceTo); }
-DWORD -STDCALL -NtGdiDdBeginMoCompFrame(HANDLE hMoComp, - PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData) -{ - PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdBeginMoCompFrame, pfnDdBeginMoCompFrame); - - if (pfnDdBeginMoCompFrame == NULL) - { - DPRINT1("Warring no pfnDdBeginMoCompFrame"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdBeginMoCompFrame"); - return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); -} +
DWORD STDCALL @@ -406,25 +368,7 @@ return pfnDdDeleteSurfaceObject(hSurface); }
-DWORD -STDCALL -NtGdiDdDestroyMoComp(HANDLE hMoComp, - PDD_DESTROYMOCOMPDATA puBeginFrameData) -{ - PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyMoComp, pfnDxDdDestroyMoComp); - - if (pfnDxDdDestroyMoComp == NULL) - { - DPRINT1("Warring no pfnDxDdDestroyMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DxDdDestroyMoComp"); - return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); -} +
@@ -447,15 +391,6 @@ DPRINT1("Calling on dxg.sys pfnDdDestroyD3DBuffer"); return pfnDdDestroyD3DBuffer(hSurface); } - - - - -typedef DWORD (NTAPI *PGD_DXDDENDMOCOMPFRAME)(HANDLE, PDD_ENDMOCOMPFRAMEDATA); -typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); -typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); - -
/************************************************************************/ /* DIRECT DRAW OBJECT */
Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/... ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Sun Oct 14 17:58:37 2007 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/d3d.c + * FILE: subsys/win32k/ntddraw/mocomp.c * PROGRAMER: Magnus olsen (magnus@greatlord.com) * REVISION HISTORY: * 19/1-2006 Magnus Olsen @@ -38,59 +38,243 @@ typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPBUFFINFO)(HANDLE, PDD_GETMOCOMPCOMPBUFFDATA); typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPGUIDS)(HANDLE, PDD_GETMOCOMPGUIDSDATA); typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPFORMATS)(HANDLE, PDD_GETMOCOMPFORMATSDATA); - -DWORD -STDCALL -NtGdiDdEndMoCompFrame(HANDLE hMoComp, PDD_ENDMOCOMPFRAMEDATA puEndFrameData) -{ - -} - +typedef DWORD (NTAPI *PGD_DXDDQUERYMOCOMPSTATUS)(HANDLE, PDD_QUERYMOCOMPSTATUSDATA); +typedef DWORD (NTAPI *PGD_DXDDRENDERMOCOMP)(HANDLE, PDD_RENDERMOCOMPDATA); + + +/************************************************************************/ +/* NtGdiDdBeginMoCompFrame */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdBeginMoCompFrame(HANDLE hMoComp, + PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData) +{ + PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdBeginMoCompFrame, pfnDdBeginMoCompFrame); + + if (pfnDdBeginMoCompFrame == NULL) + { + DPRINT1("Warring no pfnDdBeginMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DdBeginMoCompFrame"); + return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); +} + +/************************************************************************/ +/* NtGdiDdCreateMoComp */ +/************************************************************************/ +HANDLE +STDCALL +NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) +{ + PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateMoComp, pfnDdCreateMoComp); + + if (pfnDdCreateMoComp == NULL) + { + DPRINT1("Warring no pfnDdCreateMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DdCreateMoComp"); + return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); +} + +/************************************************************************/ +/* NtGdiDdDestroyMoComp */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdDestroyMoComp(HANDLE hMoComp, + PDD_DESTROYMOCOMPDATA puBeginFrameData) +{ + PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyMoComp, pfnDxDdDestroyMoComp); + + if (pfnDxDdDestroyMoComp == NULL) + { + DPRINT1("Warring no pfnDxDdDestroyMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DxDdDestroyMoComp"); + return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); +} + +/************************************************************************/ +/* NtGdiDdEndMoCompFrame */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdEndMoCompFrame(HANDLE hMoComp, + PDD_ENDMOCOMPFRAMEDATA puEndFrameData) +{ + PGD_DXDDENDMOCOMPFRAME pfnDdEndMoCompFrame = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdEndMoCompFrame, pfnDdEndMoCompFrame); + + if (pfnDdEndMoCompFrame == NULL) + { + DPRINT1("Warring no pfnDdEndMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdEndMoCompFrame"); + return pfnDdEndMoCompFrame(hMoComp, puBeginFrameData); +} + +/************************************************************************/ +/* NtGdiDdGetInternalMoCompInfo */ +/************************************************************************/ DWORD STDCALL NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw, PDD_GETINTERNALMOCOMPDATA puGetInternalData) { - -} - -DWORD STDCALL NtGdiDdGetMoCompBuffInfo( - HANDLE hDirectDraw, - PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData) -{ - -} - + PGD_DXDDGETINTERNALMOCOMPINFO pfnDdGetInternalMoCompInfo = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetInternalMoCompInfo, pfnDdGetInternalMoCompInfo); + + if (pfnDdGetInternalMoCompInfo == NULL) + { + DPRINT1("Warring no pfnDdGetInternalMoCompInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetInternalMoCompInfo"); + return pfnDdGetInternalMoCompInfo(hDirectDraw, puGetInternalData); +} + + +/************************************************************************/ +/* NtGdiDdGetMoCompBuffInfo */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw, + PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData) +{ + PGD_DXDDGETMOCOMPBUFFINFO pfnDdGetMoCompBuffInfo = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompBuffInfo, pfnDdGetMoCompBuffInfo); + + if (pfnDdGetMoCompBuffInfo == NULL) + { + DPRINT1("Warring no pfnDdGetMoCompBuffInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetMoCompBuffInfo"); + return pfnDdGetMoCompBuffInfo(hDirectDraw, puGetBuffData); +} + +/************************************************************************/ +/* NtGdiDdGetMoCompFormats */ +/************************************************************************/ DWORD STDCALL NtGdiDdGetMoCompFormats(HANDLE hDirectDraw, PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData) { - -} - - + PGD_DXDDGETMOCOMPFORMATS pfnDdGetMoCompFormats = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompFormats, pfnDdGetMoCompFormats); + + if (pfnDdGetMoCompFormats == NULL) + { + DPRINT1("Warring no pfnDdGetMoCompFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetMoCompFormats"); + return pfnDdGetMoCompFormats(hDirectDraw, puGetMoCompFormatsData); +} + + +/************************************************************************/ +/* NtGdiDdGetMoCompGuids */ +/************************************************************************/ DWORD STDCALL NtGdiDdGetMoCompGuids(HANDLE hDirectDraw, PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData) { - -} - -DWORD -STDCALL NtGdiDdQueryMoCompStatus(HANDLE hMoComp, - PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData) -{ - -} - - + PGD_DXDDGETMOCOMPGUIDS pfnDdGetMoCompGuids = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompGuids, pfnDdGetMoCompGuids); + + if (pfnDdGetMoCompGuids == NULL) + { + DPRINT1("Warring no pfnDdGetMoCompGuids"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetMoCompGuids"); + return pfnDdGetMoCompGuids(hDirectDraw, puGetMoCompGuidsData); +} + + + +/************************************************************************/ +/* NtGdiDdQueryMoCompStatus */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdQueryMoCompStatus(HANDLE hMoComp, + PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData) +{ + PGD_DXDDQUERYMOCOMPSTATUS pfnDdQueryMoCompStatus = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdQueryMoCompStatus, pfnDdQueryMoCompStatus); + + if (pfnDdQueryMoCompStatus == NULL) + { + DPRINT1("Warring no pfnDdQueryMoCompStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdQueryMoCompStatus"); + return pfnDdQueryMoCompStatus(hMoComp, puQueryMoCompStatusData); +} + + +/************************************************************************/ +/* NtGdiDdRenderMoComp */ +/************************************************************************/ DWORD STDCALL NtGdiDdRenderMoComp(HANDLE hMoComp, PDD_RENDERMOCOMPDATA puRenderMoCompData) { - -} - + PGD_DXDDRENDERMOCOMP pfnDdRenderMoComp = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdRenderMoComp, pfnDdRenderMoComp); + + if (pfnDdRenderMoComp == NULL) + { + DPRINT1("Warring no pfnDdRenderMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdRenderMoComp"); + return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); +} + + +
-
greatlrd＠svn.reactos.org