Changeset 51770 in vbox for trunk/src/VBox/Runtime/win

Timestamp:

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

Author:

vboxsync

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

94611

Message:

Merged in iprt++ dev branch.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Runtime/win/RTErrConvertFromWin32.cpp (modified) (1 diff)
• src/VBox/Runtime/win/errmsgwin.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp

@@ -413 +413 @@
         case ERROR_NOT_A_REPARSE_POINT: return VERR_NOT_SYMLINK;
 
+        case NTE_BAD_ALGID:         return VERR_CR_PKIX_UNKNOWN_DIGEST_TYPE;
     }
 

trunk/src/VBox/Runtime/win/errmsgwin.cpp

@@ -44 +44 @@
 static const RTWINERRMSG  g_aStatusMsgs[] =
 {
-#include "errmsgcomdata.h"
-#if defined(VBOX) && !defined(IN_GUEST)
-# include "errmsgvboxcomdata.h"
+#ifndef IPRT_NO_ERROR_DATA
+# include "errmsgcomdata.h"
+# if defined(VBOX) && !defined(IN_GUEST)
+#  include "errmsgvboxcomdata.h"
+# endif
+#else
+    { "Success.", "ERROR_SUCCESS", 0 },
 #endif
     { NULL, NULL, 0 }
@@ -77 +81 @@
 {
     unsigned i;
-    for (i = 0; i < RT_ELEMENTS(g_aStatusMsgs); i++)
+    for (i = 0; i < RT_ELEMENTS(g_aStatusMsgs) - 1U; i++)
         if (g_aStatusMsgs[i].iCode == rc)
             return &g_aStatusMsgs[i];
@@ -86 +90 @@
      * actual value in case we pick the wrong entry. Better than always using
      * the "Unknown Status" case. */
-    for (i = 0; i < RT_ELEMENTS(g_aStatusMsgs); i++)
+    for (i = 0; i < RT_ELEMENTS(g_aStatusMsgs) - 1U; i++)
         if (g_aStatusMsgs[i].iCode == HRESULT_CODE(rc))
         {