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

mbosma at svn.reactos.org mbosma at svn.reactos.org
Sat May 12 16:20:13 CEST 2007


Author: mbosma
Date: Sat May 12 18:20:12 2007
New Revision: 26723

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

Added:
    trunk/reactos/dll/directx/ddraw/Clipper/
    trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_clipper.c
    trunk/reactos/dll/directx/ddraw/Color/
    trunk/reactos/dll/directx/ddraw/Color/iface_color.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_color.c
    trunk/reactos/dll/directx/ddraw/Ddraw/
    trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/callbacks_hel.c
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/main/ddraw_main.c
    trunk/reactos/dll/directx/ddraw/Gamma/
    trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_gamma.c
    trunk/reactos/dll/directx/ddraw/Kernel/
    trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_kernel.c
    trunk/reactos/dll/directx/ddraw/Palette/
    trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_palette.c
    trunk/reactos/dll/directx/ddraw/Surface/
    trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c
    trunk/reactos/dll/directx/ddraw/Surface/createsurface.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/createsurface.c
    trunk/reactos/dll/directx/ddraw/Surface/surface_main.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/main/surface_main.c
    trunk/reactos/dll/directx/ddraw/Videoport/
    trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c
      - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_videoport.c
Removed:
    trunk/reactos/dll/directx/ddraw/callbacks_hel.c
    trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c
    trunk/reactos/dll/directx/ddraw/createsurface.c
    trunk/reactos/dll/directx/ddraw/iface_clipper.c
    trunk/reactos/dll/directx/ddraw/iface_color.c
    trunk/reactos/dll/directx/ddraw/iface_gamma.c
    trunk/reactos/dll/directx/ddraw/iface_kernel.c
    trunk/reactos/dll/directx/ddraw/iface_palette.c
    trunk/reactos/dll/directx/ddraw/iface_videoport.c
    trunk/reactos/dll/directx/ddraw/main/
Modified:
    trunk/reactos/dll/directx/ddraw/ddraw.rbuild

Removed: trunk/reactos/dll/directx/ddraw/callbacks_hel.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callbacks_hel.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/callbacks_hel.c (original)
+++ trunk/reactos/dll/directx/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;
-}
-

Removed: trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (original)
+++ trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (removed)
@@ -1,92 +1,0 @@
-/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $
- *
- * COPYRIGHT:            See COPYING in the top level directory
- * PROJECT:              ReactOS kernel
- * FILE:                 lib/ddraw/ddraw.c
- * PURPOSE:              DirectDraw Library 
- * PROGRAMMER:           Magnus Olsen (greatlrd)
- *
- */
-
-#include <windows.h>
-#include "rosdraw.h"
-#include "d3dhal.h"
-#include "ddrawgdi.h"
-
-
-DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData)
-{
-    DX_STUB;
-}
-
-
-DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr)
-{
-    /* 
-       This api is not doucment by MS So I leave it
-       as stub. 
-     */
-
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfSetClipList(LPDDHAL_SETCLIPLISTDATA lpSetClipListData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfSetPalette(LPDDHAL_SETPALETTEDATA lpSetPaletteData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData)
-{
-    DX_STUB;
-}
-
-DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData)
-{
-    DX_STUB;
-}
-

Removed: trunk/reactos/dll/directx/ddraw/createsurface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/createsurface.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/createsurface.c (original)
+++ trunk/reactos/dll/directx/ddraw/createsurface.c (removed)
@@ -1,348 +1,0 @@
-
-#include "rosdraw.h"
-
-
-HRESULT 
-CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, 
-              LPDDRAWI_DDRAWSURFACE_INT *That,
-              LPDDRAWI_DDRAWSURFACE_LCL *lpLcl,
-              LPDDSURFACEDESC2 pDDSD)
-{
-    DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface;
-    DDHAL_CREATESURFACEDATA mDdCreateSurface;
-
-
-    That[0]->lpLcl->lpSurfMore =  DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE));
-    if (That[0]->lpLcl->lpSurfMore == NULL)
-    {
-        DxHeapMemFree(That);
-        return DDERR_OUTOFMEMORY;
-    }
-
-    That[0]->lpLcl->lpSurfMore->slist = lpLcl;
-
-    That[0]->lpVtbl = &DirectDrawSurface7_Vtable;
-    That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
-    That[0]->lpLcl->lpSurfMore->lpDD_int = This;
-    That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl;
-    That[0]->lpLcl->lpSurfMore->slist[0] = That[0]->lpLcl;
-    That[0]->lpLcl->dwProcessId = GetCurrentProcessId();
-
-    mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl;
-    if  (pDDSD->dwFlags & DDSD_PIXELFORMAT)
-    {
-        That[0]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT;
-        mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat;
-    }
-    else
-    {
-        mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat;
-    }
-    mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;
-    mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface;
-    mDdCanCreateSurface.ddRVal = DDERR_GENERIC;
-
-    mDdCreateSurface.lpDD = This->lpLcl->lpGbl;
-    mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface;
-    mDdCreateSurface.ddRVal =  DDERR_GENERIC;
-    mDdCreateSurface.dwSCnt = That[0]->dwIntRefCnt + 1; // is this correct 
-    mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;
-
-    mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist;
-
-           That[0]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps;
-
-       This->lpLcl->lpPrimary = That[0];
-       if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) 
-       {   
-           return DDERR_NOTINITIALIZED;
-       }
-
-       if (mDdCanCreateSurface.ddRVal != DD_OK)
-       {
-           return DDERR_NOTINITIALIZED;
-       }
-
-       mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist;
-
-       if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED)
-       {
-           return DDERR_NOTINITIALIZED;
-       }
-
-       if (mDdCreateSurface.ddRVal != DD_OK) 
-       {   
-           return mDdCreateSurface.ddRVal;
-       }
-
-      That[0]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ;
-
-      That[0]->lpLink = This->lpLcl->lpGbl->dsList;
-      This->lpLcl->lpGbl->dsList = That[0];
-
-       return DD_OK;
-}
-
-HRESULT 
-CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, 
-              LPDDRAWI_DDRAWSURFACE_INT *That,
-              LPDDRAWI_DDRAWSURFACE_LCL *lpLcl,
-              LPDDSURFACEDESC2 pDDSD)
-{
-    DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface;
-    DDHAL_CREATESURFACEDATA mDdCreateSurface;
-    DWORD t;
-
-
-    /* we are building the backbuffersurface pointer list 
-     * and create the backbuffer surface and set it up 
-     */
-
-    That[0]->lpLcl->dwBackBufferCount = pDDSD->dwBackBufferCount;
-
-    for (t=0;t<pDDSD->dwBackBufferCount+1;t++)
-    {
-        
-
-    That[t]->lpLcl->lpSurfMore =  DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE));
-    if (That[t]->lpLcl->lpSurfMore == NULL)
-    {
-        DxHeapMemFree(That);
-        return DDERR_OUTOFMEMORY;
-    }
-
-    That[t]->lpLcl->lpSurfMore->slist = lpLcl;
-
-    That[t]->lpVtbl = &DirectDrawSurface7_Vtable;
-    That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
-    That[t]->lpLcl->lpSurfMore->lpDD_int = This;
-    That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl;
-    That[t]->lpLcl->lpSurfMore->slist[0] = That[t]->lpLcl;
-    That[t]->lpLcl->dwProcessId = GetCurrentProcessId();
-
-    mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl;
-    if  (pDDSD->dwFlags & DDSD_PIXELFORMAT)
-    {
-        That[t]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT;
-        mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat;
-    }
-    else
-    {
-        mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat;
-    }
-    mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;
-    mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface;
-    mDdCanCreateSurface.ddRVal = DDERR_GENERIC;
-
-    mDdCreateSurface.lpDD = This->lpLcl->lpGbl;
-    mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface;
-    mDdCreateSurface.ddRVal =  DDERR_GENERIC;
-    mDdCreateSurface.dwSCnt = That[t]->dwIntRefCnt + 1; // is this correct 
-    mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD;
-
-    mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist;
-
-           That[t]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps;
-
-       This->lpLcl->lpPrimary = That[0];
-       if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) 
-       {   
-           return DDERR_NOTINITIALIZED;
-       }
-
-       if (mDdCanCreateSurface.ddRVal != DD_OK)
-       {
-           return DDERR_NOTINITIALIZED;
-       }
-
-       mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist;
-
-       if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED)
-       {
-           return DDERR_NOTINITIALIZED;
-       }
-
-       if (mDdCreateSurface.ddRVal != DD_OK) 
-       {   
-           return mDdCreateSurface.ddRVal;
-       }
-
-      That[t]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ;
-
-        /* Build the linking buffer */
-        That[t]->lpLink = This->lpLcl->lpGbl->dsList;
-        This->lpLcl->lpGbl->dsList = That[t];
-DX_STUB_str( "ok");
-    }
-   return DD_OK;
-}
-
-
-
-HRESULT 
-CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, 
-              LPDDRAWI_DDRAWSURFACE_INT *That,
-              LPDDSURFACEDESC2 pDDSD)
-{
-
-  DDSURFACEDESC mddsdOverlay;
-  DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal;
-  DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6];
-  DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6];
-  DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6];
-  DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface;
-  DDHAL_CREATESURFACEDATA mDdCreateSurface;
-  INT i;
-  INT j;
-  INT cSurfaces;
-  DDHAL_UPDATEOVERLAYDATA      mDdUpdateOverlay;
-
-  /* create overlay surface now */  
-  ZeroMemory(&mddsdOverlay, sizeof(DDSURFACEDESC));
-  mddsdOverlay.dwSize = sizeof(DDSURFACEDESC);
-  mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT;
-
-  mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP;
-
-  mddsdOverlay.dwWidth = 100;  //pels;
-  mddsdOverlay.dwHeight = 100; // lines;
-  mddsdOverlay.dwBackBufferCount = 1; //cBuffers;
-
-  mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT);
-  mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; 
-  mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32;
-  
-
-   //DDHAL_CANCREATESURFACEDATA   mDdCanCreateSurface;
-  mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl;
-   mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface;
-   mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat;
-   mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdOverlay; // pDDSD;
-   
-   
-   if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) 
-   {
-    // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create primary [%08x]", this, rv);
-   // printf("Fail to mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED \n"); 
-       DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail");
-    return DDERR_NOTINITIALIZED;
-   }
-
-   if (mDdCanCreateSurface.ddRVal != DD_OK)
-   {
-       DX_STUB_str("mDdCanCreateSurface fail");
-// printf("Fail to mDdCanCreateSurface mDdCanCreateSurface.ddRVal = %d:%s\n",(int)mDdCanCreateSurface.ddRVal,DDErrorString(mDdCanCreateSurface.ddRVal)); 
-     return DDERR_NOTINITIALIZED;
-   }
-
- 
-  ZeroMemory(&mOverlayGlobal, sizeof(DDRAWI_DDRAWSURFACE_GBL));
-  mOverlayGlobal.dwGlobalFlags = 0;
-  mOverlayGlobal.lpDD       = This->lpLcl->lpGbl;
-  mOverlayGlobal.lpDDHandle = This->lpLcl->lpGbl;
-  mOverlayGlobal.wWidth  = (WORD)mddsdOverlay.dwWidth;
-  mOverlayGlobal.wHeight = (WORD)mddsdOverlay.dwHeight;
-  mOverlayGlobal.lPitch  = -1;
-  mOverlayGlobal.ddpfSurface = mddsdOverlay.ddpfPixelFormat;
-
-  // setup front- and backbuffer surfaces
-  cSurfaces = mddsdOverlay.dwBackBufferCount + 1;
-  for ( i = 0; i < cSurfaces; i++)
-  {
-     ZeroMemory(&mOverlayMore[i], sizeof(DDRAWI_DDRAWSURFACE_MORE));
-     mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
-
-     ZeroMemory(&mOverlayLocal[i], sizeof(DDRAWI_DDRAWSURFACE_LCL));
-     mOverlayLocal[i].lpGbl = &mOverlayGlobal;
-     mOverlayLocal[i].lpSurfMore = &mOverlayMore[i];
-     mOverlayLocal[i].dwProcessId = GetCurrentProcessId();
-     mOverlayLocal[i].dwFlags = (i == 0) ?
-      (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER):
-      (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER);
-
-     mOverlayLocal[i].dwFlags |= 
-      DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM|
-      DDRAWISURF_HASPIXELFORMAT|
-      DDRAWISURF_HASOVERLAYDATA;
-
-     mOverlayLocal[i].ddsCaps.dwCaps = mddsdOverlay.ddsCaps.dwCaps;
-     mpOverlayLocals[i] = &mOverlayLocal[i];
-  }
-
-  for ( i = 0; i < cSurfaces; i++)
-  {
-    j = (i + 1) % cSurfaces;
-
-	
-    /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) 
-	{
-     // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j);
-      return DD_FALSE;
-    }*/
-
-	if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) 
-	{
-     // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j);
-//printf("Fail to DdAttachSurface (%d:%d)\n", i, j);
-        DX_STUB_str("DdAttachSurface fail");
-      return DD_FALSE;
-    }
-	
-  }
-
-    // DDHAL_CREATESURFACEDATA      mDdCreateSurface;
-  mDdCreateSurface.lpDD = This->lpLcl->lpGbl;
-  mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface;  
-  mDdCreateSurface.lpDDSurfaceDesc = &mddsdOverlay;//pDDSD;
-  mDdCreateSurface.lplpSList = mpOverlayLocals; //cSurfaces;
-  mDdCreateSurface.dwSCnt = 1 ;  //ppSurfaces;
-
-  if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED)
-  {
-	DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail");
-	return DDERR_NOTINITIALIZED;
-  }
-  
-
-  if (mDdCreateSurface.ddRVal != DD_OK) 
-  {   
-	 DX_STUB_str("mDdCreateSurface fail");
-     return mDdCreateSurface.ddRVal;
-  }
-
-  mDdUpdateOverlay.lpDD = This->lpLcl->lpGbl;
-  mDdUpdateOverlay.UpdateOverlay = This->lpLcl->lpDDCB->HALDDSurface.UpdateOverlay;
-  mDdUpdateOverlay.lpDDDestSurface = This->lpLcl->lpPrimary->lpLcl->lpSurfMore->slist[0];
-  mDdUpdateOverlay.lpDDSrcSurface = mpOverlayLocals[0];//pDDSurface;
-  mDdUpdateOverlay.dwFlags = DDOVER_SHOW;
-
-  mDdUpdateOverlay.rDest.top = 0;
-  mDdUpdateOverlay.rDest.left = 0;
-  mDdUpdateOverlay.rDest.right = 50;
-  mDdUpdateOverlay.rDest.bottom = 50;
-
-   mDdUpdateOverlay.rSrc.top = 0;
-  mDdUpdateOverlay.rSrc.left = 0;
-  mDdUpdateOverlay.rSrc.right = 50;
-  mDdUpdateOverlay.rSrc.bottom = 50;
-
- 
- 
-
-  if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED)
-  {
-	DX_STUB_str("UpdateOverlay fail");
-	 return DDERR_NOTINITIALIZED;
-  }
-  
-
-  if (mDdUpdateOverlay.ddRVal != DD_OK) 
-  {   
-      DX_STUB_str("mDdUpdateOverlay fail");
-	  //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); 
-      return mDdUpdateOverlay.ddRVal;
-  }
-
-  DX_STUB_str("OK");
-  return DD_OK;
-}

Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rbuild?rev=26723&r1=26722&r2=26723&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original)
+++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat May 12 18:20:12 2007
@@ -1,3 +1,4 @@
+<!--
 <module name="ddraw" type="win32dll" entrypoint="0" installbase="system32" installname="ddraw.dll" allowwarnings ="true">
   <importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>	
@@ -30,13 +31,12 @@
 	<file>iface_videoport.c</file>
 	<file>iface_kernel.c</file>
 
-      <file>callbacks_hel.c</file>
-      <file>callbacks_surf_hel.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>	
-
-	
 </module>
+-->

Removed: trunk/reactos/dll/directx/ddraw/iface_clipper.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_clipper.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/iface_clipper.c (original)
+++ trunk/reactos/dll/directx/ddraw/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/iface_color.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_color.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/iface_color.c (original)
+++ trunk/reactos/dll/directx/ddraw/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/iface_gamma.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_gamma.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/iface_gamma.c (original)
+++ trunk/reactos/dll/directx/ddraw/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/iface_kernel.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_kernel.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/iface_kernel.c (original)
+++ trunk/reactos/dll/directx/ddraw/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/iface_palette.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_palette.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/iface_palette.c (original)
+++ trunk/reactos/dll/directx/ddraw/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
-};

Removed: trunk/reactos/dll/directx/ddraw/iface_videoport.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_videoport.c?rev=26722&view=auto
==============================================================================
--- trunk/reactos/dll/directx/ddraw/iface_videoport.c (original)
+++ trunk/reactos/dll/directx/ddraw/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 
-};




More information about the Ros-diffs mailing list