[ros-diffs] [greatlrd] 27525: using reactos pseh instead for wine seh or buildin support for seh.

Author: greatlrd
Date: Mon Jul  9 02:08:12 2007
New Revision: 27525

URL: http://svn.reactos.org/svn/reactos?rev=27525&view=rev
Log:
using reactos pseh instead for wine seh or buildin support for seh. 

Modified:
    branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c
    branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild
    branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c

Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c
(original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c Mon
Jul  9 02:08:12 2007
@@ -37,8 +37,6 @@
 # include "winerror.h"
 # include "wingdi.h"
 #endif
-#include "wine/exception.h"
-#include "excpt.h"
 
 #include "ddraw.h"
 #include "d3d.h"

Modified:
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild
(original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.rbuild
Mon Jul  9 02:08:12 2007
@@ -1,4 +1,4 @@
-<module name="ddraw" type="win32dll" entrypoint="0" 
installbase="system32" installname="ddraw.dll">  
+<module name="ddraw" type="win32dll" entrypoint="0" 
installbase="system32" installname="ddraw.dll" allowwarnings
="true">  
 	<importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>
 	<include base="ReactOS">include/reactos/wine-paralles</include>
@@ -10,16 +10,24 @@
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
-	<define name="WINE_NATIVEWIN32" />
+	<define name="__WINESRC__" />
+
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
+	<library>gdi32</library>
+	<library>winspool</library>
+	<library>comdlg32</library>
+	<library>shell32</library>
+	<library>ole32</library>
+	<library>oleaut32</library>
+	<library>oleaut32</library>
+	<library>dxguid</library>
+	<library>msvcrt</library>
 	<library>advapi32</library>
-	<library>ole32</library>
-	<library>winmm</library>
-	<library>dxguid</library>
+	<library>pseh</library>
 
       <file>clipper.c</file>
       <file>ddraw.c</file>

Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c
(original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c Mon Jul
 9 02:08:12 2007
@@ -41,8 +41,8 @@
 # include "wingdi.h"
 # include "winreg.h"
 #endif
-#include "wine/exception.h"
-#include "excpt.h"
+/* using the GPL PSEH libary for SEH Support */
+#include <pseh/pseh.h>
 
 #include "ddraw.h"
 #include "d3d.h"
@@ -495,6 +495,7 @@
 DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback,
                      void *Context)
 {
+    HRESULT Ret = DD_OK;
     BOOL stop = FALSE;
 
 #ifdef WINE_NATIVEWIN32
@@ -503,21 +504,21 @@
 #endif
     TRACE(" Enumerating default DirectDraw HAL interface\n");
     /* We only have one driver */
-    __TRY
+    _SEH_TRY
     {
         static CHAR driver_desc[] = "DirectDraw HAL",
         driver_name[] = "display";
 
         stop = !Callback(NULL, driver_desc, driver_name, Context);
     }
-    __EXCEPT_PAGE_FAULT
-    {
-        return E_INVALIDARG;
-    }
-    __ENDTRY
+    _SEH_HANDLE
+    {
+        Ret = E_INVALIDARG;
+    }
+    _SEH_END;
 
     TRACE(" End of enumeration\n");
-    return DD_OK;
+    return Ret;
 }
 
 /***********************************************************************
@@ -535,6 +536,7 @@
                        DWORD Flags)
 {
     BOOL stop = FALSE;
+    HRESULT Ret = DD_OK;
 
 #ifdef WINE_NATIVEWIN32
     if (IsPassthrough())
@@ -542,7 +544,7 @@
 #endif
     TRACE("Enumerating default DirectDraw HAL interface\n");
     /* We only have one driver by now */
-    __TRY
+    _SEH_TRY
     {
         static CHAR driver_desc[] = "DirectDraw HAL",
         driver_name[] = "display";
@@ -550,14 +552,14 @@
         /* QuickTime expects the description "DirectDraw HAL" */
         stop = !Callback(NULL, driver_desc, driver_name, Context, 0);
     }
-    __EXCEPT_PAGE_FAULT
-    {
-        return E_INVALIDARG;
-    }
-    __ENDTRY;
+    _SEH_HANDLE
+    {
+        Ret = E_INVALIDARG;
+    }
+    _SEH_END;
 
     TRACE("End of enumeration\n");
-    return DD_OK;
+    return Ret;
 }
 
 /***********************************************************************
@@ -573,6 +575,7 @@
 DirectDrawEnumerateW(LPDDENUMCALLBACKW Callback, LPVOID Context)
 {
     BOOL stop = FALSE;
+    HRESULT Ret = DD_OK;
 
 #ifdef WINE_NATIVEWIN32
     if (IsPassthrough())
@@ -580,21 +583,21 @@
 #endif
     TRACE(" Enumerating default DirectDraw HAL interface\n");
     /* We only have one driver */
-    __TRY
+    _SEH_TRY
     {
         static WCHAR driver_desc[] = L"DirectDraw HAL",
         driver_name[] = L"display";
 
         stop = !Callback(NULL, driver_desc, driver_name, Context);
     }
-    __EXCEPT_PAGE_FAULT
-    {
-        return E_INVALIDARG;
-    }
-    __ENDTRY
+    _SEH_HANDLE
+    {
+        Ret = E_INVALIDARG;
+    }
+    SEH_END;
 
     TRACE(" End of enumeration\n");
-    return DD_OK;
+    return  Ret;
 }
 
 /***********************************************************************
@@ -610,6 +613,7 @@
 DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW Callback, LPVOID Context, DWORD Flags)
 {
     BOOL stop = FALSE;
+    HRESULT Ret = DD_OK;
 
 #ifdef WINE_NATIVEWIN32
     if (IsPassthrough())
@@ -617,7 +621,7 @@
 #endif
     TRACE("Enumerating default DirectDraw HAL interface\n");
     /* We only have one driver by now */
-    __TRY
+    _SEH_TRY
     {
         static WCHAR driver_desc[] = L"DirectDraw HAL",
         driver_name[] = L"display";
@@ -625,14 +629,14 @@
         /* QuickTime expects the description "DirectDraw HAL" */
         stop = !Callback(NULL, driver_desc, driver_name, Context, 0);
     }
-    __EXCEPT_PAGE_FAULT
-    {
-        return E_INVALIDARG;
-    }
-    __ENDTRY;
+    _SEH_HANDLE
+    {
+        Ret = E_INVALIDARG;
+    }
+    SEH_END;
 
     TRACE("End of enumeration\n");
-    return DD_OK;
+    return  Ret;
 }