diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
index 467ef24f695..976c9fae359 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
@@ -11,6 +11,9 @@
 
 #include "rosdraw.h"
 
+/* PSEH for SEH Support */
+#include <pseh/pseh.h>
+
 HRESULT WINAPI
 Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
                                 REFIID id,
@@ -150,26 +153,33 @@ Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD lpNumCodes, LPDWORD
 
     DX_WINDBG_trace();
 
-    /* FIXME protect with SEH or something else if lpCodes or lpNumCodes for bad user pointers */
-    EnterCriticalSection(&ddcs);
+    
+     // EnterCriticalSection(&ddcs);
 
-    if(!lpNumCodes)
+    _SEH_TRY
     {
-       retVal = DDERR_INVALIDPARAMS;
+        if(IsBadWritePtr(lpNumCodes,sizeof(LPDWORD)))
+        {
+            retVal = DDERR_INVALIDPARAMS;
+        }
+        else
+        {
+            if(!IsBadWritePtr(lpCodes,sizeof(LPDWORD)))
+            {
+                memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes));
+            }
+            else
+            {
+                *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC;
+            }
+        }
     }
-    else
+    _SEH_HANDLE
     {
-       if ((lpCodes) && (*lpCodes))
-       {
-            memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes));
-       }
-       else
-       {
-            *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC;
-       }
     }
+    _SEH_END;
 
-    LeaveCriticalSection(&ddcs);
+    //LeaveCriticalSection(&ddcs);
     return retVal;
 }
 
diff --git a/reactos/dll/directx/ddraw/ddraw.rbuild b/reactos/dll/directx/ddraw/ddraw.rbuild
index ef1278aec01..ecd4f0bf0f9 100644
--- a/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@@ -16,6 +16,7 @@
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>msvcrt</library>
+	<library>pseh</library>
 
 	<file>ddraw.rc</file>
 	<file>main.c</file>