diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
index e9b5ee31bb2..c82fe22726e 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
@@ -117,6 +117,22 @@ Main_DirectDraw_Compact(LPDIRECTDRAW7 iface)
 }
 
 
+/*
+ */
+HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD,
+                                            LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter)
+{
+
+  DX_WINDBG_trace();
+  EnterCriticalSection(&ddcs);
+
+  /* code here */
+
+  LeaveCriticalSection(&ddcs);
+
+  DX_STUB;
+}
+
 /*
  */
 HRESULT WINAPI
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
index dc925fbcad1..545b81489fd 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
@@ -36,19 +36,7 @@ HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags,
 }
 
 
-/*
- * stub
- * Status not done
- */
-HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD,
-                                            LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter)
-{
 
-  DX_WINDBG_trace();
-
-   DX_STUB;
-
-}
 
 
 /*