Skip to content

W
wine-winehq
Commit dbc14a5c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ole32: Revert exception handler change.

The handler does the opposite of normal page fault handlers.
parent d076748e
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
dlls/ole32/rpc.c
View file @ dbc14a5c
...@@ -110,6 +110,13 @@ struct dispatch_params ...@@ -110,6 +110,13 @@ struct dispatch_params
HRESULT hr; /* hresult (out) */ 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) static HRESULT WINAPI RpcChannelBuffer_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, LPVOID *ppv)
{ {
*ppv = NULL; *ppv = NULL;
...@@ -446,7 +453,7 @@ void RPC_ExecuteCall(struct dispatch_params *params) ...@@ -446,7 +453,7 @@ void RPC_ExecuteCall(struct dispatch_params *params)
{ {
params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan);
} }
__EXCEPT_PAGE_FAULT __EXCEPT(ole_filter)
{ {
params->hr = GetExceptionCode(); params->hr = GetExceptionCode();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment