[pywin32-checkins] pywin32/win32/src win32tsmodule.cpp, 1.4.2.1, 1.4.2.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5707/win32/src

Modified Files:
      Tag: py3k
	win32tsmodule.cpp 
Log Message:
Merge from trunk; WTSGetActiveConsoleSessionId always raised 
NotImplementedError; it's in kernel32


Index: win32tsmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32tsmodule.cpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** win32tsmodule.cpp	29 Aug 2008 04:59:28 -0000	1.4.2.1
--- win32tsmodule.cpp	25 Oct 2008 00:19:13 -0000	1.4.2.2
***************
*** 817,821 ****
  		h=LoadLibrary(L"wtsapi32.dll");
  	if (h){
- 		pfnWTSGetActiveConsoleSessionId=(WTSGetActiveConsoleSessionIdfunc)GetProcAddress(h, "WTSGetActiveConsoleSessionId");
  		pfnWTSQueryUserToken=(WTSQueryUserTokenfunc)GetProcAddress(h, "WTSQueryUserToken");
  		pfnWTSRegisterSessionNotification=(WTSRegisterSessionNotificationfunc)GetProcAddress(h, "WTSRegisterSessionNotification");
--- 817,820 ----
***************
*** 826,831 ****
  	if (h==NULL)
  		h=LoadLibrary(L"kernel32.dll");
! 	if (h)
  		pfnProcessIdToSessionId=(ProcessIdToSessionIdfunc)GetProcAddress(h, "ProcessIdToSessionId");
  
  #if (PY_VERSION_HEX >= 0x03000000)
--- 825,832 ----
  	if (h==NULL)
  		h=LoadLibrary(L"kernel32.dll");
! 	if (h) {
  		pfnProcessIdToSessionId=(ProcessIdToSessionIdfunc)GetProcAddress(h, "ProcessIdToSessionId");
+ 		pfnWTSGetActiveConsoleSessionId=(WTSGetActiveConsoleSessionIdfunc)GetProcAddress(h, "WTSGetActiveConsoleSessionId");
+ 	}
  
  #if (PY_VERSION_HEX >= 0x03000000)