Changeset 68103 in vbox for trunk

Timestamp:

Jul 25, 2017 9:39:16 AM (7 years ago)

Author:

vboxsync

Message:

R0 guest library: make vbglR0HGCMInit and Terminate externally visible.

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
So that the Linux shared folder code can call vbglR0HGCMInit and Terminate
directly in future without neediing to call the guest library initialisation,
make these symbols externally visible and make the first letter of the names
capital to reflect this.

Signed-off-by: Hans de Goede <hdegoede@…>
Reworked by Oracle.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/Init.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -286 +286 @@
  * @{
  */
+
+/**
+ * Initializes HGCM in the R0 guest library.  Must be called before any HGCM
+ * connections are made.  Is called by VbglInitClient().
+ *
+ * @return VBox status code.
+ */
+DECLVBGL(int) VbglR0HGCMInit(void);
+
+/**
+ * Terminates HGCM in the R0 guest library.  Is called by VbglTerminate().
+ *
+ * @return VBox status code.
+ */
+DECLVBGL(int) VbglR0HGCMTerminate(void);
 
 /**

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp

@@ -55 +55 @@
  * @return VBox status code.
  */
-int vbglR0HGCMInit(void)
+DECLVBGL(int) VbglR0HGCMInit(void)
 {
     AssertReturn(mutexHGCMHandle == NIL_RTSEMFASTMUTEX, VINF_ALREADY_INITIALIZED);
@@ -66 +66 @@
  * @return VBox status code.
  */
-int vbglR0HGCMTerminate(void)
+DECLVBGL(int) VbglR0HGCMTerminate(void)
 {
     RTSemFastMutexDestroy(mutexHGCMHandle);

trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp

@@ -255 +255 @@
 
 # ifdef VBOX_WITH_HGCM
-            rc = vbglR0HGCMInit ();
+            rc = VbglR0HGCMInit ();
 # endif /* VBOX_WITH_HGCM */
 
@@ -278 +278 @@
 {
 # ifdef VBOX_WITH_HGCM
-    vbglR0HGCMTerminate ();
+    VbglR0HGCMTerminate ();
 # endif
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h

@@ -139 +139 @@
 
 #ifdef VBOX_WITH_HGCM
-# ifndef VBGL_VBOXGUEST
-int                         vbglR0HGCMInit(void);
-int                         vbglR0HGCMTerminate(void);
-# endif
 struct VBGLHGCMHANDLEDATA  *vbglHGCMHandleAlloc(void);
 void                        vbglHGCMHandleFree(struct VBGLHGCMHANDLEDATA *pHandle);