Changeset 41852 in vbox for trunk/include/VBox

Timestamp:

Jun 20, 2012 3:59:57 PM (13 years ago)

Author:

vboxsync

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

78687

Message:

Additions/common and solaris/vboxmouse: large code drop.

Location:

trunk/include/VBox

Files:

• VBoxGuest.h (modified) (2 diffs)
• VBoxGuestLib.h (modified) (3 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -364 +364 @@
 #define VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK   VBOXGUEST_IOCTL_CODE_(31, sizeof(VBoxGuestMouseSetNotifyCallback))
 
+typedef DECLCALLBACK(void) FNVBOXGUESTMOUSENOTIFY(void *pfnUser);
+typedef FNVBOXGUESTMOUSENOTIFY *PFNVBOXGUESTMOUSENOTIFY;
+
 /** Input buffer for VBOXGUEST_IOCTL_INTERNAL_SET_MOUSE_NOTIFY_CALLBACK. */
 typedef struct VBoxGuestMouseSetNotifyCallback
@@ -372 +375 @@
      * @param   pvUser      The callback argument.
      */
-    DECLR0CALLBACKMEMBER(void,  pfnNotify, (void *pvUser));
+    PFNVBOXGUESTMOUSENOTIFY      pfnNotify;
     /** The callback argument*/
     void                       *pvUser;

trunk/include/VBox/VBoxGuestLib.h

@@ -31 +31 @@
 #include <VBox/VMMDev.h>     /* grumble */
 #ifdef IN_RING0
+# include <VBox/VBoxGuest.h>
 # include <VBox/VBoxGuest2.h>
 #endif
@@ -111 +112 @@
  */
 DECLVBGL(int) VbglInit (void);
+
+/**
+ * Check whether the main VBoxGuest driver is loaded.  (The load order of guest
+ * drivers is not guaranteed on all platforms.)
+ */
+DECLVBGL(bool) VbglIsReady(void);
 
 # endif
@@ -392 +399 @@
 DECLVBGL(int) VbglQueryVMMDevMemory (VMMDevMemory **ppVMMDevMemory);
 DECLR0VBGL(bool) VbglR0CanUsePhysPageList(void);
+
+# ifndef VBOX_GUEST
+/** @name Mouse
+ * @{ */
+DECLVBGL(int)     VbglSetMouseNotifyCallback(PFNVBOXGUESTMOUSENOTIFY pfnNotify, void *pvUser);
+DECLVBGL(int)     VbglGetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_t *py);
+DECLVBGL(int)     VbglSetMouseStatus(uint32_t fFeatures);
+/** @}  */
+# endif /* VBOX_GUEST */
 
 #endif /* IN_RING0 && !IN_RING0_AGNOSTIC */