Changeset 67654 in vbox for trunk/src

Timestamp:

Jun 27, 2017 6:23:33 PM (8 years ago)

Author:

vboxsync

Message:

IUnattended: Some refactoring, probably not quite working right yet.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (6 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -1281 +1281 @@
     Bstr bstrMachineName;
     Bstr bstrSettingsFile;
-    unsigned short imageIndex = 1; // applied only to Windows installation
+    ULONG idxImage = 1; // applied only to Windows installation
     Bstr bstrSessionType = "headless";
 
@@ -1298 +1298 @@
         { "--additions-iso-path",   'a', RTGETOPT_REQ_STRING },
         { "--auxiliary-base-path",  'x', RTGETOPT_REQ_STRING },
-        { "--image-index",          'm', RTGETOPT_REQ_UINT16 },
+        { "--image-index",          'm', RTGETOPT_REQ_UINT32 },
         { "--settings-file",        's', RTGETOPT_REQ_STRING },
         { "--session-type",         'S', RTGETOPT_REQ_STRING },
@@ -1350 +1350 @@
 
             case 'm':   // --image-index
-                imageIndex = ValueUnion.u16;
+                idxImage = ValueUnion.u32;
                 break;
 
@@ -1434 +1434 @@
         CHECK_ERROR_BREAK(unAttended, COMSETTER(AdditionsIsoPath)(bstrAdditionsIsoPath.raw()));
         CHECK_ERROR_BREAK(unAttended, COMSETTER(InstallGuestAdditions)(bstrAdditionsIsoPath.isNotEmpty()));
-        CHECK_ERROR_BREAK(unAttended, COMSETTER(ImageIndex)(imageIndex));
+        CHECK_ERROR_BREAK(unAttended, COMSETTER(ImageIndex)(idxImage));
         CHECK_ERROR_BREAK(unAttended, COMSETTER(AuxiliaryBasePath)(bstrAuxiliaryBasePath.raw()));
 
@@ -1507 +1507 @@
         CHECK_ERROR_BREAK(unAttended, COMGETTER(ProductKey)(bstrProductKey.asOutParam()));
         CHECK_ERROR_BREAK(unAttended, COMGETTER(AuxiliaryBasePath)(bstrAuxiliaryBasePath.asOutParam()));
-        imageIndex = 0;
-        CHECK_ERROR_BREAK(unAttended, COMGETTER(ImageIndex)(&imageIndex));
+        idxImage = 0;
+        CHECK_ERROR_BREAK(unAttended, COMGETTER(ImageIndex)(&idxImage));
         RTPrintf("Got values:\n"
                  " user:                  %ls\n"
@@ -1521 +1521 @@
                  bstrPassword.raw(),
                  bstrProductKey.raw(),
-                 imageIndex,
+                 idxImage,
                  bstrIsoPath.raw(),
                  bstrAdditionsIsoPath.raw(),

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3838 +3838 @@
     </attribute>
 
-    <attribute name="imageIndex" type="unsigned short">
+    <attribute name="imageIndex" type="unsigned long">
       <desc>
         The image index on installation CD/DVD used to install.