[ros-diffs] [greatlrd] 50052: [win32k] Fix compile issue after chaning the dxg.h and directxint.h

Author: greatlrd
Date: Fri Dec 17 14:28:39 2010
New Revision: 50052

URL: http://svn.reactos.org/svn/reactos?rev=50052&view=rev
Log:
[win32k]
Fix compile issue after chaning the dxg.h and directxint.h

Modified:
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c

Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c [iso-8859-1] (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c [iso-8859-1] Fri Dec 17
14:28:39 2010
@@ -60,7 +60,7 @@
 NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw,
                           PDD_CANCREATESURFACEDATA puCanCreateSurfaceData)
 {
-    PGD_DDCANCREATED3DBUFFER pfnDdCanCreateD3DBuffer =
(PGD_DDCANCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdCanCreateD3DBuffer].pfn;
+    PGD_DDCANCREATED3DBUFFER pfnDdCanCreateD3DBuffer =
(PGD_DDCANCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DXDDCANCREATED3DBUFFER].pfn;
 
     if (pfnDdCanCreateD3DBuffer == NULL)
     {
@@ -119,7 +119,7 @@
                       HANDLE hSurfZ,
                       LPD3DNTHAL_CONTEXTCREATEDATA pdcci)
 {
-    PGD_D3DCONTEXTCREATE pfnD3dContextCreate =
(PGD_D3DCONTEXTCREATE)gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn;
+    PGD_D3DCONTEXTCREATE pfnD3dContextCreate =
(PGD_D3DCONTEXTCREATE)gpDxFuncs[DXG_INDEX_DXD3DCONTEXTCREATE].pfn;
 
     if (pfnD3dContextCreate == NULL)
     {
@@ -154,7 +154,7 @@
 APIENTRY
 NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData)
 {
-    PGD_D3DCONTEXTDESTROY pfnD3dContextDestroy =
(PGD_D3DCONTEXTDESTROY)gpDxFuncs[DXG_INDEX_DxD3dContextDestroy].pfn;
+    PGD_D3DCONTEXTDESTROY pfnD3dContextDestroy =
(PGD_D3DCONTEXTDESTROY)gpDxFuncs[DXG_INDEX_DXD3DCONTEXTDESTROY].pfn;
 
     if ( pfnD3dContextDestroy == NULL)
     {
@@ -192,7 +192,7 @@
 APIENTRY
 NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad)
 {
-    PGD_D3DCONTEXTDESTROYALL pfnD3dContextDestroyAll =
(PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxD3dContextDestroyAll].pfn;
+    PGD_D3DCONTEXTDESTROYALL pfnD3dContextDestroyAll =
(PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DXD3DCONTEXTDESTROYALL].pfn;
 
     if (pfnD3dContextDestroyAll == NULL)
     {
@@ -267,7 +267,7 @@
                        PDD_CREATESURFACEDATA puCreateSurfaceData,
                        HANDLE *puhSurface)
 {
-    PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer =
(PGD_DDCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn;
+    PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer =
(PGD_DDCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DXDDCREATED3DBUFFER].pfn;
 
     if (pfnDdCreateD3DBuffer == NULL)
     {
@@ -289,7 +289,7 @@
 APIENTRY
 NtGdiDdDestroyD3DBuffer(HANDLE hSurface)
 {
-    PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer =
(PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn;  
+    PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer =
(PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DXDDDESTROYD3DBUFFER].pfn;  
     
     if (pfnDdDestroyD3DBuffer == NULL)
     {
@@ -314,7 +314,7 @@
                         FLATPTR *pfpVidMemVtx,
                         DWORD *pdwSizeVtx)
 {
-    PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2  =
(PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DxD3dDrawPrimitives2].pfn;  
+    PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2  =
(PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DXD3DDRAWPRIMITIVES2].pfn;  
     
     if (pfnD3dDrawPrimitives2 == NULL)
     {
@@ -335,7 +335,7 @@
 NtGdiDdLockD3D(HANDLE hSurface,
                PDD_LOCKDATA puLockData)
 {
-    PGD_DXDDLOCKD3D pfnDdLockD3D  =
(PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdLockD3D].pfn;  
+    PGD_DXDDLOCKD3D pfnDdLockD3D  =
(PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DXDDLOCKD3D].pfn;  
     
     if (pfnDdLockD3D == NULL)
     {
@@ -354,7 +354,7 @@
 APIENTRY
 NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData)
 {
-    PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState =
(PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn;
 
+    PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState =
(PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DXD3DVALIDATETEXTURESTAGESTATE].pfn;
 
    
     if (pfnD3dValidateTextureStageState == NULL)
     {
@@ -374,7 +374,7 @@
 NtGdiDdUnlockD3D(HANDLE hSurface,
                  PDD_UNLOCKDATA puUnlockData)
 {
-    PGD_DXDDUNLOCKD3D pfnDdUnlockD3D =
(PGD_DXDDUNLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdUnlockD3D].pfn;
+    PGD_DXDDUNLOCKD3D pfnDdUnlockD3D =
(PGD_DXDDUNLOCKD3D)gpDxFuncs[DXG_INDEX_DXDDUNLOCKD3D].pfn;
    
     if (pfnDdUnlockD3D == NULL)
     {

Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] Fri Dec 17
14:28:39 2010
@@ -25,7 +25,7 @@
                      PDD_CREATESURFACEDATA puCreateSurfaceData,
                      HANDLE *puhSurface)
 {
-    PGD_DDCREATESURFACE pfnDdCreateSurface =
(PGD_DDCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCreateSurface].pfn;
+    PGD_DDCREATESURFACE pfnDdCreateSurface =
(PGD_DDCREATESURFACE)gpDxFuncs[DXG_INDEX_DXDDCREATESURFACE].pfn;
    
     if (pfnDdCreateSurface == NULL)
     {
@@ -46,7 +46,7 @@
 NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw,
                             PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData)
 {
-    PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank =
(PGD_DXDDWAITFORVERTICALBLANK)gpDxFuncs[DXG_INDEX_DxDdWaitForVerticalBlank].pfn;
+    PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank =
(PGD_DXDDWAITFORVERTICALBLANK)gpDxFuncs[DXG_INDEX_DXDDWAITFORVERTICALBLANK].pfn;
    
     if (pfnDdWaitForVerticalBlank == NULL)
     {
@@ -66,7 +66,7 @@
 NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal,
                         PDD_CANCREATESURFACEDATA puCanCreateSurfaceData)
 {
-    PGD_DDCANCREATESURFACE pfnDdCanCreateSurface =
(PGD_DDCANCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCanCreateSurface].pfn;
+    PGD_DDCANCREATESURFACE pfnDdCanCreateSurface =
(PGD_DDCANCREATESURFACE)gpDxFuncs[DXG_INDEX_DXDDCANCREATESURFACE].pfn;
     
     if (pfnDdCanCreateSurface == NULL)
     {
@@ -87,7 +87,7 @@
 NtGdiDdGetScanLine(HANDLE hDirectDrawLocal,
                    PDD_GETSCANLINEDATA puGetScanLineData)
 {
-    PGD_DXDDGETSCANLINE  pfnDdGetScanLine =
(PGD_DXDDGETSCANLINE)gpDxFuncs[DXG_INDEX_DxDdGetScanLine].pfn;
+    PGD_DXDDGETSCANLINE  pfnDdGetScanLine =
(PGD_DXDDGETSCANLINE)gpDxFuncs[DXG_INDEX_DXDDGETSCANLINE].pfn;
    
     if (pfnDdGetScanLine == NULL)
     {
@@ -115,7 +115,7 @@
                        HANDLE hSurface,
                        DWORD dwSurfaceHandle)
 {
-    PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx  =
(PGD_DXDDCREATESURFACEEX)gpDxFuncs[DXG_INDEX_DxDdCreateSurfaceEx].pfn;
+    PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx  =
(PGD_DXDDCREATESURFACEEX)gpDxFuncs[DXG_INDEX_DXDDCREATESURFACEEX].pfn;
    
     if (pfnDdCreateSurfaceEx == NULL)
     {

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 [iso-8859-1]
(original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri Dec
17 14:28:39 2010
@@ -20,7 +20,7 @@
 extern EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global;
 
 
-DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl];
+DRVFN gpDxFuncs[DXG_INDEX_DXDDIOCTL];
 HANDLE ghDxGraphics = NULL;
 ULONG gdwDirectDrawContext = 0;
 
@@ -81,7 +81,7 @@
             pDev->pEDDgpl->ddSurfaceCallbacks.dwSize =
sizeof(DD_SURFACECALLBACKS);
             pDev->pEDDgpl->ddPaletteCallbacks.dwSize =
sizeof(DD_PALETTECALLBACKS);
 
-            pfnDdEnableDirectDraw =
(PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn;
+            pfnDdEnableDirectDraw =
(PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DXDDENABLEDIRECTDRAW].pfn;
             if (pfnDdEnableDirectDraw != NULL)
             {
                 /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev
*/
@@ -126,6 +126,7 @@
      * no code have been writen for it yet
      */
 
+     /* NOTE : gdwDirectDrawContext is internal struct in win32k, but dxg seam does not
care of it. */
 
     /* FIXME ReactOS does not loading the dxapi.sys or import functions from it yet */
     // DxApiGetVersion()
@@ -178,7 +179,7 @@
 
             PDRVFN lstDrvFN = DxgDrv.pdrvfn;
             INT t;
-            for (t=0;t<=DXG_INDEX_DxDdIoctl;t++)
+            for (t=0;t<=DXG_INDEX_DXDDIOCTL;t++)
             {
                 gpDxFuncs[lstDrvFN[t].iFunc].iFunc =lstDrvFN[t].iFunc;
                 gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn;
@@ -220,7 +221,7 @@
     }
 
     /* get the pfnDdCreateDirectDrawObject after we load the drv */
-    pfnDdCreateDirectDrawObject =
(PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn;
+    pfnDdCreateDirectDrawObject =
(PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DXDDCREATEDIRECTDRAWOBJECT].pfn;
 
     if (pfnDdCreateDirectDrawObject == NULL)
     {
@@ -275,7 +276,7 @@
                      SIZE_T *pdwSizeOfPtr2,
                      PVOID pvPtr2)
 {
-    PGD_DXGENERICTRUNK pfnDxgGenericThunk =
(PGD_DXGENERICTRUNK)gpDxFuncs[DXG_INDEX_DxDxgGenericThunk].pfn;
+    PGD_DXGENERICTRUNK pfnDxgGenericThunk =
(PGD_DXGENERICTRUNK)gpDxFuncs[DXG_INDEX_DXDXGGENERICTHUNK].pfn;
 
     if (pfnDxgGenericThunk == NULL)
     {
@@ -294,7 +295,7 @@
 APIENTRY
 NtGdiDdGetDriverState(PDD_GETDRIVERSTATEDATA pdata)
 {
-    PGD_DDGETDRIVERSTATE pfnDdGetDriverState =
(PGD_DDGETDRIVERSTATE)gpDxFuncs[DXG_INDEX_DxDdGetDriverState].pfn;
+    PGD_DDGETDRIVERSTATE pfnDdGetDriverState =
(PGD_DDGETDRIVERSTATE)gpDxFuncs[DXG_INDEX_DXDDGETDRIVERSTATE].pfn;
 
     if (pfnDdGetDriverState == NULL)
     {
@@ -314,7 +315,7 @@
 NtGdiDdColorControl(HANDLE hSurface,
                     PDD_COLORCONTROLDATA puColorControlData)
 {
-    PGD_DDCOLORCONTROL pfnDdColorControl =
(PGD_DDCOLORCONTROL)gpDxFuncs[DXG_INDEX_DxDdColorControl].pfn;
+    PGD_DDCOLORCONTROL pfnDdColorControl =
(PGD_DDCOLORCONTROL)gpDxFuncs[DXG_INDEX_DXDDCOLORCONTROL].pfn;
 
     if (pfnDdColorControl == NULL)
     {
@@ -339,7 +340,7 @@
                            BOOL bComplete
 )
 {
-    PGD_DXDDCREATESURFACEOBJECT pfnDdCreateSurfaceObject =
(PGD_DXDDCREATESURFACEOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateSurfaceObject].pfn;
+    PGD_DXDDCREATESURFACEOBJECT pfnDdCreateSurfaceObject =
(PGD_DXDDCREATESURFACEOBJECT)gpDxFuncs[DXG_INDEX_DXDDCREATESURFACEOBJECT].pfn;
 
     if (pfnDdCreateSurfaceObject == NULL)
     {
@@ -358,7 +359,7 @@
 APIENTRY
 NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal)
 {
-    PGD_DXDDDELETEDIRECTDRAWOBJECT pfnDdDeleteDirectDrawObject =
(PGD_DXDDDELETEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdDeleteDirectDrawObject].pfn;
+    PGD_DXDDDELETEDIRECTDRAWOBJECT pfnDdDeleteDirectDrawObject =
(PGD_DXDDDELETEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DXDDDELETEDIRECTDRAWOBJECT].pfn;
 
     if (pfnDdDeleteDirectDrawObject == NULL)
     {
@@ -385,7 +386,7 @@
 APIENTRY
 NtGdiDdDeleteSurfaceObject(HANDLE hSurface)
 {
-    PGD_DXDDDELETESURFACEOBJECT pfnDdDeleteSurfaceObject =
(PGD_DXDDDELETESURFACEOBJECT)gpDxFuncs[DXG_INDEX_DxDdDeleteSurfaceObject].pfn;
+    PGD_DXDDDELETESURFACEOBJECT pfnDdDeleteSurfaceObject =
(PGD_DXDDDELETESURFACEOBJECT)gpDxFuncs[DXG_INDEX_DXDDDELETESURFACEOBJECT].pfn;
 
     if (pfnDdDeleteSurfaceObject == NULL)
     {
@@ -415,7 +416,7 @@
                              DWORD *puNumFourCC,
                              DWORD *puFourCC)
 {
-    PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject =
(PGD_DXDDQUERYDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdQueryDirectDrawObject].pfn;
+    PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject =
(PGD_DXDDQUERYDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DXDDQUERYDIRECTDRAWOBJECT].pfn;
 
     if (pfnDdQueryDirectDrawObject == NULL)
     {
@@ -443,7 +444,7 @@
 #if DXDBG
     BOOL status = FALSE;
 #endif
-    PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject =
(PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn;
+    PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject =
(PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DXDDREENABLEDIRECTDRAWOBJECT].pfn;
 
     if (pfnDdReenableDirectDrawObject == NULL)
     {
@@ -473,7 +474,7 @@
                      PDD_GETDRIVERINFODATA puGetDriverInfoData)
 
 {
-    PGD_DXDDGETDRIVERINFO pfnDdGetDriverInfo =
(PGD_DXDDGETDRIVERINFO)gpDxFuncs[DXG_INDEX_DxDdGetDriverInfo].pfn;
+    PGD_DXDDGETDRIVERINFO pfnDdGetDriverInfo =
(PGD_DXDDGETDRIVERINFO)gpDxFuncs[DXG_INDEX_DXDDGETDRIVERINFO].pfn;
 
     if (pfnDdGetDriverInfo == NULL)
     {
@@ -494,7 +495,7 @@
 NtGdiDdGetAvailDriverMemory(HANDLE hDirectDrawLocal,
                             PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData)
 {
-    PGD_DXDDGETAVAILDRIVERMEMORY pfnDdGetAvailDriverMemory =
(PGD_DXDDGETAVAILDRIVERMEMORY)gpDxFuncs[DXG_INDEX_DxDdGetAvailDriverMemory].pfn;
+    PGD_DXDDGETAVAILDRIVERMEMORY pfnDdGetAvailDriverMemory =
(PGD_DXDDGETAVAILDRIVERMEMORY)gpDxFuncs[DXG_INDEX_DXDDGETAVAILDRIVERMEMORY].pfn;
 
     if (pfnDdGetAvailDriverMemory == NULL)
     {
@@ -516,7 +517,7 @@
 NtGdiDdSetExclusiveMode(HANDLE hDirectDraw,
                         PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData)
 {
-    PGD_DXDDSETEXCLUSIVEMODE pfnDdSetExclusiveMode =
(PGD_DXDDSETEXCLUSIVEMODE)gpDxFuncs[DXG_INDEX_DxDdSetExclusiveMode].pfn;
+    PGD_DXDDSETEXCLUSIVEMODE pfnDdSetExclusiveMode =
(PGD_DXDDSETEXCLUSIVEMODE)gpDxFuncs[DXG_INDEX_DXDDSETEXCLUSIVEMODE].pfn;
 
     if (pfnDdSetExclusiveMode == NULL)
     {
@@ -538,7 +539,7 @@
 NtGdiDdFlipToGDISurface(HANDLE hDirectDraw,
                         PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData)
 {
-    PGD_DXDDFLIPTOGDISURFACE pfnDdFlipToGDISurface =
(PGD_DXDDFLIPTOGDISURFACE)gpDxFuncs[DXG_INDEX_DxDdFlipToGDISurface].pfn;
+    PGD_DXDDFLIPTOGDISURFACE pfnDdFlipToGDISurface =
(PGD_DXDDFLIPTOGDISURFACE)gpDxFuncs[DXG_INDEX_DXDDFLIPTOGDISURFACE].pfn;
 
     if (pfnDdFlipToGDISurface == NULL)
     {
@@ -559,7 +560,7 @@
 NtGdiDdGetDC(HANDLE hSurface,
              PALETTEENTRY *puColorTable)
 {
-    PGD_DDGETDC pfnDdGetDC = (PGD_DDGETDC)gpDxFuncs[DXG_INDEX_DxDdGetDC].pfn;
+    PGD_DDGETDC pfnDdGetDC = (PGD_DDGETDC)gpDxFuncs[DXG_INDEX_DXDDGETDC].pfn;
 
     if (pfnDdGetDC == NULL)
     {
@@ -580,7 +581,7 @@
                    HANDLE hSurface,
                    BOOL bRelease)
 {
-    PGD_DDGETDXHANDLE pfnDdGetDxHandle =
(PGD_DDGETDXHANDLE)gpDxFuncs[DXG_INDEX_DxDdGetDxHandle].pfn;
+    PGD_DDGETDXHANDLE pfnDdGetDxHandle =
(PGD_DDGETDXHANDLE)gpDxFuncs[DXG_INDEX_DXDDGETDXHANDLE].pfn;
 
     if (pfnDdGetDxHandle == NULL)
     {
@@ -600,7 +601,7 @@
 APIENTRY
 NtGdiDdReleaseDC(HANDLE hSurface)
 {
-    PGD_DDRELEASEDC pfnDdReleaseDC =
(PGD_DDRELEASEDC)gpDxFuncs[DXG_INDEX_DxDdReleaseDC].pfn;
+    PGD_DDRELEASEDC pfnDdReleaseDC =
(PGD_DDRELEASEDC)gpDxFuncs[DXG_INDEX_DXDDRELEASEDC].pfn;
 
     if (pfnDdReleaseDC == NULL)
     {
@@ -621,7 +622,7 @@
                    HWND hwnd)
 {
 
-    PGD_DDRESTVISRGN pfnDdResetVisrgn =
(PGD_DDRESTVISRGN)gpDxFuncs[DXG_INDEX_DxDdResetVisrgn].pfn;
+    PGD_DDRESTVISRGN pfnDdResetVisrgn =
(PGD_DDRESTVISRGN)gpDxFuncs[DXG_INDEX_DXDDRESETVISRGN].pfn;
 
     if (pfnDdResetVisrgn == NULL)
     {
@@ -642,7 +643,7 @@
                     HDC hdc,
                     LPVOID lpGammaRamp)
 {
-    PGD_DDSETGAMMARAMP pfnDdSetGammaRamp =
(PGD_DDSETGAMMARAMP)gpDxFuncs[DXG_INDEX_DxDdSetGammaRamp].pfn;
+    PGD_DDSETGAMMARAMP pfnDdSetGammaRamp =
(PGD_DDSETGAMMARAMP)gpDxFuncs[DXG_INDEX_DXDDSETGAMMARAMP].pfn;
 
     if (pfnDdSetGammaRamp == NULL)
     {
@@ -787,52 +788,56 @@
     DPRINT1("0x%08lx 0x308
PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.DestroyPalette              :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
ddPaletteCallbacks.DestroyPalette),pEddgbl->ddPaletteCallbacks.DestroyPalette);
     DPRINT1("0x%08lx 0x30C PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.SetEntries 
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
ddPaletteCallbacks.SetEntries),pEddgbl->ddPaletteCallbacks.SetEntries);
 
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[0]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[0]),pEddgbl->unk_314[0]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[1]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[1]),pEddgbl->unk_314[1]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[2]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[2]),pEddgbl->unk_314[2]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[3]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[3]),pEddgbl->unk_314[3]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[4]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[4]),pEddgbl->unk_314[4]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[5]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[5]),pEddgbl->unk_314[5]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[6]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[6]),pEddgbl->unk_314[6]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[7]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[7]),pEddgbl->unk_314[7]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[8]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[8]),pEddgbl->unk_314[8]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[9]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[9]),pEddgbl->unk_314[9]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[10]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[10]),pEddgbl->unk_314[10]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[11]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[11]),pEddgbl->unk_314[11]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[12]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[12]),pEddgbl->unk_314[12]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[13]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[13]),pEddgbl->unk_314[13]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[14]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[14]),pEddgbl->unk_314[14]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[15]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[15]),pEddgbl->unk_314[15]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[16]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[16]),pEddgbl->unk_314[16]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[17]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[17]),pEddgbl->unk_314[17]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[18]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[18]),pEddgbl->unk_314[18]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[19]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[19]),pEddgbl->unk_314[19]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[20]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[20]),pEddgbl->unk_314[20]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[21]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[21]),pEddgbl->unk_314[21]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[22]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[22]),pEddgbl->unk_314[22]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[23]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[23]),pEddgbl->unk_314[23]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[24]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[24]),pEddgbl->unk_314[24]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[25]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[25]),pEddgbl->unk_314[25]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[26]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[26]),pEddgbl->unk_314[26]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[27]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[27]),pEddgbl->unk_314[27]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[28]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[28]),pEddgbl->unk_314[28]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[29]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[29]),pEddgbl->unk_314[29]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[30]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[30]),pEddgbl->unk_314[30]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[31]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[31]),pEddgbl->unk_314[31]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[32]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[32]),pEddgbl->unk_314[32]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[33]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[33]),pEddgbl->unk_314[33]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[34]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[34]),pEddgbl->unk_314[34]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[35]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[35]),pEddgbl->unk_314[35]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[36]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[36]),pEddgbl->unk_314[36]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[37]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[37]),pEddgbl->unk_314[37]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[38]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[38]),pEddgbl->unk_314[38]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[39]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[39]),pEddgbl->unk_314[39]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[40]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[40]),pEddgbl->unk_314[40]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[41]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[41]),pEddgbl->unk_314[41]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[42]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[42]),pEddgbl->unk_314[42]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[43]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[43]),pEddgbl->unk_314[43]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[44]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[44]),pEddgbl->unk_314[44]);
-    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[45]                   
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[45]),pEddgbl->unk_314[45]);
+    // D3DNTHAL_GLOBALDRIVERDATA
+/* FIXME
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.dwSize  
                         : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
dwSize),pEddgbl->d3dNtGlobalDriverData.dwSize);
+    DPRINT1("0x%08lx ?????
PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.hwCaps.dwSize                     :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
hwCaps.dwSize),pEddgbl->d3dNtGlobalDriverData.hwCaps.dwSize);
+    DPRINT1("0x%08lx ?????
PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.hwCaps.dwFlags                    :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
hwCaps.dwFlags),pEddgbl->d3dNtGlobalDriverData.hwCaps.dwFlags);
+    DPRINT1("0x%08lx ?????
PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.hwCaps.dcmColorModel              :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
hwCaps.dcmColorModel),pEddgbl->d3dNtGlobalDriverData.hwCaps.dcmColorModel);
+    DPRINT1("0x%08lx ?????
PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.hwCaps.dwDevCaps                  :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
hwCaps.dwDevCaps),pEddgbl->d3dNtGlobalDriverData.hwCaps.dwDevCaps);
+    DPRINT1("0x%08lx ?????
PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.hwCaps.dtcTransformCaps.dwSize    :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
hwCaps.dtcTransformCaps.dwSize),pEddgbl->d3dNtGlobalDriverData.hwCaps.dtcTransformCaps.dwSize);
+    DPRINT1("0x%08lx ?????
PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.hwCaps.dtcTransformCaps.dwCaps    :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
hwCaps.dtcTransformCaps.dwCaps),pEddgbl->d3dNtGlobalDriverData.hwCaps.dtcTransformCaps.dwCaps);
+    DPRINT1("0x%08lx ?????
PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.hwCaps.bClipping                  :
0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
hwCaps.bClipping),pEddgbl->d3dNtGlobalDriverData.hwCaps.bClipping);
+
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[8]      
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[8]),pEddgbl->d3dNtGlobalDriverData.hwCaps.dlcLightingCaps);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[9]      
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[9]),pEddgbl->unk_314[9]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[10]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[10]),pEddgbl->unk_314[10]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[11]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[11]),pEddgbl->unk_314[11]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[12]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[12]),pEddgbl->unk_314[12]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[13]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[13]),pEddgbl->unk_314[13]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[14]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[14]),pEddgbl->unk_314[14]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[15]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[15]),pEddgbl->unk_314[15]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[16]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[16]),pEddgbl->unk_314[16]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[17]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[17]),pEddgbl->unk_314[17]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[18]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[18]),pEddgbl->unk_314[18]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[19]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[19]),pEddgbl->unk_314[19]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[20]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[20]),pEddgbl->unk_314[20]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[21]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[21]),pEddgbl->unk_314[21]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[22]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[22]),pEddgbl->unk_314[22]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[23]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[23]),pEddgbl->unk_314[23]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[24]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[24]),pEddgbl->unk_314[24]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[25]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[25]),pEddgbl->unk_314[25]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[26]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[26]),pEddgbl->unk_314[26]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[27]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[27]),pEddgbl->unk_314[27]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[28]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[28]),pEddgbl->unk_314[28]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[29]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[29]),pEddgbl->unk_314[29]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[30]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[30]),pEddgbl->unk_314[30]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[31]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[31]),pEddgbl->unk_314[31]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[32]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[32]),pEddgbl->unk_314[32]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[33]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[33]),pEddgbl->unk_314[33]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[34]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[34]),pEddgbl->unk_314[34]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[35]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[35]),pEddgbl->unk_314[35]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[36]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[36]),pEddgbl->unk_314[36]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[37]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[37]),pEddgbl->unk_314[37]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[38]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[38]),pEddgbl->unk_314[38]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[39]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[39]),pEddgbl->unk_314[39]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[40]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[40]),pEddgbl->unk_314[40]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[41]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[41]),pEddgbl->unk_314[41]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[42]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[42]),pEddgbl->unk_314[42]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[43]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[43]),pEddgbl->unk_314[43]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[44]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[44]),pEddgbl->unk_314[44]);
+    DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData[45]     
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_314[45]),pEddgbl->unk_314[45]);
+*/
     // D3DNTHAL_CALLBACKS d3dNtHalCallbacks;
     DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks             
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
d3dNtHalCallbacks),pEddgbl->d3dNtHalCallbacks);
     DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[0]                    
                : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL,
unk_460[0]),pEddgbl->unk_460[0]);

Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c [iso-8859-1]
(original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c [iso-8859-1] Fri Dec
17 14:28:39 2010
@@ -18,7 +18,7 @@
 APIENTRY
 NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy)
 {
-    PGD_DXDDDESTROYSURFACE pfnDdDestroySurface =
(PGD_DXDDDESTROYSURFACE)gpDxFuncs[DXG_INDEX_DxDdDestroySurface].pfn;
+    PGD_DXDDDESTROYSURFACE pfnDdDestroySurface =
(PGD_DXDDDESTROYSURFACE)gpDxFuncs[DXG_INDEX_DXDDDESTROYSURFACE].pfn;
     
     if (pfnDdDestroySurface == NULL)
     {
@@ -41,7 +41,7 @@
             HANDLE hSurfaceTargetLeft,
             PDD_FLIPDATA puFlipData)
 {
-    PGD_DXDDFLIP pfnDdDdFlip = (PGD_DXDDFLIP)gpDxFuncs[DXG_INDEX_DxDdFlip].pfn;
+    PGD_DXDDFLIP pfnDdDdFlip = (PGD_DXDDFLIP)gpDxFuncs[DXG_INDEX_DXDDFLIP].pfn;
    
     if (pfnDdDdFlip == NULL)
     {
@@ -54,7 +54,7 @@
 }
 
 /************************************************************************/
-/* NtGdiDdUnlock                                                        */
+/* NtGdiDdLock                                                        */
 /************************************************************************/
 DWORD
 APIENTRY
@@ -62,7 +62,7 @@
             PDD_LOCKDATA puLockData,
             HDC hdcClip)
 {
-    PGD_DXDDLOCK pfnDdLock = (PGD_DXDDLOCK)gpDxFuncs[DXG_INDEX_DxDdLock].pfn;
+    PGD_DXDDLOCK pfnDdLock = (PGD_DXDDLOCK)gpDxFuncs[DXG_INDEX_DXDDLOCK].pfn;
     
     if (pfnDdLock == NULL)
     {
@@ -82,7 +82,7 @@
 NtGdiDdUnlock(HANDLE hSurface, 
               PDD_UNLOCKDATA puUnlockData)
 {
-    PGD_DXDDUNLOCK pfnDdUnlock = (PGD_DXDDUNLOCK)gpDxFuncs[DXG_INDEX_DxDdUnlock].pfn;
+    PGD_DXDDUNLOCK pfnDdUnlock = (PGD_DXDDUNLOCK)gpDxFuncs[DXG_INDEX_DXDDUNLOCK].pfn;
    
     if (pfnDdUnlock == NULL)
     {
@@ -103,7 +103,7 @@
            HANDLE hSurfaceSrc,
            PDD_BLTDATA puBltData)
 {
-    PGD_DDBLT pfnDdBlt = (PGD_DDBLT)gpDxFuncs[DXG_INDEX_DxDdBlt].pfn;
+    PGD_DDBLT pfnDdBlt = (PGD_DDBLT)gpDxFuncs[DXG_INDEX_DXDDBLT].pfn;
     
     if (pfnDdBlt == NULL)
     {
@@ -123,7 +123,7 @@
 NtGdiDdSetColorKey(HANDLE hSurface,
                    PDD_SETCOLORKEYDATA puSetColorKeyData)
 {
-    PGD_DXDDSETCOLORKEY pfnDdSetColorKey =
(PGD_DXDDSETCOLORKEY)gpDxFuncs[DXG_INDEX_DxDdSetColorKey].pfn;
+    PGD_DXDDSETCOLORKEY pfnDdSetColorKey =
(PGD_DXDDSETCOLORKEY)gpDxFuncs[DXG_INDEX_DXDDSETCOLORKEY].pfn;
     
     if (pfnDdSetColorKey == NULL)
     {
@@ -146,7 +146,7 @@
                           HANDLE hSurfaceAttached,
                           PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData)
 {
-    PGD_DDADDATTACHEDSURFACE pfnDdAddAttachedSurface =
(PGD_DDADDATTACHEDSURFACE)gpDxFuncs[DXG_INDEX_DxDdAddAttachedSurface].pfn;
+    PGD_DDADDATTACHEDSURFACE pfnDdAddAttachedSurface =
(PGD_DDADDATTACHEDSURFACE)gpDxFuncs[DXG_INDEX_DXDDADDATTACHEDSURFACE].pfn;
     
     if (pfnDdAddAttachedSurface == NULL)
     {
@@ -166,7 +166,7 @@
 NtGdiDdGetBltStatus(HANDLE hSurface,
                     PDD_GETBLTSTATUSDATA puGetBltStatusData)
 {
-    PGD_DXDDGETBLTSTATUS pfnDdGetBltStatus =
(PGD_DXDDGETBLTSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetBltStatus].pfn;
+    PGD_DXDDGETBLTSTATUS pfnDdGetBltStatus =
(PGD_DXDDGETBLTSTATUS)gpDxFuncs[DXG_INDEX_DXDDGETBLTSTATUS].pfn;
     
     if (pfnDdGetBltStatus == NULL)
     {
@@ -186,7 +186,7 @@
 NtGdiDdGetFlipStatus(HANDLE hSurface,
                      PDD_GETFLIPSTATUSDATA puGetFlipStatusData)
 {
-    PGD_DXDDGETFLIPSTATUS pfnDdGetFlipStatus =
(PGD_DXDDGETFLIPSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetFlipStatus].pfn;
+    PGD_DXDDGETFLIPSTATUS pfnDdGetFlipStatus =
(PGD_DXDDGETFLIPSTATUS)gpDxFuncs[DXG_INDEX_DXDDGETFLIPSTATUS].pfn;
     
     if (pfnDdGetFlipStatus == NULL)
     {
@@ -207,7 +207,7 @@
                      HANDLE hSurfaceSource,
                      PDD_UPDATEOVERLAYDATA puUpdateOverlayData)
 {
-    PGD_DXDDUPDATEOVERLAY pfnDdUpdateOverlay =
(PGD_DXDDUPDATEOVERLAY)gpDxFuncs[DXG_INDEX_DxDdUpdateOverlay].pfn;
+    PGD_DXDDUPDATEOVERLAY pfnDdUpdateOverlay =
(PGD_DXDDUPDATEOVERLAY)gpDxFuncs[DXG_INDEX_DXDDUPDATEOVERLAY].pfn;
    
     if (pfnDdUpdateOverlay == NULL)
     {
@@ -229,7 +229,7 @@
                           HANDLE hSurfaceDestination,
                           PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData)
 {
-    PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition =
(PGD_DXDDSETOVERLAYPOSITION)gpDxFuncs[DXG_INDEX_DxDdSetOverlayPosition].pfn;
+    PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition =
(PGD_DXDDSETOVERLAYPOSITION)gpDxFuncs[DXG_INDEX_DXDDSETOVERLAYPOSITION].pfn;
   
     if (pfnDdSetOverlayPosition == NULL)
     {
@@ -256,7 +256,7 @@
                 HANDLE hSurfaceSrc,
                 PDD_BLTDATA puBltData)
 {
-    PGD_DDALPHABLT pfnDdAlphaBlt =
(PGD_DDALPHABLT)gpDxFuncs[DXG_INDEX_DxDdAlphaBlt].pfn;
+    PGD_DDALPHABLT pfnDdAlphaBlt =
(PGD_DDALPHABLT)gpDxFuncs[DXG_INDEX_DXDDALPHABLT].pfn;
    
     if (pfnDdAlphaBlt == NULL)
     {
@@ -277,7 +277,7 @@
                      HANDLE hSurfaceTo
 )
 {
-    PGD_DDATTACHSURFACE pfnDdAttachSurface =
(PGD_DDATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdAttachSurface].pfn;
+    PGD_DDATTACHSURFACE pfnDdAttachSurface =
(PGD_DDATTACHSURFACE)gpDxFuncs[DXG_INDEX_DXDDATTACHSURFACE].pfn;
   
     if (pfnDdAttachSurface == NULL)
     {
@@ -301,7 +301,7 @@
 NtGdiDdUnattachSurface(HANDLE hSurface,
                        HANDLE hSurfaceAttached)
 {
-    PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface =
(PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn;  
+    PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface =
(PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DXDDUNATTACHSURFACE].pfn;  
     if (pfnDdUnattachSurface == NULL)
     {
         DPRINT1("Warring no pfnDdUnattachSurface");

Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] Fri Dec 17
14:28:39 2010
@@ -20,7 +20,7 @@
 NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw,
                            PDD_CANCREATEVPORTDATA puCanCreateVPortData)
 {
-    PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort =
(PGD_DVPCANCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCanCreateVideoPort].pfn;
+    PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort =
(PGD_DVPCANCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DXDVPCANCREATEVIDEOPORT].pfn;
     
     if (pfnDvpCanCreateVideoPort == NULL)
     {
@@ -40,7 +40,7 @@
 NtGdiDvpColorControl(HANDLE hVideoPort,
                      PDD_VPORTCOLORDATA puVPortColorData)
 {
-    PGD_DVPCOLORCONTROL pfnDvpColorControl =
(PGD_DVPCOLORCONTROL)gpDxFuncs[DXG_INDEX_DxDvpColorControl].pfn;
+    PGD_DVPCOLORCONTROL pfnDvpColorControl =
(PGD_DVPCOLORCONTROL)gpDxFuncs[DXG_INDEX_DXDVPCOLORCONTROL].pfn;
     
     if (pfnDvpColorControl == NULL)
     {
@@ -60,7 +60,7 @@
 NtGdiDvpCreateVideoPort(HANDLE hDirectDraw,
                         PDD_CREATEVPORTDATA puCreateVPortData)
 {
-    PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort =
(PGD_DVPCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCreateVideoPort].pfn;
+    PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort =
(PGD_DVPCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DXDVPCREATEVIDEOPORT].pfn;
     
     if (pfnDvpCreateVideoPort == NULL)
     {
@@ -80,7 +80,7 @@
 NtGdiDvpDestroyVideoPort(HANDLE hVideoPort,
                          PDD_DESTROYVPORTDATA puDestroyVPortData)
 {
-    PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort  =
(PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpDestroyVideoPort].pfn;
+    PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort  =
(PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DXDVPDESTROYVIDEOPORT].pfn;
     
     if (pfnDvpDestroyVideoPort == NULL)
     {
@@ -102,7 +102,7 @@
                       HANDLE hDDSurfaceTarget,
                       PDD_FLIPVPORTDATA puFlipVPortData)
 {
-    PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort  =
(PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpFlipVideoPort].pfn;
+    PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort  =
(PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DXDVPFLIPVIDEOPORT].pfn;
 
     if (pfnDvpFlipVideoPort == NULL)
     {
@@ -123,7 +123,7 @@
 NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort,
                               PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData)
 {
-    PGD_DVPGETVIDEOPORTBANDWITH pfnDvpGetVideoPortBandwidth =
(PGD_DVPGETVIDEOPORTBANDWITH)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortBandwidth].pfn;
+    PGD_DVPGETVIDEOPORTBANDWITH pfnDvpGetVideoPortBandwidth =
(PGD_DVPGETVIDEOPORTBANDWITH)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOPORTBANDWIDTH].pfn;
 
     if (pfnDvpGetVideoPortBandwidth == NULL)
     {
@@ -144,7 +144,7 @@
 NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw,
                                PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData)
 {
-    PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus =
(PGD_DXDVPGETVIDEOPORTFLIPSTATUS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortFlipStatus].pfn;
+    PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus =
(PGD_DXDVPGETVIDEOPORTFLIPSTATUS)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOPORTFLIPSTATUS].pfn;
 
     if (pfnDvpGetVideoPortFlipStatus == NULL)
     {
@@ -165,7 +165,7 @@
 NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort,
                                  PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData)
 {
-    PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats =
(PGD_DXDVPGETVIDEOPORTINPUTFORMATS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortInputFormats].pfn;
+    PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats =
(PGD_DXDVPGETVIDEOPORTINPUTFORMATS)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOPORTINPUTFORMATS].pfn;
 
     if (pfnDvpGetVideoPortInputFormats == NULL)
     {
@@ -186,7 +186,7 @@
 NtGdiDvpGetVideoPortLine(HANDLE hVideoPort,
                          PDD_GETVPORTLINEDATA puGetVPortLineData)
 {
-    PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine =
(PGD_DXDVPGETVIDEOPORTLINE)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortLine].pfn;
+    PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine =
(PGD_DXDVPGETVIDEOPORTLINE)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOPORTLINE].pfn;
 
     if (pfnDvpGetVideoPortLine == NULL)
     {
@@ -207,7 +207,7 @@
 NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort,
                                   PDD_GETVPORTOUTPUTFORMATDATA
puGetVPortOutputFormatData)
 {
-    PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats =
(PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortOutputFormats].pfn;
+    PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats =
(PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOPORTOUTPUTFORMATS].pfn;
 
     if (pfnDvpGetVideoPortOutputFormats == NULL)
     {
@@ -229,7 +229,7 @@
 NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw,
                                 PDD_GETVPORTCONNECTDATA puGetVPortConnectData)
 {
-    PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo =
(PGD_DXDVPGETVIDEOPORTCONNECTINFO)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortConnectInfo].pfn;
+    PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo =
(PGD_DXDVPGETVIDEOPORTCONNECTINFO)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOPORTCONNECTINFO].pfn;
 
     if (pfnDvpGetVideoPortConnectInfo == NULL)
     {
@@ -250,7 +250,7 @@
 NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort,
                              PDD_GETVPORTSIGNALDATA puGetVPortSignalData)
 {
-    PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus =
(PGD_DXDVPGETVIDEOSIGNALSTATUS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoSignalStatus].pfn;
+    PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus =
(PGD_DXDVPGETVIDEOSIGNALSTATUS)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOSIGNALSTATUS].pfn;
 
     if (pfnDvpGetVideoSignalStatus == NULL)
     {
@@ -274,7 +274,7 @@
                         HANDLE* phSurfaceVbi,
                         PDD_UPDATEVPORTDATA puUpdateVPortData)
 {
-    PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort =
(PGD_DXDVPUPDATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpUpdateVideoPort].pfn;
+    PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort =
(PGD_DXDVPUPDATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DXDVPUPDATEVIDEOPORT].pfn;
 
     if (pfnDvpUpdateVideoPort == NULL)
     {
@@ -296,7 +296,7 @@
 NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort,
                              PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData)
 {
-    PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync =
(PGD_DXDVPWAITFORVIDEOPORTSYNC)gpDxFuncs[DXG_INDEX_DxDvpWaitForVideoPortSync].pfn;
+    PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync =
(PGD_DXDVPWAITFORVIDEOPORTSYNC)gpDxFuncs[DXG_INDEX_DXDVPWAITFORVIDEOPORTSYNC].pfn;
 
     if (pfnDvpWaitForVideoPortSync == NULL)
     {
@@ -318,7 +318,7 @@
                             HANDLE* hEvent,
                             LPDDVIDEOPORTNOTIFY pNotify)
 {
-    PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification =
(PGD_DXDVPACQUIRENOTIFICATION)gpDxFuncs[DXG_INDEX_DxDvpAcquireNotification].pfn;
+    PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification =
(PGD_DXDVPACQUIRENOTIFICATION)gpDxFuncs[DXG_INDEX_DXDVPACQUIRENOTIFICATION].pfn;
 
     if (pfnDvpAcquireNotification == NULL)
     {
@@ -339,7 +339,7 @@
 NtGdiDvpReleaseNotification(HANDLE hVideoPort,
                             HANDLE hEvent)
 {
-    PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification =
(PGD_DXDVPRELEASENOTIFICATION)gpDxFuncs[DXG_INDEX_DxDvpReleaseNotification].pfn;
+    PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification =
(PGD_DXDVPRELEASENOTIFICATION)gpDxFuncs[DXG_INDEX_DXDVPRELEASENOTIFICATION].pfn;
 
     if (pfnDvpReleaseNotification == NULL)
     {
@@ -361,7 +361,7 @@
 NtGdiDvpGetVideoPortField(HANDLE hVideoPort,
                           PDD_GETVPORTFIELDDATA puGetVPortFieldData)
 {
-    PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField =
(PGD_DXDVPGETVIDEOPORTFIELD)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortField].pfn;
+    PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField =
(PGD_DXDVPGETVIDEOPORTFIELD)gpDxFuncs[DXG_INDEX_DXDVPGETVIDEOPORTFIELD].pfn;
 
     if (pfnDvpGetVideoPortField == NULL)
     {

Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32…
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c [iso-8859-1] (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c [iso-8859-1] Fri Dec 17
14:28:39 2010
@@ -25,7 +25,7 @@
                        LPSURFACEALIGNMENT lpAlignment,
                        LPLONG lpNewPitch)
 {
-    PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned =
(PGD_HEAPVIDMEMALLOCALIGNED)gpDxFuncs[DXG_INDEX_DxDdHeapVidMemAllocAligned].pfn;
+    PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned =
(PGD_HEAPVIDMEMALLOCALIGNED)gpDxFuncs[DXG_INDEX_DXDDHEAPVIDMEMALLOCALIGNED].pfn;
 
     if (pfnHeapVidMemAllocAligned == NULL)
     {
@@ -45,7 +45,7 @@
 VidMemFree(LPVMEMHEAP pvmh,
            FLATPTR ptr)
 {
-    PGD_VIDMEMFREE pfnVidMemFree =
(PGD_VIDMEMFREE)gpDxFuncs[DXG_INDEX_DxDdHeapVidMemFree].pfn;
+    PGD_VIDMEMFREE pfnVidMemFree =
(PGD_VIDMEMFREE)gpDxFuncs[DXG_INDEX_DXDDHEAPVIDMEMFREE].pfn;
 
     if (pfnVidMemFree == NULL)
     {
@@ -67,7 +67,7 @@
                        SIZE_T  cj,
                        ULONG  tag)
 {
-    PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem =
(PGD_ENGALLOCPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DxDdAllocPrivateUserMem].pfn;
+    PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem =
(PGD_ENGALLOCPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DXDDALLOCPRIVATEUSERMEM].pfn;
 
     if (pfnEngAllocPrivateUserMem == NULL)
     {
@@ -87,7 +87,7 @@
 EngFreePrivateUserMem(PDD_SURFACE_LOCAL  psl,
                       PVOID  pv)
 {
-    PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem =
(PGD_ENGFREEPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DxDdFreePrivateUserMem].pfn;
+    PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem =
(PGD_ENGFREEPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DXDDFREEPRIVATEUSERMEM].pfn;
 
     if (pfnEngFreePrivateUserMem == NULL)
     {
@@ -130,7 +130,7 @@
            PVOID pBuffer,
            ULONG ulBufferSize)
 {
-    PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DxDdIoctl].pfn;
+    PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DXDDIOCTL].pfn;
     DWORD retVal = DDERR_UNSUPPORTED;
 
     DPRINT1("Calling dxg.sys pfnEngDxIoctl\n");
@@ -163,7 +163,7 @@
 APIENTRY
 EngLockDirectDrawSurface(HANDLE hSurface)
 {
-    PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface =
(PGD_ENGLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdLockDirectDrawSurface].pfn;
+    PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface =
(PGD_ENGLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DXDDLOCKDIRECTDRAWSURFACE].pfn;
     PDD_SURFACE_LOCAL retVal = NULL;
 
     DPRINT1("Calling dxg.sys pfnEngLockDirectDrawSurface\n");
@@ -197,7 +197,7 @@
 APIENTRY
 EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface)
 {
-    PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface =
(PGD_ENGUNLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnlockDirectDrawSurface].pfn;
+    PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface =
(PGD_ENGUNLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DXDDUNLOCKDIRECTDRAWSURFACE].pfn;
     BOOL retVal = FALSE;
 
     DPRINT1("Calling dxg.sys pfnEngUnlockDirectDrawSurface\n");

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 [iso-8859-1]
(original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] Fri Dec
17 14:28:39 2010
@@ -20,7 +20,7 @@
 NtGdiDdBeginMoCompFrame(HANDLE hMoComp,
                         PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData)
 {
-    PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame =
(PGD_DDBEGINMOCOMPFRAME)gpDxFuncs[DXG_INDEX_DxDdBeginMoCompFrame].pfn;
+    PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame =
(PGD_DDBEGINMOCOMPFRAME)gpDxFuncs[DXG_INDEX_DXDDBEGINMOCOMPFRAME].pfn;
 
     if (pfnDdBeginMoCompFrame == NULL)
     {
@@ -39,7 +39,7 @@
 APIENTRY
 NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData)
 {
-    PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp =
(PGD_DXDDCREATEMOCOMP)gpDxFuncs[DXG_INDEX_DxDdCreateMoComp].pfn;
+    PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp =
(PGD_DXDDCREATEMOCOMP)gpDxFuncs[DXG_INDEX_DXDDCREATEMOCOMP].pfn;
 
     if (pfnDdCreateMoComp == NULL)
     {
@@ -59,7 +59,7 @@
 NtGdiDdDestroyMoComp(HANDLE hMoComp,
                      PDD_DESTROYMOCOMPDATA puBeginFrameData)
 {
-    PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp =
(PGD_DXDDDESTROYMOCOMP)gpDxFuncs[DXG_INDEX_DxDdDestroyMoComp].pfn;
+    PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp =
(PGD_DXDDDESTROYMOCOMP)gpDxFuncs[DXG_INDEX_DXDDDESTROYMOCOMP].pfn;
 
     if (pfnDxDdDestroyMoComp == NULL)
     {
@@ -79,7 +79,7 @@
 NtGdiDdEndMoCompFrame(HANDLE hMoComp,
                       PDD_ENDMOCOMPFRAMEDATA puEndFrameData)
 {
-    PGD_DXDDENDMOCOMPFRAME pfnDdEndMoCompFrame =
(PGD_DXDDENDMOCOMPFRAME)gpDxFuncs[DXG_INDEX_DxDdEndMoCompFrame].pfn;
+    PGD_DXDDENDMOCOMPFRAME pfnDdEndMoCompFrame =
(PGD_DXDDENDMOCOMPFRAME)gpDxFuncs[DXG_INDEX_DXDDENDMOCOMPFRAME].pfn;
 
     if (pfnDdEndMoCompFrame == NULL)
     {
@@ -99,7 +99,7 @@
 NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw,
                              PDD_GETINTERNALMOCOMPDATA puGetInternalData)
 {
-    PGD_DXDDGETINTERNALMOCOMPINFO pfnDdGetInternalMoCompInfo =
(PGD_DXDDGETINTERNALMOCOMPINFO)gpDxFuncs[DXG_INDEX_DxDdGetInternalMoCompInfo].pfn;
+    PGD_DXDDGETINTERNALMOCOMPINFO pfnDdGetInternalMoCompInfo =
(PGD_DXDDGETINTERNALMOCOMPINFO)gpDxFuncs[DXG_INDEX_DXDDGETINTERNALMOCOMPINFO].pfn;
 
     if (pfnDdGetInternalMoCompInfo == NULL)
     {
@@ -120,7 +120,7 @@
 NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw,
                          PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData)
 {
-    PGD_DXDDGETMOCOMPBUFFINFO pfnDdGetMoCompBuffInfo =
(PGD_DXDDGETMOCOMPBUFFINFO)gpDxFuncs[DXG_INDEX_DxDdGetMoCompBuffInfo].pfn;
+    PGD_DXDDGETMOCOMPBUFFINFO pfnDdGetMoCompBuffInfo =
(PGD_DXDDGETMOCOMPBUFFINFO)gpDxFuncs[DXG_INDEX_DXDDGETMOCOMPBUFFINFO].pfn;
 
     if (pfnDdGetMoCompBuffInfo == NULL)
     {
@@ -140,7 +140,7 @@
 NtGdiDdGetMoCompFormats(HANDLE hDirectDraw,
                         PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData)
 {
-    PGD_DXDDGETMOCOMPFORMATS pfnDdGetMoCompFormats =
(PGD_DXDDGETMOCOMPFORMATS)gpDxFuncs[DXG_INDEX_DxDdGetMoCompFormats].pfn;
+    PGD_DXDDGETMOCOMPFORMATS pfnDdGetMoCompFormats =
(PGD_DXDDGETMOCOMPFORMATS)gpDxFuncs[DXG_INDEX_DXDDGETMOCOMPFORMATS].pfn;
 
     if (pfnDdGetMoCompFormats == NULL)
     {
@@ -161,7 +161,7 @@
 NtGdiDdGetMoCompGuids(HANDLE hDirectDraw,
                       PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData)
 {
-    PGD_DXDDGETMOCOMPGUIDS pfnDdGetMoCompGuids =
(PGD_DXDDGETMOCOMPGUIDS)gpDxFuncs[DXG_INDEX_DxDdGetMoCompGuids].pfn;
+    PGD_DXDDGETMOCOMPGUIDS pfnDdGetMoCompGuids =
(PGD_DXDDGETMOCOMPGUIDS)gpDxFuncs[DXG_INDEX_DXDDGETMOCOMPGUIDS].pfn;
 
     if (pfnDdGetMoCompGuids == NULL)
     {
@@ -183,7 +183,7 @@
 NtGdiDdQueryMoCompStatus(HANDLE hMoComp,
                          PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData)
 {
-    PGD_DXDDQUERYMOCOMPSTATUS pfnDdQueryMoCompStatus =
(PGD_DXDDQUERYMOCOMPSTATUS)gpDxFuncs[DXG_INDEX_DxDdQueryMoCompStatus].pfn;
+    PGD_DXDDQUERYMOCOMPSTATUS pfnDdQueryMoCompStatus =
(PGD_DXDDQUERYMOCOMPSTATUS)gpDxFuncs[DXG_INDEX_DXDDQUERYMOCOMPSTATUS].pfn;
 
     if (pfnDdQueryMoCompStatus == NULL)
     {
@@ -204,7 +204,7 @@
 NtGdiDdRenderMoComp(HANDLE hMoComp,
                     PDD_RENDERMOCOMPDATA puRenderMoCompData)
 {
-    PGD_DXDDRENDERMOCOMP pfnDdRenderMoComp =
(PGD_DXDDRENDERMOCOMP)gpDxFuncs[DXG_INDEX_DxDdRenderMoComp].pfn;
+    PGD_DXDDRENDERMOCOMP pfnDdRenderMoComp =
(PGD_DXDDRENDERMOCOMP)gpDxFuncs[DXG_INDEX_DXDDRENDERMOCOMP].pfn;
 
     if (pfnDdRenderMoComp == NULL)
     {