Changeset 68575 in vbox

Timestamp:

Aug 31, 2017 12:10:54 PM (8 years ago)

Author:

vboxsync

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

117792

Message:

merging vbglioc r117751: OS/2 mouse driver related changes.

Location:

trunk/include/VBox

Files:

• VBoxGuest.h (modified) (5 diffs)
• VBoxGuest.inc (modified) (3 diffs)
• VBoxGuest.mac (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -142 +142 @@
 # define VBGL_IOCTL_CODE_STRIPPED(a_uIOCtl)         ((a_uIOCtl) & ~VBGL_IOCTL_FLAG_BIT_MASK)
 # define VBOXGUEST_DEVICE_NAME                      "\\Dev\\VBoxGst$"
+/** Short device name for AttachDD. */
+# define VBOXGUEST_DEVICE_NAME_SHORT                "VBoxGst$"
 
 #elif defined(RT_OS_SOLARIS)
@@ -915 +917 @@
  *          Some places it's called VBGOS2IDC to short things a bit.
  */
-typedef struct VBOXGUESTOS2IDCCONNECT
+typedef struct VBGLOS2ATTACHDD
 {
     /** VBGL_IOC_VERSION. */
@@ -971 +973 @@
      */
     RTFAR16 fpfnServiceAsmEP;
-} VBOXGUESTOS2IDCCONNECT;
+} VBGLOS2ATTACHDD;
 /** Pointer to VBOXGUESTOS2IDCCONNECT buffer. */
-typedef VBOXGUESTOS2IDCCONNECT RT_FAR *PVBOXGUESTOS2IDCCONNECT;
+typedef VBGLOS2ATTACHDD RT_FAR *PVBGLOS2ATTACHDD;
+
+/**
+ * Prototype for the 16-bit callback returned by AttachDD on OS/2.
+ * @param   pAttachInfo     Pointer to structure to fill in.
+ */
+typedef void (__cdecl RT_FAR_CODE *PFNVBGLOS2ATTACHDD)(PVBGLOS2ATTACHDD pAttachInfo);
 #endif /* RT_OS_OS2 */
 
@@ -1010 +1018 @@
         {
             /** The session handle (opaque). */
+#if ARCH_BITS >= 32
             void    RT_FAR *pvSession;
+#else
+            uint32_t        pvSession;
+#endif
             /** The version of the I/O control interface for this session
              * (typically VBGL_IOC_VERSION). */
@@ -1054 +1066 @@
         {
             /** The session handle for platforms where this is needed. */
+#if ARCH_BITS >= 32
             void RT_FAR *pvSession;
+#else
+            uint32_t     pvSession;
+#endif
         } In;
     } u;

trunk/include/VBox/VBoxGuest.inc

@@ -3 +3 @@
 ;
 
-;/*
-; Copyright (C) 2006-2015 Oracle Corporation
+;
+; Copyright (C) 2006-2017 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 ; terms and conditions of either the GPL or the CDDL or both.
 ;
-; */
+;
 
 
 ;; ASSUMES OS/2 for now.
-VBOXGUEST_DEVICE_NAME   EQU     "VBoxGst$"
+VBOXGUEST_DEVICE_NAME_SHORT EQU "VBoxGst$"
 
-
-;; aka VBOXGUESTOS2IDCCONNECT
-VBGOS2IDC STRUC
+VBGLOS2ATTACHDD STRUC
 u32Version         DD ?
 u32Session         DD ?
@@ -37 +35 @@
 fpfnServiceEP      DD ?
 fpfnServiceAsmEP   DD ?
-VBGOS2IDC ENDS
+VBGLOS2ATTACHDD ENDS
 
+VBGLREQHDR STRUC
+cbIn               DD ?
+uVersion           DD ?
+uType              DD ?
+rc                 DD ?
+cbOut              DD ?
+uReserved          DD ?
+VBGLREQHDR ENDS
+
+VBGL_IOC_VERSION        EQU     000010000h
 
 ; From VMMDev.h

trunk/include/VBox/VBoxGuest.mac

@@ -29 +29 @@
 
 %ifdef RT_OS_OS2
-%define VBOXGUEST_DEVICE_NAME   "vboxgst$"
+%define VBOXGUEST_DEVICE_NAME_SHORT "vboxgst$"
 
-;; aka VBOXGUESTOS2IDCCONNECT
-struc VBGOS2IDC
+struc VBGLOS2ATTACHDD
     .u32Version         resd 1
     .u32Session         resd 1