Update NETINFOSTRUCT, PERF_COUNTER_DEFINITION and PERF_OBJECT_TYPE structures
remove packing from winwlx.h

svn path=/trunk/; revision=66471
This commit is contained in:
Christoph von Wittich 2015-02-26 15:45:01 +00:00
parent 3c1dc3355c
commit 329f3e0d7f
4 changed files with 18 additions and 6 deletions

View file

@ -11,7 +11,7 @@ extern "C" {
#define SECURITYMSG_FAILURE 2
#define SECURITYMSG_ERROR 3
typedef DWORD HPORT;
typedef HANDLE HPORT;
typedef struct _SECURITY_MESSAGE
{

View file

@ -228,7 +228,7 @@ typedef struct _NETINFOSTRUCT{
DWORD dwProviderVersion;
DWORD dwStatus;
DWORD dwCharacteristics;
DWORD dwHandle;
ULONG_PTR dwHandle;
WORD wNetType;
DWORD dwPrinters;
DWORD dwDrives;

View file

@ -97,9 +97,17 @@ typedef struct _PERF_OBJECT_TYPE {
DWORD DefinitionLength;
DWORD HeaderLength;
DWORD ObjectNameTitleIndex;
#ifdef _WIN64
DWORD ObjectNameTitle;
#else
LPWSTR ObjectNameTitle;
#endif
DWORD ObjectHelpTitleIndex;
#ifdef _WIN64
DWORD ObjectHelpTitle;
#else
LPWSTR ObjectHelpTitle;
#endif
DWORD DetailLevel;
DWORD NumCounters;
LONG DefaultCounter;
@ -111,9 +119,17 @@ typedef struct _PERF_OBJECT_TYPE {
typedef struct _PERF_COUNTER_DEFINITION {
DWORD ByteLength;
DWORD CounterNameTitleIndex;
#ifdef _WIN64
DWORD CounterNameTitle;
#else
LPWSTR CounterNameTitle;
#endif
DWORD CounterHelpTitleIndex;
#ifdef _WIN64
DWORD CounterHelpTitle;
#else
LPWSTR CounterHelpTitle;
#endif
LONG DefaultScale;
DWORD DetailLevel;
DWORD CounterType;

View file

@ -25,8 +25,6 @@
extern "C" {
#endif
#pragma pack(push,4)
#define WLX_VERSION_1_0 (0x00010000)
#define WLX_VERSION_1_1 (0x00010001)
@ -651,8 +649,6 @@ struct _WLX_NOTIFICATION_INFO
} WLX_NOTIFICATION_INFO, *PWLX_NOTIFICATION_INFO;
#pragma pack(pop)
#ifdef __cplusplus
}
#endif