pywin32-checkins

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13676/win32/src

Modified Files:
	win32pdhmodule.cpp 
Removed Files:
	pdh.h 
Log Message:
Fix some 64-bit issues in win32pdh, and remove copy of pdh.h

--- pdh.h DELETED ---

Index: win32pdhmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32pdhmodule.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** win32pdhmodule.cpp	3 Jun 2007 14:53:07 -0000	1.15
--- win32pdhmodule.cpp	16 Aug 2007 09:18:31 -0000	1.16
***************
*** 912,916 ****
  
  
! PDH_STATUS __stdcall CounterPathCallback(DWORD dwArg)
  {
  	MY_DLG_CONFIG *pMy = (MY_DLG_CONFIG *)dwArg;
--- 912,916 ----
  
  
! PDH_STATUS __stdcall PyCounterPathCallback(DWORD_PTR dwArg)
  {
  	MY_DLG_CONFIG *pMy = (MY_DLG_CONFIG *)dwArg;
***************
*** 969,973 ****
  			return NULL;
  		}
! 		int seqLen = PySequence_Length(obFlags);
  		if (seqLen>0) GET_IT(pcfg->bIncludeInstanceIndex, obFlags, 0);
  		if (seqLen>1) GET_IT(pcfg->bSingleCounterPerAdd, obFlags, 1);
--- 969,973 ----
  			return NULL;
  		}
! 		Py_ssize_t seqLen = PySequence_Length(obFlags);
  		if (seqLen>0) GET_IT(pcfg->bIncludeInstanceIndex, obFlags, 0);
  		if (seqLen>1) GET_IT(pcfg->bSingleCounterPerAdd, obFlags, 1);
***************
*** 980,985 ****
  	}
  
! 	pcfg->dwCallBackArg = (DWORD)&myCfg;
! 	pcfg->pCallBack = CounterPathCallback;
  
  	pcfg->szReturnPathBuffer = (char *)malloc(1024);
--- 980,985 ----
  	}
  
! 	pcfg->dwCallBackArg = (DWORD_PTR)&myCfg;
! 	pcfg->pCallBack = PyCounterPathCallback;
  
  	pcfg->szReturnPathBuffer = (char *)malloc(1024);