[ros-diffs] [cwittich] 66471: [PSDK] Update NETINFOSTRUCT, PERF_COUNTER_DEFINITION and PERF_OBJECT_TYPE structures remove packing from winwlx.h

Author: cwittich
Date: Thu Feb 26 15:45:01 2015
New Revision: 66471

URL: http://svn.reactos.org/svn/reactos?rev=66471&view=rev
Log:
[PSDK]
Update NETINFOSTRUCT, PERF_COUNTER_DEFINITION and PERF_OBJECT_TYPE structures
remove packing from winwlx.h

Modified:
    trunk/reactos/include/psdk/rasshost.h
    trunk/reactos/include/psdk/winnetwk.h
    trunk/reactos/include/psdk/winperf.h
    trunk/reactos/include/psdk/winwlx.h

Modified: trunk/reactos/include/psdk/rasshost.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rasshost.h?re…
==============================================================================
--- trunk/reactos/include/psdk/rasshost.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/rasshost.h	[iso-8859-1] Thu Feb 26 15:45:01 2015
@@ -11,7 +11,7 @@
 #define SECURITYMSG_FAILURE       2
 #define SECURITYMSG_ERROR         3
 
-typedef DWORD HPORT;
+typedef HANDLE HPORT;
 
 typedef struct _SECURITY_MESSAGE
 {

Modified: trunk/reactos/include/psdk/winnetwk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnetwk.h?re…
==============================================================================
--- trunk/reactos/include/psdk/winnetwk.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnetwk.h	[iso-8859-1] Thu Feb 26 15:45:01 2015
@@ -228,7 +228,7 @@
 	DWORD dwProviderVersion;
 	DWORD dwStatus;
 	DWORD dwCharacteristics;
-	DWORD dwHandle;
+	ULONG_PTR dwHandle;
 	WORD wNetType;
 	DWORD dwPrinters;
 	DWORD dwDrives;

Modified: trunk/reactos/include/psdk/winperf.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winperf.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winperf.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winperf.h	[iso-8859-1] Thu Feb 26 15:45:01 2015
@@ -97,9 +97,17 @@
 	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_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;

Modified: trunk/reactos/include/psdk/winwlx.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winwlx.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/winwlx.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winwlx.h	[iso-8859-1] Thu Feb 26 15:45:01 2015
@@ -24,8 +24,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-#pragma pack(push,4)
 
 
 #define WLX_VERSION_1_0				(0x00010000)
@@ -651,8 +649,6 @@
 } WLX_NOTIFICATION_INFO, *PWLX_NOTIFICATION_INFO;
 
 
-#pragma pack(pop)
-
 #ifdef __cplusplus
 }
 #endif