Fixing complation error on x86

Author: ktakashi

src/main.c

@@ -358,25 +358,33 @@ static int real_main(int argc, tchar **argv);
 
 #if defined(_MSC_VER)
 
-static int show_stack_trace(EXCEPTION_POINTERS *ep)
+static CRITICAL_SECTION lock;
+
+static LONG WINAPI show_stack_trace(EXCEPTION_POINTERS *ep)
 {
   volatile __int64 frame = 0;
   EXCEPTION_RECORD *er = ep->ExceptionRecord;
   void *exceptionAddress = er? er->ExceptionAddress: NULL;
   int exceptionCode = er? er->ExceptionCode: 0;
-  fprintf(stderr, "Native error occurred at %p (%x)\n", 
-	  exceptionAddress, exceptionCode);
-  fflush(stderr);		/* not needed but for my mental health */
-  Sg_DumpNativeStackTrace(ep);
-  Sg_SanitiseStack(&frame);
-  /* ok try the caused one*/
-  if (exceptionAddress)
-    Sg_ShowAddressFunction(exceptionAddress);
+  __try {
+    EnterCriticalSection(&lock);
+    fprintf(stderr, "Native error occurred at %p (%x)\n", 
+	    exceptionAddress, exceptionCode);
+    fflush(stderr);		/* not needed but for my mental health */
+    Sg_DumpNativeStackTrace(ep);
+    Sg_SanitiseStack(&frame);
+    /* ok try the caused one*/
+    if (exceptionAddress)
+      Sg_ShowAddressFunction(exceptionAddress);
+  } __finally {
+    LeaveCriticalSection(&lock);
+  }
   return EXCEPTION_EXECUTE_HANDLER;
 }
 
 int wmain(int argc, tchar **argv)
 {
+  InitializeCriticalSection(&lock);
   SetUnhandledExceptionFilter(show_stack_trace);
   return real_main(argc, argv);
 }

src/os/win/thread.c

@@ -90,7 +90,7 @@ typedef struct ThreadParams
   void *arg;
 } ThreadParams;
 
-static unsigned int __stdcall win32_thread_entry_innter(void *params)
+static unsigned int __stdcall win32_thread_entry_inner(void *params)
 {
   volatile ThreadParams *threadParams = (ThreadParams *)params;
   SgThreadEntryFunc *start;
@@ -117,7 +117,7 @@ static unsigned int __stdcall win32_thread_entry(void *params)
 {
   unsigned int status;
   SgInternalThread *me = ((ThreadParams *)params)->me;
-  status = win32_thread_entry_innter(params);
+  status = win32_thread_entry_inner(params);
   /* clear the stackBase, from now on, thread can't be terminated */
   me->stackBase = 0;
   return status;