Changeset 2906 for trunk/src/kWorker/kWorker.c

Timestamp:

Sep 10, 2016, 12:15:57 AM (9 years ago)

Author:

bird

Message:

More stdout console buffering tricks on windows.

File:

• trunk/src/kWorker/kWorker.c (modified) (2 diffs)

trunk/src/kWorker/kWorker.c

@@ -2638 +2638 @@
 static _onexit_t __cdecl kwSandbox_msvcrt__onexit(_onexit_t pfnFunc)
 {
-    PKWEXITCALLACK pCallback;
-    KW_LOG(("_onexit(%p)\n", pfnFunc));
-    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
-
-    pCallback = kHlpAlloc(sizeof(*pCallback));
-    if (pCallback)
-    {
-        pCallback->pfnCallback = pfnFunc;
-        pCallback->fAtExit     = K_FALSE;
-        pCallback->pNext       = g_Sandbox.pExitCallbackHead;
-        g_Sandbox.pExitCallbackHead = pCallback;
-        return pfnFunc;
-    }
-
-    return NULL;
+    if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
+    {
+        PKWEXITCALLACK pCallback;
+        KW_LOG(("_onexit(%p)\n", pfnFunc));
+        kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+
+        pCallback = kHlpAlloc(sizeof(*pCallback));
+        if (pCallback)
+        {
+            pCallback->pfnCallback = pfnFunc;
+            pCallback->fAtExit     = K_FALSE;
+            pCallback->pNext       = g_Sandbox.pExitCallbackHead;
+            g_Sandbox.pExitCallbackHead = pCallback;
+            return pfnFunc;
+        }
+        return NULL;
+    }
+    KW_LOG(("_onexit(%p) - IGNORED\n", pfnFunc));
+    return pfnFunc;
 }
 
@@ -2659 +2663 @@
 static int __cdecl kwSandbox_msvcrt_atexit(int (__cdecl *pfnFunc)(void))
 {
-    PKWEXITCALLACK pCallback;
-    KW_LOG(("_onexit(%p)\n", pfnFunc));
-    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
-
-    pCallback = kHlpAlloc(sizeof(*pCallback));
-    if (pCallback)
-    {
-        pCallback->pfnCallback = (_onexit_t)pfnFunc;
-        pCallback->fAtExit     = K_TRUE;
-        pCallback->pNext       = g_Sandbox.pExitCallbackHead;
-        g_Sandbox.pExitCallbackHead = pCallback;
-        return 0;
-    }
-
-    return -1;
+    if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
+    {
+        PKWEXITCALLACK pCallback;
+        kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+        KW_LOG(("atexit(%p)\n", pfnFunc));
+
+        pCallback = kHlpAlloc(sizeof(*pCallback));
+        if (pCallback)
+        {
+            pCallback->pfnCallback = (_onexit_t)pfnFunc;
+            pCallback->fAtExit     = K_TRUE;
+            pCallback->pNext       = g_Sandbox.pExitCallbackHead;
+            g_Sandbox.pExitCallbackHead = pCallback;
+            return 0;
+        }
+        return -1;
+    }
+    KW_LOG(("atexit(%p) - IGNORED!\n", pfnFunc));
+    return 0;
 }