- Timestamp:
- Jun 2, 2017 11:36:39 AM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-server/MediumImpl.cpp
r67233 r67234 6110 6110 const ComObjPtr<Progress> &aProgress, bool fSparse) 6111 6111 { 6112 /** @todo fix progress object. */ 6112 AutoCaller autoCaller(this); 6113 HRESULT hrc = autoCaller.rc(); 6114 if (FAILED(hrc)) 6115 return hrc; 6113 6116 6114 6117 /* … … 6116 6119 */ 6117 6120 MediumLockList SourceMediumLockList; 6118 HRESULTrc = i_createMediumLockList(true /* fFailIfInaccessible */,6119 6120 6121 6122 6123 if (SUCCEEDED( rc))6124 rc = SourceMediumLockList.Lock();6125 if (FAILED( rc))6126 return rc;6121 hrc = i_createMediumLockList(true /* fFailIfInaccessible */, 6122 NULL /* pToLockWrite */, 6123 false /* fMediumLockWriteAll */, 6124 NULL, 6125 SourceMediumLockList); 6126 if (SUCCEEDED(hrc)) 6127 hrc = SourceMediumLockList.Lock(); 6128 if (FAILED(hrc)) 6129 return hrc; 6127 6130 6128 6131 try … … 6151 6154 /* Load the plugin */ 6152 6155 Utf8Str strPlugin; 6153 rc = pExtPackManager->i_getLibraryPathForExtPack(g_szVDPlugin, ORACLE_PUEL_EXTPACK_NAME, &strPlugin);6154 if (SUCCEEDED( rc))6156 hrc = pExtPackManager->i_getLibraryPathForExtPack(g_szVDPlugin, ORACLE_PUEL_EXTPACK_NAME, &strPlugin); 6157 if (SUCCEEDED(hrc)) 6155 6158 { 6156 6159 vrc = VDPluginLoadFromFilename(strPlugin.c_str()); … … 6257 6260 RTVfsObjRelease(hVfsObj); 6258 6261 if (RT_FAILURE(vrc)) 6259 rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Failed to add '%s' to output (%Rrc)"), aFilename, vrc);6262 hrc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Failed to add '%s' to output (%Rrc)"), aFilename, vrc); 6260 6263 } 6261 6264 else 6262 rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc,6263 tr("RTVfsCreateProgressForFile failed when processing '%s' (%Rrc)"), aFilename, vrc);6265 hrc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, 6266 tr("RTVfsCreateProgressForFile failed when processing '%s' (%Rrc)"), aFilename, vrc); 6264 6267 } 6265 6268 else 6266 rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("VDCreateVfsFileFromDisk failed for '%s' (%Rrc)"), aFilename, vrc);6267 } 6268 catch (HRESULT hrc3) { rc = hrc3; }6269 hrc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("VDCreateVfsFileFromDisk failed for '%s' (%Rrc)"), aFilename, vrc); 6270 } 6271 catch (HRESULT hrc3) { hrc = hrc3; } 6269 6272 6270 6273 VDDestroy(hdd); 6271 6274 } 6272 catch (HRESULT hrc2) { rc = hrc2; }6273 6274 return rc;6275 catch (HRESULT hrc2) { hrc = hrc2; } 6276 6277 return hrc; 6275 6278 } 6276 6279
Note:
See TracChangeset
for help on using the changeset viewer.