vbox的更動 17362 路徑 trunk/src/VBox/Main/ApplianceImpl.cpp

時間撮記:

2009-3-4 下午06:10:58 (16 年 以前)

作者:

vboxsync

訊息:

OVF: partial implementation of write support in XML classes.

檔案:

• trunk/src/VBox/Main/ApplianceImpl.cpp (修改) (10 筆差異)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -115 +115 @@
 struct Appliance::Data
 {
-    Bstr bstrPath;
+    Utf8Str                 strPath;            // file name last given to either read() or write()
 
     DiskImagesMap           mapDisks;           // map of DiskImage structs, sorted by DiskImage.strDiskId
@@ -938 +938 @@
     AutoReadLock alock(this);
 
-    m->bstrPath.cloneTo(aPath);
+    Bstr bstrPath(m->strPath);
+    bstrPath.cloneTo(aPath);
 
     return S_OK;
@@ -1226 +1227 @@
 
     AutoWriteLock alock(this);
-    m->bstrPath = path;
 
     // see if we can handle this file; for now we insist it has an ".ovf" extension
-    Utf8Str utf8Path(path);
-    const char *pcszLastDot = strrchr(utf8Path, '.');
+    m->strPath = path;
+    const char *pcszLastDot = strrchr(m->strPath, '.');
     if (    (!pcszLastDot)
          || (    strcmp(pcszLastDot, ".ovf")
@@ -1243 +1243 @@
         xml::XmlFileParser parser;
         xml::Document doc;
-        parser.read(utf8Path.raw(),
+        parser.read(m->strPath.raw(),
                     doc);
 
@@ -1267 +1267 @@
 
         // now go though the sections
-        if (!(SUCCEEDED(rc = LoopThruSections(utf8Path.raw(), pReferencesElem, pRootElem))))
+        if (!(SUCCEEDED(rc = LoopThruSections(m->strPath.raw(), pReferencesElem, pRootElem))))
             return rc;
     }
@@ -1654 +1654 @@
     {
         uint32_t opCount = calcMaxProgress();
-        Bstr progressDesc = BstrFmt(tr("Import appliance '%ls'"),
-                                    m->bstrPath.raw());
+        Bstr progressDesc = BstrFmt(tr("Import appliance '%s'"),
+                                    m->strPath.raw());
         /* Create the progress object */
         progress.createObject();
@@ -1695 +1695 @@
     if (FAILED(rc = autoCaller.rc())) return rc;
 
-    AutoReadLock(this);
+    AutoWriteLock(this);
+
+    // see if we can handle this file; for now we insist it has an ".ovf" extension
+    m->strPath = path;
+    const char *pcszLastDot = strrchr(m->strPath, '.');
+    if (    (!pcszLastDot)
+         || (    strcmp(pcszLastDot, ".ovf")
+              && strcmp(pcszLastDot, ".OVF")
+            )
+       )
+        return setError(VBOX_E_FILE_ERROR,
+                        tr("Appliance file must have .ovf extension"));
 
     ComObjPtr<Progress> progress;
@@ -1701 +1712 @@
     {
         uint32_t opCount = calcMaxProgress();
-        Bstr progressDesc = BstrFmt(tr("Write appliance '%ls'"),
-                                    m->bstrPath.raw());
+        Bstr progressDesc = BstrFmt(tr("Write appliance '%s'"),
+                                    m->strPath.raw());
         /* Create the progress object */
         progress.createObject();
@@ -2103 +2114 @@
                     /* The disk image has to be on the same place as the OVF file. So
                      * strip the filename out of the full file path. */
-                    Utf8Str strSrcDir = stripFilename(Utf8Str(pAppliance->m->bstrPath).raw());
+                    Utf8Str strSrcDir = stripFilename(pAppliance->m->strPath);
 
                     /* Iterate over all given disk images */
@@ -2443 +2454 @@
     try
     {
+        xml::Document doc;
+        doc.createRootElement("Envelope");
+
+        xml::XmlFileWriter writer(doc);
+        writer.write(pAppliance->m->strPath.c_str());
     }
     catch(HRESULT aRC)