[WTSAPI32][PSDK] Addendum to 27ed609a: Some of the WTS_INFO_CLASS values are NT6...

diff --git a/dll/win32/wtsapi32/wtsapi32.c b/dll/win32/wtsapi32/wtsapi32.c
index 5838f1a..60658fd 100644 (file)
--- a/dll/win32/wtsapi32/wtsapi32.c
+++ b/dll/win32/wtsapi32/wtsapi32.c
@@ -372,7 +372,11 @@ BOOL WINAPI WTSQuerySessionInformationW(
         return FALSE;
     }
 
         return FALSE;
     }
 

+#if (NTDDI_VERSION >= NTDDI_WS08)

     if (WTSInfoClass > WTSIsRemoteSession)
     if (WTSInfoClass > WTSIsRemoteSession)

+#else
+    if (WTSInfoClass > WTSClientProtocolType)
+#endif

     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;


@@ -447,6 +451,7 @@ BOOL WINAPI WTSQuerySessionInformationW(
             return TRUE;
         }
 
             return TRUE;
         }
 

+#if (NTDDI_VERSION >= NTDDI_WS08)

         case WTSIdleTime:
         case WTSLogonTime:
         case WTSIncomingBytes:
         case WTSIdleTime:
         case WTSLogonTime:
         case WTSIncomingBytes:


@@ -457,6 +462,7 @@ BOOL WINAPI WTSQuerySessionInformationW(
             SetLastError(ERROR_NOT_SUPPORTED);
             return FALSE;
         }
             SetLastError(ERROR_NOT_SUPPORTED);
             return FALSE;
         }

+#endif /* (NTDDI_VERSION >= NTDDI_WS08) */

 
         default:
         {
 
         default:
         {

diff --git a/sdk/include/psdk/wtsapi32.h b/sdk/include/psdk/wtsapi32.h
index b9dbb18..5fc98e5 100644 (file)
--- a/sdk/include/psdk/wtsapi32.h
+++ b/sdk/include/psdk/wtsapi32.h
@@ -59,6 +59,7 @@ typedef enum tagWTS_INFO_CLASS
     WTSClientAddress,
     WTSClientDisplay,
     WTSClientProtocolType,
     WTSClientAddress,
     WTSClientDisplay,
     WTSClientProtocolType,

+#if (NTDDI_VERSION >= NTDDI_WS08)

     WTSIdleTime,
     WTSLogonTime,
     WTSIncomingBytes,
     WTSIdleTime,
     WTSLogonTime,
     WTSIncomingBytes,


@@ -72,6 +73,7 @@ typedef enum tagWTS_INFO_CLASS
     WTSValidationInfo,
     WTSSessionAddressV4,
     WTSIsRemoteSession
     WTSValidationInfo,
     WTSSessionAddressV4,
     WTSIsRemoteSession

+#endif /* (NTDDI_VERSION >= NTDDI_WS08) */

 } WTS_INFO_CLASS;
 
 typedef enum _WTS_CONNECTSTATE_CLASS
 } WTS_INFO_CLASS;
 
 typedef enum _WTS_CONNECTSTATE_CLASS