Changeset 38738 in vbox

Timestamp:

Sep 13, 2011 2:31:50 PM (13 years ago)

Author:

vboxsync

Message:

Less Assert redefinition, adding RT_NO_STRICT to help.

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h (modified) (4 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp (modified) (21 diffs)

trunk/include/iprt/cdefs.h

@@ -80 +80 @@
 # define IN_RT_STATIC
 # define RT_STRICT
+# define RT_NO_STRICT
 # define RT_LOCK_STRICT
 # define RT_LOCK_NO_STRICT
@@ -2145 +2146 @@
 /** @def RT_STRICT
  * The \#define RT_STRICT controls whether or not assertions and other runtime
- * checks should be compiled in or not.
+ * checks should be compiled in or not.  This is defined when DEBUG is defined.
+ * If RT_NO_STRICT is defined, it will unconditionally be undefined.
  *
  * If you want assertions which are not subject to compile time options use
@@ -2152 +2154 @@
 #if !defined(RT_STRICT) && defined(DEBUG)
 # define RT_STRICT
+#endif
+#ifdef RT_NO_STRICT
+# undef RT_STRICT
 #endif
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h

@@ -4 +4 @@
  * Common header with configuration defines and global defs
  */
+
 /*
  * Copyright (C) 2011 Oracle Corporation
@@ -15 +16 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #ifndef ___VBoxNetFltCmn_win_h___
 #define ___VBoxNetFltCmn_win_h___
@@ -24 +26 @@
 //# define DEBUG_NETFLT_PACKETS
 # ifndef DEBUG_misha
-#  define DEBUG_NETFLT_NOASSERT
+#  define RT_NO_STRICT
 # endif
 /* # define DEBUG_NETFLT_LOOPBACK */
@@ -530 +532 @@
 #include "VBoxNetFltRt-win.h"
 #ifndef VBOXNETADP
-#include "VBoxNetFltP-win.h"
-#endif
-# include "VBoxNetFltM-win.h"
-
-#ifdef DEBUG_NETFLT_NOASSERT
-# ifdef Assert
-#  undef Assert
-# endif
-
-# define Assert(_expr) do {} while (0)
-#endif /* #ifdef DEBUG_NETFLT_NOASSERT */
+# include "VBoxNetFltP-win.h"
+#endif
+#include "VBoxNetFltM-win.h"
 
 #endif /* #ifndef ___VBoxNetFltCmn_win_h___ */

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp

@@ -25 +25 @@
 
 #ifdef DEBUG
-# define Assert(a) assert(a)
-# define AssertBreakpoint() assert(0)
-
+# define NonStandardAssert(a) assert(a)
+# define NonStandardAssertBreakpoint() assert(0)
 #else
-# define Assert(a) do{}while (0)
-# define AssertBreakpoint() do{}while (0)
-
+# define NonStandardAssert(a) do{}while (0)
+# define NonStandardAssertBreakpoint() do{}while (0)
 #endif
 
@@ -65 +63 @@
     cleanup();
 
-    Assert(pNetCfg);
-    Assert(pNetCfgComponent);
+    NonStandardAssert(pNetCfg);
+    NonStandardAssert(pNetCfgComponent);
     if (pNetCfg)
     {
@@ -122 +120 @@
         {
             hr = HRESULT_FROM_WIN32(winEr);
-            AssertBreakpoint();
+            NonStandardAssertBreakpoint();
         }
 
@@ -129 +127 @@
     else
     {
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }
 
@@ -163 +161 @@
         {
             hr = HRESULT_FROM_WIN32(winEr);
-            AssertBreakpoint();
+            NonStandardAssertBreakpoint();
         }
     }
@@ -169 +167 @@
     {
         hr = HRESULT_FROM_WIN32(winEr);
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }
 
@@ -184 +182 @@
         if (hr != S_OK)
         {
-            AssertBreakpoint();
+            NonStandardAssertBreakpoint();
         }
         RegCloseKey(InstanceKey);
@@ -190 +188 @@
     else
     {
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }
 
@@ -215 +213 @@
     else
     {
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }
 
@@ -267 +265 @@
                     else
                     {
-                        AssertBreakpoint();
+                        NonStandardAssertBreakpoint();
                         *pbShouldBind = true;
                     }
@@ -274 +272 @@
                 {
                     /* TODO: we should check the default medium in HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}\<driver_id>\Ndi\Params\Medium, REG_SZ "Default" value */
-                    AssertBreakpoint();
+                    NonStandardAssertBreakpoint();
                     *pbShouldBind = true;
                 }
@@ -282 +280 @@
             else
             {
-                AssertBreakpoint();
+                NonStandardAssertBreakpoint();
             }
         }
@@ -293 +291 @@
     else
     {
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }
 
@@ -337 +335 @@
                 /* do not set err status to it */
                 *pbShouldBind = false;
-                AssertBreakpoint();
+                NonStandardAssertBreakpoint();
             }
 
@@ -345 +343 @@
         {
             hr = HRESULT_FROM_WIN32(winEr);
-            AssertBreakpoint();
+            NonStandardAssertBreakpoint();
         }
 
@@ -352 +350 @@
     else
     {
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }
 
@@ -369 +367 @@
         if (hr != S_OK)
         {
-            AssertBreakpoint();
+            NonStandardAssertBreakpoint();
             break;
         }
@@ -443 +441 @@
     else
     {
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }
 
@@ -490 +488 @@
                 else
                 {
-                    AssertBreakpoint();
+                    NonStandardAssertBreakpoint();
                     /* break on falure */
                     break;
@@ -498 +496 @@
         else
         {
-            AssertBreakpoint();
+            NonStandardAssertBreakpoint();
         }
 
@@ -505 +503 @@
     else
     {
-        AssertBreakpoint();
+        NonStandardAssertBreakpoint();
     }