[greatlrd] 29575: delete stub.c from ntddraw folder it is not longer need it add more redirect to dxg.sys smaller cleanup as well

Author: greatlrd
Date: Mon Oct 15 00:05:40 2007
New Revision: 29575

URL: http://svn.reactos.org/svn/reactos?rev=29575&view=rev
Log:
delete stub.c from ntddraw folder it is not longer need it
add more redirect to dxg.sys
smaller cleanup as well

Removed:
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c
Modified:
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
    branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.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 (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Mon Oct 15 00:05:40 2007
@@ -25,6 +25,7 @@

extern PDRVFN gpDxFuncs;

+typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE);
 typedef DWORD (NTAPI *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA);
 typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA);
 typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA);

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 00:05:40 2007
@@ -30,13 +30,10 @@
 typedef NTSTATUS (NTAPI *PGD_DXDDCLEANUPDXGRAPHICS) (VOID);
 typedef HANDLE (NTAPI *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc);
 typedef DWORD (NTAPI *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA);
-typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA);
-typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE);
 typedef DWORD (NTAPI *PGD_DDCOLORCONTROL)(HANDLE hSurface,PDD_COLORCONTROLDATA puColorControlData);
 typedef HANDLE (NTAPI *PGD_DXDDCREATESURFACEOBJECT)(HANDLE, HANDLE, PDD_SURFACE_LOCAL, PDD_SURFACE_MORE, PDD_SURFACE_GLOBAL, BOOL);
 typedef BOOL (NTAPI *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE);
 typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE);
-typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE);
 typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA);
 typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA);
 typedef BOOL (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)(HANDLE, DD_HALINFO*, DWORD*,  LPD3DNTHAL_CALLBACKS, LPD3DNTHAL_GLOBALDRIVERDATA,
@@ -361,8 +358,6 @@
 /************************************************************************/
 /* NtGdiDdReenableDirectDrawObject                                      */
 /************************************************************************/
-
-
 BOOL
 STDCALL
 NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal,
@@ -387,7 +382,6 @@
 /************************************************************************/
 /* NtGdiDdGetDriverInfo                                                 */
 /************************************************************************/
-
 DWORD
 STDCALL
 NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal,
@@ -407,8 +401,6 @@

DPRINT1("Calling on dxg.sys pfnDdGetDriverInfo");
     return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData);
-
-
 }

@@ -462,6 +454,88 @@
 }

+/************************************************************************/
+/* NtGdiDdFlipToGDISurface                                              */
+/************************************************************************/
+DWORD
+STDCALL
+NtGdiDdFlipToGDISurface(HANDLE hDirectDraw,
+                        PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData)
+{
+    PGD_DXDDFLIPTOGDISURFACE pfnDdFlipToGDISurface = NULL;
+    INT i;
+
+    DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFlipToGDISurface, pfnDdFlipToGDISurface);
+
+    if (pfnDdFlipToGDISurface == NULL)
+    {
+        DPRINT1("Warring no pfnDdFlipToGDISurface");
+        return DDHAL_DRIVER_NOTHANDLED;
+    }
+
+    DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface");
+    return pfnDdFlipToGDISurface(hDirectDrawLocal, puFlipToGDISurfaceData);
+
+}
+
+/************************************************************************/
+/* NtGdiDdGetDC                                                         */
+/************************************************************************/
+HDC
+STDCALL
+NtGdiDdGetDC(HANDLE hSurface,
+             PALETTEENTRY *puColorTable)
+{
+
+}
+
+/************************************************************************/
+/* NtGdiDdGetDxHandle                                                   */
+/************************************************************************/
+HANDLE
+STDCALL
+NtGdiDdGetDxHandle(HANDLE hDirectDraw,
+                   HANDLE hSurface,
+                   BOOL bRelease)
+{
+
+}
+
+
+/************************************************************************/
+/* NtGdiDdReleaseDC                                                     */
+/************************************************************************/
+BOOL
+STDCALL
+NtGdiDdReleaseDC(HANDLE hSurface)
+{
+
+}
+
+/************************************************************************/
+/* NtGdiDdResetVisrgn                                                   */
+/************************************************************************/
+BOOL
+STDCALL
+NtGdiDdResetVisrgn(HANDLE hSurface,
+                   HWND hwnd)
+{
+
+}
+
+/************************************************************************/
+/* NtGdiDdSetGammaRamp                                                  */
+/************************************************************************/
+BOOL
+STDCALL
+NtGdiDdSetGammaRamp(HANDLE hDirectDraw,
+                    HDC hdc,
+                    LPVOID lpGammaRamp)
+{
+
+}
+
+

/* EOF */

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 (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Mon Oct 15 00:05:40 2007
@@ -16,6 +16,8 @@

extern PDRVFN gpDxFuncs;

+typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA);
+typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE);
 typedef DWORD (NTAPI *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE);
 typedef DWORD (NTAPI *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL);
 typedef DWORD (NTAPI *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA);

Removed: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/...
==============================================================================
--- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original)
+++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c (removed)
@@ -1,85 +1,0 @@
-/*
- * COPYRIGHT:        See COPYING in the top level directory
- * PROJECT:          ReactOS kernel
- * PURPOSE:          Native DirectDraw stubs
- * FILE:             subsys/win32k/ntddraw/stubs.c
- * PROGRAMER:        Peter Bajusz ([e-mail])
- * REVISION HISTORY:
- *       25-10-2003  PB  Created
- */
-
-#include <w32k.h>
-
-#define NDEBUG
-#include <debug.h>
-
-
-
-DWORD STDCALL NtGdiDdFlipToGDISurface(
-    HANDLE hDirectDraw,
-    PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData
-)
-{
-	UNIMPLEMENTED
-
-	return 0;
-}
-
-HDC STDCALL NtGdiDdGetDC(
-    HANDLE hSurface,
-    PALETTEENTRY *puColorTable
-)
-{
-	UNIMPLEMENTED
-
-	return 0;
-}
-
-HANDLE STDCALL NtGdiDdGetDxHandle(
-    HANDLE hDirectDraw,
-    HANDLE hSurface,
-    BOOL bRelease
-)
-{
-	UNIMPLEMENTED
-
-	return 0;
-}
-
-
-
-BOOL STDCALL NtGdiDdReleaseDC(
-    HANDLE hSurface
-)
-{
-	UNIMPLEMENTED
-
-	return 0;
-}
-
-BOOL STDCALL NtGdiDdResetVisrgn(
-    HANDLE hSurface,
-    HWND hwnd
-)
-{
-
-	return TRUE;
-}
-
-BOOL STDCALL NtGdiDdSetGammaRamp(
-    HANDLE hDirectDraw,
-    HDC hdc,
-    LPVOID lpGammaRamp
-)
-{
-	UNIMPLEMENTED
-
-	return 0;
-}
-
-
-
-
-
-
-/* EOF */