Changeset 5806 in vbox for trunk/src/VBox/Main/ParallelPortImpl.cpp

Timestamp:

Nov 20, 2007 6:20:00 PM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed: Always save values of unused attributes of serial ports to preserve user's settings for later use.

File:

• trunk/src/VBox/Main/ParallelPortImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ParallelPortImpl.cpp

@@ -275 +275 @@
 }
 
+/** 
+ *  Saves the port settings to the given <Port> node.
+ *
+ *  Note that the given node is always empty so it is not necessary to delete
+ *  old values.
+ * 
+ *  @param aNode Node to save the settings to.
+ * 
+ *  @return 
+ */
 HRESULT ParallelPort::saveSettings (CFGNODE aNode)
 {
@@ -292 +302 @@
     CFGLDRSetUInt32Ex (portNode, "IOBase",  mData->mIOBase, 16);
     CFGLDRSetUInt32   (portNode, "IRQ",     mData->mIRQ);
-    CFGLDRSetBSTR     (portNode, "path",    mData->mPath);
+
+    /* 'path' is optional in XML */
+    if (!mData->mPath.isEmpty())
+        CFGLDRSetBSTR (portNode, "path", mData->mPath);
 
     return S_OK;
@@ -378 +391 @@
     if (aIRQ > 255)
         return setError (E_INVALIDARG,
-            tr ("Invalid IRQ number: %lu (must be in range [0, %lu])"),
-                aIRQ, 255);
+            tr ("Invalid IRQ number of the parallel port %d: "
+                "%lu (must be in range [0, %lu])"),
+            mData->mSlot, aIRQ, 255);
 
     AutoCaller autoCaller (this);
@@ -432 +446 @@
     if (aIOBase > 0xFFFF)
         return setError (E_INVALIDARG,
-            tr ("Invalid I/O port base address: %lu (must be in range [0, 0x%X])"),
-                aIOBase, 0, 0xFFFF);
+            tr ("Invalid I/O port base address of the parallel port %d: "
+                "%lu (must be in range [0, 0x%X])"),
+            mData->mSlot, aIOBase, 0, 0xFFFF);
 
     AutoCaller autoCaller (this);
@@ -487 +502 @@
     if (!*aPath)
         return setError (E_INVALIDARG,
-            tr ("Parallel port path cannot be empty"));
+            tr ("Path of the parallel port %d may not be empty"),
+            mData->mSlot);
 
     AutoCaller autoCaller (this);