We no longer need to handle EXCEPTION_PRIV_INSTRUCTION on page faults.
This commit is contained in:
parent
07f84d0458
commit
db7920bb44
|
@ -72,13 +72,10 @@ static HANDLE systemHeap; /* globally shared heap */
|
||||||
|
|
||||||
|
|
||||||
/* filter for page-fault exceptions */
|
/* filter for page-fault exceptions */
|
||||||
/* It is possible for a bogus global pointer to cause a */
|
|
||||||
/* page zero reference, so I include EXCEPTION_PRIV_INSTRUCTION too. */
|
|
||||||
static WINE_EXCEPTION_FILTER(page_fault)
|
static WINE_EXCEPTION_FILTER(page_fault)
|
||||||
{
|
{
|
||||||
switch (GetExceptionCode()) {
|
switch (GetExceptionCode()) {
|
||||||
case (EXCEPTION_ACCESS_VIOLATION):
|
case (EXCEPTION_ACCESS_VIOLATION):
|
||||||
case (EXCEPTION_PRIV_INSTRUCTION):
|
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
default:
|
default:
|
||||||
return EXCEPTION_CONTINUE_SEARCH;
|
return EXCEPTION_CONTINUE_SEARCH;
|
||||||
|
|
|
@ -92,8 +92,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name );
|
||||||
|
|
||||||
static WINE_EXCEPTION_FILTER(page_fault)
|
static WINE_EXCEPTION_FILTER(page_fault)
|
||||||
{
|
{
|
||||||
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ||
|
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
|
||||||
GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION)
|
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
return EXCEPTION_CONTINUE_SEARCH;
|
return EXCEPTION_CONTINUE_SEARCH;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,8 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource);
|
||||||
|
|
||||||
static WINE_EXCEPTION_FILTER(page_fault)
|
static WINE_EXCEPTION_FILTER(page_fault)
|
||||||
{
|
{
|
||||||
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ||
|
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
|
||||||
GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION)
|
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
return EXCEPTION_CONTINUE_SEARCH;
|
return EXCEPTION_CONTINUE_SEARCH;
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,8 +53,7 @@ static LANGID user_ui_language, system_ui_language;
|
||||||
|
|
||||||
static WINE_EXCEPTION_FILTER(page_fault)
|
static WINE_EXCEPTION_FILTER(page_fault)
|
||||||
{
|
{
|
||||||
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ||
|
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
|
||||||
GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION)
|
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
return EXCEPTION_CONTINUE_SEARCH;
|
return EXCEPTION_CONTINUE_SEARCH;
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,8 +112,7 @@ struct dispatch_params
|
||||||
|
|
||||||
static WINE_EXCEPTION_FILTER(ole_filter)
|
static WINE_EXCEPTION_FILTER(ole_filter)
|
||||||
{
|
{
|
||||||
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ||
|
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
|
||||||
GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION)
|
|
||||||
return EXCEPTION_CONTINUE_SEARCH;
|
return EXCEPTION_CONTINUE_SEARCH;
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,8 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource);
|
||||||
/* filter for page-fault exceptions */
|
/* filter for page-fault exceptions */
|
||||||
static WINE_EXCEPTION_FILTER(page_fault)
|
static WINE_EXCEPTION_FILTER(page_fault)
|
||||||
{
|
{
|
||||||
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ||
|
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
|
||||||
GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION)
|
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
return EXCEPTION_CONTINUE_SEARCH;
|
return EXCEPTION_CONTINUE_SEARCH;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue