[ros-diffs] [greatlrd] 29607: fixing few compiling issue with this new header. add few more redirect in ddraw.c to dxg.sys

Author: greatlrd
Date: Mon Oct 15 23:04:50 2007
New Revision: 29607

URL: http://svn.reactos.org/svn/reactos?rev=29607&view=rev
Log:
fixing few compiling issue with this new header.
add few more redirect in ddraw.c to dxg.sys

Modified:
    branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c

Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/...
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 23:04:50 2007
@@ -9,6 +9,9 @@
 /* From ddraw.c */
 extern PDRVFN gpDxFuncs;

+typedef BOOL (NTAPI* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID);
+typedef BOOL (NTAPI* PGD_DDRELEASEDC)(HANDLE);
+typedef BOOL (NTAPI* PGD_DDRESTVISRGN)(HANDLE, HWND);
 typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL);
 typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *);
 typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID);

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 (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c Mon Oct 15 23:04:50 2007
@@ -137,7 +137,7 @@
     }

DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx");
-    return pfnDdCreateSurfaceEx(hDirectDrawLocal,puGetScanLineData);
+    return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle);

}

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 Mon Oct 15 23:04:50 2007
@@ -456,7 +456,7 @@
     }

DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface");
-    return pfnDdFlipToGDISurface(hDirectDrawLocal, puFlipToGDISurfaceData);
+    return pfnDdFlipToGDISurface(hDirectDraw, puFlipToGDISurfaceData);

}

@@ -493,7 +493,7 @@
                    BOOL bRelease)
 {

-    PGD_DDGETDXHANDLE pfnDdGetDxHandle  = NULL;
+    PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL;
     INT i;

DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDxHandle, pfnDdGetDxHandle);
@@ -516,7 +516,19 @@
 STDCALL
 NtGdiDdReleaseDC(HANDLE hSurface)
 {
-
+    PGD_DDRELEASEDC pfnDdReleaseDC = NULL;
+    INT i;
+
+    DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdReleaseDC, pfnDdReleaseDC);
+
+    if (pfnDdReleaseDC == NULL)
+    {
+        DPRINT1("Warring no pfnDdReleaseDC");
+        return DDHAL_DRIVER_NOTHANDLED;
+    }
+
+    DPRINT1("Calling on dxg.sys pfnDdReleaseDC");
+    return pfnDdReleaseDC(hSurface);
 }

/************************************************************************/
@@ -528,6 +540,19 @@
                    HWND hwnd)
 {

+    PGD_DDRESTVISRGN pfnDdResetVisrgn = NULL;
+    INT i;
+
+    DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdResetVisrgn, pfnDdResetVisrgn);
+
+    if (pfnDdResetVisrgn == NULL)
+    {
+        DPRINT1("Warring no pfnDdResetVisrgn");
+        return DDHAL_DRIVER_NOTHANDLED;
+    }
+
+    DPRINT1("Calling on dxg.sys pfnDdResetVisrgn");
+    return pfnDdResetVisrgn(hSurface, hwnd);
 }

/************************************************************************/
@@ -539,7 +564,19 @@
                     HDC hdc,
                     LPVOID lpGammaRamp)
 {
-
+    PGD_DDSETGAMMARAMP pfnDdSetGammaRamp = NULL;
+    INT i;
+
+    DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetGammaRamp, pfnDdSetGammaRamp);
+
+    if (pfnDdSetGammaRamp == NULL)
+    {
+        DPRINT1("Warring no pfnDdSetGammaRamp");
+        return DDHAL_DRIVER_NOTHANDLED;
+    }
+
+    DPRINT1("Calling on dxg.sys pfnDdSetGammaRamp");
+    return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp);
 }