seh_try_macros-02.diff

[Greg Turner]

LICENSE: X11/Bugroff
CHANGELOG:
* include: rpc.h;
  include/wine: exception.h:
- implement RpcTryExcept using the __try macros
- work around wpp problems when these macros
  are defined by checking for __try first.
- ensure __try is defined if we think the
  compiler directive is present.

--
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/rpc.h ./include/rpc.h
--- ../wine.test/include/rpc.h	2003-01-03 19:32:52.000000000 -0600
+++ ./include/rpc.h	2003-01-12 23:17:40.000000000 -0600
@@ -50,3 +50,18 @@
 #include "winerror.h"
 
 #endif /*__WINE_RPC_H */
+
+#ifdef __try
+  #ifndef __WINE_RPC_H_RPCTRYMACROS
+  #define __WINE_RPC_H_RPCTRYMACROS
+    #define RpcTryExcept                __try {
+    #define RpcExcept(...)              } __except(__VA_ARGS__) {
+    #define RpcEndExcept                } 
+    #define RpcTryFinally               __try {
+    #define RpcFinally                  } __finally {
+    #define RpcEndFinally               }
+    #define RpcExceptionCode(...)       GetExceptionCode(__VA_ARGS__)
+    #define RpcAbnormalTermination(...) AbnormalTermination(__VA_ARGS__)
+  #endif
+#endif
+
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/wine/exception.h ./include/wine/exception.h
--- ../wine.test/include/wine/exception.h	2003-01-12 21:32:03.000000000 -0600
+++ ./include/wine/exception.h	2003-01-12 23:20:03.000000000 -0600
@@ -72,6 +72,9 @@
 #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); }
 #define __ENDTRY /*nothing*/
 
+/* ensure __try is #defined */
+#define __try __try
+
 #else  /* USE_COMPILER_EXCEPTIONS */
 
 #include <assert.h>
-- 
gmt

"If everyone is thinking alike then somebody isn't
thinking." --George S. Patton