Changeset 10220 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 4, 2008 12:19:35 PM (17 years ago)

Author:

vboxsync

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

32808

Message:

Frontends/VBoxManage: reverted r32673, which was wrong, and added missing ifdefs

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManage.cpp (modified) (6 diffs)
• VBoxManage.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -35 +35 @@
                          $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
                          $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
-                         $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,)
+                         $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \
+                         $(if $(VBOX_WITH_INFO_SVC),VBOX_WITH_INFO_SVC,)
 VBoxManage_DEFS.win    = _WIN32_WINNT=0x0500
 VBoxManage_SOURCES     = \

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

@@ -649 +649 @@
     }
 
+#ifdef VBOX_WITH_INFO_SVC
     if (u64Cmd & USAGE_GETGUESTPROPERTY)
     {
@@ -661 +662 @@
                  "\n");
     }
+#endif /* VBOX_WITH_INFO_SVC defined */
 
 }
@@ -7478 +7480 @@
 }
 
+#ifdef VBOX_WITH_INFO_SVC
 static int handleGetGuestProperty(int argc, char *argv[],
                                   ComPtr<IVirtualBox> virtualBox,
@@ -7497 +7500 @@
     if (machine)
     {
-        /** @todo r=bird: Why do you do this? argv was converted down in main (around line 7812). */
-        char *pszKey = NULL;
-        int rrc = RTStrCurrentCPToUtf8(&pszKey, argv[1]);
-        if (RT_SUCCESS(rrc))
-        {
-            Bstr value;
-            CHECK_ERROR(machine, GetGuestProperty(Bstr(pszKey), value.asOutParam()));
-            if (value)
-                RTPrintf("Value: %lS\n", value.raw());
-            else
-                RTPrintf("No value set!\n");
-            RTStrFree(pszKey);
-        }
+        Bstr value;
+        CHECK_ERROR(machine, GetGuestProperty(Bstr(argv[1]), value.asOutParam()));
+        if (value)
+            RTPrintf("Value: %lS\n", value.raw());
         else
-            rc = E_INVALIDARG;
+            RTPrintf("No value set!\n");
     }
     return SUCCEEDED(rc) ? 0 : 1;
@@ -7535 +7529 @@
     if (machine)
     {
-        /** @todo r=bird: Why do you do this? argv was converted down in main (around line 7812). */
-        char *pszKey = NULL;
-        int rrc = RTStrCurrentCPToUtf8(&pszKey, argv[1]);
-        if (RT_SUCCESS(rrc))
-        {
-            if (argc < 3)
-                CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), NULL));
-            else if (argc == 3)
-            {
-                char *pszValue = NULL;
-                rrc = RTStrCurrentCPToUtf8(&pszKey, argv[1]);
-                if (RT_SUCCESS(rrc))
-                    CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), Bstr(argv[2])));
-                else
-                    rc = E_INVALIDARG;
-                RTStrFree(pszValue);
-            }
-            else
-                return errorSyntax(USAGE_SETGUESTPROPERTY, "Too many parameters");
-            RTStrFree(pszKey);
-        }
+        if (argc < 3)
+            CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), NULL));
+        else if (argc == 3)
+            CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), Bstr(argv[2])));
         else
-            rc = E_INVALIDARG;
+            return errorSyntax(USAGE_SETGUESTPROPERTY, "Too many parameters");
     }
     return SUCCEEDED(rc) ? 0 : 1;
 }
+#endif /* VBOX_WITH_INFO_SVC defined */
 
 enum ConvertSettings
@@ -7896 +7874 @@
         { "sharedfolder",     handleSharedFolder },
         { "vmstatistics",     handleVMStatistics },
+#ifdef VBOX_WITH_INFO_SVC
         { "getguestproperty", handleGetGuestProperty },
         { "setguestproperty", handleSetGuestProperty },
+#endif /* VBOX_WITH_INFO_SVC defined */
         { 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)
+#ifdef VBOX_WITH_INFO_SVC
 #define USAGE_GETGUESTPROPERTY      RT_BIT_64(40)
 #define USAGE_SETGUESTPROPERTY      RT_BIT_64(41)
+#endif  /* VBOX_WITH_INFO_SVC defined */
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */