Changeset 10220
- Timestamp:
- 07/04/08 14:19:35 (2 months ago)
- Files:
-
- trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
- trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (6 diffs)
- trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk
r10058 r10220 35 35 $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \ 36 36 $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \ 37 $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) 37 $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \ 38 $(if $(VBOX_WITH_INFO_SVC),VBOX_WITH_INFO_SVC,) 38 39 VBoxManage_DEFS.win = _WIN32_WINNT=0x0500 39 40 VBoxManage_SOURCES = \ trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
r10178 r10220 649 649 } 650 650 651 #ifdef VBOX_WITH_INFO_SVC 651 652 if (u64Cmd & USAGE_GETGUESTPROPERTY) 652 653 { … … 661 662 "\n"); 662 663 } 664 #endif /* VBOX_WITH_INFO_SVC defined */ 663 665 664 666 } … … 7478 7480 } 7479 7481 7482 #ifdef VBOX_WITH_INFO_SVC 7480 7483 static int handleGetGuestProperty(int argc, char *argv[], 7481 7484 ComPtr<IVirtualBox> virtualBox, … … 7497 7500 if (machine) 7498 7501 { 7499 /** @todo r=bird: Why do you do this? argv was converted down in main (around line 7812). */ 7500 char *pszKey = NULL; 7501 int rrc = RTStrCurrentCPToUtf8(&pszKey, argv[1]); 7502 if (RT_SUCCESS(rrc)) 7503 { 7504 Bstr value; 7505 CHECK_ERROR(machine, GetGuestProperty(Bstr(pszKey), value.asOutParam())); 7506 if (value) 7507 RTPrintf("Value: %lS\n", value.raw()); 7508 else 7509 RTPrintf("No value set!\n"); 7510 RTStrFree(pszKey); 7511 } 7502 Bstr value; 7503 CHECK_ERROR(machine, GetGuestProperty(Bstr(argv[1]), value.asOutParam())); 7504 if (value) 7505 RTPrintf("Value: %lS\n", value.raw()); 7512 7506 else 7513 rc = E_INVALIDARG;7507 RTPrintf("No value set!\n"); 7514 7508 } 7515 7509 return SUCCEEDED(rc) ? 0 : 1; … … 7535 7529 if (machine) 7536 7530 { 7537 /** @todo r=bird: Why do you do this? argv was converted down in main (around line 7812). */ 7538 char *pszKey = NULL; 7539 int rrc = RTStrCurrentCPToUtf8(&pszKey, argv[1]); 7540 if (RT_SUCCESS(rrc)) 7541 { 7542 if (argc < 3) 7543 CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), NULL)); 7544 else if (argc == 3) 7545 { 7546 char *pszValue = NULL; 7547 rrc = RTStrCurrentCPToUtf8(&pszKey, argv[1]); 7548 if (RT_SUCCESS(rrc)) 7549 CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), Bstr(argv[2]))); 7550 else 7551 rc = E_INVALIDARG; 7552 RTStrFree(pszValue); 7553 } 7554 else 7555 return errorSyntax(USAGE_SETGUESTPROPERTY, "Too many parameters"); 7556 RTStrFree(pszKey); 7557 } 7531 if (argc < 3) 7532 CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), NULL)); 7533 else if (argc == 3) 7534 CHECK_ERROR(machine, SetGuestProperty(Bstr(argv[1]), Bstr(argv[2]))); 7558 7535 else 7559 r c = E_INVALIDARG;7536 return errorSyntax(USAGE_SETGUESTPROPERTY, "Too many parameters"); 7560 7537 } 7561 7538 return SUCCEEDED(rc) ? 0 : 1; 7562 7539 } 7540 #endif /* VBOX_WITH_INFO_SVC defined */ 7563 7541 7564 7542 enum ConvertSettings … … 7896 7874 { "sharedfolder", handleSharedFolder }, 7897 7875 { "vmstatistics", handleVMStatistics }, 7876 #ifdef VBOX_WITH_INFO_SVC 7898 7877 { "getguestproperty", handleGetGuestProperty }, 7899 7878 { "setguestproperty", handleSetGuestProperty }, 7879 #endif /* VBOX_WITH_INFO_SVC defined */ 7900 7880 { NULL, NULL } 7901 7881 }; trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h
r10000 r10220 70 70 #define USAGE_MODUNINSTALL RT_BIT_64(38) 71 71 #define USAGE_RENAMEVMDK RT_BIT_64(39) 72 #ifdef VBOX_WITH_INFO_SVC 72 73 #define USAGE_GETGUESTPROPERTY RT_BIT_64(40) 73 74 #define USAGE_SETGUESTPROPERTY RT_BIT_64(41) 75 #endif /* VBOX_WITH_INFO_SVC defined */ 74 76 #define USAGE_ALL (~(uint64_t)0) 75 77 /** @} */
