- Timestamp:
- Jul 22, 2016 4:15:56 PM (8 years ago)
- Location:
- trunk/include/VBox
- Files:
-
- 3 edited
-
com/errorprint.h (modified) (1 diff)
-
com/microatl.h (modified) (5 diffs)
-
vmm/pdmstorageifs.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/com/errorprint.h
r58110 r62459 364 364 /** @} */ 365 365 366 -
trunk/include/VBox/com/microatl.h
r60865 r62459 341 341 342 342 m_cLock = 0; 343 m_pTermFuncs = NULL;343 m_pTermFuncs = NULL; 344 344 _pAtlModule = this; 345 345 … … 355 355 { 356 356 if (!fInit) 357 return;358 359 // Call all term functions.360 if (m_pTermFuncs)361 {362 _ATL_TERMFUNC_ELEM *p = m_pTermFuncs;363 _ATL_TERMFUNC_ELEM *pNext;364 while (p)365 {366 p->pfn(p->pv);367 pNext = p->pNext;368 delete p;369 p = pNext;370 }371 m_pTermFuncs = NULL;372 }357 return; 358 359 // Call all term functions. 360 if (m_pTermFuncs) 361 { 362 _ATL_TERMFUNC_ELEM *p = m_pTermFuncs; 363 _ATL_TERMFUNC_ELEM *pNext; 364 while (p) 365 { 366 p->pfn(p->pv); 367 pNext = p->pNext; 368 delete p; 369 p = pNext; 370 } 371 m_pTermFuncs = NULL; 372 } 373 373 m_csStaticDataInitAndTypeInfo.Term(); 374 374 fInit = false; … … 397 397 HRESULT AddTermFunc(PFNATLTERMFUNC pfn, void *pv) 398 398 { 399 HRESULT hrc = S_OK;400 _ATL_TERMFUNC_ELEM *pNew = NULL;399 HRESULT hrc = S_OK; 400 _ATL_TERMFUNC_ELEM *pNew = NULL; 401 401 try 402 402 { … … 406 406 { 407 407 } 408 if (!pNew)409 return E_OUTOFMEMORY;410 pNew->pfn = pfn;411 pNew->pv = pv;408 if (!pNew) 409 return E_OUTOFMEMORY; 410 pNew->pfn = pfn; 411 pNew->pv = pv; 412 412 CComCritSectLock<CComCriticalSection> lock(m_csStaticDataInitAndTypeInfo, false); 413 413 hrc = lock.Lock(); 414 if (SUCCEEDED(hrc))415 {416 pNew->pNext = m_pTermFuncs;417 m_pTermFuncs = pNew;418 }419 else420 {421 delete pNew;414 if (SUCCEEDED(hrc)) 415 { 416 pNew->pNext = m_pTermFuncs; 417 m_pTermFuncs = pNew; 418 } 419 else 420 { 421 delete pNew; 422 422 AssertMsgFailed(("CComModule::AddTermFunc: failed to lock critsect\n")); 423 423 } 424 return hrc;424 return hrc; 425 425 } 426 426 … … 1003 1003 AssertPtrReturn(pThis, E_NOINTERFACE); 1004 1004 IUnknown *pObj = *(IUnknown **)((DWORD_PTR)pThis + dw); 1005 // If this assertion fails then the object has a delegation with a NULL1006 // object pointer, which is highly unusual often means that the pointer1007 // was not set up correctly. Check the COM interface map of the class1008 // for bugs with initializing.1005 // If this assertion fails then the object has a delegation with a NULL 1006 // object pointer, which is highly unusual often means that the pointer 1007 // was not set up correctly. Check the COM interface map of the class 1008 // for bugs with initializing. 1009 1009 AssertPtrReturn(pObj, E_NOINTERFACE); 1010 1010 return pObj->QueryInterface(iid, ppvObj); -
trunk/include/VBox/vmm/pdmstorageifs.h
r59539 r62459 597 597 /** Invalid state. */ 598 598 PDMMEDIAEXIOREQSTATE_INVALID = 0, 599 /** The request is active and being processed. */ 599 /** The request is active and being processed. */ 600 600 PDMMEDIAEXIOREQSTATE_ACTIVE, 601 601 /** The request is suspended due to an error and no processing will take place. */
Note:
See TracChangeset
for help on using the changeset viewer.

