Changeset 21878 in vbox for trunk/src/VBox/Main/GuestImpl.cpp
- Timestamp:
- Jul 30, 2009 12:42:08 PM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 50525
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/GuestImpl.cpp
r21219 r21878 59 59 HRESULT Guest::init (Console *aParent) 60 60 { 61 LogFlowThisFunc 61 LogFlowThisFunc(("aParent=%p\n", aParent)); 62 62 63 63 ComAssertRet (aParent, E_INVALIDARG); 64 64 65 65 /* Enclose the state transition NotReady->InInit->Ready */ 66 AutoInitSpan autoInitSpan 67 AssertReturn 68 69 unconst 66 AutoInitSpan autoInitSpan(this); 67 AssertReturn(autoInitSpan.isOk(), E_FAIL); 68 69 unconst(mParent) = aParent; 70 70 71 71 /* mData.mAdditionsActive is FALSE */ … … 103 103 void Guest::uninit() 104 104 { 105 LogFlowThisFunc 105 LogFlowThisFunc(("\n")); 106 106 107 107 /* Enclose the state transition Ready->InUninit->NotReady */ 108 AutoUninitSpan autoUninitSpan 108 AutoUninitSpan autoUninitSpan(this); 109 109 if (autoUninitSpan.uninitDone()) 110 110 return; 111 111 112 unconst 112 unconst(mParent).setNull(); 113 113 } 114 114 … … 120 120 CheckComArgOutPointerValid(aOSTypeId); 121 121 122 AutoCaller autoCaller 123 CheckComRCReturnRC 124 125 AutoReadLock alock 122 AutoCaller autoCaller(this); 123 CheckComRCReturnRC(autoCaller.rc()); 124 125 AutoReadLock alock(this); 126 126 127 127 // redirect the call to IMachine if no additions are installed … … 129 129 return mParent->machine()->COMGETTER(OSTypeId) (aOSTypeId); 130 130 131 mData.mOSTypeId.cloneTo 131 mData.mOSTypeId.cloneTo(aOSTypeId); 132 132 133 133 return S_OK; … … 138 138 CheckComArgOutPointerValid(aAdditionsActive); 139 139 140 AutoCaller autoCaller 141 CheckComRCReturnRC 142 143 AutoReadLock alock 140 AutoCaller autoCaller(this); 141 CheckComRCReturnRC(autoCaller.rc()); 142 143 AutoReadLock alock(this); 144 144 145 145 *aAdditionsActive = mData.mAdditionsActive; … … 152 152 CheckComArgOutPointerValid(aAdditionsVersion); 153 153 154 AutoCaller autoCaller 155 CheckComRCReturnRC 156 157 AutoReadLock alock 158 159 mData.mAdditionsVersion.cloneTo 154 AutoCaller autoCaller(this); 155 CheckComRCReturnRC(autoCaller.rc()); 156 157 AutoReadLock alock(this); 158 159 mData.mAdditionsVersion.cloneTo(aAdditionsVersion); 160 160 161 161 return S_OK; … … 166 166 CheckComArgOutPointerValid(aSupportsSeamless); 167 167 168 AutoCaller autoCaller 169 CheckComRCReturnRC 170 171 AutoReadLock alock 168 AutoCaller autoCaller(this); 169 CheckComRCReturnRC(autoCaller.rc()); 170 171 AutoReadLock alock(this); 172 172 173 173 *aSupportsSeamless = mData.mSupportsSeamless; … … 180 180 CheckComArgOutPointerValid(aSupportsGraphics); 181 181 182 AutoCaller autoCaller 183 CheckComRCReturnRC 184 185 AutoReadLock alock 182 AutoCaller autoCaller(this); 183 CheckComRCReturnRC(autoCaller.rc()); 184 185 AutoReadLock alock(this); 186 186 187 187 *aSupportsGraphics = mData.mSupportsGraphics; … … 194 194 CheckComArgOutPointerValid(aMemoryBalloonSize); 195 195 196 AutoCaller autoCaller 197 CheckComRCReturnRC 198 199 AutoReadLock alock 196 AutoCaller autoCaller(this); 197 CheckComRCReturnRC(autoCaller.rc()); 198 199 AutoReadLock alock(this); 200 200 201 201 *aMemoryBalloonSize = mMemoryBalloonSize; … … 206 206 STDMETHODIMP Guest::COMSETTER(MemoryBalloonSize) (ULONG aMemoryBalloonSize) 207 207 { 208 AutoCaller autoCaller 209 CheckComRCReturnRC 210 211 AutoWriteLock alock 208 AutoCaller autoCaller(this); 209 CheckComRCReturnRC(autoCaller.rc()); 210 211 AutoWriteLock alock(this); 212 212 213 213 HRESULT ret = mParent->machine()->COMSETTER(MemoryBalloonSize)(aMemoryBalloonSize); … … 228 228 CheckComArgOutPointerValid(aUpdateInterval); 229 229 230 AutoCaller autoCaller 231 CheckComRCReturnRC 232 233 AutoReadLock alock 230 AutoCaller autoCaller(this); 231 CheckComRCReturnRC(autoCaller.rc()); 232 233 AutoReadLock alock(this); 234 234 235 235 *aUpdateInterval = mStatUpdateInterval; … … 240 240 STDMETHODIMP Guest::COMSETTER(StatisticsUpdateInterval) (ULONG aUpdateInterval) 241 241 { 242 AutoCaller autoCaller 243 CheckComRCReturnRC 244 245 AutoWriteLock alock 242 AutoCaller autoCaller(this); 243 CheckComRCReturnRC(autoCaller.rc()); 244 245 AutoWriteLock alock(this); 246 246 247 247 HRESULT ret = mParent->machine()->COMSETTER(StatisticsUpdateInterval)(aUpdateInterval); … … 265 265 CheckComArgNotNull(aDomain); 266 266 267 AutoCaller autoCaller 268 CheckComRCReturnRC 267 AutoCaller autoCaller(this); 268 CheckComRCReturnRC(autoCaller.rc()); 269 269 270 270 /* forward the information to the VMM device */ … … 318 318 Assert(aVersion.isNull() || !aVersion.isEmpty()); 319 319 320 AutoCaller autoCaller 320 AutoCaller autoCaller(this); 321 321 AssertComRCReturnVoid (autoCaller.rc()); 322 322 323 AutoWriteLock alock 323 AutoWriteLock alock(this); 324 324 325 325 mData.mAdditionsVersion = aVersion; … … 331 331 void Guest::setSupportsSeamless (BOOL aSupportsSeamless) 332 332 { 333 AutoCaller autoCaller 333 AutoCaller autoCaller(this); 334 334 AssertComRCReturnVoid (autoCaller.rc()); 335 335 336 AutoWriteLock alock 336 AutoWriteLock alock(this); 337 337 338 338 mData.mSupportsSeamless = aSupportsSeamless; … … 341 341 void Guest::setSupportsGraphics (BOOL aSupportsGraphics) 342 342 { 343 AutoCaller autoCaller 343 AutoCaller autoCaller(this); 344 344 AssertComRCReturnVoid (autoCaller.rc()); 345 345 346 AutoWriteLock alock 346 AutoWriteLock alock(this); 347 347 348 348 mData.mSupportsGraphics = aSupportsGraphics;
Note:
See TracChangeset
for help on using the changeset viewer.