Changeset 10000 in vbox

Timestamp:

Jun 27, 2008 2:56:59 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

32453

Message:

Pure naming change for the guest property store stuff. Functionality is unchanged.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (6 diffs)
• Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (3 diffs)
• Main/MachineImpl.cpp (modified) (6 diffs)
• Main/idl/VirtualBox.xidl (modified) (6 diffs)
• Main/include/ConsoleImpl.h (modified) (1 diff)
• Main/include/MachineImpl.h (modified) (1 diff)

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

@@ -649 +649 @@
     }
 
-    if (u64Cmd & USAGE_GETCONFIGVAL)
-    {
-        RTPrintf("VBoxManage getconfigval     <vmname>|<uuid> <key>\n"
+    if (u64Cmd & USAGE_GETGUESTPROPERTY)
+    {
+        RTPrintf("VBoxManage getguestproperty <vmname>|<uuid> <key>\n"
                  "\n");
     }
 
-    if (u64Cmd & USAGE_SETCONFIGVAL)
-    {
-        RTPrintf("VBoxManage setconfigval     <vmname>|<uuid> <key>\n"
+    if (u64Cmd & USAGE_SETGUESTPROPERTY)
+    {
+        RTPrintf("VBoxManage setguestproperty <vmname>|<uuid> <key>\n"
                  "                            [<value>] (no value deletes key)\n"
                  "\n");
@@ -7470 +7470 @@
 }
 
-static int handleGetConfigVal(int argc, char *argv[],
-                            ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)
+static int handleGetGuestProperty(int argc, char *argv[],
+                                  ComPtr<IVirtualBox> virtualBox,
+                                  ComPtr<ISession> session)
 {
     HRESULT rc = S_OK;
 
     if (argc != 2)
-        return errorSyntax(USAGE_GETCONFIGVAL, "Incorrect number of parameters");
+        return errorSyntax(USAGE_GETGUESTPROPERTY, "Incorrect number of parameters");
 
     ComPtr<IMachine> machine;
@@ -7512 +7513 @@
         {
             Bstr value;
-            CHECK_ERROR(machine, GetConfigRegistryValue(Bstr(argv[1]), value.asOutParam()));
+            CHECK_ERROR(machine, GetGuestProperty(Bstr(argv[1]), value.asOutParam()));
             if (value)
                 RTPrintf("Value: %lS\n", value.raw());
@@ -7522 +7523 @@
 }
 
-static int handleSetConfigVal(int argc, char *argv[],
-                              ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)
+static int handleSetGuestProperty(int argc, char *argv[],
+                                  ComPtr<IVirtualBox> virtualBox,
+                                  ComPtr<ISession> session)
 {
     HRESULT rc = S_OK;
 
     if (argc < 2)
-        return errorSyntax(USAGE_SETCONFIGVAL, "Not enough parameters");
+        return errorSyntax(USAGE_SETGUESTPROPERTY, "Not enough parameters");
 
     ComPtr<IMachine> machine;
@@ -7541 +7543 @@
     {
         if (argc < 3)
-            CHECK_ERROR(machine, SetConfigRegistryValue(Bstr(argv[1]), NULL));
+            CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), NULL));
         else if (argc == 3)
-            CHECK_ERROR(machine, SetConfigRegistryValue(Bstr(argv[1]), Bstr(argv[2])));
+            CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), Bstr(argv[2])));
         else
-            return errorSyntax(USAGE_SETCONFIGVAL, "Too many parameters");
+            return errorSyntax(USAGE_SETGUESTPROPERTY, "Too many parameters");
     }
     return SUCCEEDED(rc) ? 0 : 1;
@@ -7884 +7886 @@
         { "sharedfolder",     handleSharedFolder },
         { "vmstatistics",     handleVMStatistics },
-        { "getconfigval",     handleGetConfigVal },
-        { "setconfigval",     handleSetConfigVal },
+        { "getguestproperty", handleGetGuestProperty },
+        { "setguestproperty", handleSetGuestProperty },
         { NULL,               NULL }
     };

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -70 +70 @@
 #define USAGE_MODUNINSTALL          RT_BIT_64(38)
 #define USAGE_RENAMEVMDK            RT_BIT_64(39)
-#define USAGE_GETCONFIGVAL          RT_BIT_64(40)
-#define USAGE_SETCONFIGVAL          RT_BIT_64(41)
+#define USAGE_GETGUESTPROPERTY      RT_BIT_64(40)
+#define USAGE_SETGUESTPROPERTY      RT_BIT_64(41)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2487 +2487 @@
 }
 
-STDMETHODIMP Console::GetConfigRegistryValue (INPTR BSTR aKey, BSTR *aValue)
+STDMETHODIMP Console::GetGuestProperty (INPTR BSTR aKey, BSTR *aValue)
 {
     if (!VALID_PTR(aValue))
@@ -2527 +2527 @@
 }
 
-STDMETHODIMP Console::SetConfigRegistryValue (INPTR BSTR aKey, INPTR BSTR aValue)
+STDMETHODIMP Console::SetGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue)
 {
 #ifndef VBOX_WITH_INFO_SVC
@@ -4132 +4132 @@
     }
 # ifdef VBOX_WITH_INFO_SVC
-    /* Save all guest/host configuration registry entries to the machine XML
+    /* Save all guest/host property store entries to the machine XML
      * file as extra data. */
     PCFGMNODE pRegistry = CFGMR3GetChild (CFGMR3GetRoot (mpVM), "Guest/Registry/");

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2679 +2679 @@
 
 /**
- * Read a value from the host/guest configuration registry.  If a session is
+ * Read a value from the host/guest property store.  If a session is
  * currently open for the guest then query the console object for the value,
- * since the current values of the registry will be held in RAM in the
+ * since the current values of the property store will be held in RAM in the
  * session.  Otherwise read the value from machine extra data, where it is
  * stored between sessions.
@@ -2691 +2691 @@
  *       way) between open and closed.
  */
-STDMETHODIMP Machine::GetConfigRegistryValue (INPTR BSTR aKey, BSTR *aValue)
+STDMETHODIMP Machine::GetGuestProperty (INPTR BSTR aKey, BSTR *aValue)
 {
     if (!VALID_PTR(aValue))
@@ -2736 +2736 @@
             {
                 ComAssertRet (!console.isNull(), E_FAIL);
-                hrc = console->GetConfigRegistryValue (aKey, aValue);
+                hrc = console->GetGuestProperty (aKey, aValue);
             }
             break;
@@ -2750 +2750 @@
 
 /**
- * Write a value to the host/guest configuration registry.  If a session is
+ * Write a value to the host/guest property store.  If a session is
  * currently open for the guest then query the console object for the value,
- * since the current values of the registry will be held in RAM in the
+ * since the current values of the property store will be held in RAM in the
  * session.  Otherwise read the value from machine extra data, where it is
  * stored between sessions.
@@ -2762 +2762 @@
  *       way) between open and closed.
  */
-STDMETHODIMP Machine::SetConfigRegistryValue (INPTR BSTR aKey, INPTR BSTR aValue)
+STDMETHODIMP Machine::SetGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue)
 {
 #ifndef VBOX_WITH_INFO_SVC
@@ -2804 +2804 @@
             {
                 ComAssertRet (!console.isNull(), E_FAIL);
-                hrc = console->SetConfigRegistryValue (aKey, aValue);
+                hrc = console->SetGuestProperty (aKey, aValue);
             }
             break;

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

@@ -1784 +1784 @@
         Returns associated global extra data.
 
-        If the reuqested data @a key does not exist, this function will
+        If the requested data @a key does not exist, this function will
         succeed and return @c NULL in the @a value argument.
       </desc>
@@ -1799 +1799 @@
         Sets associated global extra data.
 
-        If you pass @c NULL as a key @a vaule, the given @a key will be
+        If you pass @c NULL as a key @a value, the given @a key will be
         deleted.
 
@@ -3468 +3468 @@
     </method>
 
-    <method name="getConfigRegistryValue">
-      <desc>
-        Reads a value from the machine's host/guest configuration registry.
+    <method name="getGuestProperty">
+      <desc>
+        Reads a value from the machine's host/guest property store.
       </desc>
       <param name="key" type="wstring" dir="in">
@@ -3485 +3485 @@
     </method>
 
-    <method name="setConfigRegistryValue">
+    <method name="setGuestProperty">
       <desc>
         Sets, changes or deletes a value in the machine's host/guest
-        configuration registry.
+        property store.
       </desc>
       <param name="key" type="wstring" dir="in">
@@ -4588 +4588 @@
     </method>
 
-    <method name="getConfigRegistryValue">
-      <desc>
-        Reads a value from the host/guest configuration registry.
+    <method name="getGuestProperty">
+      <desc>
+        Reads a value from the host/guest property store.
       </desc>
       <param name="key" type="wstring" dir="in">
@@ -4605 +4605 @@
     </method>
 
-    <method name="setConfigRegistryValue">
-      <desc>
-        Sets, changes or deletes a value in the host/guest configuration
-        registry.
+    <method name="setGuestProperty">
+      <desc>
+        Sets, changes or deletes a value in the host/guest property store.
       </desc>
       <param name="key" type="wstring" dir="in">

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

@@ -148 +148 @@
     STDMETHOD(RegisterCallback) (IConsoleCallback *aCallback);
     STDMETHOD(UnregisterCallback)(IConsoleCallback *aCallback);
-    STDMETHOD(GetConfigRegistryValue)(INPTR BSTR aKey, BSTR *aValue);
-    STDMETHOD(SetConfigRegistryValue)(INPTR BSTR aKey, INPTR BSTR aValue);
+    STDMETHOD(GetGuestProperty)(INPTR BSTR aKey, BSTR *aValue);
+    STDMETHOD(SetGuestProperty)(INPTR BSTR aKey, INPTR BSTR aValue);
 
     // public methods for internal purposes only

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

@@ -527 +527 @@
     STDMETHOD(CanShowConsoleWindow) (BOOL *aCanShow);
     STDMETHOD(ShowConsoleWindow) (ULONG64 *aWinId);
-    STDMETHOD(GetConfigRegistryValue) (INPTR BSTR aKey, BSTR *aValue);
-    STDMETHOD(SetConfigRegistryValue) (INPTR BSTR aKey, INPTR BSTR aValue);
+    STDMETHOD(GetGuestProperty) (INPTR BSTR aKey, BSTR *aValue);
+    STDMETHOD(SetGuestProperty) (INPTR BSTR aKey, INPTR BSTR aValue);
 
     STDMETHOD(GetProcessorUsage) (ULONG *user, ULONG *system);