Changeset 13293 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 15, 2008 4:19:36 PM (16 years ago)

Author:

vboxsync

Message:

HostServices/GuestProperties and Main: support property flags - the values are not yet checked

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4494 +4494 @@
         char szPropFlags[MAX_FLAGS_LEN + 1];
         ULONG64 u64Timestamp = 0;  /* default */
-        szPropFlags[0] = '\0';  /* default */
         vrc = CFGMR3GetValueName (pValue, szPropName, sizeof(szPropName));
         if (RT_SUCCESS(vrc))
@@ -4500 +4499 @@
         if (RT_SUCCESS(vrc))
         {
-            CFGMR3QueryString (pFlags, szPropName, szPropFlags, sizeof(szPropFlags));
+            uint32_t fFlags;
+            CFGMR3QueryU32 (pFlags, szPropName, &fFlags);
+            writeFlags(fFlags, szPropFlags);
             CFGMR3QueryU64 (pTimestamps, szPropName, &u64Timestamp);
             Bstr(szPropName).cloneTo(&names[iProp]);

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1813 +1813 @@
             for (size_t i = 0; i < cProps; ++i)
             {
-                rc = CFGMR3InsertString(pValues, Utf8Str(names[i]).raw(), Utf8Str(values[i]).raw()); RC_CHECK();
-                rc = CFGMR3InsertInteger(pTimestamps, Utf8Str(names[i]).raw(), timestamps[i]);           RC_CHECK();
-                rc = CFGMR3InsertString(pFlags, Utf8Str(names[i]).raw(), Utf8Str(flags[i]).raw());   RC_CHECK();
+                rc = CFGMR3InsertString(pValues, Utf8Str(names[i]).raw(), Utf8Str(values[i]).raw());    RC_CHECK();
+                rc = CFGMR3InsertInteger(pTimestamps, Utf8Str(names[i]).raw(), timestamps[i]);          RC_CHECK();
+                uint32_t fFlags;
+                rc = guestProp::validateFlags(Utf8Str(flags[i]).raw(), &fFlags);
+                AssertLogRelRCReturn(rc, VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                    N_("Guest property '%lS' has invalid flags '%lS' in machine definition file"),
+                       names[i], flags[i]));
+                rc = CFGMR3InsertInteger(pFlags, Utf8Str(names[i]).raw(), fFlags);                      RC_CHECK();
             }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2804 +2804 @@
         return E_INVALIDARG;
 
-    /* For now there are no valid flags, so check this. */
-    if (aFlags != NULL)
-        for (size_t i = 0; aFlags[i] != '\0'; ++i)
-            if (aFlags[i] != ' ')
-                return E_INVALIDARG;
-
     AutoCaller autoCaller (this);
     CheckComRCReturnRC (autoCaller.rc());