[ros-diffs] [greatlrd] 29612: fixing few compiling issue.

Author: greatlrd
Date: Tue Oct 16 00:28:06 2007
New Revision: 29612

URL: http://svn.reactos.org/svn/reactos?rev=29612&view=rev
Log:
fixing few compiling issue.

Modified:
    branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.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 Tue Oct 16 00:28:06
2007
@@ -47,7 +47,7 @@
 /* From dvp.c */
 typedef DWORD (NTAPI* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA);
 typedef DWORD (NTAPI* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA);
-typedef DWORD (NTAPI* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA);
+typedef HANDLE (NTAPI* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA);
 typedef DWORD (NTAPI* PGD_DVPDESTROYVIDEOPORT)(HANDLE, PDD_DESTROYVPORTDATA);
 typedef DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA);
 typedef DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA);

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 (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Tue Oct 16 00:28:06
2007
@@ -205,7 +205,7 @@
 
     DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockD3D, pfnDdLockD3D);
 
-    if (pfnD3dValidateTextureStageState == NULL)
+    if (pfnDdLockD3D == NULL)
     {
         DPRINT1("Warring no pfnDdLockD3D");
         return DDHAL_DRIVER_NOTHANDLED;
@@ -250,7 +250,7 @@
 
     DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockD3D, pfnDdUnlockD3D);
 
-    if (pfnD3dValidateTextureStageState == NULL)
+    if (pfnDdUnlockD3D == NULL)
     {
         DPRINT1("Warring no pfnDdUnlockD3D");
         return DDHAL_DRIVER_NOTHANDLED;

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 (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Tue Oct 16 00:28:06
2007
@@ -151,7 +151,7 @@
     }
 
     DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortBandwidth");
-    return pfnDvpGetVideoPortBandwidth(hVideoPort, pfnDvpGetVideoPortBandwidth);
+    return pfnDvpGetVideoPortBandwidth(hVideoPort, puGetVPortBandwidthData);
 }
 
 
@@ -223,7 +223,7 @@
     }
 
     DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortLine");
-    return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortLineData);
+    return pfnDvpGetVideoPortLine(hVideoPort, puGetVPortLineData);
 }
 
 
@@ -240,7 +240,7 @@
 
     DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortOutputFormats,
puGetVPortOutputFormatData);
 
-    if (pfnDvpGetVideoSignalStatus == NULL)
+    if (pfnDvpGetVideoPortOutputFormats == NULL)
     {
         DPRINT1("Warring no pfnDvpGetVideoPortOutputFormats");
         return DDHAL_DRIVER_NOTHANDLED;
@@ -272,7 +272,7 @@
     }
 
     DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortConnectInfo");
-    return pfnDvpGetVideoPortConnectInfo(hVideoPort, puGetVPortConnectData);
+    return pfnDvpGetVideoPortConnectInfo(hDirectDraw, puGetVPortConnectData);
 }