diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
index 2b764cadc77..2d3f15a037e 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
@@ -29,6 +29,7 @@ Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
     {
         /* DirectDraw7 Vtable */
         This->lpVtbl = &DirectDraw7_Vtable;
+        This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7;
         *obj = &This->lpVtbl;
     }
     else
@@ -155,11 +156,11 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
 
    if (pDDSD->dwSize == sizeof(DDSURFACEDESC))
    {
-       CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD);
+       CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD);
    }
    else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2))
    {
-       RtlCopyMemory(&dd_desc_v2,pDDSD,sizeof(DDSURFACEDESC2));
+       RtlCopyMemory(&dd_desc_v2, pDDSD,sizeof(DDSURFACEDESC2));
    }
    else
    {
@@ -168,13 +169,13 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
    }
 
    /* check if this process belong to this ddraw */
-   if ( dd_int->lcl->dwProcessId != GetCurrentProcessId() )
+   if ( dd_int->lpLcl->dwProcessId != GetCurrentProcessId() )
    {
        /* FIXME send back right return code */
         return  DDERR_GENERIC;
    }
 
-  ret = internal_CreateSurface(dd_int,dd_desc_v2,ppSurf,pUnkOuter);
+  ret = Internal_CreateSurface(dd_int,&dd_desc_v2, ppSurf,pUnkOuter);
 
   LeaveCriticalSection(&ddcs);
   return ret;
diff --git a/reactos/dll/directx/ddraw/Surface/createsurface.c b/reactos/dll/directx/ddraw/Surface/createsurface.c
index f8322edd661..82ab6dcf274 100644
--- a/reactos/dll/directx/ddraw/Surface/createsurface.c
+++ b/reactos/dll/directx/ddraw/Surface/createsurface.c
@@ -10,11 +10,19 @@
 #include "rosdraw.h"
 
 HRESULT 
-Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT pDDraw, 
-              LPDDRAWI_DDRAWSURFACE_LCL *lpLcl,
-              LPDDSURFACEDESC2 pDDSD)
+Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD,
+                        LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter)
 {
-	return DDERR_GENERIC;
+    if (!pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_DIRECTDRAW7)
+    {
+        /* it is directdraw 1-6 so no DirectD3D support */
+    }
+    else
+    {
+        /* directdraw 7 support */
+    }
+
+    return DDERR_GENERIC;
 }
 
 void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc)
diff --git a/reactos/dll/directx/ddraw/Surface/surface.h b/reactos/dll/directx/ddraw/Surface/surface.h
index 80f97f486a0..a4326e626de 100644
--- a/reactos/dll/directx/ddraw/Surface/surface.h
+++ b/reactos/dll/directx/ddraw/Surface/surface.h
@@ -71,4 +71,4 @@ DWORD CALLBACK  HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISu
 HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD);
 HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD);
 HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD);
-HRESULT Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT, LPDDRAWI_DDRAWSURFACE_LCL*, LPDDSURFACEDESC2);
+
diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h
index b0de077c4d6..4952b128d9e 100644
--- a/reactos/dll/directx/ddraw/rosdraw.h
+++ b/reactos/dll/directx/ddraw/rosdraw.h
@@ -24,6 +24,8 @@ HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable);
 HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable);
 HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex);
 HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface);
+HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD,
+                        LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter);
 
 /* convert DDSURFACEDESC to DDSURFACEDESC2 */
 void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc);