Rob Shearman : include: Make RpcRaiseException DECLSPEC_NORETURN, like it is in the PSDK.

Alexandre Julliard julliard at winehq.org
Fri Dec 14 07:39:49 CST 2007


Module: wine
Branch: master
Commit: c8a802eea885d7858028002f43fedba89d2e9672
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c8a802eea885d7858028002f43fedba89d2e9672

Author: Rob Shearman <rob at codeweavers.com>
Date:   Thu Dec 13 16:11:06 2007 +0000

include: Make RpcRaiseException DECLSPEC_NORETURN, like it is in the PSDK.

---

 dlls/rpcrt4/rpcrt4_main.c |    6 ++++--
 include/rpcdce.h          |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index d9efe9a..7cd9b03 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -239,10 +239,12 @@ RPC_STATUS WINAPI RpcStringFreeW(RPC_WSTR* String)
  *
  * Raises an exception.
  */
-void WINAPI RpcRaiseException(RPC_STATUS exception)
+void DECLSPEC_NORETURN WINAPI RpcRaiseException(RPC_STATUS exception)
 {
-  /* FIXME: translate exception? */
+  /* shouldn't return */
   RaiseException(exception, 0, 0, NULL);
+  ERR("handler continued execution\n");
+  ExitProcess(1);
 }
 
 /*************************************************************************
diff --git a/include/rpcdce.h b/include/rpcdce.h
index 7f20900..1b8b6e7 100644
--- a/include/rpcdce.h
+++ b/include/rpcdce.h
@@ -289,7 +289,7 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextA(RPC_STATUS e, RPC_CSTR buffer);
 RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer);
 #define              DceErrorInqText WINELIB_NAME_AW(DceErrorInqText)
 
-RPCRTAPI void RPC_ENTRY
+RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY
   RpcRaiseException( RPC_STATUS exception );
         
 RPCRTAPI RPC_STATUS RPC_ENTRY




More information about the wine-cvs mailing list