- Make the package compile for i386

- Make the pAddr arg for DivertRecv() optional
- Make the i386 user binaries compatible with an amd64 driver.
  (useful for projects not yet ported to amd64)

include/divert.h

@@ -1,5 +1,5 @@
 /*
- * divert.c
+ * divert.h
  * (C) 2011, all rights reserved,
  *
  * This program is free software: you can redistribute it and/or modify
@@ -61,7 +61,7 @@ extern DIVERTEXPORT BOOL DivertRecv(
     __in        HANDLE handle,
     __out       PVOID pPacket,
     __in        UINT packetLen,
-    __out       PDIVERT_ADDRESS pAddr,
+    __out_opt   PDIVERT_ADDRESS pAddr,
     __out_opt   UINT *readLen);
 
 /*

include/divert_device.h

@@ -110,12 +110,13 @@
 /*
  * Message definitions.
  */
+#pragma pack(push, 1)
 struct divert_ioctl_s
 {
     UINT16 magic;                   // DIVERT_MAGIC
     UINT8  version;                 // DIVERT_VERSION
     UINT8  reserved;                // Reserved (set to 0x0)
-    PVOID  arg;                     // Pointer to buffer
+    UINT64 arg;                     // Pointer to buffer
 };
 typedef struct divert_ioctl_s *divert_ioctl_t;
 
@@ -131,6 +132,7 @@ struct divert_ioctl_filter_s
     UINT32 arg[4];                  // Argument.
 };
 typedef struct divert_ioctl_filter_s *divert_ioctl_filter_t;
+#pragma pack(pop)
 
 /*
  * IOCTL codes.