[ros-diffs] [greatlrd] 29736: make ReactX compile again, it can not load dxg.sys yet.

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Sun Oct 21 17:49:29 2007
New Revision: 29736

URL: http://svn.reactos.org/svn/reactos?rev=29736&view=rev
Log:
make ReactX compile again, it can not load dxg.sys yet. 

Modified:
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
    branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c
    branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c

Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c?rev=29736&r1=29735&r2=29736&view=diff
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Oct 21 17:49:29 2007
@@ -105,28 +105,6 @@
     return Status;
 }
 
-BOOL
-INTERNAL_CALL
-DD_Cleanup(PVOID ObjectBody)
-{
-    // FIXME remove this line PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody;
-    DPRINT1("DD_Cleanup\n");
-
-    /* Do not known what the new cleanup code should do at moment */
-    return TRUE;
-}
-
-BOOL
-INTERNAL_CALL
-DDSURF_Cleanup(PVOID pDDSurf)
-{
-    DPRINT1("DDSURF_Cleanup\n");
-    /* Do not known what the new cleanup code should do at moment */
-    return TRUE;
-}
-
-
-
 /************************************************************************/
 /* DirectX graphic/video driver loading cleanup ends here               */
 /************************************************************************/

Modified: branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c?rev=29736&r1=29735&r2=29736&view=diff
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c Sun Oct 21 17:49:29 2007
@@ -70,8 +70,8 @@
 {
   {0, 0,                     0,                       NULL},             /* 00 reserved entry */
   {1, sizeof(DC),            GDI_OBJECT_TAG_DC,       DC_Cleanup},       /* 01 DC */
-  {1, sizeof(DD_DIRECTDRAW), GDI_OBJECT_TAG_DDRAW,    DD_Cleanup},       /* 02 DD_DDRAW, should be moved away from gdi objects */
-  {1, sizeof(DD_SURFACE),    GDI_OBJECT_TAG_DDSURF,   DDSURF_Cleanup},   /* 03 DD_SURFACE, should be moved away from gdi objects */
+  {0, 0,                     0,                       NULL},             /* 02 DD_DDRAW, unused, should it be here ? */
+  {0, 0,                     0,                       NULL},             /* 03 DD_SURFACE, unused, should it be here ? */
   {1, sizeof(ROSRGNDATA),    GDI_OBJECT_TAG_REGION,   RGNDATA_Cleanup},  /* 04 REGION */
   {1, sizeof(BITMAPOBJ),     GDI_OBJECT_TAG_BITMAP,   BITMAP_Cleanup},   /* 05 BITMAP */
   {0, sizeof(DC),            GDI_OBJECT_TAG_CLIOBJ,   GDI_CleanupDummy}, /* 06 CLIOBJ: METADC,... FIXME: don't use DC struct */
@@ -85,10 +85,10 @@
   {0, 0,                     0,                       NULL},             /* 0e ICMCXF, unused */
   {0, 0,                     0,                       NULL},             /* 0f ICMDLL, unused */
   {1, sizeof(GDIBRUSHOBJ),   GDI_OBJECT_TAG_BRUSH,    BRUSH_Cleanup},    /* 10 BRUSH, PEN, EXTPEN */
-  {0, 0,                     0,                       NULL},             /* 11 D3D_HANDLE, unused */
-  {0, 0,                     0,                       NULL},             /* 12 DD_VPORT, unused */
+  {0, 0,                     0,                       NULL},             /* 11 D3D_HANDLE, unused, should it be here ? */
+  {0, 0,                     0,                       NULL},             /* 12 DD_VPORT, unused, should it be here ? */
   {0, 0,                     0,                       NULL},             /* 13 SPACE, unused */
-  {0, 0,                     0,                       NULL},             /* 14 DD_MOTION, unused */
+  {0, 0,                     0,                       NULL},             /* 14 DD_MOTION, unused, should it be here ? */
   {0, 0,                     0,                       NULL},             /* 15 META, unused */
   {0, 0,                     0,                       NULL},             /* 16 ENUMFONT, unused */
   {0, 0,                     0,                       NULL},             /* 17 BMFD, unused */

Modified: branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c?rev=29736&r1=29735&r2=29736&view=diff
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Oct 21 17:49:29 2007
@@ -916,17 +916,6 @@
 {
    UNIMPLEMENTED;
    return EHN_ERROR;
-}
-
-/*
- * @unimplemented
- */
-PDD_SURFACE_LOCAL STDCALL
-EngLockDirectDrawSurface(
-   IN HANDLE Surface)
-{
-   UNIMPLEMENTED;
-   return NULL;
 }
 
 /*
@@ -1023,17 +1012,6 @@
  * @unimplemented
  */
 BOOL STDCALL
-EngUnlockDirectDrawSurface(
-   IN PDD_SURFACE_LOCAL Surface)
-{
-   UNIMPLEMENTED;
-   return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
 EngUnmapFile(
    IN ULONG_PTR File)
 {