Index: trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp
===================================================================
--- trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp	(revision 8564)
+++ trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp	(revision 8565)
@@ -66,5 +66,5 @@
 *******************************************************************************/
 
-/** The control thread (main) handle. 
+/** The control thread (main) handle.
  * Only used to avoid some queue creation trouble. */
 static RTTHREAD g_ThreadCtrl = NIL_RTTHREAD;
@@ -91,8 +91,8 @@
 /** The timer id returned by WinStartTimer. */
 static ULONG g_idWorkerTimer = ~0UL;
-/** The state of the clipboard. 
+/** The state of the clipboard.
  * @remark I'm trying out the 'k' prefix from the mac here, bear with me.  */
 static enum
-{ 
+{
     /** The clipboard hasn't been initialized yet. */
     kClipboardState_Uninitialized = 0,
@@ -101,5 +101,5 @@
     /** We're monitoring the clipboard as a viewer. */
     kClipboardState_Viewer,
-    /** We're monitoring the clipboard using polling. 
+    /** We're monitoring the clipboard using polling.
      * This usually means something is wrong... */
     kClipboardState_Polling,
@@ -112,7 +112,7 @@
 static bool g_fEmptyClipboard = false;
 
-/** A clipboard format atom for the dummy clipboard data we insert 
- * watching for clipboard changes. If this format is found on the 
- * clipboard, the empty clipboard function has not been called 
+/** A clipboard format atom for the dummy clipboard data we insert
+ * watching for clipboard changes. If this format is found on the
+ * clipboard, the empty clipboard function has not been called
  * since we last polled it. */
 static ATOM g_atomNothingChanged = 0;
@@ -157,5 +157,5 @@
 
     /*
-     * Since we have to send shutdown messages and such from the 
+     * Since we have to send shutdown messages and such from the
      * service controller (main) thread, create a HAB and HMQ for it.
      */
@@ -193,8 +193,8 @@
                     g_atomOdin32UnicodeText = WinFindAtom(WinQuerySystemAtomTable(), SZFMT_ODIN32_UNICODETEXT);
                 if (g_atomOdin32UnicodeText == 0)
-                    VBoxServiceError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n", 
+                    VBoxServiceError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n",
                                      lLastError, WinGetLastError(g_habCtrl));
 
-                VBoxServiceVerbose(2, "g_u32ClientId=%RX32 g_atomNothingChanged=%#x g_atomOdin32UnicodeText=%#x\n", 
+                VBoxServiceVerbose(2, "g_u32ClientId=%RX32 g_atomNothingChanged=%#x g_atomOdin32UnicodeText=%#x\n",
                                    g_u32ClientId, g_atomNothingChanged, g_atomOdin32UnicodeText);
                 return VINF_SUCCESS;
@@ -204,5 +204,5 @@
         }
         else
-            VBoxServiceError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n", 
+            VBoxServiceError("WinAddAtom() failed, lasterr=%lx; WinFindAtom() failed, lasterror=%lx\n",
                              lLastError, WinGetLastError(g_habCtrl));
     }
@@ -237,5 +237,5 @@
         g_enmState = kClipboardState_Polling;
     if ((int)g_enmState != iOrgState)
-    { 
+    {
         if (g_enmState == kClipboardState_Viewer)
             VBoxServiceVerbose(3, "clipboard: viewer\n");
@@ -253,5 +253,5 @@
     /*
      * Open the clipboard and switch to 'destruction' mode.
-     * Make sure we stop being viewer. Temporarily also make sure we're 
+     * Make sure we stop being viewer. Temporarily also make sure we're
      * not the owner so that PM won't send us any WM_DESTROYCLIPBOARD message.
      */
@@ -259,7 +259,7 @@
     {
         if (g_enmState == kClipboardState_Viewer)
-            WinSetClipbrdViewer(g_habWorker, NULLHANDLE); 
+            WinSetClipbrdViewer(g_habWorker, NULLHANDLE);
         if (g_enmState == kClipboardState_Owner)
-            WinSetClipbrdOwner(g_habWorker, NULLHANDLE); 
+            WinSetClipbrdOwner(g_habWorker, NULLHANDLE);
 
         g_enmState = kClipboardState_Destroying;
@@ -343,8 +343,8 @@
 
     /*
-     * The Odin32 stuff is simple, we just assume windows data from the host 
+     * The Odin32 stuff is simple, we just assume windows data from the host
      * and all we need to do is add the header.
      */
-    if (    usFmt 
+    if (    usFmt
         &&  (   usFmt == g_atomOdin32UnicodeText
              /* || usFmt == ...*/
@@ -358,5 +358,5 @@
          *
          * Note that we probably should be using the current PM or DOS codepage
-         * here instead of the LC_CTYPE one which iconv uses by default. 
+         * here instead of the LC_CTYPE one which iconv uses by default.
          * -lazybird
          */
@@ -388,5 +388,5 @@
             VBoxServiceError("RTUtf16ToUtf8() -> %Rrc\n", rc);
     }
-    
+
     return pvPM;
 }
@@ -395,11 +395,11 @@
 /**
  * Tries to deliver an advertised host format.
- * 
+ *
  * @param   usFmt       The PM format name.
- * 
- * @remark  We must not try open the clipboard here because WM_RENDERFMT is a 
- *          request send synchronously by someone who has already opened the 
+ *
+ * @remark  We must not try open the clipboard here because WM_RENDERFMT is a
+ *          request send synchronously by someone who has already opened the
  *          clipboard. We would enter a deadlock trying to open it here.
- *          
+ *
  */
 static void VBoxServiceClipboardOS2RenderFormat(USHORT usFmt)
@@ -413,10 +413,10 @@
     if (    usFmt == CF_TEXT
         ||  usFmt == g_atomOdin32UnicodeText)
-        fFormat = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT; 
+        fFormat = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
     else /** @todo bitmaps */
         fFormat = 0;
     if (fFormat)
     {
-        /* 
+        /*
          * Query the data from the host.
          * This might require two iterations because of buffer guessing.
@@ -492,5 +492,5 @@
             PVOID pvPM;
             PCLIPHEADER pHdr = (PCLIPHEADER)WinQueryClipbrdData(g_habWorker, g_atomOdin32UnicodeText);
-            if (    pHdr 
+            if (    pHdr
                 &&  !memcmp(pHdr->achMagic, CLIPHEADER_MAGIC, sizeof(pHdr->achMagic)))
             {
@@ -548,5 +548,5 @@
     while ((ulFormat = WinEnumClipbrdFmts(g_habWorker, ulFormat)) != 0)
     {
-        if (    ulFormat == CF_TEXT 
+        if (    ulFormat == CF_TEXT
             ||  ulFormat == g_atomOdin32UnicodeText)
             fFormats |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
@@ -560,6 +560,6 @@
 /**
  * Poll the clipboard for changes.
- * 
- * This is called both when we're the viewer and when we're 
+ *
+ * This is called both when we're the viewer and when we're
  * falling back to polling. If something has changed it will
  * notify the host.
@@ -580,5 +580,5 @@
                 g_fEmptyClipboard = false;
                 VBoxServiceClipboardOS2ReportFormats();
-    
+
                 /* inject the dummy */
                 PVOID pv;
@@ -632,7 +632,7 @@
 /**
  * The window procedure for the object window.
- * 
+ *
  * @returns Message result.
- * 
+ *
  * @param   hwnd    The window handle.
  * @param   msg     The message.
@@ -665,7 +665,7 @@
             break;
 
-        /* 
+        /*
          * Clipboard viewer message - the content has been changed.
-         * This is sent *after* releasing the clipboard sem 
+         * This is sent *after* releasing the clipboard sem
          * and during the WinSetClipbrdViewer call.
          */
@@ -673,9 +673,9 @@
             if (g_enmState == kClipboardState_SettingViewer)
                 break;
-            AssertMsgBreak(g_enmState == kClipboardState_Viewer, ("g_enmState=%d\n", g_enmState), );
+            AssertMsgBreakVoid(g_enmState == kClipboardState_Viewer, ("g_enmState=%d\n", g_enmState));
             VBoxServiceClipboardOS2Poll();
             break;
 
-        /* 
+        /*
          * Clipboard owner message - the content was replaced.
          * This is sent by someone with an open clipboard, so don't try open it now.
@@ -684,5 +684,5 @@
             if (g_enmState == kClipboardState_Destroying)
                 break; /* it's us doing the replacing, ignore. */
-            AssertMsgBreak(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState), );
+            AssertMsgBreakVoid(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
             VBoxServiceClipboardOS2Destroyed();
             break;
@@ -693,14 +693,14 @@
          */
         case WM_RENDERFMT:
-            AssertMsgBreak(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState), );
+            AssertMsgBreakVoid(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
             VBoxServiceClipboardOS2RenderFormat(SHORT1FROMMP(mp1));
             break;
 
         /*
-         * Clipboard owner message - we're about to quit and should render all formats. 
+         * Clipboard owner message - we're about to quit and should render all formats.
          *
-         * However, because we're lazy, we'll just ASSUME that since we're quitting 
-         * we're probably about to shutdown or something and there is no point in 
-         * doing anything here except for emptying the clipboard and removing 
+         * However, because we're lazy, we'll just ASSUME that since we're quitting
+         * we're probably about to shutdown or something and there is no point in
+         * doing anything here except for emptying the clipboard and removing
          * ourselves as owner. Any failures at this point are silently ignored.
          */
@@ -730,5 +730,5 @@
 
         /*
-         * This is just a fallback polling strategy in case some other 
+         * This is just a fallback polling strategy in case some other
          * app is trying to view the clipboard too. We also use this
          * to try recover from errors.
@@ -740,5 +740,5 @@
          */
         case WM_TIMER:
-            if (    g_enmState != kClipboardState_Viewer 
+            if (    g_enmState != kClipboardState_Viewer
                 &&  g_enmState != kClipboardState_Polling)
                 break;
@@ -758,5 +758,5 @@
 
 
-        /* 
+        /*
          * Clipboard owner messages dealing with owner drawn content.
          * We shouldn't be seeing any of these.
@@ -771,5 +771,5 @@
         /*
          * We shouldn't be seeing any other messages according to the docs.
-         * But for whatever reason, PM sends us a WM_ADJUSTWINDOWPOS message 
+         * But for whatever reason, PM sends us a WM_ADJUSTWINDOWPOS message
          * during WinCreateWindow. So, ignore that and assert on anything else.
          */
@@ -785,12 +785,12 @@
 /**
  * The listener thread.
- * 
- * This thread is dedicated to listening for host messages and forwarding 
+ *
+ * This thread is dedicated to listening for host messages and forwarding
  * these to the worker thread (using PM).
- * 
+ *
  * The thread will set g_fListenerOkay and signal its user event when it has
  * completed initialization. In the case of init failure g_fListenerOkay will
  * not be set.
- * 
+ *
  * @returns Init error code or VINF_SUCCESS.
  * @param   ThreadSelf  Our thread handle.
@@ -827,27 +827,27 @@
                 rc = VbglR3ClipboardGetHostMsg(g_u32ClientId, &Msg, &fFormats);
                 if (RT_SUCCESS(rc))
-                {                          
+                {
                     VBoxServiceVerbose(3, "VBoxServiceClipboardOS2Listener: Msg=%#x  fFormats=%#x\n", Msg, fFormats);
                     switch (Msg)
                     {
-                        /* 
-                         * The host has announced available clipboard formats. 
+                        /*
+                         * The host has announced available clipboard formats.
                          * Forward the information to the window, so it can later
                          * respond do WM_RENDERFORMAT message.
                          */
                         case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS:
-                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS, 
+                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS,
                                             MPFROMLONG(fFormats), 0))
-                                VBoxServiceError("WinPostMsg(%lx, FORMATS,,) failed, lasterr=%#lx\n", 
+                                VBoxServiceError("WinPostMsg(%lx, FORMATS,,) failed, lasterr=%#lx\n",
                                                  g_hwndWorker, WinGetLastError(g_habListener));
                             break;
 
-                        /* 
+                        /*
                          * The host needs data in the specified format.
                          */
                         case VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
-                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA, 
+                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA,
                                             MPFROMLONG(fFormats), 0))
-                                VBoxServiceError("WinPostMsg(%lx, READ_DATA,,) failed, lasterr=%#lx\n", 
+                                VBoxServiceError("WinPostMsg(%lx, READ_DATA,,) failed, lasterr=%#lx\n",
                                                  g_hwndWorker, WinGetLastError(g_habListener));
                             break;
@@ -918,5 +918,5 @@
                 if (g_hwndWorker != NULLHANDLE)
                 {
-                    VBoxServiceVerbose(3, "g_hwndWorker=%#lx g_habWorker=%#lx g_hmqWorker=%#lx\n", g_hwndWorker, g_habWorker, g_hmqWorker); 
+                    VBoxServiceVerbose(3, "g_hwndWorker=%#lx g_habWorker=%#lx g_hmqWorker=%#lx\n", g_hwndWorker, g_habWorker, g_hmqWorker);
 
                     /*
@@ -935,5 +935,5 @@
                         {
                             /*
-                             * Tell the control thread that it can continue 
+                             * Tell the control thread that it can continue
                              * spawning services.
                              */
@@ -1014,5 +1014,5 @@
  * The OS/2 'clipboard' service description.
  */
-VBOXSERVICE g_Clipboard = 
+VBOXSERVICE g_Clipboard =
 {
     /* pszName. */
Index: trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp
===================================================================
--- trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp	(revision 8564)
+++ trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp	(revision 8565)
@@ -618,13 +618,13 @@
     {
         /* Check arguments. */
-        AssertMsgBreak(cEntriesAlloc,
-                       ("cEntriesAlloc=%u\n", cEntriesAlloc),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(VALID_PTR(pEntries),
-                       ("pEntries=%#p\n", pEntries),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(VALID_PTR(pcEntriesUsed),
-                       ("pcEntriesUsed=%#p\n", pcEntriesUsed),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(cEntriesAlloc,
+                           ("cEntriesAlloc=%u\n", cEntriesAlloc),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pEntries),
+                           ("pEntries=%#p\n", pEntries),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pcEntriesUsed),
+                           ("pcEntriesUsed=%#p\n", pcEntriesUsed),
+                           rc = VERR_INVALID_PARAMETER);
 
         /* First enumerate static backends. */
@@ -773,10 +773,10 @@
     {
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pfnError),
-                       ("pfnError=%#p\n", pfnError),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(VALID_PTR(ppDisk),
-                       ("ppDisk=%#p\n", ppDisk),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pfnError),
+                           ("pfnError=%#p\n", pfnError),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(ppDisk),
+                           ("ppDisk=%#p\n", ppDisk),
+                           rc = VERR_INVALID_PARAMETER);
 
         pDisk = (PVBOXHDD)RTMemAllocZ(sizeof(VBOXHDD));
@@ -854,10 +854,10 @@
     {
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pszFilename) && *pszFilename,
-                       ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(VALID_PTR(ppszFormat),
-                       ("ppszFormat=%#p\n", ppszFormat),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszFilename) && *pszFilename,
+                           ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(ppszFormat),
+                           ("ppszFormat=%#p\n", ppszFormat),
+                           rc = VERR_INVALID_PARAMETER);
 
         /* First check if static backends support this file format. */
@@ -1037,13 +1037,13 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pszBackend) && *pszBackend,
-                       ("pszBackend=%#p \"%s\"\n", pszBackend, pszBackend),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(VALID_PTR(pszFilename) && *pszFilename,
-                       ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
-                       ("uOpenFlags=%#x\n", uOpenFlags),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszBackend) && *pszBackend,
+                           ("pszBackend=%#p \"%s\"\n", pszBackend, pszBackend),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszFilename) && *pszFilename,
+                           ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
+                           ("uOpenFlags=%#x\n", uOpenFlags),
+                           rc = VERR_INVALID_PARAMETER);
 
         /* Force readonly for images without base/diff consistency checking. */
@@ -1251,45 +1251,45 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pszBackend) && *pszBackend,
-                       ("pszBackend=%#p \"%s\"\n", pszBackend, pszBackend),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(VALID_PTR(pszFilename) && *pszFilename,
-                       ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(enmType == VD_IMAGE_TYPE_NORMAL || enmType == VD_IMAGE_TYPE_FIXED,
-                       ("enmType=%#x\n", enmType),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(cbSize,
-                       ("cbSize=%llu\n", cbSize),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak((uImageFlags & ~VD_IMAGE_FLAGS_MASK) == 0,
-                       ("uImageFlags=%#x\n", uImageFlags),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszBackend) && *pszBackend,
+                           ("pszBackend=%#p \"%s\"\n", pszBackend, pszBackend),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszFilename) && *pszFilename,
+                           ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(enmType == VD_IMAGE_TYPE_NORMAL || enmType == VD_IMAGE_TYPE_FIXED,
+                           ("enmType=%#x\n", enmType),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(cbSize,
+                           ("cbSize=%llu\n", cbSize),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt((uImageFlags & ~VD_IMAGE_FLAGS_MASK) == 0,
+                           ("uImageFlags=%#x\n", uImageFlags),
+                           rc = VERR_INVALID_PARAMETER);
         /* The PCHS geometry fields may be 0 to leave it for later. */
-        AssertMsgBreak(   VALID_PTR(pPCHSGeometry)
-                       && pPCHSGeometry->cCylinders <= 16383
-                       && pPCHSGeometry->cHeads <= 16
-                       && pPCHSGeometry->cSectors <= 63,
-                       ("pPCHSGeometry=%#p PCHS=%u/%u/%u\n", pPCHSGeometry,
-                        pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads,
-                        pPCHSGeometry->cSectors),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(   VALID_PTR(pPCHSGeometry)
+                           && pPCHSGeometry->cCylinders <= 16383
+                           && pPCHSGeometry->cHeads <= 16
+                           && pPCHSGeometry->cSectors <= 63,
+                           ("pPCHSGeometry=%#p PCHS=%u/%u/%u\n", pPCHSGeometry,
+                            pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads,
+                            pPCHSGeometry->cSectors),
+                           rc = VERR_INVALID_PARAMETER);
         /* The LCHS geometry fields may be 0 to leave it to later autodetection. */
-        AssertMsgBreak(   VALID_PTR(pLCHSGeometry)
-                       && pLCHSGeometry->cCylinders <= 1024
-                       && pLCHSGeometry->cHeads <= 255
-                       && pLCHSGeometry->cSectors <= 63,
-                       ("pLCHSGeometry=%#p LCHS=%u/%u/%u\n", pLCHSGeometry,
-                        pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads,
-                        pLCHSGeometry->cSectors),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
-                       ("uOpenFlags=%#x\n", uOpenFlags),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(   VALID_PTR(pLCHSGeometry)
+                           && pLCHSGeometry->cCylinders <= 1024
+                           && pLCHSGeometry->cHeads <= 255
+                           && pLCHSGeometry->cSectors <= 63,
+                           ("pLCHSGeometry=%#p LCHS=%u/%u/%u\n", pLCHSGeometry,
+                            pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads,
+                            pLCHSGeometry->cSectors),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
+                           ("uOpenFlags=%#x\n", uOpenFlags),
+                           rc = VERR_INVALID_PARAMETER);
 
         /* Check state. */
-        AssertMsgBreak(pDisk->cImages == 0,
-                       ("Create base image cannot be done with other images open\n"),
-                       rc = VERR_VDI_INVALID_STATE);
+        AssertMsgBreakStmt(pDisk->cImages == 0,
+                           ("Create base image cannot be done with other images open\n"),
+                           rc = VERR_VDI_INVALID_STATE);
 
         /* Set up image descriptor. */
@@ -1444,21 +1444,21 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pszBackend) && *pszBackend,
-                       ("pszBackend=%#p \"%s\"\n", pszBackend, pszBackend),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(VALID_PTR(pszFilename) && *pszFilename,
-                       ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak((uImageFlags & ~VD_IMAGE_FLAGS_MASK) == 0,
-                       ("uImageFlags=%#x\n", uImageFlags),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
-                       ("uOpenFlags=%#x\n", uOpenFlags),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszBackend) && *pszBackend,
+                           ("pszBackend=%#p \"%s\"\n", pszBackend, pszBackend),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszFilename) && *pszFilename,
+                           ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt((uImageFlags & ~VD_IMAGE_FLAGS_MASK) == 0,
+                           ("uImageFlags=%#x\n", uImageFlags),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
+                           ("uOpenFlags=%#x\n", uOpenFlags),
+                           rc = VERR_INVALID_PARAMETER);
 
         /* Check state. */
-        AssertMsgBreak(pDisk->cImages != 0,
-                       ("Create diff image cannot be done without other images open\n"),
-                       rc = VERR_VDI_INVALID_STATE);
+        AssertMsgBreakStmt(pDisk->cImages != 0,
+                           ("Create diff image cannot be done without other images open\n"),
+                           rc = VERR_VDI_INVALID_STATE);
 
         /* Set up image descriptor. */
@@ -1822,6 +1822,6 @@
     do {
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pDiskFrom), ("pDiskFrom=%#p\n", pDiskFrom),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pDiskFrom), ("pDiskFrom=%#p\n", pDiskFrom),
+                           rc = VERR_INVALID_PARAMETER);
         AssertMsg(pDiskFrom->u32Signature == VBOXHDDDISK_SIGNATURE,
                   ("u32Signature=%08x\n", pDiskFrom->u32Signature));
@@ -1829,6 +1829,6 @@
         PVDIMAGE pImageFrom = vdGetImageByNumber(pDiskFrom, nImage);
         AssertBreak(VALID_PTR(pImageFrom), rc = VERR_VDI_IMAGE_NOT_FOUND);
-        AssertMsgBreak(VALID_PTR(pDiskTo), ("pDiskTo=%#p\n", pDiskTo),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pDiskTo), ("pDiskTo=%#p\n", pDiskTo),
+                           rc = VERR_INVALID_PARAMETER);
         AssertMsg(pDiskTo->u32Signature == VBOXHDDDISK_SIGNATURE,
                   ("u32Signature=%08x\n", pDiskTo->u32Signature));
@@ -1887,7 +1887,7 @@
 
         /* If fMoveByRename is set pszFilename is allowed to be NULL, so do the parameter check here. */
-        AssertMsgBreak(VALID_PTR(pszFilename) && *pszFilename,
-                       ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszFilename) && *pszFilename,
+                           ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
+                           rc = VERR_INVALID_PARAMETER);
 
         /* Collect properties of source image. */
@@ -2193,14 +2193,14 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pvBuf),
-                       ("pvBuf=%#p\n", pvBuf),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(cbRead,
-                       ("cbRead=%zu\n", cbRead),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(uOffset + cbRead <= pDisk->cbSize,
-                       ("uOffset=%llu cbRead=%zu pDisk->cbSize=%llu\n",
-                        uOffset, cbRead, pDisk->cbSize),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pvBuf),
+                           ("pvBuf=%#p\n", pvBuf),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(cbRead,
+                           ("cbRead=%zu\n", cbRead),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(uOffset + cbRead <= pDisk->cbSize,
+                           ("uOffset=%llu cbRead=%zu pDisk->cbSize=%llu\n",
+                            uOffset, cbRead, pDisk->cbSize),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = pDisk->pLast;
@@ -2238,14 +2238,14 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pvBuf),
-                       ("pvBuf=%#p\n", pvBuf),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(cbWrite,
-                       ("cbWrite=%zu\n", cbWrite),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(uOffset + cbWrite <= pDisk->cbSize,
-                       ("uOffset=%llu cbWrite=%zu pDisk->cbSize=%llu\n",
-                        uOffset, cbWrite, pDisk->cbSize),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pvBuf),
+                           ("pvBuf=%#p\n", pvBuf),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(cbWrite,
+                           ("cbWrite=%zu\n", cbWrite),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(uOffset + cbWrite <= pDisk->cbSize,
+                           ("uOffset=%llu cbWrite=%zu pDisk->cbSize=%llu\n",
+                            uOffset, cbWrite, pDisk->cbSize),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = pDisk->pLast;
@@ -2423,7 +2423,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pPCHSGeometry),
-                       ("pPCHSGeometry=%#p\n", pPCHSGeometry),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pPCHSGeometry),
+                           ("pPCHSGeometry=%#p\n", pPCHSGeometry),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2476,12 +2476,12 @@
 
         /* Check arguments. */
-        AssertMsgBreak(   VALID_PTR(pPCHSGeometry)
-                       && pPCHSGeometry->cCylinders <= 16383
-                       && pPCHSGeometry->cHeads <= 16
-                       && pPCHSGeometry->cSectors <= 63,
-                       ("pPCHSGeometry=%#p PCHS=%u/%u/%u\n", pPCHSGeometry,
-                        pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads,
-                        pPCHSGeometry->cSectors),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(   VALID_PTR(pPCHSGeometry)
+                           && pPCHSGeometry->cCylinders <= 16383
+                           && pPCHSGeometry->cHeads <= 16
+                           && pPCHSGeometry->cSectors <= 63,
+                           ("pPCHSGeometry=%#p PCHS=%u/%u/%u\n", pPCHSGeometry,
+                            pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads,
+                            pPCHSGeometry->cSectors),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2569,7 +2569,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pLCHSGeometry),
-                       ("pLCHSGeometry=%#p\n", pLCHSGeometry),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pLCHSGeometry),
+                           ("pLCHSGeometry=%#p\n", pLCHSGeometry),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2622,12 +2622,12 @@
 
         /* Check arguments. */
-        AssertMsgBreak(   VALID_PTR(pLCHSGeometry)
-                       && pLCHSGeometry->cCylinders <= 1024
-                       && pLCHSGeometry->cHeads <= 255
-                       && pLCHSGeometry->cSectors <= 63,
-                       ("pLCHSGeometry=%#p LCHS=%u/%u/%u\n", pLCHSGeometry,
-                        pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads,
-                        pLCHSGeometry->cSectors),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(   VALID_PTR(pLCHSGeometry)
+                           && pLCHSGeometry->cCylinders <= 1024
+                           && pLCHSGeometry->cHeads <= 255
+                           && pLCHSGeometry->cSectors <= 63,
+                           ("pLCHSGeometry=%#p LCHS=%u/%u/%u\n", pLCHSGeometry,
+                            pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads,
+                            pLCHSGeometry->cSectors),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2714,7 +2714,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(puVersion),
-                       ("puVersion=%#p\n", puVersion),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(puVersion),
+                           ("puVersion=%#p\n", puVersion),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2751,7 +2751,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(penmType),
-                       ("penmType=%#p\n", penmType),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(penmType),
+                           ("penmType=%#p\n", penmType),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2789,7 +2789,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(puImageFlags),
-                       ("puImageFlags=%#p\n", puImageFlags),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(puImageFlags),
+                           ("puImageFlags=%#p\n", puImageFlags),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2826,7 +2826,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(puOpenFlags),
-                       ("puOpenFlags=%#p\n", puOpenFlags),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(puOpenFlags),
+                           ("puOpenFlags=%#p\n", puOpenFlags),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2864,7 +2864,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
-                       ("uOpenFlags=%#x\n", uOpenFlags),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
+                           ("uOpenFlags=%#x\n", uOpenFlags),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2906,10 +2906,10 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pszFilename) && *pszFilename,
-                       ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(cbFilename,
-                       ("cbFilename=%u\n", cbFilename),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszFilename) && *pszFilename,
+                           ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(cbFilename,
+                           ("cbFilename=%u\n", cbFilename),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -2959,10 +2959,10 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pszComment),
-                       ("pszComment=%#p \"%s\"\n", pszComment, pszComment),
-                       rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreak(cbComment,
-                       ("cbComment=%u\n", cbComment),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszComment),
+                           ("pszComment=%#p \"%s\"\n", pszComment, pszComment),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(cbComment,
+                           ("cbComment=%u\n", cbComment),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -3000,7 +3000,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pszComment) || pszComment == NULL,
-                       ("pszComment=%#p \"%s\"\n", pszComment, pszComment),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pszComment) || pszComment == NULL,
+                           ("pszComment=%#p \"%s\"\n", pszComment, pszComment),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -3036,7 +3036,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pUuid),
-                       ("pUuid=%#p\n", pUuid),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pUuid),
+                           ("pUuid=%#p\n", pUuid),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -3071,7 +3071,7 @@
         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
 
-        AssertMsgBreak(VALID_PTR(pUuid) || pUuid == NULL,
-                       ("pUuid=%#p\n", pUuid),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pUuid) || pUuid == NULL,
+                           ("pUuid=%#p\n", pUuid),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -3112,7 +3112,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pUuid),
-                       ("pUuid=%#p\n", pUuid),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pUuid),
+                           ("pUuid=%#p\n", pUuid),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -3149,7 +3149,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pUuid) || pUuid == NULL,
-                       ("pUuid=%#p\n", pUuid),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pUuid) || pUuid == NULL,
+                           ("pUuid=%#p\n", pUuid),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -3192,7 +3192,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pUuid),
-                       ("pUuid=%#p\n", pUuid),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pUuid),
+                           ("pUuid=%#p\n", pUuid),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -3228,7 +3228,7 @@
 
         /* Check arguments. */
-        AssertMsgBreak(VALID_PTR(pUuid) || pUuid == NULL,
-                       ("pUuid=%#p\n", pUuid),
-                       rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(VALID_PTR(pUuid) || pUuid == NULL,
+                           ("pUuid=%#p\n", pUuid),
+                           rc = VERR_INVALID_PARAMETER);
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
