- Timestamp:
- Jan 3, 2017 8:52:49 PM (8 years ago)
- Location:
- trunk/src/VBox/Main
- Files:
-
- 40 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/glue/NativeEventQueue.cpp
r63147 r65088 600 600 * Posts an event to this event loop asynchronously. 601 601 * 602 * @param eventthe event to post, must be allocated using |new|603 * @return TRUE if successful and false otherwise602 * @param pEvent the event to post, must be allocated using |new| 603 * @return @c TRUE if successful and false otherwise 604 604 */ 605 605 BOOL NativeEventQueue::postEvent(NativeEvent *pEvent) -
trunk/src/VBox/Main/include/ApplianceImpl.h
r63184 r65088 178 178 void i_convertDiskAttachmentValues(const ovf::HardDiskController &hdc, 179 179 uint32_t ulAddressOnParent, 180 Utf8Str &controller Type,180 Utf8Str &controllerName, 181 181 int32_t &lControllerPort, 182 182 int32_t &lDevice); -
trunk/src/VBox/Main/include/BandwidthGroupImpl.h
r61194 r65088 37 37 // public initializer/uninitializer for internal purposes only 38 38 HRESULT init(BandwidthControl *aParent, 39 const Utf8Str &aName,39 const com::Utf8Str &aName, 40 40 BandwidthGroupType_T aType, 41 41 LONG64 aMaxBytesPerSec); -
trunk/src/VBox/Main/include/ConsoleImpl.h
r64134 r65088 401 401 * 402 402 * @sa SafeVMPtr, SafeVMPtrQuiet 403 * @ obsolete Use SafeVMPtr403 * @note Obsolete, use SafeVMPtr 404 404 */ 405 405 typedef AutoVMCallerBase<false, false> AutoVMCaller; … … 410 410 * 411 411 * @note Temporarily locks the argument for writing. 412 * @obsolete Use SafeVMPtrQuiet412 * @note Obsolete, use SafeVMPtrQuiet 413 413 */ 414 414 typedef AutoVMCallerBase<true, false> AutoVMCallerQuiet; … … 419 419 * 420 420 * @note Temporarily locks the argument for writing. 421 * @ obsolete Use SafeVMPtr421 * @note Obsolete, use SafeVMPtr 422 422 */ 423 423 typedef AutoVMCallerBase<false, true> AutoVMCallerWeak; … … 429 429 * 430 430 * @note Temporarily locks the argument for writing. 431 * @ obsolete Use SafeVMPtrQuiet431 * @note Obsolete, use SafeVMPtrQuiet 432 432 */ 433 433 typedef AutoVMCallerBase<true, true> AutoVMCallerQuietWeak; -
trunk/src/VBox/Main/include/HostPower.h
r62485 r65088 45 45 }; 46 46 47 # if def RT_OS_WINDOWS47 # if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING) 48 48 /** 49 49 * The Windows hosted Power Service. … … 64 64 RTTHREAD mThread; 65 65 }; 66 #elif defined(RT_OS_LINUX) 66 # endif 67 # if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING) 67 68 /** 68 69 * The Linux hosted Power Service. … … 87 88 }; 88 89 89 # elif defined(RT_OS_DARWIN) /* RT_OS_WINDOWS */ 90 # endif 91 # if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING) 90 92 /** 91 93 * The Darwin hosted Power Service. … … 116 118 bool mCritical; /* Indicate if the battery was in the critical state last checked */ 117 119 }; 118 # endif /* RT_OS_DARWIN */120 # endif 119 121 120 122 #endif /* !____H_HOSTPOWER */ -
trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h
r61009 r65088 37 37 // public initializer/uninitializer for internal purposes only 38 38 HRESULT init(IMachine * aParent, 39 const Utf8Str &a Name,39 const Utf8Str &aDevName, 40 40 LONG aHostAddess, 41 41 LONG aGuestAddress, -
trunk/src/VBox/Main/include/SharedFolderImpl.h
r62485 r65088 36 36 37 37 // public initializer/uninitializer for internal purposes only 38 HRESULT init(Machine *aMachine, const Utf8Str &aName, constUtf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);38 HRESULT init(Machine *aMachine, const com::Utf8Str &aName, const com::Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError); 39 39 HRESULT initCopy(Machine *aMachine, SharedFolder *aThat); 40 HRESULT init(Console *aConsole, const Utf8Str &aName, constUtf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);40 HRESULT init(Console *aConsole, const com::Utf8Str &aName, const com::Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError); 41 41 // HRESULT init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError); 42 42 void uninit(); -
trunk/src/VBox/Main/include/SnapshotImpl.h
r62485 r65088 40 40 HRESULT init(VirtualBox *aVirtualBox, 41 41 const Guid &aId, 42 const Utf8Str &aName,43 const Utf8Str &aDescription,42 const com::Utf8Str &aName, 43 const com::Utf8Str &aDescription, 44 44 const RTTIMESPEC &aTimeStamp, 45 45 SnapshotMachine *aMachine, … … 80 80 81 81 ComObjPtr<Snapshot> i_findChildOrSelf(IN_GUID aId); 82 ComObjPtr<Snapshot> i_findChildOrSelf(const Utf8Str &aName);82 ComObjPtr<Snapshot> i_findChildOrSelf(const com::Utf8Str &aName); 83 83 84 84 void i_updateSavedStatePaths(const Utf8Str &strOldPath, -
trunk/src/VBox/Main/include/StorageControllerImpl.h
r62485 r65088 34 34 // public initializer/uninitializer for internal purposes only 35 35 HRESULT init(Machine *aParent, 36 const Utf8Str &aName,36 const com::Utf8Str &aName, 37 37 StorageBus_T aBus, 38 38 ULONG aInstance, -
trunk/src/VBox/Main/include/USBControllerImpl.h
r62485 r65088 42 42 43 43 // public initializer/uninitializer for internal purposes only 44 HRESULT init(Machine *aParent, const Utf8Str &aName, USBControllerType_T enmType);44 HRESULT init(Machine *aParent, const com::Utf8Str &aName, USBControllerType_T enmType); 45 45 HRESULT init(Machine *aParent, USBController *aThat, bool fReshare = false); 46 46 HRESULT initCopy(Machine *aParent, USBController *aThat); -
trunk/src/VBox/Main/include/USBGetDevices.h
r62485 r65088 63 63 /** 64 64 * Free a linked list of USB devices created by the Linux enumeration code. 65 * @param p Head Pointer to the first device in the linked list65 * @param ppHead Pointer to the first device in the linked list 66 66 */ 67 67 DECLINLINE(void) deviceListFree(PUSBDEVICE *ppHead) -
trunk/src/VBox/Main/include/USBProxyBackend.h
r65063 r65088 42 42 public: 43 43 44 DECLARE_EMPTY_CTOR_DTOR 44 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackend) 45 45 46 46 HRESULT FinalConstruct(); … … 131 131 132 132 133 # if def RT_OS_DARWIN133 # if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING) 134 134 # include <VBox/param.h> 135 135 # undef PAGE_SHIFT … … 145 145 { 146 146 public: 147 DECLARE_EMPTY_CTOR_DTOR 147 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendDarwin) 148 148 149 149 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 182 182 183 183 184 # if def RT_OS_LINUX184 # if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING) 185 185 # include <stdio.h> 186 186 # ifdef VBOX_USB_WITH_SYSFS … … 194 194 { 195 195 public: 196 DECLARE_EMPTY_CTOR_DTOR 196 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendLinux) 197 197 198 198 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 237 237 238 238 239 # if def RT_OS_OS2239 # if defined(RT_OS_OS2) || defined(DOXYGEN_RUNNING) 240 240 # include <usbcalls.h> 241 241 … … 246 246 { 247 247 public: 248 DECLARE_EMPTY_CTOR_DTOR (USBProxyBackend)249 250 virtual int captureDevice 251 virtual int releaseDevice 248 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendOs2) 249 250 virtual int captureDevice(HostUSBDevice *aDevice); 251 virtual int releaseDevice(HostUSBDevice *aDevice); 252 252 253 253 protected: … … 273 273 APIRET (APIENTRY *mpfnUsbQueryDeviceReport)(ULONG, PULONG, PVOID); 274 274 }; 275 # endif /* RT_OS_ LINUX*/276 277 278 # if def RT_OS_SOLARIS275 # endif /* RT_OS_OS2 */ 276 277 278 # if defined(RT_OS_SOLARIS) || defined(DOXYGEN_RUNNING) 279 279 # include <libdevinfo.h> 280 280 … … 285 285 { 286 286 public: 287 DECLARE_EMPTY_CTOR_DTOR 287 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendSolaris) 288 288 289 289 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 293 293 virtual void removeFilter (void *aID); 294 294 295 virtual int captureDevice 296 virtual int releaseDevice 295 virtual int captureDevice(HostUSBDevice *aDevice); 296 virtual int releaseDevice(HostUSBDevice *aDevice); 297 297 virtual void captureDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess); 298 298 virtual void releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess); … … 313 313 314 314 315 # if def RT_OS_WINDOWS315 # if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING) 316 316 /** 317 317 * The Windows hosted USB Proxy Backend. … … 320 320 { 321 321 public: 322 DECLARE_EMPTY_CTOR_DTOR 322 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendWindows) 323 323 324 324 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 328 328 virtual void removeFilter (void *aID); 329 329 330 virtual int captureDevice 331 virtual int releaseDevice 330 virtual int captureDevice(HostUSBDevice *aDevice); 331 virtual int releaseDevice(HostUSBDevice *aDevice); 332 332 333 333 virtual bool i_isDevReEnumerationRequired(); … … 344 344 # endif /* RT_OS_WINDOWS */ 345 345 346 # if def RT_OS_FREEBSD346 # if defined(RT_OS_FREEBSD) || defined(DOXYGEN_RUNNING) 347 347 /** 348 348 * The FreeBSD hosted USB Proxy Backend. … … 351 351 { 352 352 public: 353 DECLARE_EMPTY_CTOR_DTOR 353 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendFreeBSD) 354 354 355 355 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); … … 402 402 { 403 403 public: 404 DECLARE_EMPTY_CTOR_DTOR 404 DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendUsbIp) 405 405 406 406 int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress); -
trunk/src/VBox/Main/include/VirtualBoxBase.h
r63643 r65088 593 593 * translation"). See VirtualBoxBase::translate() for more info. 594 594 * 595 * @param aSourceTextString to translate.595 * @param pcszSourceText String to translate. 596 596 * @param aComment Comment to the string to resolve possible 597 597 * ambiguities (NULL means no comment). … … 641 641 * of a class derived from VirtualBoxBase cannot be instantiated. 642 642 * 643 * @param XThe class name, e.g. "Class".644 * @param IXThe interface name which this class implements, e.g. "IClass".643 * @param cls The class name, e.g. "Class". 644 * @param iface The interface name which this class implements, e.g. "IClass". 645 645 */ 646 646 #ifdef VBOX_WITH_XPCOM -
trunk/src/VBox/Main/include/VirtualBoxImpl.h
r63187 r65088 179 179 ComObjPtr<Machine> *aMachine = NULL); 180 180 181 HRESULT i_validateMachineGroup(const Utf8Str &aGroup, bool fPrimary);181 HRESULT i_validateMachineGroup(const com::Utf8Str &aGroup, bool fPrimary); 182 182 HRESULT i_convertMachineGroups(const std::vector<com::Utf8Str> aMachineGroups, StringsList *pllMachineGroups); 183 183 -
trunk/src/VBox/Main/src-all/ExtPackUtil.cpp
r62485 r65088 272 272 * @returns NULL on success, pointer to an error message on failure (caller 273 273 * deletes it). 274 * @param a_pszDir The directory containingthe description file.274 * @param hVfsFile The file handle of the description file. 275 275 * @param a_pExtPackDesc Where to store the extension pack descriptor. 276 276 * @param a_pObjInfo Where to store the object info for the file (unix … … 678 678 * 679 679 * @returns VBox status code, failures with message. 680 * @param h ManifestFileThe xml from the extension pack.680 * @param hXmlFile The xml from the extension pack. 681 681 * @param pszExtPackName The expected extension pack name. This can be 682 682 * NULL, in which we don't have any expectations. -
trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp
r63147 r65088 267 267 * recognize that the created error info object represents a warning rather 268 268 * than an error. 269 * 270 * @param aResultCode 271 * @param aIID 272 * @param pcszComponent 273 * @param aText 274 * @param aWarning 275 * @param aLogIt 276 * @param aResultDetail 269 277 */ 270 278 /* static */ … … 447 455 * virtual getClassIID() and getComponentName() methods which are automatically 448 456 * defined by the VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT macro. 449 * @param aResultCode 450 * @param pcsz 457 * @param aResultCode 451 458 * @return 452 459 */ … … 466 473 * virtual getClassIID() and getComponentName() methods which are automatically 467 474 * defined by the VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT macro. 468 * @param aResultCode 475 * @param aResultCode 476 * @param pcsz 469 477 * @return 470 478 */ … … 488 496 * virtual getClassIID() and getComponentName() methods which are automatically 489 497 * defined by the VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT macro. 490 * @param ei498 * @param ei 491 499 * @return 492 500 */ -
trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c
r63260 r65088 280 280 /** 281 281 * Pure virtual method implementation referenced by VirtualBox_p.c 282 *283 * @returns New reference count.284 * @param pThis Buffer to release.285 282 */ 286 283 void __cdecl _purecall(void) /* see DLLDUMMYPURECALL in RpcProxy.h */ … … 370 367 * @param pszSubRoot The path to the where the classes are registered, 371 368 * NULL if @a hkeyRoot. 372 * @param hkeyAltRoot The registry root tree constant for the alternative373 * registrations (remove only).374 * @param pszAltSubRoot The path to where classes could also be registered,375 * but shouldn't be in our setup.376 369 * @param fDelete Whether to delete registrations first. 377 370 * @param fUpdate Whether to update registrations. … … 1267 1260 * 1268 1261 * @returns COM status code. 1262 * @param pState 1269 1263 * @param pwszVBoxDir The VirtualBox application directory. 1270 1264 * @param fIs32On64 Set if this is the 32-bit on 64-bit component. … … 1423 1417 * 1424 1418 * @param pState The registry modifier state. 1425 * @param pwszVBoxDir The VirtualBox install directory (unicode),1426 * trailing slash.1427 * @param fIs32On64 Set if we're registering the 32-bit proxy stub1428 * on a 64-bit system.1429 1419 */ 1430 1420 static void vbpsUpdateInterfaceRegistrations(VBPSREGSTATE *pState) -
trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
r64786 r65088 286 286 * Helper that calls CFGMR3InsertString and throws an RTCError if that 287 287 * fails (C-string variant). 288 * @param p ParentSee CFGMR3InsertStringN.289 * @param pcszN odeNameSee CFGMR3InsertStringN.288 * @param pNode See CFGMR3InsertStringN. 289 * @param pcszName See CFGMR3InsertStringN. 290 290 * @param pcszValue The string value. 291 291 */ … … 304 304 * Helper that calls CFGMR3InsertString and throws an RTCError if that 305 305 * fails (Utf8Str variant). 306 * @param p ParentSee CFGMR3InsertStringN.307 * @param pcszN odeNameSee CFGMR3InsertStringN.306 * @param pNode See CFGMR3InsertStringN. 307 * @param pcszName See CFGMR3InsertStringN. 308 308 * @param rStrValue The string value. 309 309 */ … … 324 324 * fails (Bstr variant). 325 325 * 326 * @param p ParentSee CFGMR3InsertStringN.327 * @param pcszN odeNameSee CFGMR3InsertStringN.328 * @param rBstrValue 326 * @param pNode See CFGMR3InsertStringN. 327 * @param pcszName See CFGMR3InsertStringN. 328 * @param rBstrValue The string value. 329 329 */ 330 330 static void InsertConfigString(PCFGMNODE pNode, -
trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp
r63239 r65088 530 530 * @copydoc SSMSTRMOPS::pfnClose 531 531 */ 532 static DECLCALLBACK(int) teleporterTcpOpClose(void *pvUser, bool fCancel ed)532 static DECLCALLBACK(int) teleporterTcpOpClose(void *pvUser, bool fCancelled) 533 533 { 534 534 TeleporterState *pState = (TeleporterState *)pvUser; … … 538 538 TELEPORTERTCPHDR EofHdr; 539 539 EofHdr.u32Magic = TELEPORTERTCPHDR_MAGIC; 540 EofHdr.cb = fCancel ed ? UINT32_MAX : 0;540 EofHdr.cb = fCancelled ? UINT32_MAX : 0; 541 541 int rc = RTTcpWrite(pState->mhSocket, &EofHdr, sizeof(EofHdr)); 542 542 if (RT_FAILURE(rc)) -
trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
r64532 r65088 562 562 563 563 /** 564 * Returns @ true if the passed in error code indicates an error which came from the guest side,565 * or @false if not.564 * Returns @c true if the passed in error code indicates an error which came 565 * from the guest side, or @c false if not. 566 566 * 567 * @return bool @ true if the passed in error code indicates an error which came from the guest side,568 * or @false if not.567 * @return bool @c true if the passed in error code indicates an error which came 568 * from the guest side, or @c false if not. 569 569 * @param rc Error code to check. 570 570 */ -
trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
r63244 r65088 889 889 * @interface_method_impl{DBGFINFOHLP,pfnPrintfV} 890 890 */ 891 static DECLCALLBACK(void) MachineDebuggerInfoPrintfV(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list va)892 { 893 RTStrFormatV(MachineDebuggerInfoOutput, (void *)pHlp, NULL, NULL, pszFormat, va);891 static DECLCALLBACK(void) MachineDebuggerInfoPrintfV(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args) 892 { 893 RTStrFormatV(MachineDebuggerInfoOutput, (void *)pHlp, NULL, NULL, pszFormat, args); 894 894 } 895 895 -
trunk/src/VBox/Main/src-client/VMMDevInterface.cpp
r63259 r65088 174 174 const char *pszUser, const char *pszDomain, 175 175 uint32_t uState, 176 const uint8_t *p uDetails, uint32_t cbDetails)176 const uint8_t *pabDetails, uint32_t cbDetails) 177 177 { 178 178 PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector); … … 186 186 187 187 pGuest->i_onUserStateChange(Bstr(pszUser), Bstr(pszDomain), (VBoxGuestUserState)uState, 188 p uDetails, cbDetails);188 pabDetails, cbDetails); 189 189 } 190 190 … … 312 312 * 313 313 * @param pInterface Pointer to this interface. 314 * @param newCapabilitiesNew capabilities.314 * @param fNewCaps New capabilities. 315 315 * @thread The emulation thread. 316 316 */ -
trunk/src/VBox/Main/src-client/VideoRec.cpp
r63256 r65088 466 466 * @returns IPRT status code. 467 467 * @param pCtx Pointer to video recording context to initialize Framebuffer width. 468 * @param uScreeen Screen number. 469 * @param strFile File to save the recorded data 470 * @param uTargetWidth Width of the target image in the video recoriding file (movie) 471 * @param uTargetHeight Height of the target image in video recording file. 468 * @param uScreen Screen number. 469 * @param pszFile File to save the recorded data 470 * @param uWidth Width of the target image in the video recoriding file (movie) 471 * @param uHeight Height of the target image in video recording file. 472 * @param uRate Rate. 473 * @param uFps FPS. 474 * @param uMaxTime 475 * @param uMaxFileSize 476 * @param pszOptions 472 477 */ 473 478 int VideoRecStrmInit(PVIDEORECCONTEXT pCtx, uint32_t uScreen, const char *pszFile, … … 710 715 * 711 716 * @returns IPRT status code. 712 * @param pCtx Pointer to video recording context. 713 * @param uSourceWidth Width of the source image. 714 * @param uSourceHeight Height of the source image. 717 * @param pStrm Stream. 715 718 */ 716 719 static int videoRecEncodeAndWrite(PVIDEORECSTREAM pStrm) … … 756 759 * 757 760 * @returns IPRT status code. 758 * @param p Ctx Pointer to video recording context.761 * @param pStrm Strm. 759 762 */ 760 763 static int videoRecRGBToYUV(PVIDEORECSTREAM pStrm) -
trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
r63563 r65088 270 270 * Private helper func that suggests a VirtualBox guest OS type 271 271 * for the given OVF operating system type. 272 * @param osTypeVBox272 * @param strType 273 273 * @param c 274 274 * @param cStr … … 446 446 /** 447 447 * Public method implementation. 448 * @param 448 * @param aPath 449 449 * @return 450 450 */ … … 463 463 /** 464 464 * Public method implementation. 465 * @param 465 * @param aDisks 466 466 * @return 467 467 */ … … 531 531 /** 532 532 * Public method implementation. 533 * @param 533 * @param aVirtualSystemDescriptions 534 534 * @return 535 535 */ … … 553 553 /** 554 554 * Public method implementation. 555 * @param a Disks555 * @param aMachines 556 556 * @return 557 557 */ … … 1564 1564 * @param aType Type of description for the new item. 1565 1565 * @param strRef Reference item; only used with hard disk controllers. 1566 * @param aO rigValue Corresponding original value from OVF.1567 * @param a AutoValue Initial configuration value (can be overridden by caller with setFinalValues).1566 * @param aOvfValue Corresponding original value from OVF. 1567 * @param aVBoxValue Initial configuration value (can be overridden by caller with setFinalValues). 1568 1568 * @param ulSizeMB Weight for IProgress 1569 1569 * @param strExtraConfig Extra configuration; meaning dependent on type. -
trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
r63563 r65088 892 892 * Opens a source file (for reading obviously). 893 893 * 894 * @param stack 894 895 * @param rstrSrcPath The source file to open. 895 896 * @param pszManifestEntry The manifest entry of the source file. This is … … 993 994 /** 994 995 * 996 * @param stack Import stack. 997 * @param rstrSrcPath Source path. 998 * @param rstrDstPath Destination path. 995 999 * @param pszManifestEntry The manifest entry of the source file. This is 996 1000 * used when constructing our manifest using a pass … … 1041 1045 /** 1042 1046 * 1047 * @param stack 1048 * @param rstrSrcPath 1049 * @param rstrDstPath 1043 1050 * @param pszManifestEntry The manifest entry of the source file. This is 1044 1051 * used when constructing our manifest using a pass … … 1988 1995 * 1) from the public Appliance::ImportMachines(). 1989 1996 * 1990 * @param aLocInfo1991 * @param aProgress1997 * @param locInfo 1998 * @param progress 1992 1999 * @return 1993 2000 */ … … 2364 2371 lControllerPort = (long)ulAddressOnParent; 2365 2372 lDevice = (long)0; 2366 break;2373 break; 2367 2374 2368 2375 case ovf::HardDiskController::SCSI: … … 2374 2381 lControllerPort = (long)ulAddressOnParent; 2375 2382 lDevice = (long)0; 2383 break; 2376 2384 } 2377 break;2378 2385 2379 2386 default: break; … … 3448 3455 * 4) Create the VirtualBox machine with the modfified machine config. 3449 3456 * 3450 * @param config3451 * @param pNewMachine3452 * @param stack3457 * @param vsdescThis 3458 * @param pReturnNewMachine 3459 * @param stack 3453 3460 */ 3454 3461 void Appliance::i_importVBoxMachine(ComObjPtr<VirtualSystemDescription> &vsdescThis, -
trunk/src/VBox/Main/src-server/HostDnsService.h
r62485 r65088 116 116 }; 117 117 118 # if def RT_OS_DARWIN118 # if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING) 119 119 class HostDnsServiceDarwin : public HostDnsMonitor 120 120 { … … 135 135 }; 136 136 # endif 137 # if def RT_OS_WINDOWS137 # if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING) 138 138 class HostDnsServiceWin : public HostDnsMonitor 139 139 { … … 155 155 }; 156 156 # endif 157 # if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD) 157 # if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD) \ 158 || defined(DOXYGEN_RUNNING) 158 159 class HostDnsServiceResolvConf: public HostDnsMonitor 159 160 { … … 176 177 Data *m; 177 178 }; 178 # if defined(RT_OS_SOLARIS) 179 # if defined(RT_OS_SOLARIS) || defined(DOXYGEN_RUNNING) 179 180 /** 180 181 * XXX: https://blogs.oracle.com/praks/entry/file_events_notification … … 190 191 }; 191 192 192 # elif defined(RT_OS_LINUX) 193 # endif 194 # if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING) 193 195 class HostDnsServiceLinux : public HostDnsServiceResolvConf 194 196 { … … 205 207 }; 206 208 207 # elif defined(RT_OS_FREEBSD) 209 # endif 210 # if defined(RT_OS_FREEBSD) || defined(DOXYGEN_RUNNING) 208 211 class HostDnsServiceFreebsd: public HostDnsServiceResolvConf 209 212 { … … 216 219 }; 217 220 218 # elif defined(RT_OS_OS2) 221 # endif 222 # if defined(RT_OS_OS2) || defined(DOXYGEN_RUNNING) 219 223 class HostDnsServiceOs2 : public HostDnsServiceResolvConf 220 224 { -
trunk/src/VBox/Main/src-server/HostImpl.cpp
r63563 r65088 1154 1154 * 1155 1155 * @returns COM status code 1156 * @param os address ofresult variable1156 * @param aOperatingSystem result variable 1157 1157 */ 1158 1158 HRESULT Host::getOperatingSystem(com::Utf8Str &aOperatingSystem) -
trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp
r62485 r65088 66 66 * @param aInterfaceName name of the network interface 67 67 * @param aGuid GUID of the host network interface 68 * @param ifType interface type 68 69 */ 69 70 HRESULT HostNetworkInterface::init(Bstr aInterfaceName, Bstr aShortName, Guid aGuid, HostNetworkInterfaceType_T ifType) … … 363 364 364 365 /** 365 * Returns the IP V6 network mask of the host network interface.366 * 367 * @returns COM status code 368 * @param aIPV6 Maskaddress of result pointer366 * Returns the IP V6 network mask prefix length of the host network interface. 367 * 368 * @returns COM status code 369 * @param aIPV6NetworkMaskPrefixLength address of result pointer 369 370 */ 370 371 HRESULT HostNetworkInterface::getIPV6NetworkMaskPrefixLength(ULONG *aIPV6NetworkMaskPrefixLength) -
trunk/src/VBox/Main/src-server/SnapshotImpl.cpp
r65063 r65088 639 639 /** 640 640 * Internal implementation for Snapshot::updateSavedStatePaths (below). 641 * @param aOldPath642 * @param aNewPath641 * @param strOldPath 642 * @param strNewPath 643 643 */ 644 644 void Snapshot::i_updateSavedStatePathsImpl(const Utf8Str &strOldPath, … … 714 714 * Intended to be called by Machine::openConfigLoader() only. 715 715 * 716 * @param aOldPath old path (full)717 * @param aNewPath new path (full)716 * @param strOldPath old path (full) 717 * @param strNewPath new path (full) 718 718 * 719 719 * @note Locks the machine (for the snapshots tree) + this object + children for writing. 720 720 */ 721 721 void Snapshot::i_updateSavedStatePaths(const Utf8Str &strOldPath, 722 const Utf8Str &strNewPath)722 const Utf8Str &strNewPath) 723 723 { 724 724 LogFlowThisFunc(("aOldPath={%s} aNewPath={%s}\n", strOldPath.c_str(), strNewPath.c_str())); … … 1858 1858 * @note Locks VirtualBox and this object for writing. 1859 1859 * 1860 * @param aSuccess Whether Console was successful with the client-side snapshot things. 1860 * @param task 1861 * @param alock 1862 * @param aSuccess Whether Console was successful with the client-side 1863 * snapshot things. 1861 1864 * @return 1862 1865 */ … … 2617 2620 * @note Locks the machine + the snapshot + the media tree for writing! 2618 2621 * 2619 * @param pTask Task data.2622 * @param task Task data. 2620 2623 */ 2621 2624 void SessionMachine::i_deleteSnapshotHandler(DeleteSnapshotTask &task) -
trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp
r63174 r65088 39 39 * @param aFilter The filter. 40 40 * @param aIdx The field index. 41 * @param aStrThe output string.41 * @param rstrOut The output string. 42 42 */ 43 43 static void i_usbFilterFieldToString(PCUSBFILTER aFilter, USBFILTERIDX aIdx, Utf8Str &rstrOut) -
trunk/src/VBox/Main/src-server/USBProxyBackend.cpp
r62485 r65088 559 559 * 560 560 * @returns Pointer to the head of the sorted doubly linked list. 561 * @param aDevices Head pointer (can be both singly and doubly linked list).561 * @param pDevices Head pointer (can be both singly and doubly linked list). 562 562 */ 563 563 static PUSBDEVICE sortDevices(PUSBDEVICE pDevices) -
trunk/src/VBox/Main/src-server/USBProxyService.cpp
r61667 r65088 264 264 * @param aMachine The machine to attach the device to. 265 265 * @param aId The UUID of the USB device to capture and attach. 266 * @param aCaptureFilename 266 267 * 267 268 * @returns COM status code and error info. … … 423 424 * 424 425 * @param aMachine The machine to detach devices from. 426 * @param aDone 427 * @param aAbnormal 425 428 * 426 429 * @returns COM status code, perhaps with error info. -
trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
r64972 r65088 3188 3188 * 3189 3189 * @param aId Machine UUID to look for. 3190 * @param aPermitInaccessible If true, inaccessible machines will be found;3190 * @param fPermitInaccessible If true, inaccessible machines will be found; 3191 3191 * if false, this will fail if the given machine is inaccessible. 3192 3192 * @param aSetError If true, set errorinfo if the machine is not found. … … 3349 3349 * Validates a machine group. 3350 3350 * 3351 * @param a MachineGroupMachine group.3352 * @param fPrimary 3351 * @param aGroup Machine group. 3352 * @param fPrimary Set if this is the primary group. 3353 3353 * 3354 3354 * @return S_OK or E_INVALIDARG … … 3452 3452 * object that matches either of them (not necessarily both) is returned. 3453 3453 * 3454 * @param aLocationFull location specification. Must not be empty.3454 * @param strLocation Full location specification. Must not be empty. 3455 3455 * @param aSetError If @c true , the appropriate error info is set in case 3456 3456 * when the hard disk is not found. … … 3773 3773 * directory as the current directory. 3774 3774 * 3775 * @param aPathPath to calculate the absolute path for.3775 * @param strPath Path to calculate the absolute path for. 3776 3776 * @param aResult Where to put the result (used only on success, can be the 3777 3777 * same Utf8Str instance as passed in @a aPath). … … 4823 4823 * directory which is normally unknown. 4824 4824 * 4825 * @param aFileNameFull file name which path is checked/created.4826 * @param aCreate Flag if the path should be created if it doesn't exist.4825 * @param strFileName Full file name which path is checked/created. 4826 * @param fCreate Flag if the path should be created if it doesn't exist. 4827 4827 * 4828 4828 * @return Extended error information on failure to check/create the path. -
trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp
r62485 r65088 169 169 kStateNetworkGlobalDNSKey); 170 170 /** 171 * 0:vvl@nb-mbp-i7-2(0)# scutil172 * > get State:/Network/Global/DNS173 * > d.show174 * <dictionary> {171 * # scutil 172 * \> get State:/Network/Global/DNS 173 * \> d.show 174 * \<dictionary\> { 175 175 * DomainName : vvl-domain 176 * SearchDomains : <array> {176 * SearchDomains : \<array\> { 177 177 * 0 : vvl-domain 178 178 * 1 : de.vvl-domain.com 179 179 * } 180 * ServerAddresses : <array> {180 * ServerAddresses : \<array\> { 181 181 * 0 : 192.168.1.4 182 182 * 1 : 192.168.1.1 -
trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp
r62485 r65088 540 540 * @param puMbits Where to store the link speed. 541 541 */ 542 int NetIfGetLinkSpeed(const char * /*pcszIfName*/, uint32_t * /*puMbits*/) 543 { 542 int NetIfGetLinkSpeed(const char *pcszIfName, uint32_t *puMbits) 543 { 544 RT_NOREF(pcszIfName, puMbits); 544 545 return VERR_NOT_IMPLEMENTED; 545 546 } -
trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
r63677 r65088 327 327 * @param pcszModel the product ID string 328 328 * @param pszDesc where to store the description string (optional) 329 * @param cchDesc the size of the buffer in @ pszDesc329 * @param cchDesc the size of the buffer in @a pszDesc 330 330 * @param pszUdi where to store the UDI string (optional) 331 * @param cchUdi the size of the buffer in @ pszUdi331 * @param cchUdi the size of the buffer in @a pszUdi 332 332 */ 333 333 /* static */ -
trunk/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp
r62485 r65088 77 77 } 78 78 79 LogRel(("USBProxy ServiceOs2: failed to register change notification, rc=%d\n", rc));79 LogRel(("USBProxyBackendOs2: failed to register change notification, rc=%d\n", rc)); 80 80 } 81 81 else 82 LogRel(("USBProxy ServiceOs2: failed to load usbcalls\n"));82 LogRel(("USBProxyBackendOs2: failed to load usbcalls\n")); 83 83 84 84 DosFreeModule(mhmod); 85 85 } 86 86 else 87 LogRel(("USBProxy ServiceOs2: failed to load usbcalls, rc=%d\n", rc));87 LogRel(("USBProxyBackendOs2: failed to load usbcalls, rc=%d\n", rc)); 88 88 mhmod = NULLHANDLE; 89 89 } … … 99 99 * Stop all service threads and free the device chain. 100 100 */ 101 USBProxy ServiceOs2::~USBProxyServiceOs2()101 USBProxyBackendOs2::~USBProxyBackendOs2() 102 102 { 103 103 LogFlowThisFunc(("\n")); … … 128 128 129 129 130 int USBProxy ServiceOs2::captureDevice(HostUSBDevice *aDevice)130 int USBProxyBackendOs2::captureDevice(HostUSBDevice *aDevice) 131 131 { 132 132 AssertReturn(aDevice, VERR_GENERAL_FAILURE); … … 147 147 148 148 149 int USBProxy ServiceOs2::releaseDevice(HostUSBDevice *aDevice)149 int USBProxyBackendOs2::releaseDevice(HostUSBDevice *aDevice) 150 150 { 151 151 AssertReturn(aDevice, VERR_GENERAL_FAILURE); … … 166 166 167 167 168 bool USBProxy ServiceOs2::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,168 bool USBProxyBackendOs2::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, 169 169 SessionMachine **aIgnoreMachine) 170 170 { … … 176 176 177 177 178 int USBProxy ServiceOs2::wait(RTMSINTERVAL aMillies)178 int USBProxyBackendOs2::wait(RTMSINTERVAL aMillies) 179 179 { 180 180 int rc = DosWaitEventSem(mhev, aMillies); … … 183 183 184 184 185 int USBProxy ServiceOs2::interruptWait(void)185 int USBProxyBackendOs2::interruptWait(void) 186 186 { 187 187 int rc = DosPostEventSem(mhev); … … 193 193 #include <stdio.h> 194 194 195 PUSBDEVICE USBProxy ServiceOs2::getDevices(void)195 PUSBDEVICE USBProxyBackendOs2::getDevices(void) 196 196 { 197 197 /* -
trunk/src/VBox/Main/webservice/vboxweb.cpp
r64012 r65088 1536 1536 * 1537 1537 * @param soap 1538 * @param str1538 * @param pcsz 1539 1539 * @param extype 1540 1540 * @param ex … … 1607 1607 * Return a safe C++ string from the given COM UUID, 1608 1608 * without crashing if the UUID is empty. 1609 * @param bstr1609 * @param uuid 1610 1610 * @return 1611 1611 */ … … 1798 1798 * 1799 1799 * Preconditions: Caller must have locked g_pWebsessionsLockHandle. 1800 *1801 * @param username1802 * @param password1803 1800 */ 1804 1801 WebServiceSession::WebServiceSession() … … 1989 1986 * Preconditions: Caller must have locked g_pWebsessionsLockHandle. 1990 1987 * 1991 * @param p cupointer to a COM object.1988 * @param pObject pointer to a COM object. 1992 1989 * @return The existing ManagedObjectRef that represents the COM object, or NULL if there's none yet. 1993 1990 */ … … 2364 2361 * client to clean up itself. 2365 2362 * 2366 * @param 2367 * @param vbox__IWebsessionManager_USCORElogon2368 * @param vbox__IWebsessionManager_USCORElogonResponse2363 * @param soap 2364 * @param req 2365 * @param resp 2369 2366 * @return 2370 2367 */ … … 2454 2451 * hard-coded implementation for IWebsessionManager::logoff. 2455 2452 * 2456 * @param 2457 * @param vbox__IWebsessionManager_USCORElogon 2458 * @param vbox__IWebsessionManager_USCORElogonResponse 2453 * @param req 2454 * @param resp 2459 2455 * @return 2460 2456 */ -
trunk/src/VBox/Main/xml/Settings.cpp
r65082 r65088 876 876 * For pre-1.4 files, this gets called with the \<DiskRegistry\> chunk instead. 877 877 * 878 * @param elmMediaRegistry 878 * @param elmMediaRegistry 879 * @param mr 879 880 */ 880 881 void ConfigFileBase::readMediaRegistry(const xml::ElementNode &elmMediaRegistry, … … 1818 1819 * from both MainConfigFile (for host filters) and MachineConfigFile (for machine 1819 1820 * filters). 1820 * @param elmDevice Filters1821 * @param elmDeviceSources 1821 1822 * @param ll 1822 1823 */ … … 1863 1864 * variables contain meaningful values (either from the file or defaults). 1864 1865 * 1865 * @param strFilename1866 * @param pstrFilename 1866 1867 */ 1867 1868 MainConfigFile::MainConfigFile(const Utf8Str *pstrFilename) … … 4571 4572 * for earlier versions. 4572 4573 * 4573 * @param elmStorageControllers 4574 * @param elmStorageControllers 4575 * @param strg 4574 4576 */ 4575 4577 void MachineConfigFile::readStorageControllers(const xml::ElementNode &elmStorageControllers, -
trunk/src/VBox/Main/xml/ovfreader.cpp
r63563 r65088 120 120 * and handles the contained child elements (which can be "Section" or "Content" elements). 121 121 * 122 * @param p cszPath Path spec of the XML file, for error messages.123 * @param pReferencesElement "References" element from OVF, for looking up file specifications;can be NULL if no such element is present.122 * @param pReferencesElem "References" element from OVF, for looking up file specifications; 123 * can be NULL if no such element is present. 124 124 * @param pCurElem Element whose children are to be analyzed here. 125 125 * @return … … 295 295 * Gets called indirectly from IAppliance::read(). 296 296 * 297 * @param pcszPath Path spec of the XML file, for error messages.298 * @param pSectionElem Section element for which this helper is getting called.299 297 * @return 300 298 */ … … 322 320 * Gets called indirectly from IAppliance::read(). 323 321 * 324 * @param pcszPath 325 * @param pContentElem 322 * @param pelmVirtualSystem 326 323 * @return 327 324 */
Note:
See TracChangeset
for help on using the changeset viewer.