Changeset 13835 in vbox for trunk/src/VBox/Frontends/VBoxBFE
- Timestamp:
- Nov 5, 2008 2:34:43 AM (16 years ago)
- Location:
- trunk/src/VBox/Frontends/VBoxBFE
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp
r13782 r13835 380 380 int rcVBox = VMR3ReqCallVoid(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, 381 381 (PFNRT)VMDisplay::doInvalidateAndUpdate, 1, mpDrv); 382 if ( VBOX_SUCCESS(rcVBox))382 if (RT_SUCCESS(rcVBox)) 383 383 VMR3ReqFree(pReq); 384 384 385 if ( VBOX_FAILURE(rcVBox))385 if (RT_FAILURE(rcVBox)) 386 386 rc = E_FAIL; 387 387 … … 1258 1258 void *pv; 1259 1259 rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv); 1260 if ( VBOX_FAILURE(rc))1260 if (RT_FAILURE(rc)) 1261 1261 { 1262 1262 AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc)); -
trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp
r8155 r13835 131 131 static DECLCALLBACK(void) svcHlpCallComplete (VBOXHGCMCALLHANDLE callHandle, int32_t rc); 132 132 static DECLCALLBACK(void) svcHlpDisconnectClient (void *pvInstance, uint32_t u32ClientId); 133 133 134 134 public: 135 135 … … 312 312 rc = loadLibrary (m_pszSvcLibrary, &m_hLdrMod); 313 313 314 if ( VBOX_SUCCESS(rc))314 if (RT_SUCCESS(rc)) 315 315 { 316 316 LogFlowFunc(("successfully loaded the library.\n")); … … 320 320 rc = RTLdrGetSymbol (m_hLdrMod, VBOX_HGCM_SVCLOAD_NAME, (void**)&m_pfnLoad); 321 321 322 if ( VBOX_FAILURE (rc) || !m_pfnLoad)322 if (RT_FAILURE (rc) || !m_pfnLoad) 323 323 { 324 324 Log(("HGCMService::loadServiceDLL: Error resolving the service entry point %s, rc = %d, m_pfnLoad = %p\n", VBOX_HGCM_SVCLOAD_NAME, rc, m_pfnLoad)); 325 325 326 if ( VBOX_SUCCESS(rc))326 if (RT_SUCCESS(rc)) 327 327 { 328 328 /* m_pfnLoad was NULL */ … … 331 331 } 332 332 333 if ( VBOX_SUCCESS(rc))333 if (RT_SUCCESS(rc)) 334 334 { 335 335 memset (&m_fntable, 0, sizeof (m_fntable)); … … 343 343 LogFlowFunc(("m_pfnLoad rc = %Vrc\n", rc)); 344 344 345 if ( VBOX_SUCCESS (rc))345 if (RT_SUCCESS (rc)) 346 346 { 347 347 if ( m_fntable.pfnUnload == NULL … … 369 369 } 370 370 371 if ( VBOX_FAILURE(rc))371 if (RT_FAILURE(rc)) 372 372 { 373 373 unloadServiceDLL (); … … 532 532 int rc = hgcmMsgGet (ThreadHandle, &pMsgCore); 533 533 534 if ( VBOX_FAILURE (rc))534 if (RT_FAILURE (rc)) 535 535 { 536 536 /* The error means some serious unrecoverable problem in the hgcmMsg/hgcmThread layer. */ … … 703 703 } 704 704 705 if ( VBOX_SUCCESS (rc))705 if (RT_SUCCESS (rc)) 706 706 { 707 707 pSvc->m_hExtension = pMsg->handle; … … 773 773 { 774 774 HGCMService *pService = static_cast <HGCMService *> (pvInstance); 775 775 776 776 if (pService) 777 777 { … … 809 809 int rc = hgcmThreadCreate (&m_thread, achThreadName, hgcmServiceThread, this); 810 810 811 if ( VBOX_SUCCESS(rc))811 if (RT_SUCCESS(rc)) 812 812 { 813 813 m_pszSvcName = RTStrDup (pszServiceName); … … 835 835 rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_LOAD, hgcmMessageAllocSvc); 836 836 837 if ( VBOX_SUCCESS(rc))837 if (RT_SUCCESS(rc)) 838 838 { 839 839 rc = hgcmMsgSend (hMsg); … … 842 842 } 843 843 844 if ( VBOX_FAILURE(rc))844 if (RT_FAILURE(rc)) 845 845 { 846 846 instanceDestroy (); … … 858 858 int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_UNLOAD, hgcmMessageAllocSvc); 859 859 860 if ( VBOX_SUCCESS(rc))860 if (RT_SUCCESS(rc)) 861 861 { 862 862 rc = hgcmMsgSend (hMsg); 863 863 864 if ( VBOX_SUCCESS (rc))864 if (RT_SUCCESS (rc)) 865 865 { 866 866 hgcmThreadWait (m_thread); … … 882 882 int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_SAVESTATE, hgcmMessageAllocSvc); 883 883 884 if ( VBOX_SUCCESS(rc))884 if (RT_SUCCESS(rc)) 885 885 { 886 886 HGCMMsgLoadSaveStateClient *pMsg = (HGCMMsgLoadSaveStateClient *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 906 906 int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_LOADSTATE, hgcmMessageAllocSvc); 907 907 908 if ( VBOX_SUCCESS(rc))908 if (RT_SUCCESS(rc)) 909 909 { 910 910 HGCMMsgLoadSaveStateClient *pMsg = (HGCMMsgLoadSaveStateClient *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 941 941 int rc = HGCMService::ResolveService (&pSvc, pszServiceName); 942 942 943 if ( VBOX_SUCCESS (rc))943 if (RT_SUCCESS (rc)) 944 944 { 945 945 /* The service is already loaded. */ … … 961 961 rc = pSvc->instanceCreate (pszServiceLibrary, pszServiceName); 962 962 963 if ( VBOX_SUCCESS(rc))963 if (RT_SUCCESS(rc)) 964 964 { 965 965 /* Insert the just created service to list for future references. */ … … 1252 1252 uint32_t cClients; 1253 1253 rc = SSMR3GetU32(pSSM, &cClients); 1254 if ( VBOX_FAILURE(rc))1254 if (RT_FAILURE(rc)) 1255 1255 { 1256 1256 pSvc->ReleaseService (); … … 1264 1264 uint32_t u32ClientId; 1265 1265 rc = SSMR3GetU32(pSSM, &u32ClientId); 1266 if ( VBOX_FAILURE(rc))1266 if (RT_FAILURE(rc)) 1267 1267 { 1268 1268 pSvc->ReleaseService (); … … 1273 1273 /* Connect the client. */ 1274 1274 rc = pSvc->CreateAndConnectClient (NULL, u32ClientId); 1275 if ( VBOX_FAILURE(rc))1275 if (RT_FAILURE(rc)) 1276 1276 { 1277 1277 pSvc->ReleaseService (); … … 1282 1282 /* Call the service, so the operation is executed by the service thread. */ 1283 1283 rc = pSvc->loadClientState (u32ClientId, pSSM); 1284 if ( VBOX_FAILURE(rc))1284 if (RT_FAILURE(rc)) 1285 1285 { 1286 1286 pSvc->ReleaseService (); … … 1334 1334 int rc = pClient->Init (this); 1335 1335 1336 if ( VBOX_SUCCESS(rc))1336 if (RT_SUCCESS(rc)) 1337 1337 { 1338 1338 /* Call the service. */ … … 1341 1341 rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_CONNECT, hgcmMessageAllocSvc); 1342 1342 1343 if ( VBOX_SUCCESS(rc))1343 if (RT_SUCCESS(rc)) 1344 1344 { 1345 1345 HGCMMsgSvcConnect *pMsg = (HGCMMsgSvcConnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 1352 1352 rc = hgcmMsgSend (hMsg); 1353 1353 1354 if ( VBOX_SUCCESS (rc))1354 if (RT_SUCCESS (rc)) 1355 1355 { 1356 1356 /* Add the client Id to the array. */ … … 1368 1368 } 1369 1369 1370 if ( VBOX_FAILURE(rc))1370 if (RT_FAILURE(rc)) 1371 1371 { 1372 1372 hgcmObjDeleteHandle (handle); … … 1404 1404 rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc); 1405 1405 1406 if ( VBOX_SUCCESS(rc))1406 if (RT_SUCCESS(rc)) 1407 1407 { 1408 1408 HGCMMsgSvcDisconnect *pMsg = (HGCMMsgSvcDisconnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 1417 1417 } 1418 1418 1419 if ( VBOX_SUCCESS (rc))1419 if (RT_SUCCESS (rc)) 1420 1420 { 1421 1421 /* Remove the client id from the array in any case. */ … … 1458 1458 int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_REGEXT, hgcmMessageAllocSvc); 1459 1459 1460 if ( VBOX_SUCCESS(rc))1460 if (RT_SUCCESS(rc)) 1461 1461 { 1462 1462 HGCMMsgSvcRegisterExtension *pMsg = (HGCMMsgSvcRegisterExtension *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 1482 1482 int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_UNREGEXT, hgcmMessageAllocSvc); 1483 1483 1484 if ( VBOX_SUCCESS(rc))1484 if (RT_SUCCESS(rc)) 1485 1485 { 1486 1486 HGCMMsgSvcUnregisterExtension *pMsg = (HGCMMsgSvcUnregisterExtension *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 1515 1515 int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_GUESTCALL, hgcmMessageAllocSvc); 1516 1516 1517 if ( VBOX_SUCCESS(rc))1517 if (RT_SUCCESS(rc)) 1518 1518 { 1519 1519 HGCMMsgCall *pMsg = (HGCMMsgCall *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 1557 1557 int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_HOSTCALL, hgcmMessageAllocSvc); 1558 1558 1559 if ( VBOX_SUCCESS(rc))1559 if (RT_SUCCESS(rc)) 1560 1560 { 1561 1561 HGCMMsgHostCallSvc *pMsg = (HGCMMsgHostCallSvc *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 1702 1702 int rc = hgcmMsgGet (ThreadHandle, &pMsgCore); 1703 1703 1704 if ( VBOX_FAILURE (rc))1704 if (RT_FAILURE (rc)) 1705 1705 { 1706 1706 /* The error means some serious unrecoverable problem in the hgcmMsg/hgcmThread layer. */ … … 1725 1725 rc = HGCMService::ResolveService (&pService, pMsg->pszServiceName); 1726 1726 1727 if ( VBOX_SUCCESS (rc))1727 if (RT_SUCCESS (rc)) 1728 1728 { 1729 1729 /* Call the service instance method. */ … … 1780 1780 rc = HGCMService::ResolveService (&pService, pMsg->pszServiceName); 1781 1781 1782 if ( VBOX_SUCCESS (rc))1782 if (RT_SUCCESS (rc)) 1783 1783 { 1784 1784 rc = pService->HostCall (pMsg->u32Function, pMsg->cParms, pMsg->paParms); … … 1845 1845 rc = HGCMService::ResolveService (&pService, handle->pszServiceName); 1846 1846 1847 if ( VBOX_SUCCESS (rc))1847 if (RT_SUCCESS (rc)) 1848 1848 { 1849 1849 pService->RegisterExtension (handle, pMsg->pfnExtension, pMsg->pvExtension); … … 1852 1852 } 1853 1853 1854 if ( VBOX_FAILURE (rc))1854 if (RT_FAILURE (rc)) 1855 1855 { 1856 1856 RTMemFree (handle); … … 1872 1872 rc = HGCMService::ResolveService (&pService, pMsg->handle->pszServiceName); 1873 1873 1874 if ( VBOX_SUCCESS (rc))1874 if (RT_SUCCESS (rc)) 1875 1875 { 1876 1876 pService->UnregisterExtension (pMsg->handle); … … 1933 1933 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_LOAD, hgcmMainMessageAlloc); 1934 1934 1935 if ( VBOX_SUCCESS(rc))1935 if (RT_SUCCESS(rc)) 1936 1936 { 1937 1937 /* Initialize the message. Since the message is synchronous, use the supplied pointers. */ … … 1975 1975 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_REGEXT, hgcmMainMessageAlloc); 1976 1976 1977 if ( VBOX_SUCCESS(rc))1977 if (RT_SUCCESS(rc)) 1978 1978 { 1979 1979 /* Initialize the message. Since the message is synchronous, use the supplied pointers. */ … … 2004 2004 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_UNREGEXT, hgcmMainMessageAlloc); 2005 2005 2006 if ( VBOX_SUCCESS(rc))2006 if (RT_SUCCESS(rc)) 2007 2007 { 2008 2008 /* Initialize the message. */ … … 2047 2047 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_CONNECT, hgcmMainMessageAlloc); 2048 2048 2049 if ( VBOX_SUCCESS(rc))2049 if (RT_SUCCESS(rc)) 2050 2050 { 2051 2051 /* Initialize the message. Since 'pszServiceName' and 'pu32ClientId' … … 2094 2094 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_DISCONNECT, hgcmMainMessageAlloc); 2095 2095 2096 if ( VBOX_SUCCESS(rc))2096 if (RT_SUCCESS(rc)) 2097 2097 { 2098 2098 /* Initialize the message. */ … … 2128 2128 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, u32MsgId, hgcmMainMessageAlloc); 2129 2129 2130 if ( VBOX_SUCCESS(rc))2130 if (RT_SUCCESS(rc)) 2131 2131 { 2132 2132 HGCMMsgMainLoadSaveState *pMsg = (HGCMMsgMainLoadSaveState *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 2239 2239 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_HOSTCALL, hgcmMainMessageAlloc); 2240 2240 2241 if ( VBOX_SUCCESS(rc))2241 if (RT_SUCCESS(rc)) 2242 2242 { 2243 2243 HGCMMsgMainHostCall *pMsg = (HGCMMsgMainHostCall *)hgcmObjReference (hMsg, HGCMOBJ_MSG); … … 2269 2269 int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_RESET, hgcmMainMessageAlloc); 2270 2270 2271 if ( VBOX_SUCCESS(rc))2271 if (RT_SUCCESS(rc)) 2272 2272 { 2273 2273 rc = hgcmMsgSend (hMsg); … … 2284 2284 int rc = hgcmThreadInit (); 2285 2285 2286 if ( VBOX_SUCCESS(rc))2286 if (RT_SUCCESS(rc)) 2287 2287 { 2288 2288 /* … … 2292 2292 rc = hgcmThreadCreate (&g_hgcmThread, "MainHGCMthread", hgcmThread, NULL); 2293 2293 2294 if ( VBOX_FAILURE (rc))2294 if (RT_FAILURE (rc)) 2295 2295 { 2296 2296 LogRel(("Failed to start HGCM thread. HGCM services will be unavailable!!! rc = %Vrc\n", rc)); … … 2312 2312 int rc = HGCMHostReset (); 2313 2313 2314 if ( VBOX_SUCCESS (rc))2314 if (RT_SUCCESS (rc)) 2315 2315 { 2316 2316 /* Send the quit message to the main hgcmThread. */ … … 2319 2319 rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_QUIT, hgcmMainMessageAlloc); 2320 2320 2321 if ( VBOX_SUCCESS(rc))2321 if (RT_SUCCESS(rc)) 2322 2322 { 2323 2323 rc = hgcmMsgSend (hMsg); 2324 2324 2325 if ( VBOX_SUCCESS (rc))2325 if (RT_SUCCESS (rc)) 2326 2326 { 2327 2327 /* Wait for the thread termination. */ -
trunk/src/VBox/Frontends/VBoxBFE/HGCMObjects.cpp
r8155 r13835 88 88 int rc = hgcmObjEnter (); 89 89 90 if ( VBOX_SUCCESS(rc))90 if (RT_SUCCESS(rc)) 91 91 { 92 92 ObjectAVLCore *pCore = &pObject->Core; 93 93 94 94 /* Generate a new handle value. */ 95 95 96 96 uint32_t volatile *pu32HandleCountSource = pObject->Type () == HGCMOBJ_CLIENT? 97 97 &g_u32ClientHandleCount: … … 102 102 for (;;) 103 103 { 104 uint32_t Key; 105 104 uint32_t Key; 105 106 106 if (u32HandleIn == 0) 107 107 { … … 158 158 /* Store returned handle. */ 159 159 handle = Key; 160 160 161 161 Log(("Object key inserted 0x%08X\n", Key)); 162 162 … … 196 196 rc = hgcmObjEnter (); 197 197 198 if ( VBOX_SUCCESS(rc))198 if (RT_SUCCESS(rc)) 199 199 { 200 200 ObjectAVLCore *pCore = (ObjectAVLCore *)RTAvlULRemove (&g_pTree, handle); … … 233 233 int rc = hgcmObjEnter (); 234 234 235 if ( VBOX_SUCCESS(rc))235 if (RT_SUCCESS(rc)) 236 236 { 237 237 ObjectAVLCore *pCore = (ObjectAVLCore *)RTAvlULGet (&g_pTree, handle); 238 238 239 239 Assert(!pCore || (pCore->pSelf && pCore->pSelf->Type() == enmObjType)); 240 if ( pCore 240 if ( pCore 241 241 && pCore->pSelf 242 242 && pCore->pSelf->Type() == enmObjType) … … 283 283 int rc = hgcmObjEnter (); 284 284 285 if ( VBOX_SUCCESS(rc))285 if (RT_SUCCESS(rc)) 286 286 { 287 287 if (g_u32ClientHandleCount <= u32ClientHandleCount) -
trunk/src/VBox/Frontends/VBoxBFE/HGCMThread.cpp
r8155 r13835 209 209 } 210 210 211 HGCMThread::HGCMThread () 211 HGCMThread::HGCMThread () 212 212 : 213 213 HGCMObject(HGCMOBJ_THREAD), … … 275 275 rc = RTSemEventMultiCreate (&m_eventThread); 276 276 277 if ( VBOX_SUCCESS(rc))277 if (RT_SUCCESS(rc)) 278 278 { 279 279 rc = RTSemEventMultiCreate (&m_eventSend); 280 280 281 if ( VBOX_SUCCESS(rc))281 if (RT_SUCCESS(rc)) 282 282 { 283 283 rc = RTCritSectInit (&m_critsect); 284 284 285 if ( VBOX_SUCCESS(rc))285 if (RT_SUCCESS(rc)) 286 286 { 287 287 m_pfnThread = pfnThread; … … 296 296 pszThreadName); 297 297 298 if ( VBOX_SUCCESS(rc))298 if (RT_SUCCESS(rc)) 299 299 { 300 300 /* Wait until the thread is ready. */ 301 301 rc = RTThreadUserWait (thread, 30000); 302 302 AssertRC (rc); 303 Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || VBOX_FAILURE (rc));303 Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE (rc)); 304 304 } 305 305 else … … 335 335 336 336 #ifdef LOG_ENABLED 337 if ( VBOX_FAILURE (rc))337 if (RT_FAILURE (rc)) 338 338 { 339 339 Log(("HGCMThread::MsgPost: FAILURE: could not obtain worker thread mutex, rc = %Vrc!!!\n", rc)); … … 358 358 bool fFromFreeList = false; 359 359 360 if (!pmsg && VBOX_SUCCESS(rc))360 if (!pmsg && RT_SUCCESS(rc)) 361 361 { 362 362 /* We have to allocate a new memory block. */ … … 369 369 } 370 370 371 if ( VBOX_SUCCESS(rc))371 if (RT_SUCCESS(rc)) 372 372 { 373 373 /* Initialize just allocated message core */ … … 402 402 rc = Enter (); 403 403 404 if ( VBOX_SUCCESS(rc))404 if (RT_SUCCESS(rc)) 405 405 { 406 406 pMsg->m_pfnCallback = pfnCallback; … … 476 476 rc = Enter (); 477 477 478 if ( VBOX_FAILURE (rc))478 if (RT_FAILURE (rc)) 479 479 { 480 480 break; … … 558 558 rc = Enter (); 559 559 560 if ( VBOX_SUCCESS(rc))560 if (RT_SUCCESS(rc)) 561 561 { 562 562 /* Remove the message from the InProcess queue. */ … … 596 596 if (fWaited) 597 597 { 598 /* If message is being waited, then it is referenced by the waiter and the pointer 598 /* If message is being waited, then it is referenced by the waiter and the pointer 599 599 * if valid even after hgcmObjDeleteHandle. 600 600 */ … … 638 638 } 639 639 640 if ( VBOX_SUCCESS (rc))640 if (RT_SUCCESS (rc)) 641 641 { 642 642 *pHandle = handle; … … 739 739 int rc = hgcmMsgPostInternal (hMsg, pfnCallback, false); 740 740 741 if ( VBOX_SUCCESS (rc))741 if (RT_SUCCESS (rc)) 742 742 { 743 743 rc = VINF_HGCM_ASYNC_EXECUTE; -
trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp
r13782 r13835 213 213 PPDMIBASE pBase; 214 214 int vrc = PDMR3QueryLun (mpVM, "usb-ohci", 0, 0, &pBase); 215 if ( VBOX_FAILURE (vrc))215 if (RT_FAILURE (vrc)) 216 216 return setError (E_FAIL, tr ("VM doesn't have a USB controller")); 217 217 /* … … 248 248 5, pRhConfig, &Uuid, fRemote, 249 249 Address.c_str(), pvRemote); 250 if ( VBOX_SUCCESS (vrc))250 if (RT_SUCCESS (vrc)) 251 251 vrc = pReq->iStatus; 252 252 VMR3ReqFree (pReq); 253 if ( VBOX_SUCCESS (vrc))253 if (RT_SUCCESS (vrc)) 254 254 hostDevice->setCaptured(); 255 255 else … … 295 295 PPDMIBASE pBase; 296 296 vrc = PDMR3QueryLun (mpVM, "usb-ohci", 0, 0, &pBase); 297 if ( VBOX_SUCCESS (vrc))297 if (RT_SUCCESS (vrc)) 298 298 { 299 299 PVUSBIRHCONFIG pRhConfig = (PVUSBIRHCONFIG)pBase->pfnQueryInterface (pBase, PDMINTERFACE_VUSB_RH_CONFIG); … … 305 305 vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)pRhConfig->pfnDestroyProxyDevice, 306 306 2, pRhConfig, &Uuid); 307 if ( VBOX_SUCCESS (vrc))307 if (RT_SUCCESS (vrc)) 308 308 vrc = pReq->iStatus; 309 309 VMR3ReqFree (pReq); … … 316 316 vrc = VINF_SUCCESS; 317 317 } 318 if ( VBOX_SUCCESS (vrc))318 if (RT_SUCCESS (vrc)) 319 319 return S_OK; 320 320 Log (("Console::AttachUSBDevice: Failed to detach the device from the USB controller, vrc=%Vrc.\n", vrc)); -
trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp
r11663 r13835 90 90 91 91 int rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)scancode); 92 if ( VBOX_FAILURE (rcVBox))92 if (RT_FAILURE (rcVBox)) 93 93 return E_FAIL; 94 94 … … 116 116 int rcVBox = VINF_SUCCESS; 117 117 118 for (uint32_t i = 0; (i < keys.size()) && VBOX_SUCCESS(rcVBox); i++)118 for (uint32_t i = 0; (i < keys.size()) && RT_SUCCESS(rcVBox); i++) 119 119 { 120 120 rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)keys[i]); 121 121 } 122 122 123 if ( VBOX_FAILURE (rcVBox))123 if (RT_FAILURE (rcVBox)) 124 124 return E_FAIL; 125 125 … … 141 141 { 142 142 static com::SafeArray<LONG> cadSequence(6); 143 143 144 144 cadSequence[0] = 0x1d; // Ctrl down 145 145 cadSequence[1] = 0x38; // Alt down … … 255 255 void *pv; 256 256 rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv); 257 if ( VBOX_FAILURE(rc))257 if (RT_FAILURE(rc)) 258 258 { 259 259 AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc)); -
trunk/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.cpp
r13782 r13835 140 140 int rcVBox = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, 141 141 (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag); 142 if ( VBOX_SUCCESS(rcVBox))142 if (RT_SUCCESS(rcVBox)) 143 143 { 144 144 rcVBox = pReq->iStatus; … … 146 146 } 147 147 148 if ( VBOX_SUCCESS(rcVBox))148 if (RT_SUCCESS(rcVBox)) 149 149 return S_OK; 150 150 … … 200 200 int rcVBox = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, 201 201 (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag); 202 if ( VBOX_SUCCESS(rcVBox))202 if (RT_SUCCESS(rcVBox)) 203 203 { 204 204 rcVBox = pReq->iStatus; … … 206 206 } 207 207 208 if ( VBOX_SUCCESS(rcVBox))208 if (RT_SUCCESS(rcVBox)) 209 209 return S_OK; 210 210 -
trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp
r11307 r13835 110 110 111 111 int vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, dx, dy, dz, fButtons); 112 if ( VBOX_FAILURE (vrc))112 if (RT_FAILURE (vrc)) 113 113 return E_FAIL; 114 114 … … 167 167 168 168 vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, 1, 1, dz, fButtons); 169 if ( VBOX_FAILURE (vrc))169 if (RT_FAILURE (vrc)) 170 170 return E_FAIL; 171 171 } … … 262 262 void *pv; 263 263 rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv); 264 if ( VBOX_FAILURE(rc))264 if (RT_FAILURE(rc)) 265 265 { 266 266 AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc)); -
trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp
r9333 r13835 201 201 break; 202 202 } 203 if ( VBOX_SUCCESS(rc))203 if (RT_SUCCESS(rc)) 204 204 { 205 205 return CONEVENT_QUIT; … … 240 240 { 241 241 int rc = handleHostKey(&ev->key); 242 if ( VBOX_SUCCESS(rc) && rc != VINF_SUCCESS)242 if (RT_SUCCESS(rc) && rc != VINF_SUCCESS) 243 243 { 244 244 return CONEVENT_QUIT; -
trunk/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp
r11307 r13835 75 75 PPDMLED pLed; 76 76 int rc = pData->pLedPorts->pfnQueryStatusLed(pData->pLedPorts, iLUN, &pLed); 77 if ( VBOX_FAILURE(rc))77 if (RT_FAILURE(rc)) 78 78 pLed = NULL; 79 79 ASMAtomicXchgPtr((void * volatile *)&pData->papLeds[iLUN - pData->iFirstLUN], pLed); … … 164 164 */ 165 165 rc = CFGMR3QueryPtr(pCfgHandle, "papLeds", (void **)&pData->papLeds); 166 if ( VBOX_FAILURE(rc))166 if (RT_FAILURE(rc)) 167 167 { 168 168 AssertMsgFailed(("Configuration error: Failed to query the \"papLeds\" value! rc=%Vrc\n", rc)); … … 173 173 if (rc == VERR_CFGM_VALUE_NOT_FOUND) 174 174 pData->iFirstLUN = 0; 175 else if ( VBOX_FAILURE(rc))175 else if (RT_FAILURE(rc)) 176 176 { 177 177 AssertMsgFailed(("Configuration error: Failed to query the \"First\" value! rc=%Vrc\n", rc)); … … 182 182 if (rc == VERR_CFGM_VALUE_NOT_FOUND) 183 183 pData->iLastLUN = 0; 184 else if ( VBOX_FAILURE(rc))184 else if (RT_FAILURE(rc)) 185 185 { 186 186 AssertMsgFailed(("Configuration error: Failed to query the \"Last\" value! rc=%Vrc\n", rc)); -
trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.cpp
r8562 r13835 85 85 0, RTTHREADTYPE_INFREQUENT_POLLER, RTTHREADFLAGS_WAITABLE, "USBPROXY"); 86 86 AssertRC (rc); 87 if ( VBOX_SUCCESS (rc))87 if (RT_SUCCESS (rc)) 88 88 LogFlow (("USBProxyService::start: started mThread=%RTthrd\n", mThread)); 89 89 else … … 117 117 if (rc == VERR_INVALID_HANDLE) 118 118 rc = VINF_SUCCESS; 119 if ( VBOX_SUCCESS (rc))119 if (RT_SUCCESS (rc)) 120 120 { 121 121 LogFlowMember (("USBProxyService::stop: stopped mThread=%RTthrd\n", mThread)); -
trunk/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp
r8539 r13835 102 102 { 103 103 rc = RTFileOpen (&mFile, pszDevices, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE); 104 if ( VBOX_SUCCESS (rc))104 if (RT_SUCCESS (rc)) 105 105 { 106 106 /* … … 124 124 */ 125 125 rc = start(); 126 if ( VBOX_SUCCESS (rc))126 if (RT_SUCCESS (rc)) 127 127 { 128 128 RTStrFree (pszDevices); … … 269 269 { 270 270 int rc = RTFileWrite (mWakeupPipeW, "Wakeup!", sizeof("Wakeup!") - 1, NULL); 271 if ( VBOX_SUCCESS (rc))271 if (RT_SUCCESS (rc)) 272 272 fsync (mWakeupPipeW); 273 273 return rc; … … 378 378 { 379 379 int rc = usbReadSkipSuffix (&pszNext); 380 if ( VBOX_FAILURE (rc))380 if (RT_FAILURE (rc)) 381 381 return rc; 382 382 } … … 467 467 */ 468 468 int rc = usbReadSkipSuffix (&pszNext); 469 if ( VBOX_FAILURE (rc))469 if (RT_FAILURE (rc)) 470 470 return rc; 471 471 *ppszNext = pszNext; … … 575 575 rewind (mStream); 576 576 int rc = VINF_SUCCESS; 577 while ( VBOX_SUCCESS (rc)577 while ( RT_SUCCESS (rc) 578 578 && fgets (szLine, sizeof (szLine), mStream)) 579 579 { … … 662 662 663 663 /* parse the line. */ 664 while (*psz && VBOX_SUCCESS (rc))664 while (*psz && RT_SUCCESS (rc)) 665 665 { 666 666 if (PREFIX ("Bus=")) … … 708 708 */ 709 709 case 'D': 710 while (*psz && VBOX_SUCCESS (rc))710 while (*psz && RT_SUCCESS (rc)) 711 711 { 712 712 if (PREFIX ("Ver=")) … … 737 737 */ 738 738 case 'P': 739 while (*psz && VBOX_SUCCESS (rc))739 while (*psz && RT_SUCCESS (rc)) 740 740 { 741 741 if (PREFIX ("Vendor=")) … … 763 763 { 764 764 rc = usbReadStr (pszValue, &Dev.pszSerialNumber); 765 if ( VBOX_SUCCESS (rc))765 if (RT_SUCCESS (rc)) 766 766 Dev.u64SerialHash = calcSerialHash (pszValue); 767 767 } … … 781 781 USBCONFIG Cfg = {0}; 782 782 Cfg.fActive = psz[-2] == '*'; 783 while (*psz && VBOX_SUCCESS (rc))783 while (*psz && RT_SUCCESS (rc)) 784 784 { 785 785 if (PREFIX ("#Ifs=")) … … 795 795 psz = RTStrStripL (psz); 796 796 } 797 if ( VBOX_SUCCESS (rc))797 if (RT_SUCCESS (rc)) 798 798 { 799 799 if (iCfg < Dev.bNumConfigurations) … … 847 847 USBINTERFACE If = {0}; 848 848 bool fIfAdopted = false; 849 while (*psz && VBOX_SUCCESS (rc))849 while (*psz && RT_SUCCESS (rc)) 850 850 { 851 851 if (PREFIX ("If#=")) … … 878 878 psz = RTStrStripL (psz); 879 879 } 880 if ( VBOX_SUCCESS (rc))880 if (RT_SUCCESS (rc)) 881 881 { 882 882 if (pCfg && If.bInterfaceNumber < pCfg->bNumInterfaces) … … 953 953 { 954 954 USBENDPOINT Ep = {0}; 955 while (*psz && VBOX_SUCCESS (rc))955 while (*psz && RT_SUCCESS (rc)) 956 956 { 957 957 if (PREFIX ("Ad=")) … … 967 967 psz = RTStrStripL (psz); 968 968 } 969 if ( VBOX_SUCCESS (rc))969 if (RT_SUCCESS (rc)) 970 970 { 971 971 if (pIf && iEp < pIf->bNumEndpoints) … … 1040 1040 * Success? 1041 1041 */ 1042 if ( VBOX_FAILURE (rc))1042 if (RT_FAILURE (rc)) 1043 1043 { 1044 1044 LogFlow (("USBProxyServiceLinux::getDevices: rc=%Vrc\n", rc)); -
trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
r13782 r13835 243 243 uint32_t n; 244 244 int rc = RTStrToUInt32Ex(&pszArg[cchRoot], NULL, 10, &n); 245 if ( VBOX_FAILURE(rc))245 if (RT_FAILURE(rc)) 246 246 { 247 247 RTPrintf("Error: invalid network device option (rc=%Vrc): %s\n", rc, pszArg); … … 491 491 return SyntaxError("missing argument for memory size!\n"); 492 492 rc = RTStrToUInt32Ex(argv[curArg], NULL, 0, &g_u32MemorySizeMB); 493 if ( VBOX_FAILURE(rc))493 if (RT_FAILURE(rc)) 494 494 return SyntaxError("bad memory size: %s (error %Vrc)\n", 495 495 argv[curArg], rc); … … 502 502 rc = RTStrToUInt32Ex(argv[curArg], NULL, 0, &uVRAMMB); 503 503 g_u32VRamSize = uVRAMMB * _1M; 504 if ( VBOX_FAILURE(rc))504 if (RT_FAILURE(rc)) 505 505 return SyntaxError("bad video ram size: %s (error %Vrc)\n", 506 506 argv[curArg], rc); … … 708 708 return SyntaxError("missing argument for %s!\n", pszArg); 709 709 rc = RTStrToInt32Ex(argv[curArg], NULL, 0, &g_aNetDevs[i].fd); 710 if ( VBOX_FAILURE(rc))710 if (RT_FAILURE(rc)) 711 711 return SyntaxError("bad tap file descriptor: %s (error %VRc)\n", argv[curArg], rc); 712 712 g_aNetDevs[i].fHaveFd = true; … … 721 721 { 722 722 rc = RTStrToInt32Ex(argv[curArg], NULL, 0, &portVRDP); 723 if ( VBOX_FAILURE(rc))723 if (RT_FAILURE(rc)) 724 724 return SyntaxError("cannot vrpd port: %s (%VRc)\n", argv[curArg], rc); 725 725 if (portVRDP < 0 || portVRDP >= 0x10000) … … 816 816 RTTHREAD thread; 817 817 rc = RTThreadCreate(&thread, VMPowerUpThread, 0, 0, RTTHREADTYPE_MAIN_WORKER, 0, "PowerUp"); 818 if ( VBOX_FAILURE(rc))818 if (RT_FAILURE(rc)) 819 819 { 820 820 RTPrintf("Error: Thread creation failed with %d\n", rc); … … 982 982 983 983 RTLogFlush(NULL); 984 return VBOX_FAILURE (rc) ? 1 : 0;984 return RT_FAILURE (rc) ? 1 : 0; 985 985 } 986 986 … … 1014 1014 */ 1015 1015 int rc = RTR3Init(); 1016 if ( VBOX_FAILURE(rc))1016 if (RT_FAILURE(rc)) 1017 1017 return FatalError("RTR3Init failed rc=%Vrc\n", rc); 1018 1018 … … 1087 1087 { 1088 1088 /** @todo accessing shared resource without any kind of synchronization */ 1089 if ( VBOX_SUCCESS(rc))1089 if (RT_SUCCESS(rc)) 1090 1090 szError[0] = '\0'; 1091 1091 else … … 1140 1140 "VBOX_RELEASE_LOG", ELEMENTS(s_apszGroups), s_apszGroups, 1141 1141 RTLOGDEST_FILE, szError, sizeof(szError), "./VBoxBFE.log"); 1142 if ( VBOX_SUCCESS(rc2))1142 if (RT_SUCCESS(rc2)) 1143 1143 { 1144 1144 /* some introductory information */ … … 1168 1168 */ 1169 1169 rc = VMR3Create(1, setVMErrorCallback, NULL, vboxbfeConfigConstructor, NULL, &pVM); 1170 if ( VBOX_FAILURE(rc))1170 if (RT_FAILURE(rc)) 1171 1171 { 1172 1172 RTPrintf("Error: VM creation failed with %Vrc.\n", rc); … … 1179 1179 */ 1180 1180 rc = VMR3AtStateRegister(pVM, vmstateChangeCallback, NULL); 1181 if ( VBOX_FAILURE(rc))1181 if (RT_FAILURE(rc)) 1182 1182 { 1183 1183 RTPrintf("Error: VMR3AtStateRegister failed with %Vrc.\n", rc); … … 1264 1264 * Power on the VM (i.e. start executing). 1265 1265 */ 1266 if ( VBOX_SUCCESS(rc))1266 if (RT_SUCCESS(rc)) 1267 1267 { 1268 1268 PVMREQ pReq; … … 1277 1277 (PFNRT)VMR3Load, 4, pVM, g_pszStateFile, &callProgressInfo, NULL); 1278 1278 endProgressInfo(); 1279 if ( VBOX_SUCCESS(rc))1279 if (RT_SUCCESS(rc)) 1280 1280 { 1281 1281 VMR3ReqFree(pReq); 1282 1282 rc = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, 1283 1283 (PFNRT)VMR3Resume, 1, pVM); 1284 if ( VBOX_SUCCESS(rc))1284 if (RT_SUCCESS(rc)) 1285 1285 { 1286 1286 rc = pReq->iStatus; … … 1295 1295 { 1296 1296 rc = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)VMR3PowerOn, 1, pVM); 1297 if ( VBOX_SUCCESS(rc))1297 if (RT_SUCCESS(rc)) 1298 1298 { 1299 1299 rc = pReq->iStatus; … … 1309 1309 * On failure destroy the VM. 1310 1310 */ 1311 if ( VBOX_FAILURE(rc))1311 if (RT_FAILURE(rc)) 1312 1312 goto failure; 1313 1313 … … 1342 1342 rc = pCallbacks->pfnRegister(pCallbacks, &Mouse::DrvReg); 1343 1343 AssertRC(rc); 1344 if ( VBOX_FAILURE(rc))1344 if (RT_FAILURE(rc)) 1345 1345 return rc; 1346 1346 rc = pCallbacks->pfnRegister(pCallbacks, &Keyboard::DrvReg); 1347 1347 AssertRC(rc); 1348 if ( VBOX_FAILURE(rc))1348 if (RT_FAILURE(rc)) 1349 1349 return rc; 1350 1350 1351 1351 rc = pCallbacks->pfnRegister(pCallbacks, &VMDisplay::DrvReg); 1352 1352 AssertRC(rc); 1353 if ( VBOX_FAILURE(rc))1353 if (RT_FAILURE(rc)) 1354 1354 return rc; 1355 1355 rc = pCallbacks->pfnRegister(pCallbacks, &VMMDev::DrvReg); 1356 1356 AssertRC(rc); 1357 if ( VBOX_FAILURE(rc))1357 if (RT_FAILURE(rc)) 1358 1358 return rc; 1359 1359 1360 1360 rc = pCallbacks->pfnRegister(pCallbacks, &VMStatus::DrvReg); 1361 if ( VBOX_FAILURE(rc))1361 if (RT_FAILURE(rc)) 1362 1362 return rc; 1363 1363 … … 1377 1377 int rc; 1378 1378 1379 #define UPDATE_RC() do { if ( VBOX_FAILURE(rc) && VBOX_SUCCESS(rcAll)) rcAll = rc; } while (0)1379 #define UPDATE_RC() do { if (RT_FAILURE(rc) && RT_SUCCESS(rcAll)) rcAll = rc; } while (0) 1380 1380 1381 1381 /* … … 1807 1807 RTFILE_O_READWRITE | RTFILE_O_OPEN | 1808 1808 RTFILE_O_DENY_NONE | RTFILE_O_INHERIT); 1809 if ( VBOX_FAILURE(rc))1809 if (RT_FAILURE(rc)) 1810 1810 { 1811 1811 FatalError("Failed to open /dev/net/tun: %Vrc\n", rc); -
trunk/src/VBox/Frontends/VBoxBFE/VMControl.cpp
r13782 r13835 66 66 (PFNRT)VMR3Suspend, 1, pVM); 67 67 AssertRC(rcVBox); 68 if ( VBOX_SUCCESS(rcVBox))68 if (RT_SUCCESS(rcVBox)) 69 69 { 70 70 rcVBox = pReq->iStatus; … … 87 87 (PFNRT)VMR3Resume, 1, pVM); 88 88 AssertRC(rcVBox); 89 if ( VBOX_SUCCESS(rcVBox))89 if (RT_SUCCESS(rcVBox)) 90 90 { 91 91 rcVBox = pReq->iStatus; … … 105 105 (PFNRT)VMR3Reset, 1, pVM); 106 106 AssertRC(rcVBox); 107 if ( VBOX_SUCCESS(rcVBox))107 if (RT_SUCCESS(rcVBox)) 108 108 { 109 109 rcVBox = pReq->iStatus; … … 122 122 PPDMIBASE pBase; 123 123 int vrc = PDMR3QueryDeviceLun (pVM, "acpi", 0, 0, &pBase); 124 if ( VBOX_SUCCESS (vrc))124 if (RT_SUCCESS (vrc)) 125 125 { 126 126 Assert (pBase); … … 140 140 PPDMIBASE pBase; 141 141 int vrc = PDMR3QueryDeviceLun (pVM, "acpi", 0, 0, &pBase); 142 if ( VBOX_SUCCESS (vrc))142 if (RT_SUCCESS (vrc)) 143 143 { 144 144 Assert (pBase); … … 163 163 (PFNRT)VMR3Save, 4, pVM, g_pszStateFile, &callProgressInfo, NULL); 164 164 endProgressInfo(); 165 if ( VBOX_SUCCESS(rc))165 if (RT_SUCCESS(rc)) 166 166 { 167 167 rc = pReq->iStatus; … … 196 196 (PFNRT)VMR3Suspend, 1, pVM); 197 197 AssertRC(rc); 198 if ( VBOX_SUCCESS(rc))198 if (RT_SUCCESS(rc)) 199 199 { 200 200 rc = pReq->iStatus; … … 206 206 rc = RTThreadCreate(&thread, VMSaveThread, (void*)pfnQuit, 0, 207 207 RTTHREADTYPE_MAIN_WORKER, 0, "Save"); 208 if ( VBOX_FAILURE(rc))208 if (RT_FAILURE(rc)) 209 209 { 210 210 RTPrintf("Error: Thread creation failed with %d\n", rc); -
trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp
r11820 r13835 466 466 void *pv; 467 467 rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv); 468 if ( VBOX_FAILURE(rc))468 if (RT_FAILURE(rc)) 469 469 { 470 470 AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc)); … … 479 479 { 480 480 rc = pData->pVMMDev->hgcmLoadService (VBOXSHAREDFOLDERS_DLL, "VBoxSharedFolders"); 481 pData->pVMMDev->fSharedFolderActive = VBOX_SUCCESS(rc);482 if ( VBOX_SUCCESS(rc))481 pData->pVMMDev->fSharedFolderActive = RT_SUCCESS(rc); 482 if (RT_SUCCESS(rc)) 483 483 LogRel(("Shared Folders service loaded.\n")); 484 484 else -
trunk/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h
r8155 r13835 128 128 #define ComAssertMsgRC(vrc, msg) AssertMsgRC (vrc, msg) 129 129 #else 130 #define ComAssertMsgRC(vrc, msg) ComAssertMsg ( VBOX_SUCCESS (vrc), msg)130 #define ComAssertMsgRC(vrc, msg) ComAssertMsg (RT_SUCCESS (vrc), msg) 131 131 #endif 132 132 … … 183 183 /** Special version of ComAssertRC that returns ret if vrc does not succeed */ 184 184 #define ComAssertRCRet(vrc, ret) \ 185 do { ComAssertRC (vrc); if (! VBOX_SUCCESS (vrc)) return (ret); } while (0)185 do { ComAssertRC (vrc); if (!RT_SUCCESS (vrc)) return (ret); } while (0) 186 186 /** Special version of ComAssertMsgRC that returns ret if vrc does not succeed */ 187 187 #define ComAssertMsgRCRet(vrc, msg, ret) \ 188 do { ComAssertMsgRC (vrc, msg); if (! VBOX_SUCCESS (vrc)) return (ret); } while (0)188 do { ComAssertMsgRC (vrc, msg); if (!RT_SUCCESS (vrc)) return (ret); } while (0) 189 189 /** Special version of ComAssertFailed that returns ret */ 190 190 #define ComAssertFailedRet(ret) \ … … 206 206 /** Special version of ComAssertRC that evaulates eval and breaks if vrc does not succeed */ 207 207 #define ComAssertRCBreak(vrc, eval) \ 208 if (1) { ComAssertRC (vrc); if (! VBOX_SUCCESS (vrc)) { eval; break; } } else do {} while (0)208 if (1) { ComAssertRC (vrc); if (!RT_SUCCESS (vrc)) { eval; break; } } else do {} while (0) 209 209 /** Special version of ComAssertMsgRC that evaulates eval and breaks if vrc does not succeed */ 210 210 #define ComAssertMsgRCBreak(vrc, msg, eval) \ 211 if (1) { ComAssertMsgRC (vrc, msg); if (! VBOX_SUCCESS (vrc)) { eval; break; } } else do {} while (0)211 if (1) { ComAssertMsgRC (vrc, msg); if (!RT_SUCCESS (vrc)) { eval; break; } } else do {} while (0) 212 212 /** Special version of ComAssertFailed that vaulates eval and breaks */ 213 213 #define ComAssertFailedBreak(eval) \
Note:
See TracChangeset
for help on using the changeset viewer.