[ros-diffs] [greatlrd] 29734: fixed allot compiling issue

Author: greatlrd
Date: Sun Oct 21 17:31:39 2007
New Revision: 29734

URL: http://svn.reactos.org/svn/reactos?rev=29734&view=rev
Log:
fixed allot 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/dxeng.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.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 Sun Oct 21 17:31:39 2007
@@ -101,6 +101,12 @@
 /* From eng.c */
 typedef FLATPTR (NTAPI *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG);
 typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR);
+typedef PVOID (NTAPI *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ;
+typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID);
+typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG);
+typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE);
+typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL);
+

/* Standard macro */
 #define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \

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 Sun Oct 21 17:31:39 2007
@@ -258,7 +258,7 @@
                        PDD_CREATESURFACEDATA puCreateSurfaceData,
                        HANDLE *puhSurface)
 {
-    PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn;
+    PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_DDCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn;

if (pfnDdCreateD3DBuffer == NULL)
     {

Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/...
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sun Oct 21 17:31:39 2007
@@ -68,7 +68,7 @@
 /************************************************************************/
 /* Enumate all drivers in win32k */
 HDEV *
-DxEngEnumerateHdev(HDEV *hdev);
+DxEngEnumerateHdev(HDEV *hdev)
 {
     /* FIXME Enumate all drivers in win32k */
     DPRINT1("We do not enumate any device from win32k ");

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 (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Sun Oct 21 17:31:39 2007
@@ -33,7 +33,7 @@
     if (pfnHeapVidMemAllocAligned == NULL)
     {
         DPRINT1("Warring no pfnHeapVidMemAllocAligned");
-        return NULL;
+        return 0;
     }

DPRINT1("Calling on dxg.sys pfnHeapVidMemAllocAligned");
@@ -104,11 +104,12 @@
     if (pfnEngFreePrivateUserMem == NULL)
     {
         DPRINT1("Warring no pfnEngFreePrivateUserMem");
-        return DDHAL_DRIVER_NOTHANDLED;
     }
-
-    DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem");
-    return pfnEngFreePrivateUserMem(psl, pv);
+    else
+    {
+        DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem");
+        pfnEngFreePrivateUserMem(psl, pv);
+    }
 }

/************************************************************************/
@@ -132,7 +133,7 @@
     }

DPRINT1("Calling on dxg.sys pfnEngDxIoctl");
-    return pfnEngFreePrivateUserMem(psl, pv);
+    return pfnEngDxIoctl(ulIoctl, pBuffer, ulBufferSize);
 }

/************************************************************************/