Changeset 68570 in vbox

Timestamp:

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

Author:

vboxsync

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

117787

Message:

merging vbglioc r117736: OS/2 adjustments.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (7 diffs)
• include/VBox/VBoxGuest.mac (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp (modified) (5 diffs)
• src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm (modified) (6 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibIdc-os2.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -131 +131 @@
 # define VBGL_IOCTL_CATEGORY                        0xc2
 # define VBGL_IOCTL_CODE_SIZE(Function, Size)       ((unsigned char)(Function))
+# define VBGL_IOCTL_CODE_BIG(Function)              ((unsigned char)(Function))
 # define VBGL_IOCTL_CATEGORY_FAST                   0xc3 /**< Also defined in VBoxGuestA-os2.asm. */
 # define VBGL_IOCTL_CODE_FAST(Function)             ((unsigned char)(Function))
@@ -318 +319 @@
 } VBGLIOCDRIVERVERSIONINFO, *PVBGLIOCDRIVERVERSIONINFO;
 AssertCompileSize(VBGLIOCDRIVERVERSIONINFO, 24 + 20);
+#ifndef RT_OS_OS2 /* figure this one out... */
 AssertCompile(VBGL_IOCTL_DRIVER_VERSION_INFO_SIZE_IN == 24 + 16);
+#endif
 /** @} */
 
@@ -393 +396 @@
 } VBGLIOCHGCMCONNECT, *PVBGLIOCHGCMCONNECT;
 AssertCompileSize(VBGLIOCHGCMCONNECT, 24 + 132);
+#ifndef RT_OS_OS2 /* figure this one out... */
 AssertCompile(VBGL_IOCTL_HGCM_CONNECT_SIZE_OUT == 24 + 4);
+#endif
 /** @} */
 
@@ -906 +911 @@
 typedef struct VBOXGUESTOS2IDCCONNECT
 {
-    /** VMMDEV_VERSION. */
+    /** VBGL_IOC_VERSION. */
     uint32_t u32Version;
     /** Opaque session handle. */
@@ -915 +920 @@
      *
      * @returns VBox status code.
-     * @param   u32Session          The above session handle.
+     * @param   u32Session          The session handle (PVBOXGUESTSESSION).
      * @param   iFunction           The requested function.
-     * @param   pvData              The input/output data buffer. The caller ensures that this
-     *                              cannot be swapped out, or that it's acceptable to take a
-     *                              page in fault in the current context. If the request doesn't
-     *                              take input or produces output, apssing NULL is okay.
-     * @param   cbData              The size of the data buffer.
-     * @param   pcbDataReturned     Where to store the amount of data that's returned.
-     *                              This can be NULL if pvData is NULL.
-     * @todo fix parameters
+     * @param   pReqHdr             The input/output data buffer.  The caller
+     *                              ensures that this cannot be swapped out, or that
+     *                              it's acceptable to take a page in fault in the
+     *                              current context.  If the request doesn't take
+     *                              input or produces output, apssing NULL is okay.
+     * @param   cbReq               The size of the data buffer.
      */
-    DECLCALLBACKMEMBER(int, pfnServiceEP)(uint32_t u32Session, unsigned iFunction, void *pvData, size_t cbData, size_t *pcbDataReturned);
+    DECLCALLBACKMEMBER(int, pfnServiceEP)(uint32_t u32Session, unsigned iFunction, PVBGLREQHDR pReqHdr, size_t cbReq);
 
     /** The 16-bit service entry point for C code (cdecl).
@@ -936 +939 @@
      * int far cdecl
      * VBoxGuestOs2IDCService16(uint32_t u32Session, uint16_t iFunction,
-     *                          void far *fpvData, uint16_t cbData, uint16_t far *pcbDataReturned);
+     *                          PVBGLREQHDR fpvData, uint16_t cbData);
      * @endcode
      */
@@ -1010 +1013 @@
 } VBGLIOCIDCCONNECT, *PVBGLIOCIDCCONNECT;
 AssertCompileSize(VBGLIOCIDCCONNECT, 24 + 16 + ARCH_BITS / 8 * 2);
+#ifndef RT_OS_OS2 /* figure this one out... */
 AssertCompile(VBGL_IOCTL_IDC_CONNECT_SIZE_IN == 24 + 16);
+#endif
 #define VBGL_IOCTL_IDC_CONNECT_MAGIC_COOKIE         UINT32_C(0x55aa4d5a) /**< Magic value for doing an IDC connect. */
 /** @} */

trunk/include/VBox/VBoxGuest.mac

@@ -42 +42 @@
 %endif ; RT_OS_OS2
 
+struc VBGLREQHDR
+    .cbIn               resd 1
+    .uVersion           resd 1
+    .uType              resd 1
+    .rc                 resd 1
+    .cbOut              resd 1
+    .uReserved          resd 1
+endstruc
+
+%define VBGL_IOC_VERSION        000010000h
+
 ; From VMMDev.h
 %define VMMDEV_VERSION_MAJOR    1

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp

@@ -52 +52 @@
 #include "VBoxGuestInternal.h"
 #include <VBox/version.h>
+#include <iprt/assert.h>
 #include <iprt/initterm.h>
-#include <iprt/string.h>
-#include <iprt/spinlock.h>
-#include <iprt/process.h>
-#include <iprt/assert.h>
 #include <iprt/log.h>
 #include <iprt/memobj.h>
 #include <iprt/mem.h>
 #include <iprt/param.h>
+#include <iprt/process.h>
+#include <iprt/spinlock.h>
+#include <iprt/string.h>
 
 
@@ -466 +466 @@
  * @param   u32Session          The session handle (PVBOXGUESTSESSION).
  * @param   iFunction           The requested function.
- * @param   pvData              The input/output data buffer. The caller ensures that this
- *                              cannot be swapped out, or that it's acceptable to take a
- *                              page in fault in the current context. If the request doesn't
- *                              take input or produces output, apssing NULL is okay.
- * @param   cbData              The size of the data buffer.
- * @param   pcbDataReturned     Where to store the amount of data that's returned.
- *                              This can be NULL if pvData is NULL.
+ * @param   pReqHdr             The input/output data buffer.  The caller
+ *                              ensures that this cannot be swapped out, or that
+ *                              it's acceptable to take a page in fault in the
+ *                              current context.  If the request doesn't take
+ *                              input or produces output, apssing NULL is okay.
+ * @param   cbReq               The size of the data buffer.
  *
  * @remark  This is called from the 16-bit thunker as well as directly from the 32-bit clients.
  */
-DECLASM(int) VGDrvOS2IDCService(uint32_t u32Session, unsigned iFunction, void *pvData, size_t cbData, size_t *pcbDataReturned)
+DECLASM(int) VGDrvOS2IDCService(uint32_t u32Session, unsigned iFunction, PVBGLREQHDR pReqHdr, size_t cbReq)
 {
     PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)u32Session;
@@ -483 +482 @@
     AssertMsgReturn(pSession->pDevExt == &g_DevExt, ("%p != %p\n", pSession->pDevExt, &g_DevExt), VERR_INVALID_HANDLE);
 
-    int rc;
-    switch (iFunction)
-    {
-        default:
-            rc = VGDrvCommonIoCtl(iFunction, &g_DevExt, pSession, pvData, cbData, pcbDataReturned);
-            break;
-
-        case VBOXGUEST_IOCTL_OS2_IDC_DISCONNECT:
-            pSession->sfn = 0;
-            VGDrvCommonCloseSession(&g_DevExt, pSession);
-            rc = VINF_SUCCESS;
-            break;
-    }
-    return rc;
+    return VGDrvCommonIoCtl(iFunction, &g_DevExt, pSession, pReqHdr, cbReq);
 }
 
@@ -569 +555 @@
                  */
                 PVBGLREQHDR pReqHdr = (PVBGLREQHDR)pvParm;
-                rc = VGDrvCommonIoCtl(iFunction, &g_DevExt, pSession, pvParm, *pcbParm);
+                rc = VGDrvCommonIoCtl(iFunction, &g_DevExt, pSession, pReqHdr, *pcbParm);
 
                 /*
@@ -581 +567 @@
                 return rc;
             }
-            AssertFailedMsg(("KernVMLock(VMDHL_WRITE, %p, %#x, &p, NULL, NULL) -> %d\n", pvParm,*pcbParm,&ParmLock, rc));
+            AssertMsgFailed(("KernVMLock(VMDHL_WRITE, %p, %#x, &p, NULL, NULL) -> %d\n", pvParm, *pcbParm, &ParmLock, rc));
             return VERR_LOCK_FAILED;
         }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm

@@ -826 +826 @@
     movzx   ebx, word [ebp + 08h]
 
-    mov     dword [ebx + VBGOS2IDC.u32Version       ], VMMDEV_VERSION
+    mov     dword [ebx + VBGOS2IDC.u32Version       ], VBGL_IOC_VERSION
     mov     dword [ebx + VBGOS2IDC.u32Session       ], eax
     mov     dword [ebx + VBGOS2IDC.pfnServiceEP     ], NAME(VGDrvOS2IDCService)
@@ -867 +867 @@
 ; @param   u32Session          bp +  8h - The above session handle.
 ; @param   iFunction           bp + 0ch - The requested function.
-; @param   pvData              bp + 0eh - The input/output data buffer. The caller ensures that this
+; @param   fpReqHdr            bp + 0eh - The input/output data buffer. The caller ensures that this
 ;                                         cannot be swapped out, or that it's acceptable to take a
 ;                                         page in fault in the current context. If the request doesn't
 ;                                         take input or produces output, passing NULL is okay.
-; @param   cbData              bp + 12h - The size of the data buffer.
-; @param   pcbDataReturned     bp + 14h - Where to store the amount of data that's returned.
-;                                         This can be NULL if pvData is NULL.
-;
-; @cproto long far __cdecl VGDrvOS2IDCService16(uint32_t u32Session, uint16_t iFunction, void far *fpvData, uint16_t cbData, uint16_t far *pcbDataReturned);
+; @param   cbReq               bp + 12h - The size of the data buffer.
+;
+; @cproto long far __cdecl VGDrvOS2IDCService16(uint32_t u32Session, uint16_t iFunction, void far *fpReqHdr, uint16_t cbReq);
 ;
 GLOBALNAME VGDrvOS2IDCService16
@@ -897 +895 @@
     ; Create the call frame before switching.
     ;
-    push    dword 0                     ; esp + 14h:    &cbDataReturned (filled in after stack switch)
     movzx   ecx, word [bp + 12h]         
     push    ecx                         ; esp + 10h:    cbData
@@ -929 +926 @@
     call    KernThunkStackTo32
 
-    ; update the cbDataReturned pointer
-    lea     eax, [esp + 18h]
-    mov     [esp + 14h], eax
-
     ; call the C code (don't cleanup the stack).
     call    NAME(VGDrvOS2IDCService)
@@ -944 +937 @@
 segment CODE16
 GLOBALNAME VGDrvOS2IDCService16_16
-
-    ; Set *pcbDataReturned.
-    cmp     word [bp + 14h + 2], 3
-    jbe     .no_pcbDataReturned
-    xchg    dx, bx
-    mov     cx, [esp + 18h]
-    les     bx, [bp + 14h]
-    mov     word [es:bx], cx
-    xchg    dx, bx
-.no_pcbDataReturned:
 
 VGDrvOS2IDCService16_Done:
@@ -988 +971 @@
     mov     ebp, esp
     push    edx                         ; bp - 4h
-    lea     sp, [bp - 18h]              ; allocate the call frame.
-
-                                        ; bp - 06h (dw): oops...
-    mov     [bp - 08h], word 0          ; bp - 08h (dw): cbDataReturned
-
-    mov     [bp - 0eh], cx              ; bp - 0eh (dw): cbData     (NOTE: out of order to free up CX)
-    lea     cx, [bp - 08h]              ; bp - 0ch (dd): &cbDataReturned
-    mov     [bp - 0ah], cx
-    mov     cx, ss
-    mov     [bp - 0ch], cx
-    mov     [bp - 10h], bx              ; bp - 10h (dd): pvData
-    mov     cx, es
-    mov     [bp - 12h], cx
-    mov     [bp - 14h], dl              ; bp - 14h (dw): iFunction
-    mov     [bp - 13h], byte 0
-    mov     [bp - 18h], eax             ; bp - 18h (dd): u32Session
-
+
+    push    cx                          ; cbData
+    push    es
+    xor     dh, dh
+    push    dx
+    push    eax
     call    NAME(VGDrvOS2IDCService16)
 
-    mov     cx, [bp - 08h]              ; cbDataReturned.
+    mov     cx, [es:bx + VBGLREQHDR.cbOut]
 
     mov     edx, [bp - 4]

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibIdc-os2.cpp

@@ -49 +49 @@
      * Just check whether the connection was made or not.
      */
-    if (   g_VBoxGuestIDC.u32Version == VMMDEV_VERSION
+    if (   g_VBoxGuestIDC.u32Version == VBGL_IOC_VERSION
         && RT_VALID_PTR(g_VBoxGuestIDC.u32Session)
         && RT_VALID_PTR(g_VBoxGuestIDC.pfnServiceEP))
-    {
-        pHandle->s.pvSession = (void *)g_VBoxGuestIDC.u32Session;
-        return vbglR0IdcNativeCall(pHandle, VBGL_IOCTL_IDC_CONNECT, pReq);
-    }
-    pHandle->s.pvSession = NULL;
+        return g_VBoxGuestIDC.pfnServiceEP(g_VBoxGuestIDC.u32Session, VBGL_IOCTL_IDC_CONNECT, &pReq->Hdr, sizeof(*pReq));
     Log(("vbglDriverOpen: failed\n"));
     return VERR_FILE_NOT_FOUND;
@@ -79 +75 @@
 DECLR0VBGL(int) VbglR0IdcCallRaw(PVBGLIDCHANDLE pHandle, uintptr_t uReq, PVBGLREQHDR pReqHdr, uint32_t cbReq)
 {
-    size_t cbRetIgn;
-    return g_VBoxGuestIDC.pfnServiceEP((uintptr_t)pHandle->s.pvSession, uReq, pReqHdr, cbReq, &cbRetIgn);
+    return g_VBoxGuestIDC.pfnServiceEP((uintptr_t)pHandle->s.pvSession, uReq, pReqHdr, cbReq);
 }