Changeset 10522 in vbox

Timestamp:

Jul 11, 2008 1:07:00 PM (17 years ago)

Author:

vboxsync

Message:

r=bird: Added a todo: IOCTL_CODE should not be #defined.

File:

• trunk/include/VBox/VBoxGuest.h (modified) (8 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -1101 +1101 @@
 #if defined(RT_OS_WINDOWS)
 /* @todo Remove IOCTL_CODE later! Integrate it in VBOXGUEST_IOCTL_CODE below. */
+/** @todo r=bird: IOCTL_CODE is supposedly defined in some header included by Windows.h or ntddk.h, which is why it wasn't in the #if 0 earlier. See HostDrivers/Support/SUPDrvIOC.h... */
 # define IOCTL_CODE(DeviceType, Function, Method, Access, DataSize_ignored) \
   ( ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
@@ -1140 +1141 @@
 
 /** 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
+#define VBOXGUEST_IOCTL_GETVMMDEVPORT   VBOXGUEST_IOCTL_CODE(1, sizeof(VBoxGuestPortInfo))
+#define IOCTL_VBOXGUEST_GETVMMDEVPORT   VBOXGUEST_IOCTL_GETVMMDEVPORT
 
 #pragma pack(4)
@@ -1151 +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
+#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.
  * Handled inside the guest additions and not seen by the host at all.
  * @see VBOXGUEST_IOCTL_WAITEVENT */
-# define VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS    VBOXGUEST_IOCTL_CODE(5, 0)
+#define VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS       VBOXGUEST_IOCTL_CODE(5, 0)
 
 /**
@@ -1189 +1190 @@
  * @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(Size)    VBOXGUEST_IOCTL_CODE(3, (Size))
+#define IOCTL_VBOXGUEST_VMMREQUEST          VBOXGUEST_IOCTL_VMMREQUEST(sizeof(VMMDevRequestHeader))
 
 /** Input and output buffer layout of the IOCTL_VBOXGUEST_CTL_FILTER_MASK. */
@@ -1201 +1202 @@
 
 /** 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
+#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
+#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. */
-# define VBOXGUEST_IOCTL_LOG(Size)                  VBOXGUEST_IOCTL_CODE(6, (Size))
+#define VBOXGUEST_IOCTL_LOG(Size)                   VBOXGUEST_IOCTL_CODE(6, (Size))
 
 
@@ -1216 +1217 @@
  * therefore packing must be defined explicitely.
  */
-#pragma pack(1)
+# pragma pack(1)
 typedef struct _VBoxGuestHGCMConnectInfo
 {
@@ -1238 +1239 @@
     /* Parameters follow in form HGCMFunctionParameter aParms[cParms] */
 } VBoxGuestHGCMCallInfo;
-#pragma pack()
+# pragma pack()
 
 # define VBOXGUEST_IOCTL_HGCM_CONNECT       VBOXGUEST_IOCTL_CODE(16, sizeof(VBoxGuestHGCMConnectInfo))
@@ -1249 +1250 @@
 # define IOCTL_VBOXGUEST_CLIPBOARD_CONNECT  VBOXGUEST_IOCTL_CLIPBOARD_CONNECT
 
-#define VBOXGUEST_HGCM_CALL_PARMS(a) ((HGCMFunctionParameter *)((uint8_t *)(a) + sizeof (VBoxGuestHGCMCallInfo)))
+# define VBOXGUEST_HGCM_CALL_PARMS(a)       ((HGCMFunctionParameter *)((uint8_t *)(a) + sizeof (VBoxGuestHGCMCallInfo)))
 
 #endif /* VBOX_HGCM */