diff --git a/reactos/dll/directx/ddraw/createsurface.c b/reactos/dll/directx/ddraw/createsurface.c
index de1db8b8fb5..954ebe2a811 100644
--- a/reactos/dll/directx/ddraw/createsurface.c
+++ b/reactos/dll/directx/ddraw/createsurface.c
@@ -219,3 +219,173 @@ 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;
+}
diff --git a/reactos/dll/directx/ddraw/main/ddraw_main.c b/reactos/dll/directx/ddraw/main/ddraw_main.c
index 740e6ff68cd..99cf1642ea6 100644
--- a/reactos/dll/directx/ddraw/main/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/main/ddraw_main.c
@@ -236,7 +236,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
     }
     if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY)
     {       
-        DX_STUB_str( "Can not create overlay surface");
+        CreateOverlaySurface(This, That, pDDSD);
     }
     if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER)
     {
diff --git a/reactos/dll/directx/ddraw/main/surface_main.c b/reactos/dll/directx/ddraw/main/surface_main.c
index 50f954e141c..3c07bb48ba9 100644
--- a/reactos/dll/directx/ddraw/main/surface_main.c
+++ b/reactos/dll/directx/ddraw/main/surface_main.c
@@ -413,10 +413,7 @@ Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
     DX_WINDBG_trace();
 
     *ppSurface = (LPDIRECTDRAWSURFACE7) This->lpLcl->lpGbl->lpDD->dsList;
-    if (This->lpLcl->lpGbl->lpDD->dsList == NULL)
-    {
-        return DDERR_NOTFOUND;
-    }
+   
 
     return DD_OK;
 }
diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h
index 3fb5e1f0e26..d7f85e5f064 100644
--- a/reactos/dll/directx/ddraw/rosdraw.h
+++ b/reactos/dll/directx/ddraw/rosdraw.h
@@ -126,6 +126,11 @@ ULONG WINAPI  DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface);
 HRESULT WINAPI  DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags);
 
 
+
+HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT That, LPDDSURFACEDESC2 pDDSD);
+HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This,  LPDDRAWI_DDRAWSURFACE_INT That, LPDDSURFACEDESC2 pDDSD);
+HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT That, LPDDSURFACEDESC2 pDDSD);
+
 /* DirectDraw Object struct 
 
    DDRAWI_DIRECTDRAW_INT