Changeset 96472 in vbox for trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

Timestamp:

Aug 24, 2022 11:48:12 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153320

Message:

ValKit/vkat,Devices/Audio: Made vkat build in no-CRT mode. bugref:10261

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (4 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -63 +63 @@
 
 #ifdef RT_OS_WINDOWS
-# include <iprt/win/windows.h> /* for CoInitializeEx */
+# include <iprt/win/windows.h> /* for CoInitializeEx and SetConsoleCtrlHandler */
+#else
+# include <signal.h>
 #endif
-#include <signal.h>
 
 #include "vkatInternal.h"
@@ -1272 +1273 @@
  * Ctrl-C signal handler.
  *
- * This just sets g_fTerminate and hope it will be noticed soon.  It restores
- * the SIGINT action to default, so that a second Ctrl-C will have the normal
- * effect (just in case the code doesn't respond to g_fTerminate).
- */
+ * This just sets g_fTerminate and hope it will be noticed soon.
+ *
+ * On non-Windows it restores the SIGINT action to default, so that a second
+ * Ctrl-C will have the normal effect (just in case the code doesn't respond to
+ * g_fTerminate).
+ */
+#ifdef RT_OS_WINDOWS
+static BOOL CALLBACK audioTestConsoleCtrlHandler(DWORD dwCtrlType)
+{
+    if (dwCtrlType != CTRL_C_EVENT && dwCtrlType != CTRL_BREAK_EVENT)
+        return false;
+    RTPrintf(dwCtrlType == CTRL_C_EVENT ? "Ctrl-C!\n" : "Ctrl-Break!\n");
+
+    ASMAtomicWriteBool(&g_fTerminate, true);
+
+    return true;
+}
+#else
 static void audioTestSignalHandler(int iSig) RT_NOEXCEPT
 {
     Assert(iSig == SIGINT); RT_NOREF(iSig);
     RTPrintf("Ctrl-C!\n");
+
     ASMAtomicWriteBool(&g_fTerminate, true);
+
     signal(SIGINT, SIG_DFL);
 }
+#endif
 
 /**
  * Commands.
  */
-const VKATCMD *g_apCommands[] =
+static const VKATCMD * const g_apCommands[] =
 {
     &g_CmdTest,
@@ -1382 +1400 @@
     int rc = RTR3InitExe(argc, &argv, 0);
     if (RT_FAILURE(rc))
-    {
-        RTPrintf("RTR3InitExe() failed with %Rrc\n", rc);
         return RTMsgInitFailure(rc);
-    }
 
     /*
@@ -1509 +1524 @@
      */
 #ifdef RT_OS_WINDOWS
-    signal(SIGINT, audioTestSignalHandler);
+    SetConsoleCtrlHandler(audioTestConsoleCtrlHandler, TRUE);
 #else
     struct sigaction sa;