Resolve Linux Warning & Improve Windows Debugging

Author: HTRamsey

src/Utilities/QGCLogging.cc

@@ -28,13 +28,39 @@ QGC_LOGGING_CATEGORY(QGCLoggingLog, "qgc.utilities.qgclogging")
 
 /// CRT Report Hook installed using _CrtSetReportHook. We install this hook when
 /// we don't want asserts to pop a dialog on windows.
-static int WindowsCrtReportHook(int reportType, char *message, int *returnValue)
+static int __cdecl WindowsCrtReportHook(int reportType, char *message, int *returnValue)
 {
-    Q_UNUSED(reportType);
+    int nRet = FALSE;
 
-    std::cerr << message << std::endl;  // Output message to stderr
-    *returnValue = 0;                   // Don't break into debugger
-    return true;                        // We handled this fully ourselves
+    printf("CRT report hook 1.\n");
+    printf("CRT report type is \"");
+
+    switch (reportType) {
+        case _CRT_ASSERT:
+            printf("_CRT_ASSERT");
+            // nRet = TRUE;   // Always stop for this type of report
+            break;
+        case _CRT_WARN:
+            printf("_CRT_WARN");
+            break;
+        case _CRT_ERROR:
+            printf("_CRT_ERROR");
+            break;
+        default:
+            printf("???Unknown???");
+            break;
+    }
+
+    printf("\".\nCRT report message is:\n\t");
+    printf("%s", message);
+
+    std::cerr << message << std::endl;
+
+    if (returnValue) {
+        *returnValue = 0;
+    }
+
+    return nRet;
 }
 
 #endif

src/Utilities/SignalHandler.cc

@@ -50,7 +50,9 @@ void SignalHandler::_onSigInt()
 {
     _notifierInt->setEnabled(false);
     char b;
-    (void) ::read(sigIntFd[1], &b, sizeof(b));
+    if (::read(sigIntFd[1], &b, sizeof(b)) == -1) {
+        qCWarning(SignalHandlerLog) << "Failed to read from SIGINT socketpair:" << strerror(errno);
+    }
 
     _sigIntCount++;
 
@@ -74,7 +76,9 @@ void SignalHandler::_onSigTerm()
 {
     _notifierTerm->setEnabled(false);
     char b;
-    (void) ::read(sigTermFd[1], &b, sizeof(b));
+    if (::read(sigTermFd[1], &b, sizeof(b)) == -1) {
+        qCWarning(SignalHandlerLog) << "Failed to read from SIGTERM socketpair:" << strerror(errno);
+    }
 
     qCDebug(SignalHandlerLog) << "Caught SIGTERM—shutting down gracefully";
     if (qgcApp() && qgcApp()->mainRootWindow()) {
@@ -91,15 +95,19 @@ void SignalHandler::intSignalHandler(int signum)
     Q_ASSERT(signum == SIGINT);
 
     char b = 1;
-    (void) ::write(sigIntFd[0], &b, sizeof(b));
+    if (::write(sigIntFd[0], &b, sizeof(b)) == -1) {
+        qCWarning(SignalHandlerLog) << "Failed to write to SIGINT socketpair:" << strerror(errno);
+    }
 }
 
 void SignalHandler::termSignalHandler(int signum)
 {
     Q_ASSERT(signum == SIGTERM);
 
     char b = 1;
-    (void) ::write(sigTermFd[0], &b, sizeof(b));
+    if (::write(sigTermFd[0], &b, sizeof(b)) == -1) {
+        qCWarning(SignalHandlerLog) << "Failed to write to SIGTERM socketpair:" << strerror(errno);
+    }
 }
 
 int SignalHandler::setupSignalHandlers()

src/main.cc

@@ -153,6 +153,9 @@ int main(int argc, char *argv[])
         // Don't pop up Windows Error Reporting dialog when app crashes.
         const DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
         SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX);
+        (void) _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+        (void) _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG);
+        (void) _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
     }
 #endif
 #endif // Q_OS_WIN