Robert Shearman : ole32: Exception handling shouldn'
t be needed around the call to IRpcStubBuffer_Invoke.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed May 10 12:56:48 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: af6d97ad36df10288f3f224ff6515e426a8db63c
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af6d97ad36df10288f3f224ff6515e426a8db63c
Author: Robert Shearman <rob at codeweavers.com>
Date: Wed May 10 13:11:49 2006 +0100
ole32: Exception handling shouldn't be needed around the call to IRpcStubBuffer_Invoke.
It should have its own exception handler to catch any exceptions that are raised.
---
dlls/ole32/rpc.c | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index d849c6e..4152198 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -43,9 +43,7 @@ #include "rpc.h"
#include "winerror.h"
#include "winreg.h"
#include "wtypes.h"
-#include "excpt.h"
#include "wine/unicode.h"
-#include "wine/exception.h"
#include "compobj_private.h"
@@ -114,13 +112,6 @@ struct dispatch_params
HRESULT hr; /* hresult (out) */
};
-static WINE_EXCEPTION_FILTER(ole_filter)
-{
- if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
- return EXCEPTION_CONTINUE_SEARCH;
- return EXCEPTION_EXECUTE_HANDLER;
-}
-
static HRESULT WINAPI RpcChannelBuffer_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, LPVOID *ppv)
{
*ppv = NULL;
@@ -510,15 +501,8 @@ HRESULT RPC_CreateServerChannel(IRpcChan
void RPC_ExecuteCall(struct dispatch_params *params)
{
- __TRY
- {
- params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan);
- }
- __EXCEPT(ole_filter)
- {
- params->hr = GetExceptionCode();
- }
- __ENDTRY
+ params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan);
+
IRpcStubBuffer_Release(params->stub);
IRpcChannelBuffer_Release(params->chan);
if (params->handle) SetEvent(params->handle);
More information about the wine-cvs
mailing list