[ros-diffs] [greatlrd] 27264: Fixing comping waring, also diamble our debug macro (it does not work for full screen for some reason

Author: greatlrd
Date: Fri Jun 22 23:34:06 2007
New Revision: 27264

URL: http://svn.reactos.org/svn/reactos?rev=27264&view=rev
Log:
Fixing comping waring, also diamble our debug macro (it does not work for full screen for
some reason 

Added:
    trunk/reactos/dll/directx/ddraw/Vtable/
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c   (with props)
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c   (with props)
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c   (with props)
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c   (with props)
Modified:
    trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
    trunk/reactos/dll/directx/ddraw/ddraw.rbuild
    trunk/reactos/dll/directx/ddraw/rosdraw.h

Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c (original)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c Fri Jun 22 23:34:06 2007
@@ -48,7 +48,7 @@
 
     if (EnumDisplaySettingsEx(NULL, SetMode->dwModeIndex, &DevMode, 0 ) != 0)
     {
-        DX_WINDBG_trace_res((int)DevMode.dmPelsWidth, (int)DevMode.dmPelsHeight,
(int)DevMode.dmBitsPerPel );
+
 
         if (ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN) !=
DISP_CHANGE_SUCCESSFUL)
         {

Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Fri Jun 22 23:34:06 2007
@@ -522,127 +522,10 @@
 /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */
 /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */
 
-IDirectDraw7Vtbl DirectDraw7_Vtable =
-{
-    Main_DirectDraw_QueryInterface,             /* (QueryInterface testing / devloping)
*/
-    Main_DirectDraw_AddRef,                     /* (AddRef done) */
-    Main_DirectDraw_Release,                    /* (QueryInterface testing / devloping)
*/
-    Main_DirectDraw_Compact,                    /* (Compact done) */
-    Main_DirectDraw_CreateClipper,
-    Main_DirectDraw_CreatePalette,
-    Main_DirectDraw_CreateSurface4,             /* (CreateSurface4 testing / devloping)
*/
-    Main_DirectDraw_DuplicateSurface,
-    Main_DirectDraw_EnumDisplayModes,           /* (EnumDisplayModes testing / devloping)
*/
-    Main_DirectDraw_EnumSurfaces,
-    Main_DirectDraw_FlipToGDISurface,
-    Main_DirectDraw_GetCaps,                    /* (GetCaps done) */
-    Main_DirectDraw_GetDisplayMode,             /* (GetDisplayMode testing / devloping)
*/
-    Main_DirectDraw_GetFourCCCodes,             /* (GetFourCCCodes done) */
-    Main_DirectDraw_GetGDISurface,
-    Main_DirectDraw_GetMonitorFrequency,        /* (GetMonitorFrequency done) */
-    Main_DirectDraw_GetScanLine,
-    Main_DirectDraw_GetVerticalBlankStatus,
-    Main_DirectDraw_Initialize,                 /* (Initialize done) */
-    Main_DirectDraw_RestoreDisplayMode,         /* (RestoreDisplayMode testing /
devloping) */
-    Main_DirectDraw_SetCooperativeLevel,        /* (SetCooperativeLevel testing /
devloping) */
-    Main_DirectDraw_SetDisplayMode,             /* (SetDisplayMode testing / devloping)
*/
-    Main_DirectDraw_WaitForVerticalBlank,
-    Main_DirectDraw_GetAvailableVidMem4,        /* (GetAvailableVidMem4 done) */
-    Main_DirectDraw_GetSurfaceFromDC,
-    Main_DirectDraw_RestoreAllSurfaces,
-    Main_DirectDraw_TestCooperativeLevel,
-    Main_DirectDraw_GetDeviceIdentifier7,       /* (GetDeviceIdentifier done) */
-    Main_DirectDraw_StartModeTest,
-    Main_DirectDraw_EvaluateMode
-};
-
-
-IDirectDraw4Vtbl DirectDraw4_Vtable =
-{
-    Main_DirectDraw_QueryInterface,
-    Main_DirectDraw_AddRef,
-    Main_DirectDraw_Release,
-    Main_DirectDraw_Compact,
-    Main_DirectDraw_CreateClipper,
-    Main_DirectDraw_CreatePalette,
-    Main_DirectDraw_CreateSurface4,
-    Main_DirectDraw_DuplicateSurface,
-    Main_DirectDraw_EnumDisplayModes,
-    Main_DirectDraw_EnumSurfaces,
-    Main_DirectDraw_FlipToGDISurface,
-    Main_DirectDraw_GetCaps,
-    Main_DirectDraw_GetDisplayMode,
-    Main_DirectDraw_GetFourCCCodes,
-    Main_DirectDraw_GetGDISurface,
-    Main_DirectDraw_GetMonitorFrequency,
-    Main_DirectDraw_GetScanLine,
-    Main_DirectDraw_GetVerticalBlankStatus,
-    Main_DirectDraw_Initialize,
-    Main_DirectDraw_RestoreDisplayMode,
-    Main_DirectDraw_SetCooperativeLevel,
-    Main_DirectDraw_SetDisplayMode,
-    Main_DirectDraw_WaitForVerticalBlank,
-    Main_DirectDraw_GetAvailableVidMem4,
-    Main_DirectDraw_GetSurfaceFromDC,
-    Main_DirectDraw_RestoreAllSurfaces,
-    Main_DirectDraw_TestCooperativeLevel,
-    Main_DirectDraw_GetDeviceIdentifier
-};
-
-IDirectDraw2Vtbl DirectDraw2_Vtable =
-{
-    Main_DirectDraw_QueryInterface,
-    Main_DirectDraw_AddRef,
-    Main_DirectDraw_Release,
-    Main_DirectDraw_Compact,
-    Main_DirectDraw_CreateClipper,
-    Main_DirectDraw_CreatePalette,
-    Main_DirectDraw_CreateSurface,
-    Main_DirectDraw_DuplicateSurface,
-    Main_DirectDraw_EnumDisplayModes,
-    Main_DirectDraw_EnumSurfaces,
-    Main_DirectDraw_FlipToGDISurface,
-    Main_DirectDraw_GetCaps,
-    Main_DirectDraw_GetDisplayMode,
-    Main_DirectDraw_GetFourCCCodes,
-    Main_DirectDraw_GetGDISurface,
-    Main_DirectDraw_GetMonitorFrequency,
-    Main_DirectDraw_GetScanLine,
-    Main_DirectDraw_GetVerticalBlankStatus,
-    Main_DirectDraw_Initialize,
-    Main_DirectDraw_RestoreDisplayMode,
-    Main_DirectDraw_SetCooperativeLevel,
-    Main_DirectDraw_SetDisplayMode,
-    Main_DirectDraw_WaitForVerticalBlank,
-    Main_DirectDraw_GetAvailableVidMem
-};
-
-IDirectDrawVtbl DirectDraw_Vtable =
-{
-    Main_DirectDraw_QueryInterface,
-    Main_DirectDraw_AddRef,
-    Main_DirectDraw_Release,
-    Main_DirectDraw_Compact,
-    Main_DirectDraw_CreateClipper,
-    Main_DirectDraw_CreatePalette,
-    Main_DirectDraw_CreateSurface,
-    Main_DirectDraw_DuplicateSurface,
-    Main_DirectDraw_EnumDisplayModes,
-    Main_DirectDraw_EnumSurfaces,
-    Main_DirectDraw_FlipToGDISurface,
-    Main_DirectDraw_GetCaps,
-    Main_DirectDraw_GetDisplayMode,
-    Main_DirectDraw_GetFourCCCodes,
-    Main_DirectDraw_GetGDISurface,
-    Main_DirectDraw_GetMonitorFrequency,
-    Main_DirectDraw_GetScanLine,
-    Main_DirectDraw_GetVerticalBlankStatus,
-    Main_DirectDraw_Initialize,
-    Main_DirectDraw_RestoreDisplayMode,
-    Main_DirectDraw_SetCooperativeLevel,
-    Main_DirectDraw_SetDisplayMode,
-    Main_DirectDraw_WaitForVerticalBlank
-};
-
-
-
+
+
+
+
+
+
+

Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c (added)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c Fri Jun 22 23:34:06 2007
@@ -1,0 +1,184 @@
+#include <windows.h>
+#include <stdio.h>
+#include <ddraw.h>
+#include <ddrawi.h>
+#include <d3dhal.h>
+#include <ddrawgdi.h>
+
+#if defined(_WIN32) && !defined(_NO_COM )
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#else
+#define IUnknown void
+#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
+        #define CO_E_NOTINITIALIZED 0x800401F0
+#endif
+#endif
+
+HRESULT WINAPI
+Main_DirectDraw_QueryInterface (
+                                LPDIRECTDRAW2 iface,
+                                REFIID id,
+                                LPVOID *obj);
+
+ULONG WINAPI
+Main_DirectDraw_AddRef (LPDIRECTDRAW2 iface);
+
+ULONG WINAPI
+Main_DirectDraw_Release (LPDIRECTDRAW2 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_Compact(LPDIRECTDRAW2 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_CreateClipper(
+                              LPDIRECTDRAW2 iface,
+                              DWORD dwFlags,
+                              LPDIRECTDRAWCLIPPER *ppClipper,
+                              IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_CreatePalette(
+                              LPDIRECTDRAW2 iface,
+                              DWORD dwFlags,
+                              LPPALETTEENTRY palent,
+                              LPDIRECTDRAWPALETTE* ppPalette,
+                              LPUNKNOWN pUnkOuter);
+
+HRESULT WINAPI 
+Main_DirectDraw_CreateSurface(
+                               LPDIRECTDRAW2 iface,
+                               LPDDSURFACEDESC pDDSD,
+                               LPDIRECTDRAWSURFACE *ppSurf,
+                               IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_DuplicateSurface(
+                                 LPDIRECTDRAW2 iface,
+                                 LPDIRECTDRAWSURFACE2 src,
+                                 LPDIRECTDRAWSURFACE2* dst);
+
+HRESULT WINAPI 
+Main_DirectDraw_EnumDisplayModes(
+                                 LPDIRECTDRAW2 iface,
+                                 DWORD dwFlags,
+                                 LPDDSURFACEDESC pDDSD,
+                                 LPVOID pContext,
+                                 LPDDENUMMODESCALLBACK pCallback);
+
+HRESULT WINAPI
+Main_DirectDraw_EnumSurfaces(
+                             LPDIRECTDRAW2 iface,
+                             DWORD dwFlags,
+                             LPDDSURFACEDESC2 lpDDSD,
+                             LPVOID context,
+                             LPDDENUMSURFACESCALLBACK callback);
+
+HRESULT WINAPI
+Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW2 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetCaps(
+                        LPDIRECTDRAW2 iface,
+                        LPDDCAPS pDriverCaps,
+                        LPDDCAPS pHELCaps);
+
+HRESULT WINAPI
+Main_DirectDraw_GetDisplayMode (
+                                LPDIRECTDRAW2 iface,
+                                LPDDSURFACEDESC pDDSD);
+
+HRESULT WINAPI
+Main_DirectDraw_GetFourCCCodes(
+                               LPDIRECTDRAW2 iface,
+                               LPDWORD lpNumCodes,
+                               LPDWORD lpCodes);
+
+HRESULT WINAPI
+Main_DirectDraw_GetGDISurface(
+                              LPDIRECTDRAW2 iface,
+                              LPDIRECTDRAWSURFACE *lplpGDIDDSSurface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetMonitorFrequency (
+                                     LPDIRECTDRAW2 iface,
+                                     LPDWORD lpFreq);
+
+
+HRESULT WINAPI
+Main_DirectDraw_GetScanLine(LPDIRECTDRAW2 iface,
+                            LPDWORD lpdwScanLine);
+
+HRESULT WINAPI
+Main_DirectDraw_GetVerticalBlankStatus(
+                                       LPDIRECTDRAW2 iface,
+                                       LPBOOL lpbIsInVB);
+
+HRESULT WINAPI
+Main_DirectDraw_Initialize (
+                            LPDIRECTDRAW2 iface,
+                            LPGUID lpGUID);
+
+
+HRESULT WINAPI
+Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW2 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_SetCooperativeLevel (
+                                     LPDIRECTDRAW2 iface,
+                                     HWND hwnd,
+                                     DWORD cooplevel);
+
+HRESULT WINAPI
+Main_DirectDraw_SetDisplayMode(
+                               LPDIRECTDRAW2 iface,
+                               DWORD dwWidth,
+                               DWORD dwHeight,
+                               DWORD dwBPP,
+                               DWORD dwRefreshRate,
+                               DWORD dwFlags);
+
+HRESULT WINAPI
+Main_DirectDraw_WaitForVerticalBlank(
+                                     LPDIRECTDRAW2 iface,
+                                     DWORD dwFlags,
+                                     HANDLE h);
+
+
+HRESULT WINAPI
+Main_DirectDraw_GetAvailableVidMem(
+                                    LPDIRECTDRAW2 iface,
+                                    LPDDSCAPS ddscaps,
+                                    LPDWORD dwTotal,
+                                    LPDWORD dwFree);
+
+
+IDirectDraw2Vtbl DirectDraw2_Vtable =
+{
+    Main_DirectDraw_QueryInterface,
+    Main_DirectDraw_AddRef,
+    Main_DirectDraw_Release,
+    Main_DirectDraw_Compact,
+    Main_DirectDraw_CreateClipper,
+    Main_DirectDraw_CreatePalette,
+    Main_DirectDraw_CreateSurface,
+    Main_DirectDraw_DuplicateSurface,
+    Main_DirectDraw_EnumDisplayModes,
+    Main_DirectDraw_EnumSurfaces,
+    Main_DirectDraw_FlipToGDISurface,
+    Main_DirectDraw_GetCaps,
+    Main_DirectDraw_GetDisplayMode,
+    Main_DirectDraw_GetFourCCCodes,
+    Main_DirectDraw_GetGDISurface,
+    Main_DirectDraw_GetMonitorFrequency,
+    Main_DirectDraw_GetScanLine,
+    Main_DirectDraw_GetVerticalBlankStatus,
+    Main_DirectDraw_Initialize,
+    Main_DirectDraw_RestoreDisplayMode,
+    Main_DirectDraw_SetCooperativeLevel,
+    Main_DirectDraw_SetDisplayMode,
+    Main_DirectDraw_WaitForVerticalBlank,
+    Main_DirectDraw_GetAvailableVidMem
+};
+
+

Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (added)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Fri Jun 22 23:34:06 2007
@@ -1,0 +1,205 @@
+#include <windows.h>
+#include <stdio.h>
+#include <ddraw.h>
+#include <ddrawi.h>
+#include <d3dhal.h>
+#include <ddrawgdi.h>
+
+#if defined(_WIN32) && !defined(_NO_COM )
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#else
+#define IUnknown void
+#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
+        #define CO_E_NOTINITIALIZED 0x800401F0
+#endif
+#endif
+
+HRESULT WINAPI
+Main_DirectDraw_QueryInterface (
+                                LPDIRECTDRAW4 iface,
+                                REFIID id,
+                                LPVOID *obj);
+
+ULONG WINAPI
+Main_DirectDraw_AddRef (LPDIRECTDRAW4 iface);
+
+ULONG WINAPI
+Main_DirectDraw_Release (LPDIRECTDRAW4 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_Compact(LPDIRECTDRAW4 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_CreateClipper(
+                              LPDIRECTDRAW4 iface,
+                              DWORD dwFlags,
+                              LPDIRECTDRAWCLIPPER *ppClipper,
+                              IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_CreatePalette(
+                              LPDIRECTDRAW4 iface,
+                              DWORD dwFlags,
+                              LPPALETTEENTRY palent,
+                              LPDIRECTDRAWPALETTE* ppPalette,
+                              LPUNKNOWN pUnkOuter);
+
+HRESULT WINAPI 
+Main_DirectDraw_CreateSurface4(
+                               LPDIRECTDRAW4 iface,
+                               LPDDSURFACEDESC2 pDDSD,
+                               LPDIRECTDRAWSURFACE4 *ppSurf,
+                               IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_DuplicateSurface(
+                                 LPDIRECTDRAW4 iface,
+                                 LPDIRECTDRAWSURFACE4 src,
+                                 LPDIRECTDRAWSURFACE4* dst);
+
+HRESULT WINAPI 
+Main_DirectDraw_EnumDisplayModes(
+                                 LPDIRECTDRAW4 iface,
+                                 DWORD dwFlags,
+                                 LPDDSURFACEDESC2 pDDSD,
+                                 LPVOID pContext,
+                                 LPDDENUMMODESCALLBACK2 pCallback);
+
+HRESULT WINAPI
+Main_DirectDraw_EnumSurfaces(
+                             LPDIRECTDRAW4 iface,
+                             DWORD dwFlags,
+                             LPDDSURFACEDESC2 lpDDSD2,
+                             LPVOID context,
+                             LPDDENUMSURFACESCALLBACK7 callback);
+
+HRESULT WINAPI
+Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW4 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetCaps(
+                        LPDIRECTDRAW4 iface,
+                        LPDDCAPS pDriverCaps,
+                        LPDDCAPS pHELCaps);
+
+HRESULT WINAPI
+Main_DirectDraw_GetDisplayMode (
+                                LPDIRECTDRAW4 iface,
+                                LPDDSURFACEDESC2 pDDSD);
+
+HRESULT WINAPI
+Main_DirectDraw_GetFourCCCodes(
+                               LPDIRECTDRAW4 iface,
+                               LPDWORD lpNumCodes,
+                               LPDWORD lpCodes);
+
+HRESULT WINAPI
+Main_DirectDraw_GetGDISurface(
+                              LPDIRECTDRAW4 iface,
+                              LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetMonitorFrequency (
+                                     LPDIRECTDRAW4 iface,
+                                     LPDWORD lpFreq);
+
+
+HRESULT WINAPI
+Main_DirectDraw_GetScanLine(LPDIRECTDRAW4 iface,
+                            LPDWORD lpdwScanLine);
+
+HRESULT WINAPI
+Main_DirectDraw_GetVerticalBlankStatus(
+                                       LPDIRECTDRAW4 iface,
+                                       LPBOOL lpbIsInVB);
+
+HRESULT WINAPI
+Main_DirectDraw_Initialize (
+                            LPDIRECTDRAW4 iface,
+                            LPGUID lpGUID);
+
+
+HRESULT WINAPI
+Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW4 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_SetCooperativeLevel (
+                                     LPDIRECTDRAW4 iface,
+                                     HWND hwnd,
+                                     DWORD cooplevel);
+
+HRESULT WINAPI
+Main_DirectDraw_SetDisplayMode(
+                               LPDIRECTDRAW4 iface,
+                               DWORD dwWidth,
+                               DWORD dwHeight,
+                               DWORD dwBPP,
+                               DWORD dwRefreshRate,
+                               DWORD dwFlags);
+
+HRESULT WINAPI
+Main_DirectDraw_WaitForVerticalBlank(
+                                     LPDIRECTDRAW4 iface,
+                                     DWORD dwFlags,
+                                     HANDLE h);
+
+
+HRESULT WINAPI
+Main_DirectDraw_GetAvailableVidMem4(
+                                    LPDIRECTDRAW4 iface,
+                                    LPDDSCAPS2 ddscaps,
+                                    LPDWORD dwTotal,
+                                    LPDWORD dwFree);
+
+HRESULT WINAPI 
+Main_DirectDraw_GetSurfaceFromDC(
+                                 LPDIRECTDRAW4 iface,
+                                 HDC hdc,
+                                 LPDIRECTDRAWSURFACE7 *lpDDS);
+
+HRESULT WINAPI 
+Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW4 iface);
+
+HRESULT WINAPI 
+Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW4 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetDeviceIdentifier(
+                                     LPDIRECTDRAW4 iface,
+                                     LPDDDEVICEIDENTIFIER pDDDI,
+                                     DWORD dwFlags);
+
+
+
+IDirectDraw4Vtbl DirectDraw4_Vtable =
+{
+    Main_DirectDraw_QueryInterface,
+    Main_DirectDraw_AddRef,
+    Main_DirectDraw_Release,
+    Main_DirectDraw_Compact,
+    Main_DirectDraw_CreateClipper,
+    Main_DirectDraw_CreatePalette,
+    Main_DirectDraw_CreateSurface4,
+    Main_DirectDraw_DuplicateSurface,
+    Main_DirectDraw_EnumDisplayModes,
+    Main_DirectDraw_EnumSurfaces,
+    Main_DirectDraw_FlipToGDISurface,
+    Main_DirectDraw_GetCaps,
+    Main_DirectDraw_GetDisplayMode,
+    Main_DirectDraw_GetFourCCCodes,
+    Main_DirectDraw_GetGDISurface,
+    Main_DirectDraw_GetMonitorFrequency,
+    Main_DirectDraw_GetScanLine,
+    Main_DirectDraw_GetVerticalBlankStatus,
+    Main_DirectDraw_Initialize,
+    Main_DirectDraw_RestoreDisplayMode,
+    Main_DirectDraw_SetCooperativeLevel,
+    Main_DirectDraw_SetDisplayMode,
+    Main_DirectDraw_WaitForVerticalBlank,
+    Main_DirectDraw_GetAvailableVidMem4,
+    Main_DirectDraw_GetSurfaceFromDC,
+    Main_DirectDraw_RestoreAllSurfaces,
+    Main_DirectDraw_TestCooperativeLevel,
+    Main_DirectDraw_GetDeviceIdentifier
+};

Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (added)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Fri Jun 22 23:34:06 2007
@@ -1,0 +1,223 @@
+
+#include <windows.h>
+#include <stdio.h>
+#include <ddraw.h>
+#include <ddrawi.h>
+#include <d3dhal.h>
+#include <ddrawgdi.h>
+
+#if defined(_WIN32) && !defined(_NO_COM )
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#else
+#define IUnknown void
+#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
+        #define CO_E_NOTINITIALIZED 0x800401F0
+#endif
+#endif
+
+
+
+
+HRESULT WINAPI
+Main_DirectDraw_QueryInterface (
+                                LPDIRECTDRAW7 iface,
+                                REFIID id,
+                                LPVOID *obj);
+
+ULONG WINAPI
+Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface);
+
+ULONG WINAPI
+Main_DirectDraw_Release (LPDIRECTDRAW7 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_Compact(LPDIRECTDRAW7 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_CreateClipper(
+                              LPDIRECTDRAW7 iface,
+                              DWORD dwFlags,
+                              LPDIRECTDRAWCLIPPER *ppClipper,
+                              IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_CreatePalette(
+                              LPDIRECTDRAW7 iface,
+                              DWORD dwFlags,
+                              LPPALETTEENTRY palent,
+                              LPDIRECTDRAWPALETTE* ppPalette,
+                              LPUNKNOWN pUnkOuter);
+
+HRESULT WINAPI 
+Main_DirectDraw_CreateSurface4(
+                               LPDIRECTDRAW7 iface,
+                               LPDDSURFACEDESC2 pDDSD,
+                               LPDIRECTDRAWSURFACE7 *ppSurf,
+                               IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_DuplicateSurface(
+                                 LPDIRECTDRAW7 iface,
+                                 LPDIRECTDRAWSURFACE7 src,
+                                 LPDIRECTDRAWSURFACE7* dst);
+
+HRESULT WINAPI 
+Main_DirectDraw_EnumDisplayModes(
+                                 LPDIRECTDRAW7 iface,
+                                 DWORD dwFlags,
+                                 LPDDSURFACEDESC2 pDDSD,
+                                 LPVOID pContext,
+                                 LPDDENUMMODESCALLBACK2 pCallback);
+
+HRESULT WINAPI
+Main_DirectDraw_EnumSurfaces(
+                             LPDIRECTDRAW7 iface,
+                             DWORD dwFlags,
+                             LPDDSURFACEDESC2 lpDDSD2,
+                             LPVOID context,
+                             LPDDENUMSURFACESCALLBACK7 callback);
+
+HRESULT WINAPI
+Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetCaps(
+                        LPDIRECTDRAW7 iface,
+                        LPDDCAPS pDriverCaps,
+                        LPDDCAPS pHELCaps);
+
+HRESULT WINAPI
+Main_DirectDraw_GetDisplayMode (
+                                LPDIRECTDRAW7 iface,
+                                LPDDSURFACEDESC2 pDDSD);
+
+HRESULT WINAPI
+Main_DirectDraw_GetFourCCCodes(
+                               LPDIRECTDRAW7 iface,
+                               LPDWORD lpNumCodes,
+                               LPDWORD lpCodes);
+
+HRESULT WINAPI
+Main_DirectDraw_GetGDISurface(
+                              LPDIRECTDRAW7 iface,
+                              LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetMonitorFrequency (
+                                     LPDIRECTDRAW7 iface,
+                                     LPDWORD lpFreq);
+
+
+HRESULT WINAPI
+Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface,
+                            LPDWORD lpdwScanLine);
+
+HRESULT WINAPI
+Main_DirectDraw_GetVerticalBlankStatus(
+                                       LPDIRECTDRAW7 iface,
+                                       LPBOOL lpbIsInVB);
+
+HRESULT WINAPI
+Main_DirectDraw_Initialize (
+                            LPDIRECTDRAW7 iface,
+                            LPGUID lpGUID);
+
+
+HRESULT WINAPI
+Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW7 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_SetCooperativeLevel (
+                                     LPDIRECTDRAW7 iface,
+                                     HWND hwnd,
+                                     DWORD cooplevel);
+
+HRESULT WINAPI
+Main_DirectDraw_SetDisplayMode(
+                               LPDIRECTDRAW7 iface,
+                               DWORD dwWidth,
+                               DWORD dwHeight,
+                               DWORD dwBPP,
+                               DWORD dwRefreshRate,
+                               DWORD dwFlags);
+
+HRESULT WINAPI
+Main_DirectDraw_WaitForVerticalBlank(
+                                     LPDIRECTDRAW7 iface,
+                                     DWORD dwFlags,
+                                     HANDLE h);
+
+
+HRESULT WINAPI
+Main_DirectDraw_GetAvailableVidMem4(
+                                    LPDIRECTDRAW7 iface,
+                                    LPDDSCAPS2 ddscaps,
+                                    LPDWORD dwTotal,
+                                    LPDWORD dwFree);
+
+HRESULT WINAPI 
+Main_DirectDraw_GetSurfaceFromDC(
+                                 LPDIRECTDRAW7 iface,
+                                 HDC hdc,
+                                 LPDIRECTDRAWSURFACE7 *lpDDS);
+
+HRESULT WINAPI 
+Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface);
+
+HRESULT WINAPI 
+Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetDeviceIdentifier7(
+                                     LPDIRECTDRAW7 iface,
+                                     LPDDDEVICEIDENTIFIER2 pDDDI,
+                                     DWORD dwFlags);
+
+HRESULT WINAPI 
+Main_DirectDraw_StartModeTest(
+                              LPDIRECTDRAW7 iface,
+                              LPSIZE pModes,
+                              DWORD dwNumModes,
+                              DWORD dwFlags);
+
+HRESULT WINAPI
+Main_DirectDraw_EvaluateMode(
+                             LPDIRECTDRAW7 iface,
+                             DWORD a,
+                             DWORD* b);
+
+IDirectDraw7Vtbl DirectDraw7_Vtable =
+{
+    Main_DirectDraw_QueryInterface,             /* (QueryInterface testing / devloping)
*/
+    Main_DirectDraw_AddRef,                     /* (AddRef done) */
+    Main_DirectDraw_Release,                    /* (QueryInterface testing / devloping)
*/
+    Main_DirectDraw_Compact,                    /* (Compact done) */
+    Main_DirectDraw_CreateClipper,
+    Main_DirectDraw_CreatePalette,
+    Main_DirectDraw_CreateSurface4,             /* (CreateSurface4 testing / devloping)
*/
+    Main_DirectDraw_DuplicateSurface,
+    Main_DirectDraw_EnumDisplayModes,           /* (EnumDisplayModes testing / devloping)
*/
+    Main_DirectDraw_EnumSurfaces,
+    Main_DirectDraw_FlipToGDISurface,
+    Main_DirectDraw_GetCaps,                    /* (GetCaps done) */
+    Main_DirectDraw_GetDisplayMode,             /* (GetDisplayMode testing / devloping)
*/
+    Main_DirectDraw_GetFourCCCodes,             /* (GetFourCCCodes done) */
+    Main_DirectDraw_GetGDISurface,
+    Main_DirectDraw_GetMonitorFrequency,        /* (GetMonitorFrequency done) */
+    Main_DirectDraw_GetScanLine,
+    Main_DirectDraw_GetVerticalBlankStatus,
+    Main_DirectDraw_Initialize,                 /* (Initialize done) */
+    Main_DirectDraw_RestoreDisplayMode,         /* (RestoreDisplayMode testing /
devloping) */
+    Main_DirectDraw_SetCooperativeLevel,        /* (SetCooperativeLevel testing /
devloping) */
+    Main_DirectDraw_SetDisplayMode,             /* (SetDisplayMode testing / devloping)
*/
+    Main_DirectDraw_WaitForVerticalBlank,
+    Main_DirectDraw_GetAvailableVidMem4,        /* (GetAvailableVidMem4 done) */
+    Main_DirectDraw_GetSurfaceFromDC,
+    Main_DirectDraw_RestoreAllSurfaces,
+    Main_DirectDraw_TestCooperativeLevel,
+    Main_DirectDraw_GetDeviceIdentifier7,       /* (GetDeviceIdentifier done) */
+    Main_DirectDraw_StartModeTest,
+    Main_DirectDraw_EvaluateMode
+};
+

Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c (added)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c Fri Jun 22 23:34:06 2007
@@ -1,0 +1,173 @@
+#include <windows.h>
+#include <stdio.h>
+#include <ddraw.h>
+#include <ddrawi.h>
+#include <d3dhal.h>
+#include <ddrawgdi.h>
+
+#if defined(_WIN32) && !defined(_NO_COM )
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#else
+#define IUnknown void
+#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
+        #define CO_E_NOTINITIALIZED 0x800401F0
+#endif
+#endif
+
+HRESULT WINAPI
+Main_DirectDraw_QueryInterface (
+                                LPDIRECTDRAW iface,
+                                REFIID id,
+                                LPVOID *obj);
+
+ULONG WINAPI
+Main_DirectDraw_AddRef (LPDIRECTDRAW iface);
+
+ULONG WINAPI
+Main_DirectDraw_Release (LPDIRECTDRAW iface);
+
+HRESULT WINAPI
+Main_DirectDraw_Compact(LPDIRECTDRAW iface);
+
+HRESULT WINAPI
+Main_DirectDraw_CreateClipper(
+                              LPDIRECTDRAW iface,
+                              DWORD dwFlags,
+                              LPDIRECTDRAWCLIPPER *ppClipper,
+                              IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_CreatePalette(
+                              LPDIRECTDRAW iface,
+                              DWORD dwFlags,
+                              LPPALETTEENTRY palent,
+                              LPDIRECTDRAWPALETTE* ppPalette,
+                              LPUNKNOWN pUnkOuter);
+
+HRESULT WINAPI 
+Main_DirectDraw_CreateSurface(
+                               LPDIRECTDRAW iface,
+                               LPDDSURFACEDESC pDDSD,
+                               LPDIRECTDRAWSURFACE *ppSurf,
+                               IUnknown *pUnkOuter);
+
+HRESULT WINAPI
+Main_DirectDraw_DuplicateSurface(
+                                 LPDIRECTDRAW iface,
+                                 LPDIRECTDRAWSURFACE src,
+                                 LPDIRECTDRAWSURFACE *dst);
+
+HRESULT WINAPI 
+Main_DirectDraw_EnumDisplayModes(
+                                 LPDIRECTDRAW iface,
+                                 DWORD dwFlags,
+                                 LPDDSURFACEDESC pDDSD,
+                                 LPVOID pContext,
+                                 LPDDENUMMODESCALLBACK pCallback);
+
+HRESULT WINAPI
+Main_DirectDraw_EnumSurfaces(
+                             LPDIRECTDRAW iface,
+                             DWORD dwFlags,
+                             LPDDSURFACEDESC2 lpDDSD2,
+                             LPVOID context,
+                             LPDDENUMSURFACESCALLBACK7 callback);
+
+HRESULT WINAPI
+Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW iface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetCaps(
+                        LPDIRECTDRAW iface,
+                        LPDDCAPS pDriverCaps,
+                        LPDDCAPS pHELCaps);
+
+HRESULT WINAPI
+Main_DirectDraw_GetDisplayMode (
+                                LPDIRECTDRAW iface,
+                                LPDDSURFACEDESC pDDSD);
+
+HRESULT WINAPI
+Main_DirectDraw_GetFourCCCodes(
+                               LPDIRECTDRAW iface,
+                               LPDWORD lpNumCodes,
+                               LPDWORD lpCodes);
+
+HRESULT WINAPI
+Main_DirectDraw_GetGDISurface(
+                              LPDIRECTDRAW iface,
+                              LPDIRECTDRAWSURFACE *lplpGDIDDSSurface);
+
+HRESULT WINAPI
+Main_DirectDraw_GetMonitorFrequency (
+                                     LPDIRECTDRAW iface,
+                                     LPDWORD lpFreq);
+
+
+HRESULT WINAPI
+Main_DirectDraw_GetScanLine(LPDIRECTDRAW iface,
+                            LPDWORD lpdwScanLine);
+
+HRESULT WINAPI
+Main_DirectDraw_GetVerticalBlankStatus(
+                                       LPDIRECTDRAW iface,
+                                       LPBOOL lpbIsInVB);
+
+HRESULT WINAPI
+Main_DirectDraw_Initialize (
+                            LPDIRECTDRAW iface,
+                            LPGUID lpGUID);
+
+
+HRESULT WINAPI
+Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW iface);
+
+HRESULT WINAPI
+Main_DirectDraw_SetCooperativeLevel (
+                                     LPDIRECTDRAW iface,
+                                     HWND hwnd,
+                                     DWORD cooplevel);
+
+HRESULT WINAPI
+Main_DirectDraw_SetDisplayMode(
+                               LPDIRECTDRAW iface,
+                               DWORD dwWidth,
+                               DWORD dwHeight,
+                               DWORD dwBPP,
+                               DWORD dwRefreshRate,
+                               DWORD dwFlags);
+
+HRESULT WINAPI
+Main_DirectDraw_WaitForVerticalBlank(
+                                     LPDIRECTDRAW iface,
+                                     DWORD dwFlags,
+                                     HANDLE h);
+
+IDirectDrawVtbl DirectDraw_Vtable =
+{
+    Main_DirectDraw_QueryInterface,
+    Main_DirectDraw_AddRef,
+    Main_DirectDraw_Release,
+    Main_DirectDraw_Compact,
+    Main_DirectDraw_CreateClipper,
+    Main_DirectDraw_CreatePalette,
+    Main_DirectDraw_CreateSurface,
+    Main_DirectDraw_DuplicateSurface,
+    Main_DirectDraw_EnumDisplayModes,
+    Main_DirectDraw_EnumSurfaces,
+    Main_DirectDraw_FlipToGDISurface,
+    Main_DirectDraw_GetCaps,
+    Main_DirectDraw_GetDisplayMode,
+    Main_DirectDraw_GetFourCCCodes,
+    Main_DirectDraw_GetGDISurface,
+    Main_DirectDraw_GetMonitorFrequency,
+    Main_DirectDraw_GetScanLine,
+    Main_DirectDraw_GetVerticalBlankStatus,
+    Main_DirectDraw_Initialize,
+    Main_DirectDraw_RestoreDisplayMode,
+    Main_DirectDraw_SetCooperativeLevel,
+    Main_DirectDraw_SetDisplayMode,
+    Main_DirectDraw_WaitForVerticalBlank
+};
+

Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original)
+++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Fri Jun 22 23:34:06 2007
@@ -57,4 +57,10 @@
 	<directory name="Videoport">	
 		<file>videoport_stubs.c</file>		
 	</directory>
+	<directory name="Vtable">	
+		<file>DirectDraw7_Vtable.c</file>		
+		<file>DirectDraw4_Vtable.c</file>
+		<file>DirectDraw2_Vtable.c</file>
+		<file>DirectDraw_Vtable.c</file>
+	</directory>
 </module>

Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/rosdraw.h (original)
+++ trunk/reactos/dll/directx/ddraw/rosdraw.h Fri Jun 22 23:34:06 2007
@@ -20,14 +20,66 @@
 extern WNDCLASSW wnd_class;
 extern CRITICAL_SECTION ddcs;
 extern IDirectDraw7Vtbl DirectDraw7_Vtable;
-
-HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW iface, LPGUID pGUID, BOOL reenable);
-HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable);
-HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW iface, BOOL reenable);
-HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL
ex);
-HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW iface);
-HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD,
-                        LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter);
+extern IDirectDraw4Vtbl DirectDraw4_Vtable;
+extern IDirectDraw2Vtbl DirectDraw2_Vtable;
+extern IDirectDrawVtbl DirectDraw_Vtable;
+
+
+extern IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable;
+extern IDirectDrawSurface3Vtbl DirectDrawSurface3_VTable;
+extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable;
+extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable;
+extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable;
+extern IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable;
+extern IDirectDrawKernelVtbl        DirectDrawKernel_Vtable;
+extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable;
+
+/* Start up direct hal or hel 
+ * iface = a pointer to the com object 
+ * pGUID = guid hardware acclations or software acclation this can  be NULL 
+ * reenable = FALSE if we whant create a new directdraw com 
+ *          = TRUE if we really whant rebuild the whole com interface (not in use)
+ */
+
+HRESULT WINAPI 
+StartDirectDraw(
+                LPDIRECTDRAW iface,
+                LPGUID pGUID,
+                BOOL reenable);
+
+/* iface = a pointer to the com object 
+ * reenable = FALSE / TRUE rebuld dx hal interface, this is need if we doing a mode
change 
+ */
+
+HRESULT WINAPI
+StartDirectDrawHal(
+                   LPDIRECTDRAW iface,
+                   BOOL reenable);
+
+/* iface = a pointer to the com object 
+ * reenable = FALSE / TRUE rebuld dx hel interface, this is need if we doing a mode
change 
+ */
+
+HRESULT WINAPI
+StartDirectDrawHel(
+                   LPDIRECTDRAW iface,
+                   BOOL reenable);
+
+HRESULT WINAPI
+Create_DirectDraw (
+                   LPGUID pGUID,
+                   LPDIRECTDRAW* pIface,
+                   REFIID id,
+                   BOOL ex);
+
+HRESULT WINAPI
+ReCreateDirectDraw(LPDIRECTDRAW iface);
+HRESULT 
+Internal_CreateSurface(
+                       LPDDRAWI_DIRECTDRAW_INT pDDraw,
+                       LPDDSURFACEDESC2 pDDSD, 
+                       LPDIRECTDRAWSURFACE7 *ppSurf,
+                       IUnknown *pUnkOuter);
 
 /* convert DDSURFACEDESC to DDSURFACEDESC2 */
 void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc);
@@ -98,22 +150,11 @@
 /* now to real info that are for private use and are our own */
 
 
-/*********** VTables ************/
-extern IDirectDrawVtbl				DirectDraw_Vtable;
-extern IDirectDraw2Vtbl				DirectDraw2_Vtable;
-extern IDirectDraw4Vtbl				DirectDraw4_Vtable;
-extern IDirectDraw7Vtbl				DirectDraw7_Vtable;
-
-
-extern IDirectDrawSurface7Vtbl		DirectDrawSurface7_Vtable;
-extern IDirectDrawSurface3Vtbl		DirectDrawSurface3_VTable;
-
-extern IDirectDrawPaletteVtbl		DirectDrawPalette_Vtable;
-extern IDirectDrawClipperVtbl		DirectDrawClipper_Vtable;
-extern IDirectDrawColorControlVtbl	DirectDrawColorControl_Vtable;
-extern IDirectDrawGammaControlVtbl	DirectDrawGammaControl_Vtable;
-extern IDirectDrawKernelVtbl        DirectDrawKernel_Vtable;
-extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable;
+
+
+
+
+
 
 /********* Prototypes **********/
 VOID Hal_DirectDraw_Release (LPDIRECTDRAW7);
@@ -192,42 +233,33 @@
 } \
 	return DD_OK;
 
- //#ifdef __GNU__
-#define DX_STUB_str(x) \
-		{ \
+
+/*
+    #define DX_STUB_str(x) \
+    { \
         char buffer[1024]; \
-		sprintf ( buffer, "Function %s %s (%s:%d)\n",
__FUNCTION__,x,__FILE__,__LINE__ ); \
-		OutputDebugStringA(buffer); \
+        sprintf ( buffer, "Function %s %s (%s:%d)\n",
__FUNCTION__,x,__FILE__,__LINE__ ); \
+        OutputDebugStringA(buffer); \
+    }
+
+
+    #define DX_WINDBG_trace() \
+        static BOOL firstcallx = TRUE; \
+        if (firstcallx) \
+        { \
+            char buffer[1024]; \
+            sprintf ( buffer, "Enter Function %s (%s:%d)\n",
__FUNCTION__,__FILE__,__LINE__ ); \
+            OutputDebugStringA(buffer); \
+            firstcallx = TRUE; \
         }
 
-
-#define DX_WINDBG_trace() \
-	static BOOL firstcallx = TRUE; \
-	if (firstcallx) \
-	{ \
-		char buffer[1024]; \
-		sprintf ( buffer, "Enter Function %s (%s:%d)\n",
__FUNCTION__,__FILE__,__LINE__ ); \
-		OutputDebugStringA(buffer); \
-		firstcallx = TRUE; \
-	}
-
-
-
-#define DX_WINDBG_trace_res(width,height,bpp) \
-	static BOOL firstcallxx = TRUE; \
-	if (firstcallxx) \
-	{ \
-		char buffer[1024]; \
-		sprintf ( buffer, "Setmode have been req width=%d, height=%d
bpp=%d\n",width,height,bpp); \
-		OutputDebugStringA(buffer); \
-		firstcallxx = FALSE; \
-	}
-/*
-#else
+*/
+
+
+
     #define DX_WINDBG_trace() //
     #define DX_STUB_str(x) //
-    #define DX_WINDBG_trace_res(width,height,bpp) //
-#endif
-*/
+
+
 
 #endif /* __DDRAW_PRIVATE */