Alexandre Julliard : krnl386.exe: Use the correct pointer for RemoveVectoredExceptionHandler.

Alexandre Julliard julliard at winehq.org
Thu Nov 11 12:05:47 CST 2010


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Nov 10 20:56:08 2010 +0100

krnl386.exe: Use the correct pointer for RemoveVectoredExceptionHandler.

---

 dlls/krnl386.exe16/dosmem.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c
index e9acd66..1f1815b 100644
--- a/dlls/krnl386.exe16/dosmem.c
+++ b/dlls/krnl386.exe16/dosmem.c
@@ -120,6 +120,7 @@ static char *DOSMEM_sysmem;
 static DWORD DOSMEM_protect;
 
 static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except);
+static void *vectored_handler;
 
 /***********************************************************************
  *           DOSMEM_FillIsrTable
@@ -318,7 +319,7 @@ BOOL DOSMEM_InitDosMemory(void)
                                         DOSMEM_SIZE - DOSMEM_protect,
                                         PAGE_READWRITE, NULL )))
                 ERR("Cannot load access low 1Mb, DOS subsystem unavailable\n");
-            RtlRemoveVectoredExceptionHandler( dosmem_handler );
+            RemoveVectoredExceptionHandler( vectored_handler );
 
             /*
              * Reserve either:
@@ -412,7 +413,7 @@ BOOL DOSMEM_Init(void)
         DOSMEM_sysmem = DOSMEM_dosmem;
     }
 
-    RtlAddVectoredExceptionHandler(FALSE, dosmem_handler);
+    vectored_handler = AddVectoredExceptionHandler(FALSE, dosmem_handler);
     DOSMEM_0000H = GLOBAL_CreateBlock( GMEM_FIXED, DOSMEM_sysmem,
                                        DOSMEM_64KB, 0, WINE_LDT_FLAGS_DATA );
     DOSMEM_BiosDataSeg = GLOBAL_CreateBlock( GMEM_FIXED, DOSMEM_sysmem + 0x400,




More information about the wine-cvs mailing list