Changeset 27703 in vbox

Timestamp:

Mar 25, 2010 1:17:01 PM (15 years ago)

Author:

vboxsync

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

59304

Message:

Guest Control: Update (VBoxManage, Main, Host Service, VbglR3), not enabled by default.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/Makefile.kmk (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/Makefile.kmk (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManage.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/HostServices/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/GuestImpl.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/GuestImpl.h (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -508 +508 @@
 # endif /* VBOX_WITH_GUEST_PROPS defined */
 
+# ifdef VBOX_WITH_GUEST_CONTROL
 /** @name Guest control
  * @{ */
 VBGLR3DECL(int)     VbglR3GuestCtrlConnect(uint32_t *pu32ClientId);
 VBGLR3DECL(int)     VbglR3GuestCtrlDisconnect(uint32_t u32ClientId);
-/** @}  */
+VBGLR3DECL(int)     VbglR3GuestCtrlGetHostMsg(uint32_t u32ClientId, uint32_t *pMsg, void **ppvData, uint32_t *pcbData);
+/** @}  */
+# endif /* VBOX_WITH_GUEST_CONTROL defined */
 
 /** @name User credentials handling

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -91 +91 @@
 VBoxGuestR3Lib_DEFS        = \
         VBOX_WITH_HGCM \
-        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
+        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
+        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,)
 VBoxGuestR3Lib_SOURCES     = \
         VBoxGuestR3Lib.cpp \

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -42 +42 @@
  endif
 ifdef VBOX_WITH_GUEST_CONTROL
- if1of ($(KBUILD_TARGET), win)
-  VBoxService_DEFS       += VBOXSERVICE_CONTROL
- endif
+  VBoxService_DEFS       += VBOX_WITH_GUEST_CONTROL
 endif
 endif
@@ -58 +56 @@
         VBoxServiceStats.cpp
 ifdef VBOX_WITH_GUEST_CONTROL
- if1of ($(KBUILD_TARGET), win)
-  VBoxService_SOURCES    += \
+ VBoxService_SOURCES    += \
         VBoxServiceControl.cpp
- endif
 endif
 ifdef VBOX_WITH_GUEST_PROPS

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

@@ -45 +45 @@
         $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
+        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
         $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API)
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
@@ -63 +64 @@
         VBoxManageDisk.cpp \
         $(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
+        $(if $(VBOX_WITH_GUEST_CONTROL),VBoxManageGuestCtrl.cpp) \
         VBoxManageHelp.cpp \
         VBoxManageHostonly.cpp \

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

@@ -385 +385 @@
         { "guestproperty",    handleGuestProperty },
 #endif
+#ifdef VBOX_WITH_GUEST_CONTROL
+        { "guestcontrol",     handleGuestControl },
+#endif
         { "metrics",          handleMetrics },
         { "import",           handleImportAppliance },

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

@@ -94 +94 @@
 #define USAGE_STORAGEATTACH         RT_BIT_64(49)
 #define USAGE_STORAGECONTROLLER     RT_BIT_64(50)
+#ifdef VBOX_WITH_GUEST_CONTROL
+#define USAGE_GUESTCONTROL          RT_BIT_64(51)
+#endif  /* VBOX_WITH_GUEST_CONTROL defined */
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */
@@ -168 +171 @@
 #ifndef VBOX_ONLY_DOCS
 extern int handleGuestProperty(HandlerArg *a);
+
+/* VBoxManageGuestCtrl.cpp */
+extern int handleGuestControl(HandlerArg *a);
+extern void usageGuestControl(void);
 
 /* VBoxManageVMInfo.cpp */

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

@@ -588 +588 @@
 #endif /* VBOX_WITH_GUEST_PROPS defined */
 
+#ifdef VBOX_WITH_GUEST_CONTROL
+    if (u64Cmd & USAGE_GUESTCONTROL)
+        usageGuestControl();
+#endif /* VBOX_WITH_GUEST_CONTROL defined */
+
     if (u64Cmd & USAGE_METRICS)
     {

trunk/src/VBox/HostServices/Makefile.kmk

@@ -40 +40 @@
  include $(PATH_SUB_CURRENT)/GuestProperties/Makefile.kmk
 endif
+ifdef VBOX_WITH_GUEST_CTRL
+ include $(PATH_SUB_CURRENT)/GuestControl/Makefile.kmk
+endif
 ifdef VBOX_WITH_GUEST_CONTROL
  include $(PATH_SUB_CURRENT)/GuestControl/Makefile.kmk

trunk/src/VBox/Main/GuestImpl.cpp

@@ -308 +308 @@
 }
 
+STDMETHODIMP Guest::ExecuteProgram(IN_BSTR aExecName, ULONG aFlags, 
+                                   ComSafeArrayIn(BSTR, aArguments), ComSafeArrayIn(BSTR, aEnvironment), 
+                                   IN_BSTR aStdIn, IN_BSTR aStdOut, IN_BSTR aStdErr,
+                                   IN_BSTR aUserName, IN_BSTR aPassword, 
+                                   ULONG aTimeoutMS, ULONG* aPID)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else  /* VBOX_WITH_GUEST_CONTROL */
+    return E_NOTIMPL;
+#endif
+}
+
 // public methods only for internal purposes
 /////////////////////////////////////////////////////////////////////////////

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

@@ -8457 +8457 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="d8556fca-81bc-12af-fca3-365528fa38ca"
+     uuid="9576d333-deb9-4c65-0f06-6a1eb6a833e7"
      wsmap="managed"
      >
@@ -8570 +8570 @@
         <desc>Statistics value</desc>
       </param>
+    </method>
+
+    <method name="executeProgram">
+      <desc>
+        Executes an existing program inside the guest VM.
+
+        <result name="E_NOTIMPL">
+          Not implemented yet.
+        </result>
+
+      </desc>
+      <param name="execName" type="wstring" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="flags" type="unsigned long" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="arguments" type="wstring" safearray="yes" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="environment" type="wstring" safearray="yes" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="stdIn" type="wstring" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="stdOut" type="wstring" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="stdErr" type="wstring" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="userName" type="wstring" dir="in">
+        <desc>Foobar</desc> 
+      </param>
+      <param name="password" type="wstring" dir="in">
+        <desc>Foobar</desc> 
+      </param>  
+      <param name="timeoutMS" type="unsigned long" dir="in">
+        <desc>Foobar</desc> 
+      </param>  
+      <param name="pid" type="unsigned long" dir="out">
+        <desc>Foobar</desc> 
+      </param>  
     </method>
 

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

@@ -72 +72 @@
                               IN_BSTR aDomain, BOOL aAllowInteractiveLogon);
     STDMETHOD(GetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG *aStatVal);
+    STDMETHOD(ExecuteProgram)(IN_BSTR aExecName, ULONG aFlags, 
+                              ComSafeArrayIn(BSTR, aArguments), ComSafeArrayIn(BSTR, aEnvironment),  
+                              IN_BSTR aStdIn, IN_BSTR aStdOut, IN_BSTR aStdErr,
+                              IN_BSTR aUserName, IN_BSTR aPassword, 
+                              ULONG aTimeoutMS, ULONG* aPID);
 
     // public methods that are not in IDL