Changeset 17858 in vbox

Timestamp:

Mar 13, 2009 9:51:35 PM (16 years ago)

Author:

vboxsync

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

44409

Message:

Additions/common/VBoxGuestLib: add support for the new user guest device to the R3 guest library

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (4 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (6 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -65 +65 @@
 /** The support device name. */
 # define VBOXGUEST_DEVICE_NAME        "/dev/vboxadd"
+# define VBOXGUEST_USER_DEVICE_NAME   "/dev/vboxuser"
 
 #elif defined(RT_OS_OS2)
 /** The support device name. */
 # define VBOXGUEST_DEVICE_NAME        "\\Dev\\VBoxGst$"
+# define VBOXGUEST_USER_DEVICE_NAME   "\\Dev\\VBoxGst$"
 
 #elif defined(RT_OS_SOLARIS)
 /** The support device name. */
 # define VBOXGUEST_DEVICE_NAME        "/dev/vboxguest"
+# define VBOXGUEST_USER_DEVICE_NAME   "/dev/vboxguest"
 
 #elif defined(RT_OS_WINDOWS)
@@ -79 +82 @@
 /** Win32 Device name. */
 # define VBOXGUEST_DEVICE_NAME        "\\\\.\\VBoxGuest"
+# define VBOXGUEST_USER_DEVICE_NAME   "\\\\.\\VBoxGuest"
 /** Global name for Win2k+ */
 # define VBOXGUEST_DEVICE_NAME_GLOBAL "\\\\.\\Global\\VBoxGuest"
@@ -89 +93 @@
 /** The support device name. */
 # define VBOXGUEST_DEVICE_NAME        "/dev/vboxguest"
+# define VBOXGUEST_USER_DEVICE_NAME   "/dev/vboxguest"
 
 #else
@@ -1656 +1661 @@
 __BEGIN_DECLS
 VBGLR3DECL(int)     VbglR3Init(void);
+VBGLR3DECL(int)     VbglR3InitUser(void);
 VBGLR3DECL(void)    VbglR3Term(void);
 # ifdef ___iprt_time_h

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

@@ -78 +78 @@
 
 
+static int vbglR3Init(char *pszDeviceName);
+
+/**
+ * Open the VBox R3 Guest Library.  This should be called by system daemons
+ * and processes.
+ */
 VBGLR3DECL(int) VbglR3Init(void)
+{
+    return vbglR3Init(VBOXGUEST_DEVICE_NAME);
+}
+
+/**
+ * Open the VBox R3 Guest Library.  Equivalent to VbglR3Init, but for user
+ * session processes.
+ */
+VBGLR3DECL(int) VbglR3InitUser(void)
+{
+    return vbglR3Init(VBOXGUEST_USER_DEVICE_NAME);
+}
+
+/**
+ * Implementation of VbglR3Init and VbglR3InitUser
+ */
+int vbglR3Init(char *pszDeviceName)
 {
     uint32_t cInits = ASMAtomicIncU32(&g_cInits);
@@ -115 +138 @@
      * and possible some other bits not availble thru iprt/file.h.
      */
-    HANDLE hFile = CreateFile(VBOXGUEST_DEVICE_NAME,
+    HANDLE hFile = CreateFile(pszDeviceName,
                               GENERIC_READ | GENERIC_WRITE,
                               FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -135 +158 @@
     HFILE hf = NULLHANDLE;
     ULONG ulAction = 0;
-    APIRET rc = DosOpen((PCSZ)VBOXGUEST_DEVICE_NAME, &hf, &ulAction, 0, FILE_NORMAL,
+    APIRET rc = DosOpen((PCSZ)pszDeviceName, &hf, &ulAction, 0, FILE_NORMAL,
                         OPEN_ACTION_OPEN_IF_EXISTS,
                         OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT | OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE,
@@ -188 +211 @@
 # endif
     int rc;
-    char szDevice[sizeof(VBOXGUEST_DEVICE_NAME) + 16];
+    char szDevice[RT_MAX(sizeof(VBOXGUEST_DEVICE_NAME),
+                         sizeof(VBOXGUEST_USER_DEVICE_NAME)) + 16];
     for (unsigned iUnit = 0; iUnit < 1024; iUnit++)
     {
-        RTStrPrintf(szDevice, sizeof(szDevice), VBOXGUEST_DEVICE_NAME "%d", iUnit);
+        RTStrPrintf(szDevice, sizeof(szDevice), pszDeviceName "%d", iUnit);
 # if defined(VBOX_VBGLR3_XFREE86)
         File = xf86open(szDevice, XF86_O_RDWR);
@@ -214 +238 @@
 
 #elif defined(VBOX_VBGLR3_XFREE86) && !defined(RT_OS_FREEBSD)
-    int File = xf86open(VBOXGUEST_DEVICE_NAME, XF86_O_RDWR);
+    int File = xf86open(pszDeviceName, XF86_O_RDWR);
     if (File == -1)
         return VERR_OPEN_FAILED;
@@ -223 +247 @@
     /* The default implemenation. (linux, solaris) */
     RTFILE File;
-    int rc = RTFileOpen(&File, VBOXGUEST_DEVICE_NAME, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    int rc = RTFileOpen(&File, pszDeviceName, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
         return rc;