Adding Hel_DDrawSurface and Hal_DDrawSurface stub

so it being more easy to implement some api

svn path=/trunk/; revision=21519

reactos/dll/directx/ddraw/hal/surface_hal.c

@@ -317,3 +317,29 @@ HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURF
 {
     DX_STUB;
 }
+HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect)
+{
+    DX_STUB;
+}
+
+HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags)
+{
+    DX_STUB;
+}
+
+HRESULT Hal_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey)
+{
+    DX_STUB;
+}
+
+HRESULT Hal_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
+{
+    DX_STUB;
+}
+
+HRESULT Hal_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
+{
+    DX_STUB;
+}
+
+

reactos/dll/directx/ddraw/main/surface_main.c

@@ -11,27 +11,34 @@
 #include "rosdraw.h"
 
 
+/* FIXME adding hal and hel stub 
+    DestroySurface; 
+    SetClipList;
+    AddAttachedSurface;  
+    GetFlipStatus;
+    SetOverlayPosition;  
+    SetPalette;
+*/
+
 
 HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2)
 {    
-    DX_WINDBG_trace();
 	return DDERR_ALREADYINITIALIZED;
 }
 
 ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface)
 {
-    DX_WINDBG_trace();
-
     IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
 
+    DX_WINDBG_trace();
+    	
     return InterlockedIncrement((PLONG)&This->owner->mDDrawGlobal.dsList->dwIntRefCnt);
 }
 
 ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface)
 {
-    DX_WINDBG_trace();
-
     IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
+        
     ULONG ref = InterlockedDecrement((PLONG)&This->owner->mDDrawGlobal.dsList->dwIntRefCnt);
     
     if (ref == 0)
@@ -59,7 +66,7 @@ HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst,
 	 IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
 	
 
-	if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_SURFCB32_BLT) 
+	if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT) 
 	{
 		return Hal_DDrawSurface_Blt( iface,  rdst, src,  rsrc,  dwFlags,  lpbltfx);
 	}
@@ -75,7 +82,7 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
 
 	IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
 
-	if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) 
+	if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) 
 	{
 		return Hal_DDrawSurface_Lock( iface, prect, pDDSD,  flags,  event);
 	}
@@ -87,7 +94,14 @@ HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRec
 {
     DX_WINDBG_trace();
 
-    DX_STUB;
+	IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
+
+	if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) 
+	{
+		return Hal_DDrawSurface_Unlock( iface,  pRect);
+	}
+
+	return Hel_DDrawSurface_Unlock( iface,  pRect);
 }
 
 HRESULT WINAPI
@@ -98,7 +112,6 @@ Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
 
    IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;        
    
-   
    IDirectDrawSurfaceImpl* That = NULL;
    if (pAttach==NULL)
    {
@@ -193,7 +206,14 @@ Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface,
 {
     DX_WINDBG_trace();
     
-    DX_STUB;
+    IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
+
+	if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_FLIP) 
+	{
+		return Hal_DDrawSurface_Flip(iface, override,  dwFlags);
+	}
+
+	return Hel_DDrawSurface_Flip(iface, override,  dwFlags);
 }
 
 HRESULT WINAPI
@@ -219,7 +239,14 @@ Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
 {
      DX_WINDBG_trace();
     
-    DX_STUB;
+    IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
+
+	if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_FLIP) 
+	{
+		return Hal_DDrawSurface_GetBltStatus( iface,  dwFlags);
+	}
+
+	return Hel_DDrawSurface_GetBltStatus( iface,  dwFlags);
 }
 
 HRESULT WINAPI
@@ -458,16 +485,17 @@ Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface,
 {
     DX_WINDBG_trace();
 
-    DX_STUB;
+    IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
+
+	if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_SETCOLORKEY) 
+	{
+		return Hal_DDrawSurface_SetColorKey (iface, dwFlags, pCKey);
+	}
+
+	return Hel_DDrawSurface_SetColorKey (iface, dwFlags, pCKey);
 }
 
-HRESULT WINAPI
-Main_DDrawSurface_SetLOD (LPDIRECTDRAWSURFACE7 iface, DWORD dwMaxLOD)
-{
-    DX_WINDBG_trace();
 
-    DX_STUB;
-}
 
 HRESULT WINAPI
 Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7 iface,
@@ -525,7 +553,14 @@ Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface,
 {
     DX_WINDBG_trace();
 
-    DX_STUB;
+    IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
+
+	if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) 
+	{
+		return Hal_DDrawSurface_UpdateOverlayDisplay ( iface,  dwFlags);
+	}
+
+	return Hel_DDrawSurface_UpdateOverlayDisplay ( iface,  dwFlags);
 }
 
 HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface,

reactos/dll/directx/ddraw/rosdraw.h

@@ -148,9 +148,11 @@ HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD
 HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX );
 HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter);       
 HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event);
-
+HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags);
-
+HRESULT Hal_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey);
-	
+HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect);	
+HRESULT Hal_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags);
+HRESULT Hal_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags);
 
 HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 );
 HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 );
@@ -163,6 +165,11 @@ HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DW
 HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX );
 HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter);       
 HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event);
+HRESULT Hel_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey);
+HRESULT Hel_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect);
+HRESULT Hel_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags);
+HRESULT Hel_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags);
+HRESULT Hel_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags);
 
 /* Setting for HEL should be move to ros special reg key ? */
 

reactos/dll/directx/ddraw/soft/surface_hel.c

@@ -28,5 +28,31 @@ HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURF
     DX_STUB;
 }
 
+HRESULT Hel_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect)
+{
+    DX_STUB;
+}
+
+HRESULT Hel_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags)
+{
+    DX_STUB;
+}
+
+HRESULT Hel_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey)
+{
+    DX_STUB;
+}
+
+HRESULT Hel_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
+{
+    DX_STUB;
+}
+
+HRESULT Hel_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags)
+{
+    DX_STUB;
+}
+
+