Changeset 10541 in vbox

Timestamp:

Jul 11, 2008 6:00:44 PM (17 years ago)

Author:

vboxsync

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

33229

Message:

Removed deprecated IOCTL namings.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (5 diffs)
• src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp (modified) (3 diffs)
• src/VBox/Additions/WINNT/VBoxControl/VBoxControl.cpp (modified) (3 diffs)
• src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp (modified) (18 diffs)
• src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp (modified) (7 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxMemBalloon.cpp (modified) (6 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxRestore.cpp (modified) (5 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp (modified) (8 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxStatistics.cpp (modified) (7 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp (modified) (6 diffs)
• src/VBox/Additions/WINNT/VBoxTray/testcase/tstSessionHack.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/include/VBoxGuestInternal.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuestLib/Init.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp (modified) (2 diffs)
• src/VBox/Additions/linux/daemon/vboxadd_timesync.c (modified) (1 diff)
• src/VBox/Additions/linux/module/cmc.c (modified) (1 diff)
• src/VBox/Additions/linux/module/hgcmcall.c (modified) (15 diffs)
• src/VBox/Additions/linux/module/vboxmod.c (modified) (17 diffs)
• src/VBox/Additions/x11/xgraphics/vboxutils_68.c (modified) (2 diffs)
• src/VBox/Additions/x11/xmouse/VBoxUtils_68.c (modified) (3 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -1142 +1142 @@
 /** IOCTL to VBoxGuest to query the VMMDev IO port region start. */
 #define VBOXGUEST_IOCTL_GETVMMDEVPORT   VBOXGUEST_IOCTL_CODE(1, sizeof(VBoxGuestPortInfo))
-#define IOCTL_VBOXGUEST_GETVMMDEVPORT   VBOXGUEST_IOCTL_GETVMMDEVPORT
 
 #pragma pack(4)
@@ -1153 +1152 @@
 /** IOCTL to VBoxGuest to wait for a VMMDev host notification */
 #define VBOXGUEST_IOCTL_WAITEVENT       VBOXGUEST_IOCTL_CODE(2, sizeof(VBoxGuestWaitEventInfo))
-#define IOCTL_VBOXGUEST_WAITEVENT       VBOXGUEST_IOCTL_WAITEVENT
 
 /** IOCTL to VBoxGuest to interrupt (cancel) any pending WAITEVENTs and return.
@@ -1190 +1188 @@
  * @remark  The data buffer for this IOCtl has an variable size, keep this in mind
  *          on systems where this matters. */
-#define VBOXGUEST_IOCTL_VMMREQUEST(Size)    VBOXGUEST_IOCTL_CODE(3, (Size))
-#define IOCTL_VBOXGUEST_VMMREQUEST          VBOXGUEST_IOCTL_VMMREQUEST(sizeof(VMMDevRequestHeader))
+#define VBOXGUEST_IOCTL_VMMREQUEST                  VBOXGUEST_IOCTL_CODE(3, sizeof(VMMDevRequestHeader))
 
 /** Input and output buffer layout of the IOCTL_VBOXGUEST_CTL_FILTER_MASK. */
@@ -1203 +1200 @@
 /** IOCTL to VBoxGuest to control event filter mask. */
 #define VBOXGUEST_IOCTL_CTL_FILTER_MASK             VBOXGUEST_IOCTL_CODE(4, sizeof(VBoxGuestFilterMaskInfo))
-#define IOCTL_VBOXGUEST_CTL_FILTER_MASK             VBOXGUEST_IOCTL_CTL_FILTER_MASK
 
 /** IOCTL to VBoxGuest to check memory ballooning. */
 #define VBOXGUEST_IOCTL_CTL_CHECK_BALLOON_MASK      VBOXGUEST_IOCTL_CODE(7, 100)
-#define IOCTL_VBOXGUEST_CTL_CHECK_BALLOON           VBOXGUEST_IOCTL_CTL_CHECK_BALLOON_MASK
 
 /** IOCTL to VBoxGuest to perform backdoor logging. */
@@ -1242 +1237 @@
 
 # define VBOXGUEST_IOCTL_HGCM_CONNECT       VBOXGUEST_IOCTL_CODE(16, sizeof(VBoxGuestHGCMConnectInfo))
-# define IOCTL_VBOXGUEST_HGCM_CONNECT       VBOXGUEST_IOCTL_HGCM_CONNECT
 # define VBOXGUEST_IOCTL_HGCM_DISCONNECT    VBOXGUEST_IOCTL_CODE(17, sizeof(VBoxGuestHGCMDisconnectInfo))
-# define IOCTL_VBOXGUEST_HGCM_DISCONNECT    VBOXGUEST_IOCTL_HGCM_DISCONNECT
-# define VBOXGUEST_IOCTL_HGCM_CALL(Size)    VBOXGUEST_IOCTL_CODE(18, (Size))
-# define IOCTL_VBOXGUEST_HGCM_CALL          VBOXGUEST_IOCTL_HGCM_CALL(sizeof(VBoxGuestHGCMCallInfo))
+# define VBOXGUEST_IOCTL_HGCM_CALL          VBOXGUEST_IOCTL_CODE(18, sizeof(VBoxGuestHGCMCallInfo))
 # define VBOXGUEST_IOCTL_CLIPBOARD_CONNECT  VBOXGUEST_IOCTL_CODE(19, sizeof(uint32_t))
-# define IOCTL_VBOXGUEST_CLIPBOARD_CONNECT  VBOXGUEST_IOCTL_CLIPBOARD_CONNECT
 
 # define VBOXGUEST_HGCM_CALL_PARMS(a)       ((HGCMFunctionParameter *)((uint8_t *)(a) + sizeof (VBoxGuestHGCMCallInfo)))

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/VBoxOGL.cpp

@@ -152 +152 @@
 
     if (DeviceIoControl(vboxOGLCtx.hGuestDrv,
-                        IOCTL_VBOXGUEST_HGCM_CONNECT,
+                        VBOXGUEST_IOCTL_HGCM_CONNECT,
                         &info, sizeof (info),
                         &info, sizeof (info),
@@ -220 +220 @@
 
         BOOL bRet = DeviceIoControl(vboxOGLCtx.hGuestDrv,
-                                    IOCTL_VBOXGUEST_HGCM_DISCONNECT,
+                                    VBOXGUEST_IOCTL_HGCM_DISCONNECT,
                                     &info, sizeof (info),
                                     &info, sizeof (info),
@@ -257 +257 @@
 
     if (DeviceIoControl (vboxOGLCtx.hGuestDrv,
-                         IOCTL_VBOXGUEST_HGCM_CALL,
+                         VBOXGUEST_IOCTL_HGCM_CALL,
                          pvData, cbData,
                          pvData, cbData,

trunk/src/VBox/Additions/WINNT/VBoxControl/VBoxControl.cpp

@@ -832 +832 @@
     DWORD cbReturned;
     if (DeviceIoControl (hDevice,
-                         IOCTL_VBOXGUEST_HGCM_CONNECT,
+                         VBOXGUEST_IOCTL_HGCM_CONNECT,
                          &info, sizeof (info),
                          &info, sizeof (info),
@@ -883 +883 @@
 
     if (DeviceIoControl (hDevice,
-                         IOCTL_VBOXGUEST_HGCM_CALL,
+                         VBOXGUEST_IOCTL_HGCM_CALL,
                          pMsg, cbMsg,
                          pMsg, cbMsg,
@@ -1005 +1005 @@
     DWORD cbReturned;
     DeviceIoControl (hDevice,
-                     IOCTL_VBOXGUEST_HGCM_DISCONNECT,
+                     VBOXGUEST_IOCTL_HGCM_DISCONNECT,
                      &info, sizeof (info),
                      &info, sizeof (info),

trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp

@@ -68 +68 @@
     vmmreqCredentials.u32Flags |= VMMDEV_CREDENTIALS_QUERYPRESENCE;
     DWORD cbReturned;
-    if (!DeviceIoControl(vboxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &vmmreqCredentials, sizeof(vmmreqCredentials),
+    if (!DeviceIoControl(vboxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &vmmreqCredentials, sizeof(vmmreqCredentials),
                          &vmmreqCredentials, sizeof(vmmreqCredentials), &cbReturned, NULL))
     {
@@ -96 +96 @@
     vmmreqCredentials.u32Flags |= VMMDEV_CREDENTIALS_CLEAR;
     DWORD cbReturned;
-    if (!DeviceIoControl(vboxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &vmmreqCredentials, sizeof(vmmreqCredentials),
+    if (!DeviceIoControl(vboxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &vmmreqCredentials, sizeof(vmmreqCredentials),
                          &vmmreqCredentials, sizeof(vmmreqCredentials), &cbReturned, NULL))
     {

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

@@ -623 +623 @@
         if (VBOX_FAILURE(rc) || VBOX_FAILURE(req->header.rc))
         {
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl IOCTL_VBOXGUEST_CTL_CHECK_BALLOON: error issuing request to VMMDev!"
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl VBOXGUEST_IOCTL_CTL_CHECK_BALLOON: error issuing request to VMMDev!"
                      "rc = %d, VMMDev rc = %Vrc\n", rc, req->header.rc));
         }
@@ -702 +702 @@
     switch (pStack->Parameters.DeviceIoControl.IoControlCode)
     {
-        case IOCTL_VBOXGUEST_GETVMMDEVPORT:
-        {
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl: IOCTL_VBOXGUEST_GETVMMDEVPORT\n"));
+        case VBOXGUEST_IOCTL_GETVMMDEVPORT:
+        {
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_GETVMMDEVPORT\n"));
 
             if (pStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof (VBoxGuestPortInfo))
@@ -722 +722 @@
         }
 
-        case IOCTL_VBOXGUEST_WAITEVENT:
+        case VBOXGUEST_IOCTL_WAITEVENT:
         {
             /* Need to be extended to support multiple waiters for an event,
@@ -728 +728 @@
              * time a wait event is arrived.
              */
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl: IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             if (pStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(VBoxGuestWaitEventInfo))
@@ -780 +780 @@
                 rc = KeWaitForSingleObject (&pDevExt->keventNotification, Executive /** @todo UserRequest? */,
                                             KernelMode, TRUE, &timeout);
-                dprintf(("IOCTL_VBOXGUEST_WAITEVENT: Wait returned %d -> event %x\n", rc, eventInfo->u32EventFlagsOut));
+                dprintf(("VBOXGUEST_IOCTL_WAITEVENT: Wait returned %d -> event %x\n", rc, eventInfo->u32EventFlagsOut));
 
                 if (!fTimeout && rc == STATUS_TIMEOUT)
@@ -797 +797 @@
         }
 
-        case IOCTL_VBOXGUEST_VMMREQUEST:
-        {
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl: IOCTL_VBOXGUEST_VMMREQUEST\n"));
+        case VBOXGUEST_IOCTL_VMMREQUEST:
+        {
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_VMMREQUEST\n"));
 
 #define CHECK_SIZE(s) \
@@ -840 +840 @@
                 if (VBOX_FAILURE(rc) || VBOX_FAILURE(req->rc))
                 {
-                    dprintf(("VBoxGuest::VBoxGuestDeviceControl IOCTL_VBOXGUEST_VMMREQUEST: error issuing request to VMMDev!"
+                    dprintf(("VBoxGuest::VBoxGuestDeviceControl VBOXGUEST_IOCTL_VMMREQUEST: error issuing request to VMMDev!"
                              "rc = %d, VMMDev rc = %Vrc\n", rc, req->rc));
                     Status = STATUS_UNSUCCESSFUL;
@@ -861 +861 @@
         }
 
-        case IOCTL_VBOXGUEST_CTL_FILTER_MASK:
+        case VBOXGUEST_IOCTL_CTL_FILTER_MASK:
         {
             VBoxGuestFilterMaskInfo *maskInfo;
@@ -886 +886 @@
          * uses the same waiting code.
          */
-        case IOCTL_VBOXGUEST_HGCM_CONNECT:
-        {
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl: IOCTL_VBOXGUEST_HGCM_CONNECT\n"));
+        case VBOXGUEST_IOCTL_HGCM_CONNECT:
+        {
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_HGCM_CONNECT\n"));
 
             if (pStack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(VBoxGuestHGCMConnectInfo))
@@ -921 +921 @@
             if (VBOX_FAILURE(rc))
             {
-                dprintf(("IOCTL_VBOXGUEST_HGCM_CONNECT: vbox rc = %Vrc\n", rc));
+                dprintf(("VBOXGUEST_IOCTL_HGCM_CONNECT: vbox rc = %Vrc\n", rc));
                 Status = STATUS_UNSUCCESSFUL;
             }
@@ -931 +931 @@
         } break;
 
-        case IOCTL_VBOXGUEST_HGCM_DISCONNECT:
-        {
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl: IOCTL_VBOXGUEST_HGCM_DISCONNECT\n"));
+        case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
+        {
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_HGCM_DISCONNECT\n"));
 
             if (pStack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(VBoxGuestHGCMDisconnectInfo))
@@ -962 +962 @@
             if (VBOX_FAILURE(rc))
             {
-                dprintf(("IOCTL_VBOXGUEST_HGCM_DISCONNECT: vbox rc = %Vrc\n", rc));
+                dprintf(("VBOXGUEST_IOCTL_HGCM_DISCONNECT: vbox rc = %Vrc\n", rc));
                 Status = STATUS_UNSUCCESSFUL;
             }
@@ -972 +972 @@
         } break;
 
-        case IOCTL_VBOXGUEST_HGCM_CALL:
-        {
-            dprintf(("VBoxGuest::VBoxGuestDeviceControl: IOCTL_VBOXGUEST_HGCM_CALL\n"));
+        case VBOXGUEST_IOCTL_HGCM_CALL:
+        {
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl: VBOXGUEST_IOCTL_HGCM_CALL\n"));
 
             Status = vboxHGCMVerifyIOBuffers (pStack,
@@ -991 +991 @@
             if (VBOX_FAILURE(rc))
             {
-                dprintf(("IOCTL_VBOXGUEST_HGCM_CALL: vbox rc = %Vrc\n", rc));
+                dprintf(("VBOXGUEST_IOCTL_HGCM_CALL: vbox rc = %Vrc\n", rc));
                 Status = STATUS_UNSUCCESSFUL;
             }
@@ -1003 +1003 @@
 
 #ifdef VBOX_WITH_VRDP_SESSION_HANDLING
-        case IOCTL_VBOXGUEST_ENABLE_VRDP_SESSION:
+        case VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION:
         {
             if (!pDevExt->fVRDPEnabled)
@@ -1016 +1016 @@
         }
 
-        case IOCTL_VBOXGUEST_DISABLE_VRDP_SESSION:
+        case VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION:
         {
             if (pDevExt->fVRDPEnabled)
@@ -1031 +1031 @@
 
 #ifdef VBOX_WITH_MANAGEMENT
-        case IOCTL_VBOXGUEST_CTL_CHECK_BALLOON:
+        case VBOXGUEST_IOCTL_CTL_CHECK_BALLOON_MASK:
         {
             ULONG *pMemBalloonSize = (ULONG *) pBuf;
@@ -1046 +1046 @@
             if (VBOX_FAILURE(rc))
             {
-                dprintf(("IOCTL_VBOXGUEST_CTL_CHECK_BALLOON: vbox rc = %Vrc\n", rc));
+                dprintf(("VBOXGUEST_IOCTL_CTL_CHECK_BALLOON: vbox rc = %Vrc\n", rc));
                 Status = STATUS_UNSUCCESSFUL;
             }

trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.cpp

@@ -135 +135 @@
 {
     DWORD cbReturned;
-    DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, pReq, pReq->size,
+    DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, pReq, pReq->size,
                     pReq, pReq->size, &cbReturned, NULL);
     return VINF_SUCCESS;

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -87 +87 @@
 
     if (DeviceIoControl (pCtx->pEnv->hDriver,
-                         IOCTL_VBOXGUEST_HGCM_CONNECT,
+                         VBOXGUEST_IOCTL_HGCM_CONNECT,
                          &info, sizeof (info),
                          &info, sizeof (info),
@@ -122 +122 @@
 
     DeviceIoControl (pCtx->pEnv->hDriver,
-                     IOCTL_VBOXGUEST_HGCM_DISCONNECT,
+                     VBOXGUEST_IOCTL_HGCM_DISCONNECT,
                      &info, sizeof (info),
                      &info, sizeof (info),
@@ -162 +162 @@
 
     if (DeviceIoControl (hDriver,
-                         IOCTL_VBOXGUEST_HGCM_CALL,
+                         VBOXGUEST_IOCTL_HGCM_CALL,
                          pvData, cbData,
                          pvData, cbData,
@@ -815 +815 @@
 
         if (!DeviceIoControl (hDriver,
-                              IOCTL_VBOXGUEST_HGCM_CALL,
+                              VBOXGUEST_IOCTL_HGCM_CALL,
                               &parms, sizeof (parms),
                               &parms, sizeof (parms),

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -356 +356 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxDisplayThread : DeviceIOControl(CtlMask - or) succeeded\n"));
@@ -372 +372 @@
         waitEvent.u32TimeoutIn = 1000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-        if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
+        if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
             dprintf(("VBoxDisplayThread : DeviceIOControl succeded\n"));
@@ -409 +409 @@
                     displayChangeRequest.header.requestType = VMMDevReq_GetDisplayChangeRequest2;
                     displayChangeRequest.eventAck           = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-                    BOOL fDisplayChangeQueried = DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest2),
+                    BOOL fDisplayChangeQueried = DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest2),
                                                                  &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest2), &cbReturned, NULL);
                     if (!fDisplayChangeQueried)
@@ -418 +418 @@
                         displayChangeRequest.header.requestType = VMMDevReq_GetDisplayChangeRequest;
                         displayChangeRequest.eventAck           = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-                        fDisplayChangeQueried = DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest),
+                        fDisplayChangeQueried = DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest),
                                                                  &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest), &cbReturned, NULL);
                         displayChangeRequest.display = 0;
@@ -548 +548 @@
                     else
                     {
-                        dprintf(("VBoxDisplayThread : error from DeviceIoControl IOCTL_VBOXGUEST_VMMREQUEST\n"));
+                        dprintf(("VBoxDisplayThread : error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
                         /* sleep a bit to not eat too much CPU while retrying */
                         /* are we supposed to stop? */
@@ -561 +561 @@
         } else
         {
-            dprintf(("VBoxDisplayThread : error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxDisplayThread : error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
             /* sleep a bit to not eat too much CPU in case the above call always fails */
             if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0)
@@ -573 +573 @@
     maskInfo.u32OrMask = 0;
     maskInfo.u32NotMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxDisplayThread : DeviceIOControl(CtlMask - not) succeeded\n"));

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxMemBalloon.cpp

@@ -54 +54 @@
     /* Check balloon size */
     DWORD dwMemBalloonSize;
-    if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_CTL_CHECK_BALLOON, NULL, 0, &dwMemBalloonSize, sizeof(dwMemBalloonSize), &cbReturned, NULL))
+    if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_CHECK_BALLOON_MASK, NULL, 0, &dwMemBalloonSize, sizeof(dwMemBalloonSize), &cbReturned, NULL))
     {
         dprintf(("VBoxMemBalloonInit: new balloon size %d MB\n", dwMemBalloonSize));
@@ -93 +93 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxMemBalloonThread: DeviceIOControl(CtlMask - or) succeeded\n"));
@@ -109 +109 @@
         waitEvent.u32TimeoutIn = 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
-        if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
+        if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
             dprintf(("VBoxMemBalloonThread: DeviceIOControl succeded\n"));
@@ -123 +123 @@
             {
                 DWORD dwMemBalloonSize;
-                if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_CTL_CHECK_BALLOON, NULL, 0, &dwMemBalloonSize, sizeof(dwMemBalloonSize), &cbReturned, NULL))
+                if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_CHECK_BALLOON_MASK, NULL, 0, &dwMemBalloonSize, sizeof(dwMemBalloonSize), &cbReturned, NULL))
                 {
                     dprintf(("VBoxMemBalloonThread: new balloon size % MB\n", dwMemBalloonSize));
@@ -134 +134 @@
         else
         {
-            dprintf(("VBoxMemBalloonThread: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxMemBalloonThread: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -148 +148 @@
     maskInfo.u32OrMask = 0;
     maskInfo.u32NotMask = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxMemBalloonThread: DeviceIOControl(CtlMask - not) succeeded\n"));

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxRestore.cpp

@@ -84 +84 @@
         DWORD cbReturned;
 
-        if (!DeviceIoControl (gCtx.pEnv->hDriver, (ret) ? IOCTL_VBOXGUEST_ENABLE_VRDP_SESSION : IOCTL_VBOXGUEST_DISABLE_VRDP_SESSION, NULL, 0, NULL, 0, &cbReturned, NULL))
+        if (!DeviceIoControl (gCtx.pEnv->hDriver, (ret) ? VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION : VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION, NULL, 0, NULL, 0, &cbReturned, NULL))
         {
             dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
@@ -106 +106 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_RESTORED;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask - or) succeeded\n"));
@@ -122 +122 @@
         waitEvent.u32TimeoutIn = 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_RESTORED;
-        if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
+        if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
             dprintf(("VBoxRestoreThread: DeviceIOControl succeded\n"));
@@ -141 +141 @@
         else
         {
-            dprintf(("VBoxTray: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxTray: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -155 +155 @@
     maskInfo.u32OrMask = 0;
     maskInfo.u32NotMask = VMMDEV_EVENT_RESTORED;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxRestoreThread: DeviceIOControl(CtlMask - not) succeeded\n"));

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

@@ -85 +85 @@
 
         DWORD cbReturned;
-        if (!DeviceIoControl(pEnv->hDriver, IOCTL_VBOXGUEST_VMMREQUEST, &vmmreqGuestCaps, sizeof(vmmreqGuestCaps),
+        if (!DeviceIoControl(pEnv->hDriver, VBOXGUEST_IOCTL_VMMREQUEST, &vmmreqGuestCaps, sizeof(vmmreqGuestCaps),
                              &vmmreqGuestCaps, sizeof(vmmreqGuestCaps), &cbReturned, NULL))
         {
@@ -115 +115 @@
 
     DWORD cbReturned;
-    if (!DeviceIoControl(pEnv->hDriver, IOCTL_VBOXGUEST_VMMREQUEST, &vmmreqGuestCaps, sizeof(vmmreqGuestCaps),
+    if (!DeviceIoControl(pEnv->hDriver, VBOXGUEST_IOCTL_VMMREQUEST, &vmmreqGuestCaps, sizeof(vmmreqGuestCaps),
                          &vmmreqGuestCaps, sizeof(vmmreqGuestCaps), &cbReturned, NULL))
     {
@@ -295 +295 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxSeamlessThread: DeviceIOControl(CtlMask - or) succeeded\n"));
@@ -311 +311 @@
         waitEvent.u32TimeoutIn = 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
-        if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
+        if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
             dprintf(("VBoxSeamlessThread: DeviceIOControl succeded\n"));
@@ -337 +337 @@
                     seamlessChangeRequest.eventAck = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
 
-                    BOOL fSeamlessChangeQueried = DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &seamlessChangeRequest, sizeof(seamlessChangeRequest),
+                    BOOL fSeamlessChangeQueried = DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &seamlessChangeRequest, sizeof(seamlessChangeRequest),
                                                                  &seamlessChangeRequest, sizeof(seamlessChangeRequest), &cbReturned, NULL);
                     if (fSeamlessChangeQueried)
@@ -381 +381 @@
                     else
                     {
-                        dprintf(("VBoxSeamlessThread: error from DeviceIoControl IOCTL_VBOXGUEST_VMMREQUEST\n"));
+                        dprintf(("VBoxSeamlessThread: error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
                     }
                     /* sleep a bit to not eat too much CPU while retrying */
@@ -395 +395 @@
         else
         {
-            dprintf(("VBoxTray: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxTray: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
             /* sleep a bit to not eat too much CPU in case the above call always fails */
             if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0)
@@ -408 +408 @@
     maskInfo.u32OrMask = 0;
     maskInfo.u32NotMask = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxSeamlessThread: DeviceIOControl(CtlMask - not) succeeded\n"));

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxStatistics.cpp

@@ -69 +69 @@
     req.eventAck = 0;
 
-    if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
+    if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
     {
         dprintf(("VBoxStatsInit: new statistics interval %d seconds\n", req.u32StatInterval));
@@ -225 +225 @@
         req.guestStats.u32CpuId = i;
 
-        if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
+        if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
         {
             dprintf(("VBoxStatsReportStatistics: new statistics reported successfully!\n"));
@@ -250 +250 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxStatsThread: DeviceIOControl(CtlMask - or) succeeded\n"));
@@ -266 +266 @@
         waitEvent.u32TimeoutIn = (pCtx->uStatInterval) ? pCtx->uStatInterval : 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
-        if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
+        if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
             dprintf(("VBoxStatsThread: DeviceIOControl succeded\n"));
@@ -283 +283 @@
                 req.eventAck = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
 
-                if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
+                if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
                 {
                     dprintf(("VBoxStatsThread: new statistics interval %d seconds\n", req.u32StatInterval));
@@ -294 +294 @@
         else
         {
-            dprintf(("VBoxStatsThread: error 0 from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxStatsThread: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -314 +314 @@
     maskInfo.u32OrMask = 0;
     maskInfo.u32NotMask = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxStatsThread: DeviceIOControl(CtlMask - not) succeeded\n"));

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -84 +84 @@
     }
 
-    DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, pReq, pReq->header.size,
+    DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST, pReq, pReq->header.size,
                     pReq, pReq->header.size, &cbReturned, NULL);
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp

@@ -321 +321 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_VRDP;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxVRDPThread: DeviceIOControl(CtlMask - or) succeeded\n"));
@@ -337 +337 @@
         waitEvent.u32TimeoutIn   = 5000;
         waitEvent.u32EventMaskIn = VMMDEV_EVENT_VRDP;
-        if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
+        if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
             dprintf(("VBoxVRDPThread: DeviceIOControl succeded\n"));
@@ -360 +360 @@
                 
                 if (DeviceIoControl (gVBoxDriver,
-                                     IOCTL_VBOXGUEST_VMMREQUEST,
+                                     VBOXGUEST_IOCTL_VMMREQUEST,
                                      &vrdpChangeRequest,
                                      sizeof(VMMDevVRDPChangeRequest),
@@ -410 +410 @@
                 else
                 {
-                    dprintf(("VBoxTray: error from DeviceIoControl IOCTL_VBOXGUEST_VMMREQUEST\n"));
+                    dprintf(("VBoxTray: error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
 
                     /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -423 +423 @@
         else
         {
-            dprintf(("VBoxTray: error from DeviceIoControl IOCTL_VBOXGUEST_WAITEVENT\n"));
+            dprintf(("VBoxTray: error from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -436 +436 @@
     maskInfo.u32OrMask = 0;
     maskInfo.u32NotMask = VMMDEV_EVENT_VRDP;
-    if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         dprintf(("VBoxVRDPThread: DeviceIOControl(CtlMask - not) succeeded\n"));

trunk/src/VBox/Additions/WINNT/VBoxTray/testcase/tstSessionHack.cpp

@@ -53 +53 @@
         printf("Removing session hack\n");
  
-    if (!DeviceIoControl (gVBoxDriver, (argc == 1) ? IOCTL_VBOXGUEST_ENABLE_VRDP_SESSION : IOCTL_VBOXGUEST_DISABLE_VRDP_SESSION, NULL, 0, NULL, 0, &cbReturned, NULL))
+    if (!DeviceIoControl (gVBoxDriver, (argc == 1) ? VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION : VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION, NULL, 0, NULL, 0, &cbReturned, NULL))
     {
         printf("VBoxRestoreThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n");

trunk/src/VBox/Additions/WINNT/include/VBoxGuestInternal.h

@@ -27 +27 @@
 
 /** IOCTL for VBoxGuest to enable a VRDP session */
-#define IOCTL_VBOXGUEST_ENABLE_VRDP_SESSION     IOCTL_CODE(FILE_DEVICE_UNKNOWN, 2100, METHOD_BUFFERED, FILE_WRITE_ACCESS, 0)
+#define VBOXGUEST_IOCTL_ENABLE_VRDP_SESSION     IOCTL_CODE(FILE_DEVICE_UNKNOWN, 2100, METHOD_BUFFERED, FILE_WRITE_ACCESS, 0)
 
 /** IOCTL for VBoxGuest to disable a VRDP session */
-#define IOCTL_VBOXGUEST_DISABLE_VRDP_SESSION    IOCTL_CODE(FILE_DEVICE_UNKNOWN, 2101, METHOD_BUFFERED, FILE_WRITE_ACCESS, 0)
+#define VBOXGUEST_IOCTL_DISABLE_VRDP_SESSION    IOCTL_CODE(FILE_DEVICE_UNKNOWN, 2101, METHOD_BUFFERED, FILE_WRITE_ACCESS, 0)
 
 

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp

@@ -141 +141 @@
         if (VBOX_SUCCESS(rc))
         {
-            rc = vbglDriverIOCtl (&pHandleData->driver, IOCTL_VBOXGUEST_HGCM_CONNECT, pData, sizeof (*pData));
+            rc = vbglDriverIOCtl (&pHandleData->driver, VBOXGUEST_IOCTL_HGCM_CONNECT, pData, sizeof (*pData));
 
             if (VBOX_SUCCESS(rc))
@@ -166 +166 @@
     int rc = VINF_SUCCESS;
 
-    rc = vbglDriverIOCtl (&handle->driver, IOCTL_VBOXGUEST_HGCM_DISCONNECT, pData, sizeof (*pData));
+    rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_DISCONNECT, pData, sizeof (*pData));
 
     vbglDriverClose (&handle->driver);
@@ -182 +182 @@
                         ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->cParms, sizeof (VBoxGuestHGCMCallInfo) + pData->cParms * sizeof (VBoxGuestHGCMCallInfo)));
 
-    rc = vbglDriverIOCtl (&handle->driver, IOCTL_VBOXGUEST_HGCM_CALL, pData, cbData);
+    rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL, pData, cbData);
 
     return rc;

trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp

@@ -51 +51 @@
         VBoxGuestPortInfo port;
 
-        rc = vbglDriverIOCtl (&driver, IOCTL_VBOXGUEST_GETVMMDEVPORT, &port, sizeof (port));
+        rc = vbglDriverIOCtl (&driver, VBOXGUEST_IOCTL_GETVMMDEVPORT, &port, sizeof (port));
 
         if (VBOX_SUCCESS (rc))

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp

@@ -49 +49 @@
     Info.u32ClientID = UINT32_MAX;  /* try make valgrid shut up. */
 
-    int rc = vbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_CONNECT, &Info, sizeof(Info));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CONNECT, &Info, sizeof(Info));
     if (RT_SUCCESS(rc))
     {
@@ -72 +72 @@
     Info.u32ClientID = u32ClientId;
 
-    int rc = vbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_DISCONNECT, &Info, sizeof(Info));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Info, sizeof(Info));
     if (RT_SUCCESS(rc))
         rc = Info.result;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp

@@ -73 +73 @@
 VBGLR3DECL(int) vbglR3GRPerform(VMMDevRequestHeader *pReq)
 {
-    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_VMMREQUEST(pReq->size), pReq, pReq->size);
+    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_VMMREQUEST, pReq, pReq->size);
 }
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp

@@ -50 +50 @@
     Info.u32ClientID = UINT32_MAX;  /* try make valgrid shut up. */
 
-    int rc = vbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_CONNECT, &Info, sizeof(Info));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CONNECT, &Info, sizeof(Info));
     if (RT_SUCCESS(rc))
     {
@@ -73 +73 @@
     Info.u32ClientID = u32ClientId;
 
-    int rc = vbglR3DoIOCtl(IOCTL_VBOXGUEST_HGCM_DISCONNECT, &Info, sizeof(Info));
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Info, sizeof(Info));
     if (RT_SUCCESS(rc))
         rc = Info.result;

trunk/src/VBox/Additions/linux/daemon/vboxadd_timesync.c

@@ -147 +147 @@
     {
         /* perform VMM request */
-        if (ioctl(fd, IOCTL_VBOXGUEST_VMMREQUEST, (void*)&req) >= 0)
+        if (ioctl(fd, VBOXGUEST_IOCTL_VMMREQUEST, (void*)&req) >= 0)
         {
             if (VBOX_SUCCESS(req.header.rc))

trunk/src/VBox/Additions/linux/module/cmc.c

@@ -45 +45 @@
     {
         /* this function can NOT handle cancelled requests */
-        case IOCTL_VBOXGUEST_HGCM_CONNECT:
+        case VBOXGUEST_IOCTL_HGCM_CONNECT:
             return VbglHGCMConnect (data, vboxadd_hgcm_callback, opaque, 0);
 
         /* this function can NOT handle cancelled requests */
-        case IOCTL_VBOXGUEST_HGCM_DISCONNECT:
+        case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
             return VbglHGCMDisconnect (data, vboxadd_hgcm_callback, opaque, 0);
 
         /* this function can handle cancelled requests */
-        case IOCTL_VBOXGUEST_HGCM_CALL:
+        case VBOXGUEST_IOCTL_HGCM_CALL:
             return VbglHGCMCall (data, vboxadd_hgcm_callback_interruptible, opaque, 0);
 

trunk/src/VBox/Additions/linux/module/hgcmcall.c

@@ -49 +49 @@
     if (!hgcmR3)
     {
-        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n"));
+        LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: cannot allocate memory!\n"));
         return -ENOMEM;
     }
@@ -55 +55 @@
     if (copy_from_user(hgcmR3, pUser, sizeof(*hgcmR3) + cParms * sizeof(HGCMFunctionParameter)))
     {
-        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
+        LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: copy_from_user failed!\n"));
         kfree(hgcmR3);
         return -EFAULT;
@@ -87 +87 @@
     if (!hgcmR0)
     {
-        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n"));
+        LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: cannot allocate memory!\n"));
         return -ENOMEM;
     }
@@ -108 +108 @@
             break;
         default:
-            LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: unsupported or unknown parameter type\n"));
+            LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: unsupported or unknown parameter type\n"));
             kfree(hgcmR0);
             return -EINVAL;
@@ -117 +117 @@
     if (pu8PointerData == NULL)
     {
-        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: out of memory allocating %d bytes for pointer data\n",
+        LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: out of memory allocating %d bytes for pointer data\n",
                 cbPointerData));
         kfree(hgcmR0);
@@ -140 +140 @@
                                 VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.size))
             {
-                LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
+                LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: copy_from_user failed!\n"));
                 kfree(hgcmR0);
                 kfree(pu8PointerData);
@@ -188 +188 @@
         {
         case VMMDevHGCMParmType_32bit:
-            Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type 32bit: %u\n",
+            Log(("VBOXGUEST_IOCTL_HGCM_CALL: parameter %d is of type 32bit: %u\n",
                   i, VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.value32));
             break;
         case VMMDevHGCMParmType_64bit:
-            Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type 64bit: %lu\n",
+            Log(("VBOXGUEST_IOCTL_HGCM_CALL: parameter %d is of type 64bit: %lu\n",
                   i, VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.value64));
             break;
         case VMMDevHGCMParmType_LinAddr:
-            Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr, size %u: %.*s...\n",
+            Log(("VBOXGUEST_IOCTL_HGCM_CALL: parameter %d is of type LinAddr, size %u: %.*s...\n",
                   i,
                   VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size > 10 ?
@@ -204 +204 @@
             break;
         case VMMDevHGCMParmType_LinAddr_In:
-            Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr_In, size %u: %.*s...\n",
+            Log(("VBOXGUEST_IOCTL_HGCM_CALL: parameter %d is of type LinAddr_In, size %u: %.*s...\n",
                   i,
                   VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size > 10 ?
@@ -212 +212 @@
             break;
         case VMMDevHGCMParmType_LinAddr_Out:
-            Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr_Out, size %u: %.*s...\n",
+            Log(("VBOXGUEST_IOCTL_HGCM_CALL: parameter %d is of type LinAddr_Out, size %u: %.*s...\n",
                   i,
                   VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size > 10 ?
@@ -220 +220 @@
             break;
         default:
-            Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of unknown type!", i));
+            Log(("VBOXGUEST_IOCTL_HGCM_CALL: parameter %d is of unknown type!", i));
         }
     }
@@ -254 +254 @@
                               VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size))
             {
-                LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n"));
+                LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: copy_to_user failed!\n"));
                 return -EFAULT;
             }
@@ -272 +272 @@
                      sizeof(*hgcmR3) + hgcmR3->cParms * sizeof(HGCMFunctionParameter)))
     {
-        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n"));
+        LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: copy_to_user failed!\n"));
         return -EFAULT;
     }
@@ -290 +290 @@
  * @param arg User space pointer to the call data structure
  */
-AssertCompile((_IOC_SIZE(IOCTL_VBOXGUEST_HGCM_CALL) == sizeof(VBoxGuestHGCMCallInfo)));
+AssertCompile((_IOC_SIZE(VBOXGUEST_IOCTL_HGCM_CALL) == sizeof(VBoxGuestHGCMCallInfo)));
 
 int vbox_ioctl_hgcm_call(unsigned long arg, VBoxDevice *vboxDev)
@@ -301 +301 @@
     if (copy_from_user(&callHeader, (void*)arg, sizeof(callHeader)))
     {
-        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
+        LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: copy_from_user failed!\n"));
         return -EFAULT;
     }
@@ -322 +322 @@
     vbox_hgcm_dump_params(hgcmR0);
     /* Call the internal VBoxGuest ioctl interface with the ioctl structure we have just copied. */
-    rc = vboxadd_cmc_call(vboxDev, IOCTL_VBOXGUEST_HGCM_CALL, hgcmR0);
+    rc = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_CALL, hgcmR0);
     if (VBOX_FAILURE(rc))
     {
-        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: internal ioctl call failed, rc=%Rrc\n", rc));
+        LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: internal ioctl call failed, rc=%Rrc\n", rc));
         rc = -RTErrConvertToErrno(rc);
     }

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -197 +197 @@
                         VBoxGuestHGCMDisconnectInfo infoDisconnect;
                         infoDisconnect.u32ClientID = hgcm_connections[i].client_id;
-                        vboxadd_cmc_call(vboxDev, IOCTL_VBOXGUEST_HGCM_DISCONNECT,
+                        vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_DISCONNECT,
                                          &infoDisconnect);
                         hgcm_connections[i].filp = NULL;
@@ -277 +277 @@
 
         if (copy_from_user (&info, ptr, sizeof (info))) {
-                LogRelFunc (("IOCTL_VBOXGUEST_WAITEVENT: can not get event info\n"));
+                LogRelFunc (("VBOXGUEST_IOCTL_WAITEVENT: can not get event info\n"));
                 rc = -EFAULT;
         }
@@ -285 +285 @@
 
                 if (copy_to_user (ptr, &info, sizeof (info))) {
-                        LogRelFunc (("IOCTL_VBOXGUEST_WAITEVENT: can not put out_mask\n"));
+                        LogRelFunc (("VBOXGUEST_IOCTL_WAITEVENT: can not put out_mask\n"));
                         rc = -EFAULT;
                 }
@@ -310 +310 @@
 
         if (0 != copy_from_user ((void *)&info, (void *)userspace_info, sizeof (info))) {
-                LogRelFunc (("IOCTL_VBOXGUEST_HGCM_CONNECT: can not get connection info\n"));
+                LogRelFunc (("VBOXGUEST_IOCTL_HGCM_CONNECT: can not get connection info\n"));
                 return -EFAULT;
         }
-        rcVBox = vboxadd_cmc_call(vboxDev, IOCTL_VBOXGUEST_HGCM_CONNECT, &info);
+        rcVBox = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_CONNECT, &info);
         if (RT_FAILURE(rcVBox) || (RT_FAILURE(info.result))) {
-                LogRelFunc(("IOCTL_VBOXGUEST_HGCM_CONNECT: hgcm connection failed.  internal ioctl result %Vrc, hgcm result %Vrc\n", rcVBox, info.result));
+                LogRelFunc(("VBOXGUEST_IOCTL_HGCM_CONNECT: hgcm connection failed.  internal ioctl result %Vrc, hgcm result %Vrc\n", rcVBox, info.result));
                 rc = RT_FAILURE(rcVBox) ?   -RTErrConvertToErrno(rcVBox)
                                           : -RTErrConvertToErrno(info.result);
@@ -323 +323 @@
                 rc = vboxadd_register_hgcm_connection(info.u32ClientID, filp);
                 if (0 != rc) {
-                        LogRelFunc(("IOCTL_VBOXGUEST_HGCM_CONNECT: failed to register the HGCM connection\n"));
+                        LogRelFunc(("VBOXGUEST_IOCTL_HGCM_CONNECT: failed to register the HGCM connection\n"));
                 } else {
                         if (copy_to_user ((void *)userspace_info, (void *)&info,
                                           sizeof(info))) {
-                                LogRelFunc (("IOCTL_VBOXGUEST_HGCM_CONNECT: failed to return the connection structure\n"));
+                                LogRelFunc (("VBOXGUEST_IOCTL_HGCM_CONNECT: failed to return the connection structure\n"));
                                 rc = -EFAULT;
                         } else {
@@ -337 +337 @@
                 /* And disconnect the hgcm connection again, as we told userspace it failed. */
                 infoDisconnect.u32ClientID = info.u32ClientID;
-                vboxadd_cmc_call(vboxDev, IOCTL_VBOXGUEST_HGCM_DISCONNECT,
+                vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_DISCONNECT,
                                   &infoDisconnect);
         }
@@ -356 +356 @@
         VBoxGuestHGCMDisconnectInfo info;
         if (0 != copy_from_user ((void *)&info, (void *)userspace_info, sizeof (info))) {
-                LogRelFunc (("IOCTL_VBOXGUEST_HGCM_DISCONNECT: can not get info\n"));
+                LogRelFunc (("VBOXGUEST_IOCTL_HGCM_DISCONNECT: can not get info\n"));
                 return -EFAULT;
         }
         LogRelFunc(("client ID %u\n", info.u32ClientID));
-        vboxadd_cmc_call(vboxDev, IOCTL_VBOXGUEST_HGCM_DISCONNECT, &info);
+        vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info);
         if (copy_to_user ((void *)userspace_info, (void *)&info, sizeof(info))) {
-                LogRelFunc (("IOCTL_VBOXGUEST_HGCM_DISCONNECT: failed to return the connection structure\n"));
+                LogRelFunc (("VBOXGUEST_IOCTL_HGCM_DISCONNECT: failed to return the connection structure\n"));
                 return -EFAULT;
         }
@@ -445 +445 @@
             if (copy_from_user(&reqHeader, (void*)arg, sizeof(reqHeader)))
             {
-                LogRelFunc(("IOCTL_VBOXGUEST_VMMREQUEST: copy_from_user failed for vmm request!\n"));
+                LogRelFunc(("VBOXGUEST_IOCTL_VMMREQUEST: copy_from_user failed for vmm request!\n"));
                 rc = -EFAULT;
             }
@@ -454 +454 @@
                 if (!cbVanillaRequestSize)
                 {
-                    LogRelFunc(("IOCTL_VBOXGUEST_VMMREQUEST: invalid request type: %d\n",
+                    LogRelFunc(("VBOXGUEST_IOCTL_VMMREQUEST: invalid request type: %d\n",
                             reqHeader.requestType));
                     rc = -EINVAL;
@@ -464 +464 @@
                 if (cbRequestSize < cbVanillaRequestSize)
                 {
-                    LogRelFunc(("IOCTL_VBOXGUEST_VMMREQUEST: invalid request size: %d min: %d type: %d\n",
+                    LogRelFunc(("VBOXGUEST_IOCTL_VMMREQUEST: invalid request size: %d min: %d type: %d\n",
                             cbRequestSize,
                             cbVanillaRequestSize,
@@ -477 +477 @@
                 if (VBOX_FAILURE(rc))
                 {
-                    LogRelFunc(("IOCTL_VBOXGUEST_VMMREQUEST: could not allocate request structure! rc = %d\n", rc));
+                    LogRelFunc(("VBOXGUEST_IOCTL_VMMREQUEST: could not allocate request structure! rc = %d\n", rc));
                     rc = -EFAULT;
                 }
@@ -486 +486 @@
                 if (copy_from_user(reqFull, (void*)arg, cbRequestSize))
                 {
-                    LogRelFunc(("IOCTL_VBOXGUEST_VMMREQUEST: failed to fetch full request from user space!\n"));
+                    LogRelFunc(("VBOXGUEST_IOCTL_VMMREQUEST: failed to fetch full request from user space!\n"));
                     rc = -EFAULT;
                 }
@@ -507 +507 @@
                 if (VBOX_FAILURE(rrc) || VBOX_FAILURE(reqFull->rc))
                 {
-                    LogRelFunc(("IOCTL_VBOXGUEST_VMMREQUEST: request execution failed!\n"));
+                    LogRelFunc(("VBOXGUEST_IOCTL_VMMREQUEST: request execution failed!\n"));
                     rc = VBOX_FAILURE(rrc) ? -RTErrConvertToErrno(rrc)
                                            : -RTErrConvertToErrno(reqFull->rc);
@@ -516 +516 @@
                     if (copy_to_user((void*)arg, (void*)reqFull, cbRequestSize))
                     {
-                        LogRelFunc(("IOCTL_VBOXGUEST_VMMREQUEST: error copying request result to user space!\n"));
+                        LogRelFunc(("VBOXGUEST_IOCTL_VMMREQUEST: error copying request result to user space!\n"));
                         rc = -EFAULT;
                     }
@@ -527 +527 @@
         else if (   (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0))
                 == VBOXGUEST_IOCTL_STRIP_SIZE(cmd))
-            || (cmd == IOCTL_VBOXGUEST_HGCM_CALL))
+            || (cmd == VBOXGUEST_IOCTL_HGCM_CALL))
         {
         /* This IOCTL allows the guest to make an HGCM call from user space.  The
@@ -543 +543 @@
         {
             switch (cmd) {
-            case IOCTL_VBOXGUEST_WAITEVENT:
-                    IOCTL_ENTRY("IOCTL_VBOXGUEST_WAITEVENT", arg);
+            case VBOXGUEST_IOCTL_WAITEVENT:
+                    IOCTL_ENTRY("VBOXGUEST_IOCTL_WAITEVENT", arg);
                     rc = vboxadd_wait_event((void *) arg);
-                    IOCTL_EXIT("IOCTL_VBOXGUEST_WAITEVENT", arg);
+                    IOCTL_EXIT("VBOXGUEST_IOCTL_WAITEVENT", arg);
                     break;
             case VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS:
@@ -553 +553 @@
                     IOCTL_EXIT("VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS", arg);
                     break;
-            case IOCTL_VBOXGUEST_HGCM_CONNECT:
-                    IOCTL_ENTRY("IOCTL_VBOXGUEST_HGCM_CONNECT", arg);
+            case VBOXGUEST_IOCTL_HGCM_CONNECT:
+                    IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_CONNECT", arg);
                     rc = vboxadd_hgcm_connect(filp, arg);
-                    IOCTL_EXIT("IOCTL_VBOXGUEST_HGCM_CONNECT", arg);
+                    IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CONNECT", arg);
                     break;
-            case IOCTL_VBOXGUEST_HGCM_DISCONNECT:
-                    IOCTL_ENTRY("IOCTL_VBOXGUEST_HGCM_DISCONNECT", arg);
+            case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
+                    IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_DISCONNECT", arg);
                     vboxadd_hgcm_disconnect(filp, arg);
-                    IOCTL_EXIT("IOCTL_VBOXGUEST_HGCM_DISCONNECT", arg);
+                    IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_DISCONNECT", arg);
                     break;
             case VBOXGUEST_IOCTL_CTL_FILTER_MASK:

trunk/src/VBox/Additions/x11/xgraphics/vboxutils_68.c

@@ -122 +122 @@
     }
 #else
-    err = ioctl (pVBox->vbox_fd, IOCTL_VBOXGUEST_VMMREQUEST, hdrp);
+    err = ioctl (pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST, hdrp);
 #endif
     if (err < 0)
@@ -150 +150 @@
             "Unable to determine whether the virtual machine supports mouse pointer integration - request initialization failed with return code %d\n", rc);
     if (   RT_SUCCESS(vrc)
-        && (ioctl(pVBox->vbox_fd, IOCTL_VBOXGUEST_VMMREQUEST, (void*)&req) < 0))
+        && (ioctl(pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST, (void*)&req) < 0))
     {
         vrc = VERR_FILE_IO_ERROR;

trunk/src/VBox/Additions/x11/xmouse/VBoxUtils_68.c

@@ -122 +122 @@
     req.pointerXPos = 0;
     req.pointerYPos = 0;
-    if (ioctl(g_vboxaddHandle, IOCTL_VBOXGUEST_VMMREQUEST, (void*)&req) < 0)
+    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST, (void*)&req) < 0)
     {
         ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
@@ -146 +146 @@
         return 1;
     /* perform VMM request */
-    if (ioctl(g_vboxaddHandle, IOCTL_VBOXGUEST_VMMREQUEST, (void*)g_vmmreqMouseStatus) >= 0)
+    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST, (void*)g_vmmreqMouseStatus) >= 0)
     {
         if (VBOX_SUCCESS(g_vmmreqMouseStatus->header.rc))
@@ -185 +185 @@
     req.pointerXPos = 0;
     req.pointerYPos = 0;
-    if (ioctl(g_vboxaddHandle, IOCTL_VBOXGUEST_VMMREQUEST, (void*)&req) < 0)
+    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST, (void*)&req) < 0)
     {
         ErrorF("ioctl to vboxadd module failed, rc = %d (%s)\n",