Changeset 32266 in vbox for trunk/src/VBox

Timestamp:

Sep 7, 2010 9:23:05 AM (14 years ago)

Author:

vboxsync

Message:

Guest Additions/Windows: First working version of unified driver (no NT4 yet).

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (5 diffs)
• VBoxGuest-freebsd.c (modified) (1 prop)
• VBoxGuest-solaris.c (modified) (1 prop)
• VBoxGuest-solaris.conf (modified) (2 props)
• VBoxGuest-win-legacy.cpp (added)
• VBoxGuest-win-pnp.cpp (added)
• VBoxGuest-win.cpp (added)
• VBoxGuest-win.h (added)
• VBoxGuest.cpp (modified) (5 diffs, 1 prop)
• VBoxGuestInternal.h (modified) (3 diffs, 1 prop)
• win (added)
• win/Makefile.kup (added)
• win/VBoxGuest.inf (added)
• win/VBoxGuest.rc (added)
• win/VBoxGuestInst.cpp (added)
• win/VBoxGuestMsg.mc (added)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -20 +20 @@
 
 
-if1of ($(KBUILD_TARGET), freebsd $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) os2 solaris)
+if1of ($(KBUILD_TARGET), freebsd $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) os2 solaris win)
  #
  # VBoxGuest - The Guest Additions Driver.
@@ -31 +31 @@
  VBoxGuest_NOINST.linux  = true
  VBoxGuest_DEFS.linux    = KBUILD_MODNAME=KBUILD_STR\(vboxguest\) KBUILD_BASENAME=KBUILD_STR\(vboxguest\) DEBUG_HASH=2 DEBUG_HASH2=3 EXPORT_SYMTAB
+ VBoxGuest_DEFS.win      = VBOX_REBOOT_ON_UNINSTALL VBOX_SVN_REV=$(VBOX_SVN_REV) # VBOX_WITH_VRDP_SESSION_HANDLING
+ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
+ VBoxGuest_NOINST        = true
+endif
+ifdef VBOX_WITH_GUEST_BUGCHECK_DETECTION
+ VBoxGuest_DEFS.win     += VBOX_WITH_GUEST_BUGCHECK_DETECTION
+endif
  VBoxGuest_DEFS.solaris  = VBOX_SVN_REV=$(VBOX_SVN_REV)
  VBoxGuest_DEPS.solaris += $(VBOX_SVN_REV_KMK)
@@ -40 +47 @@
  VBoxGuest_INCS.linux    = ../../../Runtime/r0drv/linux
  ifneq ($(KBUILD_TARGET),os2)
-  ifn1of ($(KBUILD_TARGET), linux freebsd solaris)
-   VBoxGuest_SOURCES     = VBoxGuest-$(KBUILD_TARGET).cpp
-  else
-   VBoxGuest_SOURCES     = VBoxGuest-$(KBUILD_TARGET).c
-  endif
-  VBoxGuest_SOURCES     += \
-        VBoxGuest.cpp \
-        VBoxGuest2.cpp
-  VBoxGuest2.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
-  VBoxGuest_LIBS         = \
+  ifeq ($(KBUILD_TARGET),win)
+   VBoxGuest_SOURCES     = \
+        VBoxGuest-$(KBUILD_TARGET).cpp \
+        VBoxGuest-$(KBUILD_TARGET)-pnp.cpp \
+        win/VBoxGuest.rc
+   VBoxGuest_LDFLAGS.x86   = -Entry:DriverEntry@8
+   VBoxGuest_LDFLAGS.amd64 = -Entry:DriverEntry
+   VBoxGuest_LIBS          = \
+                $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
+                $(PATH_SDK_W2K3DDK_LIB)/hal.lib
+   ifdef VBOX_WITH_GUEST_BUGCHECK_DETECTION
+    VBoxGuest_LIBS += \
+                $(PATH_SDK_WINDDKWLH_LIB)/aux_klib.lib \
+                $(PATH_SDK_WINDDKWLH_LIB)/ksecdd.lib \
+                $(PATH_SDK_WINDDKWLH_LIB)/BufferOverflowK.lib
+    VBoxGuest.cpp_SDKS = WINDDKWLH
+   endif # VBOX_WITH_GUEST_BUGCHECK_DETECTION
+
+   #SYSMODS.x86 += VBoxGuestNT # Not yet buildable!
+   VBoxGuestNT_EXTENDS   = VBoxGuest
+   VBoxGuestNT_NOINST    = $(NO_SUCH_VARIABLE)
+   VBoxGuestNT_DEFS      = $(VBoxGuest_DEFS) TARGET_NT4
+   VBoxGuestNT_SOURCES   = \
+                VBoxGuest-$(KBUILD_TARGET).cpp \
+                VBoxGuest-$(KBUILD_TARGET)-legacy.cpp \
+                win/VBoxGuest.rc
+   VBoxGuestNT_LIBS      = \
+                $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \
+                $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
+                $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
+                $(VBOX_LIB_VBGL_R0BASE) \
+                $(VBOX_LIB_IPRT_GUEST_R0_NT4)
+  else # not Windows
+   ifn1of ($(KBUILD_TARGET), linux freebsd solaris)
+    VBoxGuest_SOURCES     = VBoxGuest-$(KBUILD_TARGET).cpp
+   else
+    VBoxGuest_SOURCES     = VBoxGuest-$(KBUILD_TARGET).c
+   endif
+  endif # win
+  VBoxGuest_SOURCES      += \
+        VBoxGuest.cpp \
+        VBoxGuest2.cpp
+  VBoxGuest2.cpp_DEFS     = VBOX_SVN_REV=$(VBOX_SVN_REV)
+  VBoxGuest.cpp_DEFS      = VBOX_SVN_REV=$(VBOX_SVN_REV)
+  VBoxGuest_LIBS         += \
         $(VBOX_LIB_VBGL_R0BASE) \
         $(VBOX_LIB_IPRT_GUEST_R0)
@@ -56 +98 @@
         $(PATH_INS)/gen-sys-hdrs/bus_if.h \
         $(PATH_INS)/gen-sys-hdrs/device_if.h
-
  else # OS/2:
   # The library order is crucial, so a bit of trickery is necessary.
@@ -163 +204 @@
 endif # FreeBSD
 
+ifeq ($(KBUILD_TARGET),win)
+#
+# VBoxGuestInst - The installer.
+#
+#PROGRAMS += VBoxGuestInst
+VBoxGuestInst_TEMPLATE= VBOXGUESTR3EXE
+VBoxGuestInst_SOURCES = win/VBoxGuestInst.cpp
+endif
+
 include $(KBUILD_PATH)/subfooter.kmk
 

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

@@ -40 +40 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 # include "revision-generated.h"
+#endif
+#if defined(RT_OS_WINDOWS)
+RT_C_DECLS_BEGIN
+# include <ntddk.h>
+RT_C_DECLS_END
 #endif
 
@@ -1573 +1578 @@
 
 
+/**
+ * Helper to (re-)init the HGCM communication.
+ *
+ * @param pDevExt   Device extension
+ */
+int VBoxGuestHGCMInitCommunication(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE enmOSType)
+{
+    int rc = VBoxGuestReportGuestInfo(enmOSType);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VBoxGuestReportDriverStatus(true /* Driver is active */);
+        if (RT_FAILURE(rc))
+            Log(("VBoxGuest::VBoxGuestInitHGCMCommunication: could not report guest driver status, vrc = %d\n", rc));
+    }
+    else
+        Log(("VBoxGuest::VBoxGuestInitHGCMCommunication: could not report guest information to host, vrc = %d\n", rc));
+    Log(("VBoxGuest::VBoxGuestInitHGCMCommunication: returned with vrc = %d\n", rc));
+    return rc;
+}
+
+
 static int VBoxGuestCommonIOCtl_HGCMConnect(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,
                                             VBoxGuestHGCMConnectInfo *pInfo, size_t *pcbDataReturned)
@@ -1949 +1975 @@
         if (pDevExt->MemBalloon.pOwner == pSession)
         {
-            rc = vboxGuestSetBalloonSizeFromUser(pDevExt, pSession, pInfo->u64ChunkAddr, pInfo->fInflate);
+            rc = vboxGuestSetBalloonSizeFromUser(pDevExt, pSession,
+                                                 pInfo->u64ChunkAddr,
+                                                 pInfo->fInflate > 0 ? true : false);
             if (pcbDataReturned)
                 *pcbDataReturned = 0;
@@ -1962 +1990 @@
     return rc;
 }
+
+
+#ifdef VBOX_WITH_VRDP_SESSION_HANDLING
+/**
+ * Enables the VRDP session and saves its session ID.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pDevExt             The device extention.
+ * @param   pSession            The session.
+ */
+static int VBoxGuestCommonIOCtl_EnableVRDPSession(VBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession)
+{
+    /* Nothing to do here right now, since this only is supported on Windows at the moment. */
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Disables the VRDP session.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pDevExt             The device extention.
+ * @param   pSession            The session.
+ */
+static int VBoxGuestCommonIOCtl_DisableVRDPSession(VBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession)
+{
+    /* Nothing to do here right now, since this only is supported on Windows at the moment. */
+    return VINF_SUCCESS;
+}
+#endif /* VBOX_WITH_VRDP_SESSION_HANDLING */
 
 
@@ -2155 +2215 @@
                 break;
 
+#ifdef VBOX_WITH_VRDP_SESSION_HANDLING
+            case VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION:
+                rc = VBoxGuestCommonIOCtl_EnableVRDPSession(pDevExt, pSession);
+                break;
+
+            case VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION:
+                rc = VBoxGuestCommonIOCtl_DisableVRDPSession(pDevExt, pSession);
+                break;
+#endif /* VBOX_WITH_VRDP_SESSION_HANDLING */
+
             default:
             {

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007 Oracle Corporation
+ * Copyright (C) 2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -143 +143 @@
      * For implementing the VBOXGUEST_IOCTL_CLIPBOARD_CONNECT interface. */
     uint32_t                    u32ClipboardClientId;
-
+#ifdef VBOX_WITH_VRDP_SESSION_HANDLING
+    BOOL                        fVRDPEnabled;
+#endif
     /** Memory balloon information for RTR0MemObjAllocPhysNC(). */
     VBOXGUESTMEMBALLOON         MemBalloon;
+    /** Align the next bit on a 64-byte boundary and make sure it starts at the same
+     *  offset in both 64-bit and 32-bit builds.
+     *
+     * @remarks The aligments of the members that are larger than 48 bytes should be
+     *          64-byte for cache line reasons. structs containing small amounts of
+     *          data could be lumped together at the end with a < 64 byte padding
+     *          following it (to grow into and align the struct size).
+     */
+    uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 24 : 4];
+
+    /** Windows part. */
+    union
+    {
+#ifdef ___VBoxGuest_win_h
+        VBOXGUESTDEVEXTWIN          s;
+#endif
+        uint8_t                     padding[256];      /* Multiple of 64; fix me! */
+    } win;
 
 } VBOXGUESTDEVEXT;
@@ -201 +221 @@
 void VBoxGuestCloseSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession);
 
+#ifdef VBOX_WITH_HGCM
+int  VBoxGuestHGCMInitCommunication(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE enmOSType);
+#endif
+
 int  VBoxGuestCommonIOCtlFast(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession);
 int  VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,