From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 7 Jan 2006 07:40:14 +0000 (+0000)
Subject: - Do not generate manifest files for drivers or native apps.
X-Git-Tag: backups/expat-rbuild@40467~499
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=38c460379c438606c270597f2f8108665c86d95c;hp=edd15921f7f1810d83117efbcd6358011d2fef13

- Do not generate manifest files for drivers or native apps.
- Get portcls to compile.
- Commit some fixes I forgot.

svn path=/trunk/; revision=20656
---

diff --git a/reactos/drivers/multimedia/portcls/portcls.c b/reactos/drivers/multimedia/portcls/portcls.c
index 99fc654117a..cb8c7a8fefd 100644
--- a/reactos/drivers/multimedia/portcls/portcls.c
+++ b/reactos/drivers/multimedia/portcls/portcls.c
@@ -42,8 +42,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
 /*
  * @implemented
  */
-DWORD STDCALL
-DllInitialize(DWORD Unknown)
+ULONG STDCALL
+DllInitialize(ULONG Unknown)
 {
     return 0;
 }
@@ -51,7 +51,7 @@ DllInitialize(DWORD Unknown)
 /*
  * @implemented
  */
-DWORD STDCALL
+ULONG STDCALL
 DllUnload(VOID)
 {
     return 0;
@@ -63,11 +63,11 @@ DllUnload(VOID)
  */
 NTSTATUS STDCALL
 PcAddAdapterDevice(
- DWORD DriverObject,
- DWORD PhysicalDeviceObject,
- DWORD StartDevice,
- DWORD MaxObjects,
- DWORD DeviceExtensionSize
+ ULONG DriverObject,
+ ULONG PhysicalDeviceObject,
+ ULONG StartDevice,
+ ULONG MaxObjects,
+ ULONG DeviceExtensionSize
 )
 {
  UNIMPLEMENTED;
@@ -79,9 +79,9 @@ PcAddAdapterDevice(
  */
 NTSTATUS STDCALL
 PcAddContentHandlers(
- DWORD  ContentId,
- DWORD  paHandlers,
- DWORD  NumHandlers
+ ULONG  ContentId,
+ ULONG  paHandlers,
+ ULONG  NumHandlers
 )
 {
  UNIMPLEMENTED;
@@ -93,9 +93,9 @@ PcAddContentHandlers(
  */
 NTSTATUS STDCALL
 PcCompleteIrp(
- DWORD  DeviceObject,
- DWORD  Irp,
- DWORD  Status
+ ULONG  DeviceObject,
+ ULONG  Irp,
+ ULONG  Status
 )
 {
  UNIMPLEMENTED;
@@ -107,8 +107,8 @@ PcCompleteIrp(
  */
 NTSTATUS STDCALL
 PcCompletePendingPropertyRequest(
- DWORD PropertyRequest,
- DWORD NtStatus
+ ULONG PropertyRequest,
+ ULONG NtStatus
 )
 {
  UNIMPLEMENTED;
@@ -120,9 +120,9 @@ PcCompletePendingPropertyRequest(
  */
 NTSTATUS STDCALL 
 PcCreateContentMixed(
- DWORD paContentId,
- DWORD cContentId,
- DWORD pMixedContentId
+ ULONG paContentId,
+ ULONG cContentId,
+ ULONG pMixedContentId
 )
 {
  UNIMPLEMENTED;
@@ -134,7 +134,7 @@ PcCreateContentMixed(
  */
 NTSTATUS STDCALL
 PcDestroyContent(
- DWORD ContentId
+ ULONG ContentId
 )
 {
  UNIMPLEMENTED;
@@ -146,8 +146,8 @@ PcDestroyContent(
  */
 NTSTATUS STDCALL
 PcDispatchIrp(
- DWORD DeviceObject,
- DWORD Irp
+ ULONG DeviceObject,
+ ULONG Irp
 )
 {
  UNIMPLEMENTED;
@@ -159,9 +159,9 @@ PcDispatchIrp(
  */
 NTSTATUS STDCALL
 PcForwardContentToDeviceObject(
- DWORD ContentId,
- DWORD Reserved,
- DWORD DrmForward
+ ULONG ContentId,
+ ULONG Reserved,
+ ULONG DrmForward
 )
 {
  UNIMPLEMENTED;
@@ -173,8 +173,8 @@ PcForwardContentToDeviceObject(
  */
 NTSTATUS STDCALL 
 PcForwardContentToFileObject(
- DWORD ContentId,
- DWORD FileObject
+ ULONG ContentId,
+ ULONG FileObject
 )
 {
  UNIMPLEMENTED;
@@ -186,9 +186,9 @@ PcForwardContentToFileObject(
  */
 NTSTATUS STDCALL 
 PcForwardContentToInterface(
- DWORD ContentId,
- DWORD Unknown,
- DWORD NumMethods
+ ULONG ContentId,
+ ULONG Unknown,
+ ULONG NumMethods
 )
 {
  UNIMPLEMENTED;
@@ -200,8 +200,8 @@ PcForwardContentToInterface(
  */
 NTSTATUS STDCALL
 PcForwardIrpSynchronous(
- DWORD DeviceObject,
- DWORD Irp 
+ ULONG DeviceObject,
+ ULONG Irp 
 )
 {
  UNIMPLEMENTED;
@@ -213,8 +213,8 @@ PcForwardIrpSynchronous(
  */
 NTSTATUS STDCALL 
 PcGetContentRights(
- DWORD ContentId,
- DWORD DrmRights
+ ULONG ContentId,
+ ULONG DrmRights
 )
 {
  UNIMPLEMENTED;
@@ -226,11 +226,11 @@ PcGetContentRights(
  */
 NTSTATUS STDCALL
 PcGetDeviceProperty(
- DWORD DeviceObject,
- DWORD DeviceProperty,
- DWORD BufferLength,
- DWORD PropertyBuffer,
- DWORD ResultLength
+ ULONG DeviceObject,
+ ULONG DeviceProperty,
+ ULONG BufferLength,
+ ULONG PropertyBuffer,
+ ULONG ResultLength
 )
 {
  UNIMPLEMENTED;
@@ -257,9 +257,9 @@ PcGetTimeInterval(
  */
 NTSTATUS STDCALL
 PcInitializeAdapterDriver(
- DWORD DriverObject,
- DWORD RegistryPathName,
- DWORD AddDevice
+ ULONG DriverObject,
+ ULONG RegistryPathName,
+ ULONG AddDevice
 )
 {
  UNIMPLEMENTED;
@@ -271,11 +271,11 @@ PcInitializeAdapterDriver(
  */
 NTSTATUS STDCALL
 PcNewDmaChannel(
- DWORD OutDmaChannel,
- DWORD Unknown,
- DWORD PoolType,
- DWORD DeviceDescription,
- DWORD DeviceObject
+ ULONG OutDmaChannel,
+ ULONG Unknown,
+ ULONG PoolType,
+ ULONG DeviceDescription,
+ ULONG DeviceObject
 )
 {
  UNIMPLEMENTED;
@@ -287,11 +287,11 @@ PcNewDmaChannel(
  */
 NTSTATUS STDCALL
 PcNewInterruptSync(
- DWORD OutInterruptSync,
- DWORD Unknown,
- DWORD ResourceList,
- DWORD ResourceIndex,
- DWORD Mode
+ ULONG OutInterruptSync,
+ ULONG Unknown,
+ ULONG ResourceList,
+ ULONG ResourceIndex,
+ ULONG Mode
 )
 {
  UNIMPLEMENTED;
@@ -303,8 +303,8 @@ PcNewInterruptSync(
  */
 NTSTATUS STDCALL
 PcNewMiniport(
- DWORD OutMiniport,
- DWORD ClassId
+ ULONG OutMiniport,
+ ULONG ClassId
 )
 {
  UNIMPLEMENTED;
@@ -316,8 +316,8 @@ PcNewMiniport(
  */
 NTSTATUS STDCALL
 PcNewPort(
- DWORD OutPort,
- DWORD ClassId
+ ULONG OutPort,
+ ULONG ClassId
 )
 {
  UNIMPLEMENTED;
@@ -329,15 +329,15 @@ PcNewPort(
  */
 NTSTATUS STDCALL
 PcNewRegistryKey(
- DWORD OutRegistryKey,
- DWORD Unknown,
- DWORD RegistryKeyType,
- DWORD DesiredAccess,
- DWORD DeviceObject,
- DWORD SubDevice,
- DWORD ObjectAttributes,
- DWORD CreateOptions,
- DWORD Disposition
+ ULONG OutRegistryKey,
+ ULONG Unknown,
+ ULONG RegistryKeyType,
+ ULONG DesiredAccess,
+ ULONG DeviceObject,
+ ULONG SubDevice,
+ ULONG ObjectAttributes,
+ ULONG CreateOptions,
+ ULONG Disposition
 )
 {
  UNIMPLEMENTED;
@@ -349,11 +349,11 @@ PcNewRegistryKey(
  */
 NTSTATUS STDCALL
 PcNewResourceList(
- DWORD OutResourceList,
- DWORD Unknown,
- DWORD PoolType,
- DWORD TranslatedResources,
- DWORD UntranslatedResources
+ ULONG OutResourceList,
+ ULONG Unknown,
+ ULONG PoolType,
+ ULONG TranslatedResources,
+ ULONG UntranslatedResources
 )
 {
  UNIMPLEMENTED;
@@ -365,11 +365,11 @@ PcNewResourceList(
  */
 NTSTATUS STDCALL
 PcNewResourceSublist(
- DWORD OutResourceList,
- DWORD Unknown,
- DWORD PoolType,
- DWORD ParentList,
- DWORD MaximumEntries
+ ULONG OutResourceList,
+ ULONG Unknown,
+ ULONG PoolType,
+ ULONG ParentList,
+ ULONG MaximumEntries
 )
 {
  UNIMPLEMENTED;
@@ -381,8 +381,8 @@ PcNewResourceSublist(
  */
 NTSTATUS STDCALL
 PcNewServiceGroup(
- DWORD OutServiceGroup,
- DWORD Unknown
+ ULONG OutServiceGroup,
+ ULONG Unknown
 )
 {
  UNIMPLEMENTED;
@@ -394,8 +394,8 @@ PcNewServiceGroup(
  */
 NTSTATUS STDCALL
 PcRegisterAdapterPowerManagement(
- DWORD Unknown,
- DWORD pvContext
+ ULONG Unknown,
+ ULONG pvContext
 )
 {
  UNIMPLEMENTED;
@@ -407,9 +407,9 @@ PcRegisterAdapterPowerManagement(
  */
 NTSTATUS STDCALL
 PcRegisterIoTimeout(
- DWORD pDeviceObject,
- DWORD pTimerRoutine,
- DWORD pContext
+ ULONG pDeviceObject,
+ ULONG pTimerRoutine,
+ ULONG pContext
 )
 {
  UNIMPLEMENTED;
@@ -421,11 +421,11 @@ PcRegisterIoTimeout(
  */
 NTSTATUS STDCALL
 PcRegisterPhysicalConnection(
- DWORD DeviceObject,
- DWORD FromUnknown,
- DWORD FromPin,
- DWORD ToUnknown,
- DWORD ToPin
+ ULONG DeviceObject,
+ ULONG FromUnknown,
+ ULONG FromPin,
+ ULONG ToUnknown,
+ ULONG ToPin
 )
 {
  UNIMPLEMENTED;
@@ -437,11 +437,11 @@ PcRegisterPhysicalConnection(
  */
 NTSTATUS STDCALL
 PcRegisterPhysicalConnectionFromExternal(
- DWORD DeviceObject,
- DWORD FromString,
- DWORD FromPin,
- DWORD ToUnknown,
- DWORD ToPin
+ ULONG DeviceObject,
+ ULONG FromString,
+ ULONG FromPin,
+ ULONG ToUnknown,
+ ULONG ToPin
 )
 {
  UNIMPLEMENTED;
@@ -453,11 +453,11 @@ PcRegisterPhysicalConnectionFromExternal(
  */
 NTSTATUS STDCALL
 PcRegisterPhysicalConnectionToExternal(
- DWORD DeviceObject,
- DWORD FromUnknown,
- DWORD FromPin,
- DWORD ToString,
- DWORD ToPin
+ ULONG DeviceObject,
+ ULONG FromUnknown,
+ ULONG FromPin,
+ ULONG ToString,
+ ULONG ToPin
 )
 {
  UNIMPLEMENTED;
@@ -469,9 +469,9 @@ PcRegisterPhysicalConnectionToExternal(
  */
 NTSTATUS STDCALL
 PcRegisterSubdevice(
- DWORD DeviceObject,
- DWORD SubdevName,
- DWORD Unknown
+ ULONG DeviceObject,
+ ULONG SubdevName,
+ ULONG Unknown
 )
 {
  UNIMPLEMENTED;
@@ -483,8 +483,8 @@ PcRegisterSubdevice(
  */
 NTSTATUS STDCALL
 PcRequestNewPowerState(
- DWORD pDeviceObject,
- DWORD RequestedNewState
+ ULONG pDeviceObject,
+ ULONG RequestedNewState
 )
 {
  UNIMPLEMENTED;
@@ -496,9 +496,9 @@ PcRequestNewPowerState(
  */
 NTSTATUS STDCALL
 PcUnregisterIoTimeout(
- DWORD pDeviceObject,
- DWORD pTimerRoutine,
- DWORD pContext
+ ULONG pDeviceObject,
+ ULONG pTimerRoutine,
+ ULONG pContext
 )
 {
  UNIMPLEMENTED;
diff --git a/reactos/drivers/multimedia/portcls/portcls.h b/reactos/drivers/multimedia/portcls/portcls.h
index 1a0fe0d24c1..4dc027db331 100644
--- a/reactos/drivers/multimedia/portcls/portcls.h
+++ b/reactos/drivers/multimedia/portcls/portcls.h
@@ -13,96 +13,98 @@
 extern "C" {
 #endif
 
+/* This header is total bull**** */
+
 #include <ntddk.h>
 
 #define PORTCLASSAPI extern
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcAddAdapterDevice(
- DWORD DriverObject,
- DWORD PhysicalDeviceObject,
- DWORD StartDevice,
- DWORD MaxObjects,
- DWORD DeviceExtensionSize
+ ULONG DriverObject,
+ ULONG PhysicalDeviceObject,
+ ULONG StartDevice,
+ ULONG MaxObjects,
+ ULONG DeviceExtensionSize
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcAddContentHandlers(
- DWORD  ContentId,
- DWORD  paHandlers,
- DWORD  NumHandlers
+ ULONG  ContentId,
+ ULONG  paHandlers,
+ ULONG  NumHandlers
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcCompleteIrp(
- DWORD  DeviceObject,
- DWORD  Irp,
- DWORD  Status
+ ULONG  DeviceObject,
+ ULONG  Irp,
+ ULONG  Status
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcCompletePendingPropertyRequest(
- DWORD PropertyRequest,
- DWORD NtStatus
+ ULONG PropertyRequest,
+ ULONG NtStatus
 );
 
 PORTCLASSAPI NTSTATUS STDCALL 
 PcCreateContentMixed(
- DWORD paContentId,
- DWORD cContentId,
- DWORD pMixedContentId
+ ULONG paContentId,
+ ULONG cContentId,
+ ULONG pMixedContentId
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcDestroyContent(
- DWORD ContentId
+ ULONG ContentId
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcDispatchIrp(
- DWORD DeviceObject,
- DWORD Irp
+ ULONG DeviceObject,
+ ULONG Irp
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcForwardContentToDeviceObject(
- DWORD ContentId,
- DWORD Reserved,
- DWORD DrmForward
+ ULONG ContentId,
+ ULONG Reserved,
+ ULONG DrmForward
 );
 
 PORTCLASSAPI NTSTATUS STDCALL 
 PcForwardContentToFileObject(
- DWORD ContentId,
- DWORD FileObject
+ ULONG ContentId,
+ ULONG FileObject
 );
 
 PORTCLASSAPI NTSTATUS STDCALL 
 PcForwardContentToInterface(
- DWORD ContentId,
- DWORD Unknown,
- DWORD NumMethods
+ ULONG ContentId,
+ ULONG Unknown,
+ ULONG NumMethods
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcForwardIrpSynchronous(
- DWORD DeviceObject,
- DWORD Irp 
+ ULONG DeviceObject,
+ ULONG Irp 
 );
 
 PORTCLASSAPI NTSTATUS STDCALL 
 PcGetContentRights(
- DWORD ContentId,
- DWORD DrmRights
+ ULONG ContentId,
+ ULONG DrmRights
 ); 
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcGetDeviceProperty(
- DWORD DeviceObject,
- DWORD DeviceProperty,
- DWORD BufferLength,
- DWORD PropertyBuffer,
- DWORD ResultLength
+ ULONG DeviceObject,
+ ULONG DeviceProperty,
+ ULONG BufferLength,
+ ULONG PropertyBuffer,
+ ULONG ResultLength
 );
 
 PORTCLASSAPI ULONGLONG STDCALL
@@ -112,136 +114,136 @@ PcGetTimeInterval(
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcInitializeAdapterDriver(
- DWORD DriverObject,
- DWORD RegistryPathName,
- DWORD AddDevice
+ ULONG DriverObject,
+ ULONG RegistryPathName,
+ ULONG AddDevice
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewDmaChannel(
- DWORD OutDmaChannel,
- DWORD Unknown,
- DWORD PoolType,
- DWORD DeviceDescription,
- DWORD DeviceObject
+ ULONG OutDmaChannel,
+ ULONG Unknown,
+ ULONG PoolType,
+ ULONG DeviceDescription,
+ ULONG DeviceObject
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewInterruptSync(
- DWORD OutInterruptSync,
- DWORD Unknown,
- DWORD ResourceList,
- DWORD ResourceIndex,
- DWORD Mode
+ ULONG OutInterruptSync,
+ ULONG Unknown,
+ ULONG ResourceList,
+ ULONG ResourceIndex,
+ ULONG Mode
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewMiniport(
- DWORD OutMiniport,
- DWORD ClassId
+ ULONG OutMiniport,
+ ULONG ClassId
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewPort(
- DWORD OutPort,
- DWORD ClassId
+ ULONG OutPort,
+ ULONG ClassId
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewRegistryKey(
- DWORD OutRegistryKey,
- DWORD Unknown,
- DWORD RegistryKeyType,
- DWORD DesiredAccess,
- DWORD DeviceObject,
- DWORD SubDevice,
- DWORD ObjectAttributes,
- DWORD CreateOptions,
- DWORD Disposition
+ ULONG OutRegistryKey,
+ ULONG Unknown,
+ ULONG RegistryKeyType,
+ ULONG DesiredAccess,
+ ULONG DeviceObject,
+ ULONG SubDevice,
+ ULONG ObjectAttributes,
+ ULONG CreateOptions,
+ ULONG Disposition
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewResourceList(
- DWORD OutResourceList,
- DWORD Unknown,
- DWORD PoolType,
- DWORD TranslatedResources,
- DWORD UntranslatedResources
+ ULONG OutResourceList,
+ ULONG Unknown,
+ ULONG PoolType,
+ ULONG TranslatedResources,
+ ULONG UntranslatedResources
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewResourceSublist(
- DWORD OutResourceList,
- DWORD Unknown,
- DWORD PoolType,
- DWORD ParentList,
- DWORD MaximumEntries
+ ULONG OutResourceList,
+ ULONG Unknown,
+ ULONG PoolType,
+ ULONG ParentList,
+ ULONG MaximumEntries
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcNewServiceGroup(
- DWORD OutServiceGroup,
- DWORD Unknown
+ ULONG OutServiceGroup,
+ ULONG Unknown
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcRegisterAdapterPowerManagement(
- DWORD Unknown,
- DWORD pvContext
+ ULONG Unknown,
+ ULONG pvContext
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcRegisterIoTimeout(
- DWORD pDeviceObject,
- DWORD pTimerRoutine,
- DWORD pContext
+ ULONG pDeviceObject,
+ ULONG pTimerRoutine,
+ ULONG pContext
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcRegisterPhysicalConnection(
- DWORD DeviceObject,
- DWORD FromUnknown,
- DWORD FromPin,
- DWORD ToUnknown,
- DWORD ToPin
+ ULONG DeviceObject,
+ ULONG FromUnknown,
+ ULONG FromPin,
+ ULONG ToUnknown,
+ ULONG ToPin
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcRegisterPhysicalConnectionFromExternal(
- DWORD DeviceObject,
- DWORD FromString,
- DWORD FromPin,
- DWORD ToUnknown,
- DWORD ToPin
+ ULONG DeviceObject,
+ ULONG FromString,
+ ULONG FromPin,
+ ULONG ToUnknown,
+ ULONG ToPin
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcRegisterPhysicalConnectionToExternal(
- DWORD DeviceObject,
- DWORD FromUnknown,
- DWORD FromPin,
- DWORD ToString,
- DWORD ToPin
+ ULONG DeviceObject,
+ ULONG FromUnknown,
+ ULONG FromPin,
+ ULONG ToString,
+ ULONG ToPin
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcRegisterSubdevice(
- DWORD DeviceObject,
- DWORD SubdevName,
- DWORD Unknown
+ ULONG DeviceObject,
+ ULONG SubdevName,
+ ULONG Unknown
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcRequestNewPowerState(
- DWORD pDeviceObject,
- DWORD RequestedNewState
+ ULONG pDeviceObject,
+ ULONG RequestedNewState
 );
 
 PORTCLASSAPI NTSTATUS STDCALL
 PcUnregisterIoTimeout(
- DWORD pDeviceObject,
- DWORD pTimerRoutine,
- DWORD pContext
+ ULONG pDeviceObject,
+ ULONG pTimerRoutine,
+ ULONG pContext
 );
 
 #ifdef __cplusplus
diff --git a/reactos/drivers/net/tcpip/include/tcp.h b/reactos/drivers/net/tcpip/include/tcp.h
index b160b660320..47359d17961 100644
--- a/reactos/drivers/net/tcpip/include/tcp.h
+++ b/reactos/drivers/net/tcpip/include/tcp.h
@@ -11,6 +11,7 @@ typedef VOID
 (*PTCP_COMPLETION_ROUTINE)( PVOID Context, NTSTATUS Status, ULONG Count );
 
 /* TCPv4 header structure */
+#include <pshpack1.h>
 typedef struct TCPv4_HEADER {
   USHORT SourcePort;        /* Source port */
   USHORT DestinationPort;   /* Destination port */
@@ -21,7 +22,7 @@ typedef struct TCPv4_HEADER {
   USHORT Window;            /* Maximum acceptable receive window */
   USHORT Checksum;          /* Checksum of segment */
   USHORT Urgent;            /* Pointer to urgent data */
-} __attribute__((packed)) TCPv4_HEADER, *PTCPv4_HEADER;
+} TCPv4_HEADER, *PTCPv4_HEADER;
 
 /* TCPv4 header flags */
 #define TCP_URG   0x20
@@ -49,7 +50,8 @@ typedef struct TCPv4_PSEUDO_HEADER {
   UCHAR Zero;               /* Reserved */
   UCHAR Protocol;           /* Protocol */
   USHORT TCPLength;         /* Size of TCP segment */
-} __attribute__((packed)) TCPv4_PSEUDO_HEADER, *PTCPv4_PSEUDO_HEADER;
+} TCPv4_PSEUDO_HEADER, *PTCPv4_PSEUDO_HEADER;
+#include <poppack.h>
 
 typedef struct _SLEEPING_THREAD {
     LIST_ENTRY Entry;
diff --git a/reactos/drivers/net/tcpip/include/udp.h b/reactos/drivers/net/tcpip/include/udp.h
index 0064e65e9ec..46609c245d9 100644
--- a/reactos/drivers/net/tcpip/include/udp.h
+++ b/reactos/drivers/net/tcpip/include/udp.h
@@ -11,12 +11,13 @@
 #define UDP_DYNAMIC_PORTS 0x8000
 
 /* UDPv4 header structure */
+#include <pshpack1.h>
 typedef struct UDP_HEADER {
   USHORT SourcePort; /* Source port */
   USHORT DestPort;   /* Destination port */
   USHORT Length;     /* Size of header and data */
   USHORT Checksum;   /* Checksum of datagram */
-} __attribute__((packed)) UDP_HEADER, *PUDP_HEADER;
+} UDP_HEADER, *PUDP_HEADER;
 
 /* UDPv4 pseudo header */
 typedef struct UDP_PSEUDO_HEADER {
@@ -25,8 +26,8 @@ typedef struct UDP_PSEUDO_HEADER {
   UCHAR Zero;          /* Reserved */
   UCHAR Protocol;      /* Protocol */
   USHORT UDPLength;    /* Size of UDP datagram */
-} __attribute__((packed)) UDP_PSEUDO_HEADER, *PUDP_PSEUDO_HEADER;
-
+} UDP_PSEUDO_HEADER, *PUDP_PSEUDO_HEADER;
+#include <poppack.h>
 
 typedef struct UDP_STATISTICS {
   ULONG InputDatagrams;
diff --git a/reactos/drivers/net/tcpip/recmutex/recmutex.h b/reactos/drivers/net/tcpip/recmutex/recmutex.h
index a170d4aed18..bec2cf60754 100644
--- a/reactos/drivers/net/tcpip/recmutex/recmutex.h
+++ b/reactos/drivers/net/tcpip/recmutex/recmutex.h
@@ -5,7 +5,7 @@ typedef struct _RECURSIVE_MUTEX {
     /* Lock. */
     FAST_MUTEX Mutex;
     /* Number of times this object was locked */
-    UINT LockCount;
+    SIZE_T LockCount;
     /* CurrentThread */
     PVOID CurrentThread;  
     /* Notification event which signals that another thread can take over */
@@ -21,7 +21,7 @@ typedef struct _RECURSIVE_MUTEX {
 } RECURSIVE_MUTEX, *PRECURSIVE_MUTEX;
 
 extern VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex );
-extern UINT RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToRead );
+extern SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToRead );
 extern VOID RecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex );
 
 #endif/*_ROSRTL_RECMUTEX_H*/
diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index 0b9c67a6bfe..91756b39d04 100644
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -388,6 +388,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 			{
 				fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" );
 				fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );
+				fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" );
 				fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 );
 				fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 );
 				fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ());
@@ -399,6 +400,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 				{
 					fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" );
 					fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );
+					fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" );
 					fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 );
 					fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 );
 					fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" );
@@ -408,6 +410,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 				{
 					fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" );
 					fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 );
+					fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" );
 					fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );
 					fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" );
 					fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ());