Changeset 37423 in vbox for trunk/src/VBox/Main
- Timestamp:
- Jun 12, 2011 6:37:56 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 72222
- Location:
- trunk/src/VBox/Main
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/VirtualBoxBase.h
r36451 r37423 658 658 #ifdef RT_OS_WINDOWS 659 659 return CoCreateFreeThreadedMarshaler(this, //GetControllingUnknown(), 660 660 &m_pUnkMarshaler.p); 661 661 #else 662 662 return S_OK; -
trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp
r36630 r37423 406 406 dev.createObject(); 407 407 com::Bstr devname(it->second.szDevName); 408 dev->init(NULL, devname, 409 it->second.HostAddress.valid() ? it->second.HostAddress.asLong() : -1, 408 dev->init(NULL, devname, 409 it->second.HostAddress.valid() ? it->second.HostAddress.asLong() : -1, 410 410 it->first.asLong(), it->second.HostAddress.valid()); 411 411 result.setElement(iIndex++, dev); -
trunk/src/VBox/Main/src-client/SessionImpl.cpp
r36991 r37423 58 58 59 59 HRESULT rc = init(); 60 61 BaseFinalConstruct(); 62 60 61 BaseFinalConstruct(); 62 63 63 return rc; 64 64 } … … 69 69 70 70 uninit(); 71 71 72 72 BaseFinalRelease(); 73 73 } … … 190 190 rc = mConsole->machine().queryInterfaceTo(aMachine); 191 191 else 192 rc = mRemoteMachine.queryInterfaceTo(aMachine); 192 rc = mRemoteMachine.queryInterfaceTo(aMachine); 193 193 if (FAILED(rc)) 194 194 { -
trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp
r35638 r37423 52 52 { 53 53 uninit(); 54 54 55 55 BaseFinalRelease(); 56 56 } -
trunk/src/VBox/Main/src-server/MediumFormatImpl.cpp
r35638 r37423 38 38 { 39 39 uninit(); 40 40 41 41 BaseFinalRelease(); 42 42 } -
trunk/src/VBox/Main/src-server/PerformanceImpl.cpp
r36842 r37423 217 217 BaseMetricList::iterator it; 218 218 for (it = m.baseMetrics.begin(); it != m.baseMetrics.end();) 219 220 221 222 223 224 225 219 if ((*it)->isUnregistered()) 220 { 221 delete *it; 222 it = m.baseMetrics.erase(it); 223 } 224 else 225 ++it; 226 226 Assert(m.baseMetrics.size() == 0); 227 227 /* -
trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
r35817 r37423 357 357 switch (aType) 358 358 { 359 case NetworkAttachmentType_NAT: 359 case NetworkAttachmentType_NAT: 360 360 case NetworkAttachmentType_Internal: 361 361 /* chipset default is OK */ -
trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp
r35785 r37423 128 128 129 129 int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVBox, 130 IHostNetworkInterface **aHostNetworkInterface, 130 IHostNetworkInterface **aHostNetworkInterface, 131 131 IProgress **aProgress, 132 132 const char *pcszName) -
trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp
r36958 r37423 64 64 while (pDevice) 65 65 { 66 const char *pcszState = 66 const char *pcszState = 67 67 pDevice->enmState == USBDEVICESTATE_UNSUPPORTED ? "UNSUPPORTED" 68 68 : pDevice->enmState == USBDEVICESTATE_USED_BY_HOST ? "USED_BY_HOST" -
trunk/src/VBox/Main/testcase/tstUSBProxyLinux.cpp
r37086 r37423 73 73 } 74 74 75 static struct 75 static struct 76 76 { 77 77 const char *pcszEnvUsb; … … 163 163 } 164 164 165 static struct 165 static struct 166 166 { 167 167 const char *pacszDeviceAddresses[16];
Note:
See TracChangeset
for help on using the changeset viewer.