Changeset 80828 in vbox

Timestamp:

Sep 16, 2019 2:05:09 PM (5 years ago)

Author:

vboxsync

Message:

Main/Guest*: Create enviornment blocks with RTENV_CREATE_F_ALLOW_EQUAL_FIRST_IN_VAR for windows guests.

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (10 diffs)
• include/GuestImpl.h (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (2 diffs)

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

@@ -83 +83 @@
         : m_hEnv(NIL_RTENV)
         , m_cRefs(1)
+        , m_fFlags(0)
     { }
 
@@ -362 +363 @@
      * @throws HRESULT
      */
-    GuestEnvironmentBase(const GuestEnvironmentBase &rThat, bool fChangeRecord)
+    GuestEnvironmentBase(const GuestEnvironmentBase &rThat, bool fChangeRecord, uint32_t fFlags = 0)
         : m_hEnv(NIL_RTENV)
         , m_cRefs(1)
+        , m_fFlags(fFlags)
     {
         int rc = cloneCommon(rThat, fChangeRecord);
@@ -394 +396 @@
                 /* Need to type convert it. */
                 if (fChangeRecord)
-                    rc = RTEnvCreateChangeRecord(&hNewEnv);
+                    rc = RTEnvCreateChangeRecordEx(&hNewEnv, rThat.m_fFlags);
                 else
-                    rc = RTEnvCreate(&hNewEnv);
+                    rc = RTEnvCreateEx(&hNewEnv, rThat.m_fFlags);
                 if (RT_SUCCESS(rc))
                 {
@@ -412 +414 @@
              */
             if (fChangeRecord)
-                rc = RTEnvCreateChangeRecord(&hNewEnv);
+                rc = RTEnvCreateChangeRecordEx(&hNewEnv, rThat.m_fFlags);
             else
-                rc = RTEnvCreate(&hNewEnv);
+                rc = RTEnvCreateEx(&hNewEnv, rThat.m_fFlags);
         }
         if (RT_SUCCESS(rc))
@@ -420 +422 @@
             RTEnvDestroy(m_hEnv);
             m_hEnv = hNewEnv;
+            m_fFlags = rThat.m_fFlags;
         }
         return rc;
@@ -429 +432 @@
     /** Reference counter. */
     uint32_t volatile   m_cRefs;
+    /** RTENV_CREATE_F_XXX. */
+    uint32_t            m_fFlags;
 };
 
@@ -470 +475 @@
      * Initialize this as a normal environment block.
      * @returns IPRT status code.
-     */
-    int initNormal(void)
+     * @param   fFlags      RTENV_CREATE_F_XXX
+     */
+    int initNormal(uint32_t fFlags)
     {
         AssertReturn(m_hEnv == NIL_RTENV, VERR_WRONG_ORDER);
-        return RTEnvCreate(&m_hEnv);
+        m_fFlags = fFlags;
+        return RTEnvCreateEx(&m_hEnv, fFlags);
     }
 
@@ -494 +501 @@
     GuestEnvironment &operator=(const GuestEnvironmentBase &rThat)
     {
-        int rc = cloneCommon(rThat, true /*fChangeRecord*/);
+        int rc = copy(rThat);
         if (RT_FAILURE(rc))
             throw (Global::vboxStatusCodeToCOM(rc));
@@ -550 +557 @@
      * Initialize this as a environment change record.
      * @returns IPRT status code.
-     */
-    int initChangeRecord(void)
+     * @param   fFlags      RTENV_CREATE_F_XXX
+     */
+    int initChangeRecord(uint32_t fFlags)
     {
         AssertReturn(m_hEnv == NIL_RTENV, VERR_WRONG_ORDER);
-        return RTEnvCreateChangeRecord(&m_hEnv);
+        m_fFlags = fFlags;
+        return RTEnvCreateChangeRecordEx(&m_hEnv, fFlags);
     }
 
@@ -574 +583 @@
     GuestEnvironmentChanges &operator=(const GuestEnvironmentBase &rThat)
     {
-        int rc = cloneCommon(rThat, true /*fChangeRecord*/);
+        int rc = copy(rThat);
         if (RT_FAILURE(rc))
             throw (Global::vboxStatusCodeToCOM(rc));

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

@@ -106 +106 @@
     uint32_t    i_getAdditionsRevision(void) { return mData.mAdditionsRevision; }
     uint32_t    i_getAdditionsVersion(void) { return mData.mAdditionsVersionFull; }
-    VBOXOSTYPE  i_getGuestOSType(void) { return mData.mOSType; }
+    VBOXOSTYPE  i_getGuestOSType(void) const { return mData.mOSType; }
+    /** Checks if the guest OS type is part of the windows NT family.  */
+    bool        i_isGuestInWindowsNtFamily(void) const
+    {
+        return mData.mOSType < VBOXOSTYPE_OS2 && mData.mOSType >= VBOXOSTYPE_WinNT;
+    }
 #ifdef VBOX_WITH_GUEST_CONTROL
     int         i_dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);

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

@@ -230 +230 @@
     if (RT_SUCCESS(rc))
     {
-        rc = mData.mEnvironmentChanges.initChangeRecord();
+        rc = mData.mEnvironmentChanges.initChangeRecord(pGuest->i_isGuestInWindowsNtFamily()
+                                                        ? RTENV_CREATE_F_ALLOW_EQUAL_FIRST_IN_VAR : 0);
         if (RT_SUCCESS(rc))
         {
@@ -1836 +1837 @@
                 if (pBaseEnv)
                 {
-                    int vrc = pBaseEnv->initNormal();
+                    int vrc = pBaseEnv->initNormal(Guest.i_isGuestInWindowsNtFamily() ? RTENV_CREATE_F_ALLOW_EQUAL_FIRST_IN_VAR : 0);
                     if (RT_SUCCESS(vrc))
                         vrc = pBaseEnv->copyUtf8Block(pszzEnvBlock, cbEnvBlock);