Changeset 62013 in vbox for trunk

Timestamp:

Jul 4, 2016 3:54:28 PM (9 years ago)

Author:

vboxsync

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

108470

Message:

VBoxProxyStub.c: Include VBox/cdefs.h so VBOX_STRICT gets defined. Fixed fallout.

File:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (modified) (7 diffs)

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -31 +31 @@
 
 #include "VirtualBox.h"
+#include <VBox/cdefs.h>                 /* for VBOX_STRICT */
 #include <VBox/log.h>
 #include <iprt/alloca.h>
@@ -1702 +1703 @@
 DECLINLINE(bool) vbpsIsTypeLibIdToRemove(PRTUTF16 pwszTypeLibId)
 {
+    AssertCompile(RT_ELEMENTS(g_apwszTypeLibIds) == 2);
 #ifdef VBOX_STRICT
     static bool s_fDoneStrict = false;
@@ -1708 +1710 @@
     {
         Assert(RT_ELEMENTS(g_apwszTypeLibIds) == 2);
-        Assert(g_apwszTypeLibIds[0] == '{');
-        Assert(g_apwszTypeLibIds[1] == '{');
+        Assert(g_apwszTypeLibIds[0][0] == '{');
+        Assert(g_apwszTypeLibIds[1][0] == '{');
         Assert(RT_C_IS_XDIGIT(g_apwszTypeLibIds[0][1]));
         Assert(RT_C_IS_XDIGIT(g_apwszTypeLibIds[1][1]));
@@ -1717 +1719 @@
     }
 #endif
-    AssertCompile(RT_ELEMENTS(g_apwszTypeLibIds) == 2);
 
     /*
@@ -1753 +1754 @@
 DECLINLINE(bool) vbpsIsProxyStubClsIdToRemove(PRTUTF16 pwszProxyStubId)
 {
+    AssertCompile(RT_ELEMENTS(g_apwszProxyStubClsIds) == 2);
 #ifdef VBOX_STRICT
     static bool s_fDoneStrict = false;
@@ -1759 +1761 @@
     {
         Assert(RT_ELEMENTS(g_apwszProxyStubClsIds) == 2);
-        Assert(g_apwszProxyStubClsIds[0] == '{');
-        Assert(g_apwszProxyStubClsIds[1] == '{');
+        Assert(g_apwszProxyStubClsIds[0][0] == '{');
+        Assert(g_apwszProxyStubClsIds[1][0] == '{');
         Assert(RT_C_IS_XDIGIT(g_apwszProxyStubClsIds[0][1]));
         Assert(RT_C_IS_XDIGIT(g_apwszProxyStubClsIds[1][1]));
@@ -1768 +1770 @@
     }
 #endif
-    AssertCompile(RT_ELEMENTS(g_apwszProxyStubClsIds) == 2);
 
     /*