From cd6060c8f8bbbd86cd937a4d69bf67755b4b0c18 Mon Sep 17 00:00:00 2001
From: David Jones <drj@ravenbrook.com>
Date: Fri, 17 Apr 1998 15:41:51 +0100
Subject: [PATCH] [bug]

ArenaAccess now takes MutatorFaultContext parm

Copied from Perforce
 Change: 19429
 ServerID: perforce.ravenbrook.com

GitHub-reference: https://github.com/Ravenbrook/mps/issues/160044
---
 mps/src/protw3.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mps/src/protw3.c b/mps/src/protw3.c
index 1fcffb6252e..5ee7fd4fd96 100644
--- a/mps/src/protw3.c
+++ b/mps/src/protw3.c
@@ -1,10 +1,13 @@
 /*  impl.c.protw3: PROTECTION FOR WIN32
  *
- *  $HopeName: MMsrc!protw3.c(trunk.11) $
+ *  $HopeName: MMsrc!protw3.c(trunk.12) $
  *  Copyright (C) 1995, 1997 Harlequin Group, all rights reserved
  */
 
 #include "mpm.h"
+/* protw3.h needed to share MutatorFaultContextStruct declation */
+/* with impl.c.prmcw3i3 */
+#include "protw3.h"
 
 #ifndef MPS_OS_W3
 #error "protw3.c is Win32-specific, but MPS_OS_W3 is not set"
@@ -15,7 +18,7 @@
 
 #include "mpswin.h"
 
-SRCID(protw3, "$HopeName: MMsrc!protw3.c(trunk.11) $");
+SRCID(protw3, "$HopeName: MMsrc!protw3.c(trunk.12) $");
 
 
 void ProtSetup(void)
@@ -53,11 +56,14 @@ LONG ProtSEHfilter(LPEXCEPTION_POINTERS info)
   AccessSet mode;
   Addr base, limit;
   LONG action;
+  MutatorFaultContextStruct context;
 
   er = info->ExceptionRecord;
 
   if(er->ExceptionCode != EXCEPTION_ACCESS_VIOLATION)
     return EXCEPTION_CONTINUE_SEARCH;
+  
+  context.er = er;
 
   /* assert that the exception is continuable */
   /* Note that Microsoft say that this field should be 0 or */
@@ -86,7 +92,7 @@ LONG ProtSEHfilter(LPEXCEPTION_POINTERS info)
 
   AVER(base < limit);  /* nasty case (base = -1): continue search? @@@ */
 
-  if(ArenaAccess(base, mode))
+  if(ArenaAccess(base, mode, &context))
     action = EXCEPTION_CONTINUE_EXECUTION;
   else
     action = EXCEPTION_CONTINUE_SEARCH;