[ros-diffs] [greatlrd] 27343: uodate rpc.h aganist trunk

Author: greatlrd
Date: Sat Jun 30 13:16:02 2007
New Revision: 27343

URL: http://svn.reactos.org/svn/reactos?rev=27343&view=rev
Log:
uodate rpc.h aganist trunk

Modified:
    branches/ddk2003/include/ddk2003/rpc.h
    branches/ddk2003/include/psdk/rpc.h

Modified: branches/ddk2003/include/ddk2003/rpc.h
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/rpc.h?r…
==============================================================================
--- branches/ddk2003/include/ddk2003/rpc.h (original)
+++ branches/ddk2003/include/ddk2003/rpc.h Sat Jun 30 13:16:02 2007
@@ -3,6 +3,12 @@
 #include <windows.h>
 #endif
 
+#ifdef __GNUC__
+    #ifndef _SEH_NO_NATIVE_NLG
+        /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */
+        #include  <libs/pseh/pseh.h>
+    #endif
+#endif
 
 #ifndef __RPC_H__
 #define __RPC_H__
@@ -63,32 +69,26 @@
     #define RPC_ENTRY
 #endif
 
-#if !defined(DECLSPEC_IMPORT)
-    #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64))
&& !defined(MIDL_PASS)
-        #define DECLSPEC_IMPORT __declspec(dllimport)
+
+#ifndef __GNUC__
+    #if !defined(DECLSPEC_IMPORT)
+            #define DECLSPEC_IMPORT
+    #endif
+
+    #if !defined(_RPCRT4_)
+        #define RPCRTAPI DECLSPEC_IMPORT
     #else
-        #define DECLSPEC_IMPORT
+        #define RPCRTAPI 
     #endif
-#endif
 
-#if !defined(DECLSPEC_EXPORT)
-    #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64))
&& !defined(MIDL_PASS)
-        #define DECLSPEC_EXPORT __declspec(dllexport)
+    #if !defined(_RPCNS4_)
+        #define RPCNSAPI DECLSPEC_IMPORT
     #else
-        #define DECLSPEC_EXPORT
+        #define RPCNSAPI 
     #endif
-#endif
-
-#if !defined(_RPCRT4_)
-    #define RPCRTAPI DECLSPEC_IMPORT
 #else
-    #define RPCRTAPI DECLSPEC_EXPORT
-#endif
-
-#if !defined(_RPCNS4_)
-    #define RPCNSAPI DECLSPEC_IMPORT
-#else
-    #define RPCNSAPI DECLSPEC_EXPORT
+    #define RPCRTAPI 
+    #define RPCNSAPI 
 #endif
 
 
@@ -115,7 +115,7 @@
     #include <poppack.h>
 #else
     #include <rpcdce.h>
-    #include <rpcnsi.h>
+    /* #include <rpcnsi.h> */
     #include <rpcnterr.h>
     #include <excpt.h>
     #include <winerror.h>
@@ -132,14 +132,31 @@
     #else
         /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */
 
-        #define RpcTryExcept if (1) {
-        #define RpcExcept(expr) } else {
-        #define RpcEndExcept }
-        #define RpcTryFinally
-        #define RpcFinally
-        #define RpcEndFinally
-        #define RpcExceptionCode() 0
-        /* #define RpcAbnormalTermination() abort() */
+        #ifdef _SEH_NO_NATIVE_NLG
+            /* hack for  _SEH_NO_NATIVE_NLG */
+                #define RpcTryExcept if (1) {
+                #define RpcExcept(expr) } else {
+                #define RpcEndExcept }
+                #define RpcTryFinally
+                #define RpcFinally
+                #define RpcEndFinally
+                #define RpcExceptionCode() 0
+        #else
+            #define RpcTryExcept _SEH_TRY {
+            #define RpcExcept(expr) } _SEH_HANDLE { \
+                                      if (expr) \
+                                      {
+            #define RpcEndExcept } \
+                                 } \
+                                 _SEH_END;
+
+            #define RpcTryFinally  _SEH_TRY {
+            #define RpcFinally  } _SEH_HANDLE {
+            #define RpcEndFinally } _SEH_END;
+            #define RpcExceptionCode() _SEH_GetExceptionCode()
+
+            /* #define RpcAbnormalTermination() abort() */
+        #endif
     #endif
 #endif
 
@@ -153,3 +170,4 @@
 
 #endif
 
+

Modified: branches/ddk2003/include/psdk/rpc.h
URL:
http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpc.h?rev=…
==============================================================================
--- branches/ddk2003/include/psdk/rpc.h (original)
+++ branches/ddk2003/include/psdk/rpc.h Sat Jun 30 13:16:02 2007
@@ -3,6 +3,12 @@
 #include <windows.h>
 #endif
 
+#ifdef __GNUC__
+    #ifndef _SEH_NO_NATIVE_NLG
+        /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */
+        #include  <libs/pseh/pseh.h>
+    #endif
+#endif
 
 #ifndef __RPC_H__
 #define __RPC_H__
@@ -63,32 +69,26 @@
     #define RPC_ENTRY
 #endif
 
-#if !defined(DECLSPEC_IMPORT)
-    #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64))
&& !defined(MIDL_PASS)
-        #define DECLSPEC_IMPORT __declspec(dllimport)
+
+#ifndef __GNUC__
+    #if !defined(DECLSPEC_IMPORT)
+            #define DECLSPEC_IMPORT
+    #endif
+
+    #if !defined(_RPCRT4_)
+        #define RPCRTAPI DECLSPEC_IMPORT
     #else
-        #define DECLSPEC_IMPORT
+        #define RPCRTAPI 
     #endif
-#endif
 
-#if !defined(DECLSPEC_EXPORT)
-    #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64))
&& !defined(MIDL_PASS)
-        #define DECLSPEC_EXPORT __declspec(dllexport)
+    #if !defined(_RPCNS4_)
+        #define RPCNSAPI DECLSPEC_IMPORT
     #else
-        #define DECLSPEC_EXPORT
+        #define RPCNSAPI 
     #endif
-#endif
-
-#if !defined(_RPCRT4_)
-    #define RPCRTAPI DECLSPEC_IMPORT
 #else
-    #define RPCRTAPI DECLSPEC_EXPORT
-#endif
-
-#if !defined(_RPCNS4_)
-    #define RPCNSAPI DECLSPEC_IMPORT
-#else
-    #define RPCNSAPI DECLSPEC_EXPORT
+    #define RPCRTAPI 
+    #define RPCNSAPI 
 #endif
 
 
@@ -115,7 +115,7 @@
     #include <poppack.h>
 #else
     #include <rpcdce.h>
-    #include <rpcnsi.h>
+    /* #include <rpcnsi.h> */
     #include <rpcnterr.h>
     #include <excpt.h>
     #include <winerror.h>
@@ -132,14 +132,31 @@
     #else
         /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */
 
-        #define RpcTryExcept if (1) {
-        #define RpcExcept(expr) } else {
-        #define RpcEndExcept }
-        #define RpcTryFinally
-        #define RpcFinally
-        #define RpcEndFinally
-        #define RpcExceptionCode() 0
-        /* #define RpcAbnormalTermination() abort() */
+        #ifdef _SEH_NO_NATIVE_NLG
+            /* hack for  _SEH_NO_NATIVE_NLG */
+                #define RpcTryExcept if (1) {
+                #define RpcExcept(expr) } else {
+                #define RpcEndExcept }
+                #define RpcTryFinally
+                #define RpcFinally
+                #define RpcEndFinally
+                #define RpcExceptionCode() 0
+        #else
+            #define RpcTryExcept _SEH_TRY {
+            #define RpcExcept(expr) } _SEH_HANDLE { \
+                                      if (expr) \
+                                      {
+            #define RpcEndExcept } \
+                                 } \
+                                 _SEH_END;
+
+            #define RpcTryFinally  _SEH_TRY {
+            #define RpcFinally  } _SEH_HANDLE {
+            #define RpcEndFinally } _SEH_END;
+            #define RpcExceptionCode() _SEH_GetExceptionCode()
+
+            /* #define RpcAbnormalTermination() abort() */
+        #endif
     #endif
 #endif
 
@@ -153,3 +170,4 @@
 
 #endif
 
+