Changeset 75955 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 4, 2018 9:08:55 PM (6 years ago)

Author:

vboxsync

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

127171

Message:

Main: Load VBoxGuestPropSvc from the VMMDev driver.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (4 diffs)
• VMMDev.h (modified) (2 diffs)

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

@@ -291 +291 @@
      *
      * @returns COM status code.
-     * @þaram   strCfg    The config for the disks.
-     *
-     * @note: One line in the config string contains all required data for one disk.
+     * @param   strCfg    The config for the disks.
+     *
+     * @note  One line in the config string contains all required data for one disk.
      *        The format for one disk is some sort of comma separated value using
      *        key=value pairs.
@@ -302 +302 @@
      */
     HRESULT i_setDiskEncryptionKeys(const Utf8Str &strCfg);
+
+
+#ifdef VBOX_WITH_GUEST_PROPS
+    // VMMDev needs:
+    HRESULT                     i_pullGuestProperties(ComSafeArrayOut(BSTR, names), ComSafeArrayOut(BSTR, values),
+                                                      ComSafeArrayOut(LONG64, timestamps), ComSafeArrayOut(BSTR, flags));
+    static DECLCALLBACK(int)    i_doGuestPropNotification(void *pvExtension, uint32_t, void *pvParms, uint32_t cbParms);
+#endif
 
 private:
@@ -739 +747 @@
                         bool fAttachDetach, bool fIgnoreConnectFailure);
     int i_configSerialPort(PCFGMNODE pInst, PortMode_T ePortMode, const char *pszPath, bool fServer);
-    static DECLCALLBACK(int) i_configGuestProperties(void *pvConsole);
     static DECLCALLBACK(void) i_vmstateChangeCallback(PUVM pUVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser);
     static DECLCALLBACK(int) i_unplugCpu(Console *pThis, PUVM pUVM, VMCPUID idCpu);
@@ -836 +843 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
-    static DECLCALLBACK(int)    i_doGuestPropNotification(void *pvExtension, uint32_t, void *pvParms, uint32_t cbParms);
     HRESULT                     i_doEnumerateGuestProperties(const Utf8Str &aPatterns,
                                                              std::vector<Utf8Str> &aNames,

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

@@ -59 +59 @@
     int hgcmLoadService (const char *pszServiceLibrary, const char *pszServiceName);
     int hgcmHostCall (const char *pszServiceName, uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms);
-#ifdef VBOX_WITH_CRHGSMI
+# ifdef VBOX_WITH_CRHGSMI
     int hgcmHostSvcHandleCreate (const char *pszServiceName, HGCMCVSHANDLE * phSvc);
     int hgcmHostSvcHandleDestroy (HGCMCVSHANDLE hSvc);
     int hgcmHostFastCallAsync (HGCMCVSHANDLE hSvc, uint32_t function, PVBOXHGCMSVCPARM pParm, PHGCMHOSTFASTCALLCB pfnCompletion, void *pvCompletion);
-#endif
+# endif
     void hgcmShutdown(bool fUvmIsInvalid = false);
 
@@ -70 +70 @@
 
 private:
+#ifdef VBOX_WITH_HGCM
+# ifdef VBOX_WITH_GUEST_PROPS
+    void i_guestPropSetMultiple(void *names, void *values, void *timestamps, void *flags);
+    void i_guestPropSet(const char *pszName, const char *pszValue, const char *pszFlags);
+    int  i_guestPropSetGlobalPropertyFlags(uint32_t fFlags);
+    int  i_guestPropLoadAndConfigure();
+# endif
+#endif
+
     static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);