diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2011-10-17 14:18:31 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2011-10-17 14:18:31 +0200 |
| commit | 1cf00a61132b69bc7e27254fdd74bf105d2da28c (patch) | |
| tree | a7d314cc5ec77b4ce3e1f037af600b53ae1d43f8 /src/VBox/Additions | |
| parent | f8fd93b0b6b13ba94584bb61c1efd1a761f438c9 (diff) | |
| download | virtualbox-1cf00a61132b69bc7e27254fdd74bf105d2da28c.tar.gz | |
Imported Upstream version 4.1.4-dfsgupstream/4.1.4-dfsg
Diffstat (limited to 'src/VBox/Additions')
206 files changed, 1001 insertions, 565 deletions
diff --git a/src/VBox/Additions/Makefile.kmk b/src/VBox/Additions/Makefile.kmk index 6d0f3fa53..ee8d7a1c6 100644 --- a/src/VBox/Additions/Makefile.kmk +++ b/src/VBox/Additions/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38093 2011-07-21 12:45:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VirtualBox Guest Additions. # diff --git a/src/VBox/Additions/common/Makefile.kmk b/src/VBox/Additions/common/Makefile.kmk index 1dab16ba2..dc6d66fbb 100644 --- a/src/VBox/Additions/common/Makefile.kmk +++ b/src/VBox/Additions/common/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34817 2010-12-07 21:36:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the common addition code. # diff --git a/src/VBox/Additions/common/VBoxControl/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/Makefile.kmk index c57b43c28..f3c520307 100644 --- a/src/VBox/Additions/common/VBoxControl/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxControl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 31002 2010-07-22 14:45:41Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Guest Additions Command Line Management Interface. # diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp index e97876e93..5f2c9e015 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxControl.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxControl.cpp $ */ /** @file * VBoxControl - Guest Additions Command Line Management Interface. */ diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.rc b/src/VBox/Additions/common/VBoxControl/VBoxControl.rc index e24f5fdfb..c9d1dd83a 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControl.rc +++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxControl.rc 32394 2010-09-10 12:13:11Z vboxsync $ */ +/* $Id: VBoxControl.rc $ */ /** @file * VBoxControl - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk index 77c765d90..05a94c447 100644 --- a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBoxControl testcases. # diff --git a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp index e1b489607..7536162bb 100644 --- a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVBoxControl.cpp 32705 2010-09-23 07:06:34Z vboxsync $ */ +/* $Id: tstVBoxControl.cpp $ */ /** @file * VBoxControl - Guest Additions Command Line Management Interface, test case */ diff --git a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk index e9c760a38..d2e46af5d 100644 --- a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38316 2011-08-04 15:02:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Cross Platform Guest Additions Driver. # diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c index f206bb834..1720abb23 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-freebsd.c 38322 2011-08-05 10:15:15Z vboxsync $ */ +/* $Id: VBoxGuest-freebsd.c $ */ /** @file * VirtualBox Guest Additions Driver for FreeBSD. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c index 89b02e1fa..7275435fc 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c @@ -1,4 +1,4 @@ -/* $Rev: 36408 $ */ +/* $Rev: 74186 $ */ /** @file * VBoxGuest - Linux specifics. * @@ -26,10 +26,10 @@ #define LOG_GROUP LOG_GROUP_SUP_DRV #include "the-linux-kernel.h" #include "VBoxGuestInternal.h" +#include <linux/input.h> #include <linux/miscdevice.h> #include <linux/poll.h> -#include "version-generated.h" -#include "product-generated.h" +#include <VBox/version.h> #include <iprt/assert.h> #include <iprt/asm.h> @@ -105,6 +105,9 @@ static void *g_pvMMIOBase; static wait_queue_head_t g_PollEventQueue; /** Asynchronous notification stuff. */ static struct fasync_struct *g_pFAsyncQueue; +/** Pre-allocated mouse status VMMDev request for use in the IRQ + * handler. */ +static VMMDevReqMouseStatus *g_pMouseStatusReq; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) /** Whether we've create the logger or not. */ static volatile bool g_fLoggerCreated; @@ -135,6 +138,14 @@ static unsigned int g_iModuleMajor = 0; # error "CONFIG_VBOXADD_MAJOR -> CONFIG_VBOXGUEST_MAJOR" #endif +/** The input device handle */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) +static struct input_dev g_InputDevice; +#endif +static struct input_dev *g_pInputDevice = NULL; +/** Is the input device registered? */ +static bool g_fInputDeviceRegistered = false; + /** The file_operations structure. */ static struct file_operations g_FileOps = { @@ -197,6 +208,7 @@ static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] = }; MODULE_DEVICE_TABLE(pci, g_VBoxGuestPciId); +static PVBOXGUESTSESSION g_pKernelSession = NULL; /** * Converts a VBox status code to a linux error code. @@ -374,6 +386,132 @@ static void vboxguestLinuxTermISR(void) } +enum +{ + /** The minumum value our device can return */ + RANGE_MIN = 0, + /** The maximum value our device can return */ + RANGE_MAX = 0xFFFF +}; + + +/** Calls the kernel IOCtl to report mouse status to the host on behalf of + * our kernel session. */ +static int vboxguestLinuxSetMouseStatus(uint32_t fStatus) +{ + return VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &g_DevExt, + g_pKernelSession, &fStatus, sizeof(fStatus), + NULL); +} + + +/** Called when the input device is first opened. Sets up absolute reporting. + */ +static int vboxguestOpenInputDevice(struct input_dev *pDev) +{ + NOREF(pDev); + if (RT_FAILURE(vboxguestLinuxSetMouseStatus + ( VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE + | VMMDEV_MOUSE_NEW_PROTOCOL))) + return ENODEV; + return 0; +} + + +/** Called if all open handles to the device are closed, disables absolute + * reporting. */ +static void vboxguestCloseInputDevice(struct input_dev *pDev) +{ + NOREF(pDev); + vboxguestLinuxSetMouseStatus(0); +} + + +/** + * Creates the kernel input device. + */ +static int __init vboxguestLinuxCreateInputDevice(void) +{ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 29) +# define INPUT_DEV_ID(val) id.val +#else +# define INPUT_DEV_ID(val) id##val +#endif + int rc; + + rc = VbglGRAlloc((VMMDevRequestHeader **)&g_pMouseStatusReq, + sizeof(*g_pMouseStatusReq), + VMMDevReq_GetMouseStatus); + if (RT_FAILURE(rc)) + return -ENOMEM; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) + g_pInputDevice = input_allocate_device(); + if (!g_pInputDevice) + { + VbglGRFree(&g_pMouseStatusReq->header); + return -ENOMEM; + } + g_pInputDevice->INPUT_DEV_ID(bustype) = BUS_PCI; +#else + g_pInputDevice = &g_InputDevice; + g_pInputDevice->INPUT_DEV_ID(bus) = BUS_PCI; +#endif + g_pInputDevice->INPUT_DEV_ID(vendor) = VMMDEV_VENDORID; + g_pInputDevice->INPUT_DEV_ID(product) = VMMDEV_DEVICEID; + g_pInputDevice->INPUT_DEV_ID(version) = VBOX_SHORT_VERSION; + g_pInputDevice->open = vboxguestOpenInputDevice; + g_pInputDevice->close = vboxguestCloseInputDevice; + /** @todo parent (PCI?) device in device model view. */ + /* g_pInputDevice->dev.parent = */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) + { + int rc = input_register_device(g_pInputDevice); + if (rc) + { + VbglGRFree(&g_pMouseStatusReq->header); + input_free_device(g_pInputDevice); + return rc; + } + } +#else + input_register_device(g_pInputDevice); +#endif + /* Do what one of our competitors apparently does as that works. */ + ASMBitSet(g_pInputDevice->evbit, EV_ABS); + ASMBitSet(g_pInputDevice->evbit, EV_KEY); +#ifdef EV_SYN + ASMBitSet(g_pInputDevice->evbit, EV_SYN); +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7) + input_set_abs_params(g_pInputDevice, ABS_X, RANGE_MIN, RANGE_MAX, 0, 0); + input_set_abs_params(g_pInputDevice, ABS_Y, RANGE_MIN, RANGE_MAX, 0, 0); +#else + ASMBitSet(g_pInputDevice->absbit, ABS_X); + ASMBitSet(g_pInputDevice->absbit, ABS_Y); + g_pInputDevice->absmin[ABS_X] = g_pInputDevice->absmin[ABS_Y] = RANGE_MIN; + g_pInputDevice->absmax[ABS_X] = g_pInputDevice->absmax[ABS_Y] = RANGE_MAX; +#endif + ASMBitSet(g_pInputDevice->keybit, BTN_MOUSE); + /** @todo this string should be in a header file somewhere. */ + g_pInputDevice->name = "VirtualBox mouse integration"; + return 0; +#undef INPUT_DEV_ID +} + + +/** + * Terminates the kernel input device. + */ +static void vboxguestLinuxTermInputDevice(void) +{ + VbglGRFree(&g_pMouseStatusReq->header); + input_unregister_device(g_pInputDevice); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) + input_free_device(g_pInputDevice); +#endif +} + + /** * Creates the device nodes. * @@ -436,7 +574,6 @@ static void vboxguestLinuxTermDeviceNodes(void) } - /** * Initialize module. * @@ -515,20 +652,42 @@ static int __init vboxguestLinuxModInit(void) if (RT_SUCCESS(rc)) { /* - * Finally, create the device nodes. + * Create the kernel session for this driver. */ - rc = vboxguestLinuxInitDeviceNodes(); - if (rc >= 0) + rc = VBoxGuestCreateKernelSession(&g_DevExt, + &g_pKernelSession); + if (RT_SUCCESS(rc)) { - /* some useful information for the user but don't show this on the console */ - LogRel((DEVICE_NAME ": major %d, IRQ %d, I/O port %RTiop, MMIO at %RHp (size 0x%x)\n", - g_iModuleMajor, g_pPciDev->irq, g_IOPortBase, g_MMIOPhysAddr, g_cbMMIO)); - printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version " - VBOX_VERSION_STRING " (interface " RT_XSTR(VMMDEV_VERSION) ")\n"); - return rc; + /* + * Create the kernel input device. + */ + rc = vboxguestLinuxCreateInputDevice(); + if (rc >= 0) + { + /* + * Finally, create the device nodes. + */ + rc = vboxguestLinuxInitDeviceNodes(); + if (rc >= 0) + { + /* some useful information for the user but don't show this on the console */ + LogRel((DEVICE_NAME ": major %d, IRQ %d, I/O port %RTiop, MMIO at %RHp (size 0x%x)\n", + g_iModuleMajor, g_pPciDev->irq, g_IOPortBase, g_MMIOPhysAddr, g_cbMMIO)); + printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version " + VBOX_VERSION_STRING " (interface " RT_XSTR(VMMDEV_VERSION) ")\n"); + return rc; + } + + /* bail out */ + vboxguestLinuxTermInputDevice(); + } + else + { + LogRel((DEVICE_NAME ": vboxguestCreateInputDevice failed with rc=%Rrc\n", rc)); + rc = RTErrConvertFromErrno(rc); + } + VBoxGuestCloseSession(&g_DevExt, g_pKernelSession); } - - /* bail out */ VBoxGuestDeleteDevExt(&g_DevExt); } else @@ -556,6 +715,8 @@ static void __exit vboxguestLinuxModExit(void) * Inverse order of init. */ vboxguestLinuxTermDeviceNodes(); + vboxguestLinuxTermInputDevice(); + VBoxGuestCloseSession(&g_DevExt, g_pKernelSession); VBoxGuestDeleteDevExt(&g_DevExt); vboxguestLinuxTermISR(); vboxguestLinuxTermPci(); @@ -775,6 +936,7 @@ static ssize_t vboxguestRead(struct file *pFile, char *pbBuf, size_t cbRead, lof void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt) { + int rc; NOREF(pDevExt); /* @@ -785,6 +947,21 @@ void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt) wake_up_all(&g_PollEventQueue); Log(("VBoxGuestNativeISRMousePollEvent: kill_fasync\n")); kill_fasync(&g_pFAsyncQueue, SIGIO, POLL_IN); + /* Report events to the kernel input device */ + g_pMouseStatusReq->mouseFeatures = 0; + g_pMouseStatusReq->pointerXPos = 0; + g_pMouseStatusReq->pointerYPos = 0; + rc = VbglGRPerform(&g_pMouseStatusReq->header); + if (RT_SUCCESS(rc)) + { + input_report_abs(g_pInputDevice, ABS_X, + g_pMouseStatusReq->pointerXPos); + input_report_abs(g_pInputDevice, ABS_Y, + g_pMouseStatusReq->pointerYPos); +#ifdef EV_SYN + input_sync(g_pInputDevice); +#endif + } Log(("VBoxGuestNativeISRMousePollEvent: done\n")); } diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp index 1feac79d1..b1ae4156f 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-os2.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuest-os2.cpp $ */ /** @file * VBoxGuest - OS/2 specifics. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def index c1526e368..4728686eb 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def @@ -1,4 +1,4 @@ -; $Id: VBoxGuest-os2.def 31517 2010-08-10 11:28:35Z vboxsync $ +; $Id: VBoxGuest-os2.def $ ;; @file ; VBoxGuest - OS/2 definition file. ; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c index d87907ad3..8e9aa4971 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-solaris.c 36408 2011-03-24 16:25:47Z vboxsync $ */ +/* $Id: VBoxGuest-solaris.c $ */ /** @file * VirtualBox Guest Additions Driver for Solaris. */ @@ -28,6 +28,8 @@ #include <sys/ddi_intr.h> #include <sys/sunddi.h> #include <sys/open.h> +#include <sys/sunldi.h> +#include <sys/file.h> #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */ #include "VBoxGuestInternal.h" @@ -172,6 +174,12 @@ static size_t g_cIntrAllocated; static pollhead_t g_PollHead; /** The IRQ Mutex */ static kmutex_t g_IrqMtx; +/** Layered device handle for kernel keep-attached opens */ +static ldi_handle_t g_LdiHandle = NULL; +/** Ref counting for IDCOpen calls */ +static uint64_t g_cLdiOpens = 0; +/** The Mutex protecting the LDI handle in IDC opens */ +static kmutex_t g_LdiMtx; /** * Kernel entry points @@ -194,6 +202,8 @@ int _init(void) else cmn_err(CE_NOTE, "failed to initialize driver logging rc=%d!\n", rc); + mutex_init(&g_LdiMtx, NULL, MUTEX_DRIVER, NULL); + /* * Prevent module autounloading. */ @@ -231,6 +241,8 @@ int _fini(void) RTLogDestroy(RTLogRelSetDefaultInstance(NULL)); RTLogDestroy(RTLogSetDefaultInstance(NULL)); + mutex_destroy(&g_LdiMtx); + RTR0Term(); return rc; } diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp index bab93c98d..9e811cae1 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp @@ -109,6 +109,9 @@ ULONG DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath) case 1: /* Note: Also could be Windows 2008 Server R2! */ g_winVersion = WIN7; break; + case 2: + g_winVersion = WIN8; + break; default: Log(("VBoxGuest::DriverEntry: Unknown version of Windows (%u.%u), refusing!\n", majorVersion, minorVersion)); @@ -514,6 +517,26 @@ NTSTATUS vboxguestwinCleanup(PDEVICE_OBJECT pDevObj) PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pDevObj->DeviceExtension; if (pDevExt) { + +#if 0 /* @todo: test & enable cleaning global session data */ +#ifdef VBOX_WITH_HGCM + if (pDevExt->win.s.pKernelSession) + { + VBoxGuestCloseSession(pDevExt, pDevExt->win.s.pKernelSession); + pDevExt->win.s.pKernelSession = NULL; + } +#endif +#endif + + if (pDevExt->win.s.pInterruptObject) + { + IoDisconnectInterrupt(pDevExt->win.s.pInterruptObject); + pDevExt->win.s.pInterruptObject = NULL; + } + + /* @todo: cleanup the rest stuff */ + + #ifdef VBOX_WITH_GUEST_BUGCHECK_DETECTION hlpDeregisterBugCheckCallback(pDevExt); /* ignore failure! */ #endif @@ -1255,6 +1278,14 @@ VBOXOSTYPE vboxguestwinVersionToOSType(winVersion_t winVer) #endif break; + case WIN8: +#if ARCH_BITS == 64 + enmOsType = VBOXOSTYPE_Win8_x64; +#else + enmOsType = VBOXOSTYPE_Win8; +#endif + break; + default: /* We don't know, therefore NT family. */ enmOsType = VBOXOSTYPE_WinNT; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h index db3307dd0..db978a6d3 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h @@ -143,7 +143,8 @@ typedef enum WINXP = 3, WIN2K3 = 4, WINVISTA = 5, - WIN7 = 6 + WIN7 = 6, + WIN8 = 7 } winVersion_t; extern winVersion_t winVersion; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp index 77a66bcd9..e0a056b2e 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest.cpp 34406 2010-11-26 16:45:34Z vboxsync $ */ +/* $Id: VBoxGuest.cpp $ */ /** @file * VBoxGuest - Guest Additions Driver, Common Code. */ @@ -56,6 +56,10 @@ #ifdef VBOX_WITH_HGCM static DECLCALLBACK(int) VBoxGuestHGCMAsyncWaitCallback(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser, uint32_t u32User); #endif +#ifdef DEBUG +static void testSetMouseStatus(void); +#endif +static int VBoxGuestCommonIOCtl_SetMouseStatus(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fFeatures); /******************************************************************************* @@ -708,7 +712,6 @@ int VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, pDevExt->f32PendingEvents = 0; pDevExt->u32MousePosChangedSeq = 0; pDevExt->SessionSpinlock = NIL_RTSPINLOCK; - pDevExt->u32ClipboardClientId = 0; pDevExt->MemBalloon.hMtx = NIL_RTSEMFASTMUTEX; pDevExt->MemBalloon.cChunks = 0; pDevExt->MemBalloon.cMaxChunks = 0; @@ -788,6 +791,10 @@ int VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, { vboxGuestInitFixateGuestMappings(pDevExt); +#ifdef DEBUG + testSetMouseStatus(); /* Other tests? */ +#endif + rc = VBoxGuestReportDriverStatus(true /* Driver is active */); if (RT_FAILURE(rc)) LogRel(("VBoxGuestInitDevExt: VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc)); @@ -978,6 +985,8 @@ void VBoxGuestCloseSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession) pSession->Process = NIL_RTPROCESS; pSession->R0Process = NIL_RTR0PROCESS; vboxGuestCloseMemBalloon(pDevExt, pSession); + /* Reset any mouse status flags which the session may have set. */ + VBoxGuestCommonIOCtl_SetMouseStatus(pDevExt, pSession, 0); RTMemFree(pSession); } @@ -1817,74 +1826,6 @@ static int VBoxGuestCommonIOCtl_HGCMCall(PVBOXGUESTDEVEXT pDevExt, } -/** - * @returns VBox status code. Unlike the other HGCM IOCtls this will combine - * the VbglHGCMConnect/Disconnect return code with the Info.result. - * - * @param pDevExt The device extension. - * @param pu32ClientId The client id. - * @param pcbDataReturned Where to store the amount of returned data. Can - * be NULL. - */ -static int VBoxGuestCommonIOCtl_HGCMClipboardReConnect(PVBOXGUESTDEVEXT pDevExt, uint32_t *pu32ClientId, size_t *pcbDataReturned) -{ - int rc; - VBoxGuestHGCMConnectInfo CnInfo; - - Log(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: Current u32ClientId=%RX32\n", pDevExt->u32ClipboardClientId)); - - /* - * If there is an old client, try disconnect it first. - */ - if (pDevExt->u32ClipboardClientId != 0) - { - VBoxGuestHGCMDisconnectInfo DiInfo; - DiInfo.result = VERR_WRONG_ORDER; - DiInfo.u32ClientID = pDevExt->u32ClipboardClientId; - rc = VbglR0HGCMInternalDisconnect(&DiInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT); - if (RT_SUCCESS(rc)) - { - LogRel(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: failed to disconnect old client. VbglHGCMDisconnect -> rc=%Rrc\n", rc)); - return rc; - } - if (RT_FAILURE((int32_t)DiInfo.result)) - { - Log(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: failed to disconnect old client. DiInfo.result=%Rrc\n", DiInfo.result)); - return DiInfo.result; - } - pDevExt->u32ClipboardClientId = 0; - } - - /* - * Try connect. - */ - CnInfo.Loc.type = VMMDevHGCMLoc_LocalHost_Existing; - strcpy(CnInfo.Loc.u.host.achName, "VBoxSharedClipboard"); - CnInfo.u32ClientID = 0; - CnInfo.result = VERR_WRONG_ORDER; - - rc = VbglR0HGCMInternalConnect(&CnInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT); - if (RT_FAILURE(rc)) - { - LogRel(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: VbglHGCMConnected -> rc=%Rrc\n", rc)); - return rc; - } - if (RT_FAILURE(CnInfo.result)) - { - LogRel(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: VbglHGCMConnected -> rc=%Rrc\n", rc)); - return rc; - } - - Log(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: connected successfully u32ClientId=%RX32\n", CnInfo.u32ClientID)); - - pDevExt->u32ClipboardClientId = CnInfo.u32ClientID; - *pu32ClientId = CnInfo.u32ClientID; - if (pcbDataReturned) - *pcbDataReturned = sizeof(uint32_t); - - return VINF_SUCCESS; -} - #endif /* VBOX_WITH_HGCM */ /** @@ -2068,6 +2009,172 @@ static int VBoxGuestCommonIOCtl_DisableVRDPSession(VBOXGUESTDEVEXT pDevExt, PVBO } #endif /* VBOX_WITH_VRDP_SESSION_HANDLING */ +#ifdef DEBUG +/** Unit test SetMouseStatus instead of really executing the request. */ +static bool g_test_fSetMouseStatus = false; +/** When unit testing SetMouseStatus, the fake RC for the GR to return. */ +static int g_test_SetMouseStatusGRRC; +/** When unit testing SetMouseStatus this will be set to the status passed to + * the GR. */ +static uint32_t g_test_statusSetMouseStatus; +#endif + +static int vboxguestcommonSetMouseStatus(uint32_t fFeatures) +{ + VMMDevReqMouseStatus *pReq; + int rc; + + LogRelFlowFunc(("fFeatures=%u\n", (int) fFeatures)); + rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetMouseStatus); + if (RT_SUCCESS(rc)) + { + pReq->mouseFeatures = fFeatures; + pReq->pointerXPos = 0; + pReq->pointerYPos = 0; +#ifdef DEBUG + if (g_test_fSetMouseStatus) + { + g_test_statusSetMouseStatus = pReq->mouseFeatures; + rc = g_test_SetMouseStatusGRRC; + } + else +#endif + rc = VbglGRPerform(&pReq->header); + VbglGRFree(&pReq->header); + } + LogRelFlowFunc(("rc=%Rrc\n", rc)); + return rc; +} + + +/** + * Sets the mouse status features for this session and updates them + * globally. We aim to ensure that if several threads call this in + * parallel the most recent status will always end up being set. + * + * @returns VBox status code. + * + * @param pDevExt The device extention. + * @param pSession The session. + * @param fFeatures New bitmap of enabled features. + */ +static int VBoxGuestCommonIOCtl_SetMouseStatus(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fFeatures) +{ + unsigned i; + RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER; + uint32_t fNewDevExtStatus = 0; + int rc; + /* Exit early if nothing has changed - hack to work around the + * Windows Additions not using the common code. */ + bool fNoAction; + + RTSpinlockAcquireNoInts(pDevExt->SessionSpinlock, &Tmp); + for (i = 0; i < sizeof(fFeatures) * 8; ++i) + { + if (RT_BIT_32(i) & VMMDEV_MOUSE_GUEST_MASK) + { + if ( (RT_BIT_32(i) & fFeatures) + && !(RT_BIT_32(i) & pSession->fMouseStatus)) + ++pDevExt->cMouseFeatureUsage[i]; + else if ( !(RT_BIT_32(i) & fFeatures) + && (RT_BIT_32(i) & pSession->fMouseStatus)) + --pDevExt->cMouseFeatureUsage[i]; + } + if (pDevExt->cMouseFeatureUsage[i] > 0) + fNewDevExtStatus |= RT_BIT_32(i); + } + pSession->fMouseStatus = fFeatures & VMMDEV_MOUSE_GUEST_MASK; + fNoAction = (pDevExt->fMouseStatus == fNewDevExtStatus); + pDevExt->fMouseStatus = fNewDevExtStatus; + RTSpinlockReleaseNoInts(pDevExt->SessionSpinlock, &Tmp); + if (fNoAction) + return VINF_SUCCESS; + do + { + fNewDevExtStatus = pDevExt->fMouseStatus; + rc = vboxguestcommonSetMouseStatus(fNewDevExtStatus); + } while(RT_SUCCESS(rc) && fNewDevExtStatus != pDevExt->fMouseStatus); + return rc; +} + + +#ifdef DEBUG +/** Unit test for the SET_MOUSE_STATUS IoCtl. Since this is closely tied to + * the code in question it probably makes most sense to keep it next to the + * code. */ +static void testSetMouseStatus(void) +{ + int cFailures = 0; + uint32_t u32Data; + int rc; + RTSPINLOCK Spinlock; + + g_test_fSetMouseStatus = true; + rc = RTSpinlockCreate(&Spinlock); + AssertRCReturnVoid(rc); + { + VBOXGUESTDEVEXT DevExt = { 0 }; + VBOXGUESTSESSION Session = { 0 }; + + g_test_statusSetMouseStatus = ~0; + g_test_SetMouseStatusGRRC = VINF_SUCCESS; + DevExt.SessionSpinlock = Spinlock; + u32Data = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] = 1; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == ( VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE + | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR), + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + u32Data = VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE; /* Can't change this */ + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + u32Data = VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + u32Data = 0; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + AssertMsg(DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] == 1, + ("Actual value: %d\n", DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR)])); + g_test_SetMouseStatusGRRC = VERR_UNRESOLVED_ERROR; + /* This should succeed as the host request should not be made + * since nothing has changed. */ + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + /* This should fail with VERR_UNRESOLVED_ERROR as set above. */ + u32Data = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertMsg(rc == VERR_UNRESOLVED_ERROR, ("rc == %Rrc\n", rc)); + /* Untested paths: out of memory; race setting status to host */ + } + RTSpinlockDestroy(Spinlock); + g_test_fSetMouseStatus = false; +} +#endif + /** * Guest backdoor logging. @@ -2143,6 +2250,20 @@ int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUES return VERR_INVALID_POINTER; \ } \ } while (0) +#define CHECKRET_SIZE(mnemonic, cb) \ + do { \ + if (cbData != (cb)) \ + { \ + LogFunc((mnemonic ": cbData=%#zx (%zu) expected is %#zx (%zu)\n", \ + cbData, cbData, (size_t)(cb), (size_t)(cb))); \ + return VERR_BUFFER_OVERFLOW; \ + } \ + if ((cb) != 0 && !VALID_PTR(pvData)) \ + { \ + LogFunc((mnemonic ": Invalid pointer %p\n", pvData)); \ + return VERR_INVALID_POINTER; \ + } \ + } while (0) /* @@ -2243,11 +2364,6 @@ int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUES CHECKRET_MIN_SIZE("HGCM_DISCONNECT", sizeof(VBoxGuestHGCMDisconnectInfo)); rc = VBoxGuestCommonIOCtl_HGCMDisconnect(pDevExt, pSession, (VBoxGuestHGCMDisconnectInfo *)pvData, pcbDataReturned); break; - - case VBOXGUEST_IOCTL_CLIPBOARD_CONNECT: - CHECKRET_MIN_SIZE("CLIPBOARD_CONNECT", sizeof(uint32_t)); - rc = VBoxGuestCommonIOCtl_HGCMClipboardReConnect(pDevExt, (uint32_t *)pvData, pcbDataReturned); - break; #endif /* VBOX_WITH_HGCM */ case VBOXGUEST_IOCTL_CHECK_BALLOON: @@ -2274,6 +2390,11 @@ int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUES rc = VBoxGuestCommonIOCtl_DisableVRDPSession(pDevExt, pSession); break; #endif /* VBOX_WITH_VRDP_SESSION_HANDLING */ + case VBOXGUEST_IOCTL_SET_MOUSE_STATUS: + CHECKRET_SIZE("SET_MOUSE_STATUS", sizeof(uint32_t)); + rc = VBoxGuestCommonIOCtl_SetMouseStatus(pDevExt, pSession, + *(uint32_t *)pvData); + break; default: { diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp index a326513cf..db507545e 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest2.cpp 35907 2011-02-09 11:20:31Z vboxsync $ */ +/* $Id: VBoxGuest2.cpp $ */ /** @file * VBoxGuest - Guest Additions Driver, bits shared with the windows code. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h index a7214d7a9..74fac205d 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest2.h 32434 2010-09-12 23:11:51Z vboxsync $ */ +/* $Id: VBoxGuest2.h $ */ /** @file * VBoxGuest - Guest Additions Driver, bits shared with the windows code. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm index bb018c4de..bb8757f19 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm @@ -1,4 +1,4 @@ -; $Id: VBoxGuestA-os2.asm 31517 2010-08-10 11:28:35Z vboxsync $ +; $Id: VBoxGuestA-os2.asm $ ;; @file ; VBoxGuest - OS/2 assembly file, the first file in the link. ; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h index be447cc0e..62fe75da3 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h @@ -1,4 +1,4 @@ -/* $Rev: 33595 $ */ +/* $Rev: 74164 $ */ /** @file * VBoxGuest - Inter Driver Communication, unix implementation. * @@ -39,12 +39,45 @@ DECLVBGL(void *) VBoxGuestIDCOpen(uint32_t *pu32Version) LogFlow(("VBoxGuestIDCOpen: Version=%#x\n", pu32Version ? *pu32Version : 0)); AssertPtrReturn(pu32Version, NULL); + +#ifdef RT_OS_SOLARIS + mutex_enter(&g_LdiMtx); + if (!g_LdiHandle) + { + ldi_ident_t DevIdent = ldi_ident_from_anon(); + rc = ldi_open_by_name(VBOXGUEST_DEVICE_NAME, FREAD, kcred, &g_LdiHandle, DevIdent); + ldi_ident_release(DevIdent); + if (rc) + { + LogRel(("VBoxGuestIDCOpen: ldi_open_by_name failed. rc=%d\n", rc)); + mutex_exit(&g_LdiMtx); + return NULL; + } + } + ++g_cLdiOpens; + mutex_exit(&g_LdiMtx); +#endif + rc = VBoxGuestCreateKernelSession(&g_DevExt, &pSession); if (RT_SUCCESS(rc)) { *pu32Version = VMMDEV_VERSION; return pSession; } + +#ifdef RT_OS_SOLARIS + mutex_enter(&g_LdiMtx); + if (g_cLdiOpens > 0) + --g_cLdiOpens; + if ( g_cLdiOpens == 0 + && g_LdiHandle) + { + ldi_close(g_LdiHandle, FREAD, kcred); + g_LdiHandle = NULL; + } + mutex_exit(&g_LdiMtx); +#endif + LogRel(("VBoxGuestIDCOpen: VBoxGuestCreateKernelSession failed. rc=%d\n", rc)); return NULL; } @@ -63,6 +96,20 @@ DECLVBGL(int) VBoxGuestIDCClose(void *pvSession) AssertPtrReturn(pSession, VERR_INVALID_POINTER); VBoxGuestCloseSession(&g_DevExt, pSession); + +#ifdef RT_OS_SOLARIS + mutex_enter(&g_LdiMtx); + if (g_cLdiOpens > 0) + --g_cLdiOpens; + if ( g_cLdiOpens == 0 + && g_LdiHandle) + { + ldi_close(g_LdiHandle, FREAD, kcred); + g_LdiHandle = NULL; + } + mutex_exit(&g_LdiMtx); +#endif + return VINF_SUCCESS; } diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h index a82215821..b974c2b49 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestInternal.h 33750 2010-11-03 21:00:26Z vboxsync $ */ +/* $Id: VBoxGuestInternal.h $ */ /** @file * VBoxGuest - Guest Additions Driver. */ @@ -144,24 +144,20 @@ typedef struct VBOXGUESTDEVEXT /** Spinlock various items in the VBOXGUESTSESSION. */ RTSPINLOCK SessionSpinlock; - - /** The current clipboard client ID, 0 if no client. - * 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 alignments 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]; + /** For each mouse status feature the number of sessions which have + * enabled it. A feature is enabled globally if at least one session has + * requested it. */ + /** @todo can we programmatically determine the size of the array and + * still get the following alignment right? */ + uint32_t volatile cMouseFeatureUsage[32]; + /** The mouse feature status matching the counts above. These are updated + * together inside the session spinlock. */ + uint32_t volatile fMouseStatus; /** Windows part. */ union @@ -169,7 +165,6 @@ typedef struct VBOXGUESTDEVEXT #ifdef ___VBoxGuest_win_h VBOXGUESTDEVEXTWIN s; #endif - uint8_t padding[256]; /* Multiple of 64; fix me! */ } win; } VBOXGUESTDEVEXT; @@ -212,6 +207,9 @@ typedef struct VBOXGUESTSESSION /** The last consumed VMMDEV_EVENT_MOUSE_POSITION_CHANGED sequence number. * Used to implement polling. */ uint32_t volatile u32MousePosChangedSeq; + /** Mouse features supported. A feature enabled in any guest session will + * be enabled for the host. */ + uint32_t volatile fMouseStatus; } VBOXGUESTSESSION; diff --git a/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile b/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile index a295456af..e186a7342 100644 --- a/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile +++ b/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 37233 2011-05-27 13:31:57Z vboxsync $ +# $Id: Makefile $ ## @file # VirtualBox Guest Additions Module Makefile. # diff --git a/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest b/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest index 7d022ca77..303440b45 100644..100755 --- a/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest +++ b/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxguest 37955 2011-07-14 12:23:02Z vboxsync $ +# $Id: files_vboxguest $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/common/VBoxGuest/linux/Makefile b/src/VBox/Additions/common/VBoxGuest/linux/Makefile index c14476892..2211952af 100644 --- a/src/VBox/Additions/common/VBoxGuest/linux/Makefile +++ b/src/VBox/Additions/common/VBoxGuest/linux/Makefile @@ -1,4 +1,4 @@ -# $Revision: 37233 $ +# $Revision: 71955 $ ## @file # VirtualBox Guest Additions Module Makefile. # diff --git a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest index 8c56bcd8c..6d0900fe8 100644..100755 --- a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest +++ b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxguest 37964 2011-07-14 13:20:55Z vboxsync $ +# $Id: files_vboxguest $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc index f08489a4d..0b2920e9e 100644 --- a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc +++ b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest.rc 32399 2010-09-10 12:47:16Z vboxsync $ */ +/* $Id: VBoxGuest.rc $ */ /** @file * VBoxGuest - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp index 01cf1c682..ea1fe1873 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp @@ -1,4 +1,4 @@ -/* $Revision: 36740 $ */ +/* $Revision: 71271 $ */ /** @file * VBoxGuestLibR0 - Generic VMMDev request management. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp index 1c7b2a572..7fef12879 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp @@ -1,4 +1,4 @@ -/* $Revision: 28800 $ */ +/* $Revision: 60692 $ */ /** @file * VBoxGuestLib - Host-Guest Communication Manager. * diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp index d2f726a8a..5cde531d0 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp @@ -1,4 +1,4 @@ -/* $Revision: 36373 $ */ +/* $Revision: 70720 $ */ /** @file * VBoxGuestLib - Host-Guest Communication Manager internal functions, implemented by VBoxGuest */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp index f76743293..4a736a345 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp @@ -1,4 +1,4 @@ -/* $Revision: 34066 $ */ +/* $Revision: 67748 $ */ /** @file * VBoxGuestLibR0 - Library initialization. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk index 7d5e1a9e6..242aeb5b9 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 35380 2010-12-30 16:06:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the common guest addition code library. # diff --git a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp index 407f14c94..51f1281d0 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp @@ -1,4 +1,4 @@ -/* $Revision: 33540 $ */ +/* $Revision: 67140 $ */ /** @file * VBoxGuestLibR0 - Physical memory heap. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp index 3cc126602..4b40de0c5 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp @@ -1,4 +1,4 @@ -/* $Revision: 33540 $ */ +/* $Revision: 67140 $ */ /** @file * VBoxGuestLibR0 - IDC with VBoxGuest and HGCM helpers. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h index 80b50f895..8b68df513 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h +++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h @@ -1,4 +1,4 @@ -/* $Revision: 28800 $ */ +/* $Revision: 60692 $ */ /** @file * VBoxGuestLibR0 - System dependent helpers internal header. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h index 2c077c52f..eb36f231f 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h @@ -1,4 +1,4 @@ -/* $Revision: 38407 $ */ +/* $Revision: 73443 $ */ /** @file * VBoxGuestLibR0 - Internal header. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h index 8a767d0da..a36e81291 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h @@ -1,4 +1,4 @@ -/* $Id: VBGLR3Internal.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBGLR3Internal.h $ */ /** @file * VBoxGuestR3Lib - Ring-3 support library for the guest additions, Internal header. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c index 6ca0c727a..55fd41230 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c @@ -1,4 +1,4 @@ -/* $Revision: 37672 $ */ +/* $Revision: 72532 $ */ /** @file * VBoxGuestR0LibSharedFolders - Ring 0 Shared Folders calls. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp index e71425377..07e888b66 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3Lib.cpp 38317 2011-08-04 15:27:37Z vboxsync $ */ +/* $Id: VBoxGuestR3Lib.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Core. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp index bfc9e4a24..ef9559000 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibAdditions.cpp 37262 2011-05-30 14:13:17Z vboxsync $ */ +/* $Id: VBoxGuestR3LibAdditions.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Additions Info. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp index 076fe9721..cd4279bb0 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibBalloon.cpp 31045 2010-07-23 09:48:52Z vboxsync $ */ +/* $Id: VBoxGuestR3LibBalloon.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Ballooning. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp index ad21c4873..2c13b0aa1 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibClipboard.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibClipboard.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Clipboard. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp index 0ff3e2140..8ef0006b4 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibCoreDump.cpp 32574 2010-09-16 17:44:29Z vboxsync $ */ +/* $Id: VBoxGuestR3LibCoreDump.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Core Dumps. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp index 5c626654f..563548394 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibCpuHotPlug.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibCpuHotPlug.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, CPU Hot Plugging. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp index 25c72bd18..678d32ee3 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibCredentials.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibCredentials.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, user credentials. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp index 9ca617fb7..a314e522c 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxGuestR3LibDaemonize.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/** $Id: VBoxGuestR3LibDaemonize.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, daemonize a process. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp index 93caeb8a3..f1d901428 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibEvent.cpp 29291 2010-05-10 10:12:44Z vboxsync $ */ +/* $Id: VBoxGuestR3LibEvent.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Events. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp index 133b6a80f..b8a3fa7f2 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGR.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGR.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, GR. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp index 0964c3557..dd9729515 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGuestCtrl.cpp 38133 2011-07-25 09:02:17Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGuestCtrl.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, guest control. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp index 1014b44d6..32c7d7968 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGuestProp.cpp 36638 2011-04-11 09:51:59Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGuestProp.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, guest properties. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp index 468c37971..01aacd4ed 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibLog.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibLog.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Logging. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp index 5cdcadd97..cc298cb26 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibMisc.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibMisc.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Misc. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp index 1807bdc03..f0bb28d50 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibModule.cpp 30061 2010-06-07 09:34:15Z vboxsync $ */ +/* $Id: VBoxGuestR3LibModule.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Shared modules. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp index c23134dca..c21342843 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibMouse.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibMouse.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Mouse. */ @@ -70,11 +70,7 @@ VBGLR3DECL(int) VbglR3GetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_ */ VBGLR3DECL(int) VbglR3SetMouseStatus(uint32_t fFeatures) { - VMMDevReqMouseStatus Req; - vmmdevInitRequest(&Req.header, VMMDevReq_SetMouseStatus); - Req.mouseFeatures = fFeatures; - Req.pointerXPos = 0; - Req.pointerYPos = 0; - return vbglR3GRPerform(&Req.header); + return vbglR3DoIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures, + sizeof(fFeatures)); } diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp index c1f0af5bd..36427fe87 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibRuntimeXF86.cpp 31159 2010-07-28 03:28:00Z vboxsync $ */ +/* $Id: VBoxGuestR3LibRuntimeXF86.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, * implements the minimum of runtime functions needed for diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp index a0ba5e5c1..aa146281b 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibSeamless.cpp 37384 2011-06-08 15:09:14Z vboxsync $ */ +/* $Id: VBoxGuestR3LibSeamless.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Seamless mode. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp index a481a8bcf..11123a847 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibSharedFolders.cpp 35351 2010-12-27 17:04:17Z vboxsync $ */ +/* $Id: VBoxGuestR3LibSharedFolders.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, shared folders. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp index 6609aa41d..289181a1d 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibStat.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibStat.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Statistics. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp index 9275900c0..c03b2c222 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibTime.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibTime.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Time. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp index 8d1e989dd..3298d85d8 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibVideo.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibVideo.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Video. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp index 74a2c69d4..c95198f0f 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp @@ -1,4 +1,4 @@ -/* $Revision: 28800 $ */ +/* $Revision: 60692 $ */ /** @file * VBoxGuestLibR0 - Physical memory heap. */ diff --git a/src/VBox/Additions/common/VBoxService/Makefile.kmk b/src/VBox/Additions/common/VBoxService/Makefile.kmk index d3b38a4ec..ee88c6ba8 100644 --- a/src/VBox/Additions/common/VBoxService/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxService/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38133 2011-07-25 09:02:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Cross Platform Guest Addition Services. # diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp index 6f0a51b53..ca54b67a0 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxService-win.cpp 36338 2011-03-22 10:57:01Z vboxsync $ */ +/* $Id: VBoxService-win.cpp $ */ /** @file * VBoxService - Guest Additions Service Skeleton, Windows Specific Parts. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.rc b/src/VBox/Additions/common/VBoxService/VBoxService-win.rc index 28ff919ba..91db5f56c 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService-win.rc +++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxService-win.rc 32394 2010-09-10 12:13:11Z vboxsync $ */ +/* $Id: VBoxService-win.rc $ */ /** @file * VBoxService - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxService.cpp b/src/VBox/Additions/common/VBoxService/VBoxService.cpp index 873ca1343..d093d23ea 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxService.cpp 38223 2011-07-28 14:38:54Z vboxsync $ */ +/* $Id: VBoxService.cpp $ */ /** @file * VBoxService - Guest Additions Service Skeleton. */ @@ -217,19 +217,18 @@ RTEXITCODE VBoxServiceError(const char *pszFormat, ...) * Displays a verbose message. * * @returns 1 + * @param iLevel Minimum log level required to display this message. * @param pszFormat The message text. * @param ... Format arguments. */ void VBoxServiceVerbose(int iLevel, const char *pszFormat, ...) { -#ifdef DEBUG - int rc = RTCritSectEnter(&g_csLog); - if (RT_SUCCESS(rc)) + if (iLevel <= g_cVerbosity) { -#endif - if (iLevel <= g_cVerbosity) - { #ifdef DEBUG + int rc = RTCritSectEnter(&g_csLog); + if (RT_SUCCESS(rc)) + { const char *pszThreadName = RTThreadSelfName(); AssertPtr(pszThreadName); RTStrmPrintf(g_pStdOut, "%s [%s]: ", @@ -244,13 +243,11 @@ void VBoxServiceVerbose(int iLevel, const char *pszFormat, ...) va_start(va, pszFormat); LogRel(("%s: %N", g_pszProgName, pszFormat, &va)); va_end(va); - } #ifdef DEBUG - int rc2 = RTCritSectLeave(&g_csLog); - if (RT_SUCCESS(rc)) - rc = rc2; - } + RTCritSectLeave(&g_csLog); + } #endif + } } diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp index 5f8db00a1..498cee8df 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceAutoMount.cpp 37832 2011-07-08 10:13:18Z vboxsync $ */ +/* $Id: VBoxServiceAutoMount.cpp $ */ /** @file * VBoxService - Auto-mounting for Shared Folders. */ @@ -331,7 +331,8 @@ static int VBoxServiceAutoMountSharedFolder(const char *pszShareName, const char break; case 3: - VBoxServiceError("VBoxServiceAutoMountWorker: Could not add an entry to the mount table: %s\n", strerror(errno)); + /* VBoxServiceError("VBoxServiceAutoMountWorker: Could not add an entry to the mount table: %s\n", strerror(errno)); */ + errno = 0; break; default: diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp index 800427066..8b609d432 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceBalloon.cpp 32813 2010-09-29 11:50:19Z vboxsync $ */ +/* $Id: VBoxServiceBalloon.cpp $ */ /** @file * VBoxService - Memory Ballooning. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp index 978cdd2d0..ea32683cf 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxServiceClipboard-os2.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/** $Id: VBoxServiceClipboard-os2.cpp $ */ /** @file * VBoxService - Guest Additions Clipboard Service, OS/2. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp index 80ce6e61c..8de4144e4 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControl.cpp 38157 2011-07-25 13:10:12Z vboxsync $ */ +/* $Id: VBoxServiceControl.cpp $ */ /** @file * VBoxServiceControl - Host-driven Guest Control. */ @@ -251,6 +251,7 @@ static DECLCALLBACK(void) VBoxServiceControlStop(void) } } + void VBoxServiceControlThreadSignalShutdown(const PVBOXSERVICECTRLTHREAD pThread) { AssertPtrReturnVoid(pThread); @@ -262,7 +263,8 @@ int VBoxServiceControlThreadWaitForShutdown(const PVBOXSERVICECTRLTHREAD pThread { AssertPtrReturn(pThread, VERR_INVALID_POINTER); int rc = VINF_SUCCESS; - if (pThread->Thread != NIL_RTTHREAD) + if ( pThread->Thread != NIL_RTTHREAD + && !pThread->fShutdown) /* Only shutdown threads which aren't yet. */ { /* Wait a bit ... */ rc = RTThreadWait(pThread->Thread, 30 * 1000 /* Wait 30 seconds max. */, NULL); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp index 83ba405c9..1c7b7c280 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControlExec.cpp 38395 2011-08-10 11:48:29Z vboxsync $ */ +/* $Id: VBoxServiceControlExec.cpp $ */ /** @file * VBoxServiceControlExec - Utility functions for process execution. */ @@ -247,6 +247,11 @@ static int VBoxServiceControlExecProcHandleOutputEvent(RTPOLLSET hPollSet, uint3 rc2 = RTPipeClose(*phPipeR); AssertRC(rc2); *phPipeR = NIL_RTPIPE; + + /* Sinc some error occured (or because the pipe simply broke) we + * have to set our pipe buffer to disabled so that others don't wait + * for new data to arrive anymore. */ + VBoxServicePipeBufSetStatus(pBuf, false); } return rc; } @@ -606,6 +611,18 @@ static int VBoxServiceControlExecProcLoop(PVBOXSERVICECTRLTHREAD pThread, cbOffset, &cbRead, &cbLeft)) && cbRead) { +#ifdef DEBUG + int rc2 = RTCritSectEnter(&g_csLog); + if (RT_SUCCESS(rc2)) + { +#endif + RTStrmWriteEx(g_pStdOut, szBuf, cbRead, NULL /* No partial write. */); +#ifdef DEBUG + rc2 = RTCritSectLeave(&g_csLog); + if (RT_SUCCESS(rc)) + rc = rc2; + } +#endif cbOffset += cbRead; if (!cbLeft) break; @@ -885,10 +902,10 @@ static int VBoxServiceControlExecCreateProcess(const char *pszExec, const char * { /* Process Main flag "ExecuteProcessFlag_Hidden". */ if (fFlags & RT_BIT(2)) - uProcFlags = RTPROC_FLAGS_HIDDEN; + uProcFlags |= RTPROC_FLAGS_HIDDEN; /* Process Main flag "ExecuteProcessFlag_NoProfile". */ if (fFlags & RT_BIT(3)) - uProcFlags = RTPROC_FLAGS_NO_PROFILE; + uProcFlags |= RTPROC_FLAGS_NO_PROFILE; } /* If no user name specified run with current credentials (e.g. @@ -1405,7 +1422,6 @@ int VBoxServiceControlExecHandleCmdGetOutput(uint32_t u32ClientId, uint32_t uNum else VBoxServiceError("ControlExec: [PID %u]: Failed to retrieve output, CID=%u, uHandle=%u, rc=%Rrc\n", uPID, uContextID, uHandleID, rc); - /* Note: Since the context ID is unique the request *has* to be completed here, * regardless whether we got data or not! Otherwise the progress object * on the host never will get completed! */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp index c336eeda8..4692437bc 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControlExecThread.cpp 38445 2011-08-12 20:43:24Z vboxsync $ */ +/* $Id: VBoxServiceControlExecThread.cpp $ */ /** @file * VBoxServiceControlExecThread - Thread for an executed guest process. */ @@ -338,60 +338,69 @@ int VBoxServiceControlExecThreadGetOutput(uint32_t uPID, uint32_t uHandleId, uin int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect); if (RT_SUCCESS(rc)) { - const PVBOXSERVICECTRLTHREAD pNode = vboxServiceControlExecThreadGetByPID(uPID); - if (pNode) + const PVBOXSERVICECTRLTHREAD pThread = vboxServiceControlExecThreadGetByPID(uPID); + if (pThread) { - const PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pNode->pvData; + const PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pThread->pvData; AssertPtr(pData); PVBOXSERVICECTRLEXECPIPEBUF pPipeBuf = NULL; switch (uHandleId) { - case OUTPUT_HANDLE_ID_STDERR: /* StdErr */ + case OUTPUT_HANDLE_ID_STDERR: pPipeBuf = &pData->stdErr; break; - case OUTPUT_HANDLE_ID_STDOUT: /* StdOut */ + case OUTPUT_HANDLE_ID_STDOUT: + case OUTPUT_HANDLE_ID_STDOUT_DEPRECATED: pPipeBuf = &pData->stdOut; break; default: - AssertReleaseMsgFailed(("Unknown output handle ID (%u)\n", uHandleId)); + rc = VERR_NOT_FOUND; /* Handle ID not found! */ break; } - AssertPtr(pPipeBuf); - -#ifdef DEBUG_andy - VBoxServiceVerbose(4, "ControlExec: [PID %u]: Getting output from pipe buffer %u ...\n", - uPID, pPipeBuf->uPipeId); -#endif - /* If the stdout pipe buffer is enabled (that is, still could be filled by a running - * process) wait for the signal to arrive so that we don't return without any actual - * data read. */ - bool fEnabled = VBoxServicePipeBufIsEnabled(pPipeBuf); - if (fEnabled) - { -#ifdef DEBUG_andy - VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u (%ums)\n", - uPID, pPipeBuf->uPipeId, uTimeout); -#endif - rc = VBoxServicePipeBufWaitForEvent(pPipeBuf, uTimeout); - } + if (RT_SUCCESS(rc)) { - uint32_t cbRead = cbSize; - rc = VBoxServicePipeBufRead(pPipeBuf, pBuf, cbSize, &cbRead); + AssertPtr(pPipeBuf); + + #ifdef DEBUG_andy + VBoxServiceVerbose(4, "ControlExec: [PID %u]: Getting output from pipe buffer %u ...\n", + uPID, pPipeBuf->uPipeId); + #endif + /* If the stdout pipe buffer is enabled (that is, still could be filled by a running + * process) wait for the signal to arrive so that we don't return without any actual + * data read. */ + bool fEnabled = VBoxServicePipeBufIsEnabled(pPipeBuf); + if (fEnabled) + { + #ifdef DEBUG_andy + VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u (%ums)\n", + uPID, pPipeBuf->uPipeId, uTimeout); + #endif + rc = VBoxServicePipeBufWaitForEvent(pPipeBuf, uTimeout); + } if (RT_SUCCESS(rc)) { - if (fEnabled && !cbRead) - AssertMsgFailed(("[PID %u]: Waited (%ums) for pipe buffer %u (%u bytes left), but nothing read!\n", - uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize - pPipeBuf->cbOffset)); - if (pcbRead) - *pcbRead = cbRead; + uint32_t cbRead = cbSize; /* Read as much as possible. */ + rc = VBoxServicePipeBufRead(pPipeBuf, pBuf, cbSize, &cbRead); + if (RT_SUCCESS(rc)) + { + if ( !cbRead + && fEnabled) + { + AssertReleaseMsg(!VBoxServicePipeBufIsEnabled(pPipeBuf), + ("[PID %u]: Waited (%ums) for active pipe buffer %u (%u size, %u bytes left), but nothing read!\n", + uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize, pPipeBuf->cbSize - pPipeBuf->cbOffset)); + } + if (pcbRead) + *pcbRead = cbRead; + } + else + VBoxServiceError("ControlExec: [PID %u]: Unable to read from pipe buffer %u, rc=%Rrc\n", + uPID, pPipeBuf->uPipeId, rc); } - else - VBoxServiceError("ControlExec: [PID %u]: Unable to read from pipe buffer %u, rc=%Rrc\n", - uPID, pPipeBuf->uPipeId, rc); } } else @@ -405,6 +414,38 @@ int VBoxServiceControlExecThreadGetOutput(uint32_t uPID, uint32_t uHandleId, uin } +int VBoxServiceControlExecThreadRemove(uint32_t uPID) +{ + int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect); + if (RT_SUCCESS(rc)) + { + PVBOXSERVICECTRLTHREAD pThread = vboxServiceControlExecThreadGetByPID(uPID); + if (pThread) + { + Assert(pThread->fStarted != pThread->fStopped); + if (pThread->fStopped) /* Only shut down stopped threads. */ + { + VBoxServiceVerbose(4, "ControlExec: [PID %u]: Removing thread ... \n", + uPID); + + rc = VBoxServiceControlExecThreadShutdown(pThread); + + RTListNodeRemove(&pThread->Node); + RTMemFree(pThread); + } + } + else + rc = VERR_NOT_FOUND; + + int rc2 = RTCritSectLeave(&g_GuestControlThreadsCritSect); + if (RT_SUCCESS(rc)) + rc = rc2; + } + + return rc; +} + +/* Does not do locking, must be done by the caller! */ int VBoxServiceControlExecThreadShutdown(const PVBOXSERVICECTRLTHREAD pThread) { AssertPtrReturn(pThread, VERR_INVALID_POINTER); @@ -433,6 +474,8 @@ int VBoxServiceControlExecThreadShutdown(const PVBOXSERVICECTRLTHREAD pThread) int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) { + AssertPtrReturn(pbAllowed, VERR_INVALID_POINTER); + int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect); if (RT_SUCCESS(rc)) { @@ -441,7 +484,7 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) * how many guest processes are started and served already. */ bool fLimitReached = false; - if (g_GuestControlProcsMaxKept) /* If we allow unlimited processes, take a shortcut. */ + if (g_GuestControlProcsMaxKept) /* If we allow unlimited processes (=0), take a shortcut. */ { /** @todo Put running/stopped (+ memory alloc) stats into global struct! */ uint32_t uProcsRunning = 0; @@ -467,7 +510,8 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) int32_t iProcsLeft = (g_GuestControlProcsMaxKept - uProcsRunning - 1); if (iProcsLeft < 0) { - VBoxServiceVerbose(3, "ControlExec: Maximum running guest processes reached\n"); + VBoxServiceVerbose(3, "ControlExec: Maximum running guest processes reached (%u)\n", + g_GuestControlProcsMaxKept); fLimitReached = true; } else if (uProcsStopped > (uint32_t)iProcsLeft) @@ -486,7 +530,7 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) int rc2 = VBoxServiceControlExecThreadShutdown(pNode); if (RT_FAILURE(rc2)) { - VBoxServiceError("ControlExec: Unable to shut down thread due to policy, rc=%Rrc", rc2); + VBoxServiceError("ControlExec: Unable to shut down thread due to policy, rc=%Rrc\n", rc2); if (RT_SUCCESS(rc)) rc = rc2; /* Keep going. */ @@ -496,10 +540,10 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) RTMemFree(pNode); pNode = pNext; + Assert(uProcsToKill); uProcsToKill--; if (!uProcsToKill) break; - } } Assert(uProcsToKill == 0); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h index 69393804e..b1369a987 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControlExecThread.h 38180 2011-07-26 12:26:34Z vboxsync $ */ +/* $Id: VBoxServiceControlExecThread.h $ */ /** @file * VBoxServiceControlExecThread - Thread for an executed guest process. */ @@ -30,6 +30,7 @@ int VBoxServiceControlExecThreadAssignPID(PVBOXSERVICECTRLTHREADDATAEXEC pData, void VBoxServiceControlExecThreadDataDestroy(PVBOXSERVICECTRLTHREADDATAEXEC pData); int VBoxServiceControlExecThreadGetOutput(uint32_t uPID, uint32_t uHandleId, uint32_t uTimeout, uint8_t *pBuf, uint32_t cbSize, uint32_t *pcbRead); +int VBoxServiceControlExecThreadRemove(uint32_t uPID); int VBoxServiceControlExecThreadSetInput(uint32_t uPID, bool fPendingClose, uint8_t *pBuf, uint32_t cbSize, uint32_t *pcbWritten); int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp index 25616a759..600ef09b0 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceCpuHotPlug.cpp 33468 2010-10-26 12:49:59Z vboxsync $ */ +/* $Id: VBoxServiceCpuHotPlug.cpp $ */ /** @file * VBoxService - Guest Additions CPU Hot Plugging Service. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h index 79935ed0b..df22915c2 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceInternal.h 38180 2011-07-26 12:26:34Z vboxsync $ */ +/* $Id: VBoxServiceInternal.h $ */ /** @file * VBoxService - Guest Additions Services. */ @@ -157,7 +157,7 @@ typedef struct /** The other end of hNotificationPipeW. */ RTPIPE hNotificationPipeR; /** The event semaphore for getting notified whether something - * has changed, e.g. written or read from this buffer. */ + * has changed, e.g. written to this buffer or enabled/disabled it. */ RTSEMEVENT hEventSem; } VBOXSERVICECTRLEXECPIPEBUF; /** Pointer to buffered pipe data. */ @@ -275,6 +275,9 @@ extern VBOXSERVICE g_PageSharing; #ifdef VBOX_WITH_SHARED_FOLDERS extern VBOXSERVICE g_AutoMount; #endif +#ifdef DEBUG +extern RTCRITSECT g_csLog; /* For guest process stdout dumping. */ +#endif extern RTEXITCODE VBoxServiceSyntax(const char *pszFormat, ...); extern RTEXITCODE VBoxServiceError(const char *pszFormat, ...); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp index 1dd83ad98..c051f1220 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePageSharing.cpp 38411 2011-08-11 09:40:35Z vboxsync $ */ +/* $Id: VBoxServicePageSharing.cpp $ */ /** @file * VBoxService - Guest page sharing. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp index 9807c3894..f38868bf5 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePipeBuf.cpp 38437 2011-08-12 15:05:41Z vboxsync $ */ +/* $Id: VBoxServicePipeBuf.cpp $ */ /** @file * VBoxServicePipeBuf - Pipe buffering. */ @@ -111,14 +111,11 @@ int VBoxServicePipeBufRead(PVBOXSERVICECTRLEXECPIPEBUF pBuf, pBuf->cbOffset += cbToRead; #ifdef DEBUG_andy - VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n", + VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read cbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n", pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset); #endif - if (pBuf->hEventSem != NIL_RTSEMEVENT) - { - rc = RTSemEventSignal(pBuf->hEventSem); - AssertRC(rc); - } + /* Don't signal event semaphore here -- we only read out something from + * this pipe buffer. */ *pcbToRead = cbToRead; } @@ -401,7 +398,8 @@ bool VBoxServicePipeBufIsEnabled(PVBOXSERVICECTRLEXECPIPEBUF pBuf) if (RT_SUCCESS(rc)) { fEnabled = pBuf->fEnabled; - RTCritSectLeave(&pBuf->CritSect); + rc = RTCritSectLeave(&pBuf->CritSect); + AssertRC(rc); } return fEnabled; } @@ -452,6 +450,11 @@ int VBoxServicePipeBufSetStatus(PVBOXSERVICECTRLEXECPIPEBUF pBuf, bool fEnabled) if ( pBuf->fEnabled != fEnabledOld && pBuf->hEventSem) { +#ifdef DEBUG_andy + VBoxServiceVerbose(4, "Pipe [%u %u] status %s -> %s\n", + pBuf->uPID, pBuf->uPipeId, + fEnabledOld ? "EN" : "DIS", pBuf->fEnabled ? "EN" : "DIS"); +#endif /* Let waiter know that something has changed ... */ RTSemEventSignal(pBuf->hEventSem); } diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h index 3ffa8d9af..587e263ea 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePipeBuf.h 38113 2011-07-22 13:57:35Z vboxsync $ */ +/* $Id: VBoxServicePipeBuf.h $ */ /** @file * VBoxServicePipeBuf - Pipe buffering. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp index c0d378f2f..347faa951 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePropCache.cpp 36249 2011-03-10 12:18:20Z vboxsync $ */ +/* $Id: VBoxServicePropCache.cpp $ */ /** @file * VBoxServicePropCache - Guest property cache. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h index d484a17ec..cf932cbe2 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceResource-win.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxServiceResource-win.h $ */ /** @file * VBoxService - Guest Additions Service, resource IDs. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp index b81330e69..6f51be217 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceStats.cpp 32813 2010-09-29 11:50:19Z vboxsync $ */ +/* $Id: VBoxServiceStats.cpp $ */ /** @file * VBoxStats - Guest statistics notification */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp index 70cb0781f..3371cb2f8 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceTimeSync.cpp 37608 2011-06-23 11:47:33Z vboxsync $ */ +/* $Id: VBoxServiceTimeSync.cpp $ */ /** @file * VBoxService - Guest Additions TimeSync Service. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp index 3bc0e1e3f..06fe3f239 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceToolBox.cpp 38015 2011-07-18 12:49:31Z vboxsync $ */ +/* $Id: VBoxServiceToolBox.cpp $ */ /** @file * VBoxServiceToolbox - Internal (BusyBox-like) toolbox. */ @@ -607,7 +607,8 @@ static int VBoxServiceToolboxLsHandleDir(const char *pszDir, int rc = RTPathAbs(pszDir, szPathAbs, sizeof(szPathAbs)); if (RT_FAILURE(rc)) { - RTMsgError("Failed to retrieve absolute path of '%s', rc=%Rrc\n", pszDir, rc); + if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Failed to retrieve absolute path of '%s', rc=%Rrc\n", pszDir, rc); return rc; } @@ -615,7 +616,8 @@ static int VBoxServiceToolboxLsHandleDir(const char *pszDir, rc = RTDirOpen(&pDir, szPathAbs); if (RT_FAILURE(rc)) { - RTMsgError("Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc); + if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc); return rc; } @@ -649,8 +651,9 @@ static int VBoxServiceToolboxLsHandleDir(const char *pszDir, int rc2 = RTDirClose(pDir); if (RT_FAILURE(rc2)) { - RTMsgError("Failed to close dir '%s', rc=%Rrc\n", - pszDir, rc2); + if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Failed to close dir '%s', rc=%Rrc\n", + pszDir, rc2); if (RT_SUCCESS(rc)) rc = rc2; } @@ -837,8 +840,9 @@ static RTEXITCODE VBoxServiceToolboxLs(int argc, char **argv) RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK /* @todo Follow link? */); if (RT_FAILURE(rc2)) { - RTMsgError("Cannot access '%s': No such file or directory\n", - pNodeIt->pszName); + if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Cannot access '%s': No such file or directory\n", + pNodeIt->pszName); rc = VERR_FILE_NOT_FOUND; /* Do not break here -- process every element in the list * and keep failing rc. */ @@ -1069,8 +1073,9 @@ static RTEXITCODE VBoxServiceToolboxStat(int argc, char **argv) RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK /* @todo Follow link? */); if (RT_FAILURE(rc2)) { - RTMsgError("Cannot stat for '%s': No such file or directory\n", - pNodeIt->pszName); + if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Cannot stat for '%s': No such file or directory\n", + pNodeIt->pszName); rc = VERR_FILE_NOT_FOUND; /* Do not break here -- process every element in the list * and keep failing rc. */ @@ -1179,10 +1184,42 @@ bool VBoxServiceToolboxMain(int argc, char **argv, RTEXITCODE *prcExit) } /* + * The input is ASSUMED to be in the current process codeset (NT guarantees + * ACP, unixy systems doesn't guarantee anything). This loop converts all + * the argv[*] strings to UTF-8, which is a tad ugly but who cares. + * (As a rule all strings in VirtualBox are UTF-8.) + */ + for (int i = 0; i < argc; i++) + { + char *pszConverted; + int rc = RTStrCurrentCPToUtf8(&pszConverted, argv[i]); + if (RT_SUCCESS(rc)) + argv[i] = pszConverted; + else + { + RTMsgError("Failed to convert argument %d to UTF-8, rc=%Rrc\n", + i + 1, rc); + + /* Conversion was not possible,probably due to invalid characters. + * Keep in mind that we do RTStrFree on the whole array below. */ + argv[i] = RTStrDup(argv[i]); + } + } + + /* * Invoke the handler. */ RTMsgSetProgName("VBoxService/%s", pszTool); *prcExit = pfnHandler(argc, argv); + + /* + * Free converted argument vector + */ + for (int i = 0; i < argc; i++) + { + RTStrFree(argv[i]); + argv[i] = NULL; + } return true; } diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp index d988b992e..6dcff3a89 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceUtils.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxServiceUtils.cpp $ */ /** @file * VBoxServiceUtils - Some utility functions. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h index bc4ad0031..7cd6dfc96 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceUtils.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxServiceUtils.h $ */ /** @file * VBoxServiceUtils - Guest Additions Services (Utilities). */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp index c3d78e678..9be261dfd 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceVMInfo-win.cpp 38131 2011-07-25 08:38:59Z vboxsync $ */ +/* $Id: VBoxServiceVMInfo-win.cpp $ */ /** @file * VBoxService - Virtual Machine Information for the Host, Windows specifics. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp index a6d7d354e..2c31fcfce 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceVMInfo.cpp 38224 2011-07-28 14:53:13Z vboxsync $ */ +/* $Id: VBoxServiceVMInfo.cpp $ */ /** @file * VBoxService - Virtual Machine Information for the Host. */ diff --git a/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk index 678611500..d75c86ff9 100644 --- a/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 32634 2010-09-20 12:00:44Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxServicec test cases. # diff --git a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp index b9a2405b9..b27e986a6 100644 --- a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp +++ b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: tstUserInfo.cpp 32652 2010-09-21 07:04:49Z vboxsync $ */ +/* $Id: tstUserInfo.cpp $ */ /** @file * Test case for correct user environment. */ diff --git a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp index 387c2d871..5f37c56f0 100644 --- a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp +++ b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp @@ -1,4 +1,4 @@ -/* $Id: HGSMIBase.cpp 35398 2011-01-04 09:39:07Z vboxsync $ */ +/* $Id: HGSMIBase.cpp $ */ /** @file * VirtualBox Video driver, common code - HGSMI initialisation and helper * functions. diff --git a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp index efce4243a..3a2eb24be 100644 --- a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp +++ b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp @@ -1,4 +1,4 @@ -/* $Id: Modesetting.cpp 38207 2011-07-27 21:56:28Z vboxsync $ */ +/* $Id: Modesetting.cpp $ */ /** @file * VirtualBox Video driver, common code - HGSMI initialisation and helper * functions. diff --git a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp index e29186999..5f481049c 100644 --- a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp +++ b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp @@ -1,4 +1,4 @@ -/* $Id: VBVABase.cpp 35398 2011-01-04 09:39:07Z vboxsync $ */ +/* $Id: VBVABase.cpp $ */ /** @file * VirtualBox Video driver, common code - VBVA initialisation and helper * functions. diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk index a8d9fc56f..dd75c8e5d 100644 --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest OpenGL part # diff --git a/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc b/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc index f5240bf22..fe7f561bf 100644 --- a/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc +++ b/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxCROGL.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: VBoxCROGL.rc $ */ /** @file * VBoxCROGL - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc b/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc index bff467cf2..19972f35b 100644 --- a/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc +++ b/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc @@ -1,4 +1,4 @@ -/* $Id: arrayspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: arrayspu.rc $ */ /** @file * VBoxOGLarrayspu.so - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.c b/src/VBox/Additions/common/crOpenGL/dri_drv.c index 55734ccf3..d19b99b1c 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_drv.c +++ b/src/VBox/Additions/common/crOpenGL/dri_drv.c @@ -1,4 +1,4 @@ -/* $Id: dri_drv.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: dri_drv.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.h b/src/VBox/Additions/common/crOpenGL/dri_drv.h index 13b5b0b9d..9ee57766c 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_drv.h +++ b/src/VBox/Additions/common/crOpenGL/dri_drv.h @@ -1,4 +1,4 @@ -/* $Id: dri_drv.h 32404 2010-09-10 13:17:42Z vboxsync $ */ +/* $Id: dri_drv.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/dri_glx.h b/src/VBox/Additions/common/crOpenGL/dri_glx.h index 366417a35..a2a389701 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_glx.h +++ b/src/VBox/Additions/common/crOpenGL/dri_glx.h @@ -1,4 +1,4 @@ -/* $Id: dri_glx.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: dri_glx.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c index 3159e9eb4..7e222af66 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c @@ -1,4 +1,4 @@ -/* $Id: fakedri_drv.c 37594 2011-06-22 16:26:29Z vboxsync $ */ +/* $Id: fakedri_drv.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h index 2fff8be8a..0d94e1c3a 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h @@ -1,4 +1,4 @@ -/* $Id: fakedri_drv.h 32404 2010-09-10 13:17:42Z vboxsync $ */ +/* $Id: fakedri_drv.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h index 8caeef2d7..ce5510f51 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h @@ -1,4 +1,4 @@ -/* $Id: fakedri_glfuncsList.h 35039 2010-12-13 17:37:15Z vboxsync $ */ +/* $Id: fakedri_glfuncsList.h $ */ /** @file * VBox OpenGL list of opengl functions common in Mesa and vbox opengl stub diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h index 34ce69304..c1592cdf1 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h @@ -1,4 +1,4 @@ -/* $Id: fakedri_glxfuncsList.h 32404 2010-09-10 13:17:42Z vboxsync $ */ +/* $Id: fakedri_glxfuncsList.h $ */ /** @file * VBox OpenGL list of opengl functions common in Mesa and vbox opengl stub diff --git a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c index 630c12708..e285e585c 100644 --- a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c +++ b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c @@ -1,4 +1,4 @@ -/* $Id: feedback_context.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: feedback_context.c $ */ /** @file * VBox feedback spu, context tracking. diff --git a/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc b/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc index 64dbaddc9..36f5fa54d 100644 --- a/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc +++ b/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc @@ -1,4 +1,4 @@ -/* $Id: feedbackspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: feedbackspu.rc $ */ /** @file * VBoxOGLfeedbackspu - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c index cb6f645e0..4f94870ae 100644 --- a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c +++ b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c @@ -1,4 +1,4 @@ -/* $Id: glx_c_exports.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: glx_c_exports.c $ */ /** @file * * VirtualBox guest OpenGL DRI GLX C stubs diff --git a/src/VBox/Additions/common/crOpenGL/glx_proto.h b/src/VBox/Additions/common/crOpenGL/glx_proto.h index 63b5dda4b..2ab6d05cb 100644 --- a/src/VBox/Additions/common/crOpenGL/glx_proto.h +++ b/src/VBox/Additions/common/crOpenGL/glx_proto.h @@ -1,4 +1,4 @@ -/* $Id: glx_proto.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: glx_proto.h $ */ /** @file * * VirtualBox guest OpenGL DRI GLX header C prototypes diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.c b/src/VBox/Additions/common/crOpenGL/icd_drv.c index 14b896986..76dd2f5a4 100644 --- a/src/VBox/Additions/common/crOpenGL/icd_drv.c +++ b/src/VBox/Additions/common/crOpenGL/icd_drv.c @@ -1,4 +1,4 @@ -/* $Id: icd_drv.c 37986 2011-07-15 15:14:35Z vboxsync $ */ +/* $Id: icd_drv.c $ */ /** @file * VBox OpenGL windows ICD driver functions diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.h b/src/VBox/Additions/common/crOpenGL/icd_drv.h index a0109ea11..e610de150 100644 --- a/src/VBox/Additions/common/crOpenGL/icd_drv.h +++ b/src/VBox/Additions/common/crOpenGL/icd_drv.h @@ -1,4 +1,4 @@ -/* $Id: icd_drv.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: icd_drv.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/load.c b/src/VBox/Additions/common/crOpenGL/load.c index d8ba30bd5..52fcd758e 100644 --- a/src/VBox/Additions/common/crOpenGL/load.c +++ b/src/VBox/Additions/common/crOpenGL/load.c @@ -1129,8 +1129,10 @@ stubInit(void) crDebug("Stub launched for %s", response); #if defined(CR_NEWWINTRACK) && !defined(WINDOWS) - /*@todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread*/ - if (!crStrcmp(response, "compiz") || !crStrcmp(response, "compiz_real") + /*@todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread + * as at the start compiz runs our code under XGrabServer. + */ + if (!crStrcmp(response, "compiz") || !crStrcmp(response, "compiz_real") || !crStrcmp(response, "compiz.real") || !crStrcmp(response, "compiz-bin")) { disable_sync = 1; diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu.rc b/src/VBox/Additions/common/crOpenGL/pack/packspu.rc index 337538c26..4b4961087 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu.rc +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu.rc @@ -1,4 +1,4 @@ -/* $Id: packspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: packspu.rc $ */ /** @file * VBoxOGLpackspu.so - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c index c7dd95ec4..4c010f35a 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c @@ -1,4 +1,4 @@ -/* $Id: packspu_framebuffer.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: packspu_framebuffer.c $ */ /** @file * VBox OpenGL FBO related functions diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c index 694fcf642..9165ea30b 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c @@ -1,4 +1,4 @@ -/* $Id: packspu_getshaders.c 37157 2011-05-19 14:53:33Z vboxsync $ */ +/* $Id: packspu_getshaders.c $ */ /** @file * VBox OpenGL GLSL related functions diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c index bf36b6d35..71295d15e 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c @@ -1,4 +1,4 @@ -/* $Id: packspu_glsl.c 33988 2010-11-11 13:03:17Z vboxsync $ */ +/* $Id: packspu_glsl.c $ */ /** @file * VBox OpenGL GLSL related functions diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c index 342c96861..b5c60aec5 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c @@ -1,4 +1,4 @@ -/* $Id: packspu_texture.c 29298 2010-05-10 12:16:24Z vboxsync $ */ +/* $Id: packspu_texture.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc b/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc index 2f0e60117..9569ed3d6 100644 --- a/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc +++ b/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc @@ -1,4 +1,4 @@ -/* $Id: passthroughspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: passthroughspu.rc $ */ /** @file * VBoxOGLpassthroughspu - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/pam/Makefile.kmk b/src/VBox/Additions/common/pam/Makefile.kmk index 3d30ea769..cff82bb67 100644 --- a/src/VBox/Additions/common/pam/Makefile.kmk +++ b/src/VBox/Additions/common/pam/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 29058 2010-05-05 08:49:52Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for VBox PAM module for automated logons. # diff --git a/src/VBox/Additions/common/pam/pam_vbox.c b/src/VBox/Additions/common/pam/pam_vbox.c index 603a91e56..600da91c8 100644 --- a/src/VBox/Additions/common/pam/pam_vbox.c +++ b/src/VBox/Additions/common/pam/pam_vbox.c @@ -1,4 +1,4 @@ -/* $Id: pam_vbox.c 36051 2011-02-22 11:55:10Z vboxsync $ */ +/* $Id: pam_vbox.c $ */ /** @file * pam_vbox - PAM module for auto logons. */ diff --git a/src/VBox/Additions/common/testcase/Makefile.kmk b/src/VBox/Additions/common/testcase/Makefile.kmk index 8fa7d1ff0..e2c478319 100644 --- a/src/VBox/Additions/common/testcase/Makefile.kmk +++ b/src/VBox/Additions/common/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 32431 2010-09-11 18:02:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Cross Platform Guest Addition test cases. # diff --git a/src/VBox/Additions/common/testcase/tstPageFusion.cpp b/src/VBox/Additions/common/testcase/tstPageFusion.cpp index 1a2d60ab1..3e4c8fa41 100644 --- a/src/VBox/Additions/common/testcase/tstPageFusion.cpp +++ b/src/VBox/Additions/common/testcase/tstPageFusion.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPageFusion.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: tstPageFusion.cpp $ */ /** @file * VBoxService - Guest page sharing testcase */ diff --git a/src/VBox/Additions/freebsd/Installer/vboxguest.sh b/src/VBox/Additions/freebsd/Installer/vboxguest.sh index 85bec4e87..85bec4e87 100644..100755 --- a/src/VBox/Additions/freebsd/Installer/vboxguest.sh +++ b/src/VBox/Additions/freebsd/Installer/vboxguest.sh diff --git a/src/VBox/Additions/freebsd/Makefile.kmk b/src/VBox/Additions/freebsd/Makefile.kmk index 3e5c86e28..c9c8c4138 100644 --- a/src/VBox/Additions/freebsd/Makefile.kmk +++ b/src/VBox/Additions/freebsd/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38158 2011-07-25 13:13:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the FreeBSD guest additions base directory. # diff --git a/src/VBox/Additions/freebsd/drm/Makefile b/src/VBox/Additions/freebsd/drm/Makefile index 1022bb574..15a581a4d 100644 --- a/src/VBox/Additions/freebsd/drm/Makefile +++ b/src/VBox/Additions/freebsd/drm/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile $ ## @file # Makefile for the VirtualBox FreeBSD Host Driver. # diff --git a/src/VBox/Additions/freebsd/drm/Makefile.kmk b/src/VBox/Additions/freebsd/drm/Makefile.kmk index 571bf11e3..d986a26d3 100644 --- a/src/VBox/Additions/freebsd/drm/Makefile.kmk +++ b/src/VBox/Additions/freebsd/drm/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38317 2011-08-04 15:27:37Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo DRM module (FreeBSD kernel OpenGL module). # diff --git a/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm b/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm index 9d806b766..67fdecb65 100644..100755 --- a/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm +++ b/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxvideo_drm 29250 2010-05-09 17:53:58Z vboxsync $ +# $Id: files_vboxvideo_drm $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c b/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c index 163fba369..2e2a91d80 100644 --- a/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c +++ b/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c @@ -1,4 +1,4 @@ -/* $Id: vboxvideo_drm.c 28854 2010-04-27 19:41:12Z vboxsync $ */ +/* $Id: vboxvideo_drm.c $ */ /** @file * VirtualBox Guest Additions - vboxvideo DRM module. * FreeBSD kernel OpenGL module. diff --git a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk index b3f855009..b605540e5 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk +++ b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 35380 2010-12-30 16:06:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the FreeBSD Shared folder kernel module. # diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h index 6d5d466d0..7c9b8f4d6 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxvfs.h 31012 2010-07-22 15:55:04Z vboxsync $ */ +/* $Id: vboxvfs.h $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c index a4292513b..a9d9c14a3 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vfsops.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: vboxvfs_vfsops.c $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c index 3e1d06506..575a55ed2 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vnops.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: vboxvfs_vnops.c $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk index a87ae2e1e..f3b37f475 100644 --- a/src/VBox/Additions/linux/Makefile.kmk +++ b/src/VBox/Additions/linux/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38196 2011-07-27 11:25:22Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the linux guest additions base directory. # @@ -132,10 +132,6 @@ VBOX_ADD_STRIP_MOD.linux = \ vboxmouse_drv_14.so \ vboxmouse_drv_15.so \ vboxmouse_drv_16.so \ - vboxmouse_drv_17.so \ - vboxmouse_drv_18.so \ - vboxmouse_drv_19.so \ - vboxmouse_drv_110.so \ vboxvideo_drv_70.so \ vboxvideo_drv_71.so \ vboxvideo_drv_13.so \ @@ -146,6 +142,7 @@ VBOX_ADD_STRIP_MOD.linux = \ vboxvideo_drv_18.so \ vboxvideo_drv_19.so \ vboxvideo_drv_110.so \ + vboxvideo_drv_111.so \ pam_vbox.so \ mount.vboxsf @@ -321,9 +318,6 @@ lnx_add_inst-noexec_INSTTYPE = stage lnx_add_inst-noexec_SOURCES = \ $(VBOX_REL_X11_ADD_INST)vboxclient.desktop \ $(VBOX_REL_X11_ADD_INST)vboxvideo.ids \ - $(VBOX_REL_X11_ADD_INST)50-vboxmouse.conf \ - $(VBOX_REL_LNX_ADD_INST)70-xorg-vboxmouse.rules \ - $(VBOX_REL_LNX_ADD_INST)90-vboxguest.fdi \ selinux-fedora/vbox_x11.pp \ selinux-fedora/vbox_accel.pp @@ -413,13 +407,13 @@ $(VBOX_LNX_ADD_ARCHIVE.$(KBUILD_TARGET_ARCH)): \ $(QUIET)$(RM) -f -- $(wildcard $(dir $@)VBoxGuestAdditions-*r*.tar.bz2) $(QUIET)$(MKDIR) -p $(@D) ifdef VBOX_USE_PBZIP2 - $(QUIET)tar --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ + $(QUIET)tar --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ -C $(VBOX_LNX_ADD_INST_OUT_DIR) \ LICENSE bin init lib sbin share src \ $(if $(filter $(KBUILD_TYPE),debug),debug) $(QUIET)pbzip2 $(patsubst %.bz2,%,$@) else - $(QUIET)tar --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ + $(QUIET)tar --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ -C $(VBOX_LNX_ADD_INST_OUT_DIR) \ LICENSE bin init lib sbin share src \ $(if $(filter $(KBUILD_TYPE),debug),debug) @@ -437,12 +431,12 @@ $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2: \ $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@) $(QUIET)$(MKDIR) -p $(@D) ifdef VBOX_USE_PBZIP2 - $(QUIET)tar --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ + $(QUIET)tar --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ -C $(VBOX_LNX_ADD_INST_DBG_DIR) \ bin lib sbin $(QUIET)pbzip2 $(patsubst %.bz2,%,$@) else - $(QUIET)tar --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ + $(QUIET)tar --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ -C $(VBOX_LNX_ADD_INST_DBG_DIR) \ bin lib sbin endif diff --git a/src/VBox/Additions/linux/drm/Makefile.kmk b/src/VBox/Additions/linux/drm/Makefile.kmk index 8aa952a1d..d42959446 100644 --- a/src/VBox/Additions/linux/drm/Makefile.kmk +++ b/src/VBox/Additions/linux/drm/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38216 2011-07-28 11:15:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo DRM module (linux kernel OpenGL module). # diff --git a/src/VBox/Additions/linux/drm/files_vboxvideo_drm b/src/VBox/Additions/linux/drm/files_vboxvideo_drm index c27650459..9f18c86fa 100644..100755 --- a/src/VBox/Additions/linux/drm/files_vboxvideo_drm +++ b/src/VBox/Additions/linux/drm/files_vboxvideo_drm @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxvideo_drm 37350 2011-06-07 13:44:25Z vboxsync $ +# $Id: files_vboxvideo_drm $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c index 4a0a89cd9..b335f76eb 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c @@ -1,4 +1,4 @@ -/** @file $Id: vboxvideo_drm.c 37351 2011-06-07 13:45:11Z vboxsync $ +/** @file $Id: vboxvideo_drm.c $ * * VirtualBox Additions Linux kernel driver, DRM support */ diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.h b/src/VBox/Additions/linux/drm/vboxvideo_drm.h index 239d7ed6a..0613a9d23 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drm.h +++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.h @@ -1,4 +1,4 @@ -/** @file $Id: vboxvideo_drm.h 28800 2010-04-27 08:22:32Z vboxsync $ +/** @file $Id: vboxvideo_drm.h $ * * VirtualBox Additions Linux kernel driver, DRM support */ diff --git a/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules b/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules deleted file mode 100644 index 795726add..000000000 --- a/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="vboxguest",ENV{ID_INPUT}="1" diff --git a/src/VBox/Additions/linux/installer/90-vboxguest.fdi b/src/VBox/Additions/linux/installer/90-vboxguest.fdi deleted file mode 100644 index 4583a27cc..000000000 --- a/src/VBox/Additions/linux/installer/90-vboxguest.fdi +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -# Hal driver description for the vboxmouse driver -# $Id: 90-vboxguest.fdi 32396 2010-09-10 12:22:20Z vboxsync $ - - Copyright (C) 2008-2010 Oracle Corporation - - This file is part of VirtualBox Open Source Edition (OSE), as - available from http://www.virtualbox.org. This file is free software; - you can redistribute it and/or modify it under the terms of the GNU - General Public License (GPL) as published by the Free Software - Foundation, in version 2 as it comes in the "COPYING" file of the - VirtualBox OSE distribution. VirtualBox OSE is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. ---> -<deviceinfo version="0.2"> - <device> - <match key="info.subsystem" string="pci"> - <match key="info.product" string="VirtualBox Guest Service"> - <append key="info.capabilities" type="strlist">input</append> - <append key="info.capabilities" type="strlist">input.mouse</append> - <merge key="input.x11_driver" type="string">vboxmouse</merge> - <merge key="input.device" type="string">/dev/vboxguest</merge> - </match> - </match> - </device> -</deviceinfo> - diff --git a/src/VBox/Additions/linux/installer/autorun.sh b/src/VBox/Additions/linux/installer/autorun.sh index 28997631f..45afb034a 100644..100755 --- a/src/VBox/Additions/linux/installer/autorun.sh +++ b/src/VBox/Additions/linux/installer/autorun.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: autorun.sh 36759 2011-04-20 16:40:13Z vboxsync $ +# $Id: autorun.sh $ # # VirtualBox Guest Additions installation script for *nix guests # diff --git a/src/VBox/Additions/linux/installer/vboxadd-service.sh b/src/VBox/Additions/linux/installer/vboxadd-service.sh index 02016ee4a..85251c9ce 100755 --- a/src/VBox/Additions/linux/installer/vboxadd-service.sh +++ b/src/VBox/Additions/linux/installer/vboxadd-service.sh @@ -33,7 +33,7 @@ if [ -f /etc/redhat-release ]; then PIDFILE="/var/lock/subsys/vboxadd-service" elif [ -f /etc/SuSE-release ]; then system=suse - PIDFILE="/var/lock/subsys/vboxadd-service" + PIDFILE="/var/run/vboxadd-service" elif [ -f /etc/debian_version ]; then system=debian PIDFILE="/var/run/vboxadd-service" @@ -170,7 +170,7 @@ if [ "$system" = "arch" ]; then fi -if [ "$system" = "slackware" ]; then +if [ "$system" = "slackware" -o "$system" = "other" ]; then daemon() { $1 $2 } @@ -217,20 +217,6 @@ if [ "$system" = "lfs" ]; then } fi -if [ "$system" = "other" ]; then - fail_msg() { - echo " ...fail!" - } - - succ_msg() { - echo " ...done." - } - - begin() { - echo -n "$1" - } -fi - binary=/usr/sbin/VBoxService testbinary() { diff --git a/src/VBox/Additions/linux/installer/vboxadd-x11.sh b/src/VBox/Additions/linux/installer/vboxadd-x11.sh index f7ff32020..3d20d8a1e 100755 --- a/src/VBox/Additions/linux/installer/vboxadd-x11.sh +++ b/src/VBox/Additions/linux/installer/vboxadd-x11.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# Linux Additions X11 setup init script ($Revision: 38093 $) +# Linux Additions X11 setup init script ($Revision: 74215 $) # # @@ -283,11 +283,11 @@ setup() dox11config="true" # By default, we want to run our xorg.conf setup script setupxorgconf="true" - # But not to install the configuration file into xorg.conf.d - doxorgconfd="" - # But without the workaround for SUSE 11.1 not doing input auto-detection - newmouse="" - # By default we want to use hal/udev/whatever for auto-loading the mouse driver + # On all but the oldest X servers we want to use our new mouse + # driver. + newmouse="--newMouse" + # On more recent servers our kernel mouse driver will be used + # automatically automouse="--autoMouse" # We need to tell our xorg.conf hacking script whether /dev/psaux exists nopsaux="--nopsaux" @@ -296,6 +296,8 @@ setup() vboxvideo_src= # The mouse driver to install for X.Org 6.9+ vboxmouse_src= + # The driver extension + driver_ext=".so" modules_dir=`X -showDefaultModulePath 2>&1` || modules_dir= if [ -z "$modules_dir" ]; then @@ -324,96 +326,91 @@ setup() echo "installing the X.Org drivers." dox11config="" ;; + 1.11.* ) + xserver_version="X.Org Server 1.11" + vboxvideo_src=vboxvideo_drv_111.so + # Does Fedora still ship without vboxvideo detection? + # test "$system" = "redhat" || setupxorgconf="" + ;; 1.10.* ) - begin "Installing X.Org Server 1.10 modules" + xserver_version="X.Org Server 1.10" vboxvideo_src=vboxvideo_drv_110.so - vboxmouse_src=vboxmouse_drv_110.so - doxorgconfd="true" # Does Fedora still ship without vboxvideo detection? # test "$system" = "redhat" || setupxorgconf="" ;; 1.9.* ) - begin "Installing X.Org Server 1.9 modules" + xserver_version="X.Org Server 1.9" vboxvideo_src=vboxvideo_drv_19.so - vboxmouse_src=vboxmouse_drv_19.so - doxorgconfd="true" # Fedora 14 looks likely to ship without vboxvideo detection # test "$system" = "redhat" || setupxorgconf="" ;; 1.8.* ) - begin "Installing X.Org Server 1.8 modules" + xserver_version="X.Org Server 1.8" vboxvideo_src=vboxvideo_drv_18.so - vboxmouse_src=vboxmouse_drv_18.so - doxorgconfd="true" # Fedora 13 shipped without vboxvideo detection test "$system" = "redhat" || setupxorgconf="" ;; 1.7.* ) - begin "Installing X.Org Server 1.7 modules" + xserver_version="X.Org Server 1.7" vboxvideo_src=vboxvideo_drv_17.so - vboxmouse_src=vboxmouse_drv_17.so setupxorgconf="" - test "$system" = "debian" && doxorgconfd="true" ;; 1.6.* ) - begin "Installing X.Org Server 1.6 modules" + xserver_version="X.Org Server 1.6" vboxvideo_src=vboxvideo_drv_16.so vboxmouse_src=vboxmouse_drv_16.so # SUSE SLE* with X.Org 1.6 does not do input autodetection; # openSUSE does. if grep -q -E '^SLE[^ ]' /etc/SuSE-brand 2>/dev/null; then automouse="" - newmouse="--newMouse" else test "$system" = "suse" && setupxorgconf="" fi ;; 1.5.* ) - begin "Installing X.Org Server 1.5 modules" + xserver_version="X.Org Server 1.5" vboxvideo_src=vboxvideo_drv_15.so vboxmouse_src=vboxmouse_drv_15.so # SUSE with X.Org 1.5 is another special case, and is also # handled specially - test "$system" = "suse" && - { automouse=""; newmouse="--newMouse"; } + test "$system" = "suse" && automouse="" ;; 1.4.* ) - begin "Installing X.Org Server 1.4 modules" + xserver_version="X.Org Server 1.4" vboxvideo_src=vboxvideo_drv_14.so vboxmouse_src=vboxmouse_drv_14.so automouse="" - newmouse="--newMouse" ;; 1.3.* ) # This was the first release which gave the server version number # rather than the X11 release version when you did 'X -version'. - begin "Installing X.Org Server 1.3 modules" + xserver_version="X.Org Server 1.3" vboxvideo_src=vboxvideo_drv_13.so vboxmouse_src=vboxmouse_drv_13.so automouse="" - newmouse="--newMouse" ;; 7.1.* | 7.2.* ) - begin "Installing X.Org 7.1 modules" + xserver_version="X.Org 7.1" vboxvideo_src=vboxvideo_drv_71.so vboxmouse_src=vboxmouse_drv_71.so automouse="" + newmouse="" ;; 6.9.* | 7.0.* ) - begin "Installing X.Org 6.9/7.0 modules" + xserver_version="X.Org 6.9/7.0" vboxvideo_src=vboxvideo_drv_70.so vboxmouse_src=vboxmouse_drv_70.so automouse="" + newmouse="" ;; 6.7* | 6.8.* | 4.2.* | 4.3.* ) # Assume X.Org post-fork or XFree86 - begin "Installing XFree86 4.2/4.3 and X.Org 6.7/6.8 modules" - rm "$modules_dir/drivers/vboxvideo_drv.o" 2>/dev/null - rm "$modules_dir/input/vboxmouse_drv.o" 2>/dev/null - ln -s "$lib_dir/vboxvideo_drv.o" "$modules_dir/drivers/vboxvideo_drv.o" - ln -s "$lib_dir/vboxmouse_drv.o" "$modules_dir/input/vboxmouse_drv.o" + xserver_version="XFree86 4.2/4.3 and X.Org 6.7/6.8" + driver_ext=.o + vboxvideo_src=vboxvideo_drv.o + vboxmouse_src=vboxmouse_drv.o automouse="" - succ_msg + newmouse="" ;; * ) echo "Warning: unknown version of the X Window System installed. Not installing" @@ -421,13 +418,16 @@ setup() dox11config="" ;; esac - if [ -n "$vboxvideo_src" -a -n "$vboxmouse_src" ]; then - rm "$modules_dir/drivers/vboxvideo_drv.so" 2>/dev/null - rm "$modules_dir/input/vboxmouse_drv.so" 2>/dev/null - ln -s "$lib_dir/$vboxvideo_src" "$modules_dir/drivers/vboxvideo_drv.so" - ln -s "$lib_dir/$vboxmouse_src" "$modules_dir/input/vboxmouse_drv.so" && - succ_msg - fi + begin "Installing $xserver_version modules" + rm "$modules_dir/drivers/vboxvideo_drv$driver_ext" 2>/dev/null + rm "$modules_dir/input/vboxmouse_drv$driver_ext" 2>/dev/null + case "$vboxvideo_src" in ?*) + ln -s "$lib_dir/$vboxvideo_src" "$modules_dir/drivers/vboxvideo_drv$driver_ext";; + esac + case "$vboxmouse_src" in ?*) + ln -s "$lib_dir/$vboxmouse_src" "$modules_dir/input/vboxmouse_drv$driver_ext";; + esac + succ_msg if test -n "$dox11config"; then begin "Setting up the Window System to use the Guest Additions" @@ -469,34 +469,6 @@ setup() touch "$nobak" fi fi - # X.Org Server versions starting with 1.5 can do mouse auto-detection, - # to make our lives easier and spare us the nasty hacks. - test -n "$automouse" && - if [ -d /etc/hal/fdi/policy ] - then - # Install hal information about the mouse driver so that X.Org - # knows to load it. - install -o 0 -g 0 -m 0644 "$share_dir/90-vboxguest.fdi" /etc/hal/fdi/policy - # Delete the hal cache so that it notices our fdi file - rm -r /var/cache/hald/fdi-cache 2> /dev/null - fi - if test -n "$doxorgconfd" - then - if test -d /etc/udev/rules.d - then - install -o 0 -g 0 -m 0644 "$share_dir/70-xorg-vboxmouse.rules" /etc/udev/rules.d - # This is normally silent. I have purposely not redirected - # error output as I want to know if something goes wrong, - # particularly if the command syntax ever changes. - udevadm trigger --action=change --subsystem-match=misc - fi - test -d /usr/share/X11/xorg.conf.d && - install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/share/X11/xorg.conf.d - test -d /usr/lib/X11/xorg.conf.d && - install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/lib/X11/xorg.conf.d - test -d /etc/X11/xorg.conf.d && - install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /etc/X11/xorg.conf.d - fi succ_msg test -n "$generated" && cat << EOF @@ -638,11 +610,6 @@ EOF rm /usr/share/autostart/vboxclient.desktop 2>/dev/null # Remove other files - rm /etc/hal/fdi/policy/90-vboxguest.fdi 2>/dev/null - rm /etc/udev/rules.d/70-xorg-vboxmouse.rules 2>/dev/null - udevadm trigger --action=change --subsystem-match=misc 2>/dev/null - rm /usr/lib/X11/xorg.conf.d/50-vboxmouse.conf 2>/dev/null - rm /usr/share/X11/xorg.conf.d/50-vboxmouse.conf 2>/dev/null rm /usr/share/xserver-xorg/pci/vboxvideo.ids 2>/dev/null } diff --git a/src/VBox/Additions/linux/installer/vboxadd.sh b/src/VBox/Additions/linux/installer/vboxadd.sh index 326b8ceed..18d752d64 100755 --- a/src/VBox/Additions/linux/installer/vboxadd.sh +++ b/src/VBox/Additions/linux/installer/vboxadd.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# Linux Additions kernel module init script ($Revision: 38093 $) +# Linux Additions kernel module init script ($Revision: 73698 $) # # @@ -196,14 +196,18 @@ test_sane_kernel_dir() fi } -fail() +show_error() { if [ "$system" = "gentoo" ]; then eerror $1 - exit 1 fi fail_msg echo "($1)" +} + +fail() +{ + show_error "$1" exit 1 } @@ -388,7 +392,8 @@ setup_modules() if ! $BUILDVBOXGUEST \ --save-module-symvers /tmp/vboxguest-Module.symvers \ --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" + show_error "Look at $LOG to find out what went wrong" + return 1 fi succ_msg fi @@ -397,7 +402,8 @@ setup_modules() if ! $BUILDVBOXSF \ --use-module-symvers /tmp/vboxguest-Module.symvers \ --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" + show_error "Look at $LOG to find out what went wrong" + return 1 fi succ_msg fi @@ -406,7 +412,8 @@ setup_modules() if ! $BUILDVBOXVIDEO \ --use-module-symvers /tmp/vboxguest-Module.symvers \ --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" + show_error "Look at $LOG to find out what went wrong" + return 1 fi succ_msg fi diff --git a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk index c1d35c038..8baa2ef52 100644 --- a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk +++ b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38194 2011-07-27 09:55:19Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxsf (linux shared folders module). # diff --git a/src/VBox/Additions/linux/sharedfolders/files_vboxsf b/src/VBox/Additions/linux/sharedfolders/files_vboxsf index 6d94398c8..6ad29a626 100644..100755 --- a/src/VBox/Additions/linux/sharedfolders/files_vboxsf +++ b/src/VBox/Additions/linux/sharedfolders/files_vboxsf @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxsf 37350 2011-06-07 13:44:25Z vboxsync $ +# $Id: files_vboxsf $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c b/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c index 9a8c02cd0..16f814ebf 100644 --- a/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c +++ b/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c @@ -530,7 +530,7 @@ main (int argc, char **argv) break; case 3: - panic_err("%s: Could not add an entry to the mount table.", argv[0]); + /* panic_err("%s: Could not add an entry to the mount table.", argv[0]); */ break; default: diff --git a/src/VBox/Additions/linux/sharedfolders/utils.c b/src/VBox/Additions/linux/sharedfolders/utils.c index cb12d8337..22d5b01ad 100644 --- a/src/VBox/Additions/linux/sharedfolders/utils.c +++ b/src/VBox/Additions/linux/sharedfolders/utils.c @@ -18,6 +18,7 @@ */ #include "vfsmod.h" +#include <iprt/asm.h> #include <linux/nfs_fs.h> #include <linux/vfs.h> @@ -827,9 +828,13 @@ struct dentry_operations sf_dentry_ops = .d_revalidate = sf_dentry_revalidate }; -int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name) +int sf_init_backing_dev(struct sf_glob_info *sf_g) { int rc = 0; + /* Each new shared folder map gets a new uint64_t identifier, + * allocated in sequence. We ASSUME the sequence will not wrap. */ + static uint64_t s_u64Sequence = 0; + uint64_t u64CurrentSequence = ASMAtomicIncU64(&s_u64Sequence); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) sf_g->bdi.ra_pages = 0; /* No readahead */ @@ -844,7 +849,8 @@ int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name) rc = bdi_init(&sf_g->bdi); # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) if (!rc) - rc = bdi_register(&sf_g->bdi, NULL, "vboxsf-%s", name); + rc = bdi_register(&sf_g->bdi, NULL, "vboxsf-%llu", + (unsigned long long)u64CurrentSequence); # endif /* >= 2.6.26 */ # endif /* >= 2.6.24 */ #endif /* >= 2.6.0 */ diff --git a/src/VBox/Additions/linux/sharedfolders/vbsfmount.c b/src/VBox/Additions/linux/sharedfolders/vbsfmount.c index 2f580db50..f6f704cb8 100644 --- a/src/VBox/Additions/linux/sharedfolders/vbsfmount.c +++ b/src/VBox/Additions/linux/sharedfolders/vbsfmount.c @@ -1,4 +1,4 @@ -/* $Id: vbsfmount.c 31205 2010-07-29 12:48:43Z vboxsync $ */ +/* $Id: vbsfmount.c $ */ /** @file * vbsfmount - Commonly used code to mount shared folders on Linux-based * systems. Currently used by mount.vboxsf and VBoxService. diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.c b/src/VBox/Additions/linux/sharedfolders/vfsmod.c index b0228096e..95aad5279 100644 --- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c +++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c @@ -277,10 +277,13 @@ static int sf_read_super_aux(struct super_block *sb, void *data, int flags) goto fail3; } - if (sf_init_backing_dev(sf_g, info->name)) + if (sf_init_backing_dev(sf_g)) { err = -EINVAL; LogFunc(("could not init bdi\n")); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25) + unlock_new_inode(iroot); +#endif goto fail4; } diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.h b/src/VBox/Additions/linux/sharedfolders/vfsmod.h index 51920eef6..21ab0c14b 100644 --- a/src/VBox/Additions/linux/sharedfolders/vfsmod.h +++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.h @@ -116,7 +116,7 @@ extern void sf_dir_info_empty(struct sf_dir_info *p); extern struct sf_dir_info *sf_dir_info_alloc(void); extern int sf_dir_read_all(struct sf_glob_info *sf_g, struct sf_inode_info *sf_i, struct sf_dir_info *sf_d, SHFLHANDLE handle); -extern int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name); +extern int sf_init_backing_dev(struct sf_glob_info *sf_g); extern void sf_done_backing_dev(struct sf_glob_info *sf_g); #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) diff --git a/src/VBox/Additions/solaris/DRM/Makefile.kmk b/src/VBox/Additions/solaris/DRM/Makefile.kmk index 320f3c035..0daddebd6 100644 --- a/src/VBox/Additions/solaris/DRM/Makefile.kmk +++ b/src/VBox/Additions/solaris/DRM/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 33656 2010-11-01 14:18:11Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo DRM module (Solaris kernel OpenGL module). # diff --git a/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c b/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c index e7e7561f1..c49ec803b 100644 --- a/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c +++ b/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c @@ -1,4 +1,4 @@ -/* $Id: vboxvideo_drm.c 33656 2010-11-01 14:18:11Z vboxsync $ */ +/* $Id: vboxvideo_drm.c $ */ /** @file * vboxvideo_drm - Direct Rendering Module, Solaris Specific Code. */ diff --git a/src/VBox/Additions/solaris/Installer/makepackage.sh b/src/VBox/Additions/solaris/Installer/makepackage.sh index b3b804487..b3b804487 100644..100755 --- a/src/VBox/Additions/solaris/Installer/makepackage.sh +++ b/src/VBox/Additions/solaris/Installer/makepackage.sh diff --git a/src/VBox/Additions/solaris/Installer/postinstall.sh b/src/VBox/Additions/solaris/Installer/postinstall.sh index 262499b86..262499b86 100644..100755 --- a/src/VBox/Additions/solaris/Installer/postinstall.sh +++ b/src/VBox/Additions/solaris/Installer/postinstall.sh diff --git a/src/VBox/Additions/solaris/Installer/preremove.sh b/src/VBox/Additions/solaris/Installer/preremove.sh index 58bade74c..58bade74c 100644..100755 --- a/src/VBox/Additions/solaris/Installer/preremove.sh +++ b/src/VBox/Additions/solaris/Installer/preremove.sh diff --git a/src/VBox/Additions/solaris/Makefile.kmk b/src/VBox/Additions/solaris/Makefile.kmk index 67a83459b..fdb4d7f92 100644 --- a/src/VBox/Additions/solaris/Makefile.kmk +++ b/src/VBox/Additions/solaris/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Solaris guest additions base directory. # diff --git a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk index 58f042d4b..12c66abdc 100644 --- a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk +++ b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38078 2011-07-19 17:24:10Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Solaris Shared folder kernel module. # diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs.h index 13654a569..1e15e922d 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs.h 33994 2010-11-11 14:26:08Z vboxsync $ */ +/* $Id: vboxfs.h $ */ /** @file * VirtualBox File System Driver for Solaris Guests, Internal Header. */ diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c index 531e4e9b3..4d92587f0 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c @@ -1,4 +1,4 @@ -/* $Id: vboxfs_mount.c 37833 2011-07-08 10:16:08Z vboxsync $ */ +/* $Id: vboxfs_mount.c $ */ /** @file * VirtualBox File System Mount Helper, Solaris host. * Userspace mount wrapper that parses mount (or user-specified) options diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c index a16b3ee82..d0ecc4446 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c @@ -108,6 +108,7 @@ sfprov_connect(int version) } else cmn_err(CE_WARN, "sfprov_connect: vboxInit() failed rc=%d\n", rc); + return (NULL); } void @@ -138,7 +139,7 @@ sfprov_mount(sfp_connection_t *conn, char *path, sfp_mount_t **mnt) m = kmem_zalloc(sizeof (*m), KM_SLEEP); str = sfprov_string(path, &size); rc = vboxCallMapFolder(&vbox_client, str, &m->map); - if (!RT_SUCCESS(rc)) { + if (RT_FAILURE(rc)) { cmn_err(CE_WARN, "sfprov_mount: vboxCallMapFolder() failed rc=%d\n", rc); kmem_free(m, sizeof (*m)); *mnt = NULL; @@ -157,7 +158,7 @@ sfprov_unmount(sfp_mount_t *mnt) int rc; rc = vboxCallUnmapFolder(&vbox_client, &mnt->map); - if (!RT_SUCCESS(rc)) { + if (RT_FAILURE(rc)) { cmn_err(CE_WARN, "sfprov_mount: vboxCallUnmapFolder() failed rc=%d\n", rc); rc = EINVAL; } else { @@ -335,6 +336,8 @@ sfprov_open(sfp_mount_t *mnt, char *path, sfp_file_t **fp) return (ENOENT); } } + else + kmem_free(str, size); newfp = kmem_alloc(sizeof(sfp_file_t), KM_SLEEP); newfp->handle = parms.Handle; newfp->map = mnt->map; @@ -359,9 +362,9 @@ sfprov_trunc(sfp_mount_t *mnt, char *path) parms.CreateFlags = SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READWRITE | SHFL_CF_ACT_OVERWRITE_IF_EXISTS; rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms); + kmem_free(str, size); if (RT_FAILURE(rc)) { - kmem_free(str, size); return (EINVAL); } (void)vboxCallClose(&vbox_client, &mnt->map, parms.Handle); diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h index 77939ff74..0dd49d17b 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs_prov.h 31691 2010-08-16 12:59:23Z vboxsync $ */ +/* $Id: vboxfs_prov.h $ */ /** @file * VirtualBox File System for Solaris Guests, provider header. * Portions contributed by: Ronald. diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h index d088d818d..f222b808a 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs_vfs.h 31691 2010-08-16 12:59:23Z vboxsync $ */ +/* $Id: vboxfs_vfs.h $ */ /** @file * VirtualBox File System for Solaris Guests, VFS header. */ diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c index 317e8e6b8..e54629309 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c @@ -210,7 +210,6 @@ sfnode_get_vnode(sfnode_t *node) LogFlowFunc((" %s gets vnode 0x%p\n", node->sf_path, vp)); vp->v_type = node->sf_type; vp->v_vfsp = node->sf_sffs->sf_vfsp; - VFS_HOLD(vp->v_vfsp); vn_setops(vp, sffs_ops); vp->v_flag = VNOSWAP | VNOMAP; /* @todo -XXX- remove VNOMAP when ro-mmap is working*/ vn_exists(vp); @@ -246,6 +245,7 @@ sfnode_make( LogFlowFunc(("sffs_make(%s)\n", path)); node = kmem_alloc(sizeof (*node), KM_SLEEP); node->sf_sffs = sffs; + VFS_HOLD(node->sf_sffs->sf_vfsp); node->sf_path = path; node->sf_ino = sffs->sf_ino++; node->sf_type = type; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h index df663f832..11e5d3905 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs_vnode.h 37806 2011-07-06 15:11:02Z vboxsync $ */ +/* $Id: vboxfs_vnode.h $ */ /** @file * VirtualBox File System for Solaris Guests, VNode header. */ diff --git a/src/VBox/Additions/solaris/Virtio/Makefile.kmk b/src/VBox/Additions/solaris/Virtio/Makefile.kmk index 6c92a5679..9a80aef1e 100644 --- a/src/VBox/Additions/solaris/Virtio/Makefile.kmk +++ b/src/VBox/Additions/solaris/Virtio/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34233 2010-11-22 11:25:55Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for Solaris Virtio drivers. # diff --git a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c index 370221bac..c521c0be9 100644 --- a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c @@ -1,4 +1,4 @@ -/* $Id: Virtio-solaris.c 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: Virtio-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris. */ diff --git a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h index 68e389b9d..b7bef0736 100644 --- a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h +++ b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h @@ -1,4 +1,4 @@ -/* $Id: Virtio-solaris.h 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: Virtio-solaris.h $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, header. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c index 91c2f638f..0fe733ce2 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VirtioNet-solaris.c 34143 2010-11-17 20:05:36Z vboxsync $ */ +/* $Id: VirtioNet-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Network Driver for Solaris. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c index 0d5fe55f3..4a5737a10 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VirtioPci-solaris.c 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: VirtioPci-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, PCI Hypervisor Interface. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h index 004cc8106..df9ab0ed8 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h +++ b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h @@ -1,4 +1,4 @@ -/* $Id: VirtioPci-solaris.h 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: VirtioPci-solaris.h $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, PCI Hypervisor Interface. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c index d8e6921ca..81e3a12db 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VirtioRing-solaris.c 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: VirtioRing-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, Ring implementation. */ diff --git a/src/VBox/Additions/x11/Installer/50-vboxmouse.conf b/src/VBox/Additions/x11/Installer/50-vboxmouse.conf deleted file mode 100644 index b7c15320d..000000000 --- a/src/VBox/Additions/x11/Installer/50-vboxmouse.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "InputClass" - Identifier "vboxmouse" - MatchDevicePath "/dev/vboxguest" - Driver "vboxmouse" -EndSection diff --git a/src/VBox/Additions/x11/Installer/x11config.pl b/src/VBox/Additions/x11/Installer/x11config.pl index 333c659f2..333c659f2 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config.pl +++ b/src/VBox/Additions/x11/Installer/x11config.pl diff --git a/src/VBox/Additions/x11/Installer/x11config15.pl b/src/VBox/Additions/x11/Installer/x11config15.pl index 877add382..877add382 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config15.pl +++ b/src/VBox/Additions/x11/Installer/x11config15.pl diff --git a/src/VBox/Additions/x11/Installer/x11config15sol.pl b/src/VBox/Additions/x11/Installer/x11config15sol.pl index dc6e59579..dc6e59579 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config15sol.pl +++ b/src/VBox/Additions/x11/Installer/x11config15sol.pl diff --git a/src/VBox/Additions/x11/Installer/x11config15suse.pl b/src/VBox/Additions/x11/Installer/x11config15suse.pl index e75fdcc2b..e75fdcc2b 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config15suse.pl +++ b/src/VBox/Additions/x11/Installer/x11config15suse.pl diff --git a/src/VBox/Additions/x11/Installer/x11restore.pl b/src/VBox/Additions/x11/Installer/x11restore.pl index eba375855..96c1aae97 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11restore.pl +++ b/src/VBox/Additions/x11/Installer/x11restore.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# $Revision: 32388 $ +# $Revision: 65744 $ # # Restore xorg.conf while removing Guest Additions. # diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk index 2d1c46c4a..c810f328b 100644 --- a/src/VBox/Additions/x11/Makefile.kmk +++ b/src/VBox/Additions/x11/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the X11 Guest Additions. # diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index ee73ed08c..61947e196 100644 --- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest Addition X11 Client. # diff --git a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp index 60eb2a04c..1e6421909 100644 --- a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp +++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp @@ -1,4 +1,4 @@ -/** $Id: clipboard.cpp 37434 2011-06-14 13:14:57Z vboxsync $ */ +/** $Id: clipboard.cpp $ */ /** @file * Guest Additions - X11 Shared Clipboard. */ diff --git a/src/VBox/Additions/x11/VBoxClient/display.cpp b/src/VBox/Additions/x11/VBoxClient/display.cpp index 645273033..f86dac132 100644 --- a/src/VBox/Additions/x11/VBoxClient/display.cpp +++ b/src/VBox/Additions/x11/VBoxClient/display.cpp @@ -1,4 +1,4 @@ -/* $Id: display.cpp 34918 2010-12-09 18:08:01Z vboxsync $ */ +/* $Id: display.cpp $ */ /** @file * X11 guest client - display management. */ diff --git a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp index cf55d1771..a8b2ffe70 100644 --- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp +++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp @@ -21,10 +21,13 @@ #include <iprt/thread.h> #ifdef VBOX_WITH_DBUS - #include <VBox/dbus.h> +# include <VBox/dbus.h> #endif #include <VBox/log.h> #include <VBox/VBoxGuestLib.h> +#ifdef VBOX_OSE +# include <VBox/version.h> +#endif #include "VBoxClient.h" @@ -163,14 +166,20 @@ public: { if (bUpdate) { - char szMsg[256]; + char szMsg[1024]; char szTitle[64]; /** @todo add some translation macros here */ RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions update available!"); +#ifndef VBOX_OSE RTStrPrintf(szMsg, sizeof(szMsg), "Your guest is currently running the Guest Additions version %s. " "We recommend updating to the latest version (%s) by choosing the " "install option from the Devices menu.", pszGuestVersion, pszHostVersion); +#else +/* This is the message which appears for non-Oracle builds of the + * Guest Additions. Distributors are encouraged to customise this. */ + RTStrPrintf(szMsg, sizeof(szMsg), "Your virtual machine is currently running the Guest Additions version %s. Since you are running a version of the Guest Additions provided by the operating system you installed in the virtual machine we recommend that you update it to at least version %s using that system's update features, or alternatively that you remove this version and then install the " VBOX_VENDOR_SHORT " Guest Additions package using the install option from the Devices menu. Please consult the documentation for the operating system you are running to find out how to update or remove the current Guest Additions package.", pszGuestVersion, pszHostVersion); +#endif rc = showNotify(szTitle, szMsg); LogRel(("VBoxClient: VirtualBox Guest Additions update available!")); if (RT_FAILURE(rc)) diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp index 3941f0464..896cc36c1 100644 --- a/src/VBox/Additions/x11/VBoxClient/main.cpp +++ b/src/VBox/Additions/x11/VBoxClient/main.cpp @@ -261,13 +261,6 @@ int main(int argc, char *argv[]) LogRel(("Failed to connect to the VirtualBox kernel service\n")); return 1; } - if (g_szPidFile[0] && RT_FAILURE(VbglR3PidFile(g_szPidFile, &g_hPidFile))) - { - RTPrintf("Failed to create a pidfile. Exiting.\n"); - LogRel(("Failed to create a pidfile. Exiting.\n")); - VbglR3Term(); - return 1; - } if (fDaemonise) { rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */); @@ -281,6 +274,13 @@ int main(int argc, char *argv[]) return 1; } } + if (g_szPidFile[0] && RT_FAILURE(VbglR3PidFile(g_szPidFile, &g_hPidFile))) + { + RTPrintf("Failed to create a pidfile. Exiting.\n"); + LogRel(("Failed to create a pidfile. Exiting.\n")); + VbglR3Term(); + return 1; + } /* Set signal handlers to clean up on exit. */ vboxClientSetSignalHandlers(); /* Set an X11 error handler, so that we don't die when we get unavoidable errors. */ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk index 5422a717f..74f579045 100644 --- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Additions XFree86 and X.org mouse drivers. # @@ -154,6 +154,8 @@ vboxmouse_drv_16_SOURCES = \ vboxmouse_15.c +ifneq ($(KBUILD_TARGET), linux) + # # vboxmouse_drv_17 # @@ -233,6 +235,7 @@ vboxmouse_drv_110_INCS := \ vboxmouse_drv_110_SOURCES = \ vboxmouse_15.c +endif # neq ($(KBUILD_TARGET),linux) # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. @@ -301,6 +304,8 @@ $$(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run: $$(vboxmouse_drv_16_1_STAGE_TA $(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15 $(QUIET)$(APPEND) -t "$@" "done" +ifneq ($(KBUILD_TARGET), linux) + TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run $$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET) @@ -333,9 +338,11 @@ $$(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run: $$(vboxmouse_drv_110_1_STAGE $(vboxmouse_drv_110_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15 $(QUIET)$(APPEND) -t "$@" "done" +endif # neq ($(KBUILD_TARGET),linux) + endif # ! VBOX_ONLY_SDK endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) - endif # eq ($(KBUILD_TARGET),linux) + endif # 1of ($(KBUILD_TARGET),linux solaris) # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES diff --git a/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c b/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c index d9692399e..b53f149b5 100644 --- a/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c +++ b/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c @@ -48,10 +48,7 @@ int VBoxMouseInit(void) return 1; } - rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL); - if (RT_SUCCESS(rc)) - rc = VbglR3SetMouseStatus( fFeatures - | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE); + rc = VbglR3SetMouseStatus(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE); if (RT_FAILURE(rc)) { ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n", @@ -97,13 +94,6 @@ int VBoxMouseQueryPosition(unsigned int *pcx, unsigned int *pcy) int VBoxMouseFini(void) { - if (gDeviceOpenFailed) - return VINF_SUCCESS; - uint32_t fFeatures; - int rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL); - if (RT_SUCCESS(rc)) - rc = VbglR3SetMouseStatus( fFeatures - & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE); VbglR3Term(); - return rc; + return VINF_SUCCESS; } diff --git a/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c b/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c index 861dbc807..c372da3c1 100644 --- a/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c +++ b/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c @@ -89,7 +89,7 @@ static VMMDevReqMouseStatus *g_vmmreqMouseStatus = NULL; */ int VBoxMouseInit(void) { - VMMDevReqMouseStatus req; + uint32_t fFeatures; /* return immediately if already initialized */ if (g_vboxguestHandle != -1) @@ -114,12 +114,10 @@ int VBoxMouseInit(void) vmmdevInitRequest((VMMDevRequestHeader*)g_vmmreqMouseStatus, VMMDevReq_GetMouseStatus); /* tell the host that we want absolute coordinates */ - vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus); - req.mouseFeatures = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR; - req.pointerXPos = 0; - req.pointerYPos = 0; + fFeatures = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE; /** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */ - if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0) + if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures) + < 0) { ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n", errno, strerror(errno)); @@ -174,18 +172,8 @@ int VBoxMouseFini(void) /* If we are not initialised, there is nothing to do */ if (g_vboxguestHandle < 0) return 0; - /* tell VMM that we no longer support absolute mouse handling */ - vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus); - req.mouseFeatures = 0; - req.pointerXPos = 0; - req.pointerYPos = 0; -/** @todo r=bird: Michael, ditto. */ - if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0) - { - ErrorF("ioctl to vboxguest module failed, rc = %d (%s)\n", - errno, strerror(errno)); - } - + /* Tell VMM that we no longer support absolute mouse handling - done + * automatically when we close the handle. */ free(g_vmmreqMouseStatus); g_vmmreqMouseStatus = NULL; close(g_vboxguestHandle); diff --git a/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c b/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c index 72867f01a..6d7c38d48 100644 --- a/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c +++ b/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c @@ -60,17 +60,10 @@ enum { -#if ABI_XINPUT_VERSION > SET_ABI_VERSION(2, 0) -/* The X server does (to my mind) incorrect rounding, so we adjust our range to - * compensate. */ - ADJUST_RANGE = 32, -#else - ADJUST_RANGE = 0, -#endif /** The minumum value our device can return */ - RANGE_MIN = ADJUST_RANGE, + RANGE_MIN = 0, /** The maximum value our device can return */ - RANGE_MAX = 0xFFFF + ADJUST_RANGE + RANGE_MAX = 0xFFFF }; static void diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk index 58fd5e149..24cdccffb 100644 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Linux Additions X.org graphics driver. # @@ -325,6 +325,33 @@ vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) +# +# vboxvideo_drv_111 +# +DLLS += vboxvideo_drv_111 +vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD +vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS) +vboxvideo_drv_111_DEFS := $(vboxvideo_drv_15_DEFS) +## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +vboxvideo_drv_111_INCS = \ + $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \ + $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \ + $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \ + $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \ + $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \ + $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \ + $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \ + $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \ + $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \ + $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ + $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \ + $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 +vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include +vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_15_SOURCES) + + # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. ifdef VBOX_WITH_TESTCASES @@ -424,6 +451,14 @@ $$(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run: $$(vboxvideo_drv_110_1_STAGE $(vboxvideo_drv_110_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined $(QUIET)$(APPEND) -t "$@" "done" + TESTING += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run + OTHERS += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run +$$(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run: $$(vboxvideo_drv_111_1_STAGE_TARGET) + $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) + $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \ + $(vboxvideo_drv_111_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined + $(QUIET)$(APPEND) -t "$@" "done" + endif # ! VBOX_ONLY_SDK endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) endif # eq ($(KBUILD_TARGET),linux) diff --git a/src/VBox/Additions/x11/vboxvideo/edid.c b/src/VBox/Additions/x11/vboxvideo/edid.c index c73a70fce..9f7f73a6e 100644 --- a/src/VBox/Additions/x11/vboxvideo/edid.c +++ b/src/VBox/Additions/x11/vboxvideo/edid.c @@ -1,4 +1,4 @@ -/* $Id: edid.c 35776 2011-01-30 00:14:29Z vboxsync $ */ +/* $Id: edid.c $ */ /** @file * * Linux Additions X11 graphics driver, EDID construction diff --git a/src/VBox/Additions/x11/vboxvideo/pointer.c b/src/VBox/Additions/x11/vboxvideo/pointer.c index f59fd4867..ea7572ddd 100644 --- a/src/VBox/Additions/x11/vboxvideo/pointer.c +++ b/src/VBox/Additions/x11/vboxvideo/pointer.c @@ -188,13 +188,6 @@ vbox_init(int scrnIndex, VBOXPtr pVBox) rc = FALSE; } pVBox->useDevice = rc; - /* We can't switch to a software cursor at will without help from - * VBoxClient. So tell that to the host and wait for VBoxClient to - * change this. */ - vrc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL); - if (RT_SUCCESS(vrc)) - VbglR3SetMouseStatus( fMouseFeatures - | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR); return rc; } diff --git a/src/VBox/Additions/x11/vboxvideo/setmode.c b/src/VBox/Additions/x11/vboxvideo/setmode.c index 00c69070b..0ede80526 100644 --- a/src/VBox/Additions/x11/vboxvideo/setmode.c +++ b/src/VBox/Additions/x11/vboxvideo/setmode.c @@ -1,4 +1,4 @@ -/* $Id: setmode.c 36020 2011-02-18 14:18:51Z vboxsync $ */ +/* $Id: setmode.c $ */ /** @file * * Linux Additions X11 graphics driver, mode setting diff --git a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk index ca773307f..171acbb55 100644 --- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 37520 2011-06-16 20:57:39Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo testcases. # diff --git a/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c b/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c index 0bc1020b4..b30a35b00 100644 --- a/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c +++ b/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c @@ -1,4 +1,4 @@ -/* $Id: tstSetModeXOrg.c 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: tstSetModeXOrg.c $ */ /** @file * vboxvideo unit test - modesetting. */ diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c index 22749cefd..dd32da3af 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c @@ -1,4 +1,4 @@ -/* $Id: vboxvideo.c 38207 2011-07-27 21:56:28Z vboxsync $ */ +/* $Id: vboxvideo.c $ */ /** @file * * Linux Additions X11 graphics driver diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c b/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c index 644275933..ab9324ed3 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c @@ -1,4 +1,4 @@ -/** @file $Id: vboxvideo_dri.c 35268 2010-12-20 23:30:58Z vboxsync $ +/** @file $Id: vboxvideo_dri.c $ * * VirtualBox X11 Additions graphics driver, DRI support */ diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h index 55ab12122..835bdf4b1 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h @@ -1,4 +1,4 @@ -/* $Id: sparc.h,v 1.3 2001/06/06 22:55:28 davem69 Exp $ */ +/* $Id: sparc.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h index fdbd154d5..a6b68d527 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h @@ -1,4 +1,4 @@ -/* $Id: x86-64.h,v 1.1 2005/05/07 16:59:59 brianp Exp $ */ +/* $Id: x86-64.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h index 1f2fd8e8b..673d45994 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h @@ -1,4 +1,4 @@ -/* $Id: 3dnow.h,v 1.6 2002/04/09 14:58:03 keithw Exp $ */ +/* $Id: 3dnow.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h index cccf80198..7540c6a49 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h @@ -1,4 +1,4 @@ -/* $Id: clip_args.h,v 1.5 2002/10/29 20:28:57 brianp Exp $ */ +/* $Id: clip_args.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h index 997729832..e093b1872 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_asm.h,v 1.12 2005/07/16 00:56:20 ajax Exp $ */ +/* $Id: common_x86_asm.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h index 90509775c..9a0cedc99 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_features.h,v 1.6 2003/01/21 16:14:00 brianp Exp $ */ +/* $Id: common_x86_features.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h index ba155caae..43033732b 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_macros.h,v 1.3 2002/10/29 20:28:58 brianp Exp $ */ +/* $Id: common_x86_macros.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h index 1b43d57a2..1e7d79c67 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h @@ -1,4 +1,4 @@ -/* $Id: norm_args.h,v 1.4 2003/11/26 08:32:36 dborca Exp $ */ +/* $Id: norm_args.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h index 98146a904..fe1233653 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h @@ -1,4 +1,4 @@ -/* $Id: sse.h,v 1.2 2002/04/09 14:58:03 keithw Exp $ */ +/* $Id: sse.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h index a646aff46..8d529110b 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h @@ -1,4 +1,4 @@ -/* $Id: x86.h,v 1.5 2002/04/09 14:58:03 keithw Exp $ */ +/* $Id: x86.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h index 89a04205c..6bc1b8060 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h @@ -1,4 +1,4 @@ -/* $Id: xform_args.h,v 1.5 2002/10/29 20:28:58 brianp Exp $ */ +/* $Id: xform_args.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11stubs/Makefile.kmk b/src/VBox/Additions/x11/x11stubs/Makefile.kmk index b7f6bfe04..37279143c 100644 --- a/src/VBox/Additions/x11/x11stubs/Makefile.kmk +++ b/src/VBox/Additions/x11/x11stubs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the X11 linker stub (import) libraries. # diff --git a/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c b/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c index 50aac7dd3..401eec1d7 100644 --- a/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c +++ b/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c @@ -1,4 +1,4 @@ -/* $Id: libXcomposite.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: libXcomposite.c $ */ /** @file * X.Org libXcomposite.so linker stub diff --git a/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c b/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c index aa6dbabf1..bcf008ea0 100644 --- a/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c +++ b/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c @@ -1,4 +1,4 @@ -/* $Id: libXdamage.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: libXdamage.c $ */ /** @file * X.Org libXdamage.so linker stub diff --git a/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c b/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c index 0aec41467..f83809adb 100644 --- a/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c +++ b/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c @@ -1,4 +1,4 @@ -/* $Id: libXext.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: libXext.c $ */ /** @file * X.Org libXext.so linker stub diff --git a/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c b/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c index 82dab131a..211f7f491 100644 --- a/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c +++ b/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c @@ -1,4 +1,4 @@ -/* $Id: libXfixes.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: libXfixes.c $ */ /** @file * X.Org libXfixes.so linker stub |