ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Packing fixes

Browse Source 
svn path=/trunk/; revision=9667
This commit is contained in:
Filip Navara
2004-06-14 20:05:00 +00:00
parent 0999a0ef81
commit 4cb0e04a46
61 changed files with 47 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/w32api/include/ddk/atm.h
+1 -4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
typedef ULONG ATM_ADDRESSTYPE;
#define SAP_TYPE_NSAP 1
@@ -431,6 +429,7 @@ typedef struct _ATM_TRAFFIC_DESCRIPTOR {
typedef struct _ATM_TRAFFIC_DESCRIPTOR_IE {
ATM_TRAFFIC_DESCRIPTOR ForwardTD;
ATM_TRAFFIC_DESCRIPTOR BackwardTD;
BOOLEAN BestEffort;
} ATM_TRAFFIC_DESCRIPTOR_IE, *PATM_TRAFFIC_DESCRIPTOR_IE;
/* ATM_TRANSIT_NETWORK_SELECTION_IE.TypeOfNetworkId constants */
@@ -501,8 +500,6 @@ typedef struct _ATM_SERVICE_ADDRESS_LIST {
ATM_ADDRESS Address[1];
} ATM_SERVICE_ADDRESS_LIST, *PATM_SERVICE_ADDRESS_LIST;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/batclass.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#if defined(_BATTERYCLASS_)
@@ -293,8 +291,6 @@ DDKAPI
BatteryClassUnload(
IN PVOID ClassData);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/cfg.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#define CM_PROB_NOT_CONFIGURED 0x00000001
#define CM_PROB_DEVLOADER_FAILED 0x00000002
#define CM_PROB_OUT_OF_MEMORY 0x00000003
@@ -134,8 +132,6 @@ typedef enum _PNP_VETO_TYPE {
PNP_VetoLegacyDriver
} PNP_VETO_TYPE, *PPNP_VETO_TYPE;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/cfgmgr32.h
+3 -3
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#if defined(_CFGMGR32_)
@@ -43,6 +41,8 @@ extern "C" {
#include "cfg.h"
#include <pshpack1.h>
#define CR_SUCCESS 0x00000000
#define CR_DEFAULT 0x00000001
#define CR_OUT_OF_MEMORY 0x00000002
@@ -1524,7 +1524,7 @@ WINAPI
CMP_WaitNoPendingInstallEvents(
IN DWORD dwTimeout);
#pragma pack(pop)
#include <poppack.h>
#ifdef __cplusplus
}
reactos/w32api/include/ddk/d4drvif.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "d4iface.h"
@@ -99,8 +97,6 @@ typedef struct _DOT4_DRIVER_CMD {
ULONG ulTimeout;
} DOT4_DRIVER_CMD, *PDOT4_DRIVER_CMD;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/d4iface.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define DOT4_MAX_CHANNELS 128
@@ -79,8 +77,6 @@ typedef struct _DOT4_WMI_XFER_INFO {
ULONG ulPacketBytesRead;
} DOT4_WMI_XFER_INFO, *PDOT4_WMI_XFER_INFO;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ddkmapi.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#if defined(_DXAPI_)
@@ -329,8 +327,6 @@ typedef struct _DDSETSKIPFIELD {
DWORD dwStartField;
} DDSETSKIPFIELD, FAR *LPDDSETSKIPFIELD;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/hidclass.h
+14 -12
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "hidpi.h"
@@ -112,25 +110,31 @@ typedef struct _HID_DRIVER_CONFIG {
} HID_DRIVER_CONFIG, *PHID_DRIVER_CONFIG;
typedef struct _HID_INTERFACE_HIDPARSE {
#if 0
/* FIXME: COM stuff */
#ifdef __cplusplus
INTERFACE i;
#else
INTERFACE;
#endif
/* GCC doesn't support including unnamed structs, so INTERFACE is
expanded here */
USHORT Size;
USHORT Version;
PVOID Context;
PINTERFACE_REFERENCE InterfaceReference;
PINTERFACE_DEREFERENCE InterfaceDereference;
#endif
PHIDP_GETCAPS HidpGetCaps;
} HID_INTERFACE_HIDPARSE, *PHID_INTERFACE_HIDPARSE;
typedef struct _HID_INTERFACE_NOTIFY_PNP {
#if 0
/* FIXME: COM stuff */
#ifdef __cplusplus
INTERFACE i;
#else
INTERFACE;
#endif
/* GCC doesn't support including unnamed structs, so INTERFACE is
expanded here */
USHORT Size;
USHORT Version;
PVOID Context;
PINTERFACE_REFERENCE InterfaceReference;
PINTERFACE_DEREFERENCE InterfaceDereference;
#endif
PHID_STATUS_CHANGE StatusChangeFn;
PVOID CallbackContext;
@@ -142,8 +146,6 @@ typedef struct _HID_XFER_PACKET {
UCHAR reportId;
} HID_XFER_PACKET, *PHID_XFER_PACKET;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/hidpi.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "hidusage.h"
@@ -599,8 +597,6 @@ HidP_UsageListDifference(
OUT PUSAGE MakeUsageList,
IN ULONG UsageListLength);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/mcd.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "srb.h"
#include "scsi.h"
@@ -138,8 +136,6 @@ ChangerClassInitialize(
IN PUNICODE_STRING RegistryPath,
IN PMCD_INIT_DATA MCDInitData);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/miniport.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define EMULATOR_READ_ACCESS 0x01
#define EMULATOR_WRITE_ACCESS 0x02
@@ -73,8 +70,6 @@ typedef VOID DDKAPI
IN ULONG WriteBank,
IN PVOID Context);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/mountdev.h
-5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "mountmgr.h"
#define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME \
CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
@@ -75,8 +72,6 @@ typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT {
USHORT NewUniqueIdLength;
} MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/mountmgr.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID,
0x53f5630d, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
@@ -135,8 +132,6 @@ typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT {
USHORT TargetVolumeNameLength;
} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ndis.h
+3 -7
View File
@@ -37,8 +37,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddndis.h"
#include "netpnp.h"
@@ -537,6 +535,7 @@ typedef struct _NDIS_DMA_BLOCK {
PVOID MapRegisterBase;
KEVENT AllocationEvent;
PADAPTER_OBJECT SystemAdapterObject;
PVOID Miniport;
BOOLEAN InProgress;
} NDIS_DMA_BLOCK, *PNDIS_DMA_BLOCK;
@@ -703,10 +702,9 @@ typedef struct _CO_FLOW_PARAMETERS {
ULONG PeakBandwidth;
ULONG Latency;
ULONG DelayVariation;
GUARANTEE LevelOfGuarantee;
ULONG CostOfCall;
ULONG NetworkAvailability;
SERVICETYPE ServiceType;
ULONG MaxSduSize;
ULONG MinimumPolicedSize;
} CO_FLOW_PARAMETERS, *PCO_FLOW_PARAMETERS;
typedef struct _CO_SPECIFIC_PARAMETERS {
@@ -5220,8 +5218,6 @@ typedef struct _NDIS_MAC_CHARACTERISTICS {
typedef NDIS_MAC_CHARACTERISTICS NDIS_WAN_MAC_CHARACTERISTICS;
typedef NDIS_WAN_MAC_CHARACTERISTICS *PNDIS_WAN_MAC_CHARACTERISTICS;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ndistapi.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ndis.h"
#ifndef NDIS_TAPI_CURRENT_VERSION
@@ -1303,8 +1301,6 @@ typedef struct _CO_AF_TAPI_MAKE_CALL_PARAMETERS {
IN NDIS_VAR_DATA_DESC LineCallParams;
} CO_AF_TAPI_MAKE_CALL_PARAMETERS, *PCO_AF_TAPI_MAKE_CALL_PARAMETERS;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ndiswan.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ndis.h"
#define NDIS_USE_WAN_WRAPPER 0x00000001
@@ -246,8 +244,6 @@ typedef struct _NDIS_WAN_CO_GET_STATS_INFO {
OUT ULONG BytesReceivedCompressed;
} NDIS_WAN_CO_GET_STATS_INFO, *PNDIS_WAN_CO_GET_STATS_INFO;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/netpnp.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
typedef enum _NET_PNP_EVENT_CODE {
NetEventSetPower,
NetEventQueryPower,
@@ -64,8 +62,6 @@ typedef enum _NET_DEVICE_POWER_STATE {
NetDeviceStateMaximum
} NET_DEVICE_POWER_STATE, *PNET_DEVICE_POWER_STATE;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/newdev.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
/* UpdateDriverForPlugAndPlayDevices.InstallFlags constants */
#define INSTALLFLAG_FORCE 0x00000001
#define INSTALLFLAG_READONLY 0x00000002
@@ -61,8 +59,6 @@ UpdateDriverForPlugAndPlayDevicesW(
#define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesA
#endif /* UNICODE */
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntapi.h
+2 -2
View File
@@ -34,13 +34,13 @@
extern "C" {
#endif
#pragma pack(push,4)
#include <stdarg.h>
#include <winbase.h>
#include "ntddk.h"
#include "ntpoapi.h"
#pragma pack(push,4)
typedef struct _PEB *PPEB;
/* FIXME: Unknown definitions */
reactos/w32api/include/ddk/ntdd8042.h
-5
View File
@@ -31,13 +31,10 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddkbd.h"
#include "ntddmou.h"
#define IOCTL_INTERNAL_I8042_CONTROLLER_WRITE_BUFFER \
CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0FF2, METHOD_NEITHER, FILE_ANY_ACCESS)
@@ -209,8 +206,6 @@ typedef struct _INTERNAL_I8042_HOOK_MOUSE {
IN PVOID CallContext;
} INTERNAL_I8042_HOOK_MOUSE, *PINTERNAL_I8042_HOOK_MOUSE;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddbeep.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define DD_BEEP_DEVICE_NAME "\\Device\\Beep"
#define DD_BEEP_DEVICE_NAME_U L"\\Device\\Beep"
@@ -50,8 +47,6 @@ typedef struct _BEEP_SET_PARAMETERS {
#define BEEP_FREQUENCY_MINIMUM 0x25
#define BEEP_FREQUENCY_MAXIMUM 0x7FFF
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddcdrm.h
-5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddstor.h"
#define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM
#define IOCTL_CDROM_CHECK_VERIFY \
@@ -343,8 +340,6 @@ typedef struct __RAW_READ_INFO {
TRACK_MODE_TYPE TrackMode;
} RAW_READ_INFO, *PRAW_READ_INFO;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddcdvd.h
+4 -5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddstor.h"
#define IOCTL_DVD_BASE FILE_DEVICE_DVD
#define IOCTL_DVD_END_SESSION \
@@ -77,12 +74,14 @@ typedef enum DVD_STRUCTURE_FORMAT {
DvdMaxDescriptor
} DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT;
#include <pshpack1.h>
typedef struct DVD_READ_STRUCTURE {
LARGE_INTEGER BlockByteOffset;
DVD_STRUCTURE_FORMAT Format;
DVD_SESSION_ID SessionId;
UCHAR LayerNumber;
} DVD_READ_STRUCTURE, *PDVD_READ_STRUCTURE;
#include <poppack.h>
typedef struct _DVD_DESCRIPTOR_HEADER {
USHORT Length;
@@ -90,6 +89,7 @@ typedef struct _DVD_DESCRIPTOR_HEADER {
UCHAR Data[0];
} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER;
#include <pshpack1.h>
typedef struct _DVD_LAYER_DESCRIPTOR {
UCHAR BookVersion : 4;
UCHAR BookType : 4;
@@ -108,6 +108,7 @@ typedef struct _DVD_LAYER_DESCRIPTOR {
UCHAR BCAFlag : 1;
UCHAR Reserved6;
} DVD_LAYER_DESCRIPTOR, *PDVD_LAYER_DESCRIPTOR;
#include <poppack.h>
typedef struct _DVD_COPYRIGHT_DESCRIPTOR {
UCHAR CopyrightProtectionType;
@@ -205,8 +206,6 @@ typedef struct _DVD_REGION {
UCHAR ResetCount;
} DVD_REGION, *PDVD_REGION;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddchgr.h
-5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddstor.h"
#define DD_CHANGER_DEVICE_NAME "\\Device\\Changer"
#define DD_CHANGER_DEVICE_NAME_U L"\\Device\\Changer"
@@ -349,8 +346,6 @@ typedef struct _WMI_CHANGER_PROBLEM_DEVICE_ERROR {
ULONG ChangerProblemType;
} WMI_CHANGER_PROBLEM_DEVICE_ERROR, *PWMI_CHANGER_PROBLEM_DEVICE_ERROR;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntdddisk.h
+4 -5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddstor.h"
#define DD_DISK_DEVICE_NAME "\\Device\\UNKNOWN"
#define DD_DISK_DEVICE_NAME_U L"\\Device\\UNKNOWN"
@@ -454,6 +451,7 @@ typedef struct _IDEREGS {
UCHAR bReserved;
} IDEREGS, *PIDEREGS, *LPIDEREGS;
#include <pshpack1.h>
typedef struct _SENDCMDINPARAMS {
ULONG cBufferSize;
IDEREGS irDriveRegs;
@@ -462,6 +460,7 @@ typedef struct _SENDCMDINPARAMS {
ULONG dwReserved[4];
UCHAR bBuffer[1];
} SENDCMDINPARAMS, *PSENDCMDINPARAMS, *LPSENDCMDINPARAMS;
#include <poppack.h>
/* DRIVERSTATUS.bDriverError constants */
#define SMART_NO_ERROR 0
@@ -495,11 +494,13 @@ typedef struct _DRIVERSTATUS {
#define READ_THRESHOLD_BUFFER_SIZE 512
#define SMART_LOG_SECTOR_SIZE 512
#include <pshpack1.h>
typedef struct _SENDCMDOUTPARAMS {
ULONG cBufferSize;
DRIVERSTATUS DriverStatus;
UCHAR bBuffer[1];
} SENDCMDOUTPARAMS, *PSENDCMDOUTPARAMS, *LPSENDCMDOUTPARAMS;
#include <poppack.h>
#define READ_ATTRIBUTES 0xD0
#define READ_THRESHOLDS 0xD1
@@ -513,8 +514,6 @@ typedef struct _SENDCMDOUTPARAMS {
#define RETURN_SMART_STATUS 0xDA
#define ENABLE_DISABLE_AUTO_OFFLINE 0xDB
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddkbd.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define DD_KEYBOARD_DEVICE_NAME "\\Device\\KeyboardClass"
#define DD_KEYBOARD_DEVICE_NAME_U L"\\Device\\KeyboardClass"
@@ -131,8 +128,6 @@ typedef struct _KEYBOARD_IME_STATUS {
ULONG ImeConvMode;
} KEYBOARD_IME_STATUS, *PKEYBOARD_IME_STATUS;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddmou.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define DD_MOUSE_DEVICE_NAME "\\Device\\PointerClass"
#define DD_MOUSE_DEVICE_NAME_U L"\\Device\\PointerClass"
@@ -111,8 +108,6 @@ typedef struct _MOUSE_ATTRIBUTES {
ULONG InputDataQueueLength;
} MOUSE_ATTRIBUTES, *PMOUSE_ATTRIBUTES;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddpar.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
/* Parallel port device GUIDs */
DEFINE_GUID (GUID_DEVINTERFACE_PARALLEL,
@@ -115,8 +112,6 @@ typedef struct _PARCLASS_NEGOTIATION_MASK {
#define ECP_SW 0x0400
#define ECP_ANY 0x0780
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddpcm.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define IOCTL_PCMCIA_BASE FILE_DEVICE_CONTROLLER
#define DD_PCMCIA_DEVICE_NAME "\\\\.\\Pcmcia"
@@ -161,8 +158,6 @@ typedef struct _PCMCIA_INTERFACE_STANDARD {
PPCMCIA_IS_WRITE_PROTECTED IsWriteProtected;
} PCMCIA_INTERFACE_STANDARD, *PPCMCIA_INTERFACE_STANDARD;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddscsi.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort"
#define DD_SCSI_DEVICE_NAME_U L"\\Device\\ScsiPort"
@@ -167,8 +164,6 @@ typedef struct _DUMP_POINTERS {
PVOID DeviceObject;
} DUMP_POINTERS, *PDUMP_POINTERS;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddser.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
/* GUIDs */
DEFINE_GUID(GUID_DEVINTERFACE_COMPORT,
@@ -445,8 +442,6 @@ typedef struct _SERIALCONFIG {
WCHAR ProviderData[1];
} SERIALCONFIG,*PSERIALCONFIG;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddstor.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE
#define IOCTL_STORAGE_CHECK_VERIFY \
@@ -329,8 +326,6 @@ typedef struct _STORAGE_PROPERTY_QUERY {
UCHAR AdditionalParameters[1];
} STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddtape.h
-5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddstor.h"
#define DD_TAPE_DEVICE_NAME "\\Device\\Tape"
#define DD_TAPE_DEVICE_NAME_U L"\\Device\\Tape"
@@ -75,8 +72,6 @@ typedef enum _TAPE_DRIVE_PROBLEM_TYPE {
TapeDriveSnappedTape
} TAPE_DRIVE_PROBLEM_TYPE;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddtdi.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define DD_TDI_DEVICE_NAME "\\Device\\UNKNOWN"
#define DD_TDI_DEVICE_NAME_U L"\\Device\\UNKNOWN"
@@ -57,8 +54,6 @@ extern "C" {
#define IOCTL_TDI_DISASSOCIATE_ADDRESS _TDI_CONTROL_CODE(12, METHOD_BUFFERED)
#define IOCTL_TDI_ACTION _TDI_CONTROL_CODE(13, METHOD_OUT_DIRECT)
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddvdeo.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
@@ -435,8 +433,6 @@ typedef struct _VIDEO_HARDWARE_STATE {
#define VIDEO_DUALVIEW_PRIMARY 0x80000000
#define VIDEO_DUALVIEW_SECONDARY 0x40000000
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntddvol.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define IOCTL_VOLUME_BASE ((ULONG) 'V')
#define IOCTL_VOLUME_LOGICAL_TO_PHYSICAL \
@@ -137,8 +134,6 @@ typedef struct _VOLUME_FAILOVER_SET {
ULONG DiskNumbers[1];
} VOLUME_FAILOVER_SET, *PVOLUME_FAILOVER_SET;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ntpoapi.h
-5
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "batclass.h"
@@ -224,9 +222,6 @@ typedef struct _PROCESSOR_POWER_INFORMATION {
ULONG CurrentIdleState;
} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/parallel.h
-5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "ntddpar.h"
#define DD_PARALLEL_PORT_BASE_NAME "ParallelPort"
#define DD_PARALLEL_PORT_BASE_NAME_U L"ParallelPort"
@@ -273,8 +270,6 @@ typedef struct _PARCLASS_INFORMATION {
PPARALLEL_DESELECT_DEVICE ParallelDeSelect;
} PARCLASS_INFORMATION, *PPARCLASS_INFORMATION;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/pfhook.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define DD_IPFLTRDRVR_DEVICE_NAME L"\\Device\\IPFILTERDRIVER"
#define INVALID_PF_IF_INDEX 0xffffffff
@@ -72,8 +69,6 @@ typedef struct _PF_SET_EXTENSION_HOOK_INFO {
#define IOCTL_PF_SET_EXTENSION_POINTER \
_IPFLTRDRVR_CTL_CODE(22, METHOD_BUFFERED, FILE_WRITE_ACCESS)
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/poclass.h
-5
View File
@@ -31,12 +31,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "batclass.h"
DEFINE_GUID(GUID_CLASS_INPUT,
0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30);
@@ -114,8 +111,6 @@ typedef struct _PROCESSOR_OBJECT_INFO {
UCHAR PBlkLength;
} PROCESSOR_OBJECT_INFO, *PPROCESSOR_OBJECT_INFO;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/scsi.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
typedef union _CDB {
@@ -1689,8 +1687,6 @@ typedef union _TWO_BYTE {
(Bit) = _val; \
}
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/scsiscan.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define IOCTL_SCSISCAN_CMD \
CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_CMD_CODE, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
@@ -126,8 +123,6 @@ typedef struct _SCSISCAN_INFO {
ULONG Reserved;
} SCSISCAN_INFO, *PSCSISCAN_INFO;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/smbus.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#if !defined(SMBCLASS)
#define SMBCLASSAPI DECLSPEC_IMPORT
#else
@@ -185,8 +183,6 @@ DDKAPI
SmbClassUnlockDevice(
IN PSMB_CLASS SmbClass);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/srb.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#if defined(_SCSIPORT_)
@@ -748,8 +746,6 @@ ScsiDebugPrint(
IN PCCHAR DebugMessage,
IN ...);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/storport.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "srb.h"
@@ -417,8 +415,6 @@ StorPortSynchronizeAccess(
#define DebugPrint(x)
#endif
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/tdiinfo.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
typedef struct TDIEntityID {
ULONG tei_entity;
ULONG tei_instance;
@@ -106,8 +103,6 @@ typedef struct _TCP_REQUEST_SET_INFORMATION_EX {
UCHAR Buffer[1];
} TCP_REQUEST_SET_INFORMATION_EX, *PTCP_REQUEST_SET_INFORMATION_EX;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/tdikrnl.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "tdi.h"
@@ -1157,8 +1155,6 @@ DDKAPI
TdiUnmapBuffer(
IN PMDL MdlChain);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/tvout.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
/* VIDEOPARAMETERS.dwCommand constants */
#define VP_COMMAND_GET 0x00000001
#define VP_COMMAND_SET 0x00000002
@@ -112,8 +109,6 @@ typedef struct _VIDEOPARAMETERS {
BYTE bOEMCopyProtection[256];
} VIDEOPARAMETERS, *PVIDEOPARAMETERS, FAR *LPVIDEOPARAMETERS;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/upssvc.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#if defined(_APCUPS_)
@@ -89,8 +87,6 @@ UPSWaitForStateChange(
IN DWORD aCurrentState,
IN DWORD anInterval);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/usb.h
-4
View File
@@ -35,8 +35,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "usb100.h"
@@ -464,8 +462,6 @@ typedef struct _OS_STRING {
UCHAR bPad;
} OS_STRING, *POS_STRING;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/usb100.h
+9 -5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define MAXIMUM_USB_STRING_LENGTH 255
#define USB_DEVICE_CLASS_RESERVED 0x00
@@ -101,15 +98,18 @@ typedef struct _USB_COMMON_DESCRIPTOR {
#define USB_CONFIG_SELF_POWERED 0x40
#define USB_CONFIG_REMOTE_WAKEUP 0x20
#include <pshpack1.h>
typedef struct _USB_CONFIGURATION_DESCRIPTOR {
UCHAR bLength;
UCHAR bDescriptorType;
USHORT wTotalLength;
UCHAR bNumInterfaces;
UCHAR bConfigurationValue;
UCHAR iConfiguration;
UCHAR bmAttributes;
UCHAR MaxPower;
} USB_CONFIGURATION_DESCRIPTOR, *PUSB_CONFIGURATION_DESCRIPTOR;
#include <poppack.h>
typedef struct _USB_DEVICE_DESCRIPTOR {
UCHAR bLength;
@@ -140,6 +140,7 @@ typedef struct _USB_DEVICE_DESCRIPTOR {
#define USB_ENDPOINT_TYPE_BULK 0x02
#define USB_ENDPOINT_TYPE_INTERRUPT 0x03
#include <pshpack1.h>
typedef struct _USB_ENDPOINT_DESCRIPTOR {
UCHAR bLength;
UCHAR bDescriptorType;
@@ -148,6 +149,7 @@ typedef struct _USB_ENDPOINT_DESCRIPTOR {
USHORT wMaxPacketSize;
UCHAR bInterval;
} USB_ENDPOINT_DESCRIPTOR, *PUSB_ENDPOINT_DESCRIPTOR;
#include <poppack.h>
#define USB_FEATURE_ENDPOINT_STALL 0x0000
#define USB_FEATURE_REMOTE_WAKEUP 0x0001
@@ -170,6 +172,7 @@ typedef struct _USB_STRING_DESCRIPTOR {
WCHAR bString[1];
} USB_STRING_DESCRIPTOR, *PUSB_STRING_DESCRIPTOR;
#include <pshpack1.h>
typedef struct _USB_HUB_DESCRIPTOR {
UCHAR bDescriptorLength;
UCHAR bDescriptorType;
@@ -179,6 +182,7 @@ typedef struct _USB_HUB_DESCRIPTOR {
UCHAR bHubControlCurrent;
UCHAR bRemoveAndPowerMask[64];
} USB_HUB_DESCRIPTOR, *PUSB_HUB_DESCRIPTOR;
#include <poppack.h>
#define USB_SUPPORT_D0_COMMAND 0x01
#define USB_SUPPORT_D1_COMMAND 0x02
@@ -209,6 +213,7 @@ typedef struct _USB_CONFIGURATION_POWER_DESCRIPTOR {
#define USB_FEATURE_INTERFACE_POWER_D2 0x0004
#define USB_FEATURE_INTERFACE_POWER_D3 0x0005
#include <pshpack1.h>
typedef struct _USB_INTERFACE_POWER_DESCRIPTOR {
UCHAR bLength;
UCHAR bDescriptorType;
@@ -223,8 +228,7 @@ typedef struct _USB_INTERFACE_POWER_DESCRIPTOR {
USHORT TransitionTimeFromD2;
USHORT TransitionTimeFromD3;
} USB_INTERFACE_POWER_DESCRIPTOR, *PUSB_INTERFACE_POWER_DESCRIPTOR;
#pragma pack(pop)
#include <poppack.h>
#ifdef __cplusplus
}
reactos/w32api/include/ddk/usbdi.h
-5
View File
@@ -35,12 +35,9 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "usbioctl.h"
#define USBDI_VERSION 0x300
#define USB_DEFAULT_DEVICE_ADDRESS 0
@@ -401,8 +398,6 @@ typedef struct _URB {
};
} URB, *PURB;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/usbioctl.h
+3 -3
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "usb100.h"
#include "usbiodef.h"
@@ -151,6 +149,8 @@ typedef enum _USB_CONNECTION_STATUS {
DeviceInLegacyHub
} USB_CONNECTION_STATUS, *PUSB_CONNECTION_STATUS;
#include <pshpack1.h>
typedef struct _USB_DESCRIPTOR_REQUEST {
ULONG ConnectionIndex;
struct {
@@ -344,7 +344,7 @@ typedef struct _USB_ROOT_HUB_NAME {
WCHAR RootHubName[1];
} USB_ROOT_HUB_NAME, *PUSB_ROOT_HUB_NAME;
#pragma pack(pop)
#include <poppack.h>
#ifdef __cplusplus
}
reactos/w32api/include/ddk/usbiodef.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, \
0xf18a0e88, 0xc30c, 0x11d0, 0x88, 0x15, 0x00, 0xa0, 0xc9, 0x06, 0xbe, 0xd8);
@@ -102,8 +99,6 @@ DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION,
METHOD_NEITHER, \
FILE_ANY_ACCESS)
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/usbscan.h
-5
View File
@@ -31,11 +31,8 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#define FILE_DEVICE_USB_SCAN 0x8000
#define IOCTL_INDEX 0x0800
@@ -154,8 +151,6 @@ typedef enum _PIPE_TYPE {
ALL_PIPE
} PIPE_TYPE;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/usbuser.h
+2 -3
View File
@@ -31,12 +31,11 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "usb.h"
#include "usbiodef.h"
#include <pshpack1.h>
#define USBUSER_VERSION 0x0004
@@ -320,7 +319,7 @@ typedef struct _USBUSER_GET_USB2HW_VERSION {
USB_USB2HW_VERSION_PARAMETERS Parameters;
} USBUSER_GET_USB2HW_VERSION, *PUSBUSER_GET_USB2HW_VERSION;
#pragma pack(pop)
#include <poppack.h>
#ifdef __cplusplus
}
reactos/w32api/include/ddk/video.h
-1
View File
@@ -169,7 +169,6 @@ typedef struct _VIDEO_PORT_CONFIG_INFO {
ULONG NumEmulatorAccessEntries;
PEMULATOR_ACCESS_ENTRY EmulatorAccessEntries;
ULONG_PTR EmulatorAccessEntriesContext;
PVOID Reserved0;
PHYSICAL_ADDRESS VdmPhysicalVideoMemoryAddress;
ULONG VdmPhysicalVideoMemoryLength;
ULONG HardwareStateSize;
reactos/w32api/include/ddk/videoagp.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include "ntddk.h"
#include "video.h"
@@ -124,8 +122,6 @@ VideoPortGetAgpServices(
IN PVOID HwDeviceExtension,
IN PVIDEO_PORT_AGP_SERVICES AgpServices);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/winddi.h
+2 -4
View File
@@ -828,7 +828,7 @@ typedef struct _GDIINFO {
typedef struct _PATHDATA {
FLONG flags;
ULONG count;
POINTFIX pptfx;
POINTFIX *glypptfx;
} PATHDATA, *PPATHDATA;
/* PATHOBJ.fl constants */
@@ -856,7 +856,7 @@ typedef union _GLYPHDEF {
typedef struct _GLYPHPOS {
HGLYPH hg;
GLYPHDEF *pgdf;
POINTL *ptl;
POINTL ptl;
} GLYPHPOS, *PGLYPHPOS;
typedef struct _GLYPHDATA {
@@ -4147,8 +4147,6 @@ DrvGetDirectDrawInfo(
OUT DWORD *pdwNumFourCCCodes,
OUT DWORD *pdwFourCC);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/winnt4.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
typedef struct _ZONE_SEGMENT_HEADER {
SINGLE_LIST_ENTRY SegmentList;
PVOID Reserved;
@@ -599,8 +597,6 @@ Exfi386InterlockedExchangeUlong(
#endif /* _X86_ */
#pragma pack(pop)
#ifdef __cplusplus
}
#endif
reactos/w32api/include/ddk/ws2san.h
-4
View File
@@ -31,8 +31,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#include <winsock2.h>
#include "ntddk.h"
@@ -243,8 +241,6 @@ typedef int WSPAPI
IN OUT LPDWORD lpdwDescriptorLength,
OUT LPINT lpErrno);
#pragma pack(pop)
#ifdef __cplusplus
}
#endif