Index: /trunk/src/VBox/Main/ConsoleImpl2.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 26185) +++ /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 26186) @@ -1035,5 +1035,5 @@ { ComPtr medium; - hrc = atts [j]->COMGETTER(Medium)(medium.asOutParam()); H(); + hrc = atts[j]->COMGETTER(Medium)(medium.asOutParam()); H(); LONG lDev; hrc = atts[j]->COMGETTER(Device)(&lDev); H(); @@ -2096,5 +2096,5 @@ /* Register VM state change handler */ int rc2 = VMR3AtStateRegister (pVM, Console::vmstateChangeCallback, pConsole); - AssertRC (rc2); + AssertRC(rc2); if (RT_SUCCESS(rc)) rc = rc2; @@ -2102,5 +2102,5 @@ /* Register VM runtime error handler */ rc2 = VMR3AtRuntimeErrorRegister (pVM, Console::setVMRuntimeErrorCallback, pConsole); - AssertRC (rc2); + AssertRC(rc2); if (RT_SUCCESS(rc)) rc = rc2; @@ -2306,5 +2306,5 @@ } - Assert ((int)pThis->maTapFD[uInstance] >= 0); + Assert((int)pThis->maTapFD[uInstance] >= 0); if ((int)pThis->maTapFD[uInstance] >= 0) { @@ -2514,5 +2514,5 @@ } - Assert ((int)pThis->maTapFD[uInstance] >= 0); + Assert((int)pThis->maTapFD[uInstance] >= 0); if ((int)pThis->maTapFD[uInstance] >= 0) { Index: /trunk/src/VBox/Main/ConsoleVRDPServer.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleVRDPServer.cpp (revision 26185) +++ /trunk/src/VBox/Main/ConsoleVRDPServer.cpp (revision 26186) @@ -46,6 +46,6 @@ { public: - VRDPConsoleCallback (ConsoleVRDPServer *server) : - m_server(server) + VRDPConsoleCallback(ConsoleVRDPServer *server) + : m_server(server) { #ifndef VBOX_WITH_XPCOM @@ -60,14 +60,14 @@ #ifndef VBOX_WITH_XPCOM STDMETHOD_(ULONG, AddRef)() { - return ::InterlockedIncrement (&refcnt); + return ::InterlockedIncrement(&refcnt); } STDMETHOD_(ULONG, Release)() { - long cnt = ::InterlockedDecrement (&refcnt); + long cnt = ::InterlockedDecrement(&refcnt); if (cnt == 0) delete this; return cnt; } - STDMETHOD(QueryInterface) (REFIID riid , void **ppObj) + STDMETHOD(QueryInterface)(REFIID riid , void **ppObj) { if (riid == IID_IUnknown) { @@ -103,5 +103,5 @@ if (m_server) { - m_server->NotifyKeyboardLedsChange (fNumLock, fCapsLock, fScrollLock); + m_server->NotifyKeyboardLedsChange(fNumLock, fCapsLock, fScrollLock); } return S_OK; @@ -128,20 +128,20 @@ } - STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter) + STDMETHOD(OnNetworkAdapterChange)(INetworkAdapter *aNetworkAdapter) { return S_OK; } - STDMETHOD(OnSerialPortChange) (ISerialPort *aSerialPort) + STDMETHOD(OnSerialPortChange)(ISerialPort *aSerialPort) { return S_OK; } - STDMETHOD(OnParallelPortChange) (IParallelPort *aParallelPort) + STDMETHOD(OnParallelPortChange)(IParallelPort *aParallelPort) { return S_OK; } - STDMETHOD(OnStorageControllerChange) () + STDMETHOD(OnStorageControllerChange)() { return S_OK; @@ -169,5 +169,5 @@ } - STDMETHOD(OnSharedFolderChange) (Scope_T aScope) + STDMETHOD(OnSharedFolderChange)(Scope_T aScope) { return S_OK; @@ -188,5 +188,5 @@ } - STDMETHOD(OnShowWindow) (ULONG64 *winId) + STDMETHOD(OnShowWindow)(ULONG64 *winId) { if (!winId) @@ -212,5 +212,5 @@ #ifdef DEBUG_sunlover #define LOGDUMPPTR Log -void dumpPointer (const uint8_t *pu8Shape, uint32_t width, uint32_t height, bool fXorMaskRGB32) +void dumpPointer(const uint8_t *pu8Shape, uint32_t width, uint32_t height, bool fXorMaskRGB32) { unsigned i; @@ -237,5 +237,5 @@ if (fXorMaskRGB32) { - uint32_t *pu32Xor = (uint32_t *)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3)); + uint32_t *pu32Xor = (uint32_t*)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3)); for (i = 0; i < height; i++) @@ -253,5 +253,5 @@ { /* RDP 24 bit RGB mask. */ - uint8_t *pu8Xor = (uint8_t *)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3)); + uint8_t *pu8Xor = (uint8_t*)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3)); for (i = 0; i < height; i++) { @@ -271,5 +271,5 @@ #endif /* DEBUG_sunlover */ -static void findTopLeftBorder (const uint8_t *pu8AndMask, const uint8_t *pu8XorMask, uint32_t width, uint32_t height, uint32_t *pxSkip, uint32_t *pySkip) +static void findTopLeftBorder(const uint8_t *pu8AndMask, const uint8_t *pu8XorMask, uint32_t width, uint32_t height, uint32_t *pxSkip, uint32_t *pySkip) { /* @@ -391,6 +391,6 @@ } - *pxSkip = RT_MIN (xSkipAnd, xSkipXor); - *pySkip = RT_MIN (ySkipAnd, ySkipXor); + *pxSkip = RT_MIN(xSkipAnd, xSkipXor); + *pySkip = RT_MIN(ySkipAnd, ySkipXor); } @@ -401,7 +401,7 @@ * necessary, which we try to avoid. */ -static void mousePointerGenerateANDMask (uint8_t *pu8DstAndMask, int cbDstAndMask, const uint8_t *pu8SrcAlpha, int w, int h) -{ - memset (pu8DstAndMask, 0xFF, cbDstAndMask); +static void mousePointerGenerateANDMask(uint8_t *pu8DstAndMask, int cbDstAndMask, const uint8_t *pu8SrcAlpha, int w, int h) +{ + memset(pu8DstAndMask, 0xFF, cbDstAndMask); int y; @@ -431,12 +431,11 @@ } -STDMETHODIMP VRDPConsoleCallback::OnMousePointerShapeChange ( - BOOL visible, - BOOL alpha, - ULONG xHot, - ULONG yHot, - ULONG width, - ULONG height, - BYTE *shape) +STDMETHODIMP VRDPConsoleCallback::OnMousePointerShapeChange(BOOL visible, + BOOL alpha, + ULONG xHot, + ULONG yHot, + ULONG width, + ULONG height, + BYTE *shape) { LogSunlover(("VRDPConsoleCallback::OnMousePointerShapeChange: %d, %d, %lux%lu, @%lu,%lu\n", visible, alpha, width, height, xHot, yHot)); @@ -448,5 +447,5 @@ if (!visible) { - m_server->MousePointerHide (); + m_server->MousePointerHide(); } } @@ -470,5 +469,5 @@ */ - dumpPointer (shape, width, height, true); + dumpPointer(shape, width, height, true); int cbDstAndMask = (((width + 7) / 8) * height + 3) & ~3; @@ -479,7 +478,7 @@ if (alpha) { - pu8AndMask = (uint8_t *)alloca (cbDstAndMask); - - mousePointerGenerateANDMask (pu8AndMask, cbDstAndMask, pu8XorMask, width, height); + pu8AndMask = (uint8_t*)alloca(cbDstAndMask); + + mousePointerGenerateANDMask(pu8AndMask, cbDstAndMask, pu8XorMask, width, height); } @@ -493,9 +492,9 @@ uint32_t xSkip = 0; /* How many columns to skip at the left. */ - findTopLeftBorder (pu8AndMask, pu8XorMask, width, height, &xSkip, &ySkip); + findTopLeftBorder(pu8AndMask, pu8XorMask, width, height, &xSkip, &ySkip); /* Must not skip the hot spot. */ - xSkip = RT_MIN (xSkip, xHot); - ySkip = RT_MIN (ySkip, yHot); + xSkip = RT_MIN(xSkip, xHot); + ySkip = RT_MIN(ySkip, yHot); /* @@ -515,13 +514,13 @@ uint32_t rdpdatalen = dstheight * rdpdatawidth; - pointer = (VRDPCOLORPOINTER *)RTMemTmpAlloc (sizeof (VRDPCOLORPOINTER) + rdpmasklen + rdpdatalen); + pointer = (VRDPCOLORPOINTER *)RTMemTmpAlloc(sizeof(VRDPCOLORPOINTER) + rdpmasklen + rdpdatalen); if (pointer) { - uint8_t *maskarray = (uint8_t *)pointer + sizeof (VRDPCOLORPOINTER); + uint8_t *maskarray = (uint8_t*)pointer + sizeof(VRDPCOLORPOINTER); uint8_t *dataarray = maskarray + rdpmasklen; - memset (maskarray, 0xFF, rdpmasklen); - memset (dataarray, 0x00, rdpdatalen); + memset(maskarray, 0xFF, rdpmasklen); + memset(dataarray, 0x00, rdpdatalen); uint32_t srcmaskwidth = (width + 7) / 8; @@ -532,6 +531,6 @@ uint8_t *dst = maskarray + (dstheight - 1) * rdpmaskwidth; - uint32_t minheight = RT_MIN (height - ySkip, dstheight); - uint32_t minwidth = RT_MIN (width - xSkip, dstwidth); + uint32_t minheight = RT_MIN(height - ySkip, dstheight); + uint32_t minwidth = RT_MIN(width - xSkip, dstwidth); unsigned x, y; @@ -567,5 +566,5 @@ for (x = 0; x < minwidth; x++) { - memcpy (dst + x * 3, &src[4 * (x + xSkip)], 3); + memcpy(dst + x * 3, &src[4 * (x + xSkip)], 3); } @@ -583,9 +582,9 @@ pointer->u16DataLen = (uint16_t)rdpdatalen; - dumpPointer ((uint8_t *)pointer + sizeof (*pointer), dstwidth, dstheight, false); - - m_server->MousePointerUpdate (pointer); - - RTMemTmpFree (pointer); + dumpPointer((uint8_t*)pointer + sizeof(*pointer), dstwidth, dstheight, false); + + m_server->MousePointerUpdate(pointer); + + RTMemTmpFree(pointer); } } @@ -608,5 +607,5 @@ VRDPCALLBACKS_1 ConsoleVRDPServer::mCallbacks = { - { VRDP_INTERFACE_VERSION_1, sizeof (VRDPCALLBACKS_1) }, + { VRDP_INTERFACE_VERSION_1, sizeof(VRDPCALLBACKS_1) }, ConsoleVRDPServer::VRDPCallbackQueryProperty, ConsoleVRDPServer::VRDPCallbackClientLogon, @@ -623,7 +622,7 @@ }; -DECLCALLBACK(int) ConsoleVRDPServer::VRDPCallbackQueryProperty (void *pvCallback, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) -{ - ConsoleVRDPServer *server = static_cast (pvCallback); +DECLCALLBACK(int) ConsoleVRDPServer::VRDPCallbackQueryProperty(void *pvCallback, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) +{ + ConsoleVRDPServer *server = static_cast(pvCallback); int rc = VERR_NOT_SUPPORTED; @@ -636,5 +635,5 @@ ULONG port = 0; - if (cbBuffer >= sizeof (uint32_t)) + if (cbBuffer >= sizeof(uint32_t)) { *(uint32_t *)pvBuffer = (uint32_t)port; @@ -646,5 +645,5 @@ } - *pcbOut = sizeof (uint32_t); + *pcbOut = sizeof(uint32_t); } break; @@ -652,10 +651,10 @@ { com::Bstr bstr; - server->mConsole->getVRDPServer ()->COMGETTER(NetAddress) (bstr.asOutParam()); + server->mConsole->getVRDPServer()->COMGETTER(NetAddress)(bstr.asOutParam()); /* The server expects UTF8. */ com::Utf8Str address = bstr; - size_t cbAddress = address.length () + 1; + size_t cbAddress = address.length() + 1; if (cbAddress >= 0x10000) @@ -672,5 +671,5 @@ if (address.raw()) { - memcpy (pvBuffer, address.raw(), cbAddress); + memcpy(pvBuffer, address.raw(), cbAddress); } else @@ -695,7 +694,7 @@ ULONG cMonitors = 1; - server->mConsole->machine ()->COMGETTER(MonitorCount)(&cMonitors); - - if (cbBuffer >= sizeof (uint32_t)) + server->mConsole->machine()->COMGETTER(MonitorCount)(&cMonitors); + + if (cbBuffer >= sizeof(uint32_t)) { *(uint32_t *)pvBuffer = (uint32_t)cMonitors; @@ -707,5 +706,5 @@ } - *pcbOut = sizeof (uint32_t); + *pcbOut = sizeof(uint32_t); } break; @@ -713,5 +712,5 @@ { com::Bstr bstr; - HRESULT hrc = server->mConsole->getVRDPServer ()->COMGETTER(Ports) (bstr.asOutParam()); + HRESULT hrc = server->mConsole->getVRDPServer()->COMGETTER(Ports)(bstr.asOutParam()); if (hrc != S_OK) @@ -743,5 +742,5 @@ if (portRange.raw()) { - memcpy (pvBuffer, portRange.raw(), cbPortRange); + memcpy(pvBuffer, portRange.raw(), cbPortRange); } else @@ -764,5 +763,5 @@ case VRDP_SP_NETWORK_BIND_PORT: { - if (cbBuffer != sizeof (uint32_t)) + if (cbBuffer != sizeof(uint32_t)) { rc = VERR_INVALID_PARAMETER; @@ -778,8 +777,8 @@ if (pcbOut) { - *pcbOut = sizeof (uint32_t); - } - - server->mConsole->onRemoteDisplayInfoChange (); + *pcbOut = sizeof(uint32_t); + } + + server->mConsole->onRemoteDisplayInfoChange(); } break; @@ -791,7 +790,7 @@ } -DECLCALLBACK(int) ConsoleVRDPServer::VRDPCallbackClientLogon (void *pvCallback, uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain) -{ - ConsoleVRDPServer *server = static_cast (pvCallback); +DECLCALLBACK(int) ConsoleVRDPServer::VRDPCallbackClientLogon(void *pvCallback, uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain) +{ + ConsoleVRDPServer *server = static_cast(pvCallback); return server->mConsole->VRDPClientLogon (u32ClientId, pszUser, pszPassword, pszDomain); @@ -800,5 +799,5 @@ DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackClientConnect (void *pvCallback, uint32_t u32ClientId) { - ConsoleVRDPServer *server = static_cast (pvCallback); + ConsoleVRDPServer *server = static_cast(pvCallback); server->mConsole->VRDPClientConnect (u32ClientId); @@ -807,5 +806,5 @@ DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackClientDisconnect (void *pvCallback, uint32_t u32ClientId, uint32_t fu32Intercepted) { - ConsoleVRDPServer *server = static_cast (pvCallback); + ConsoleVRDPServer *server = static_cast(pvCallback); server->mConsole->VRDPClientDisconnect (u32ClientId, fu32Intercepted); @@ -814,5 +813,5 @@ DECLCALLBACK(int) ConsoleVRDPServer::VRDPCallbackIntercept (void *pvCallback, uint32_t u32ClientId, uint32_t fu32Intercept, void **ppvIntercept) { - ConsoleVRDPServer *server = static_cast (pvCallback); + ConsoleVRDPServer *server = static_cast(pvCallback); LogFlowFunc(("%x\n", fu32Intercept)); @@ -871,5 +870,5 @@ DECLCALLBACK(bool) ConsoleVRDPServer::VRDPCallbackFramebufferQuery (void *pvCallback, unsigned uScreenId, VRDPFRAMEBUFFERINFO *pInfo) { - ConsoleVRDPServer *server = static_cast (pvCallback); + ConsoleVRDPServer *server = static_cast(pvCallback); bool fAvailable = false; @@ -926,5 +925,5 @@ DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackFramebufferLock (void *pvCallback, unsigned uScreenId) { - ConsoleVRDPServer *server = static_cast (pvCallback); + ConsoleVRDPServer *server = static_cast(pvCallback); if (server->maFramebuffers[uScreenId]) @@ -936,5 +935,5 @@ DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackFramebufferUnlock (void *pvCallback, unsigned uScreenId) { - ConsoleVRDPServer *server = static_cast (pvCallback); + ConsoleVRDPServer *server = static_cast(pvCallback); if (server->maFramebuffers[uScreenId]) @@ -964,5 +963,5 @@ DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackInput (void *pvCallback, int type, const void *pvInput, unsigned cbInput) { - ConsoleVRDPServer *server = static_cast (pvCallback); + ConsoleVRDPServer *server = static_cast(pvCallback); Console *pConsole = server->mConsole; @@ -1093,7 +1092,7 @@ DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackVideoModeHint (void *pvCallback, unsigned cWidth, unsigned cHeight, unsigned cBitsPerPixel, unsigned uScreenId) { - ConsoleVRDPServer *server = static_cast (pvCallback); - - server->mConsole->getDisplay ()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId); + ConsoleVRDPServer *server = static_cast(pvCallback); + + server->mConsole->getDisplay()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId); } #endif /* VBOX_WITH_VRDP */ @@ -1103,6 +1102,6 @@ mConsole = console; - int rc = RTCritSectInit (&mCritSect); - AssertRC (rc); + int rc = RTCritSectInit(&mCritSect); + AssertRC(rc); mcClipboardRefs = 0; @@ -1338,5 +1337,5 @@ mUSBBackends.fThreadRunning = true; int rc = RTThreadUserSignal (thread); - AssertRC (rc); + AssertRC(rc); } @@ -1378,5 +1377,5 @@ /* Wait until the thread is ready. */ rc = RTThreadUserWait (mUSBBackends.thread, 60000); - AssertRC (rc); + AssertRC(rc); Assert (mUSBBackends.fThreadRunning || RT_FAILURE(rc)); } @@ -1394,5 +1393,5 @@ int rc = RTThreadWait (mUSBBackends.thread, 60000, NULL); - AssertRC (rc); + AssertRC(rc); mUSBBackends.thread = NIL_RTTHREAD; @@ -1486,5 +1485,5 @@ if (RT_FAILURE(rc)) { - mConsole->reportAuthLibraryError (filename.raw(), rc); + mConsole->reportAuthLibraryError(filename.raw(), rc); mpfnAuthEntry = NULL; @@ -1546,5 +1545,5 @@ { int rc = RTCritSectEnter (&mCritSect); - AssertRC (rc); + AssertRC(rc); return rc; } @@ -1941,5 +1940,5 @@ #ifdef VBOX_WITH_USB int rc = lockConsoleVRDPServer (); - AssertRC (rc); + AssertRC(rc); /* Exclude the found instance from the list. */ Index: /trunk/src/VBox/Main/DHCPServerRunner.cpp =================================================================== --- /trunk/src/VBox/Main/DHCPServerRunner.cpp (revision 26185) +++ /trunk/src/VBox/Main/DHCPServerRunner.cpp (revision 26186) @@ -86,6 +86,6 @@ /* get the path to the executable */ - char exePathBuf [RTPATH_MAX]; - const char *exePath = RTProcGetExecutableName (exePathBuf, RTPATH_MAX); + char exePathBuf[RTPATH_MAX]; + const char *exePath = RTProcGetExecutableName(exePathBuf, RTPATH_MAX); char *substrSl = strrchr(exePathBuf, '/'); char *substrBs = strrchr(exePathBuf, '\\'); @@ -121,5 +121,5 @@ args[index++] = NULL; - int rc = RTProcCreate (exePath, args, RTENV_DEFAULT, 0, &mProcess); + int rc = RTProcCreate(exePath, args, RTENV_DEFAULT, 0, &mProcess); if (RT_FAILURE(rc)) mProcess = NIL_RTPROCESS; Index: /trunk/src/VBox/Main/DisplayImpl.cpp =================================================================== --- /trunk/src/VBox/Main/DisplayImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/DisplayImpl.cpp (revision 26186) @@ -105,6 +105,6 @@ #ifdef VBOX_WITH_OLD_VBVA_LOCK - int rc = RTCritSectInit (&mVBVALock); - AssertRC (rc); + int rc = RTCritSectInit(&mVBVALock); + AssertRC(rc); mfu32PendingVideoAccelDisable = false; #endif /* VBOX_WITH_OLD_VBVA_LOCK */ @@ -2247,9 +2247,9 @@ if (vrc == VERR_NOT_IMPLEMENTED) - rc = setError (E_NOTIMPL, - tr ("This feature is not implemented")); + rc = setError(E_NOTIMPL, + tr("This feature is not implemented")); else if (RT_FAILURE(vrc)) - rc = setError (VBOX_E_IPRT_ERROR, - tr ("Could not take a screenshot (%Rrc)"), vrc); + rc = setError(VBOX_E_IPRT_ERROR, + tr("Could not take a screenshot (%Rrc)"), vrc); LogFlowFunc (("rc=%08X\n", rc)); @@ -2323,9 +2323,9 @@ } else if (vrc == VERR_NOT_IMPLEMENTED) - rc = setError (E_NOTIMPL, - tr ("This feature is not implemented")); + rc = setError(E_NOTIMPL, + tr("This feature is not implemented")); else - rc = setError (VBOX_E_IPRT_ERROR, - tr ("Could not take a screenshot (%Rrc)"), vrc); + rc = setError(VBOX_E_IPRT_ERROR, + tr("Could not take a screenshot (%Rrc)"), vrc); LogFlowFunc (("rc=%08X\n", rc)); @@ -2395,6 +2395,6 @@ } else if (RT_FAILURE(rcVBox)) - rc = setError (VBOX_E_IPRT_ERROR, - tr ("Could not draw to the screen (%Rrc)"), rcVBox); + rc = setError(VBOX_E_IPRT_ERROR, + tr("Could not draw to the screen (%Rrc)"), rcVBox); //@todo // else @@ -2456,6 +2456,6 @@ if (RT_FAILURE(rcVBox)) - rc = setError (VBOX_E_IPRT_ERROR, - tr ("Could not invalidate and update the screen (%Rrc)"), rcVBox); + rc = setError(VBOX_E_IPRT_ERROR, + tr("Could not invalidate and update the screen (%Rrc)"), rcVBox); LogFlowFunc (("rc=%08X\n", rc)); @@ -2487,7 +2487,6 @@ /* this is only valid for external framebuffers */ if (maFramebuffers[aScreenId].pFramebuffer == NULL) - return setError (VBOX_E_NOT_SUPPORTED, - tr ("Resize completed notification is valid only " - "for external framebuffers")); + return setError(VBOX_E_NOT_SUPPORTED, + tr("Resize completed notification is valid only for external framebuffers")); /* Set the flag indicating that the resize has completed and display @@ -2523,7 +2522,6 @@ /* this is only valid for external framebuffers */ if (maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer == NULL) - return setError (VBOX_E_NOT_SUPPORTED, - tr ("Resize completed notification is valid only " - "for external framebuffers")); + return setError(VBOX_E_NOT_SUPPORTED, + tr("Resize completed notification is valid only for external framebuffers")); return S_OK; Index: /trunk/src/VBox/Main/GuestImpl.cpp =================================================================== --- /trunk/src/VBox/Main/GuestImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/GuestImpl.cpp (revision 26186) @@ -283,6 +283,6 @@ } - return setError (VBOX_E_VM_ERROR, - tr ("VMM device is not available (is the VM running?)")); + return setError(VBOX_E_VM_ERROR, + tr("VMM device is not available (is the VM running?)")); } Index: /trunk/src/VBox/Main/HostImpl.cpp =================================================================== --- /trunk/src/VBox/Main/HostImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/HostImpl.cpp (revision 26186) @@ -225,17 +225,17 @@ */ # if defined (RT_OS_DARWIN) - m->pUSBProxyService = new USBProxyServiceDarwin (this); + m->pUSBProxyService = new USBProxyServiceDarwin(this); # elif defined (RT_OS_LINUX) - m->pUSBProxyService = new USBProxyServiceLinux (this); + m->pUSBProxyService = new USBProxyServiceLinux(this); # elif defined (RT_OS_OS2) m->pUSBProxyService = new USBProxyServiceOs2 (this); # elif defined (RT_OS_SOLARIS) - m->pUSBProxyService = new USBProxyServiceSolaris (this); + m->pUSBProxyService = new USBProxyServiceSolaris(this); # elif defined (RT_OS_WINDOWS) - m->pUSBProxyService = new USBProxyServiceWindows (this); + m->pUSBProxyService = new USBProxyServiceWindows(this); # elif defined (RT_OS_FREEBSD) - m->pUSBProxyService = new USBProxyServiceFreeBSD (this); + m->pUSBProxyService = new USBProxyServiceFreeBSD(this); # else - m->pUSBProxyService = new USBProxyService (this); + m->pUSBProxyService = new USBProxyService(this); # endif HRESULT hrc = m->pUSBProxyService->init(); @@ -248,9 +248,9 @@ #if defined (RT_OS_WINDOWS) - m->pHostPowerService = new HostPowerServiceWin (m->pParent); + m->pHostPowerService = new HostPowerServiceWin(m->pParent); #elif defined (RT_OS_DARWIN) - m->pHostPowerService = new HostPowerServiceDarwin (m->pParent); + m->pHostPowerService = new HostPowerServiceDarwin(m->pParent); #else - m->pHostPowerService = new HostPowerService (m->pParent); + m->pHostPowerService = new HostPowerService(m->pParent); #endif @@ -1157,5 +1157,5 @@ ComObjPtr filter; filter.createObject(); - HRESULT rc = filter->init (this, aName); + HRESULT rc = filter->init(this, aName); ComAssertComRCRet (rc, rc); rc = filter.queryInterfaceTo(aFilter); @@ -1203,6 +1203,6 @@ if (pFilter->mInList) - return setError (E_INVALIDARG, - tr ("The given USB device filter is already in the list")); + return setError(E_INVALIDARG, + tr("The given USB device filter is already in the list")); /* iterate to the position... */ @@ -1248,11 +1248,11 @@ if (!m->llUSBDeviceFilters.size()) - return setError (E_INVALIDARG, - tr ("The USB device filter list is empty")); + return setError(E_INVALIDARG, + tr("The USB device filter list is empty")); if (aPosition >= m->llUSBDeviceFilters.size()) - return setError (E_INVALIDARG, - tr ("Invalid position: %lu (must be in range [0, %lu])"), - aPosition, m->llUSBDeviceFilters.size() - 1); + return setError(E_INVALIDARG, + tr("Invalid position: %lu (must be in range [0, %lu])"), + aPosition, m->llUSBDeviceFilters.size() - 1); ComObjPtr filter; @@ -1369,6 +1369,6 @@ if (!found) - return setError (E_INVALIDARG, HostNetworkInterface::tr ( - "The host network interface with the given name could not be found")); + return setError(E_INVALIDARG, + HostNetworkInterface::tr("The host network interface with the given name could not be found")); found->setVirtualBox(m->pParent); @@ -1407,6 +1407,6 @@ if (!found) - return setError (E_INVALIDARG, HostNetworkInterface::tr ( - "The host network interface with the given GUID could not be found")); + return setError(E_INVALIDARG, + HostNetworkInterface::tr("The host network interface with the given GUID could not be found")); found->setVirtualBox(m->pParent); @@ -1448,5 +1448,5 @@ STDMETHODIMP Host::FindUSBDeviceByAddress(IN_BSTR aAddress, - IHostUSBDevice **aDevice) + IHostUSBDevice **aDevice) { #ifdef VBOX_WITH_USB @@ -2402,21 +2402,21 @@ #ifdef VBOX_WITH_RESOURCE_USAGE_API -void Host::registerMetrics (PerformanceCollector *aCollector) +void Host::registerMetrics(PerformanceCollector *aCollector) { pm::CollectorHAL *hal = aCollector->getHAL(); /* Create sub metrics */ - pm::SubMetric *cpuLoadUser = new pm::SubMetric ("CPU/Load/User", + pm::SubMetric *cpuLoadUser = new pm::SubMetric("CPU/Load/User", "Percentage of processor time spent in user mode."); - pm::SubMetric *cpuLoadKernel = new pm::SubMetric ("CPU/Load/Kernel", + pm::SubMetric *cpuLoadKernel = new pm::SubMetric("CPU/Load/Kernel", "Percentage of processor time spent in kernel mode."); - pm::SubMetric *cpuLoadIdle = new pm::SubMetric ("CPU/Load/Idle", + pm::SubMetric *cpuLoadIdle = new pm::SubMetric("CPU/Load/Idle", "Percentage of processor time spent idling."); - pm::SubMetric *cpuMhzSM = new pm::SubMetric ("CPU/MHz", + pm::SubMetric *cpuMhzSM = new pm::SubMetric("CPU/MHz", "Average of current frequency of all processors."); - pm::SubMetric *ramUsageTotal = new pm::SubMetric ("RAM/Usage/Total", + pm::SubMetric *ramUsageTotal = new pm::SubMetric("RAM/Usage/Total", "Total physical memory installed."); - pm::SubMetric *ramUsageUsed = new pm::SubMetric ("RAM/Usage/Used", + pm::SubMetric *ramUsageUsed = new pm::SubMetric("RAM/Usage/Used", "Physical memory currently occupied."); - pm::SubMetric *ramUsageFree = new pm::SubMetric ("RAM/Usage/Free", + pm::SubMetric *ramUsageFree = new pm::SubMetric("RAM/Usage/Free", "Physical memory currently available to applications."); /* Create and register base metrics */ @@ -2424,74 +2424,74 @@ ComObjPtr tmp = this; tmp.queryInterfaceTo(&objptr); - pm::BaseMetric *cpuLoad = new pm::HostCpuLoadRaw (hal, objptr, cpuLoadUser, cpuLoadKernel, + pm::BaseMetric *cpuLoad = new pm::HostCpuLoadRaw(hal, objptr, cpuLoadUser, cpuLoadKernel, cpuLoadIdle); aCollector->registerBaseMetric (cpuLoad); - pm::BaseMetric *cpuMhz = new pm::HostCpuMhz (hal, objptr, cpuMhzSM); + pm::BaseMetric *cpuMhz = new pm::HostCpuMhz(hal, objptr, cpuMhzSM); aCollector->registerBaseMetric (cpuMhz); - pm::BaseMetric *ramUsage = new pm::HostRamUsage (hal, objptr, ramUsageTotal, ramUsageUsed, + pm::BaseMetric *ramUsage = new pm::HostRamUsage(hal, objptr, ramUsageTotal, ramUsageUsed, ramUsageFree); aCollector->registerBaseMetric (ramUsage); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser, 0)); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser, - new pm::AggregateMax())); - - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel, 0)); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel, - new pm::AggregateMax())); - - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle, 0)); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle, - new pm::AggregateMax())); - - aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM, 0)); - aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM, - new pm::AggregateMax())); - - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal, 0)); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal, - new pm::AggregateMax())); - - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed, 0)); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed, - new pm::AggregateMax())); - - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree, 0)); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree, - new pm::AggregateMax())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, 0)); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, + new pm::AggregateMax())); + + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, 0)); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, + new pm::AggregateMax())); + + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, 0)); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, + new pm::AggregateMax())); + + aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM, 0)); + aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM, + new pm::AggregateMax())); + + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal, 0)); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal, + new pm::AggregateMax())); + + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, 0)); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, + new pm::AggregateMax())); + + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree, 0)); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree, + new pm::AggregateMax())); }; void Host::unregisterMetrics (PerformanceCollector *aCollector) { - aCollector->unregisterMetricsFor (this); - aCollector->unregisterBaseMetricsFor (this); + aCollector->unregisterMetricsFor(this); + aCollector->unregisterBaseMetricsFor(this); }; #endif /* VBOX_WITH_RESOURCE_USAGE_API */ Index: /trunk/src/VBox/Main/HostPower.cpp =================================================================== --- /trunk/src/VBox/Main/HostPower.cpp (revision 26185) +++ /trunk/src/VBox/Main/HostPower.cpp (revision 26186) @@ -36,5 +36,5 @@ HostPowerService::HostPowerService (VirtualBox *aVirtualBox) { - Assert (aVirtualBox != NULL); + Assert(aVirtualBox != NULL); mVirtualBox = aVirtualBox; } @@ -75,7 +75,7 @@ /* get the remote console */ ComPtr console; - rc = pControl->GetRemoteConsole (console.asOutParam()); + rc = pControl->GetRemoteConsole(console.asOutParam()); /* the VM could have been powered down and closed or whatever */ - if (FAILED (rc)) + if (FAILED(rc)) continue; @@ -83,5 +83,5 @@ * in an inappropriate state */ rc = console->Pause(); - if (FAILED (rc)) + if (FAILED(rc)) continue; @@ -102,5 +102,5 @@ /* go through VMs we paused on Suspend */ - for (size_t i = 0; i < mConsoles.size(); ++ i) + for (size_t i = 0; i < mConsoles.size(); ++i) { /* note that Resume() will simply return a failure if the VM is @@ -108,6 +108,6 @@ * been somehow closed by this time already so that the * console reference we have is dead) */ - rc = mConsoles [i]->Resume(); - if (FAILED (rc)) + rc = mConsoles[i]->Resume(); + if (FAILED(rc)) continue; @@ -148,5 +148,5 @@ rc = pControl->GetRemoteConsole (console.asOutParam()); /* the VM could have been powered down and closed or whatever */ - if (FAILED (rc)) + if (FAILED(rc)) continue; @@ -156,5 +156,5 @@ * is in an inappropriate state */ rc = console->SaveState (progress.asOutParam()); - if (FAILED (rc)) + if (FAILED(rc)) continue; Index: /trunk/src/VBox/Main/KeyboardImpl.cpp =================================================================== --- /trunk/src/VBox/Main/KeyboardImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/KeyboardImpl.cpp (revision 26186) @@ -138,12 +138,12 @@ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); - CHECK_CONSOLE_DRV (mpDrv); - - int vrc = mpDrv->pUpPort->pfnPutEvent (mpDrv->pUpPort, (uint8_t)scancode); + CHECK_CONSOLE_DRV(mpDrv); + + int vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)scancode); if (RT_FAILURE(vrc)) - rc = setError (VBOX_E_IPRT_ERROR, - tr ("Could not send scan code 0x%08X to the virtual keyboard (%Rrc)"), - scancode, vrc); + rc = setError(VBOX_E_IPRT_ERROR, + tr("Could not send scan code 0x%08X to the virtual keyboard (%Rrc)"), + scancode, vrc); return rc; @@ -179,10 +179,10 @@ for (uint32_t i = 0; (i < keys.size()) && RT_SUCCESS(vrc); i++) - vrc = mpDrv->pUpPort->pfnPutEvent (mpDrv->pUpPort, (uint8_t)keys [i]); + vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)keys[i]); if (RT_FAILURE(vrc)) - return setError (VBOX_E_IPRT_ERROR, - tr ("Could not send all scan codes to the virtual keyboard (%Rrc)"), - vrc); + return setError(VBOX_E_IPRT_ERROR, + tr("Could not send all scan codes to the virtual keyboard (%Rrc)"), + vrc); /// @todo is it actually possible that not all scancodes can be transmitted? @@ -202,14 +202,14 @@ STDMETHODIMP Keyboard::PutCAD() { - static com::SafeArray cadSequence (6); - - cadSequence [0] = 0x1d; // Ctrl down - cadSequence [1] = 0x38; // Alt down - cadSequence [2] = 0x53; // Del down - cadSequence [3] = 0xd3; // Del up - cadSequence [4] = 0xb8; // Alt up - cadSequence [5] = 0x9d; // Ctrl up - - return PutScancodes (ComSafeArrayAsInParam (cadSequence), NULL); + static com::SafeArray cadSequence(6); + + cadSequence[0] = 0x1d; // Ctrl down + cadSequence[1] = 0x38; // Alt down + cadSequence[2] = 0x53; // Del down + cadSequence[3] = 0xd3; // Del up + cadSequence[4] = 0xb8; // Alt up + cadSequence[5] = 0x9d; // Ctrl up + + return PutScancodes(ComSafeArrayAsInParam(cadSequence), NULL); } Index: /trunk/src/VBox/Main/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/MachineImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/MachineImpl.cpp (revision 26186) @@ -179,9 +179,9 @@ /* default boot order: floppy - DVD - HDD */ - mBootOrder [0] = DeviceType_Floppy; - mBootOrder [1] = DeviceType_DVD; - mBootOrder [2] = DeviceType_HardDisk; - for (size_t i = 3; i < RT_ELEMENTS (mBootOrder); ++i) - mBootOrder [i] = DeviceType_Null; + mBootOrder[0] = DeviceType_Floppy; + mBootOrder[1] = DeviceType_DVD; + mBootOrder[2] = DeviceType_HardDisk; + for (size_t i = 3; i < RT_ELEMENTS(mBootOrder); ++i) + mBootOrder[i] = DeviceType_Null; mClipboardMode = ClipboardMode_Bidirectional; @@ -509,5 +509,5 @@ LogFlowThisFuncEnter(); - Assert (!isWriteLockOnCurrentThread()); + Assert(!isWriteLockOnCurrentThread()); /* Enclose the state transition Ready->InUninit->NotReady */ @@ -1730,5 +1730,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - Assert (!!mVRDPServer); + Assert(!!mVRDPServer); mVRDPServer.queryInterfaceTo(vrdpServer); @@ -2278,5 +2278,5 @@ setModified(IsModified_MachineData); mHWData.backup(); - mHWData->mBootOrder [aPosition - 1] = aDevice; + mHWData->mBootOrder[aPosition - 1] = aDevice; return S_OK; @@ -2295,5 +2295,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - *aDevice = mHWData->mBootOrder [aPosition - 1]; + *aDevice = mHWData->mBootOrder[aPosition - 1]; return S_OK; @@ -3035,8 +3035,8 @@ } -STDMETHODIMP Machine::GetSerialPort (ULONG slot, ISerialPort **port) +STDMETHODIMP Machine::GetSerialPort(ULONG slot, ISerialPort **port) { CheckComArgOutPointerValid(port); - CheckComArgExpr (slot, slot < RT_ELEMENTS (mSerialPorts)); + CheckComArgExpr(slot, slot < RT_ELEMENTS(mSerialPorts)); AutoCaller autoCaller(this); @@ -3045,13 +3045,13 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - mSerialPorts [slot].queryInterfaceTo(port); - - return S_OK; -} - -STDMETHODIMP Machine::GetParallelPort (ULONG slot, IParallelPort **port) + mSerialPorts[slot].queryInterfaceTo(port); + + return S_OK; +} + +STDMETHODIMP Machine::GetParallelPort(ULONG slot, IParallelPort **port) { CheckComArgOutPointerValid(port); - CheckComArgExpr (slot, slot < RT_ELEMENTS (mParallelPorts)); + CheckComArgExpr(slot, slot < RT_ELEMENTS(mParallelPorts)); AutoCaller autoCaller(this); @@ -3060,13 +3060,13 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - mParallelPorts [slot].queryInterfaceTo(port); - - return S_OK; -} - -STDMETHODIMP Machine::GetNetworkAdapter (ULONG slot, INetworkAdapter **adapter) + mParallelPorts[slot].queryInterfaceTo(port); + + return S_OK; +} + +STDMETHODIMP Machine::GetNetworkAdapter(ULONG slot, INetworkAdapter **adapter) { CheckComArgOutPointerValid(adapter); - CheckComArgExpr (slot, slot < RT_ELEMENTS (mNetworkAdapters)); + CheckComArgExpr(slot, slot < RT_ELEMENTS(mNetworkAdapters)); AutoCaller autoCaller(this); @@ -3251,5 +3251,5 @@ * been actually changed */ - rollback (true /* aNotify */); + rollback(true /* aNotify */); return S_OK; @@ -3381,5 +3381,5 @@ // mData->mCurrentStateModified to FALSE - return setError (E_NOTIMPL, "Not implemented"); + return setError(E_NOTIMPL, "Not implemented"); } @@ -3867,7 +3867,7 @@ if ( (aConnectionType <= StorageBus_Null) || (aConnectionType > StorageBus_SAS)) - return setError (E_INVALIDARG, - tr ("Invalid connection type: %d"), - aConnectionType); + return setError(E_INVALIDARG, + tr("Invalid connection type: %d"), + aConnectionType); AutoCaller autoCaller(this); @@ -3884,6 +3884,7 @@ rc = getStorageControllerByName (aName, ctrl, false /* aSetError */); if (SUCCEEDED(rc)) - return setError (VBOX_E_OBJECT_IN_USE, - tr ("Storage controller named '%ls' already exists"), aName); + return setError(VBOX_E_OBJECT_IN_USE, + tr("Storage controller named '%ls' already exists"), + aName); ctrl.createObject(); @@ -4146,6 +4147,7 @@ if (RT_FAILURE(vrc)) - return setError (VBOX_E_IPRT_ERROR, - tr("Saved screenshot data is not available (%Rrc)"), vrc); + return setError(VBOX_E_IPRT_ERROR, + tr("Saved screenshot data is not available (%Rrc)"), + vrc); *aSize = cbData; @@ -4179,6 +4181,7 @@ if (RT_FAILURE(vrc)) - return setError (VBOX_E_IPRT_ERROR, - tr("Saved screenshot data is not available (%Rrc)"), vrc); + return setError(VBOX_E_IPRT_ERROR, + tr("Saved screenshot data is not available (%Rrc)"), + vrc); *aWidth = u32Width; @@ -4237,6 +4240,7 @@ if (RT_FAILURE(vrc)) - return setError (VBOX_E_IPRT_ERROR, - tr("Saved screenshot data is not available (%Rrc)"), vrc); + return setError(VBOX_E_IPRT_ERROR, + tr("Saved screenshot data is not available (%Rrc)"), + vrc); *aSize = cbData; @@ -4270,6 +4274,7 @@ if (RT_FAILURE(vrc)) - return setError (VBOX_E_IPRT_ERROR, - tr("Saved screenshot data is not available (%Rrc)"), vrc); + return setError(VBOX_E_IPRT_ERROR, + tr("Saved screenshot data is not available (%Rrc)"), + vrc); *aWidth = u32Width; @@ -4508,5 +4513,5 @@ { /* Log folder is //Logs */ - Assert (!mUserData->mSnapshotFolderFull.isEmpty()); + Assert(!mUserData->mSnapshotFolderFull.isEmpty()); aLogFolder = Utf8StrFmt ("%ls%cLogs", mUserData->mSnapshotFolderFull.raw(), RTPATH_DELIMITER); @@ -4687,5 +4692,5 @@ * with the relevant part in openSession()). */ - Assert (mData->mSession.mRemoteControls.size() == 1); + Assert(mData->mSession.mRemoteControls.size() == 1); if (mData->mSession.mRemoteControls.size() == 1) { @@ -4850,5 +4855,5 @@ const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE; # endif - Assert (sz >= sizeof (VirtualBox_exe)); + Assert(sz >= sizeof (VirtualBox_exe)); strcpy (cmd, VirtualBox_exe); @@ -4873,5 +4878,5 @@ { const char VBoxSDL_exe[] = "VBoxSDL" HOSTSUFF_EXE; - Assert (sz >= sizeof (VBoxSDL_exe)); + Assert(sz >= sizeof (VBoxSDL_exe)); strcpy (cmd, VBoxSDL_exe); @@ -4901,5 +4906,5 @@ { const char VBoxHeadless_exe[] = "VBoxHeadless" HOSTSUFF_EXE; - Assert (sz >= sizeof (VBoxHeadless_exe)); + Assert(sz >= sizeof (VBoxHeadless_exe)); strcpy (cmd, VBoxHeadless_exe); @@ -4972,5 +4977,5 @@ /* attach launch data to the machine */ - Assert (mData->mSession.mPid == NIL_RTPROCESS); + Assert(mData->mSession.mPid == NIL_RTPROCESS); mData->mSession.mRemoteControls.push_back (aControl); mData->mSession.mProgress = aProgress; @@ -4999,13 +5004,14 @@ if (!mData->mRegistered) - return setError (E_UNEXPECTED, - tr ("The machine '%ls' is not registered"), mUserData->mName.raw()); + return setError(E_UNEXPECTED, + tr("The machine '%ls' is not registered"), + mUserData->mName.raw()); LogFlowThisFunc(("mSession.state=%s\n", Global::stringifySessionState(mData->mSession.mState))); if (mData->mSession.mState != SessionState_Open) - return setError (VBOX_E_INVALID_SESSION_STATE, - tr ("The machine '%ls' does not have an open session"), - mUserData->mName.raw()); + return setError(VBOX_E_INVALID_SESSION_STATE, + tr("The machine '%ls' does not have an open session"), + mUserData->mName.raw()); ComAssertRet (!mData->mSession.mDirectControl.isNull(), E_FAIL); @@ -5018,9 +5024,10 @@ HRESULT rc = mData->mSession.mDirectControl-> GetRemoteConsole (console.asOutParam()); - if (FAILED (rc)) + if (FAILED(rc)) { /* The failure may occur w/o any error info (from RPC), so provide one */ - return setError (VBOX_E_VM_ERROR, - tr ("Failed to get a console object from the direct session (%Rrc)"), rc); + return setError(VBOX_E_VM_ERROR, + tr("Failed to get a console object from the direct session (%Rrc)"), + rc); } @@ -5427,5 +5434,5 @@ ++mData->mMachineStateDeps; - Assert (mData->mMachineStateDeps != 0 /* overflow */); + Assert(mData->mMachineStateDeps != 0 /* overflow */); } @@ -5459,5 +5466,5 @@ if (mData->mMachineStateChangePending != 0) { - Assert (mData->mMachineStateDepsSem != NIL_RTSEMEVENTMULTI); + Assert(mData->mMachineStateDepsSem != NIL_RTSEMEVENTMULTI); RTSemEventMultiSignal (mData->mMachineStateDepsSem); } @@ -5574,39 +5581,39 @@ /* create associated BIOS settings object */ unconst(mBIOSSettings).createObject(); - mBIOSSettings->init (this); + mBIOSSettings->init(this); #ifdef VBOX_WITH_VRDP /* create an associated VRDPServer object (default is disabled) */ unconst(mVRDPServer).createObject(); - mVRDPServer->init (this); + mVRDPServer->init(this); #endif /* create associated serial port objects */ - for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++) - { - unconst(mSerialPorts [slot]).createObject(); - mSerialPorts [slot]->init (this, slot); + for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++) + { + unconst(mSerialPorts[slot]).createObject(); + mSerialPorts[slot]->init(this, slot); } /* create associated parallel port objects */ - for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++) - { - unconst(mParallelPorts [slot]).createObject(); - mParallelPorts [slot]->init (this, slot); + for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++) + { + unconst(mParallelPorts[slot]).createObject(); + mParallelPorts[slot]->init(this, slot); } /* create the audio adapter object (always present, default is disabled) */ unconst(mAudioAdapter).createObject(); - mAudioAdapter->init (this); + mAudioAdapter->init(this); /* create the USB controller object (always present, default is disabled) */ unconst(mUSBController).createObject(); - mUSBController->init (this); + mUSBController->init(this); /* create associated network adapter objects */ - for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++) - { - unconst(mNetworkAdapters [slot]).createObject(); - mNetworkAdapters [slot]->init (this, slot); + for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot ++) + { + unconst(mNetworkAdapters[slot]).createObject(); + mNetworkAdapters[slot]->init(this, slot); } @@ -6770,5 +6777,5 @@ /* new dir and old dir cannot be equal here because of 'if' * above and because name != newName */ - Assert (configDir != newConfigDir); + Assert(configDir != newConfigDir); if (!aNew) { @@ -8021,5 +8028,5 @@ rc = pMedium->UnlockWrite(&state); /* the disk may be alredy relocked for reading above */ - Assert (SUCCEEDED(rc) || state == MediumState_LockedRead); + Assert(SUCCEEDED(rc) || state == MediumState_LockedRead); } } @@ -8300,10 +8307,10 @@ mUSBController->commit(); - for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++) - mNetworkAdapters [slot]->commit(); - for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++) - mSerialPorts [slot]->commit(); - for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++) - mParallelPorts [slot]->commit(); + for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++) + mNetworkAdapters[slot]->commit(); + for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++) + mSerialPorts[slot]->commit(); + for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++) + mParallelPorts[slot]->commit(); bool commitStorageControllers = false; @@ -8332,10 +8339,10 @@ * create a peer owning data this device share it with */ peer.createObject(); - peer->init (mPeer, *it, true /* aReshare */); + peer->init(mPeer, *it, true /* aReshare */); } else { /* remove peer from the old list */ - mPeer->mStorageControllers->remove (peer); + mPeer->mStorageControllers->remove(peer); } /* and add it to the new list */ @@ -8354,5 +8361,5 @@ /* attach new list of controllers to our peer */ - mPeer->mStorageControllers.attach (newList); + mPeer->mStorageControllers.attach(newList); } else @@ -8383,6 +8390,6 @@ { /* attach new data to the primary machine and reshare it */ - mPeer->mUserData.attach (mUserData); - mPeer->mHWData.attach (mHWData); + mPeer->mUserData.attach(mUserData); + mPeer->mHWData.attach(mHWData); /* mMediaData is reshared by fixupMedia */ // mPeer->mMediaData.attach(mMediaData); @@ -8408,5 +8415,5 @@ AssertReturnVoid(aThat->getClassID() == clsidSnapshotMachine); - AssertReturnVoid(!Global::IsOnline (mData->mMachineState)); + AssertReturnVoid(!Global::IsOnline(mData->mMachineState)); mHWData.assignCopy(aThat->mHWData); @@ -8421,5 +8428,5 @@ folder.createObject(); HRESULT rc = folder->initCopy(getMachine(), *it); - AssertComRC (rc); + AssertComRC(rc); *it = folder; } @@ -8441,63 +8448,63 @@ ComObjPtr ctrl; ctrl.createObject(); - ctrl->initCopy (this, *it); + ctrl->initCopy(this, *it); mStorageControllers->push_back(ctrl); } - for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++) - mNetworkAdapters[slot]->copyFrom (aThat->mNetworkAdapters [slot]); - for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++) - mSerialPorts[slot]->copyFrom (aThat->mSerialPorts [slot]); - for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++) - mParallelPorts[slot]->copyFrom (aThat->mParallelPorts [slot]); + for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++) + mNetworkAdapters[slot]->copyFrom(aThat->mNetworkAdapters[slot]); + for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++) + mSerialPorts[slot]->copyFrom(aThat->mSerialPorts[slot]); + for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++) + mParallelPorts[slot]->copyFrom(aThat->mParallelPorts[slot]); } #ifdef VBOX_WITH_RESOURCE_USAGE_API -void Machine::registerMetrics (PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid) +void Machine::registerMetrics(PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid) { pm::CollectorHAL *hal = aCollector->getHAL(); /* Create sub metrics */ - pm::SubMetric *cpuLoadUser = new pm::SubMetric ("CPU/Load/User", + pm::SubMetric *cpuLoadUser = new pm::SubMetric("CPU/Load/User", "Percentage of processor time spent in user mode by VM process."); - pm::SubMetric *cpuLoadKernel = new pm::SubMetric ("CPU/Load/Kernel", + pm::SubMetric *cpuLoadKernel = new pm::SubMetric("CPU/Load/Kernel", "Percentage of processor time spent in kernel mode by VM process."); - pm::SubMetric *ramUsageUsed = new pm::SubMetric ("RAM/Usage/Used", + pm::SubMetric *ramUsageUsed = new pm::SubMetric("RAM/Usage/Used", "Size of resident portion of VM process in memory."); /* Create and register base metrics */ - pm::BaseMetric *cpuLoad = new pm::MachineCpuLoadRaw (hal, aMachine, pid, - cpuLoadUser, cpuLoadKernel); - aCollector->registerBaseMetric (cpuLoad); - pm::BaseMetric *ramUsage = new pm::MachineRamUsage (hal, aMachine, pid, - ramUsageUsed); - aCollector->registerBaseMetric (ramUsage); - - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser, 0)); - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser, + pm::BaseMetric *cpuLoad = new pm::MachineCpuLoadRaw(hal, aMachine, pid, + cpuLoadUser, cpuLoadKernel); + aCollector->registerBaseMetric(cpuLoad); + pm::BaseMetric *ramUsage = new pm::MachineRamUsage(hal, aMachine, pid, + ramUsageUsed); + aCollector->registerBaseMetric(ramUsage); + + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, 0)); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser, - new pm::AggregateMax())); - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel, 0)); - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel, - new pm::AggregateMax())); - - aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed, 0)); - aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed, - new pm::AggregateAvg())); - aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed, - new pm::AggregateMin())); - aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed, - new pm::AggregateMax())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, + new pm::AggregateMax())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, 0)); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, + new pm::AggregateMax())); + + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, 0)); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, + new pm::AggregateAvg())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, + new pm::AggregateMin())); + aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, + new pm::AggregateMax())); }; -void Machine::unregisterMetrics (PerformanceCollector *aCollector, Machine *aMachine) -{ - aCollector->unregisterMetricsFor (aMachine); - aCollector->unregisterBaseMetricsFor (aMachine); +void Machine::unregisterMetrics(PerformanceCollector *aCollector, Machine *aMachine) +{ + aCollector->unregisterMetricsFor(aMachine); + aCollector->unregisterBaseMetricsFor(aMachine); }; #endif /* VBOX_WITH_RESOURCE_USAGE_API */ @@ -8529,5 +8536,5 @@ LogFlowThisFunc(("\n")); - uninit (Uninit::Unexpected); + uninit(Uninit::Unexpected); } @@ -8535,5 +8542,5 @@ * @note Must be called only by Machine::openSession() from its own write lock. */ -HRESULT SessionMachine::init (Machine *aMachine) +HRESULT SessionMachine::init(Machine *aMachine) { LogFlowThisFuncEnter(); @@ -8554,18 +8561,18 @@ if (mIPCSemName[i] == '\\') mIPCSemName[i] = '/'; - mIPCSem = ::CreateMutex (NULL, FALSE, mIPCSemName); - ComAssertMsgRet (mIPCSem, - ("Cannot create IPC mutex '%ls', err=%d", - mIPCSemName.raw(), ::GetLastError()), - E_FAIL); + mIPCSem = ::CreateMutex(NULL, FALSE, mIPCSemName); + ComAssertMsgRet(mIPCSem, + ("Cannot create IPC mutex '%ls', err=%d", + mIPCSemName.raw(), ::GetLastError()), + E_FAIL); #elif defined(RT_OS_OS2) - Utf8Str ipcSem = Utf8StrFmt ("\\SEM32\\VBOX\\VM\\{%RTuuid}", - aMachine->mData->mUuid.raw()); + Utf8Str ipcSem = Utf8StrFmt("\\SEM32\\VBOX\\VM\\{%RTuuid}", + aMachine->mData->mUuid.raw()); mIPCSemName = ipcSem; - APIRET arc = ::DosCreateMutexSem ((PSZ) ipcSem.raw(), &mIPCSem, 0, FALSE); - ComAssertMsgRet (arc == NO_ERROR, - ("Cannot create IPC mutex '%s', arc=%ld", - ipcSem.raw(), arc), - E_FAIL); + APIRET arc = ::DosCreateMutexSem((PSZ)ipcSem.raw(), &mIPCSem, 0, FALSE); + ComAssertMsgRet(arc == NO_ERROR, + ("Cannot create IPC mutex '%s', arc=%ld", + ipcSem.raw(), arc), + E_FAIL); #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) # ifdef VBOX_WITH_NEW_SYS_V_KEYGEN @@ -8582,10 +8589,10 @@ { key = ((uint32_t)'V' << 24) | i; - int sem = ::semget (key, 1, S_IRUSR | S_IWUSR | IPC_CREAT | IPC_EXCL); + int sem = ::semget(key, 1, S_IRUSR | S_IWUSR | IPC_CREAT | IPC_EXCL); if (sem >= 0 || (errno != EEXIST && errno != EACCES)) { mIPCSem = sem; if (sem >= 0) - mIPCKey = BstrFmt ("%u", key); + mIPCKey = BstrFmt("%u", key); break; } @@ -8594,9 +8601,9 @@ Utf8Str semName = aMachine->mData->m_strConfigFileFull; char *pszSemName = NULL; - RTStrUtf8ToCurrentCP (&pszSemName, semName); - key_t key = ::ftok (pszSemName, 'V'); - RTStrFree (pszSemName); - - mIPCSem = ::semget (key, 1, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT); + RTStrUtf8ToCurrentCP(&pszSemName, semName); + key_t key = ::ftok(pszSemName, 'V'); + RTStrFree(pszSemName); + + mIPCSem = ::semget(key, 1, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT); # endif /* !VBOX_WITH_NEW_SYS_V_KEYGEN */ @@ -8629,10 +8636,10 @@ return E_FAIL; } - ComAssertMsgRet (mIPCSem >= 0, ("Cannot create IPC semaphore, errno=%d", errnoSave), - E_FAIL); + ComAssertMsgRet(mIPCSem >= 0, ("Cannot create IPC semaphore, errno=%d", errnoSave), + E_FAIL); /* set the initial value to 1 */ - int rv = ::semctl (mIPCSem, 0, SETVAL, 1); - ComAssertMsgRet (rv == 0, ("Cannot init IPC semaphore, errno=%d", errno), - E_FAIL); + int rv = ::semctl(mIPCSem, 0, SETVAL, 1); + ComAssertMsgRet(rv == 0, ("Cannot init IPC semaphore, errno=%d", errno), + E_FAIL); #else # error "Port me!" @@ -8645,9 +8652,9 @@ /* take the pointers to data to share */ - mData.share (aMachine->mData); - mSSData.share (aMachine->mSSData); - - mUserData.share (aMachine->mUserData); - mHWData.share (aMachine->mHWData); + mData.share(aMachine->mData); + mSSData.share(aMachine->mSSData); + + mUserData.share(aMachine->mUserData); + mHWData.share(aMachine->mHWData); mMediaData.share(aMachine->mMediaData); @@ -8660,28 +8667,28 @@ ctl.createObject(); ctl->init(this, *it); - mStorageControllers->push_back (ctl); + mStorageControllers->push_back(ctl); } unconst(mBIOSSettings).createObject(); - mBIOSSettings->init (this, aMachine->mBIOSSettings); + mBIOSSettings->init(this, aMachine->mBIOSSettings); #ifdef VBOX_WITH_VRDP /* create another VRDPServer object that will be mutable */ unconst(mVRDPServer).createObject(); - mVRDPServer->init (this, aMachine->mVRDPServer); + mVRDPServer->init(this, aMachine->mVRDPServer); #endif /* create another audio adapter object that will be mutable */ unconst(mAudioAdapter).createObject(); - mAudioAdapter->init (this, aMachine->mAudioAdapter); + mAudioAdapter->init(this, aMachine->mAudioAdapter); /* create a list of serial ports that will be mutable */ - for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++) - { - unconst(mSerialPorts [slot]).createObject(); - mSerialPorts [slot]->init (this, aMachine->mSerialPorts [slot]); + for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++) + { + unconst(mSerialPorts[slot]).createObject(); + mSerialPorts[slot]->init(this, aMachine->mSerialPorts[slot]); } /* create a list of parallel ports that will be mutable */ - for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++) - { - unconst(mParallelPorts [slot]).createObject(); - mParallelPorts [slot]->init (this, aMachine->mParallelPorts [slot]); + for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++) + { + unconst(mParallelPorts[slot]).createObject(); + mParallelPorts[slot]->init(this, aMachine->mParallelPorts[slot]); } /* create another USB controller object that will be mutable */ @@ -8692,6 +8699,6 @@ for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++) { - unconst(mNetworkAdapters [slot]).createObject(); - mNetworkAdapters[slot]->init (this, aMachine->mNetworkAdapters [slot]); + unconst(mNetworkAdapters[slot]).createObject(); + mNetworkAdapters[slot]->init(this, aMachine->mNetworkAdapters[slot]); } @@ -8714,5 +8721,5 @@ * @note Locks mParent + this object for writing. */ -void SessionMachine::uninit (Uninit::Reason aReason) +void SessionMachine::uninit(Uninit::Reason aReason) { LogFlowThisFuncEnter(); @@ -8746,13 +8753,13 @@ #if defined(RT_OS_WINDOWS) if (mIPCSem) - ::CloseHandle (mIPCSem); + ::CloseHandle(mIPCSem); mIPCSem = NULL; #elif defined(RT_OS_OS2) if (mIPCSem != NULLHANDLE) - ::DosCloseMutexSem (mIPCSem); + ::DosCloseMutexSem(mIPCSem); mIPCSem = NULLHANDLE; #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) if (mIPCSem >= 0) - ::semctl (mIPCSem, 0, IPC_RMID); + ::semctl(mIPCSem, 0, IPC_RMID); mIPCSem = -1; # ifdef VBOX_WITH_NEW_SYS_V_KEYGEN @@ -8785,5 +8792,5 @@ { LogWarningThisFunc(("ABNORMAL client termination! (wasBusy=%d)\n", - Global::IsOnlineOrTransient (lastState))); + Global::IsOnlineOrTransient(lastState))); /* reset the state to Aborted */ @@ -8796,5 +8803,5 @@ { LogWarningThisFunc(("Discarding unsaved settings changes!\n")); - rollback (false /* aNotify */); + rollback(false /* aNotify */); } @@ -8821,5 +8828,5 @@ #ifdef VBOX_WITH_USB /* release all captured USB devices */ - if (aReason == Uninit::Abnormal && Global::IsOnline (lastState)) + if (aReason == Uninit::Abnormal && Global::IsOnline(lastState)) { /* Console::captureUSBDevices() is called in the VM process only after @@ -8831,11 +8838,11 @@ * This is identical to SessionMachine::DetachAllUSBDevices except * for the aAbnormal argument. */ - HRESULT rc = mUSBController->notifyProxy (false /* aInsertFilters */); + HRESULT rc = mUSBController->notifyProxy(false /* aInsertFilters */); AssertComRC(rc); - NOREF (rc); + NOREF(rc); USBProxyService *service = mParent->host()->usbProxyService(); if (service) - service->detachAllDevicesFromVM (this, true /* aDone */, true /* aAbnormal */); + service->detachAllDevicesFromVM(this, true /* aDone */, true /* aAbnormal */); } #endif /* VBOX_WITH_USB */ @@ -8847,6 +8854,6 @@ * need to queue the PID to reap the process (and avoid zombies on * Linux). */ - Assert (mData->mSession.mPid != NIL_RTPROCESS); - mParent->addProcessToReap (mData->mSession.mPid); + Assert(mData->mSession.mPid != NIL_RTPROCESS); + mParent->addProcessToReap(mData->mSession.mPid); } @@ -8874,5 +8881,5 @@ HRESULT rc = (*it)->Uninitialize(); LogFlowThisFunc((" remoteControl->Uninitialize() returned %08X\n", rc)); - if (FAILED (rc)) + if (FAILED(rc)) LogWarningThisFunc(("Forgot to close the remote session?\n")); ++it; @@ -8903,7 +8910,7 @@ { /* this must be null here (see #OnSessionEnd()) */ - Assert (mData->mSession.mDirectControl.isNull()); - Assert (mData->mSession.mState == SessionState_Closing); - Assert (!mData->mSession.mProgress.isNull()); + Assert(mData->mSession.mDirectControl.isNull()); + Assert(mData->mSession.mState == SessionState_Closing); + Assert(!mData->mSession.mProgress.isNull()); mData->mSession.mProgress->notifyComplete (S_OK); @@ -8912,6 +8919,6 @@ /* remove the association between the peer machine and this session machine */ - Assert (mData->mSession.mMachine == this || - aReason == Uninit::Unexpected); + Assert(mData->mSession.mMachine == this || + aReason == Uninit::Unexpected); /* reset the rest of session data */ @@ -9192,5 +9199,5 @@ /* go to the closing state (essential for all open*Session() calls and * for #checkForDeath()) */ - Assert (mData->mSession.mState == SessionState_Open); + Assert(mData->mSession.mState == SessionState_Open); mData->mSession.mState = SessionState_Closing; @@ -10197,5 +10204,5 @@ * Machine::fixupMedia(). The last can happen when e.g a DVD/Floppy * image was unmounted at runtime. */ - Assert (SUCCEEDED(rc) || state == MediumState_LockedRead || state == MediumState_Created); + Assert(SUCCEEDED(rc) || state == MediumState_LockedRead || state == MediumState_Created); } Index: /trunk/src/VBox/Main/Matching.cpp =================================================================== --- /trunk/src/VBox/Main/Matching.cpp (revision 26185) +++ /trunk/src/VBox/Main/Matching.cpp (revision 26186) @@ -55,8 +55,8 @@ do { - end = strcspn (aFilter + start, ",-"); + end = strcspn(aFilter + start, ",-"); end += start; - char delim = aFilter [end]; + char delim = aFilter[end]; if (delim == '-') @@ -73,10 +73,10 @@ // skip spaces around numbers size_t s = start; - while (s < end && aFilter [s] == ' ') ++ s; + while (s < end && aFilter[s] == ' ') ++s; size_t e = end - 1; - while (e > s && aFilter [e] == ' ') -- e; - ++ e; - - that->parseValue (aFilter, s, e, mode); + while (e > s && aFilter[e] == ' ') --e; + ++e; + + that->parseValue(aFilter, s, e, mode); if (!that->mValid) return; Index: /trunk/src/VBox/Main/MediumFormatImpl.cpp =================================================================== --- /trunk/src/VBox/Main/MediumFormatImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/MediumFormatImpl.cpp (revision 26186) @@ -198,8 +198,7 @@ } -STDMETHODIMP MediumFormat:: -COMGETTER(FileExtensions)(ComSafeArrayOut (BSTR, aFileExtensions)) -{ - if (ComSafeArrayOutIsNull (aFileExtensions)) +STDMETHODIMP MediumFormat::COMGETTER(FileExtensions)(ComSafeArrayOut(BSTR, aFileExtensions)) +{ + if (ComSafeArrayOutIsNull(aFileExtensions)) return E_POINTER; @@ -208,10 +207,11 @@ /* this is const, no need to lock */ - com::SafeArray fileExtentions (m.fileExtensions.size()); + com::SafeArray fileExtentions(m.fileExtensions.size()); int i = 0; for (BstrList::const_iterator it = m.fileExtensions.begin(); - it != m.fileExtensions.end(); ++ it, ++ i) - (*it).cloneTo (&fileExtentions [i]); - fileExtentions.detachTo (ComSafeArrayOutArg (aFileExtensions)); + it != m.fileExtensions.end(); + ++it, ++i) + (*it).cloneTo(&fileExtentions[i]); + fileExtentions.detachTo(ComSafeArrayOutArg(aFileExtensions)); return S_OK; @@ -254,27 +254,28 @@ /* this is const, no need to lock */ - com::SafeArray propertyNames (m.properties.size()); - com::SafeArray propertyDescriptions (m.properties.size()); - com::SafeArray propertyTypes (m.properties.size()); - com::SafeArray propertyFlags (m.properties.size()); - com::SafeArray propertyDefaults (m.properties.size()); + com::SafeArray propertyNames(m.properties.size()); + com::SafeArray propertyDescriptions (m.properties.size()); + com::SafeArray propertyTypes(m.properties.size()); + com::SafeArray propertyFlags(m.properties.size()); + com::SafeArray propertyDefaults(m.properties.size()); int i = 0; for (PropertyList::const_iterator it = m.properties.begin(); - it != m.properties.end(); ++ it, ++ i) + it != m.properties.end(); + ++it, ++i) { const Property &prop = (*it); - prop.name.cloneTo (&propertyNames [i]); - prop.description.cloneTo (&propertyDescriptions [i]); - propertyTypes [i] = prop.type; - propertyFlags [i] = prop.flags; - prop.defaultValue.cloneTo (&propertyDefaults [i]); + prop.name.cloneTo(&propertyNames[i]); + prop.description.cloneTo(&propertyDescriptions[i]); + propertyTypes[i] = prop.type; + propertyFlags[i] = prop.flags; + prop.defaultValue.cloneTo(&propertyDefaults[i]); } - propertyNames.detachTo (ComSafeArrayOutArg (aNames)); - propertyDescriptions.detachTo (ComSafeArrayOutArg (aDescriptions)); - propertyTypes.detachTo (ComSafeArrayOutArg (aTypes)); - propertyFlags.detachTo (ComSafeArrayOutArg (aFlags)); - propertyDefaults.detachTo (ComSafeArrayOutArg (aDefaults)); + propertyNames.detachTo(ComSafeArrayOutArg(aNames)); + propertyDescriptions.detachTo(ComSafeArrayOutArg(aDescriptions)); + propertyTypes.detachTo(ComSafeArrayOutArg(aTypes)); + propertyFlags.detachTo(ComSafeArrayOutArg(aFlags)); + propertyDefaults.detachTo(ComSafeArrayOutArg(aDefaults)); return S_OK; Index: /trunk/src/VBox/Main/MediumImpl.cpp =================================================================== --- /trunk/src/VBox/Main/MediumImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/MediumImpl.cpp (revision 26186) @@ -1753,5 +1753,5 @@ it != m->backRefs.end(); ++ it, ++ i) { - it->machineId.toUtf16().detachTo(&machineIds [i]); + it->machineId.toUtf16().detachTo(&machineIds[i]); } } @@ -2170,7 +2170,7 @@ it->first.cloneTo(&names[i]); if (it->second.isEmpty()) - Bstr("").cloneTo(&values [i]); + Bstr("").cloneTo(&values[i]); else - it->second.cloneTo(&values [i]); + it->second.cloneTo(&values[i]); ++ i; } @@ -2218,5 +2218,5 @@ it->second = (const char *)NULL; else - it->second = values [i]; + it->second = values[i]; } @@ -2608,5 +2608,5 @@ } - if (FAILED (rc)) + if (FAILED(rc)) { HRESULT rc2 = UnlockWrite(NULL); Index: /trunk/src/VBox/Main/MouseImpl.cpp =================================================================== --- /trunk/src/VBox/Main/MouseImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/MouseImpl.cpp (revision 26186) @@ -240,7 +240,7 @@ int vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, dx, dy, dz, dw, fButtons); if (RT_FAILURE(vrc)) - rc = setError (VBOX_E_IPRT_ERROR, - tr ("Could not send the mouse event to the virtual mouse (%Rrc)"), - vrc); + rc = setError(VBOX_E_IPRT_ERROR, + tr("Could not send the mouse event to the virtual mouse (%Rrc)"), + vrc); return rc; @@ -342,7 +342,7 @@ mLastAbsY = mouseYAbs; if (RT_FAILURE(vrc)) - rc = setError (VBOX_E_IPRT_ERROR, - tr ("Could not send the mouse event to the virtual mouse (%Rrc)"), - vrc); + rc = setError(VBOX_E_IPRT_ERROR, + tr("Could not send the mouse event to the virtual mouse (%Rrc)"), + vrc); } Index: /trunk/src/VBox/Main/NetworkAdapterImpl.cpp =================================================================== --- /trunk/src/VBox/Main/NetworkAdapterImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/NetworkAdapterImpl.cpp (revision 26186) @@ -221,7 +221,7 @@ break; default: - return setError (E_FAIL, - tr("Invalid network adapter type '%d'"), - aAdapterType); + return setError(E_FAIL, + tr("Invalid network adapter type '%d'"), + aAdapterType); } @@ -239,5 +239,5 @@ mlock.release(); - mParent->onNetworkAdapterChange (this, FALSE); + mParent->onNetworkAdapterChange(this, FALSE); } @@ -297,5 +297,5 @@ mlock.release(); - mParent->onNetworkAdapterChange (this, FALSE); + mParent->onNetworkAdapterChange(this, FALSE); } @@ -408,5 +408,5 @@ if (emitChangeEvent) - mParent->onNetworkAdapterChange (this, FALSE); + mParent->onNetworkAdapterChange(this, FALSE); return rc; @@ -508,6 +508,6 @@ && mData->mAttachmentType == NetworkAttachmentType_Internal) { - return setError (E_FAIL, - tr ("Empty or null internal network name is not valid")); + return setError(E_FAIL, + tr("Empty or null internal network name is not valid")); } @@ -784,6 +784,6 @@ mlock.release(); - HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE); - if (FAILED (rc)) + HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE); + if (FAILED(rc)) { /* If changing the attachment failed then we can't assume @@ -831,6 +831,6 @@ mlock.release(); - HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE); - if (FAILED (rc)) + HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE); + if (FAILED(rc)) { /* If changing the attachment failed then we can't assume @@ -886,6 +886,6 @@ mlock.release(); - HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE); - if (FAILED (rc)) + HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE); + if (FAILED(rc)) { /* If changing the attachment failed then we can't assume @@ -933,6 +933,6 @@ mlock.release(); - HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE); - if (FAILED (rc)) + HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE); + if (FAILED(rc)) { /* If changing the attachment failed then we can't assume @@ -974,5 +974,5 @@ mlock.release(); - mParent->onNetworkAdapterChange (this, TRUE); + mParent->onNetworkAdapterChange(this, TRUE); } Index: /trunk/src/VBox/Main/ParallelPortImpl.cpp =================================================================== --- /trunk/src/VBox/Main/ParallelPortImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/ParallelPortImpl.cpp (revision 26186) @@ -227,8 +227,7 @@ if (aEnabled && m->bd->strPath.isEmpty()) - return setError (E_INVALIDARG, - tr ("Cannot enable the parallel port %d " - "because the port path is empty or null"), - m->bd->ulSlot); + return setError(E_INVALIDARG, + tr("Cannot enable the parallel port %d because the port path is empty or null"), + m->bd->ulSlot); m->bd.backup(); @@ -282,8 +281,7 @@ * (when changing this, make sure it corresponds to XML schema */ if (aIRQ > 255) - return setError (E_INVALIDARG, - tr ("Invalid IRQ number of the parallel port %d: " - "%lu (must be in range [0, %lu])"), - m->bd->ulSlot, aIRQ, 255); + return setError(E_INVALIDARG, + tr("Invalid IRQ number of the parallel port %d: %lu (must be in range [0, %lu])"), + m->bd->ulSlot, aIRQ, 255); AutoCaller autoCaller(this); @@ -334,8 +332,7 @@ * (when changing this, make sure it corresponds to XML schema */ if (aIOBase > 0xFFFF) - return setError (E_INVALIDARG, - tr ("Invalid I/O port base address of the parallel port %d: " - "%lu (must be in range [0, 0x%X])"), - m->bd->ulSlot, aIOBase, 0, 0xFFFF); + return setError(E_INVALIDARG, + tr("Invalid I/O port base address of the parallel port %d: %lu (must be in range [0, 0x%X])"), + m->bd->ulSlot, aIOBase, 0, 0xFFFF); AutoCaller autoCaller(this); Index: /trunk/src/VBox/Main/PerformanceImpl.cpp =================================================================== --- /trunk/src/VBox/Main/PerformanceImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/PerformanceImpl.cpp (revision 26186) @@ -168,6 +168,5 @@ //////////////////////////////////////////////////////////////////////////////// -STDMETHODIMP -PerformanceCollector::COMGETTER(MetricNames) (ComSafeArrayOut(BSTR, theMetricNames)) +STDMETHODIMP PerformanceCollector::COMGETTER(MetricNames)(ComSafeArrayOut(BSTR, theMetricNames)) { if (ComSafeArrayOutIsNull(theMetricNames)) @@ -216,8 +215,7 @@ } -STDMETHODIMP -PerformanceCollector::GetMetrics (ComSafeArrayIn (IN_BSTR, metricNames), - ComSafeArrayIn (IUnknown *, objects), - ComSafeArrayOut(IPerformanceMetric *, outMetrics)) +STDMETHODIMP PerformanceCollector::GetMetrics(ComSafeArrayIn(IN_BSTR, metricNames), + ComSafeArrayIn(IUnknown *, objects), + ComSafeArrayOut(IPerformanceMetric *, outMetrics)) { LogFlowThisFuncEnter(); @@ -251,5 +249,5 @@ LogFlow (("PerformanceCollector::GetMetrics() store a metric at " "retMetrics[%d]...\n", i)); - metric.queryInterfaceTo(&retMetrics [i++]); + metric.queryInterfaceTo(&retMetrics[i++]); } retMetrics.detachTo(ComSafeArrayOutArg(outMetrics)); @@ -258,16 +256,15 @@ } -STDMETHODIMP -PerformanceCollector::SetupMetrics (ComSafeArrayIn (IN_BSTR, metricNames), - ComSafeArrayIn (IUnknown *, objects), - ULONG aPeriod, ULONG aCount, - ComSafeArrayOut(IPerformanceMetric *, - outMetrics)) +STDMETHODIMP PerformanceCollector::SetupMetrics(ComSafeArrayIn(IN_BSTR, metricNames), + ComSafeArrayIn(IUnknown *, objects), + ULONG aPeriod, + ULONG aCount, + ComSafeArrayOut(IPerformanceMetric *, outMetrics)) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - pm::Filter filter (ComSafeArrayInArg (metricNames), - ComSafeArrayInArg (objects)); + pm::Filter filter(ComSafeArrayInArg (metricNames), + ComSafeArrayInArg (objects)); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -297,9 +294,9 @@ } - com::SafeIfaceArray retMetrics (filteredMetrics.size()); + com::SafeIfaceArray retMetrics(filteredMetrics.size()); int i = 0; for (it = filteredMetrics.begin(); it != filteredMetrics.end() && SUCCEEDED(rc); ++it) - rc = toIPerformanceMetric(*it, &retMetrics [i++]); + rc = toIPerformanceMetric(*it, &retMetrics[i++]); retMetrics.detachTo(ComSafeArrayOutArg(outMetrics)); @@ -308,15 +305,13 @@ } -STDMETHODIMP -PerformanceCollector::EnableMetrics (ComSafeArrayIn (IN_BSTR, metricNames), - ComSafeArrayIn (IUnknown *, objects), - ComSafeArrayOut(IPerformanceMetric *, - outMetrics)) +STDMETHODIMP PerformanceCollector::EnableMetrics(ComSafeArrayIn(IN_BSTR, metricNames), + ComSafeArrayIn(IUnknown *, objects), + ComSafeArrayOut(IPerformanceMetric *, outMetrics)) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - pm::Filter filter (ComSafeArrayInArg (metricNames), - ComSafeArrayInArg (objects)); + pm::Filter filter(ComSafeArrayInArg(metricNames), + ComSafeArrayInArg(objects)); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); /* Write lock is not needed atm since we are */ @@ -334,9 +329,9 @@ } - com::SafeIfaceArray retMetrics (filteredMetrics.size()); + com::SafeIfaceArray retMetrics(filteredMetrics.size()); int i = 0; for (it = filteredMetrics.begin(); it != filteredMetrics.end() && SUCCEEDED(rc); ++it) - rc = toIPerformanceMetric(*it, &retMetrics [i++]); + rc = toIPerformanceMetric(*it, &retMetrics[i++]); retMetrics.detachTo(ComSafeArrayOutArg(outMetrics)); @@ -345,15 +340,13 @@ } -STDMETHODIMP -PerformanceCollector::DisableMetrics (ComSafeArrayIn (IN_BSTR, metricNames), - ComSafeArrayIn (IUnknown *, objects), - ComSafeArrayOut(IPerformanceMetric *, - outMetrics)) +STDMETHODIMP PerformanceCollector::DisableMetrics(ComSafeArrayIn(IN_BSTR, metricNames), + ComSafeArrayIn(IUnknown *, objects), + ComSafeArrayOut(IPerformanceMetric *, outMetrics)) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - pm::Filter filter (ComSafeArrayInArg (metricNames), - ComSafeArrayInArg (objects)); + pm::Filter filter(ComSafeArrayInArg(metricNames), + ComSafeArrayInArg(objects)); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); /* Write lock is not needed atm since we are */ @@ -371,9 +364,9 @@ } - com::SafeIfaceArray retMetrics (filteredMetrics.size()); + com::SafeIfaceArray retMetrics(filteredMetrics.size()); int i = 0; for (it = filteredMetrics.begin(); it != filteredMetrics.end() && SUCCEEDED(rc); ++it) - rc = toIPerformanceMetric(*it, &retMetrics [i++]); + rc = toIPerformanceMetric(*it, &retMetrics[i++]); retMetrics.detachTo(ComSafeArrayOutArg(outMetrics)); @@ -382,21 +375,20 @@ } -STDMETHODIMP -PerformanceCollector::QueryMetricsData (ComSafeArrayIn (IN_BSTR, metricNames), - ComSafeArrayIn (IUnknown *, objects), - ComSafeArrayOut(BSTR, outMetricNames), - ComSafeArrayOut(IUnknown *, outObjects), - ComSafeArrayOut(BSTR, outUnits), - ComSafeArrayOut(ULONG, outScales), - ComSafeArrayOut(ULONG, outSequenceNumbers), - ComSafeArrayOut(ULONG, outDataIndices), - ComSafeArrayOut(ULONG, outDataLengths), - ComSafeArrayOut(LONG, outData)) +STDMETHODIMP PerformanceCollector::QueryMetricsData(ComSafeArrayIn (IN_BSTR, metricNames), + ComSafeArrayIn (IUnknown *, objects), + ComSafeArrayOut(BSTR, outMetricNames), + ComSafeArrayOut(IUnknown *, outObjects), + ComSafeArrayOut(BSTR, outUnits), + ComSafeArrayOut(ULONG, outScales), + ComSafeArrayOut(ULONG, outSequenceNumbers), + ComSafeArrayOut(ULONG, outDataIndices), + ComSafeArrayOut(ULONG, outDataLengths), + ComSafeArrayOut(LONG, outData)) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - pm::Filter filter (ComSafeArrayInArg (metricNames), - ComSafeArrayInArg (objects)); + pm::Filter filter(ComSafeArrayInArg(metricNames), + ComSafeArrayInArg(objects)); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -416,12 +408,12 @@ size_t flatIndex = 0; size_t numberOfMetrics = filteredMetrics.size(); - com::SafeArray retNames (numberOfMetrics); - com::SafeIfaceArray retObjects (numberOfMetrics); - com::SafeArray retUnits (numberOfMetrics); - com::SafeArray retScales (numberOfMetrics); - com::SafeArray retSequenceNumbers (numberOfMetrics); - com::SafeArray retIndices (numberOfMetrics); - com::SafeArray retLengths (numberOfMetrics); - com::SafeArray retData (flatSize); + com::SafeArray retNames(numberOfMetrics); + com::SafeIfaceArray retObjects(numberOfMetrics); + com::SafeArray retUnits(numberOfMetrics); + com::SafeArray retScales(numberOfMetrics); + com::SafeArray retSequenceNumbers(numberOfMetrics); + com::SafeArray retIndices(numberOfMetrics); + com::SafeArray retLengths(numberOfMetrics); + com::SafeArray retData(flatSize); for (it = filteredMetrics.begin(); it != filteredMetrics.end(); ++it, ++i) @@ -459,5 +451,5 @@ /////////////////////////////////////////////////////////////////////////////// -void PerformanceCollector::registerBaseMetric (pm::BaseMetric *baseMetric) +void PerformanceCollector::registerBaseMetric(pm::BaseMetric *baseMetric) { //LogFlowThisFuncEnter(); @@ -471,5 +463,5 @@ } -void PerformanceCollector::registerMetric (pm::Metric *metric) +void PerformanceCollector::registerMetric(pm::Metric *metric) { //LogFlowThisFuncEnter(); @@ -483,5 +475,5 @@ } -void PerformanceCollector::unregisterBaseMetricsFor (const ComPtr &aObject) +void PerformanceCollector::unregisterBaseMetricsFor(const ComPtr &aObject) { //LogFlowThisFuncEnter(); @@ -504,5 +496,5 @@ } -void PerformanceCollector::unregisterMetricsFor (const ComPtr &aObject) +void PerformanceCollector::unregisterMetricsFor(const ComPtr &aObject) { //LogFlowThisFuncEnter(); @@ -547,10 +539,10 @@ /* static */ -void PerformanceCollector::staticSamplerCallback (RTTIMERLR hTimerLR, void *pvUser, - uint64_t /* iTick */) +void PerformanceCollector::staticSamplerCallback(RTTIMERLR hTimerLR, void *pvUser, + uint64_t /* iTick */) { AssertReturnVoid (pvUser != NULL); PerformanceCollector *collector = static_cast (pvUser); - Assert (collector->mMagic == MAGIC); + Assert(collector->mMagic == MAGIC); if (collector->mMagic == MAGIC) { @@ -621,5 +613,5 @@ //////////////////////////////////////////////////////////////////////////////// -HRESULT PerformanceMetric::init (pm::Metric *aMetric) +HRESULT PerformanceMetric::init(pm::Metric *aMetric) { m.name = aMetric->getName(); @@ -634,5 +626,5 @@ } -HRESULT PerformanceMetric::init (pm::BaseMetric *aMetric) +HRESULT PerformanceMetric::init(pm::BaseMetric *aMetric) { m.name = aMetric->getName(); @@ -651,5 +643,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(MetricName) (BSTR *aMetricName) +STDMETHODIMP PerformanceMetric::COMGETTER(MetricName)(BSTR *aMetricName) { /// @todo (r=dmik) why do all these getters not do AutoCaller and @@ -660,5 +652,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(Object) (IUnknown **anObject) +STDMETHODIMP PerformanceMetric::COMGETTER(Object)(IUnknown **anObject) { m.object.queryInterfaceTo(anObject); @@ -666,5 +658,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(Description) (BSTR *aDescription) +STDMETHODIMP PerformanceMetric::COMGETTER(Description)(BSTR *aDescription) { m.description.cloneTo(aDescription); @@ -672,5 +664,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(Period) (ULONG *aPeriod) +STDMETHODIMP PerformanceMetric::COMGETTER(Period)(ULONG *aPeriod) { *aPeriod = m.period; @@ -678,5 +670,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(Count) (ULONG *aCount) +STDMETHODIMP PerformanceMetric::COMGETTER(Count)(ULONG *aCount) { *aCount = m.count; @@ -684,5 +676,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(Unit) (BSTR *aUnit) +STDMETHODIMP PerformanceMetric::COMGETTER(Unit)(BSTR *aUnit) { m.unit.cloneTo(aUnit); @@ -690,5 +682,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(MinimumValue) (LONG *aMinValue) +STDMETHODIMP PerformanceMetric::COMGETTER(MinimumValue)(LONG *aMinValue) { *aMinValue = m.min; @@ -696,5 +688,5 @@ } -STDMETHODIMP PerformanceMetric::COMGETTER(MaximumValue) (LONG *aMaxValue) +STDMETHODIMP PerformanceMetric::COMGETTER(MaximumValue)(LONG *aMaxValue) { *aMaxValue = m.max; Index: /trunk/src/VBox/Main/ProgressImpl.cpp =================================================================== --- /trunk/src/VBox/Main/ProgressImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/ProgressImpl.cpp (revision 26186) @@ -140,5 +140,5 @@ /* add to the global collection of progress operations (note: after * creating mId) */ - mParent->addProgress (this); + mParent->addProgress(this); #endif @@ -402,6 +402,6 @@ if (!mCompleted) - return setError (E_FAIL, - tr ("Result code is not available, operation is still in progress")); + return setError(E_FAIL, + tr("Result code is not available, operation is still in progress")); *aResultCode = mResultCode; @@ -420,6 +420,6 @@ if (!mCompleted) - return setError (E_FAIL, - tr ("Error info is not available, operation is still in progress")); + return setError(E_FAIL, + tr("Error info is not available, operation is still in progress")); mErrorInfo.queryInterfaceTo(aErrorInfo); @@ -1087,5 +1087,5 @@ * Marks the whole task as complete and sets the result code. * - * If the result code indicates a failure (|FAILED (@a aResultCode)|) then this + * If the result code indicates a failure (|FAILED(@a aResultCode)|) then this * method will import the error info from the current thread and assign it to * the errorInfo attribute (it will return an error if no info is available in @@ -1172,5 +1172,5 @@ mResultCode = aResultCode; - AssertReturn(FAILED (aResultCode), E_FAIL); + AssertReturn(FAILED(aResultCode), E_FAIL); ComObjPtr errorInfo; @@ -1286,6 +1286,5 @@ m_ulCurrentOperation = 0; - rc = mProgresses [0]->COMGETTER(OperationDescription) ( - m_bstrOperationDescription.asOutParam()); + rc = mProgresses[0]->COMGETTER(OperationDescription)(m_bstrOperationDescription.asOutParam()); if (FAILED(rc)) return rc; @@ -1295,5 +1294,5 @@ { BOOL cancelable = FALSE; - rc = mProgresses [i]->COMGETTER(Cancelable) (&cancelable); + rc = mProgresses[i]->COMGETTER(Cancelable)(&cancelable); if (FAILED(rc)) return rc; @@ -1304,5 +1303,5 @@ { ULONG opCount = 0; - rc = mProgresses [i]->COMGETTER(OperationCount) (&opCount); + rc = mProgresses[i]->COMGETTER(OperationCount)(&opCount); if (FAILED(rc)) return rc; @@ -1328,12 +1327,13 @@ * @param aId See ProgressBase::init(). */ -HRESULT CombinedProgress::init ( +HRESULT CombinedProgress::init( #if !defined (VBOX_COM_INPROC) - VirtualBox *aParent, + VirtualBox *aParent, #endif - IUnknown *aInitiator, - CBSTR aDescription, - IProgress *aProgress1, IProgress *aProgress2, - OUT_GUID aId /* = NULL */) + IUnknown *aInitiator, + CBSTR aDescription, + IProgress *aProgress1, + IProgress *aProgress2, + OUT_GUID aId /* = NULL */) { /* Enclose the state transition NotReady->InInit->Ready */ @@ -1341,13 +1341,15 @@ AssertReturn(autoInitSpan.isOk(), E_FAIL); - mProgresses.resize (2); - mProgresses [0] = aProgress1; - mProgresses [1] = aProgress2; - - HRESULT rc = protectedInit (autoInitSpan, + mProgresses.resize(2); + mProgresses[0] = aProgress1; + mProgresses[1] = aProgress2; + + HRESULT rc = protectedInit(autoInitSpan, #if !defined (VBOX_COM_INPROC) - aParent, + aParent, #endif - aInitiator, aDescription, aId); + aInitiator, + aDescription, + aId); /* Confirm a successful initialization when it's the case */ @@ -1608,6 +1610,6 @@ if (aOperation >= m_cOperations) - return setError (E_FAIL, - tr ("Operation number must be in range [0, %d]"), m_ulCurrentOperation - 1); + return setError(E_FAIL, + tr("Operation number must be in range [0, %d]"), m_ulCurrentOperation - 1); /* if we're already completed or if the given operation is already done, @@ -1623,6 +1625,6 @@ { ULONG opCount = 0; - rc = mProgresses [progress]->COMGETTER(OperationCount) (&opCount); - if (FAILED (rc)) + rc = mProgresses[progress]->COMGETTER(OperationCount)(&opCount); + if (FAILED(rc)) return rc; @@ -1688,5 +1690,5 @@ if (!mCancelable) - return setError (E_FAIL, tr ("Operation cannot be canceled")); + return setError(E_FAIL, tr("Operation cannot be canceled")); if (!mCanceled) @@ -1731,5 +1733,5 @@ { rc = progress->COMGETTER(Completed)(&fCompleted); - if (FAILED (rc)) + if (FAILED(rc)) return rc; @@ -1737,21 +1739,21 @@ { rc = progress->COMGETTER(Canceled)(&mCanceled); - if (FAILED (rc)) + if (FAILED(rc)) return rc; LONG iRc; rc = progress->COMGETTER(ResultCode)(&iRc); - if (FAILED (rc)) + if (FAILED(rc)) return rc; mResultCode = iRc; - if (FAILED (mResultCode)) + if (FAILED(mResultCode)) { rc = progress->COMGETTER(ErrorInfo) (mErrorInfo.asOutParam()); - if (FAILED (rc)) + if (FAILED(rc)) return rc; } - if (FAILED (mResultCode) || mCanceled) + if (FAILED(mResultCode) || mCanceled) { mCompleted = TRUE; @@ -1761,5 +1763,5 @@ ULONG opCount = 0; rc = progress->COMGETTER(OperationCount) (&opCount); - if (FAILED (rc)) + if (FAILED(rc)) return rc; @@ -1768,5 +1770,5 @@ if (mProgress < mProgresses.size()) - progress = mProgresses [mProgress]; + progress = mProgresses[mProgress]; else mCompleted = TRUE; Index: /trunk/src/VBox/Main/SerialPortImpl.cpp =================================================================== --- /trunk/src/VBox/Main/SerialPortImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/SerialPortImpl.cpp (revision 26186) @@ -349,8 +349,7 @@ * (when changing this, make sure it corresponds to XML schema */ if (aIRQ > 255) - return setError (E_INVALIDARG, - tr ("Invalid IRQ number of the serial port %d: " - "%lu (must be in range [0, %lu])"), - m->bd->ulSlot, aIRQ, 255); + return setError(E_INVALIDARG, + tr("Invalid IRQ number of the serial port %d: %lu (must be in range [0, %lu])"), + m->bd->ulSlot, aIRQ, 255); AutoCaller autoCaller(this); @@ -401,8 +400,7 @@ * (when changing this, make sure it corresponds to XML schema */ if (aIOBase > 0xFFFF) - return setError (E_INVALIDARG, - tr ("Invalid I/O port base address of the serial port %d: " - "%lu (must be in range [0, 0x%X])"), - m->bd->ulSlot, aIOBase, 0, 0xFFFF); + return setError(E_INVALIDARG, + tr("Invalid I/O port base address of the serial port %d: %lu (must be in range [0, 0x%X])"), + m->bd->ulSlot, aIOBase, 0, 0xFFFF); AutoCaller autoCaller(this); Index: /trunk/src/VBox/Main/SessionImpl.cpp =================================================================== --- /trunk/src/VBox/Main/SessionImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/SessionImpl.cpp (revision 26186) @@ -40,5 +40,5 @@ #if defined(RT_OS_WINDOWS) || defined (RT_OS_OS2) /** VM IPC mutex holder thread */ -static DECLCALLBACK(int) IPCMutexHolderThread (RTTHREAD Thread, void *pvUser); +static DECLCALLBACK(int) IPCMutexHolderThread(RTTHREAD Thread, void *pvUser); #endif @@ -51,7 +51,5 @@ do { \ if (mState != SessionState_Open) \ - return setError (E_UNEXPECTED, \ - tr ("The session is not open (session state: %s)"), \ - Global::stringifySessionState(mState)); \ + return setError(E_UNEXPECTED, tr ("The session is not open (session state: %s)"), Global::stringifySessionState(mState)); \ } while (0) @@ -70,5 +68,5 @@ LogFlowThisFunc(("\n")); - uninit (true /* aFinalRelease */); + uninit(true /* aFinalRelease */); } @@ -115,5 +113,5 @@ * @note Locks this object for writing. */ -void Session::uninit (bool aFinalRelease) +void Session::uninit(bool aFinalRelease) { LogFlowThisFuncEnter(); @@ -134,9 +132,9 @@ if (mState != SessionState_Closed) { - Assert (mState == SessionState_Open || - mState == SessionState_Spawning); - - HRESULT rc = close (aFinalRelease, false /* aFromServer */); - AssertComRC (rc); + Assert(mState == SessionState_Open || + mState == SessionState_Spawning); + + HRESULT rc = close(aFinalRelease, false /* aFromServer */); + AssertComRC(rc); } @@ -147,5 +145,5 @@ ///////////////////////////////////////////////////////////////////////////// -STDMETHODIMP Session::COMGETTER(State) (SessionState_T *aState) +STDMETHODIMP Session::COMGETTER(State)(SessionState_T *aState) { CheckComArgOutPointerValid(aState); @@ -161,5 +159,5 @@ } -STDMETHODIMP Session::COMGETTER(Type) (SessionType_T *aType) +STDMETHODIMP Session::COMGETTER(Type)(SessionType_T *aType) { CheckComArgOutPointerValid(aType); @@ -176,5 +174,5 @@ } -STDMETHODIMP Session::COMGETTER(Machine) (IMachine **aMachine) +STDMETHODIMP Session::COMGETTER(Machine)(IMachine **aMachine) { CheckComArgOutPointerValid(aMachine); @@ -193,10 +191,10 @@ else rc = mRemoteMachine.queryInterfaceTo(aMachine); - ComAssertComRC (rc); + ComAssertComRC(rc); return rc; } -STDMETHODIMP Session::COMGETTER(Console) (IConsole **aConsole) +STDMETHODIMP Session::COMGETTER(Console)(IConsole **aConsole) { CheckComArgOutPointerValid(aConsole); @@ -215,5 +213,5 @@ else rc = mRemoteConsole.queryInterfaceTo(aConsole); - ComAssertComRC (rc); + ComAssertComRC(rc); return rc; @@ -235,5 +233,5 @@ CHECK_OPEN(); - return close (false /* aFinalRelease */, false /* aFromServer */); + return close(false /* aFinalRelease */, false /* aFromServer */); } @@ -241,20 +239,20 @@ ///////////////////////////////////////////////////////////////////////////// -STDMETHODIMP Session::GetPID (ULONG *aPid) +STDMETHODIMP Session::GetPID(ULONG *aPid) { AssertReturn(aPid, E_POINTER); AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); - - AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - - *aPid = (ULONG) RTProcSelf(); - AssertCompile (sizeof (*aPid) == sizeof (RTPROCESS)); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); + + AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); + + *aPid = (ULONG)RTProcSelf(); + AssertCompile(sizeof(*aPid) == sizeof(RTPROCESS)); return S_OK; } -STDMETHODIMP Session::GetRemoteConsole (IConsole **aConsole) +STDMETHODIMP Session::GetRemoteConsole(IConsole **aConsole) { LogFlowThisFuncEnter(); @@ -262,5 +260,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -268,6 +266,7 @@ AssertReturn(mState != SessionState_Closed, VBOX_E_INVALID_VM_STATE); - AssertMsgReturn (mType == SessionType_Direct && !!mConsole, - ("This is not a direct session!\n"), VBOX_E_INVALID_OBJECT_STATE); + AssertMsgReturn(mType == SessionType_Direct && !!mConsole, + ("This is not a direct session!\n"), + VBOX_E_INVALID_OBJECT_STATE); /* return a failure if the session already transitioned to Closing @@ -283,5 +282,5 @@ } -STDMETHODIMP Session::AssignMachine (IMachine *aMachine) +STDMETHODIMP Session::AssignMachine(IMachine *aMachine) { LogFlowThisFuncEnter(); @@ -289,5 +288,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -319,8 +318,8 @@ rc = mConsole.createObject(); - AssertComRCReturn (rc, rc); - - rc = mConsole->init (aMachine, mControl); - AssertComRCReturn (rc, rc); + AssertComRCReturn(rc, rc); + + rc = mConsole->init(aMachine, mControl); + AssertComRCReturn(rc, rc); rc = grabIPCSemaphore(); @@ -331,5 +330,5 @@ */ if (SUCCEEDED(rc)) - rc = aMachine->COMGETTER(Parent) (mVirtualBox.asOutParam()); + rc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam()); if (SUCCEEDED(rc)) @@ -352,5 +351,5 @@ } -STDMETHODIMP Session::AssignRemoteMachine (IMachine *aMachine, IConsole *aConsole) +STDMETHODIMP Session::AssignRemoteMachine(IMachine *aMachine, IConsole *aConsole) { LogFlowThisFuncEnter(); @@ -360,5 +359,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -396,5 +395,5 @@ * until the session is closed */ - rc = aMachine->COMGETTER(Parent) (mVirtualBox.asOutParam()); + rc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam()); if (SUCCEEDED(rc)) @@ -407,5 +406,5 @@ mType = SessionType_Existing; else - Assert (mState == SessionState_Spawning); + Assert(mState == SessionState_Spawning); mState = SessionState_Open; @@ -425,5 +424,5 @@ } -STDMETHODIMP Session::UpdateMachineState (MachineState_T aMachineState) +STDMETHODIMP Session::UpdateMachineState(MachineState_T aMachineState) { AutoCaller autoCaller(this); @@ -453,5 +452,5 @@ AssertReturn(!mConsole.isNull(), E_FAIL); - return mConsole->updateMachineState (aMachineState); + return mConsole->updateMachineState(aMachineState); } @@ -481,5 +480,5 @@ /* close ourselves */ - rc = close (false /* aFinalRelease */, true /* aFromServer */); + rc = close(false /* aFinalRelease */, true /* aFromServer */); } else if (autoCaller.state() == InUninit) @@ -508,5 +507,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -522,5 +521,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -536,5 +535,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -550,5 +549,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -564,5 +563,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -578,5 +577,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -592,5 +591,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -606,5 +605,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -615,10 +614,10 @@ } -STDMETHODIMP Session::OnSharedFolderChange (BOOL aGlobal) -{ - LogFlowThisFunc(("\n")); - - AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); +STDMETHODIMP Session::OnSharedFolderChange(BOOL aGlobal) +{ + LogFlowThisFunc(("\n")); + + AutoCaller autoCaller(this); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -626,15 +625,15 @@ AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE); - return mConsole->onSharedFolderChange (aGlobal); -} - -STDMETHODIMP Session::OnUSBDeviceAttach (IUSBDevice *aDevice, - IVirtualBoxErrorInfo *aError, - ULONG aMaskedIfs) -{ - LogFlowThisFunc(("\n")); - - AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + return mConsole->onSharedFolderChange(aGlobal); +} + +STDMETHODIMP Session::OnUSBDeviceAttach(IUSBDevice *aDevice, + IVirtualBoxErrorInfo *aError, + ULONG aMaskedIfs) +{ + LogFlowThisFunc(("\n")); + + AutoCaller autoCaller(this); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -642,14 +641,14 @@ AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE); - return mConsole->onUSBDeviceAttach (aDevice, aError, aMaskedIfs); -} - -STDMETHODIMP Session::OnUSBDeviceDetach (IN_BSTR aId, - IVirtualBoxErrorInfo *aError) -{ - LogFlowThisFunc(("\n")); - - AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + return mConsole->onUSBDeviceAttach(aDevice, aError, aMaskedIfs); +} + +STDMETHODIMP Session::OnUSBDeviceDetach(IN_BSTR aId, + IVirtualBoxErrorInfo *aError) +{ + LogFlowThisFunc(("\n")); + + AutoCaller autoCaller(this); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -657,11 +656,11 @@ AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE); - return mConsole->onUSBDeviceDetach (aId, aError); -} - -STDMETHODIMP Session::OnShowWindow (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId) -{ - AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + return mConsole->onUSBDeviceDetach(aId, aError); +} + +STDMETHODIMP Session::OnShowWindow(BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId) +{ + AutoCaller autoCaller(this); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -680,36 +679,36 @@ } - return mConsole->onShowWindow (aCheck, aCanShow, aWinId); -} - -STDMETHODIMP Session::AccessGuestProperty (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags, - BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags) + return mConsole->onShowWindow(aCheck, aCanShow, aWinId); +} + +STDMETHODIMP Session::AccessGuestProperty(IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags, + BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags) { #ifdef VBOX_WITH_GUEST_PROPS AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); if (mState != SessionState_Open) - return setError (VBOX_E_INVALID_VM_STATE, - tr ("Machine session is not open (session state: %s)."), - Global::stringifySessionState(mState)); + return setError(VBOX_E_INVALID_VM_STATE, + tr("Machine session is not open (session state: %s)."), + Global::stringifySessionState(mState)); AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE); CheckComArgNotNull(aName); - if (!aIsSetter && !VALID_PTR (aRetValue)) + if (!aIsSetter && !VALID_PTR(aRetValue)) return E_POINTER; - if (!aIsSetter && !VALID_PTR (aRetTimestamp)) + if (!aIsSetter && !VALID_PTR(aRetTimestamp)) return E_POINTER; - if (!aIsSetter && !VALID_PTR (aRetFlags)) + if (!aIsSetter && !VALID_PTR(aRetFlags)) return E_POINTER; /* aValue can be NULL for a setter call if the property is to be deleted. */ - if (aIsSetter && (aValue != NULL) && !VALID_PTR (aValue)) + if (aIsSetter && (aValue != NULL) && !VALID_PTR(aValue)) return E_INVALIDARG; /* aFlags can be null if it is to be left as is */ - if (aIsSetter && (aFlags != NULL) && !VALID_PTR (aFlags)) + if (aIsSetter && (aFlags != NULL) && !VALID_PTR(aFlags)) return E_INVALIDARG; if (!aIsSetter) - return mConsole->getGuestProperty (aName, aRetValue, aRetTimestamp, aRetFlags); + return mConsole->getGuestProperty(aName, aRetValue, aRetTimestamp, aRetFlags); else - return mConsole->setGuestProperty (aName, aValue, aFlags); + return mConsole->setGuestProperty(aName, aValue, aFlags); #else /* VBOX_WITH_GUEST_PROPS not defined */ ReturnComNotImplemented(); @@ -717,20 +716,20 @@ } -STDMETHODIMP Session::EnumerateGuestProperties (IN_BSTR aPatterns, - ComSafeArrayOut(BSTR, aNames), - ComSafeArrayOut(BSTR, aValues), - ComSafeArrayOut(ULONG64, aTimestamps), - ComSafeArrayOut(BSTR, aFlags)) +STDMETHODIMP Session::EnumerateGuestProperties(IN_BSTR aPatterns, + ComSafeArrayOut(BSTR, aNames), + ComSafeArrayOut(BSTR, aValues), + ComSafeArrayOut(ULONG64, aTimestamps), + ComSafeArrayOut(BSTR, aFlags)) { #ifdef VBOX_WITH_GUEST_PROPS AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); if (mState != SessionState_Open) - return setError (VBOX_E_INVALID_VM_STATE, - tr ("Machine session is not open (session state: %s)."), - Global::stringifySessionState(mState)); - AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE); - if (!VALID_PTR (aPatterns) && (aPatterns != NULL)) + return setError(VBOX_E_INVALID_VM_STATE, + tr("Machine session is not open (session state: %s)."), + Global::stringifySessionState(mState)); + AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE); + if (!VALID_PTR(aPatterns) && (aPatterns != NULL)) return E_POINTER; if (ComSafeArrayOutIsNull(aNames)) @@ -764,5 +763,5 @@ * @note Locks this object for writing. */ -HRESULT Session::close (bool aFinalRelease, bool aFromServer) +HRESULT Session::close(bool aFinalRelease, bool aFromServer) { LogFlowThisFuncEnter(); @@ -779,5 +778,5 @@ if (mState != SessionState_Open) { - Assert (mState == SessionState_Spawning); + Assert(mState == SessionState_Spawning); /* The session object is going to be uninitialized before it has been @@ -789,15 +788,15 @@ * trying to close the session before waiting for the progress object it * got from IVirtualBox:: openRemoteSession() to complete, so assert. */ - Assert (aFromServer); + Assert(aFromServer); mState = SessionState_Closed; mType = SessionType_Null; #if defined(RT_OS_WINDOWS) - Assert (!mIPCSem && !mIPCThreadSem); + Assert(!mIPCSem && !mIPCThreadSem); #elif defined(RT_OS_OS2) - Assert (mIPCThread == NIL_RTTHREAD && - mIPCThreadSem == NIL_RTSEMEVENT); + Assert(mIPCThread == NIL_RTTHREAD && + mIPCThreadSem == NIL_RTSEMEVENT); #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) - Assert (mIPCSem == -1); + Assert(mIPCSem == -1); #else # error "Port me!" @@ -845,5 +844,5 @@ LogFlowThisFunc(("Calling mControl->OnSessionEnd()...\n")); - HRESULT rc = mControl->OnSessionEnd (this, progress.asOutParam()); + HRESULT rc = mControl->OnSessionEnd(this, progress.asOutParam()); LogFlowThisFunc(("mControl->OnSessionEnd()=%08X\n", rc)); @@ -857,5 +856,5 @@ rc = S_OK; - AssertComRC (rc); + AssertComRC(rc); } @@ -872,7 +871,7 @@ * once this method returns) */ - Assert (!!progress); + Assert(!!progress); if (progress) - progress->WaitForCompletion (-1); + progress->WaitForCompletion(-1); } } @@ -895,5 +894,5 @@ /* open the IPC semaphore based on the sessionId and try to grab it */ Bstr ipcId; - rc = mControl->GetIPCId (ipcId.asOutParam()); + rc = mControl->GetIPCId(ipcId.asOutParam()); AssertComRCReturnRC(rc); @@ -909,34 +908,33 @@ */ - mIPCThreadSem = ::CreateEvent (NULL, FALSE, FALSE, NULL); - AssertMsgReturn (mIPCThreadSem, - ("Cannot create an event sem, err=%d", ::GetLastError()), - E_FAIL); - - void *data [3]; - data [0] = (void *) (BSTR) ipcId; - data [1] = (void *) mIPCThreadSem; - data [2] = 0; /* will get an output from the thread */ + mIPCThreadSem = ::CreateEvent(NULL, FALSE, FALSE, NULL); + AssertMsgReturn(mIPCThreadSem, + ("Cannot create an event sem, err=%d", ::GetLastError()), + E_FAIL); + + void *data[3]; + data[0] = (void*)(BSTR)ipcId; + data[1] = (void*)mIPCThreadSem; + data[2] = 0; /* will get an output from the thread */ /* create a thread to hold the IPC mutex until signalled to release it */ RTTHREAD tid; - int vrc = RTThreadCreate (&tid, IPCMutexHolderThread, (void *) data, - 0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder"); - AssertRCReturn (vrc, E_FAIL); + int vrc = RTThreadCreate(&tid, IPCMutexHolderThread, (void*)data, 0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder"); + AssertRCReturn(vrc, E_FAIL); /* wait until thread init is completed */ - DWORD wrc = ::WaitForSingleObject (mIPCThreadSem, INFINITE); - AssertMsg (wrc == WAIT_OBJECT_0, ("Wait failed, err=%d\n", ::GetLastError())); - Assert (data [2]); - - if (wrc == WAIT_OBJECT_0 && data [2]) + DWORD wrc = ::WaitForSingleObject(mIPCThreadSem, INFINITE); + AssertMsg(wrc == WAIT_OBJECT_0, ("Wait failed, err=%d\n", ::GetLastError())); + Assert(data[2]); + + if (wrc == WAIT_OBJECT_0 && data[2]) { /* memorize the event sem we should signal in close() */ - mIPCSem = (HANDLE) data [2]; + mIPCSem = (HANDLE)data[2]; rc = S_OK; } else { - ::CloseHandle (mIPCThreadSem); + ::CloseHandle(mIPCThreadSem); mIPCThreadSem = NULL; rc = E_FAIL; @@ -950,16 +948,16 @@ * and then release it in close(). */ - int vrc = RTSemEventCreate (&mIPCThreadSem); - AssertRCReturn (vrc, E_FAIL); - - void *data [3]; - data [0] = (void *) ipcId.raw(); - data [1] = (void *) mIPCThreadSem; - data [2] = (void *) false; /* will get the thread result here */ + int vrc = RTSemEventCreate(&mIPCThreadSem); + AssertRCReturn(vrc, E_FAIL); + + void *data[3]; + data[0] = (void*)ipcId.raw(); + data[1] = (void*)mIPCThreadSem; + data[2] = (void*)false; /* will get the thread result here */ /* create a thread to hold the IPC mutex until signalled to release it */ - vrc = RTThreadCreate (&mIPCThread, IPCMutexHolderThread, (void *) data, - 0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder"); - AssertRCReturn (vrc, E_FAIL); + vrc = RTThreadCreate(&mIPCThread, IPCMutexHolderThread, (void *) data, + 0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder"); + AssertRCReturn(vrc, E_FAIL); /* wait until thread init is completed */ @@ -968,5 +966,5 @@ /* the thread must succeed */ - AssertReturn((bool) data [2], E_FAIL); + AssertReturn((bool)data[2], E_FAIL); #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) @@ -1034,5 +1032,5 @@ /* tell the thread holding the IPC mutex to release it */ int vrc = RTSemEventSignal (mIPCThreadSem); - AssertRC (vrc == NO_ERROR); + AssertRC(vrc == NO_ERROR); /* wait for the thread to finish */ @@ -1073,6 +1071,6 @@ void **data = (void **) pvUser; - BSTR sessionId = (BSTR) data [0]; - HANDLE initDoneSem = (HANDLE) data [1]; + BSTR sessionId = (BSTR)data[0]; + HANDLE initDoneSem = (HANDLE)data[1]; HANDLE ipcMutex = ::OpenMutex (MUTEX_ALL_ACCESS, FALSE, sessionId); @@ -1090,5 +1088,5 @@ if (finishSem) { - data [2] = (void *) finishSem; + data[2] = (void*)finishSem; /* signal we're done with init */ ::SetEvent (initDoneSem); @@ -1123,6 +1121,6 @@ void **data = (void **) pvUser; - Utf8Str ipcId = (BSTR) data [0]; - RTSEMEVENT finishSem = (RTSEMEVENT) data [1]; + Utf8Str ipcId = (BSTR)data[0]; + RTSEMEVENT finishSem = (RTSEMEVENT)data[1]; LogFlowFunc (("ipcId='%s', finishSem=%p\n", ipcId.raw(), finishSem)); @@ -1141,8 +1139,8 @@ { /* store the answer */ - data [2] = (void *) true; + data[2] = (void*)true; /* signal we're done */ int vrc = RTThreadUserSignal (Thread); - AssertRC (vrc); + AssertRC(vrc); /* wait until we're signaled to release the IPC mutex */ @@ -1161,8 +1159,8 @@ /* store the answer */ - data [1] = (void *) false; + data[1] = (void*)false; /* signal we're done */ int vrc = RTThreadUserSignal (Thread); - AssertRC (vrc); + AssertRC(vrc); LogFlowFuncLeave(); Index: /trunk/src/VBox/Main/SharedFolderImpl.cpp =================================================================== --- /trunk/src/VBox/Main/SharedFolderImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/SharedFolderImpl.cpp (revision 26186) @@ -209,5 +209,5 @@ /* Check whether the path is full (absolute) */ - char hostPathFull [RTPATH_MAX]; + char hostPathFull[RTPATH_MAX]; int vrc = RTPathAbsEx(NULL, hostPath.c_str(), @@ -215,10 +215,12 @@ sizeof (hostPathFull)); if (RT_FAILURE(vrc)) - return setError (E_INVALIDARG, - tr ("Invalid shared folder path: '%s' (%Rrc)"), hostPath.raw(), vrc); + return setError(E_INVALIDARG, + tr("Invalid shared folder path: '%s' (%Rrc)"), + hostPath.raw(), vrc); if (RTPathCompare(hostPath.c_str(), hostPathFull) != 0) - return setError (E_INVALIDARG, - tr ("Shared folder path '%s' is not absolute"), hostPath.raw()); + return setError(E_INVALIDARG, + tr("Shared folder path '%s' is not absolute"), + hostPath.raw()); unconst(mParent) = aParent; Index: /trunk/src/VBox/Main/SnapshotImpl.cpp =================================================================== --- /trunk/src/VBox/Main/SnapshotImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/SnapshotImpl.cpp (revision 26186) @@ -106,5 +106,5 @@ HRESULT Snapshot::FinalConstruct() { - LogFlowMember (("Snapshot::FinalConstruct()\n")); + LogFlowMember(("Snapshot::FinalConstruct()\n")); return S_OK; } @@ -112,5 +112,5 @@ void Snapshot::FinalRelease() { - LogFlowMember (("Snapshot::FinalRelease()\n")); + LogFlowMember(("Snapshot::FinalRelease()\n")); uninit(); } @@ -136,5 +136,5 @@ LogFlowMember(("Snapshot::init(uuid: %s, aParent->uuid=%s)\n", aId.toString().c_str(), (aParent) ? aParent->m->uuid.toString().c_str() : "")); - ComAssertRet (!aId.isEmpty() && !aName.isEmpty() && aMachine, E_INVALIDARG); + ComAssertRet(!aId.isEmpty() && !aName.isEmpty() && aMachine, E_INVALIDARG); /* Enclose the state transition NotReady->InInit->Ready */ @@ -174,5 +174,5 @@ void Snapshot::uninit() { - LogFlowMember (("Snapshot::uninit()\n")); + LogFlowMember(("Snapshot::uninit()\n")); /* Enclose the state transition Ready->InUninit->NotReady */ @@ -310,5 +310,5 @@ //////////////////////////////////////////////////////////////////////////////// -STDMETHODIMP Snapshot::COMGETTER(Id) (BSTR *aId) +STDMETHODIMP Snapshot::COMGETTER(Id)(BSTR *aId) { CheckComArgOutPointerValid(aId); @@ -323,5 +323,5 @@ } -STDMETHODIMP Snapshot::COMGETTER(Name) (BSTR *aName) +STDMETHODIMP Snapshot::COMGETTER(Name)(BSTR *aName) { CheckComArgOutPointerValid(aName); @@ -363,5 +363,5 @@ } -STDMETHODIMP Snapshot::COMGETTER(Description) (BSTR *aDescription) +STDMETHODIMP Snapshot::COMGETTER(Description)(BSTR *aDescription) { CheckComArgOutPointerValid(aDescription); @@ -376,5 +376,5 @@ } -STDMETHODIMP Snapshot::COMSETTER(Description) (IN_BSTR aDescription) +STDMETHODIMP Snapshot::COMSETTER(Description)(IN_BSTR aDescription) { CheckComArgNotNull(aDescription); @@ -399,5 +399,5 @@ } -STDMETHODIMP Snapshot::COMGETTER(TimeStamp) (LONG64 *aTimeStamp) +STDMETHODIMP Snapshot::COMGETTER(TimeStamp)(LONG64 *aTimeStamp) { CheckComArgOutPointerValid(aTimeStamp); @@ -425,5 +425,5 @@ } -STDMETHODIMP Snapshot::COMGETTER(Machine) (IMachine **aMachine) +STDMETHODIMP Snapshot::COMGETTER(Machine)(IMachine **aMachine) { CheckComArgOutPointerValid(aMachine); @@ -438,5 +438,5 @@ } -STDMETHODIMP Snapshot::COMGETTER(Parent) (ISnapshot **aParent) +STDMETHODIMP Snapshot::COMGETTER(Parent)(ISnapshot **aParent) { CheckComArgOutPointerValid(aParent); @@ -451,5 +451,5 @@ } -STDMETHODIMP Snapshot::COMGETTER(Children) (ComSafeArrayOut(ISnapshot *, aChildren)) +STDMETHODIMP Snapshot::COMGETTER(Children)(ComSafeArrayOut(ISnapshot *, aChildren)) { CheckComArgOutSafeArrayPointerValid(aChildren); @@ -816,5 +816,5 @@ LogFlowThisFunc(("mName={%ls}\n", aSessionMachine->mUserData->mName.raw())); - AssertReturn(aSessionMachine && !Guid (aSnapshotId).isEmpty(), E_INVALIDARG); + AssertReturn(aSessionMachine && !Guid(aSnapshotId).isEmpty(), E_INVALIDARG); /* Enclose the state transition NotReady->InInit->Ready */ @@ -832,11 +832,11 @@ /* take the pointer to Data to share */ - mData.share (mPeer->mData); + mData.share(mPeer->mData); /* take the pointer to UserData to share (our UserData must always be the * same as Machine's data) */ - mUserData.share (mPeer->mUserData); + mUserData.share(mPeer->mUserData); /* make a private copy of all other data (recent changes from SessionMachine) */ - mHWData.attachCopy (aSessionMachine->mHWData); + mHWData.attachCopy(aSessionMachine->mHWData); mMediaData.attachCopy(aSessionMachine->mMediaData); @@ -855,5 +855,5 @@ ComObjPtr folder; folder.createObject(); - rc = folder->initCopy (this, *it); + rc = folder->initCopy(this, *it); if (FAILED(rc)) return rc; *it = folder; @@ -885,5 +885,5 @@ ComObjPtr ctrl; ctrl.createObject(); - ctrl->initCopy (this, *it); + ctrl->initCopy(this, *it); mStorageControllers->push_back(ctrl); } @@ -892,33 +892,33 @@ unconst(mBIOSSettings).createObject(); - mBIOSSettings->initCopy (this, mPeer->mBIOSSettings); + mBIOSSettings->initCopy(this, mPeer->mBIOSSettings); #ifdef VBOX_WITH_VRDP unconst(mVRDPServer).createObject(); - mVRDPServer->initCopy (this, mPeer->mVRDPServer); + mVRDPServer->initCopy(this, mPeer->mVRDPServer); #endif unconst(mAudioAdapter).createObject(); - mAudioAdapter->initCopy (this, mPeer->mAudioAdapter); + mAudioAdapter->initCopy(this, mPeer->mAudioAdapter); unconst(mUSBController).createObject(); mUSBController->initCopy(this, mPeer->mUSBController); - for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot++) + for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++) { unconst(mNetworkAdapters[slot]).createObject(); - mNetworkAdapters[slot]->initCopy (this, mPeer->mNetworkAdapters [slot]); - } - - for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot++) - { - unconst(mSerialPorts [slot]).createObject(); - mSerialPorts[slot]->initCopy (this, mPeer->mSerialPorts[slot]); - } - - for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot++) + mNetworkAdapters[slot]->initCopy(this, mPeer->mNetworkAdapters[slot]); + } + + for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++) + { + unconst(mSerialPorts[slot]).createObject(); + mSerialPorts[slot]->initCopy(this, mPeer->mSerialPorts[slot]); + } + + for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++) { unconst(mParallelPorts[slot]).createObject(); - mParallelPorts[slot]->initCopy (this, mPeer->mParallelPorts[slot]); + mParallelPorts[slot]->initCopy(this, mPeer->mParallelPorts[slot]); } @@ -967,10 +967,10 @@ /* take the pointer to Data to share */ - mData.share (mPeer->mData); + mData.share(mPeer->mData); /* * take the pointer to UserData to share * (our UserData must always be the same as Machine's data) */ - mUserData.share (mPeer->mUserData); + mUserData.share(mPeer->mUserData); /* allocate private copies of all other data (will be loaded from settings) */ mHWData.allocate(); @@ -1079,5 +1079,5 @@ * @note Locks this object for writing. */ -HRESULT SnapshotMachine::onSnapshotChange (Snapshot *aSnapshot) +HRESULT SnapshotMachine::onSnapshotChange(Snapshot *aSnapshot) { AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -1538,5 +1538,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -1952,5 +1952,5 @@ AutoCaller autoCaller(this); - AssertComRCReturn (autoCaller.rc(), autoCaller.rc()); + AssertComRCReturn(autoCaller.rc(), autoCaller.rc()); /* saveSettings() needs mParent lock */ @@ -2208,5 +2208,5 @@ /* The below assert would be nice but I don't want to move * Medium::MergeChain to the header just for that - * Assert (!chain->isForward()); */ + * Assert(!chain->isForward()); */ // prepareDiscard() should have raised an error already Index: /trunk/src/VBox/Main/StorageControllerImpl.cpp =================================================================== --- /trunk/src/VBox/Main/StorageControllerImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/StorageControllerImpl.cpp (revision 26186) @@ -123,6 +123,6 @@ if ( (aStorageBus <= StorageBus_Null) || (aStorageBus > StorageBus_SAS)) - return setError (E_INVALIDARG, - tr ("Invalid storage connection type")); + return setError(E_INVALIDARG, + tr("Invalid storage connection type")); /* Enclose the state transition NotReady->InInit->Ready */ @@ -137,5 +137,5 @@ /* register with parent early, since uninit() will unconditionally * unregister on failure */ - m->pParent->addDependentChild (this); + m->pParent->addDependentChild(this); m->bd.allocate(); @@ -211,5 +211,5 @@ /* register with parent early, since uninit() will unconditionally * unregister on failure */ - m->pParent->addDependentChild (this); + m->pParent->addDependentChild(this); /* sanity */ @@ -258,11 +258,11 @@ /* m->pPeer is left null */ - m->pParent->addDependentChild (this); - - AutoCaller thatCaller (aThat); + m->pParent->addDependentChild(this); + + AutoCaller thatCaller(aThat); AssertComRCReturnRC(thatCaller.rc()); AutoReadLock thatlock(aThat COMMA_LOCKVAL_SRC_POS); - m->bd.attachCopy (aThat->m->bd); + m->bd.attachCopy(aThat->m->bd); /* Confirm a successful initialization */ @@ -288,5 +288,5 @@ m->bd.free(); - m->pParent->removeDependentChild (this); + m->pParent->removeDependentChild(this); unconst(m->pPeer).setNull(); @@ -494,7 +494,7 @@ /* AHCI SATA supports a maximum of 30 ports. */ if ((aPortCount < 1) || (aPortCount > 30)) - return setError (E_INVALIDARG, - tr ("Invalid port count: %lu (must be in range [%lu, %lu])"), - aPortCount, 1, 30); + return setError(E_INVALIDARG, + tr("Invalid port count: %lu (must be in range [%lu, %lu])"), + aPortCount, 1, 30); break; } @@ -508,7 +508,7 @@ */ if (aPortCount != 16) - return setError (E_INVALIDARG, - tr ("Invalid port count: %lu (must be in range [%lu, %lu])"), - aPortCount, 16, 16); + return setError(E_INVALIDARG, + tr("Invalid port count: %lu (must be in range [%lu, %lu])"), + aPortCount, 16, 16); break; } @@ -519,7 +519,7 @@ */ if (aPortCount != 2) - return setError (E_INVALIDARG, - tr ("Invalid port count: %lu (must be in range [%lu, %lu])"), - aPortCount, 2, 2); + return setError(E_INVALIDARG, + tr("Invalid port count: %lu (must be in range [%lu, %lu])"), + aPortCount, 2, 2); break; } @@ -531,7 +531,7 @@ */ if (aPortCount != 1) - return setError (E_INVALIDARG, - tr ("Invalid port count: %lu (must be in range [%lu, %lu])"), - aPortCount, 1, 1); + return setError(E_INVALIDARG, + tr("Invalid port count: %lu (must be in range [%lu, %lu])"), + aPortCount, 1, 1); break; } @@ -542,7 +542,7 @@ */ if (aPortCount != 8) - return setError (E_INVALIDARG, - tr ("Invalid port count: %lu (must be in range [%lu, %lu])"), - aPortCount, 8, 8); + return setError(E_INVALIDARG, + tr("Invalid port count: %lu (must be in range [%lu, %lu])"), + aPortCount, 8, 8); break; } @@ -617,6 +617,6 @@ if (m->bd->mStorageControllerType != StorageControllerType_IntelAhci) - return setError (E_NOTIMPL, - tr ("Invalid controller type")); + return setError(E_NOTIMPL, + tr("Invalid controller type")); switch (DevicePosition) @@ -652,11 +652,11 @@ if (m->bd->mStorageControllerType != StorageControllerType_IntelAhci) - return setError (E_NOTIMPL, - tr ("Invalid controller type")); + return setError(E_NOTIMPL, + tr("Invalid controller type")); if ((aPortNumber < 0) || (aPortNumber >= 30)) - return setError (E_INVALIDARG, - tr ("Invalid port number: %l (must be in range [%lu, %lu])"), - aPortNumber, 0, 29); + return setError(E_INVALIDARG, + tr("Invalid port number: %l (must be in range [%lu, %lu])"), + aPortNumber, 0, 29); switch (DevicePosition) Index: /trunk/src/VBox/Main/SystemPropertiesImpl.cpp =================================================================== --- /trunk/src/VBox/Main/SystemPropertiesImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/SystemPropertiesImpl.cpp (revision 26186) @@ -97,8 +97,8 @@ /// free in structures returned by VDBackendInfo. Must be fixed ASAP! - VDBACKENDINFO aVDInfo [100]; + VDBACKENDINFO aVDInfo[100]; unsigned cEntries; - int vrc = VDBackendInfo (RT_ELEMENTS (aVDInfo), aVDInfo, &cEntries); - AssertRC (vrc); + int vrc = VDBackendInfo(RT_ELEMENTS (aVDInfo), aVDInfo, &cEntries); + AssertRC(vrc); if (RT_SUCCESS(vrc)) { @@ -109,8 +109,8 @@ if (FAILED(rc)) break; - rc = hdf->init (&aVDInfo [i]); + rc = hdf->init(&aVDInfo[i]); if (FAILED(rc)) break; - mMediumFormats.push_back (hdf); + mMediumFormats.push_back(hdf); } } Index: /trunk/src/VBox/Main/USBControllerImpl.cpp =================================================================== --- /trunk/src/VBox/Main/USBControllerImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/USBControllerImpl.cpp (revision 26186) @@ -560,11 +560,11 @@ if (!m->llDeviceFilters->size()) - return setError (E_INVALIDARG, - tr ("The USB device filter list is empty")); + return setError(E_INVALIDARG, + tr("The USB device filter list is empty")); if (aPosition >= m->llDeviceFilters->size()) - return setError (E_INVALIDARG, - tr ("Invalid position: %lu (must be in range [0, %lu])"), - aPosition, m->llDeviceFilters->size() - 1); + return setError(E_INVALIDARG, + tr("Invalid position: %lu (must be in range [0, %lu])"), + aPosition, m->llDeviceFilters->size() - 1); /* backup the list before modification */ Index: /trunk/src/VBox/Main/VirtualBoxBase.cpp =================================================================== --- /trunk/src/VBox/Main/VirtualBoxBase.cpp (revision 26185) +++ /trunk/src/VBox/Main/VirtualBoxBase.cpp (revision 26186) @@ -63,6 +63,6 @@ if (mObjectLock) delete mObjectLock; - Assert (mInitUninitWaiters == 0); - Assert (mInitUninitSem == NIL_RTSEMEVENTMULTI); + Assert(mInitUninitWaiters == 0); + Assert(mInitUninitSem == NIL_RTSEMEVENTMULTI); if (mZeroCallersSem != NIL_RTSEMEVENT) RTSemEventDestroy (mZeroCallersSem); @@ -217,5 +217,5 @@ { RTSemEventMultiCreate (&mInitUninitSem); - Assert (mInitUninitWaiters == 0); + Assert(mInitUninitWaiters == 0); } @@ -242,5 +242,5 @@ else { - Assert (mCallers != 0); + Assert(mCallers != 0); -- mCallers; if (mCallers == 0 && mState == InUninit) @@ -272,6 +272,6 @@ { /* if Ready or Limited, decrease the number of callers */ - AssertMsgReturn (mCallers != 0, ("mCallers is ZERO!"), (void) 0); - -- mCallers; + AssertMsgReturn(mCallers != 0, ("mCallers is ZERO!"), (void) 0); + --mCallers; return; @@ -291,12 +291,10 @@ /* the caller is being released after AutoUninitSpan or * AutoMayUninitSpan has begun */ - AssertMsgReturn (mCallers != 0, ("mCallers is ZERO!"), (void) 0); - -- mCallers; + AssertMsgReturn(mCallers != 0, ("mCallers is ZERO!"), (void) 0); + --mCallers; if (mCallers == 0) - { /* inform the Auto*UninitSpan ctor there are no more callers */ - RTSemEventSignal (mZeroCallersSem); - } + RTSemEventSignal(mZeroCallersSem); return; @@ -600,5 +598,5 @@ * something else but set error info. */ mRC = mObj->addCaller(); - Assert(FAILED (mRC)); + Assert(FAILED(mRC)); return; } @@ -634,5 +632,5 @@ { /* if we did nothing in the constructor, do nothing here */ - if (mAlreadyInProgress || FAILED (mRC)) + if (mAlreadyInProgress || FAILED(mRC)) return; @@ -730,5 +728,5 @@ bool VirtualBoxSupportTranslationBase::cutClassNameFrom__PRETTY_FUNCTION__ (char *fn) { - Assert (fn); + Assert(fn); if (!fn) return false; @@ -752,16 +750,16 @@ #endif - char *start = strstr (fn, START); - Assert (start); + char *start = strstr(fn, START); + Assert(start); if (start) { - start += sizeof (START) - 1; - char *end = strstr (start, END); - Assert (end && (end > start)); + start += sizeof(START) - 1; + char *end = strstr(start, END); + Assert(end && (end > start)); if (end && (end > start)) { size_t len = end - start; - memmove (fn, start, len); - fn [len] = 0; + memmove(fn, start, len); + fn[len] = 0; return true; } @@ -827,5 +825,5 @@ /* these are mandatory, others -- not */ - AssertReturn((!aWarning && FAILED (aResultCode)) || + AssertReturn((!aWarning && FAILED(aResultCode)) || (aWarning && aResultCode != S_OK), E_FAIL); @@ -854,5 +852,5 @@ if (FAILED(rc)) break; rc = err.queryInterfaceTo(curInfo.asOutParam()); - if (FAILED (rc)) + if (FAILED(rc)) { /* create a IVirtualBoxErrorInfo wrapper for the native @@ -869,5 +867,5 @@ } /* On failure, curInfo will stay null */ - Assert (SUCCEEDED(rc) || curInfo.isNull()); + Assert(SUCCEEDED(rc) || curInfo.isNull()); /* set the current error info and preserve the previous one if any */ @@ -913,5 +911,5 @@ } /* On failure, curInfo will stay null */ - Assert (SUCCEEDED(rc) || curInfo.isNull()); + Assert(SUCCEEDED(rc) || curInfo.isNull()); /* set the current error info and preserve the previous one if any */ @@ -991,5 +989,5 @@ DependentChildren::iterator it = mDependentChildren.begin(); ComPtr unk = it->first; - Assert (!unk.isNull()); + Assert(!unk.isNull()); VirtualBoxBase *child = it->second; @@ -1003,5 +1001,5 @@ * uninit() call will wait until the first one has done so * (thanks to AutoUninitSpan). */ - Assert (child); + Assert(child); if (child) child->uninit(); @@ -1017,5 +1015,5 @@ mDependentChildren.erase (it); - Assert (count == mDependentChildren.size()); + Assert(count == mDependentChildren.size()); } } Index: /trunk/src/VBox/Main/VirtualBoxImpl.cpp =================================================================== --- /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 26185) +++ /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 26186) @@ -314,8 +314,7 @@ int vrc = com::GetVBoxUserHomeDirectory(szHomeDir, sizeof(szHomeDir)); if (RT_FAILURE(vrc)) - return setError (E_FAIL, - tr ("Could not create the VirtualBox home directory '%s'" - "(%Rrc)"), - szHomeDir, vrc); + return setError(E_FAIL, + tr("Could not create the VirtualBox home directory '%s' (%Rrc)"), + szHomeDir, vrc); unconst(m->strHomeDir) = szHomeDir; @@ -380,15 +379,15 @@ if (SUCCEEDED(rc)) { - rc = guestOSTypeObj->init(Global::sOSTypes [i].familyId, - Global::sOSTypes [i].familyDescription, - Global::sOSTypes [i].id, - Global::sOSTypes [i].description, - Global::sOSTypes [i].osType, - Global::sOSTypes [i].osHint, - Global::sOSTypes [i].recommendedRAM, - Global::sOSTypes [i].recommendedVRAM, - Global::sOSTypes [i].recommendedHDD, - Global::sOSTypes [i].networkAdapterType, - Global::sOSTypes [i].numSerialEnabled); + rc = guestOSTypeObj->init(Global::sOSTypes[i].familyId, + Global::sOSTypes[i].familyDescription, + Global::sOSTypes[i].id, + Global::sOSTypes[i].description, + Global::sOSTypes[i].osType, + Global::sOSTypes[i].osHint, + Global::sOSTypes[i].recommendedRAM, + Global::sOSTypes[i].recommendedVRAM, + Global::sOSTypes[i].recommendedHDD, + Global::sOSTypes[i].networkAdapterType, + Global::sOSTypes[i].numSerialEnabled); if (SUCCEEDED(rc)) m->ollGuestOSTypes.addChild(guestOSTypeObj); @@ -456,5 +455,5 @@ RTTHREADFLAGS_WAITABLE, "Watcher"); - ComAssertRC (vrc); + ComAssertRC(vrc); if (RT_FAILURE(vrc)) rc = E_FAIL; @@ -887,5 +886,5 @@ if (FAILED(autoCaller.rc())) return autoCaller.rc(); - return setError (E_NOTIMPL, "Not yet implemented"); + return setError(E_NOTIMPL, "Not yet implemented"); } @@ -1365,5 +1364,5 @@ imageId = Guid(aImageId); if (imageId.isEmpty()) - return setError (E_INVALIDARG, tr ("Argument %s is empty"), "aImageId"); + return setError(E_INVALIDARG, tr("Argument %s is empty"), "aImageId"); } if (aSetParentId) @@ -1624,7 +1623,7 @@ for (size_t i = 0; i < RT_ELEMENTS (kOldNewIDs) / 2; i += 2) { - if (id == kOldNewIDs [i]) - { - id = kOldNewIDs [i + 1]; + if (id == kOldNewIDs[i]) + { + id = kOldNewIDs[i + 1]; break; } @@ -1648,7 +1647,7 @@ return (*aType) ? S_OK : - setError (E_INVALIDARG, - tr ("'%ls' is not a valid Guest OS type"), - aId); + setError(E_INVALIDARG, + tr("'%ls' is not a valid Guest OS type"), + aId); } @@ -1661,5 +1660,5 @@ if (FAILED(autoCaller.rc())) return autoCaller.rc(); - return setError (E_NOTIMPL, "Not yet implemented"); + return setError(E_NOTIMPL, "Not yet implemented"); } @@ -1671,5 +1670,5 @@ if (FAILED(autoCaller.rc())) return autoCaller.rc(); - return setError (E_NOTIMPL, "Not yet implemented"); + return setError(E_NOTIMPL, "Not yet implemented"); } @@ -1830,6 +1829,6 @@ if (state != SessionState_Closed) - return setError (VBOX_E_INVALID_OBJECT_STATE, - tr ("The given session is already open or being opened")); + return setError(VBOX_E_INVALID_OBJECT_STATE, + tr("The given session is already open or being opened")); /* get the IInternalSessionControl interface */ @@ -1886,6 +1885,6 @@ if (state != SessionState_Closed) - return setError (VBOX_E_INVALID_OBJECT_STATE, - tr ("The given session is already open or being opened")); + return setError(VBOX_E_INVALID_OBJECT_STATE, + tr("The given session is already open or being opened")); /* get the IInternalSessionControl interface */ @@ -1940,6 +1939,6 @@ if (state != SessionState_Closed) - return setError (VBOX_E_INVALID_OBJECT_STATE, - tr ("The given session is already open or being opened")); + return setError(VBOX_E_INVALID_OBJECT_STATE, + tr("The given session is already open or being opened")); /* get the IInternalSessionControl interface */ @@ -2271,5 +2270,5 @@ /* get the path to the executable */ - char exePathBuf [RTPATH_MAX]; + char exePathBuf[RTPATH_MAX]; char *exePath = RTProcGetExecutableName (exePathBuf, RTPATH_MAX); ComAssertBreak (exePath, E_FAIL); @@ -2307,10 +2306,10 @@ * (pressing the Cancel button to close the Run As dialog) */ if (vrc2 == VERR_CANCELLED) - rc = setError (E_FAIL, - tr ("Operation cancelled by the user")); + rc = setError(E_FAIL, + tr("Operation cancelled by the user")); else - rc = setError (E_FAIL, - tr ("Could not launch a privileged process '%s' (%Rrc)"), - exePath, vrc2); + rc = setError(E_FAIL, + tr("Could not launch a privileged process '%s' (%Rrc)"), + exePath, vrc2); break; } @@ -2322,6 +2321,6 @@ if (RT_FAILURE(vrc)) { - rc = setError (E_FAIL, - tr ("Could not launch a process '%s' (%Rrc)"), exePath, vrc); + rc = setError(E_FAIL, + tr("Could not launch a process '%s' (%Rrc)"), exePath, vrc); break; } @@ -2346,6 +2345,6 @@ if (SUCCEEDED(rc) && RT_FAILURE(vrc)) { - rc = setError (E_FAIL, - tr ("Could not operate the communication channel (%Rrc)"), vrc); + rc = setError(E_FAIL, + tr("Could not operate the communication channel (%Rrc)"), vrc); break; } @@ -2353,5 +2352,5 @@ while (0); - if (FAILED (rc) && !userFuncCalled) + if (FAILED(rc) && !userFuncCalled) { /* call the user function in the "cleanup only" mode @@ -2499,5 +2498,5 @@ HRESULT rc = (*it++)->OnExtraDataCanChange (id, aKey, aValue, aError.asOutParam(), &allowChange); - if (FAILED (rc)) + if (FAILED(rc)) { /* if a call to this method fails for some reason (for ex., because @@ -2978,7 +2977,7 @@ int vrc = calculateFullPath(Utf8Str(aLocation), location); if (RT_FAILURE(vrc)) - return setError (VBOX_E_FILE_ERROR, - tr ("Invalid image file location '%ls' (%Rrc)"), - aLocation, vrc); + return setError(VBOX_E_FILE_ERROR, + tr("Invalid image file location '%ls' (%Rrc)"), + aLocation, vrc); } @@ -3869,5 +3868,5 @@ { /* spawned VM process has terminated (normally or abnormally) */ - (spawnedMachines [rc - WAIT_OBJECT_0 - cnt - 1])-> + (spawnedMachines[rc - WAIT_OBJECT_0 - cnt - 1])-> checkForSpawnFailure(); update = true; @@ -3945,5 +3944,5 @@ /* close old process handles */ for (size_t i = 1 + cnt; i < 1 + cnt + cntSpawned; ++ i) - CloseHandle (handles [i]); + CloseHandle (handles[i]); /* release sets of machines if any */ @@ -3958,5 +3957,5 @@ /* according to PMREF, 64 is the maximum for the muxwait list */ - SEMRECORD handles [64]; + SEMRECORD handles[64]; HMUX muxSem = NULLHANDLE; @@ -4008,5 +4007,5 @@ { /* machine mutex is normally released */ - Assert (semId >= 0 && semId < cnt); + Assert(semId >= 0 && semId < cnt); if (semId >= 0 && semId < cnt) { @@ -4031,12 +4030,11 @@ PID pid; TID tid; unsigned long reqCnt; - arc = DosQueryMutexSem ((HMTX) handles [i].hsemCur, &pid, - &tid, &reqCnt); + arc = DosQueryMutexSem((HMTX)handles[i].hsemCur, &pid, &tid, &reqCnt); if (arc == ERROR_SEM_OWNER_DIED) { /* close the dead mutex as asked by PMREF */ - ::DosCloseMutexSem ((HMTX) handles [i].hsemCur); - - Assert (i >= 0 && i < cnt); + ::DosCloseMutexSem((HMTX)handles[i].hsemCur); + + Assert(i >= 0 && i < cnt); if (i >= 0 && i < cnt) { @@ -4063,5 +4061,5 @@ { for (size_t i = 0; i < cntSpawned; ++ i) - updateSpawned |= (spawnedMachines [i])-> + updateSpawned |= (spawnedMachines[i])-> checkForSpawnFailure(); } @@ -4217,9 +4215,9 @@ update = false; for (size_t i = 0; i < cnt; ++ i) - update |= (machines [i])->checkForDeath(); + update |= (machines[i])->checkForDeath(); updateSpawned = false; for (size_t i = 0; i < cntSpawned; ++ i) - updateSpawned |= (spawnedMachines [i])->checkForSpawnFailure(); + updateSpawned |= (spawnedMachines[i])->checkForSpawnFailure(); /* reap child processes */ @@ -4470,5 +4468,5 @@ { rc = saveSettings(); - if (FAILED (rc)) + if (FAILED(rc)) unregisterDHCPServer(aDHCPServer, false /* aSaveRegistry */); } @@ -4512,5 +4510,5 @@ { rc = saveSettings(); - if (FAILED (rc)) + if (FAILED(rc)) registerDHCPServer(aDHCPServer, false /* aSaveRegistry */); } Index: /trunk/src/VBox/Main/generic/NetIf-generic.cpp =================================================================== --- /trunk/src/VBox/Main/generic/NetIf-generic.cpp (revision 26185) +++ /trunk/src/VBox/Main/generic/NetIf-generic.cpp (revision 26186) @@ -231,7 +231,7 @@ Bstr ifname; ComPtr iface; - if (FAILED (host->FindHostNetworkInterfaceById (Guid(aId).toUtf16(), iface.asOutParam()))) + if (FAILED(host->FindHostNetworkInterfaceById (Guid(aId).toUtf16(), iface.asOutParam()))) return VERR_INVALID_PARAMETER; - iface->COMGETTER (Name) (ifname.asOutParam()); + iface->COMGETTER(Name) (ifname.asOutParam()); if (ifname.isNull()) return VERR_INTERNAL_ERROR; Index: /trunk/src/VBox/Main/glue/ErrorInfo.cpp =================================================================== --- /trunk/src/VBox/Main/glue/ErrorInfo.cpp (revision 26185) +++ /trunk/src/VBox/Main/glue/ErrorInfo.cpp (revision 26186) @@ -145,5 +145,5 @@ void ErrorInfo::init (IUnknown *aI, const GUID &aIID, bool aKeepObj /* = false */) { - Assert (aI); + Assert(aI); if (!aI) return; @@ -210,5 +210,5 @@ { mNext.reset (new ErrorInfo (next)); - Assert (mNext.get()); + Assert(mNext.get()); if (!mNext.get()) rc = E_OUTOFMEMORY; @@ -235,5 +235,5 @@ ErrorInfo (false /* aDummy */) { - Assert (progress); + Assert(progress); if (!progress) return; Index: /trunk/src/VBox/Main/glue/EventQueue.cpp =================================================================== --- /trunk/src/VBox/Main/glue/EventQueue.cpp (revision 26185) +++ /trunk/src/VBox/Main/glue/EventQueue.cpp (revision 26186) @@ -485,5 +485,5 @@ BOOL EventQueue::waitForEvent (Event **event) { - Assert (event); + Assert(event); if (!event) return FALSE; @@ -518,5 +518,5 @@ rc = mEventQ->WaitForEvent (&ev); // check for error - if (FAILED (rc)) + if (FAILED(rc)) return FALSE; // check for EINTR signal @@ -545,5 +545,5 @@ BOOL EventQueue::handleEvent (Event *event) { - Assert (event); + Assert(event); if (!event) return FALSE; Index: /trunk/src/VBox/Main/glue/SupportErrorInfo.cpp =================================================================== --- /trunk/src/VBox/Main/glue/SupportErrorInfo.cpp (revision 26185) +++ /trunk/src/VBox/Main/glue/SupportErrorInfo.cpp (revision 26186) @@ -50,10 +50,10 @@ { sCounter = RTTlsAlloc(); - AssertReturnVoid (sCounter != NIL_RTTLS); + AssertReturnVoid(sCounter != NIL_RTTLS); } - uintptr_t counter = (uintptr_t) RTTlsGet (sCounter); - ++ counter; - RTTlsSet (sCounter, (void *) counter); + uintptr_t counter = (uintptr_t)RTTlsGet(sCounter); + ++counter; + RTTlsSet(sCounter, (void*)counter); } @@ -61,8 +61,8 @@ void MultiResult::decCounter() { - uintptr_t counter = (uintptr_t) RTTlsGet (sCounter); - AssertReturnVoid (counter != 0); - -- counter; - RTTlsSet (sCounter, (void *) counter); + uintptr_t counter = (uintptr_t)RTTlsGet(sCounter); + AssertReturnVoid(counter != 0); + --counter; + RTTlsSet(sCounter, (void*)counter); } @@ -106,5 +106,5 @@ { /* whether multi-error mode is turned on */ - bool preserve = ((uintptr_t) RTTlsGet (MultiResult::sCounter)) > 0; + bool preserve = ((uintptr_t)RTTlsGet(MultiResult::sCounter)) > 0; LogRel(("ERROR [COM]: aRC=%#08x aIID={%RTuuid} aComponent={%s} aText={%s} aWarning=%RTbool, aInfo=%p, preserve=%RTbool\n", @@ -120,5 +120,5 @@ { /* these are mandatory, others -- not */ - AssertReturn((!aWarning && FAILED (aResultCode)) || + AssertReturn((!aWarning && FAILED(aResultCode)) || (aWarning && aResultCode != S_OK), E_FAIL); @@ -143,8 +143,8 @@ /* get the current error info if any */ ComPtr err; - rc = ::GetErrorInfo (0, err.asOutParam()); + rc = ::GetErrorInfo(0, err.asOutParam()); if (FAILED(rc)) break; rc = err.queryInterfaceTo(curInfo.asOutParam()); - if (FAILED (rc)) + if (FAILED(rc)) { /* create a IVirtualBoxErrorInfo wrapper for the native @@ -154,5 +154,5 @@ if (SUCCEEDED(rc)) { - rc = wrapper->init (err); + rc = wrapper->init(err); if (SUCCEEDED(rc)) curInfo = wrapper; @@ -176,5 +176,5 @@ if (FAILED(rc)) break; - rc = infoObj->init (aInfo, curInfo); + rc = infoObj->init(aInfo, curInfo); if (FAILED(rc)) break; @@ -183,5 +183,5 @@ /* we want to return the head's result code */ - rc = info->COMGETTER(ResultCode) (&aResultCode); + rc = info->COMGETTER(ResultCode)(&aResultCode); if (FAILED(rc)) break; } @@ -192,5 +192,5 @@ if (FAILED(rc)) break; - rc = infoObj->init (aResultCode, aIID, aComponent, strText.c_str(), curInfo); + rc = infoObj->init(aResultCode, aIID, aComponent, strText.c_str(), curInfo); if (FAILED(rc)) break; @@ -201,14 +201,14 @@ rc = info.queryInterfaceTo(err.asOutParam()); if (SUCCEEDED(rc)) - rc = ::SetErrorInfo (0, err); + rc = ::SetErrorInfo(0, err); #else // !defined (VBOX_WITH_XPCOM) nsCOMPtr es; - es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc); + es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc); if (NS_SUCCEEDED(rc)) { nsCOMPtr em; - rc = es->GetCurrentExceptionManager (getter_AddRefs (em)); + rc = es->GetCurrentExceptionManager(getter_AddRefs(em)); if (FAILED(rc)) break; @@ -218,8 +218,8 @@ /* get the current error info if any */ ComPtr ex; - rc = em->GetCurrentException (ex.asOutParam()); + rc = em->GetCurrentException(ex.asOutParam()); if (FAILED(rc)) break; rc = ex.queryInterfaceTo(curInfo.asOutParam()); - if (FAILED (rc)) + if (FAILED(rc)) { /* create a IVirtualBoxErrorInfo wrapper for the native @@ -229,5 +229,5 @@ if (SUCCEEDED(rc)) { - rc = wrapper->init (ex); + rc = wrapper->init(ex); if (SUCCEEDED(rc)) curInfo = wrapper; @@ -236,5 +236,5 @@ } /* On failure, curInfo will stay null */ - Assert (SUCCEEDED(rc) || curInfo.isNull()); + Assert(SUCCEEDED(rc) || curInfo.isNull()); /* set the current error info and preserve the previous one if any */ @@ -251,5 +251,5 @@ if (FAILED(rc)) break; - rc = infoObj->init (aInfo, curInfo); + rc = infoObj->init(aInfo, curInfo); if (FAILED(rc)) break; @@ -259,5 +259,5 @@ /* we want to return the head's result code */ PRInt32 lrc; - rc = info->COMGETTER(ResultCode) (&lrc); aResultCode = lrc; + rc = info->COMGETTER(ResultCode)(&lrc); aResultCode = lrc; if (FAILED(rc)) break; } @@ -277,5 +277,5 @@ rc = info.queryInterfaceTo(ex.asOutParam()); if (SUCCEEDED(rc)) - rc = em->SetCurrentException (ex); + rc = em->SetCurrentException(ex); } else if (rc == NS_ERROR_UNEXPECTED) @@ -301,5 +301,5 @@ while (0); - AssertComRC (rc); + AssertComRC(rc); return SUCCEEDED(rc) ? aResultCode : rc; @@ -307,38 +307,38 @@ /* static */ -HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const GUID &aIID, - const char *aComponent, const char *aText, - ...) -{ - va_list args; - va_start (args, aText); - HRESULT rc = setErrorV (aResultCode, aIID, aComponent, aText, args); - va_end (args); +HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const GUID &aIID, + const char *aComponent, const char *aText, + ...) +{ + va_list args; + va_start(args, aText); + HRESULT rc = setErrorV(aResultCode, aIID, aComponent, aText, args); + va_end(args); return rc; } /* static */ -HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const GUID &aIID, - const char *aComponent, const char *aText, - ...) -{ - va_list args; - va_start (args, aText); - HRESULT rc = setWarningV (aResultCode, aIID, aComponent, aText, args); - va_end (args); - return rc; -} - -HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const char *aText, ...) -{ - va_list args; - va_start (args, aText); - HRESULT rc = setErrorV (aResultCode, mainInterfaceID(), componentName(), - aText, args); - va_end (args); - return rc; -} - -HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const Utf8Str &strText) +HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const GUID &aIID, + const char *aComponent, const char *aText, + ...) +{ + va_list args; + va_start(args, aText); + HRESULT rc = setWarningV(aResultCode, aIID, aComponent, aText, args); + va_end(args); + return rc; +} + +HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const char *aText, ...) +{ + va_list args; + va_start(args, aText); + HRESULT rc = setErrorV(aResultCode, mainInterfaceID(), componentName(), + aText, args); + va_end(args); + return rc; +} + +HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const Utf8Str &strText) { HRESULT rc = setError(aResultCode, @@ -349,31 +349,31 @@ } -HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const char *aText, ...) -{ - va_list args; - va_start (args, aText); - HRESULT rc = setWarningV (aResultCode, mainInterfaceID(), componentName(), - aText, args); - va_end (args); - return rc; -} - -HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const GUID &aIID, - const char *aText, ...) -{ - va_list args; - va_start (args, aText); - HRESULT rc = setErrorV (aResultCode, aIID, componentName(), aText, args); - va_end (args); - return rc; -} - -HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const GUID &aIID, - const char *aText, ...) -{ - va_list args; - va_start (args, aText); - HRESULT rc = setWarningV (aResultCode, aIID, componentName(), aText, args); - va_end (args); +HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const char *aText, ...) +{ + va_list args; + va_start(args, aText); + HRESULT rc = setWarningV(aResultCode, mainInterfaceID(), componentName(), + aText, args); + va_end(args); + return rc; +} + +HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const GUID &aIID, + const char *aText, ...) +{ + va_list args; + va_start(args, aText); + HRESULT rc = setErrorV(aResultCode, aIID, componentName(), aText, args); + va_end(args); + return rc; +} + +HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const GUID &aIID, + const char *aText, ...) +{ + va_list args; + va_start(args, aText); + HRESULT rc = setWarningV(aResultCode, aIID, componentName(), aText, args); + va_end(args); return rc; } Index: /trunk/src/VBox/Main/glue/initterm.cpp =================================================================== --- /trunk/src/VBox/Main/glue/initterm.cpp (revision 26185) +++ /trunk/src/VBox/Main/glue/initterm.cpp (revision 26186) @@ -444,5 +444,5 @@ /* Use RTPathAppPrivateArch() first */ vrc = RTPathAppPrivateArch(szAppHomeDir, sizeof(szAppHomeDir)); - AssertRC (vrc); + AssertRC(vrc); } else @@ -450,5 +450,5 @@ /* Iterate over all other paths */ szAppHomeDir[RTPATH_MAX - 1] = '\0'; - strncpy(szAppHomeDir, kAppPathsToProbe [i], RTPATH_MAX - 1); + strncpy(szAppHomeDir, kAppPathsToProbe[i], RTPATH_MAX - 1); vrc = VINF_SUCCESS; } Index: /trunk/src/VBox/Main/glue/string.cpp =================================================================== --- /trunk/src/VBox/Main/glue/string.cpp (revision 26185) +++ /trunk/src/VBox/Main/glue/string.cpp (revision 26186) @@ -77,5 +77,5 @@ }; -void Utf8StrFmt::init (const char *format, va_list args) +void Utf8StrFmt::init(const char *format, va_list args) { if (!format) @@ -83,5 +83,5 @@ // assume an extra byte for a terminating zero - size_t fmtlen = strlen (format) + 1; + size_t fmtlen = strlen(format) + 1; FormatData data; @@ -90,29 +90,28 @@ data.size += fmtlen; data.pos = 0; - data.cache = (char *) ::RTMemTmpAllocZ (data.size); + data.cache = (char*)::RTMemTmpAllocZ(data.size); - size_t n = ::RTStrFormatV (strOutput, &data, NULL, NULL, format, args); + size_t n = ::RTStrFormatV(strOutput, &data, NULL, NULL, format, args); - AssertMsg (n == data.pos, - ("The number of bytes formatted doesn't match: %d and %d!", - n, data.pos)); - NOREF (n); + AssertMsg(n == data.pos, + ("The number of bytes formatted doesn't match: %d and %d!", n, data.pos)); + NOREF(n); // finalize formatting - data.cache [data.pos] = 0; - (*static_cast (this)) = data.cache; - ::RTMemTmpFree (data.cache); + data.cache[data.pos] = 0; + (*static_cast(this)) = data.cache; + ::RTMemTmpFree(data.cache); } // static -DECLCALLBACK(size_t) Utf8StrFmt::strOutput (void *pvArg, const char *pachChars, - size_t cbChars) +DECLCALLBACK(size_t) Utf8StrFmt::strOutput(void *pvArg, const char *pachChars, + size_t cbChars) { - Assert (pvArg); + Assert(pvArg); FormatData &data = *(FormatData *) pvArg; if (!(pachChars == NULL && cbChars == 0)) { - Assert (pachChars); + Assert(pachChars); // append to cache (always assume an extra byte for a terminating zero) @@ -123,7 +122,7 @@ if (needed >= FormatData::CacheIncrement) data.size += needed; - data.cache = (char *) ::RTMemRealloc (data.cache, data.size); + data.cache = (char*)::RTMemRealloc(data.cache, data.size); } - strncpy (data.cache + data.pos, pachChars, cbChars); + strncpy(data.cache + data.pos, pachChars, cbChars); data.pos += cbChars; } Index: /trunk/src/VBox/Main/hgcm/HGCMThread.cpp =================================================================== --- /trunk/src/VBox/Main/hgcm/HGCMThread.cpp (revision 26185) +++ /trunk/src/VBox/Main/hgcm/HGCMThread.cpp (revision 26186) @@ -194,5 +194,5 @@ pThread->m_fu32ThreadFlags &= ~HGCMMSG_TF_INITIALIZING; rc = RTThreadUserSignal (ThreadSelf); - AssertRC (rc); + AssertRC(rc); pThread->m_pfnThread (pThread->Handle (), pThread->m_pvUser); @@ -300,6 +300,6 @@ /* Wait until the thread is ready. */ rc = RTThreadUserWait (thread, 30000); - AssertRC (rc); - Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE(rc)); + AssertRC(rc); + Assert(!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE(rc)); } else @@ -484,5 +484,5 @@ /* Remove the message from the head of Queue list. */ - Assert (m_pMsgInputQueueHead->m_pPrev == NULL); + Assert(m_pMsgInputQueueHead->m_pPrev == NULL); if (m_pMsgInputQueueHead->m_pNext) @@ -493,5 +493,5 @@ else { - Assert (m_pMsgInputQueueHead == m_pMsgInputQueueTail); + Assert(m_pMsgInputQueueHead == m_pMsgInputQueueTail); m_pMsgInputQueueHead = NULL; Index: /trunk/src/VBox/Main/include/AutoCaller.h =================================================================== --- /trunk/src/VBox/Main/include/AutoCaller.h (revision 26185) +++ /trunk/src/VBox/Main/include/AutoCaller.h (revision 26186) @@ -90,5 +90,5 @@ /** - * Returns |true| if |SUCCEEDED (rc())| is |true|, for convenience. + * Returns |true| if |SUCCEEDED(rc())| is |true|, for convenience. * |true| means the number of callers was successfully increased. */ @@ -245,8 +245,8 @@ * AssertReturn (autoInitSpan.isOk(), E_FAIL); * ... - * if (FAILED (rc)) + * if (FAILED(rc)) * return rc; * ... - * if (SUCCEEDED (rc)) + * if (SUCCEEDED(rc)) * autoInitSpan.setSucceeded(); * return rc; @@ -341,8 +341,8 @@ * AssertReturn (autoReinitSpan.isOk(), E_FAIL); * ... - * if (FAILED (rc)) + * if (FAILED(rc)) * return rc; * ... - * if (SUCCEEDED (rc)) + * if (SUCCEEDED(rc)) * autoReinitSpan.setSucceeded(); * return rc; @@ -478,8 +478,8 @@ * return S_OK; * ... - * if (FAILED (rc)) + * if (FAILED(rc)) * return rc; // will go back to Ready * ... - * if (SUCCEEDED (rc)) + * if (SUCCEEDED(rc)) * mayUninitSpan.acceptUninit(); // will call uninit() * return rc; Index: /trunk/src/VBox/Main/include/ConsoleImpl.h =================================================================== --- /trunk/src/VBox/Main/include/ConsoleImpl.h (revision 26185) +++ /trunk/src/VBox/Main/include/ConsoleImpl.h (revision 26186) @@ -69,5 +69,5 @@ do { \ if (!(drv)) \ - return setError (E_ACCESSDENIED, tr ("The console is not powered up")); \ + return setError(E_ACCESSDENIED, tr("The console is not powered up")); \ } while (0) @@ -217,7 +217,7 @@ static const PDMDRVREG DrvStatusReg; - void reportAuthLibraryError (const char *filename, int rc) + void reportAuthLibraryError(const char *filename, int rc) { - setError (E_FAIL, tr("Could not load the external authentication library '%s' (%Rrc)"), filename, rc); + setError(E_FAIL, tr("Could not load the external authentication library '%s' (%Rrc)"), filename, rc); } @@ -242,10 +242,10 @@ AutoVMCallerBase (Console *aThat) : mThat (aThat), mRC (S_OK) { - Assert (aThat); + Assert(aThat); mRC = aThat->addVMCaller (taQuiet, taAllowNullVM); } ~AutoVMCallerBase() { - if (SUCCEEDED (mRC)) + if (SUCCEEDED(mRC)) mThat->releaseVMCaller(); } @@ -253,5 +253,5 @@ void release() { - AssertReturnVoid (SUCCEEDED (mRC)); + AssertReturnVoid(SUCCEEDED(mRC)); mThat->releaseVMCaller(); mRC = E_FAIL; @@ -261,11 +261,11 @@ void add() { - AssertReturnVoid (!SUCCEEDED (mRC)); + AssertReturnVoid(!SUCCEEDED(mRC)); mRC = mThat->addVMCaller (taQuiet, taAllowNullVM); } /** Returns the result of Console::addVMCaller() */ HRESULT rc() const { return mRC; } - /** Shortcut to SUCCEEDED (rc()) */ - bool isOk() const { return SUCCEEDED (mRC); } + /** Shortcut to SUCCEEDED(rc()) */ + bool isOk() const { return SUCCEEDED(mRC); } protected: Console *mThat; @@ -328,5 +328,5 @@ SafeVMPtrBase (Console *aThat) : Base (aThat), mpVM (NULL) { - if (SUCCEEDED (Base::mRC)) + if (SUCCEEDED(Base::mRC)) mpVM = aThat->mpVM; } Index: /trunk/src/VBox/Main/include/ProgressCombinedImpl.h =================================================================== --- /trunk/src/VBox/Main/include/ProgressCombinedImpl.h (revision 26185) +++ /trunk/src/VBox/Main/include/ProgressCombinedImpl.h (revision 26186) @@ -131,5 +131,5 @@ /* Confirm a successful initialization when it's the case */ - if (SUCCEEDED (rc)) + if (SUCCEEDED(rc)) autoInitSpan.setSucceeded(); Index: /trunk/src/VBox/Main/include/VirtualBoxBase.h =================================================================== --- /trunk/src/VBox/Main/include/VirtualBoxBase.h (revision 26185) +++ /trunk/src/VBox/Main/include/VirtualBoxBase.h (revision 26186) @@ -149,5 +149,5 @@ * * In the debug build, this macro is equivalent to Assert. - * In the release build, this macro uses |setError (E_FAIL, ...)| to set the + * In the release build, this macro uses |setError(E_FAIL, ...)| to set the * error info from the asserted expression. * @@ -960,5 +960,5 @@ * On all platforms, the template argument must also define the following * method: |public static const wchar_t *C::getComponentName()|. See - * #setError (HRESULT, const char *, ...) for a description on how it is + * #setError(HRESULT, const char *, ...) for a description on how it is * used. * @@ -1041,5 +1041,5 @@ * overloaded versions, that automatically substitute some arguments * taking their values from the template parameters. See - * #setError (HRESULT, const char *, ...) for an example. + * #setError(HRESULT, const char *, ...) for an example. * * @param aResultCode result (error) code, must not be S_OK @@ -1094,5 +1094,5 @@ * (a value of C::getComponentName()). * - * See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...) + * See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...) * for details. * @@ -1102,9 +1102,9 @@ * * - * return setError (E_FAIL, "Terrible Error"); + * return setError(E_FAIL, "Terrible Error"); * * or * - * HRESULT rc = setError (E_FAIL, "Terrible Error"); + * HRESULT rc = setError(E_FAIL, "Terrible Error"); * ... * return rc; @@ -1146,6 +1146,6 @@ * (a value of C::getComponentName()). * - * See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...) - * and #setError (HRESULT, const char *, ...) for details. + * See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...) + * and #setError(HRESULT, const char *, ...) for details. */ static HRESULT setErrorV(HRESULT aResultCode, const char *aText, @@ -1183,6 +1183,6 @@ * Bstr string, because it omits an extra conversion Utf8Str -> Bstr. * - * See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...) - * and #setError (HRESULT, const char *, ...) for details. + * See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...) + * and #setError(HRESULT, const char *, ...) for details. */ static HRESULT setErrorBstr(HRESULT aResultCode, const Bstr &aText) @@ -1215,5 +1215,5 @@ * id manually. * - * See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...) + * See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...) * for details. */ @@ -1254,5 +1254,5 @@ * harmless error from causing confusion. * - * It is otherwise identical to #setError (HRESULT, const char *text, ...). + * It is otherwise identical to #setError(HRESULT, const char *text, ...). */ static HRESULT setErrorNoLog(HRESULT aResultCode, const char *aText, ...) Index: /trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h =================================================================== --- /trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h (revision 26185) +++ /trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h (revision 26186) @@ -78,8 +78,8 @@ // is available in this class. static const char *tr (const char *a) { return a; } - static HRESULT setError (HRESULT rc, - const char * /* a */, - const char * /* b */, - void * /* c */) { return rc; } + static HRESULT setError(HRESULT rc, + const char * /* a */, + const char * /* b */, + void * /* c */) { return rc; } HRESULT mResultCode; Index: /trunk/src/VBox/Main/linux/HostHardwareLinux.cpp =================================================================== --- /trunk/src/VBox/Main/linux/HostHardwareLinux.cpp (revision 26185) +++ /trunk/src/VBox/Main/linux/HostHardwareLinux.cpp (revision 26186) @@ -1166,10 +1166,10 @@ bool IsSet () { - Assert ((mError.name == NULL) == (mError.message == NULL)); + Assert((mError.name == NULL) == (mError.message == NULL)); return (mError.name != NULL); } bool HasName (const char *pcszName) { - Assert ((mError.name == NULL) == (mError.message == NULL)); + Assert((mError.name == NULL) == (mError.message == NULL)); return (RTStrCmp (mError.name, pcszName) == 0); } @@ -1624,8 +1624,8 @@ if (RT_SUCCESS(rc) && halSuccess) { - Assert (pMatches->size() == cProps); - AssertForEach (j, size_t, 0, cProps, (pfMatches == NULL) - || (pfMatches[j] == true) - || ((pfMatches[j] == false) && (pMatches[j].size() == 0))); + Assert(pMatches->size() == cProps); + AssertForEach(j, size_t, 0, cProps, (pfMatches == NULL) + || (pfMatches[j] == true) + || ((pfMatches[j] == false) && (pMatches[j].size() == 0))); } LogFlowFunc (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); @@ -1654,6 +1654,6 @@ autoDBusError dbusError; - RTMemAutoPtr message, replyFind, replyGet; - RTMemAutoPtr dbusConnection; + RTMemAutoPtr message, replyFind, replyGet; + RTMemAutoPtr dbusConnection; DBusMessageIter iterFind, iterUdis; @@ -1665,6 +1665,6 @@ if (halSuccess && RT_SUCCESS(rc)) { - rc = halFindDeviceStringMatch (dbusConnection.get(), "info.subsystem", - "usb_device", &replyFind); + rc = halFindDeviceStringMatch(dbusConnection.get(), "info.subsystem", + "usb_device", &replyFind); if (!replyFind) halSuccess = false; @@ -1672,5 +1672,5 @@ if (halSuccess && RT_SUCCESS(rc)) { - dbus_message_iter_init (replyFind.get(), &iterFind); + dbus_message_iter_init(replyFind.get(), &iterFind); if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY) halSuccess = false; @@ -1679,7 +1679,7 @@ * entries. */ if (halSuccess && RT_SUCCESS(rc)) - dbus_message_iter_recurse (&iterFind, &iterUdis); + dbus_message_iter_recurse(&iterFind, &iterUdis); for (; halSuccess && RT_SUCCESS(rc) - && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING; + && dbus_message_iter_get_arg_type(&iterUdis) == DBUS_TYPE_STRING; dbus_message_iter_next(&iterUdis)) { @@ -1688,19 +1688,19 @@ dbus_message_iter_get_basic (&iterUdis, &pszUdi); static const char *papszKeys[] = { "linux.device_file", "linux.sysfs_path" }; - char *papszValues[RT_ELEMENTS (papszKeys)]; - rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys), - papszKeys, papszValues, &replyGet); + char *papszValues[RT_ELEMENTS(papszKeys)]; + rc = halGetPropertyStrings(dbusConnection.get(), pszUdi, RT_ELEMENTS(papszKeys), + papszKeys, papszValues, &replyGet); const char *pszDevice = papszValues[0], *pszSysfsPath = papszValues[1]; /* Get the interfaces. */ if (!!replyGet && pszDevice && pszSysfsPath) { - USBDeviceInfo info (pszDevice, pszSysfsPath); + USBDeviceInfo info(pszDevice, pszSysfsPath); bool ifaceSuccess = true; /* If we can't get the interfaces, just * skip this one device. */ - rc = getUSBInterfacesFromHal (&info.mInterfaces, pszUdi, &ifaceSuccess); + rc = getUSBInterfacesFromHal(&info.mInterfaces, pszUdi, &ifaceSuccess); if (RT_SUCCESS(rc) && halSuccess && ifaceSuccess) try { - pList->push_back (info); + pList->push_back(info); } catch(std::bad_alloc &e) @@ -1714,5 +1714,5 @@ if (pfSuccess != NULL) *pfSuccess = halSuccess; - LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); + LogFlow(("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); dbusError.FlowLog(); return rc; @@ -1739,10 +1739,10 @@ autoDBusError dbusError; - RTMemAutoPtr message, replyFind, replyGet; - RTMemAutoPtr dbusConnection; + RTMemAutoPtr message, replyFind, replyGet; + RTMemAutoPtr dbusConnection; DBusMessageIter iterFind, iterUdis; /* Connect to hal */ - rc = halInit (&dbusConnection); + rc = halInit(&dbusConnection); if (!dbusConnection) halSuccess = false; @@ -1750,5 +1750,5 @@ if (halSuccess && RT_SUCCESS(rc)) { - rc = halFindDeviceStringMatch (dbusConnection.get(), "info.category", + rc = halFindDeviceStringMatch(dbusConnection.get(), "info.category", "usbraw", &replyFind); if (!replyFind) @@ -1757,6 +1757,6 @@ if (halSuccess && RT_SUCCESS(rc)) { - dbus_message_iter_init (replyFind.get(), &iterFind); - if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY) + dbus_message_iter_init(replyFind.get(), &iterFind); + if (dbus_message_iter_get_arg_type(&iterFind) != DBUS_TYPE_ARRAY) halSuccess = false; } @@ -1764,29 +1764,29 @@ * entries. */ if (halSuccess && RT_SUCCESS(rc)) - dbus_message_iter_recurse (&iterFind, &iterUdis); + dbus_message_iter_recurse(&iterFind, &iterUdis); for (; halSuccess && RT_SUCCESS(rc) - && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING; + && dbus_message_iter_get_arg_type(&iterUdis) == DBUS_TYPE_STRING; dbus_message_iter_next(&iterUdis)) { /* Get the device node and the sysfs path for the current entry. */ const char *pszUdi; - dbus_message_iter_get_basic (&iterUdis, &pszUdi); + dbus_message_iter_get_basic(&iterUdis, &pszUdi); static const char *papszKeys[] = { "linux.device_file", "info.parent" }; - char *papszValues[RT_ELEMENTS (papszKeys)]; - rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys), - papszKeys, papszValues, &replyGet); + char *papszValues[RT_ELEMENTS(papszKeys)]; + rc = halGetPropertyStrings(dbusConnection.get(), pszUdi, RT_ELEMENTS(papszKeys), + papszKeys, papszValues, &replyGet); const char *pszDevice = papszValues[0], *pszSysfsPath = papszValues[1]; /* Get the interfaces. */ if (!!replyGet && pszDevice && pszSysfsPath) { - USBDeviceInfo info (pszDevice, pszSysfsPath); + USBDeviceInfo info(pszDevice, pszSysfsPath); bool ifaceSuccess = false; /* If we can't get the interfaces, just * skip this one device. */ - rc = getUSBInterfacesFromHal (&info.mInterfaces, pszSysfsPath, - &ifaceSuccess); + rc = getUSBInterfacesFromHal(&info.mInterfaces, pszSysfsPath, + &ifaceSuccess); if (RT_SUCCESS(rc) && halSuccess && ifaceSuccess) try { - pList->push_back (info); + pList->push_back(info); } catch(std::bad_alloc &e) @@ -1796,9 +1796,9 @@ } } - if (dbusError.HasName (DBUS_ERROR_NO_MEMORY)) + if (dbusError.HasName(DBUS_ERROR_NO_MEMORY)) rc = VERR_NO_MEMORY; if (pfSuccess != NULL) *pfSuccess = halSuccess; - LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); + LogFlow(("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); dbusError.FlowLog(); return rc; @@ -1822,9 +1822,9 @@ const char *pcszUdi, bool *pfSuccess) { - AssertReturn(VALID_PTR (pList) && VALID_PTR (pcszUdi) && + AssertReturn(VALID_PTR(pList) && VALID_PTR(pcszUdi) && (pfSuccess == NULL || VALID_PTR (pfSuccess)), VERR_INVALID_POINTER); - LogFlowFunc (("pList=%p, pcszUdi=%s, pfSuccess=%p\n", pList, pcszUdi, - pfSuccess)); + LogFlowFunc(("pList=%p, pcszUdi=%s, pfSuccess=%p\n", pList, pcszUdi, + pfSuccess)); int rc = VINF_SUCCESS; /* We set this to failure on fatal errors. */ bool halSuccess = true; /* We set this to false to abort the operation. */ @@ -1835,5 +1835,5 @@ DBusMessageIter iterFind, iterUdis; - rc = halInit (&dbusConnection); + rc = halInit(&dbusConnection); if (!dbusConnection) halSuccess = false; @@ -1841,6 +1841,6 @@ { /* Look for children of the current UDI. */ - rc = halFindDeviceStringMatch (dbusConnection.get(), "info.parent", - pcszUdi, &replyFind); + rc = halFindDeviceStringMatch(dbusConnection.get(), "info.parent", + pcszUdi, &replyFind); if (!replyFind) halSuccess = false; @@ -1848,22 +1848,22 @@ if (halSuccess && RT_SUCCESS(rc)) { - dbus_message_iter_init (replyFind.get(), &iterFind); - if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY) + dbus_message_iter_init(replyFind.get(), &iterFind); + if (dbus_message_iter_get_arg_type(&iterFind) != DBUS_TYPE_ARRAY) halSuccess = false; } if (halSuccess && RT_SUCCESS(rc)) - dbus_message_iter_recurse (&iterFind, &iterUdis); + dbus_message_iter_recurse(&iterFind, &iterUdis); for (; halSuccess && RT_SUCCESS(rc) - && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING; + && dbus_message_iter_get_arg_type(&iterUdis) == DBUS_TYPE_STRING; dbus_message_iter_next(&iterUdis)) { /* Now get the sysfs path and the subsystem from the iterator */ const char *pszUdi; - dbus_message_iter_get_basic (&iterUdis, &pszUdi); + dbus_message_iter_get_basic(&iterUdis, &pszUdi); static const char *papszKeys[] = { "linux.sysfs_path", "info.subsystem", "linux.subsystem" }; - char *papszValues[RT_ELEMENTS (papszKeys)]; - rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys), - papszKeys, papszValues, &replyGet); + char *papszValues[RT_ELEMENTS(papszKeys)]; + rc = halGetPropertyStrings(dbusConnection.get(), pszUdi, RT_ELEMENTS(papszKeys), + papszKeys, papszValues, &replyGet); const char *pszSysfsPath = papszValues[0], *pszInfoSubsystem = papszValues[1], *pszLinuxSubsystem = papszValues[2]; @@ -1877,5 +1877,5 @@ try { - pList->push_back (pszSysfsPath); + pList->push_back(pszSysfsPath); } catch(std::bad_alloc &e) @@ -1884,9 +1884,9 @@ } } - if (dbusError.HasName (DBUS_ERROR_NO_MEMORY)) + if (dbusError.HasName(DBUS_ERROR_NO_MEMORY)) rc = VERR_NO_MEMORY; if (pfSuccess != NULL) *pfSuccess = halSuccess; - LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); + LogFlow(("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); dbusError.FlowLog(); return rc; @@ -1906,12 +1906,12 @@ */ /* static */ -DBusHandlerResult dbusFilterFunction (DBusConnection * /* pConnection */, - DBusMessage *pMessage, void *pvUser) -{ - volatile bool *pTriggered = reinterpret_cast (pvUser); - if ( dbus_message_is_signal (pMessage, "org.freedesktop.Hal.Manager", - "DeviceAdded") - || dbus_message_is_signal (pMessage, "org.freedesktop.Hal.Manager", - "DeviceRemoved")) +DBusHandlerResult dbusFilterFunction(DBusConnection * /* pConnection */, + DBusMessage *pMessage, void *pvUser) +{ + volatile bool *pTriggered = reinterpret_cast(pvUser); + if ( dbus_message_is_signal(pMessage, "org.freedesktop.Hal.Manager", + "DeviceAdded") + || dbus_message_is_signal(pMessage, "org.freedesktop.Hal.Manager", + "DeviceRemoved")) { *pTriggered = true; Index: /trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp =================================================================== --- /trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp (revision 26185) +++ /trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp (revision 26186) @@ -124,9 +124,9 @@ for (PRUint32 i = 0; i < machineCnt; ++ i) { - IMachine *machine = machines [i]; + IMachine *machine = machines[i]; if (machine) { PRBool isAccessible = PR_FALSE; - machine->GetAccessible (&isAccessible); + machine->GetAccessible(&isAccessible); if (isAccessible) Index: /trunk/src/VBox/Main/win/NetIf-win.cpp =================================================================== --- /trunk/src/VBox/Main/win/NetIf-win.cpp (revision 26185) +++ /trunk/src/VBox/Main/win/NetIf-win.cpp (revision 26186) @@ -877,5 +877,5 @@ 0, KEY_QUERY_VALUE, &hKey); - Assert (rc == ERROR_SUCCESS || rc == ERROR_PATH_NOT_FOUND); + Assert(rc == ERROR_SUCCESS || rc == ERROR_PATH_NOT_FOUND); if (rc == ERROR_SUCCESS) { @@ -887,5 +887,5 @@ RegCloseKey (hKey); - Assert (rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND); + Assert(rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND); } Index: /trunk/src/VBox/Main/win/svchlp.cpp =================================================================== --- /trunk/src/VBox/Main/win/svchlp.cpp (revision 26185) +++ /trunk/src/VBox/Main/win/svchlp.cpp (revision 26186) @@ -235,5 +235,5 @@ aVal.reserve(len + 1); - aVal.mutableRaw() [len] = 0; + aVal.mutableRaw()[len] = 0; /* read string data */ @@ -283,12 +283,11 @@ { #ifdef VBOX_WITH_NETFLT - vrc = netIfNetworkInterfaceHelperServer (this, msgCode); + vrc = netIfNetworkInterfaceHelperServer(this, msgCode); #endif break; } default: - AssertMsgFailedReturn (( - "Invalid message code %d (%08lX)\n", msgCode, msgCode), - VERR_GENERAL_FAILURE); + AssertMsgFailedReturn(("Invalid message code %d (%08lX)\n", msgCode, msgCode), + VERR_GENERAL_FAILURE); } Index: /trunk/src/VBox/Main/win/svcmain.cpp =================================================================== --- /trunk/src/VBox/Main/win/svcmain.cpp (revision 26185) +++ /trunk/src/VBox/Main/win/svcmain.cpp (revision 26186) @@ -233,7 +233,7 @@ { Bstr str (lpszToken); - LPCTSTR lpszToken2 = FindOneOf (lpszToken, szTokens); + LPCTSTR lpszToken2 = FindOneOf(lpszToken, szTokens); if (lpszToken2) - str.mutableRaw() [lpszToken2 - lpszToken] = '\0'; + str.mutableRaw()[lpszToken2 - lpszToken] = '\0'; pipeName = Utf8Str(lpszToken); } Index: /trunk/src/VBox/Main/xpcom/server.cpp =================================================================== --- /trunk/src/VBox/Main/xpcom/server.cpp (revision 26185) +++ /trunk/src/VBox/Main/xpcom/server.cpp (revision 26186) @@ -978,5 +978,5 @@ nsCOMPtr ipcServ (do_GetService(IPC_SERVICE_CONTRACTID, &rc)); - if (NS_FAILED (rc)) + if (NS_FAILED(rc)) { RTMsgError("Failed to get IPC service! (rc=%Rhrc)", rc); Index: /trunk/src/VBox/Main/xpcom/server_module.cpp =================================================================== --- /trunk/src/VBox/Main/xpcom/server_module.cpp (revision 26185) +++ /trunk/src/VBox/Main/xpcom/server_module.cpp (revision 26186) @@ -84,5 +84,5 @@ * Full path to the VBoxSVC executable. */ -static char VBoxSVCPath [RTPATH_MAX]; +static char VBoxSVCPath[RTPATH_MAX]; static bool IsVBoxSVCPathSet = false; @@ -160,10 +160,10 @@ } } - if (NS_FAILED (rc)) + if (NS_FAILED(rc)) break; } nsCOMPtr ipcServ = do_GetService (IPC_SERVICE_CONTRACTID, &rc); - if (NS_FAILED (rc)) + if (NS_FAILED(rc)) break; @@ -179,5 +179,5 @@ PRUint32 serverID = 0; rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID); - if (NS_FAILED (rc)) + if (NS_FAILED(rc)) { LogFlowFunc (("Starting server \"%s\"...\n", VBoxSVCPath)); @@ -241,5 +241,5 @@ nsCOMPtr dconServ = do_GetService (IPC_DCONNECTSERVICE_CONTRACTID, &rc); - if (NS_FAILED (rc)) + if (NS_FAILED(rc)) break;