Changeset 95765 in vbox for trunk/src/VBox/Runtime/r3/win/thread-win.cpp

Timestamp:

Jul 20, 2022 7:37:11 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/thread-win.cpp: IPRT_NO_CRT adjustments. bugref:10261

File:

• trunk/src/VBox/Runtime/r3/win/thread-win.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -32 +32 @@
 #include <iprt/nt/nt-and-windows.h>
 
-#include <errno.h>
-#include <process.h>
+#ifndef IPRT_NO_CRT
+# include <errno.h>
+# include <process.h>
+#endif
 
 #include <iprt/thread.h>
@@ -84 +86 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static unsigned __stdcall rtThreadNativeMain(void *pvArgs) RT_NOTHROW_PROTO;
 static void rtThreadWinTellDebuggerThreadName(uint32_t idThread, const char *pszName);
 DECLINLINE(void) rtThreadWinSetThreadName(PRTTHREADINT pThread, DWORD idThread);
@@ -348 +349 @@
  * Wrapper which unpacks the param stuff and calls thread function.
  */
+#ifndef IPRT_NO_CRT
 static unsigned __stdcall rtThreadNativeMain(void *pvArgs) RT_NOTHROW_DEF
+#else
+static DWORD __stdcall rtThreadNativeMain(void *pvArgs) RT_NOTHROW_DEF
+#endif
 {
     DWORD           dwThreadId = GetCurrentThreadId();
@@ -368 +373 @@
     TlsSetValue(g_dwSelfTLS, NULL);
     rtThreadNativeUninitComAndOle();
+#ifndef IPRT_NO_CRT
     _endthreadex(rc);
-    return rc;
+    return rc; /* not reached */
+#else
+    for (;;)
+        ExitThread(rc);
+#endif
 }
 
@@ -389 +399 @@
      */
     pThread->hThread = (uintptr_t)INVALID_HANDLE_VALUE;
+#ifndef IPRT_NO_CRT
     unsigned    uThreadId = 0;
-    uintptr_t   hThread   = _beginthreadex(NULL, cbStack, rtThreadNativeMain, pThread, 0, &uThreadId);
+    uintptr_t   hThread   = _beginthreadex(NULL /*pSecAttrs*/, cbStack, rtThreadNativeMain, pThread, 0 /*fFlags*/, &uThreadId);
     if (hThread != 0 && hThread != ~0U)
     {
@@ -398 +409 @@
     }
     return RTErrConvertFromErrno(errno);
+#else
+    DWORD  idThread = 0;
+    HANDLE hThread = CreateThread(NULL /*pSecAttrs*/, cbStack, rtThreadNativeMain, pThread, 0 /*fFlags*/, &idThread);
+    if (hThread != NULL)
+    {
+        pThread->hThread = (uintptr_t)hThread;
+        *pNativeThread = idThread;
+        return VINF_SUCCESS;
+    }
+    return RTErrConvertFromWin32(GetLastError());
+#endif
 }