Changeset 65103 in vbox for trunk/src/VBox/Main
- Timestamp:
- Jan 4, 2017 12:08:18 PM (8 years ago)
- Location:
- trunk/src/VBox/Main
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/MediumAttachmentImpl.h
r61713 r65103 39 39 LONG aDevice, 40 40 DeviceType_T aType, 41 bool fImplicit,42 bool fPassthrough,43 bool fTempEject,44 bool fNonRotational,45 bool fDiscard,46 bool fHotPluggable,41 bool aImplicit, 42 bool aPassthrough, 43 bool aTempEject, 44 bool aNonRotational, 45 bool aDiscard, 46 bool aHotPluggable, 47 47 const Utf8Str &strBandwidthGroup); 48 48 HRESULT initCopy(Machine *aParent, MediumAttachment *aThat); -
trunk/src/VBox/Main/include/ProgressImpl.h
r63147 r65103 79 79 * @param aCancelable 80 80 * @param cOperations 81 * @param bstrFirstOperationDescription81 * @param aFirstOperationDescription 82 82 * @return 83 83 */ -
trunk/src/VBox/Main/src-all/ProgressImpl.cpp
r62485 r65103 139 139 * @param ulTotalOperationsWeight Total weight of operations; must be the sum of ulFirstOperationWeight and 140 140 * what is later passed with each subsequent setNextOperation() call. 141 * @param bstrFirstOperationDescription Description of the first operation.141 * @param aFirstOperationDescription Description of the first operation. 142 142 * @param ulFirstOperationWeight Weight of first sub-operation. 143 143 */ … … 407 407 * @param aResultCode Operation result (error) code, must not be S_OK. 408 408 * @param aIID IID of the interface that defines the error. 409 * @param aComponentName of the component that generates the error.409 * @param pcszComponent Name of the component that generates the error. 410 410 * @param aText Error message (must not be null), an RTStrPrintf-like 411 411 * format string in UTF-8 encoding. … … 781 781 * the next operation. The operation percentage is reset to 0. 782 782 * 783 * @param aOperationDescription Description of the next operation. 783 * @param aNextOperationDescription Description of the next operation. 784 * @param aNextOperationsWeight Weight of the next operation. 784 785 * 785 786 * @note The current operation must not be the last one. -
trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
r63239 r65103 4826 4826 * @returns COM status code. 4827 4827 * 4828 * @par mapUVM The VM handle (caller hold this safely).4828 * @param pUVM The VM handle (caller hold this safely). 4829 4829 * @param pszDevice The PDM device name. 4830 4830 * @param uInstance The PDM device instance. -
trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
r65088 r65103 143 143 * 144 144 * @returns COM status code 145 * @param a _fEnableThe new state.145 * @param aSingleStep The new state. 146 146 */ 147 147 HRESULT MachineDebugger::setSingleStep(BOOL aSingleStep) … … 224 224 * 225 225 * @returns COM status code 226 * @param a _fEnabledaddress of result variable226 * @param aRecompileUser address of result variable 227 227 */ 228 228 HRESULT MachineDebugger::getRecompileUser(BOOL *aRecompileUser) … … 235 235 * 236 236 * @returns COM status 237 * @param a Enablenew user mode code recompile flag.237 * @param aRecompileUser new user mode code recompile flag. 238 238 */ 239 239 HRESULT MachineDebugger::setRecompileUser(BOOL aRecompileUser) … … 247 247 * 248 248 * @returns COM status code 249 * @param a Enabledaddress of result variable249 * @param aRecompileSupervisor address of result variable 250 250 */ 251 251 HRESULT MachineDebugger::getRecompileSupervisor(BOOL *aRecompileSupervisor) … … 258 258 * 259 259 * @returns COM status code 260 * @param a Enablenew recompile supervisor code flag260 * @param aRecompileSupervisor new recompile supervisor code flag 261 261 */ 262 262 HRESULT MachineDebugger::setRecompileSupervisor(BOOL aRecompileSupervisor) … … 270 270 * 271 271 * @returns COM status code 272 * @param aE nabledAddress of result variable.272 * @param aExecuteAllInIEM Address of result variable. 273 273 */ 274 274 HRESULT MachineDebugger::getExecuteAllInIEM(BOOL *aExecuteAllInIEM) … … 281 281 * 282 282 * @returns COM status code 283 * @param aE nableNew setting.283 * @param aExecuteAllInIEM New setting. 284 284 */ 285 285 HRESULT MachineDebugger::setExecuteAllInIEM(BOOL aExecuteAllInIEM) … … 293 293 * 294 294 * @returns COM status code 295 * @param a Enabledaddress of result variable295 * @param aPATMEnabled address of result variable 296 296 */ 297 297 HRESULT MachineDebugger::getPATMEnabled(BOOL *aPATMEnabled) … … 314 314 * 315 315 * @returns COM status code 316 * @param a Enablenew patch manager enabled flag316 * @param aPATMEnabled new patch manager enabled flag 317 317 */ 318 318 HRESULT MachineDebugger::setPATMEnabled(BOOL aPATMEnabled) … … 349 349 * 350 350 * @returns COM status code 351 * @param a Enabledaddress of result variable351 * @param aCSAMEnabled address of result variable 352 352 */ 353 353 HRESULT MachineDebugger::getCSAMEnabled(BOOL *aCSAMEnabled) … … 371 371 * 372 372 * @returns COM status code 373 * @param a Enablenew code scanner enabled flag373 * @param aCSAMEnabled new code scanner enabled flag 374 374 */ 375 375 HRESULT MachineDebugger::setCSAMEnabled(BOOL aCSAMEnabled) … … 593 593 * 594 594 * @returns COM status code 595 * @param a Enabledaddress of result variable595 * @param aHWVirtExUXEnabled address of result variable 596 596 */ 597 597 HRESULT MachineDebugger::getHWVirtExUXEnabled(BOOL *aHWVirtExUXEnabled) … … 675 675 * 676 676 * @returns COM status code 677 * @param a Enabled address of result variable677 * @param aPAEEnabled address of result variable. 678 678 */ 679 679 HRESULT MachineDebugger::getPAEEnabled(BOOL *aPAEEnabled) … … 699 699 * 700 700 * @returns COM status code. 701 * @param a _puPctWhere to store the rate.701 * @param aVirtualTimeRate Where to store the rate. 702 702 */ 703 703 HRESULT MachineDebugger::getVirtualTimeRate(ULONG *aVirtualTimeRate) … … 714 714 715 715 /** 716 * Returns the currentvirtual time rate.716 * Set the virtual time rate. 717 717 * 718 718 * @returns COM status code. 719 * @param a Pct Where to store therate.719 * @param aVirtualTimeRate The new rate. 720 720 */ 721 721 HRESULT MachineDebugger::setVirtualTimeRate(ULONG aVirtualTimeRate) -
trunk/src/VBox/Main/src-client/MouseImpl.cpp
r63244 r65103 367 367 * 368 368 * @returns COM status code 369 * @param a bsoluteSupported address of result variable369 * @param aAbsoluteSupported address of result variable 370 370 */ 371 371 HRESULT Mouse::getAbsoluteSupported(BOOL *aAbsoluteSupported) … … 380 380 * 381 381 * @returns COM status code 382 * @param relativeSupported address of result variable382 * @param aRelativeSupported address of result variable 383 383 */ 384 384 HRESULT Mouse::getRelativeSupported(BOOL *aRelativeSupported) … … 393 393 * 394 394 * @returns COM status code 395 * @param multiTouchSupported address of result variable395 * @param aMultiTouchSupported address of result variable 396 396 */ 397 397 HRESULT Mouse::getMultiTouchSupported(BOOL *aMultiTouchSupported) … … 406 406 * 407 407 * @returns COM status code 408 * @param pfNeedsHostCursor address of result variable408 * @param aNeedsHostCursor address of result variable 409 409 */ 410 410 HRESULT Mouse::getNeedsHostCursor(BOOL *aNeedsHostCursor) … … 736 736 * 737 737 * @returns COM status code 738 * @param dx X movement 739 * @param dy Y movement 740 * @param dz Z movement 741 * @param fButtons The mouse button state 738 * @param dx X movement. 739 * @param dy Y movement. 740 * @param dz Z movement. 741 * @param dw Mouse wheel movement. 742 * @param aButtonState The mouse button state. 742 743 */ 743 744 HRESULT Mouse::putMouseEvent(LONG dx, LONG dy, LONG dz, LONG dw, … … 837 838 * 838 839 * @returns COM status code 839 * @param x X position (pixel), starting from 1 840 * @param y Y position (pixel), starting from 1 841 * @param dz Z movement 842 * @param fButtons The mouse button state 840 * @param x X position (pixel), starting from 1 841 * @param y Y position (pixel), starting from 1 842 * @param dz Z movement 843 * @param dw mouse wheel movement 844 * @param aButtonState The mouse button state 843 845 */ 844 846 HRESULT Mouse::putMouseEventAbsolute(LONG x, LONG y, LONG dz, LONG dw, … … 1048 1050 1049 1051 /** Check what sort of reporting can be done using the devices currently 1050 * enabled. Does not consider the VMM device. */ 1052 * enabled. Does not consider the VMM device. 1053 * 1054 * @param pfAbs supports absolute mouse coordinates. 1055 * @param pfRel supports relative mouse coordinates. 1056 * @param pfMT supports multitouch. 1057 */ 1051 1058 void Mouse::i_getDeviceCaps(bool *pfAbs, bool *pfRel, bool *pfMT) 1052 1059 { … … 1149 1156 * A virtual device is notifying us about its current state and capabilities 1150 1157 */ 1151 DECLCALLBACK(void) Mouse::i_mouseReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs, bool fMT) 1158 DECLCALLBACK(void) Mouse::i_mouseReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRelative, 1159 bool fAbsolute, bool fMultiTouch) 1152 1160 { 1153 1161 PDRVMAINMOUSE pDrv = RT_FROM_MEMBER(pInterface, DRVMAINMOUSE, IConnector); 1154 if (fRel )1162 if (fRelative) 1155 1163 pDrv->u32DevCaps |= MOUSE_DEVCAP_RELATIVE; 1156 1164 else 1157 1165 pDrv->u32DevCaps &= ~MOUSE_DEVCAP_RELATIVE; 1158 if (fAbs )1166 if (fAbsolute) 1159 1167 pDrv->u32DevCaps |= MOUSE_DEVCAP_ABSOLUTE; 1160 1168 else 1161 1169 pDrv->u32DevCaps &= ~MOUSE_DEVCAP_ABSOLUTE; 1162 if (fM T)1170 if (fMultiTouch) 1163 1171 pDrv->u32DevCaps |= MOUSE_DEVCAP_MULTI_TOUCH; 1164 1172 else -
trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp
r63239 r65103 67 67 68 68 /** 69 * @interface_method_impl{PDMIPCIRAW UP,pfnPciDeviceConstructComplete}69 * @interface_method_impl{PDMIPCIRAWCONNECTOR,pfnDeviceConstructComplete} 70 70 */ 71 71 DECLCALLBACK(int) PCIRawDev::drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pInterface, const char *pcszName, -
trunk/src/VBox/Main/src-client/SessionImpl.cpp
r63258 r65103 1090 1090 * @param aFinalRelease called as a result of FinalRelease() 1091 1091 * @param aFromServer called as a result of Uninitialize() 1092 * @param pLockW The write lock this object is protected with.1092 * @param aLockW The write lock this object is protected with. 1093 1093 * Must be acquired already and will be released 1094 1094 * and later reacquired during the unlocking. -
trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
r65088 r65103 373 373 * Implementation for IVirtualBox::createAppliance. 374 374 * 375 * @param a nAppliance IAppliance object created if S_OK is returned.375 * @param aAppliance IAppliance object created if S_OK is returned. 376 376 * @return S_OK or error. 377 377 */ … … 392 392 /** 393 393 * Appliance COM initializer. 394 * @param 394 * @param aVirtualBox The VirtualBox object. 395 395 * @return 396 396 */ … … 1394 1394 /** 1395 1395 * Public method implementation. 1396 * @param 1396 * @param aCount 1397 1397 * @return 1398 1398 */ -
trunk/src/VBox/Main/src-server/MediumAttachmentImpl.cpp
r61713 r65103 92 92 * @param aParent Machine object. 93 93 * @param aMedium Medium object. 94 * @param aController 94 * @param aControllerName Controller the hard disk is attached to. 95 95 * @param aPort Port number. 96 96 * @param aDevice Device number on the port. 97 * @param aType Device type. 98 * @param aImplicit 97 99 * @param aPassthrough Whether accesses are directly passed to the host drive. 98 * @param aBandwidthLimit Bandwidth limit in Mbps 100 * @param aTempEject 101 * @param aNonRotational Whether this medium is non-rotational (aka SSD). 102 * @param aDiscard 103 * @param aHotPluggable Whether this medium is hot-pluggable. 104 * @param aBandwidthLimit Bandwidth limit in Mbps. 99 105 */ 100 106 HRESULT MediumAttachment::init(Machine *aParent, -
trunk/src/VBox/Main/src-server/MediumImpl.cpp
r65066 r65103 1074 1074 * @param uuidMachineRegistry The registry to which this medium should be added 1075 1075 * (global registry UUID or machine UUID or empty if none). 1076 * @param deviceTypeDevice Type.1076 * @param aDeviceType Device Type. 1077 1077 */ 1078 1078 HRESULT Medium::init(VirtualBox *aVirtualBox, … … 4367 4367 * of this media and updates it if necessary to reflect the new location. 4368 4368 * 4369 * @param aOldPath Old path (full).4370 * @param aNewPath New path (full).4369 * @param strOldPath Old path (full). 4370 * @param strNewPath New path (full). 4371 4371 * 4372 4372 * @note Locks this object for writing. … … 6072 6072 * Used by IAppliance to export disk images. 6073 6073 * 6074 * @param aFilename 6075 * @param aFormat 6076 * @param aVariant Which exact image format variant to use6077 * for thedestination image.6078 * @param pKeyStore The optional key store for decrypting the data6079 * forencrypted media during the export.6080 * @param aVDImageIO Callbacks Pointer to the callback table for a6081 * VDINTERFACEIOinterface. May be NULL.6082 * @param aVDImageIOUser 6083 * @param aProgress 6074 * @param aFilename Filename to create (UTF8). 6075 * @param aFormat Medium format for creating @a aFilename. 6076 * @param aVariant Which exact image format variant to use for the 6077 * destination image. 6078 * @param pKeyStore The optional key store for decrypting the data for 6079 * encrypted media during the export. 6080 * @param aVDImageIOIf Pointer to the callback table for a VDINTERFACEIO 6081 * interface. May be NULL. 6082 * @param aVDImageIOUser Opaque data for the callbacks. 6083 * @param aProgress Progress object to use. 6084 6084 * @return 6085 6085 * @note The source format is defined by the Medium instance. … … 6511 6511 * @note Locks m->pParent for reading. Locks this object for writing. 6512 6512 * 6513 * @param fSetImageId Whether to reset the UUID contained in the image file to the UUID in the medium instance data (see SetIDs()) 6514 * @param fSetParentId Whether to reset the parent UUID contained in the image file to the parent 6515 * UUID in the medium instance data (see SetIDs()) 6513 * @param fSetImageId Whether to reset the UUID contained in the image file 6514 * to the UUID in the medium instance data (see SetIDs()) 6515 * @param fSetParentId Whether to reset the parent UUID contained in the image 6516 * file to the parent UUID in the medium instance data (see 6517 * SetIDs()) 6518 * @param autoCaller 6516 6519 * @return 6517 6520 */ -
trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp
r65063 r65103 65 65 * 66 66 * @param aParent Handle of the parent object. 67 * @param uSlot Slot number this network adapter is plugged into. 67 68 */ 68 69 HRESULT NetworkAdapter::init(Machine *aParent, ULONG uSlot) … … 102 103 * the object passed as an argument. 103 104 * 105 * @param aParent Parent object. 106 * @param aThat 104 107 * @param aReshare 105 108 * When false, the original object will remain a data owner. -
trunk/src/VBox/Main/src-server/ParallelPortImpl.cpp
r65063 r65103 72 72 * 73 73 * @param aParent Handle of the parent object. 74 * @param aSlot Slotnumber this parallel port is plugged into. 74 75 */ 75 76 HRESULT ParallelPort::init(Machine *aParent, ULONG aSlot) -
trunk/src/VBox/Main/src-server/SerialPortImpl.cpp
r65063 r65103 74 74 * 75 75 * @param aParent Handle of the parent object. 76 * @param aSlot Slot number the serial port is plugged into. 76 77 */ 77 78 HRESULT SerialPort::init(Machine *aParent, ULONG aSlot) -
trunk/src/VBox/Main/src-server/SnapshotImpl.cpp
r65088 r65103 99 99 * Initializes the instance 100 100 * 101 * @param aVirtualBox VirtualBox object 101 102 * @param aId id of the snapshot 102 103 * @param aName name of the snapshot … … 1113 1114 * @param hardware hardware settings 1114 1115 * @param pDbg debuging settings 1115 * @param pAuto Start autostart settings1116 * @param pAutostart autostart settings 1116 1117 * @param aSnapshotId snapshot ID of this snapshot machine 1117 1118 * @param aStateFilePath file where the execution state is saved … … 2051 2052 * @note Locks mParent + this object for writing. 2052 2053 * 2053 * @param pTask Task data.2054 * @param task Task data. 2054 2055 */ 2055 2056 void SessionMachine::i_restoreSnapshotHandler(RestoreSnapshotTask &task) … … 3629 3630 * @param aSource Source hard disk for merge. 3630 3631 * @param aTarget Target hard disk for merge. 3631 * @param aMergeForward Merge direction.3632 * @param fMergeForward Merge direction. 3632 3633 * @param aParentForTarget New parent if target needs to be reparented. 3633 3634 * @param aChildrenToReparent Medium lock list with children which have to be -
trunk/src/VBox/Main/src-server/StorageControllerImpl.cpp
r63975 r65103 83 83 * @param aParent Pointer to our parent object. 84 84 * @param aName Name of the storage controller. 85 * @param aStorageBus Type of the storage bus. 85 86 * @param aInstance Instance number of the storage controller. 87 * @param fBootable Bootable flag. 86 88 */ 87 89 HRESULT StorageController::init(Machine *aParent, … … 176 178 * the object passed as an argument. 177 179 * 180 * @param aParent Pointer to our parent object. 181 * @param aThat 178 182 * @param aReshare 179 183 * When false, the original object will remain a data owner. -
trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
r64273 r65103 1175 1175 * the "default default" machine folder has changed, and we now require 1176 1176 * a full path always. 1177 * @param aPath1177 * @param strPath 1178 1178 * @return 1179 1179 */ -
trunk/src/VBox/Main/src-server/USBControllerImpl.cpp
r61380 r65103 121 121 * @param aParent Pointer to our parent object. 122 122 * @param aPeer The object to share. 123 * @param aReshare123 * @param fReshare 124 124 * When false, the original object will remain a data owner. 125 125 * Otherwise, data ownership will be transferred from the original -
trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp
r65088 r65103 83 83 * @param aFilter The filter. 84 84 * @param aIdx The field index. 85 * @param aStr The input string. 86 * @param aName The field name for use in the error string. 85 * @param aValue The input string. 87 86 * @param aErrStr Where to return the error string on failure. 88 87 * … … 278 277 * 279 278 * @param aParent Handle of the parent object. 279 * @param aName Name of the filter. 280 280 */ 281 281 HRESULT USBDeviceFilter::init(USBDeviceFilters *aParent, IN_BSTR aName) … … 317 317 * the object passed as an argument. 318 318 * 319 * @param aParent Handle of the parent object. 320 * @param aThat 319 321 * @param aReshare 320 322 * When false, the original object will remain a data owner. … … 778 780 * 779 781 * @param aIdx The field index. 780 * @param aStrThe new value.782 * @param strNew The new value. 781 783 * 782 784 * @return COM status. -
trunk/src/VBox/Main/src-server/USBProxyService.cpp
r65088 r65103 543 543 * 544 544 * @param aDevice The device in question. 545 * @param aUSBDeviceThe USB device structure.545 * @param pDev The USB device structure. 546 546 */ 547 547 void USBProxyService::i_deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, … … 711 711 * @returns COM status code (only parameter & state checks will fail). 712 712 * @param aDevice The USB device to apply filters to. 713 * @param llOpenedMachines The list of opened machines. 713 714 * @param aIgnoreMachine The machine to ignore filters from (we've just 714 715 * detached the device from this machine). -
trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp
r63378 r65103 75 75 /** 76 76 * VFSExplorer COM initializer. 77 * @param 77 * @param aType VFS type. 78 * @param aFilePath File path. 79 * @param aHostname Host name. 80 * @param aUsername User name. 81 * @param aPassword Password. 82 * @param aVirtualBox VirtualBox object. 78 83 * @return 79 84 */ … … 125 130 /** 126 131 * Public method implementation. 127 * @param 132 * @param aPath Where to store the path. 128 133 * @return 129 134 */ -
trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
r65088 r65103 666 666 * continue to work as before. 667 667 * 668 * @param uuid MachineRegistry The UUID of the media registry. This is either the668 * @param uuidRegistry The UUID of the media registry. This is either the 669 669 * transient UUID created at VirtualBox startup for the global registry or 670 670 * a machine ID. 671 671 * @param mediaRegistry The XML settings structure to load, either from VirtualBox.xml 672 672 * or a machine XML. 673 * @param strMachineFolder The folder of the machine. 673 674 * @return 674 675 */ … … 3623 3624 * @param uuid UUID to search for; must refer to a host drive or an image file or be null. 3624 3625 * @param fRefresh Whether to refresh the list of host drives in IHost (see Host::getDrives()) 3626 * @param aSetError 3625 3627 * @param pMedium out: IMedium object found. 3626 3628 * @return -
trunk/src/VBox/Main/webservice/vboxweb.cpp
r65088 r65103 2190 2190 * Preconditions: Caller must have locked g_pWebsessionsLockHandle. 2191 2191 * 2192 * @param strId 2193 * @param iter 2192 * @param id 2193 * @param pRef 2194 * @param fNullAllowed 2194 2195 * @return 2195 2196 */
Note:
See TracChangeset
for help on using the changeset viewer.