[ros-diffs] [mbosma] 26724: DirectDraw rearrangement. (part 2/2)

Author: mbosma
Date: Sat May 12 18:58:26 2007
New Revision: 26724

URL: http://svn.reactos.org/svn/reactos?rev=26724&view=rev
Log:
DirectDraw rearrangement. (part 2/2)

Added:
    trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c
      - copied unchanged from r26723,
trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c
    trunk/reactos/dll/directx/ddraw/Color/color_stubs.c
      - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Color/iface_color.c
    trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c
      - copied unchanged from r26723,
trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c   (with props)
    trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c
      - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c
    trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c
      - copied unchanged from r26723,
trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c
    trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c
      - copied unchanged from r26723,
trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c
    trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c   (with props)
    trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c
      - copied unchanged from r26723,
trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c
Removed:
    trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c
    trunk/reactos/dll/directx/ddraw/Color/iface_color.c
    trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c
    trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c
    trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c
    trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c
    trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c
Modified:
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
    trunk/reactos/dll/directx/ddraw/Surface/createsurface.c
    trunk/reactos/dll/directx/ddraw/Surface/surface_main.c
    trunk/reactos/dll/directx/ddraw/ddraw.rbuild
    trunk/reactos/dll/directx/ddraw/rosdraw.h

Removed: trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c (original)
+++ trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c (removed)
@@ -1,105 +1,0 @@
-/* $Id: clipper.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/main/clipper.c
- * PURPOSE:              IDirectDrawClipper Implementation 
- * PROGRAMMER:           Maarten Bosma
- *
- */
-
-#include "rosdraw.h"
-
-
-ULONG WINAPI 
-DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) 
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-ULONG WINAPI 
-DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, 
-                              LPDIRECTDRAW lpDD, 
-                              DWORD dwFlags) 
-{
-   /* FIXME not implment */
-   DX_WINDBG_trace();
-   DX_STUB_DD_OK;
-}
-
-HRESULT WINAPI 
-DirectDrawClipper_SetHwnd( LPDIRECTDRAWCLIPPER iface, 
-                           DWORD dwFlags, 
-                           HWND hWnd) 
-{
-   /* FIXME not implment */
-   DX_WINDBG_trace();
-   DX_STUB_DD_OK;
-}
-
-HRESULT WINAPI 
-DirectDrawClipper_GetClipList( LPDIRECTDRAWCLIPPER iface, 
-                               LPRECT lpRect, 
-                               LPRGNDATA lpClipList,
-                               LPDWORD lpdwSize)
-{
-   DX_WINDBG_trace();
-   DX_STUB;    
-}
-
-HRESULT WINAPI 
-DirectDrawClipper_SetClipList( LPDIRECTDRAWCLIPPER iface,
-                               LPRGNDATA lprgn,
-                               DWORD dwFlag) 
-{
-   DX_WINDBG_trace();
-   DX_STUB;    
-}
-
-HRESULT WINAPI 
-DirectDrawClipper_QueryInterface( LPDIRECTDRAWCLIPPER iface, 
-                                  REFIID riid, 
-                                  LPVOID* ppvObj) 
-{
-   DX_WINDBG_trace();
-   DX_STUB;    
-}
-
-HRESULT WINAPI 
-DirectDrawClipper_GetHWnd( LPDIRECTDRAWCLIPPER iface, 
-                           HWND* hWndPtr) 
-{
-   DX_WINDBG_trace();
-   DX_STUB;    
-}
-
-HRESULT WINAPI 
-DirectDrawClipper_IsClipListChanged( LPDIRECTDRAWCLIPPER iface, 
-                                     BOOL* lpbChanged) 
-{
-   DX_WINDBG_trace();
-   DX_STUB;    
-}
-
-IDirectDrawClipperVtbl DirectDrawClipper_Vtable =
-{
-    DirectDrawClipper_QueryInterface,
-    DirectDrawClipper_AddRef,
-    DirectDrawClipper_Release,
-    DirectDrawClipper_GetClipList,
-    DirectDrawClipper_GetHWnd,
-    DirectDrawClipper_Initialize,
-    DirectDrawClipper_IsClipListChanged,
-    DirectDrawClipper_SetClipList,
-    DirectDrawClipper_SetHwnd
-};

Removed: trunk/reactos/dll/directx/ddraw/Color/iface_color.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Color/if…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Color/iface_color.c (original)
+++ trunk/reactos/dll/directx/ddraw/Color/iface_color.c (removed)
@@ -1,66 +1,0 @@
-/* $Id: color.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/main/color.c
- * PURPOSE:              IDirectDrawColorControl Implementation 
- * PROGRAMMER:           Maarten Bosma
- *
- */
-
-#include "rosdraw.h"
-
-ULONG WINAPI
-DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface)
-{           
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-ULONG WINAPI
-DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface)
-{
-    LPDDRAWI_DDCOLORCONTROL_INT This = (LPDDRAWI_DDCOLORCONTROL_INT)iface;
-
-    DX_WINDBG_trace();
-    /* FIXME 
-       This is not right exiame how it should be done 
-     */
-    DX_STUB_str("FIXME This is not right exiame how it should be done\n");
-    return This->dwIntRefCnt;
-}
-
-HRESULT WINAPI
-DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, 
-                                       REFIID riid, 
-                                       LPVOID* ppvObj) 
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI
-DirectDrawColorControl_GetColorControls( LPDIRECTDRAWCOLORCONTROL iface, 
-                                         LPDDCOLORCONTROL lpColorControl)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI
-DirectDrawColorControl_SetColorControls( LPDIRECTDRAWCOLORCONTROL iface,
-                                         LPDDCOLORCONTROL lpColorControl)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable =
-{
-    DirectDrawColorControl_QueryInterface,
-    DirectDrawColorControl_AddRef,
-    DirectDrawColorControl_Release,
-    DirectDrawColorControl_GetColorControls,
-    DirectDrawColorControl_SetColorControls
-};

Removed: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c (original)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c (removed)
@@ -1,101 +1,0 @@
-/* $Id: surface_hel.c 21519 2006-04-08 21:05:49Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/soft/surface.c
- * PURPOSE:              DirectDraw Software Implementation 
- * PROGRAMMER:           Magnus Olsen
- *
- */
-
-#include "rosdraw.h"
-
-
-extern  DDPIXELFORMAT pixelformats[];
-extern DWORD pixelformatsCount;
-
-/*
- * Direct Draw Callbacks 
- */
- 
-DWORD CALLBACK  HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK  HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface)
-{
-    DX_STUB;
-}
-
-
-DWORD CALLBACK  HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpDrvSetColorKey)
-{
-    DX_STUB;
-}
-
-
-DWORD CALLBACK  HelDdSetMode(LPDDHAL_SETMODEDATA SetMode)
-{
-    DEVMODE DevMode;
-
-    DX_STUB_str("in hel");
-
-    DevMode.dmSize = (WORD)sizeof(DEVMODE);
-    DevMode.dmDriverExtra = 0;
-
-    SetMode->ddRVal = DDERR_UNSUPPORTEDMODE;	
-
-    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)
-        {
-            DX_STUB_str("FAIL");
-            SetMode->ddRVal = DDERR_UNSUPPORTEDMODE;		
-        }
-        else
-        {
-            DX_STUB_str("OK");
-            SetMode->ddRVal = DD_OK;
-        }
-    }
-
-    return DDHAL_DRIVER_HANDLED;
-}
-
-DWORD CALLBACK  HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA
lpWaitForVerticalBlank)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK  HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK  HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK  HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK  HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode)
-{
-    DX_WINDBG_trace();
-    DX_STUB_str("Not implement yet, return DD_OK for not bsod\n");
-    lpSetExclusiveMode->ddRVal = DD_OK;
-    
-    return DDHAL_DRIVER_HANDLED;
-}
-
-DWORD CALLBACK  HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface)
-{
-    DX_STUB;
-}
-

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 Sat May 12 18:58:26 2007
@@ -116,206 +116,6 @@
     return DD_OK;
 }
 
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT
-WINAPI
-Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface,
-                              DWORD dwFlags,
-                              LPDIRECTDRAWCLIPPER *ppClipper,
-                              IUnknown *pUnkOuter)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags,
-                  LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN
pUnkOuter)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-
-/*
- * stub
- * Status not done
- */
-HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2
pDDSD,
-                                            LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown
*pUnkOuter)
-{
-
-  DX_WINDBG_trace();
-
-   DX_STUB;
-
-}
-
-
-/*
- * stub
- * Status not done
- */
-HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7
src,
-                 LPDIRECTDRAWSURFACE7* dst)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags,
-                 LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2
callback)
-{
-
-   DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * stub
- * Status not done
- */
-HRESULT WINAPI
-Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags,
-                 LPDDSURFACEDESC2 lpDDSD2, LPVOID context,
-                 LPDDENUMSURFACESCALLBACK7 callback)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
-            LPDDCAPS pHELCaps)
-{
-
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2
pDDSD)
-{
-  //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
-
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI
-Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI
-Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface,
-                                             LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI
-Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT
-WINAPI
-Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-   return DD_OK;
-}
 
 /*
  */
@@ -484,110 +284,6 @@
     return DD_OK;
 
 }
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight,
-                                                                DWORD dwBPP, DWORD
dwRefreshRate, DWORD dwFlags)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,
-                                                   HANDLE h)
-{
-
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * IMPLEMENT
- * Status ok
- */
-HRESULT WINAPI
-Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps,
-                   LPDWORD total, LPDWORD free)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc,
-                                                LPDIRECTDRAWSURFACE7 *lpDDS)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface,
-                   LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes,
-                  DWORD dwNumModes, DWORD dwFlags)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
-/*
- * Stub
- * Status todo
- */
-HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b)
-{
-    DX_WINDBG_trace();
-    DX_STUB;
-}
-
 
 IDirectDraw7Vtbl DirectDraw7_Vtable =
 {

Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (added)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sat May 12 18:58:26 2007
@@ -1,0 +1,316 @@
+/* $Id$
+ *
+ * COPYRIGHT:            See COPYING in the top level directory
+ * PROJECT:              ReactOS
+ * FILE:                 
+ * PURPOSE:              IDirectDraw7 Implementation
+ * PROGRAMMER:           Magnus Olsen, Maarten Bosma
+ *
+ */
+
+#include "../rosdraw.h"
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT
+WINAPI
+Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface,
+                              DWORD dwFlags,
+                              LPDIRECTDRAWCLIPPER *ppClipper,
+                              IUnknown *pUnkOuter)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/* */
+HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags,
+                  LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN
pUnkOuter)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+
+/*
+ * stub
+ * Status not done
+ */
+HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2
pDDSD,
+                                            LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown
*pUnkOuter)
+{
+
+  DX_WINDBG_trace();
+
+   DX_STUB;
+
+}
+
+
+/*
+ * stub
+ * Status not done
+ */
+HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7
src,
+                 LPDIRECTDRAWSURFACE7* dst)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags,
+                 LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2
callback)
+{
+
+   DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * stub
+ * Status not done
+ */
+HRESULT WINAPI
+Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags,
+                 LPDDSURFACEDESC2 lpDDSD2, LPVOID context,
+                 LPDDENUMSURFACESCALLBACK7 callback)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
+            LPDDCAPS pHELCaps)
+{
+
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2
pDDSD)
+{
+  //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
+
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI
+Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI
+Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface,
+                                             LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI
+Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT
+WINAPI
+Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+   return DD_OK;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight,
+                                                                DWORD dwBPP, DWORD
dwRefreshRate, DWORD dwFlags)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,
+                                                   HANDLE h)
+{
+
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * IMPLEMENT
+ * Status ok
+ */
+HRESULT WINAPI
+Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps,
+                   LPDWORD total, LPDWORD free)
+{
+  DX_WINDBG_trace();
+
+   DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc,
+                                                LPDIRECTDRAWSURFACE7 *lpDDS)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface,
+                   LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes,
+                  DWORD dwNumModes, DWORD dwFlags)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}
+
+/*
+ * Stub
+ * Status todo
+ */
+HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b)
+{
+    DX_WINDBG_trace();
+    DX_STUB;
+}

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

Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Removed: trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Gamma/if…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c (original)
+++ trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c (removed)
@@ -1,68 +1,0 @@
-/* $Id: gamma.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/main/gamma.c
- * PURPOSE:              IDirectDrawGamma Implementation 
- * PROGRAMMER:           Maarten Bosma
- *
- */
-
-#include "rosdraw.h"
-
-ULONG WINAPI
-DirectDrawGammaControl_AddRef( LPDIRECTDRAWGAMMACONTROL iface)
-{         
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-ULONG WINAPI
-DirectDrawGammaControl_Release( LPDIRECTDRAWGAMMACONTROL iface)
-{    
-    LPDDRAWI_DDGAMMACONTROL_INT This = (LPDDRAWI_DDGAMMACONTROL_INT)iface;
-
-    DX_WINDBG_trace();
-    /* FIXME 
-       This is not right exiame how it should be done 
-     */
-    DX_STUB_str("FIXME This is not right exiame how it should be done\n");
-    return This->dwIntRefCnt;
-}
-
-HRESULT WINAPI
-DirectDrawGammaControl_QueryInterface( LPDIRECTDRAWGAMMACONTROL iface, 
-                                       REFIID riid,
-                                       LPVOID *ppObj)
-{
-   DX_WINDBG_trace();
-   DX_STUB;
-}
-
-HRESULT WINAPI
-DirectDrawGammaControl_GetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, 
-                                     DWORD dwFlags, 
-                                     LPDDGAMMARAMP lpGammaRamp)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI
-DirectDrawGammaControl_SetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, 
-                                     DWORD dwFlags, 
-                                     LPDDGAMMARAMP lpGammaRamp)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable =
-{
-    DirectDrawGammaControl_QueryInterface,
-    DirectDrawGammaControl_AddRef,
-    DirectDrawGammaControl_Release,
-    DirectDrawGammaControl_GetGammaRamp,
-    DirectDrawGammaControl_SetGammaRamp
-};

Removed: trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Kernel/i…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c (original)
+++ trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c (removed)
@@ -1,131 +1,0 @@
-/* $Id: kernel.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/main/kernel.c
- * PURPOSE:              IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation 
- * PROGRAMMER:           Maarten Bosma
- *
- */
-
-#include "rosdraw.h"
-
-
-/***** IDirectDrawKernel ****/
-
-ULONG WINAPI 
-DirectDrawKernel_AddRef ( LPDIRECTDRAWKERNEL iface)
-{   
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-ULONG WINAPI 
-DirectDrawKernel_Release ( LPDIRECTDRAWKERNEL iface)
-{    
-  DX_WINDBG_trace();
-
-   DX_STUB;
-}
-
-HRESULT WINAPI 
-DirectDrawKernel_QueryInterface ( LPDIRECTDRAWKERNEL iface, 
-                                  REFIID riid, 
-                                  LPVOID* ppvObj)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-DirectDrawKernel_GetKernelHandle ( LPDIRECTDRAWKERNEL iface, 
-                                   ULONG* handle)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-DirectDrawKernel_ReleaseKernelHandle ( LPDIRECTDRAWKERNEL iface)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-
-ULONG WINAPI 
-DDSurfaceKernel_AddRef ( LPDIRECTDRAWSURFACEKERNEL iface)
-{         
-   LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface;
-   
-   DX_WINDBG_trace();
-
-    if (iface!=NULL)
-    {
-        This->dwIntRefCnt++;
-        //This->lpLcl->dwLocalRefCnt++;
-
-        //if (This->lpLcl->lpGbl != NULL)
-        //{
-        //    This->lpLcl->lpGbl->dwRefCnt++;
-        //}
-    }
-    return This->dwIntRefCnt;
-}
-
-ULONG WINAPI 
-DDSurfaceKernel_Release ( LPDIRECTDRAWSURFACEKERNEL iface)
-{    
-    LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface;
-
-    DX_WINDBG_trace();
-    /* FIXME 
-       This is not right exiame how it should be done 
-     */
-    DX_STUB_str("FIXME This is not right exiame how it should be done\n");
-    return This->dwIntRefCnt;
-}
-
-HRESULT WINAPI 
-DDSurfaceKernel_QueryInterface ( LPDIRECTDRAWSURFACEKERNEL iface, 
-                                 REFIID riid, 
-                                 LPVOID* ppvObj)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-DDSurfaceKernel_GetKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface, 
-                                  ULONG* handle)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-DDSurfaceKernel_ReleaseKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-
-IDirectDrawKernelVtbl DirectDrawKernel_Vtable =
-{
-    DirectDrawKernel_QueryInterface,
-    DirectDrawKernel_AddRef,
-    DirectDrawKernel_Release,
-	DirectDrawKernel_GetKernelHandle,
-	DirectDrawKernel_ReleaseKernelHandle
-};
-
-IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable =
-{
-    DDSurfaceKernel_QueryInterface,
-    DDSurfaceKernel_AddRef,
-    DDSurfaceKernel_Release,
-	DDSurfaceKernel_GetKernelHandle,
-	DDSurfaceKernel_ReleaseKernelHandle
-};

Removed: trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c (original)
+++ trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c (removed)
@@ -1,85 +1,0 @@
-/* $Id: palette.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/main/palette.c
- * PURPOSE:              IDirectDrawPalette Implementation 
- * PROGRAMMER:           Maarten Bosma
- *
- */
-
-#include "rosdraw.h"
-
-ULONG WINAPI
-DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface)
-{    
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-ULONG WINAPI 
-DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) 
-{         
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-HRESULT WINAPI
-DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface,
-				              LPDIRECTDRAW ddraw, 
-                              DWORD dwFlags,
-				              LPPALETTEENTRY palent)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI
-DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, 
-                              DWORD dwFlags,
-				              DWORD dwStart, DWORD dwCount,
-				              LPPALETTEENTRY palent)
-{
-   DX_WINDBG_trace();
-   DX_STUB;
-}
-
-HRESULT WINAPI
-DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, 
-                              DWORD dwFlags,
-				              DWORD dwStart,
-                              DWORD dwCount,
-				              LPPALETTEENTRY palent)
-{
-   DX_WINDBG_trace();
-   DX_STUB;
-}
-HRESULT WINAPI
-DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, 
-                           LPDWORD lpdwCaps)
-{
-   DX_WINDBG_trace();
-   DX_STUB;
-}
-
-HRESULT WINAPI
-DirectDrawPalette_QueryInterface( LPDIRECTDRAWPALETTE iface,
-				                  REFIID refiid, 
-                                  LPVOID *obj)
-{
-   DX_WINDBG_trace();
-   DX_STUB;
-}
-
-IDirectDrawPaletteVtbl DirectDrawPalette_Vtable =
-{
-    DirectDrawPalette_QueryInterface,
-    DirectDrawPalette_AddRef,
-    DirectDrawPalette_Release,
-    DirectDrawPalette_GetCaps,
-    DirectDrawPalette_GetEntries,
-    DirectDrawPalette_Initialize,
-    DirectDrawPalette_SetEntries
-};

Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original)
+++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat May 12 18:58:26 2007
@@ -21,7 +21,7 @@
 
     That[0]->lpLcl->lpSurfMore->slist = lpLcl;
 
-    That[0]->lpVtbl = &DirectDrawSurface7_Vtable;
+    //That[0]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe !
     That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
     That[0]->lpLcl->lpSurfMore->lpDD_int = This;
     That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl;
@@ -113,7 +113,7 @@
 
     That[t]->lpLcl->lpSurfMore->slist = lpLcl;
 
-    That[t]->lpVtbl = &DirectDrawSurface7_Vtable;
+    //That[t]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe !
     That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
     That[t]->lpLcl->lpSurfMore->lpDD_int = This;
     That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl;

Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sat May 12 18:58:26 2007
@@ -2,7 +2,7 @@
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/main/surface.c
+ * FILE:                 lib/ddraw/
  * PURPOSE:              IDirectDrawSurface7 Implementation 
  * PROGRAMMER:           Magnus Olsen, Maarten Bosma
  *
@@ -307,100 +307,6 @@
    DX_STUB;
 }
 
-/* MSDN: "not currently implemented." */
-HRESULT WINAPI
-Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface,
-					   LPRECT pRect)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx,
-			      DWORD dsty, LPDIRECTDRAWSURFACE7 src,
-			      LPRECT rsrc, DWORD trans)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-/* MSDN: "not currently implemented." */
-HRESULT WINAPI
-Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface,
-				LPDDBLTBATCH pBatch, DWORD dwCount,
-				DWORD dwFlags)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
-					     DWORD dwFlags,
-					     LPDIRECTDRAWSURFACE7 pAttach)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface,
-					    LPVOID context,
-					    LPDDENUMSURFACESCALLBACK7 cb)
-{
-	DX_WINDBG_trace();
-
-	DX_STUB;    
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface,
-					  DWORD dwFlags, LPVOID context,
-					  LPDDENUMSURFACESCALLBACK7 cb)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface,
-			    LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags)
-{        
-    DX_WINDBG_trace();
-
-    DX_STUB;    
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
 HRESULT WINAPI
 Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
                                      LPDDSCAPS2 pCaps,
@@ -460,25 +366,6 @@
 }
 
 HRESULT WINAPI
-Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface,
-				  LPDIRECTDRAWCLIPPER* ppClipper)
-{	
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags,
-				   LPDDCOLORKEY pCKey)
-{
-    //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface;
-
-	DX_WINDBG_trace();	
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
 Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC)
 {
     LPDDRAWI_DDRAWSURFACE_INT This;
@@ -500,46 +387,6 @@
     *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC;
 
     return DD_OK;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-HRESULT WINAPI
-Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface,
-					  LPLONG pX, LPLONG pY)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-HRESULT WINAPI
-Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface,
-				  LPDIRECTDRAWPALETTE* ppPalette)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
 }
 
 HRESULT WINAPI
@@ -566,25 +413,6 @@
     }
 
   return retVale;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface,
-				   LPDWORD pdwPriority)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface,
-				      REFGUID tag, LPVOID pBuffer,
-				      LPDWORD pcbBufferSize)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
 }
 
 HRESULT WINAPI
@@ -690,41 +518,6 @@
 }
 
 HRESULT WINAPI
-Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface,
-					  LPDWORD pValue)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface)
-{
-    DX_WINDBG_trace();
-
-    //DX_STUB;
-    DX_STUB_str("not implement return not lost\n");
-    return DD_OK;    
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
 Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC)
 {    
     LPDDRAWI_DDRAWSURFACE_INT This;
@@ -751,15 +544,6 @@
     }
    
     return DD_OK;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface,
-				  LPDIRECTDRAWCLIPPER pDDClipper)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
 }
 
 HRESULT WINAPI
@@ -832,87 +616,6 @@
 	}
 
 	return DDERR_GENERIC;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface,
-				  LPDIRECTDRAWPALETTE pPalette)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface,
-				   DWORD dwPriority)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface,
-				      REFGUID tag, LPVOID pData,
-				      DWORD cbSize, DWORD dwFlags)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface,
-				     LPRECT pSrcRect,
-				     LPDIRECTDRAWSURFACE7 pDstSurface,
-				     LPRECT pDstRect, DWORD dwFlags,
-				     LPDDOVERLAYFX pFX)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-/* MSDN: "not currently implemented." */
-HRESULT WINAPI
-Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface,
-					    DWORD dwFlags)
-{    
-    LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface;
-
-	DX_WINDBG_trace();
-
-	if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags
& DDHAL_SURFCB32_UPDATEOVERLAY) 
-	{
-		return DDERR_GENERIC;
-	}
-
-	DX_STUB;
-}
-
-HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface,
-					   DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef)
-{
-    DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD
Flags)
-{
-	DX_WINDBG_trace();
-
-    DX_STUB;
-}
-
-HRESULT WINAPI
-Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD)
-{
-	DX_WINDBG_trace();
-
-    DX_STUB;
 }
 
 IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable =

Added: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c (added)
+++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Sat May 12 18:58:26 2007
@@ -1,0 +1,325 @@
+/* $Id$
+ *
+ * COPYRIGHT:            See COPYING in the top level directory
+ * PROJECT:              ReactOS
+ * FILE:                 
+ * PURPOSE:              IDirectDrawSurface7 Implementation 
+ * PROGRAMMER:           Magnus Olsen, Maarten Bosma
+ *
+ */
+
+#include "../rosdraw.h"
+
+HRESULT WINAPI
+Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid,
+				      LPVOID* ppObj)
+{
+    DX_WINDBG_trace();
+
+	DX_STUB_str("Unimplement\n");
+
+	return E_NOINTERFACE;
+}
+
+
+/* MSDN: "not currently implemented." */
+HRESULT WINAPI
+Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface,
+					   LPRECT pRect)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx,
+			      DWORD dsty, LPDIRECTDRAWSURFACE7 src,
+			      LPRECT rsrc, DWORD trans)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+/* MSDN: "not currently implemented." */
+HRESULT WINAPI
+Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface,
+				LPDDBLTBATCH pBatch, DWORD dwCount,
+				DWORD dwFlags)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
+					     DWORD dwFlags,
+					     LPDIRECTDRAWSURFACE7 pAttach)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface,
+					    LPVOID context,
+					    LPDDENUMSURFACESCALLBACK7 cb)
+{
+	DX_WINDBG_trace();
+
+	DX_STUB;    
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface,
+					  DWORD dwFlags, LPVOID context,
+					  LPDDENUMSURFACESCALLBACK7 cb)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface,
+			    LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags)
+{        
+    DX_WINDBG_trace();
+
+    DX_STUB;    
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface,
+				  LPDIRECTDRAWCLIPPER* ppClipper)
+{	
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags,
+				   LPDDCOLORKEY pCKey)
+{
+    //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface;
+
+	DX_WINDBG_trace();	
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+HRESULT WINAPI
+Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface,
+					  LPLONG pX, LPLONG pY)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+HRESULT WINAPI
+Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface,
+				  LPDIRECTDRAWPALETTE* ppPalette)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface,
+				   LPDWORD pdwPriority)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface,
+				      REFGUID tag, LPVOID pBuffer,
+				      LPDWORD pcbBufferSize)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface,
+					  LPDWORD pValue)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface)
+{
+    DX_WINDBG_trace();
+
+    //DX_STUB;
+    DX_STUB_str("not implement return not lost\n");
+    return DD_OK;    
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+
+HRESULT WINAPI
+Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface,
+				  LPDIRECTDRAWCLIPPER pDDClipper)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+
+HRESULT WINAPI
+Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface,
+				  LPDIRECTDRAWPALETTE pPalette)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface,
+				   DWORD dwPriority)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface,
+				      REFGUID tag, LPVOID pData,
+				      DWORD cbSize, DWORD dwFlags)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface,
+				     LPRECT pSrcRect,
+				     LPDIRECTDRAWSURFACE7 pDstSurface,
+				     LPRECT pDstRect, DWORD dwFlags,
+				     LPDDOVERLAYFX pFX)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+
+/* MSDN: "not currently implemented." */
+HRESULT WINAPI
+Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface,
+					    DWORD dwFlags)
+{    
+    LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface;
+
+	DX_WINDBG_trace();
+
+	if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags
& DDHAL_SURFCB32_UPDATEOVERLAY) 
+	{
+		return DDERR_GENERIC;
+	}
+
+	DX_STUB;
+}
+
+
+HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface,
+					   DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef)
+{
+    DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD
Flags)
+{
+	DX_WINDBG_trace();
+
+    DX_STUB;
+}
+
+HRESULT WINAPI
+Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD)
+{
+	DX_WINDBG_trace();
+
+    DX_STUB;
+}
+

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

Propchange: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Removed: trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Videopor…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c (original)
+++ trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c (removed)
@@ -1,264 +1,0 @@
-/* $Id: videoport.c 22739 2006-07-01 12:08:35Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS
- * FILE:                 lib/ddraw/main/videoport.c
- * PURPOSE:              IDirectDrawVideoPort, DDVideoPortContainer and
IDirectDrawVideoPortNotify Implementation 
- * PROGRAMMER:           Maarten Bosma
- *
- */
-
-#include "rosdraw.h"
-
-
-/************* IDirectDrawVideoPort *************/ 
-
-HRESULT WINAPI 
-Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid,
LPVOID* ppvObj)
-{
-   DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-ULONG WINAPI 
-Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) 
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-ULONG WINAPI 
-Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-Main_DirectDrawVideoPort_Flip (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE
lpDDSurface, DWORD dwFlags)
-{
-  DX_WINDBG_trace();
-
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-Main_DirectDrawVideoPort_GetBandwidthInfo (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT
lpddpfFormat, DWORD dwWidth, 
-										   DWORD dwHeight, DWORD dwFlags, LPDDVIDEOPORTBANDWIDTH lpBandwidth)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-Main_DirectDrawVideoPort_GetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL
lpColorControl)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_GetInputFormats (LPDIRECTDRAWVIDEOPORT iface,
LPDWORD lpNumFormats, 
-														 LPDDPIXELFORMAT lpFormats, DWORD dwFlags)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_GetOutputFormats (LPDIRECTDRAWVIDEOPORT iface,
LPDDPIXELFORMAT lpInputFormat, 
-														  LPDWORD lpNumFormats, LPDDPIXELFORMAT lpFormats, DWORD dwFlags)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_GetFieldPolarity (LPDIRECTDRAWVIDEOPORT iface,
LPBOOL lpbFieldPolarity)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoLine (LPDIRECTDRAWVIDEOPORT This, LPDWORD
lpdwLine)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoSignalStatus (LPDIRECTDRAWVIDEOPORT
iface, LPDWORD lpdwStatus)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_SetColorControls (LPDIRECTDRAWVIDEOPORT iface,
LPDDCOLORCONTROL lpColorControl)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_SetTargetSurface (LPDIRECTDRAWVIDEOPORT iface,
LPDIRECTDRAWSURFACE lpDDSurface, 
-														  DWORD dwFlags)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_StartVideo (LPDIRECTDRAWVIDEOPORT iface,
LPDDVIDEOPORTINFO dwFlags)
-{
-   DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_StopVideo (LPDIRECTDRAWVIDEOPORT iface)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_UpdateVideo (LPDIRECTDRAWVIDEOPORT iface,
LPDDVIDEOPORTINFO dwFlags)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface, DWORD
dwFlags, DWORD dwLine, 
-													 DWORD dwTimeout)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-/************* IDDVideoPortContainer *************/ 
-
-HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface,
REFIID riid, LPVOID* ppvObj)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) 
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface,
DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, 
-														  LPDIRECTDRAWVIDEOPORT* DDVideoPort, IUnknown* pUnkOuter)
-{
-    DX_WINDBG_trace();
-   DX_STUB;  
-}    
-
-HRESULT WINAPI 
-Main_DDVideoPortContainer_EnumVideoPorts (LPDDVIDEOPORTCONTAINER iface, 
-                                          DWORD dwFlags, 
-                                          LPDDVIDEOPORTCAPS pCaps, 
-                                          LPVOID pContext, 
-							              LPDDENUMVIDEOCALLBACK pEnumVideoCallback)
-{
-    DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-Main_DDVideoPortContainer_GetVideoPortConnectInfo (LPDDVIDEOPORTCONTAINER iface, 
-                                                   DWORD PortId, DWORD* pNumEntries, 
-												   LPDDVIDEOPORTCONNECT pConnectInfo)
-{
-    DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI 
-Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONTAINER iface, 
-                                                DWORD PortId, 
-                                                LPDDVIDEOPORTSTATUS pStatus)
-{
-    DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-/************* IDirectDrawVideoPortNotify *************/ 
-
-HRESULT WINAPI 
-Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID 
-                                       riid, LPVOID* ppvObj)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-ULONG WINAPI 
-Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-ULONG WINAPI 
-Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface)
-{
-	DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY
iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify)
-{
-    DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY
iface, HANDLE h)
-{
-    DX_WINDBG_trace();
-   DX_STUB;  
-}
-
-IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable =
-{
-	Main_DirectDrawVideoPort_QueryInterface,
-	Main_DirectDrawVideoPort_AddRef,
-	Main_DirectDrawVideoPort_Release,
-	Main_DirectDrawVideoPort_Flip, 
-	Main_DirectDrawVideoPort_GetBandwidthInfo, 
-	Main_DirectDrawVideoPort_GetColorControls, 
-	Main_DirectDrawVideoPort_GetInputFormats, 
-	Main_DirectDrawVideoPort_GetOutputFormats, 
-	Main_DirectDrawVideoPort_GetFieldPolarity, 
-	Main_DirectDrawVideoPort_GetVideoLine,
-	Main_DirectDrawVideoPort_GetVideoSignalStatus, 
-	Main_DirectDrawVideoPort_SetColorControls, 
-	Main_DirectDrawVideoPort_SetTargetSurface, 
-	Main_DirectDrawVideoPort_StartVideo, 
-	Main_DirectDrawVideoPort_StopVideo, 
-	Main_DirectDrawVideoPort_UpdateVideo, 
-	Main_DirectDrawVideoPort_WaitForSync
-};
-
-IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable =
-{
-    Main_DDVideoPortContainer_QueryInterface,
-    Main_DDVideoPortContainer_AddRef,
-    Main_DDVideoPortContainer_Release,
-    Main_DDVideoPortContainer_CreateVideoPort,
-    Main_DDVideoPortContainer_EnumVideoPorts,
-    Main_DDVideoPortContainer_GetVideoPortConnectInfo,
-    Main_DDVideoPortContainer_QueryVideoPortStatus
-};
-
-IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable =
-{
-   Main_DDVideoPortNotify_QueryInterface,
-   Main_DDVideoPortNotify_AddRef,
-   Main_DDVideoPortNotify_Release,
-   Main_DDVideoPortNotify_AcquireNotification,
-   Main_DDVideoPortNotify_ReleaseNotification 
-};

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 Sat May 12 18:58:26 2007
@@ -1,6 +1,5 @@
-<!--
 <module name="ddraw" type="win32dll" entrypoint="0"
installbase="system32" installname="ddraw.dll" allowwarnings
="true">
-  <importlibrary definition="ddraw.def" />
+	<importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>	
 	<define name="UNICODE" />
 	<define name="__USE_W32API" />
@@ -22,21 +21,33 @@
 	<file>main.c</file>
 	<file>startup.c</file>
 	<file>cleanup.c</file>
-	<file>createsurface.c</file>
 
-	<file>iface_clipper.c</file>
-	<file>iface_color.c</file>
-	<file>iface_gamma.c</file>
-	<file>iface_palette.c</file>
-	<file>iface_videoport.c</file>
-	<file>iface_kernel.c</file>
-
-    <file>callbacks_hel.c</file>
-    <file>callbacks_surf_hel.c</file>
-
-	<directory name="main">
-		<file>ddraw_main.c</file>
-		<file>surface_main.c</file>				
+	<directory name="Ddraw">	
+		<file>ddraw_stubs.c</file>	
+		<file>ddraw_main.c</file>	
+		<file>callbacks_dd_hel.c</file>
 	</directory>	
-</module>
--->
+	<directory name="Surface">	
+		<file>surface_stubs.c</file>    
+		<file>callbacks_surf_hel.c</file>
+ 		<file>createsurface.c</file>
+	</directory>	
+	<directory name="clipper">	
+		<file>clipper_stubs.c</file>		
+	</directory>	
+	<directory name="Color">
+		<file>color_stubs.c</file>			
+	</directory>	
+	<directory name="Gamma">	
+		<file>gamma_stubs.c</file>		
+	</directory>	
+	<directory name="Kernel">	
+		<file>kernel_stubs.c</file>		
+	</directory>	
+	<directory name="Palette">	
+		<file>palette_stubs.c</file>		
+	</directory>	
+	<directory name="videoport">	
+		<file>videoport_stubs.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 Sat May 12 18:58:26 2007
@@ -73,7 +73,9 @@
 HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD,
DWORD);
 HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface);
 HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface);
-
+HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID);
+HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD
dwNumModes, DWORD dwFlags);
+HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b);
 
 ULONG   WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7);
 ULONG   WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7);