VirtualBox

Timestamp:

Jul 1, 2014 6:14:02 PM (10 years ago)

Author:

vboxsync

Message:

Merged in iprt++ dev branch.

Location:

trunk

Files:

trunk
- Property svn:mergeinfo changed
  /branches/bird/hardenedwindows (added) merged: 92692-94610
trunk/src/VBox
- Property svn:mergeinfo changed
  /branches/bird/hardenedwindows/src/VBox (added) merged: 92692-94610
trunk/src/VBox/Frontends
- Property svn:mergeinfo changed
  /branches/bird/hardenedwindows/src/VBox/Frontends (added) merged: 92692-94610

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

r51649	r51770
57	57	VirtualBoxHardened_NAME = VirtualBox
58	58	VirtualBoxHardened_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
	59	VirtualBoxHardened_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
59	60
60	61

-              r51679
+              r51770
     /* Prepare the error-message: */
     QString strTitle = QApplication::tr("VirtualBox - Error In %1").arg(pszWhere);
+    char msgBuf[1024];
+    vsprintf(msgBuf, pszMsgFmt, va);
+    QString strText = QApplication::tr("<html><b>%1 (rc=%2)</b><br/><br/>").arg(msgBuf).arg(rc);
+    char szMsgBuf[1024];
+    RTStrPrintfV(szMsgBuf, sizeof(szMsgBuf), pszMsgFmt, va);
+    QString strText = QApplication::tr("<html><b>%1 (rc=%2)</b><br/><br/>").arg(szMsgBuf).arg(rc);
     switch (enmWhat)
+    {
 …
 # ifdef RT_OS_LINUX
         case kSupInitOp_IPRT:
+        case kSupInitOp_Misc:
             if (rc == VERR_NO_MEMORY)
                 strText += g_QStrHintLinuxNoMemory;
 …
             break;
+    }
     strText += "</html>";

Note: See TracChangeset for help on using the changeset viewer.