Changeset 38740 in vbox

Timestamp:

Sep 13, 2011 2:38:35 PM (13 years ago)

Author:

vboxsync

Message:

Another Assert redefinition bites the dust.

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (8 diffs)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -49 +49 @@
 
 #ifdef DEBUG
-# define Assert(_expr) assert(_expr)
+# define NonStandardAssert(_expr) assert(_expr)
 #else
-# define Assert(_expr) do{ }while(0)
+# define NonStandardAssert(_expr) do{ }while(0)
 #endif
 
@@ -505 +505 @@
 static VOID netCfgLoggerEnable(MSIHANDLE hModule)
 {
-    Assert(hModule);
+    NonStandardAssert(hModule);
 
     if (g_hCurrentModule)
@@ -614 +614 @@
 
             UINT rTmp = MsiRecordSetStringW(hMsg, 2, lpszLockedBy);
-            Assert(rTmp == ERROR_SUCCESS);
+            NonStandardAssert(rTmp == ERROR_SUCCESS);
             if (rTmp != ERROR_SUCCESS)
             {
@@ -623 +623 @@
 
             MsgResult = MsiProcessMessage(hModule, (INSTALLMESSAGE)(INSTALLMESSAGE_USER | MB_RETRYCANCEL), hMsg);
-            Assert(MsgResult == IDRETRY || MsgResult == IDCANCEL);
+            NonStandardAssert(MsgResult == IDRETRY || MsgResult == IDCANCEL);
             LogStringW(hModule, TEXT("doNetCfgInit: MsiProcessMessage returned (0x%x)"), MsgResult);
         }
@@ -800 +800 @@
                 KEY_READ /*IN REGSAM  samDesired*/
                 );
-        Assert(hKey != INVALID_HANDLE_VALUE);
+        NonStandardAssert(hKey != INVALID_HANDLE_VALUE);
         if (hKey != INVALID_HANDLE_VALUE)
         {
@@ -812 +812 @@
               &cbGuid /*guid__inout_opt  LPDWORD lpcbData*/
             );
-            Assert(winEr == ERROR_SUCCESS);
+            NonStandardAssert(winEr == ERROR_SUCCESS);
             if (winEr == ERROR_SUCCESS)
             {
@@ -819 +819 @@
 
                 HRESULT hr = VBoxNetCfgWinGenHostonlyConnectionName (DevName, ConnectoinName, &cbName);
-                Assert(hr == S_OK);
+                NonStandardAssert(hr == S_OK);
                 if (SUCCEEDED(hr))
                 {
                     hr = VBoxNetCfgWinRenameConnection (guid, ConnectoinName);
-                    Assert(hr == S_OK);
+                    NonStandardAssert(hr == S_OK);
                 }
             }
@@ -831 +831 @@
     else
     {
-        Assert(0);
+        NonStandardAssert(0);
     }