Changeset 71649 in vbox

Timestamp:

Apr 4, 2018 11:10:53 AM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Renamed SessionTaskUpdateAdditions::InstallerFile to ISOFile and UPDATEFILE_FLAG_ to ISOFILE_FLAG_ flags to emphasize its usage.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImplTasks.h (modified) (3 diffs)
• src-client/GuestSessionImplTasks.cpp (modified) (8 diffs)

trunk/src/VBox/Main/include/GuestSessionImplTasks.h

@@ -261 +261 @@
      * get off the .ISO, copied to the guest.
      */
-    struct InstallerFile
-    {
-        InstallerFile(const Utf8Str &aSource,
-                      const Utf8Str &aDest,
-                      uint32_t       aFlags = 0)
+    struct ISOFile
+    {
+        ISOFile(const Utf8Str &aSource,
+                const Utf8Str &aDest,
+                uint32_t       aFlags = 0)
             : strSource(aSource),
               strDest(aDest),
               fFlags(aFlags) { }
 
-        InstallerFile(const Utf8Str          &aSource,
-                      const Utf8Str          &aDest,
-                      uint32_t                aFlags,
-                      const GuestProcessStartupInfo &aStartupInfo)
+        ISOFile(const Utf8Str                 &aSource,
+                const Utf8Str                 &aDest,
+                uint32_t                       aFlags,
+                const GuestProcessStartupInfo &aStartupInfo)
             : strSource(aSource),
               strDest(aDest),
@@ -288 +288 @@
         /** Destination file on the guest. */
         Utf8Str                 strDest;
-        /** File flags. */
+        /** ISO file flags (see ISOFILE_FLAG_ defines). */
         uint32_t                fFlags;
         /** Optional arguments if this file needs to be
@@ -300 +300 @@
 
     /** Files to handle. */
-    std::vector<InstallerFile> mFiles;
+    std::vector<ISOFile> mFiles;
     /** The (optionally) specified Guest Additions .ISO on the host
      *  which will be used for the updating process. */

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -49 +49 @@
 
 /**
- * Update file flags.
+ * (Guest Additions) ISO file flags.
+ * Needed for handling Guest Additions updates.
  */
-#define UPDATEFILE_FLAG_NONE                0
+#define ISOFILE_FLAG_NONE                0
 /** Copy over the file from host to the
  *  guest. */
-#define UPDATEFILE_FLAG_COPY_FROM_ISO       RT_BIT(0)
+#define ISOFILE_FLAG_COPY_FROM_ISO       RT_BIT(0)
 /** Execute file on the guest after it has
  *  been successfully transfered. */
-#define UPDATEFILE_FLAG_EXECUTE             RT_BIT(7)
+#define ISOFILE_FLAG_EXECUTE             RT_BIT(7)
 /** File is optional, does not have to be
  *  existent on the .ISO. */
-#define UPDATEFILE_FLAG_OPTIONAL            RT_BIT(8)
+#define ISOFILE_FLAG_OPTIONAL            RT_BIT(8)
 
 
@@ -2042 +2043 @@
                                 { "oracle-vbox.cer",    "CERT/ORACLE_VBOX.CER" },
                             };
-                            uint32_t fCopyCertUtil = UPDATEFILE_FLAG_COPY_FROM_ISO;
+                            uint32_t fCopyCertUtil = ISOFILE_FLAG_COPY_FROM_ISO;
                             for (uint32_t i = 0; i < RT_ELEMENTS(s_aCertFiles); i++)
                             {
@@ -2054 +2055 @@
                                 /* Copy the certificate certificate. */
                                 Utf8Str const strDstCert(strUpdateDir + s_aCertFiles[i].pszDst);
-                                mFiles.push_back(InstallerFile(s_aCertFiles[i].pszIso,
-                                                               strDstCert,
-                                                               UPDATEFILE_FLAG_COPY_FROM_ISO | UPDATEFILE_FLAG_OPTIONAL));
+                                mFiles.push_back(ISOFile(s_aCertFiles[i].pszIso,
+                                                         strDstCert,
+                                                         ISOFILE_FLAG_COPY_FROM_ISO | ISOFILE_FLAG_OPTIONAL));
 
                                 /* Out certificate installation utility. */
@@ -2067 +2068 @@
                                 siCertUtilRem.mArguments.push_back(strDstCert);
                                 siCertUtilRem.mArguments.push_back(strDstCert);
-                                mFiles.push_back(InstallerFile("CERT/VBOXCERTUTIL.EXE",
-                                                               strUpdateDir + "VBoxCertUtil.exe",
-                                                               fCopyCertUtil | UPDATEFILE_FLAG_EXECUTE | UPDATEFILE_FLAG_OPTIONAL,
-                                                               siCertUtilRem));
+                                mFiles.push_back(ISOFile("CERT/VBOXCERTUTIL.EXE",
+                                                         strUpdateDir + "VBoxCertUtil.exe",
+                                                         fCopyCertUtil | ISOFILE_FLAG_EXECUTE | ISOFILE_FLAG_OPTIONAL,
+                                                         siCertUtilRem));
                                 fCopyCertUtil = 0;
                                 /* Second pass: Only execute (but don't copy) again, this time installng the
@@ -2080 +2081 @@
                                 siCertUtilAdd.mArguments.push_back(strDstCert);
                                 siCertUtilAdd.mArguments.push_back(strDstCert);
-                                mFiles.push_back(InstallerFile("CERT/VBOXCERTUTIL.EXE",
-                                                               strUpdateDir + "VBoxCertUtil.exe",
-                                                               UPDATEFILE_FLAG_EXECUTE | UPDATEFILE_FLAG_OPTIONAL,
-                                                               siCertUtilAdd));
+                                mFiles.push_back(ISOFile("CERT/VBOXCERTUTIL.EXE",
+                                                         strUpdateDir + "VBoxCertUtil.exe",
+                                                         ISOFILE_FLAG_EXECUTE | ISOFILE_FLAG_OPTIONAL,
+                                                         siCertUtilAdd));
                             }
                         }
                         /* The installers in different flavors, as we don't know (and can't assume)
                          * the guest's bitness. */
-                        mFiles.push_back(InstallerFile("VBOXWINDOWSADDITIONS_X86.EXE",
-                                                       strUpdateDir + "VBoxWindowsAdditions-x86.exe",
-                                                       UPDATEFILE_FLAG_COPY_FROM_ISO));
-                        mFiles.push_back(InstallerFile("VBOXWINDOWSADDITIONS_AMD64.EXE",
-                                                       strUpdateDir + "VBoxWindowsAdditions-amd64.exe",
-                                                       UPDATEFILE_FLAG_COPY_FROM_ISO));
+                        mFiles.push_back(ISOFile("VBOXWINDOWSADDITIONS_X86.EXE",
+                                                 strUpdateDir + "VBoxWindowsAdditions-x86.exe",
+                                                 ISOFILE_FLAG_COPY_FROM_ISO));
+                        mFiles.push_back(ISOFile("VBOXWINDOWSADDITIONS_AMD64.EXE",
+                                                 strUpdateDir + "VBoxWindowsAdditions-amd64.exe",
+                                                 ISOFILE_FLAG_COPY_FROM_ISO));
                         /* The stub loader which decides which flavor to run. */
                         GuestProcessStartupInfo siInstaller;
@@ -2117 +2118 @@
                         if (mFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly)
                             siInstaller.mFlags |= ProcessCreateFlag_WaitForProcessStartOnly;
-                        mFiles.push_back(InstallerFile("VBOXWINDOWSADDITIONS.EXE",
-                                                       strUpdateDir + "VBoxWindowsAdditions.exe",
-                                                       UPDATEFILE_FLAG_COPY_FROM_ISO | UPDATEFILE_FLAG_EXECUTE, siInstaller));
+                        mFiles.push_back(ISOFile("VBOXWINDOWSADDITIONS.EXE",
+                                                 strUpdateDir + "VBoxWindowsAdditions.exe",
+                                                 ISOFILE_FLAG_COPY_FROM_ISO | ISOFILE_FLAG_EXECUTE, siInstaller));
                         break;
                     }
@@ -2143 +2144 @@
                 LogRel(("Copying over Guest Additions update files to the guest ...\n"));
 
-                std::vector<InstallerFile>::const_iterator itFiles = mFiles.begin();
+                std::vector<ISOFile>::const_iterator itFiles = mFiles.begin();
                 while (itFiles != mFiles.end())
                 {
-                    if (itFiles->fFlags & UPDATEFILE_FLAG_COPY_FROM_ISO)
+                    if (itFiles->fFlags & ISOFILE_FLAG_COPY_FROM_ISO)
                     {
                         bool fOptional = false;
-                        if (itFiles->fFlags & UPDATEFILE_FLAG_OPTIONAL)
+                        if (itFiles->fFlags & ISOFILE_FLAG_OPTIONAL)
                             fOptional = true;
                         rc = copyFileToGuest(pSession, &iso, itFiles->strSource, itFiles->strDest,
@@ -2183 +2184 @@
                 LogRel(("Executing Guest Additions update files ...\n"));
 
-                std::vector<InstallerFile>::iterator itFiles = mFiles.begin();
+                std::vector<ISOFile>::iterator itFiles = mFiles.begin();
                 while (itFiles != mFiles.end())
                 {
-                    if (itFiles->fFlags & UPDATEFILE_FLAG_EXECUTE)
+                    if (itFiles->fFlags & ISOFILE_FLAG_EXECUTE)
                     {
                         rc = runFileOnGuest(pSession, itFiles->mProcInfo);