Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 15:36:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK]

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/psdk/rasshost.h
View file

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

2
reactos/include/psdk/winnetwk.h
View file

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

16
reactos/include/psdk/winperf.h
View file

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

4
reactos/include/psdk/winwlx.h
View file

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