pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/Wise/PyWise PyWise.dsp,1.7,1.8

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

Update of /cvsroot/pywin32/pywin32/Wise/PyWise
In directory sc8-pr-cvs1:/tmp/cvs-serv29864

Modified Files:
	PyWise.dsp 
Log Message:
Add 2.4 support to the pywise extension.


Index: PyWise.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Wise/PyWise/PyWise.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PyWise.dsp	8 Oct 2002 11:43:30 -0000	1.7
--- PyWise.dsp	1 Sep 2003 08:21:12 -0000	1.8
***************
*** 18,22 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
- !MESSAGE "PyWise - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "PyWise - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "PyWise - Win32 Python 16 Release" (based on "Win32 (x86) Dynamic-Link Library")
--- 18,21 ----
***************
*** 25,28 ****
--- 24,28 ----
  !MESSAGE "PyWise - Win32 Python 22 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "PyWise - Win32 Python 23 Release" (based on "Win32 (x86) Dynamic-Link Library")
+ !MESSAGE "PyWise - Win32 Python 24 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
***************
*** 35,64 ****
  RSC=rc.exe
  
! !IF  "$(CFG)" == "PyWise - Win32 Release"
! 
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "WinRel"
! # PROP BASE Intermediate_Dir "WinRel"
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "Build\Release"
! # PROP Intermediate_Dir "Build\Temp\Release"
! # PROP Ignore_Export_Lib 0
! # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\Python-1.5.2\pc" /I "..\..\..\Python-1.5.2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # SUBTRACT CPP /Fr
! # ADD BASE MTL /nologo /D "NDEBUG" /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
! # ADD BASE RSC /l 0x409 /d "NDEBUG"
! # ADD RSC /l 0x409 /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 ..\..\..\Python-1.5.2\pcbuild\python15.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! 
! !ELSEIF  "$(CFG)" == "PyWise - Win32 Debug"
  
  # PROP BASE Use_MFC 0
--- 35,39 ----
  RSC=rc.exe
  
! !IF  "$(CFG)" == "PyWise - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 230,238 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Build\Release\PyWise23.dll"
  
  !ENDIF 
  
  # Begin Target
  
- # Name "PyWise - Win32 Release"
  # Name "PyWise - Win32 Debug"
  # Name "PyWise - Win32 Python 16 Release"
--- 205,241 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Build\Release\PyWise23.dll"
  
+ !ELSEIF  "$(CFG)" == "PyWise - Win32 Python 24 Release"
+ 
+ # PROP BASE Use_MFC 0
+ # PROP BASE Use_Debug_Libraries 0
+ # PROP BASE Output_Dir "PyWise___Win32_Python_24_Release"
+ # PROP BASE Intermediate_Dir "PyWise___Win32_Python_24_Release"
+ # PROP BASE Ignore_Export_Lib 0
+ # PROP BASE Target_Dir ""
+ # PROP Use_MFC 0
+ # PROP Use_Debug_Libraries 0
+ # PROP Output_Dir "Build\Temp"
+ # PROP Intermediate_Dir "Build\Temp\Release24"
+ # PROP Ignore_Export_Lib 0
+ # PROP Target_Dir ""
+ # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+ # SUBTRACT BASE CPP /Fr
+ # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+ # SUBTRACT CPP /Fr
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+ # ADD BASE RSC /l 0x409 /d "NDEBUG"
+ # ADD RSC /l 0x409 /d "NDEBUG"
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Build\Release\PyWise23.dll"
+ # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Build\Release\PyWise24.dll"
+ 
  !ENDIF 
  
  # Begin Target
  
  # Name "PyWise - Win32 Debug"
  # Name "PyWise - Win32 Python 16 Release"
***************
*** 241,244 ****
--- 244,248 ----
  # Name "PyWise - Win32 Python 22 Release"
  # Name "PyWise - Win32 Python 23 Release"
+ # Name "PyWise - Win32 Python 24 Release"
  # Begin Group "Source Files"
  

[pywin32-checkins] pywin32/Wise win32all.wse,1.31,1.32

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

Update of /cvsroot/pywin32/pywin32/Wise
In directory sc8-pr-cvs1:/tmp/cvs-serv29597

Modified Files:
	win32all.wse 
Log Message:
Change default values from 2.2 to 2.3


Index: win32all.wse
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Wise/win32all.wse,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** win32all.wse	27 Jul 2003 23:04:27 -0000	1.31
--- win32all.wse	1 Sep 2003 08:20:16 -0000	1.32
***************
*** 18,22 ****
    Patch Threshold=85
    Patch Memory=4000
!   EXE Filename=win32all-157.exe
    Code Sign Name=Python Win32 combined extensions
    Code Sign Info=skippinet.com.au
--- 18,22 ----
    Patch Threshold=85
    Patch Memory=4000
!   EXE Filename=win32all-20030731.exe
    Code Sign Name=Python Win32 combined extensions
    Code Sign Info=skippinet.com.au
***************
*** 35,39 ****
    Variable Name4=PYVER_DOTTED
    Variable Description4=Python version number
!   Variable Default4=2.2
    Variable Values4=1.5
    Variable Values4=1.6
--- 35,39 ----
    Variable Name4=PYVER_DOTTED
    Variable Description4=Python version number
!   Variable Default4=2.3
    Variable Values4=1.5
    Variable Values4=1.6
***************
*** 42,49 ****
    Variable Values4=2.2
    Variable Values4=2.3
    Variable Flags4=00000010
    Variable Name5=PYVER_NODOT
    Variable Description5=Python version number, without a dot.
!   Variable Default5=22
    Variable Values5=15
    Variable Values5=16
--- 42,50 ----
    Variable Values4=2.2
    Variable Values4=2.3
+   Variable Values4=2.4
    Variable Flags4=00000010
    Variable Name5=PYVER_NODOT
    Variable Description5=Python version number, without a dot.
!   Variable Default5=23
    Variable Values5=15
    Variable Values5=16
***************
*** 52,55 ****
--- 53,57 ----
    Variable Values5=22
    Variable Values5=23
+   Variable Values5=24
    Variable Flags5=00000010
    Variable Name6=PY_DEV_BUILD

[pywin32-checkins] pywin32/Wise brandall.py,1.5,1.6

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

Update of /cvsroot/pywin32/pywin32/Wise
In directory sc8-pr-cvs1:/tmp/cvs-serv29464

Modified Files:
	brandall.py 
Log Message:
Handle building CVS versions better.


Index: brandall.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Wise/brandall.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** brandall.py	7 Jul 2003 14:08:14 -0000	1.5
--- brandall.py	1 Sep 2003 08:19:06 -0000	1.6
***************
*** 22,28 ****
  			bRebrand = 1
  
- 	if len(args) != 2:
- 		print "You must enter the Python version and the build number"
- 		return
  	defines = []
  	if args[0] == "cvs":
--- 22,25 ----
***************
*** 32,37 ****
  		build_suffix = time.strftime("%Y%m%d", time.gmtime(time.time()))
  		defines.append("PY_DEV_BUILD=1")
! 		# xxx
  	else:
  		pyver = args[0]
  		build = args[1]
--- 29,39 ----
  		build_suffix = time.strftime("%Y%m%d", time.gmtime(time.time()))
  		defines.append("PY_DEV_BUILD=1")
! 		pyver = "%d.%d" % (sys.version_info[0], sys.version_info[1])
! 		defines.append("PYVER_DOTTED=%s" % (pyver,))
! 		defines.append("PYVER_NODOT=%d%d" % (sys.version_info[0], sys.version_info[1]))
  	else:
+ 		if len(args) != 2:
+ 			print "You must enter the Python version and the build number"
+ 			return
  		pyver = args[0]
  		build = args[1]
***************
*** 46,57 ****
  			print why
  			return
- 		if sys.executable.find("_d")<0:
- 			print "Oops - can't brand myself - spawing debug version."
- 			base, ext = os.path.splitext(sys.executable)
- 			exe = base + "_d" + ext
- 			os.execv(exe, [exe]+sys.argv)
- 			# Does not return
- 			assert(False)
  		build_suffix = build
  #	projectName = "$/Python/Wise/win32all"
  	
--- 48,60 ----
  			print why
  			return
  		build_suffix = build
+ 	if sys.executable.find("_d")<0:
+ 		print "Oops - can't brand myself - spawing debug version."
+ 		print "XXX - note that readline is gunna screw up"
+ 		base, ext = os.path.splitext(sys.executable)
+ 		exe = base + "_d" + ext
+ 		os.execv(exe, [exe]+sys.argv)
+ 		# Does not return
+ 		assert(False)
  #	projectName = "$/Python/Wise/win32all"
  	

[pywin32-checkins] pywin32/com/win32com __init__.py,1.3,1.4

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

Update of /cvsroot/pywin32/pywin32/com/win32com
In directory sc8-pr-cvs1:/tmp/cvs-serv28824

Modified Files:
	__init__.py 
Log Message:
Ensure win32com.gen_py exists even when the genpath is the default,
and if the win32com\gen_py directory doesn't exist use
%TEMP%\gen_py\%Py_VERSION% (rather than trying to create a directory
which may be read-only after installation for some users)


Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/__init__.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** __init__.py	2 Jul 2003 03:43:42 -0000	1.3
--- __init__.py	1 Sep 2003 08:16:33 -0000	1.4
***************
*** 3,7 ****
  #
  
! import win32api, sys
  import pythoncom
  
--- 3,7 ----
  #
  
! import win32api, sys, os
  import pythoncom
  
***************
*** 57,76 ****
  		found = 0
  		global __gen_path__
! 		try:
! 			if key is not None:
  				__gen_path__ = win32api.RegQueryValue(key, "GenPath")
  				found = 1
! 				# Import a special module, Otherwise it is already all setup for us.
! 				import new
! 				global gen_py # Exists in the win32com namespace.
! 				gen_py = new.module("win32com.gen_py")
! 				gen_py.__path__ = [ __gen_path__ ]
! 				sys.modules[gen_py.__name__]=gen_py
! 				
! 		except win32api.error:
! 			found = 0
! 		
  		if not found:
! 			__gen_path__ = win32api.GetFullPathName( __path__[0] + "\\gen_py")
  	finally:
  		if key is not None:
--- 57,83 ----
  		found = 0
  		global __gen_path__
! 		if key is not None:
! 			try:
  				__gen_path__ = win32api.RegQueryValue(key, "GenPath")
  				found = 1
! 			except win32api.error:
! 				pass
  		if not found:
! 			# no key.
! 			# We used to use a directory under win32com - but this sucks.
! 			# If that directory exists, we still use it, but now we prefer
! 			# a version specific directory under the user temp directory.
! 			if os.path.isdir(win32api.GetFullPathName( __path__[0] + "\\gen_py")):
! 				__gen_path__ = win32api.GetFullPathName( __path__[0] + "\\gen_py")
! 			else:
! 				__gen_path__ = os.path.join(
! 									win32api.GetTempPath(), "gen_py",
! 									"%d.%d" % (sys.version_info[0], sys.version_info[1]))
! 		# Create a "win32com.gen_py", but with a custom __path__
! 		import new
! 		global gen_py # Exists in the win32com namespace.
! 		gen_py = new.module("win32com.gen_py")
! 		gen_py.__path__ = [ __gen_path__ ]
! 		sys.modules[gen_py.__name__]=gen_py
  	finally:
  		if key is not None:
***************
*** 97,99 ****
  
  # get rid of these for module users
! del sys, win32api, pythoncom
--- 104,106 ----
  
  # get rid of these for module users
! del os, sys, win32api, pythoncom

[pywin32-checkins] pywin32/win32/src PyWinTypes.h,1.15,1.16

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28592

Modified Files:
	PyWinTypes.h 
Log Message:
Explicit them implicit release would deadlock (and killed win32gui in some
cases)


Index: PyWinTypes.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyWinTypes.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PyWinTypes.h	19 Apr 2003 15:54:36 -0000	1.15
--- PyWinTypes.h	1 Sep 2003 08:13:12 -0000	1.16
***************
*** 524,527 ****
--- 524,528 ----
  	CEnterLeavePython() {
  		acquire();
+ 		released = FALSE;
  	}
  	void acquire(void) {
***************
*** 532,539 ****
  	}
  	void release(void) {
! 		PyGILState_Release(state);
  	}
  private:
  	PyGILState_STATE state;
  };
  #endif // PYWIN_USE_GILSTATE
--- 533,544 ----
  	}
  	void release(void) {
! 		if (!released) {
! 			PyGILState_Release(state);
! 			released = TRUE;
! 		}
  	}
  private:
  	PyGILState_STATE state;
+ 	BOOL released;
  };
  #endif // PYWIN_USE_GILSTATE

[pywin32-checkins] pywin32/win32/src win32file.i,1.31,1.32

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28343/src

Modified Files:
	win32file.i 
Log Message:
Fix WaitCommEvent docs.


Index: win32file.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32file.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** win32file.i	10 Mar 2003 01:05:38 -0000	1.31
--- win32file.i	1 Sep 2003 08:11:08 -0000	1.32
***************
*** 2287,2290 ****
--- 2287,2291 ----
  
  %{
+ // @pyswig |WaitCommEvent|Waits for an event to occur for a specified communications device. The set of events that are monitored by this function is contained in the event mask associated with the device handle.
  static PyObject *MyWaitCommEvent(PyObject *self, PyObject *args)
  {
***************
*** 2318,2321 ****
--- 2319,2326 ----
  		return PyWin_SetAPIError("WaitCommError", rc);
  	return Py_BuildValue("ll", rc, *pmask);
+ 	// @rdesc The result is a tuple of (rc, mask_val), where rc is zero for success, or
+ 	// the result of calling GetLastError() otherwise.  The mask_val is the new mask value
+ 	// once the function has returned, but if an Overlapped object is passed, this value
+ 	// will generally be meaningless.  See the comments for more details.
  	// @comm If an overlapped structure is passed, then the <om PyOVERLAPPED.dword> 
  	// address is passed to the Win32 API as the mask.  This means that once the

[pywin32-checkins] pywin32/win32/Lib win32pdhutil.py,1.5,1.6

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv28108

Modified Files:
	win32pdhutil.py 
Log Message:
Handle translating counter names to/from native language and English.


Index: win32pdhutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhutil.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32pdhutil.py	9 May 2002 05:56:32 -0000	1.5
--- win32pdhutil.py	1 Sep 2003 08:09:50 -0000	1.6
***************
*** 23,26 ****
--- 23,44 ----
  error = win32pdh.error
  
+ # Handle some localization issues.
+ # see http://support.microsoft.com/default.aspx?scid=http://support.microsoft.com:80/support/kb/articles/Q287/1/59.asp&NoWebContent=1
+ # Build a map of english_counter_name: counter_id
+ counter_english_map = {}
+ 
+ def find_pdh_counter_localized_name(english_name, machine_name = None):
+ 	if not counter_english_map:
+ 		import win32api, win32con
+ 		counter_reg_value = win32api.RegQueryValueEx(win32con.HKEY_PERFORMANCE_DATA, "Counter 009")
+ 		counter_list = counter_reg_value[0]
+ 		for i in range(0, len(counter_list) - 1, 2):
+ 			try:
+ 				counter_id = int(counter_list[i])
+ 			except ValueError:
+ 				continue
+ 			counter_english_map[counter_list[i+1].lower()] = counter_id
+ 	return win32pdh.LookupPerfNameByIndex(machine_name, counter_english_map[english_name.lower()])
+ 
  def GetPerformanceAttributes(object, counter, instance = None, inum=-1, format = win32pdh.PDH_FMT_LONG, machine=None):
  	path = win32pdh.MakeCounterPath( (machine,object,instance, None, inum,counter) )
***************
*** 37,41 ****
  		win32pdh.CloseQuery(hq)
  
! def FindPerformanceAttributesByName(instanceName, object = "Process", counter = "ID Process", format = win32pdh.PDH_FMT_LONG, machine = None, bRefresh=0):
  	"""Find peformance attributes by (case insensitive) instance name.
  	
--- 55,59 ----
  		win32pdh.CloseQuery(hq)
  
! def FindPerformanceAttributesByName(instanceName, object = None, counter = None, format = win32pdh.PDH_FMT_LONG, machine = None, bRefresh=0):
  	"""Find peformance attributes by (case insensitive) instance name.
  	
***************
*** 43,47 ****
  	Most useful for returning a tuple of PIDs given a process name.
  	"""
! 
  	if bRefresh: # PDH docs say this is how you do a refresh.
  		win32pdh.EnumObjects(None, machine, 0, 1)
--- 61,66 ----
  	Most useful for returning a tuple of PIDs given a process name.
  	"""
! 	if object is None: object = find_pdh_counter_localized_name("Process", machine)
! 	if counter is None: counter = find_pdh_counter_localized_name("ID Process", machine)
  	if bRefresh: # PDH docs say this is how you do a refresh.
  		win32pdh.EnumObjects(None, machine, 0, 1)
***************
*** 106,121 ****
  
  def browse( callback = BrowseCallBackDemo, title="Python Browser", level=win32pdh.PERF_DETAIL_WIZARD):
- 	win32pdh.BrowseCounters(None,0, callback, level, title)
- 
- def test():
  	print "Virtual Bytes = ", FindPerformanceAttributesByName("python", counter="Virtual Bytes")	 
  	print "Available Bytes = ", GetPerformanceAttributes("Memory", "Available Bytes")
! 	print win32pdh.EnumObjectItems(None,None,"Memory", -1)
! 	
! 	
! 	
  if __name__=='__main__':
  	ShowAllProcesses()
- #	test()
  	print "Browsing for counters..."
  	browse()
--- 125,133 ----
  
  def browse( callback = BrowseCallBackDemo, title="Python Browser", level=win32pdh.PERF_DETAIL_WIZARD):
  	print "Virtual Bytes = ", FindPerformanceAttributesByName("python", counter="Virtual Bytes")	 
  	print "Available Bytes = ", GetPerformanceAttributes("Memory", "Available Bytes")
! 
  if __name__=='__main__':
  	ShowAllProcesses()
  	print "Browsing for counters..."
  	browse()

[pywin32-checkins] pywin32/win32/src win32pdhmodule.cpp,1.8,1.9

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28016

Modified Files:
	win32pdhmodule.cpp 
Log Message:
Add LookupPerfIndexByName and LookupPerfNameByIndex


Index: win32pdhmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32pdhmodule.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** win32pdhmodule.cpp	10 Mar 2003 01:15:22 -0000	1.8
--- win32pdhmodule.cpp	1 Sep 2003 08:09:00 -0000	1.9
***************
*** 141,144 ****
--- 141,157 ----
  );
  
+ typedef PDH_STATUS (WINAPI *FuncPdhLookupPerfIndexByName) (
+   LPCTSTR szMachineName,
+   LPCTSTR szCounterName,
+   LPDWORD pdwIndex
+ );
+ 
+ typedef PDH_STATUS (WINAPI *FuncPdhLookupPerfNameByIndex) (
+   LPCTSTR szMachineName,
+   DWORD index,
+   LPCTSTR szCounterName,
+   LPDWORD pcchBuffer
+ );
+ 
  #define CHECK_PDH_PTR(ptr) if((ptr)==NULL) { PyErr_SetString(PyExc_RuntimeError, "The pdh.dll entry point functions could not be loaded."); return NULL;}
  
***************
*** 162,165 ****
--- 175,180 ----
  
  FuncPdhConnectMachine pPdhConnectMachine = NULL;
+ FuncPdhLookupPerfIndexByName pPdhLookupPerfIndexByName = NULL;
+ FuncPdhLookupPerfNameByIndex pPdhLookupPerfNameByIndex = NULL;
  
  #include "Python.h"
***************
*** 192,196 ****
  	pPdhParseInstanceName = (FuncPdhParseInstanceName)GetProcAddress(handle, "PdhParseInstanceNameA");
  	pPdhBrowseCounters = (FuncPdhBrowseCounters)GetProcAddress(handle, "PdhBrowseCountersA");
!         pPdhConnectMachine = (FuncPdhConnectMachine)GetProcAddress(handle, "PdhConnectMachineA");
  	return TRUE;
  }
--- 207,213 ----
  	pPdhParseInstanceName = (FuncPdhParseInstanceName)GetProcAddress(handle, "PdhParseInstanceNameA");
  	pPdhBrowseCounters = (FuncPdhBrowseCounters)GetProcAddress(handle, "PdhBrowseCountersA");
! 	pPdhConnectMachine = (FuncPdhConnectMachine)GetProcAddress(handle, "PdhConnectMachineA");
! 	pPdhLookupPerfNameByIndex = (FuncPdhLookupPerfNameByIndex)GetProcAddress(handle, "PdhLookupPerfNameByIndexA");
! 	pPdhLookupPerfIndexByName = (FuncPdhLookupPerfIndexByName)GetProcAddress(handle, "PdhLookupPerfIndexByName");
  	return TRUE;
  }
***************
*** 990,993 ****
--- 1007,1064 ----
  }
  
+ // @pymethod int|win32pdh|LookupPerfIndexByName|Returns the counter index corresponding to the specified counter name.
+ static PyObject *PyLookupPerfIndexByName(PyObject *self, PyObject *args)
+ {
+ 	PyObject *obiname, *obmname;
+ 	if (!PyArg_ParseTuple(args, "OO:LookupPerfIndexByName", 
+ 	          &obmname,// @pyparm string|machineName||The name of the machine where the specified counter is located. The machine name can be specified by the DNS name or the IP address. 
+ 	          &obiname))// @pyparm string|instanceName||The full name of the counter.
+ 		return NULL;
+ 	TCHAR *mname;
+ 	if (!PyWinObject_AsTCHAR(obmname, &mname, TRUE))
+ 		return NULL;
+ 	TCHAR *iname;
+ 	if (!PyWinObject_AsTCHAR(obiname, &iname, FALSE)) {
+ 		PyWinObject_FreeTCHAR(mname);
+ 		return NULL;
+ 	}
+ 
+ 	CHECK_PDH_PTR(pPdhLookupPerfIndexByName);
+ 	DWORD dwIndex;
+ 	PyW32_BEGIN_ALLOW_THREADS
+ 	PDH_STATUS pdhStatus = (*pPdhLookupPerfIndexByName) (mname, iname, &dwIndex);
+ 	PyW32_END_ALLOW_THREADS
+ 	PyWinObject_FreeTCHAR(mname);
+ 	PyWinObject_FreeTCHAR(iname);
+ 	if (pdhStatus != 0)
+ 		return PyWin_SetAPIError("LookupPerfIndexByName", pdhStatus);
+ 	return PyInt_FromLong(dwIndex);
+ }
+ 
+ // @pymethod string|win32pdh|LookupPerfNameByIndex|Returns the performance object name corresponding to the specified index.
+ static PyObject *PyLookupPerfNameByIndex(PyObject *self, PyObject *args)
+ {
+ 	PyObject *obmname;
+ 	int index;
+ 	if (!PyArg_ParseTuple(args, "Oi:LookupPerfIndexByName", 
+ 	          &obmname,// @pyparm string|machineName||The name of the machine where the specified counter is located. The machine name can be specified by the DNS name or the IP address. 
+ 	          &index))// @pyparm int|index||The index of the performance object.
+ 		return NULL;
+ 	TCHAR *mname;
+ 	if (!PyWinObject_AsTCHAR(obmname, &mname, TRUE))
+ 		return NULL;
+ 
+ 	TCHAR buffer[512];
+ 	DWORD buf_size = sizeof(buffer)/sizeof(buffer[0]);
+ 	CHECK_PDH_PTR(pPdhLookupPerfNameByIndex);
+ 	PyW32_BEGIN_ALLOW_THREADS
+ 	PDH_STATUS pdhStatus = (*pPdhLookupPerfNameByIndex) (mname, index, buffer, &buf_size);
+ 	PyW32_END_ALLOW_THREADS
+ 	PyWinObject_FreeTCHAR(mname);
+ 	if (pdhStatus != 0)
+ 		return PyWin_SetAPIError("LookupPerfNameByIndex", pdhStatus);
+ 	return PyWinObject_FromTCHAR(buffer);
+ }
+ 
  /* List of functions exported by this module */
  // @module win32pdh|A module, encapsulating the Windows Performance Data Helpers API
***************
*** 1010,1013 ****
--- 1081,1086 ----
  	{"BrowseCounters",           PyBrowseCounters,        1}, // @pymeth BrowseCounters|Displays the counter browsing dialog box so that the user can select the counters to be returned to the caller. 
  	{"ConnectMachine",           PyConnectMachine,        1}, // @pymeth ConnectMachine|connects to the specified machine, and creates and initializes a machine entry in the PDH DLL.
+ 	{"LookupPerfIndexByName",    PyLookupPerfIndexByName, 1}, // @pymeth LookupPerfIndexByName|Returns the counter index corresponding to the specified counter name.
+ 	{"LookupPerfNameByIndex",    PyLookupPerfNameByIndex, 1}, // @pymeth LookupPerfNameByIndex|Returns the performance object name corresponding to the specified index.
  	{NULL}
  };

[pywin32-checkins] pywin32/com/win32com/src PyFactory.cpp,1.4,1.5

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27904

Modified Files:
	PyFactory.cpp 
Log Message:
Policy failure calls PyCom_LogError(), which reports a traceback.


Index: PyFactory.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/PyFactory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyFactory.cpp	27 Sep 2002 04:58:34 -0000	1.4
--- PyFactory.cpp	1 Sep 2003 08:08:09 -0000	1.5
***************
*** 14,20 ****
  static LONG factoryRefCount = 0;
  
- extern void PyCom_LogF(const TCHAR *fmt, ...);
- #define LogF PyCom_LogF
- 
  CPyFactory::CPyFactory(REFCLSID guidClassID) :
  	m_guidClassID(guidClassID),
--- 14,17 ----
***************
*** 165,169 ****
   	if ( !pPyModule )
  	{
! 		LogF(_T("PythonCOM Server - The policy module could not be loaded."));
  		/* ### propagate the exception? */
  		PyErr_Clear();
--- 162,166 ----
   	if ( !pPyModule )
  	{
! 		PyCom_LogError("PythonCOM Server - The 'win32com.server.policy' module could not be loaded.");
  		/* ### propagate the exception? */
  		PyErr_Clear();

[pywin32-checkins] pywin32/com/win32comext/mapi/src mapi.i,1.2,1.3 mapilib.i,1.1,1.2

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/mapi/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27409

Modified Files:
	mapi.i mapilib.i 
Log Message:
Add WrapCompressedRTFStream, and a little utility for converting
RTF -> HTML (but only when the source of the RTF was originally HTML - 
which begs the question why MS didn't give access to the HTML!)


Index: mapi.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/mapi.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mapi.i	25 Jan 2000 09:59:57 -0000	1.2
--- mapi.i	1 Sep 2003 08:05:36 -0000	1.3
***************
*** 482,485 ****
--- 482,492 ----
  );
  
+ // @pyswig <PyIStream>|WrapCompressedRTFStream|
+ HRESULT WrapCompressedRTFStream(
+   IStream *INPUT, // @pyparm <o PyIStream>|stream||Message stream
+   unsigned long ulflags, // @pyparm int|flags||
+   IStream **OUTPUT
+ );
+ 
  %native(MAPIUIDFromBinary) MAPIUIDFromBinary;
  %{
***************
*** 596,597 ****
--- 603,758 ----
  }
  %}
+ 
+ %{
+ // Code for converting RTF to HTML.
+ // Found at http://www.wischik.com/lu/programmer/mapi_utils.html
+ // MarkH converted it to Python, but was too slow.  Moving to a regex 
+ // based parser was too much work.
+ 
+ // DECODERTFHTML -- Given an uncompressed RTF body of the message,
+ // and assuming that it contains encoded-html, this function
+ // turns it onto regular html.
+ // [in] (buf,*len) indicate the start and length of the uncompressed RTF body.
+ // [out] the buffer is overwritten with the HTML version, null-terminated,
+ // and *len indicates the length of this HTML.
+ //
+ // Notes: (1) because of how the encoding works, the HTML version is necessarily
+ // shorter than the encoded version. That's why it's safe for the function to
+ // place the decoded html in the same buffer that formerly held the encoded stuff.
+ // (2) Some messages include characters \'XX, where XX is a hexedecimal number.
+ // This function simply converts this into ASCII. The conversion will only make
+ // sense if the right code-page is being used. I don't know how rtf specifies which
+ // code page it wants.
+ // (3) By experiment, I discovered that \pntext{..} and \liN and \fi-N are RTF
+ // markup that should be removed. There might be other RTF markup that should
+ // also be removed. But I don't know what else.
+ //
+ void decodertfhtml(char *buf,unsigned int *len)
+ { // c -- pointer to where we're reading from
+   // d -- pointer to where we're writing to. Invariant: d<c
+   // max -- how far we can read from (i.e. to the end of the original rtf)
+   // ignore_tag -- stores 'N': after \mhtmlN, we will ignore the subsequent \htmlN.
+   char *c=buf, *max=buf+*len, *d=buf; int ignore_tag=-1;
+   // First, we skip forwards to the first \htmltag.
+   while (c<max && strncmp(c,"{\\*\\htmltag",11)!=0) c++;
+   //
+   // Now work through the document. Our plan is as follows:
+   // * Ignore { and }. These are part of RTF markup.
+   // * Ignore \htmlrtf...\htmlrtf0. This is how RTF keeps its equivalent markup separate from the html.
+   // * Ignore \r and \n. The real carriage returns are stored in \par tags.
+   // * Ignore \pntext{..} and \liN and \fi-N. These are RTF junk.
+   // * Convert \par and \tab into \r\n and \t
+   // * Convert \'XX into the ascii character indicated by the hex number XX
+   // * Convert \{ and \} into { and }. This is how RTF escapes its curly braces.
+   // * When we get \*\mhtmltagN, keep the tag, but ignore the subsequent \*\htmltagN
+   // * When we get \*\htmltagN, keep the tag as long as it isn't subsequent to a \*\mhtmltagN
+   // * All other text should be kept as it is.
+   while (c<max)
+   { if (*c=='{') c++;
+     else if (*c=='}') c++;
+     else if (strncmp(c,"\\*\\htmltag",10)==0)
+     { c+=10; int tag=0; while (*c>='0' && *c<='9') {tag=tag*10+*c-'0'; c++;}
+       if (*c==' ') c++;
+       if (tag==ignore_tag) {while (c<max && *c!='}') c++; if (*c=='}') c++;}
+       ignore_tag=-1;
+     }
+     else if (strncmp(c,"\\*\\mhtmltag",11)==0)
+     { c+=11; int tag=0; while (*c>='0' && *c<='9') {tag=tag*10+*c-'0'; c++;}
+       if (*c==' ') c++;
+       ignore_tag=tag;
+     }
+     else if (strncmp(c,"\\par",4)==0) {strcpy(d,"\r\n"); d+=2; c+=4; if (*c==' ') c++;}
+     else if (strncmp(c,"\\tab",4)==0) {strcpy(d,"   "); d+=3; c+=4; if (*c==' ') c++;}
+     else if (strncmp(c,"\\li",3)==0)
+     { c+=3; while (*c>='0' && *c<='9') c++; if (*c==' ') c++;
+     }
+     else if (strncmp(c,"\\fi-",4)==0)
+     { c+=4; while (*c>='0' && *c<='9') c++; if (*c==' ') c++;
+     }
+     else if (strncmp(c,"\\'",2)==0)
+     { unsigned int hi=c[2], lo=c[3];
+       if (hi>='0' && hi<='9') hi-='0'; else if (hi>='A' && hi<='Z') hi=hi-'A'+10; else if (hi>='a' && hi<='z') hi=hi-'a'+10;
+       if (lo>='0' && lo<='9') lo-='0'; else if (lo>='A' && lo<='Z') lo=lo-'A'+10; else if (lo>='a' && lo<='z') lo=lo-'a'+10;
+       *((unsigned char*)d) = (unsigned char)(hi*16+lo);
+       c+=4; d++;
+     }
+     else if (strncmp(c,"\\pntext",7)==0) {c+=7; while (c<max && *c!='}') c++;}
+     else if (strncmp(c,"\\htmlrtf",8)==0)
+     { c++; while (c<max && strncmp(c,"\\htmlrtf0",9)!=0) c++;
+       if (c<max) c+=9; if (*c==' ') c++;
+     }
+     else if (*c=='\r' || *c=='\n') c++;
+     else if (strncmp(c,"\\{",2)==0) {*d='{'; d++; c+=2;}
+     else if (strncmp(c,"\\}",2)==0) {*d='}'; d++; c+=2;}
+     else {*d=*c; c++; d++;}
+   }
+   *d=0; d++;
+   *len = (unsigned int)(d-buf);
+ }
+ 
+ 
+ bool isrtfhtml(const char *buf,unsigned int len)
+ { // We look for the words "\fromhtml" somewhere in the file.
+   // If the rtf encodes text rather than html, then instead
+   // it will only find "\fromtext".
+   for (const char *c=buf; c<buf+len; c++)
+   { if (strncmp(c,"\\from",5)==0) return strncmp(c,"\\fromhtml",9)==0;
+   } return false;
+ }
+ 
+ // @pyswig |RTFStreamToHTML|
+ static PyObject *MyRTFStreamToHTML(PyObject *self, PyObject *args)
+ {
+   PyObject *obStream;
+   HRESULT hr;
+   // @pyparm <o PyIStream>|The stream to read the uncompressed RTF from||
+   if  (!PyArg_ParseTuple(args, "O:RTFStreamToHTML", &obStream))
+     return NULL;
+   IStream *pStream = NULL;
+ 
+   if (!PyCom_InterfaceFromPyObject(obStream, IID_IStream, (void **)&pStream, FALSE))
+     return NULL;
+ 
+   // all exit from here via 'exit', and no Python until POSTCALL
+   PY_INTERFACE_PRECALL;
+   PyObject *ret = NULL;
+   unsigned int bufsize=10240; 
+   char *htmlbuf = (char *)malloc(bufsize);
+   unsigned int htmlsize=0; bool done=(htmlbuf==NULL);
+   while (!done)
+   { ULONG red; hr = pStream->Read(htmlbuf+htmlsize, bufsize-htmlsize, &red);
+     if (hr!=S_OK) {htmlbuf[htmlsize]=0; done=true;}
+     else
+     { htmlsize+=red; done = (red < bufsize-htmlsize);
+       if (!done)
+       { unsigned int newsize=2*htmlsize;
+         htmlbuf = (char *)realloc(htmlbuf, newsize);
+         bufsize=newsize;
+       }
+     }
+   }
+   bool ok;
+   if (htmlbuf) {
+     ok = isrtfhtml(htmlbuf,htmlsize);
+     if (ok)
+       decodertfhtml(htmlbuf,&htmlsize);
+   }
+   PY_INTERFACE_POSTCALL;
+   if (htmlbuf==0) {
+     PyErr_NoMemory();
+     goto exit;
+   }
+   if (!ok) {
+     Py_INCREF(Py_None);
+     ret = Py_None;
+     goto exit;
+   }
+   ret = PyString_FromStringAndSize(htmlbuf, htmlsize-1);
+ exit:
+   if (pStream) pStream->Release();
+   if (htmlbuf)
+     free(htmlbuf);
+   return ret;
+ }
+ %}
+ %native(RTFStreamToHTML) MyRTFStreamToHTML;

Index: mapilib.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/mapilib.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mapilib.i	1 Sep 1999 23:17:16 -0000	1.1
--- mapilib.i	1 Sep 2003 08:05:36 -0000	1.2
***************
*** 79,82 ****
--- 79,86 ----
    $target = &temp;
  }
+ %typemap(python,ignore) IStream **OUTPUT(IStream *temp)
+ {
+   $target = &temp;
+ }
  
  
***************
*** 120,123 ****
--- 124,130 ----
  	MAKE_OUTPUT_INTERFACE($source, $target, IID_IMsgServiceAdmin)
  }
+ %typemap(python,argout) IStream **OUTPUT {
+ 	MAKE_OUTPUT_INTERFACE($source, $target, IID_IStream)
+ }
  
  
***************
*** 147,151 ****
  						 IAddrBook *INPUT_NULLOK,
  						 IMsgServiceAdmin *INPUT,
! 						 IMsgServiceAdmin *INPUT_NULLOK
  {
  	if ($source) $source->Release();
--- 154,160 ----
  						 IAddrBook *INPUT_NULLOK,
  						 IMsgServiceAdmin *INPUT,
! 						 IMsgServiceAdmin *INPUT_NULLOK,
! 						 IStream *INPUT,
! 						 IStream *INPUT_NULLOK
  {
  	if ($source) $source->Release();
***************
*** 267,270 ****
--- 276,288 ----
  		return NULL;
  }
+ %typemap(python,in) IStream *INPUT {
+ 	if (!PyCom_InterfaceFromPyInstanceOrObject($source, IID_IStream, (void **)&$target, 0))
+ 		return NULL;
+ }
+ %typemap(python,in) IStream *INPUT_NULLOK {
+ 	if (!PyCom_InterfaceFromPyInstanceOrObject($source, IID_IStream, (void **)&$target, 1))
+ 		return NULL;
+ }
+ 
  // Some ** special cases.
  %typemap(python,freearg) IMsgStore **INPUT

[pywin32-checkins] pywin32/win32/src win32trace.cpp,1.9,1.10

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16761

Modified Files:
	win32trace.cpp 
Log Message:
Don't fail when an empty string is printed.


Index: win32trace.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32trace.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32trace.cpp	31 Aug 2003 04:47:56 -0000	1.9
--- win32trace.cpp	31 Aug 2003 23:05:53 -0000	1.10
***************
*** 296,300 ****
          return FALSE;
      }
!     BOOL rc = FALSE;
      Py_BEGIN_ALLOW_THREADS
      const char *data_this = data;
--- 296,300 ----
          return FALSE;
      }
!     BOOL rc = TRUE;
      Py_BEGIN_ALLOW_THREADS
      const char *data_this = data;

[pywin32-checkins] pywin32/win32/src win32trace.cpp,1.8,1.9

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7459/src

Modified Files:
	win32trace.cpp 
Log Message:
Don't just die when we try and write >64k of data (now we only write a max
of 32k at a time, and sleep either 10ms or until a reader empties the 
buffer, then write the next chunk.)

Add tests for the above.


Index: win32trace.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32trace.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** win32trace.cpp	15 May 2003 22:41:38 -0000	1.8
--- win32trace.cpp	31 Aug 2003 04:47:56 -0000	1.9
***************
*** 24,27 ****
--- 24,30 ----
  output is discarded, and the text written to the new, empty buffer.
  
+ However, the most we will write at a time is "buffer_size/2" bytes, then we
+ will have a short, optimized sleep between chunks.
+ 
  See - I told you the implementation was simple :-)
  
***************
*** 41,44 ****
--- 44,48 ----
  const char *MUTEX_OBJECT_NAME = "PythonTraceOutputMutex";
  const char *EVENT_OBJECT_NAME = "PythonTraceOutputEvent";
+ const char *EVENT_EMPTY_OBJECT_NAME = "PythonTraceOutputEmptyEvent";
  
  // no const because of python api, this is the name of the entry
***************
*** 49,52 ****
--- 53,59 ----
  // An auto-reset event so a reader knows when data is avail without polling.
  HANDLE hEvent = NULL;
+ // An auto-reset event so writing large data can know when the buffer has
+ // been read.
+ HANDLE hEventEmpty = NULL;
  
  SECURITY_ATTRIBUTES  sa;       // Security attributes.
***************
*** 289,311 ****
          return FALSE;
      }
-     if (len>BUFFER_SIZE-sizeof(size_t)-1) {
-         ReturnError("The data is too large.");
-         return FALSE;
-     }
      BOOL rc = FALSE;
      Py_BEGIN_ALLOW_THREADS
!     if (GetMyMutex()) {
! 
! 	size_t *pLen = (size_t *)pMapBaseWrite;
! 	char *buffer = (char *)(((size_t *)pMapBaseWrite)+1);
  
! 	size_t sizeLeft = (BUFFER_SIZE-sizeof(size_t)) - *pLen;
! 	if (sizeLeft<len)
! 	    *pLen = 0;
! 		
! 	memcpy(buffer+(*pLen), data, len);
! 	*pLen += len;
! 	rc = ReleaseMyMutex();
! 	SetEvent(hEvent);
      }
      Py_END_ALLOW_THREADS
--- 296,324 ----
          return FALSE;
      }
      BOOL rc = FALSE;
      Py_BEGIN_ALLOW_THREADS
!     const char *data_this = data;
!     while (len) {
!         unsigned len_this = min(len, BUFFER_SIZE/2);
!         if (GetMyMutex()) {
!             size_t *pLen = (size_t *)pMapBaseWrite;
!             char *buffer = (char *)(((size_t *)pMapBaseWrite)+1);
  
!             size_t sizeLeft = (BUFFER_SIZE-sizeof(size_t)) - *pLen;
!             if (sizeLeft<len_this)
!                 *pLen = 0;
!             memcpy(buffer+(*pLen), data_this, len_this);
!             *pLen += len_this;
!             rc = ReleaseMyMutex();
!             SetEvent(hEvent);
!             data_this += len_this;
!             len -= len_this;
!             if (len) {
!                 // If we had to split up the data, we can have little sleep
!                 // to let a reader grab the data (but if a reader empties us
!                 // before the timeout, then we wake up)
!                 WaitForSingleObject(hEventEmpty, 10);
!             }
!         }
      }
      Py_END_ALLOW_THREADS
***************
*** 345,348 ****
--- 358,362 ----
  	}
  	rc = ReleaseMyMutex();
+ 	SetEvent(hEventEmpty); // in case anyone wants to optimize waiting.
      }
      Py_END_ALLOW_THREADS
***************
*** 582,587 ****
      sa.bInheritHandle = TRUE;
  
- 
- 
      assert(hMutex == NULL);
      hMutex = CreateMutex(&sa, FALSE, MUTEX_OBJECT_NAME);
--- 596,599 ----
***************
*** 595,598 ****
          PyWin_SetAPIError("CreateEvent");
          return ;
!     }  
  }
--- 607,616 ----
          PyWin_SetAPIError("CreateEvent");
          return ;
!     }
!     assert (hEventEmpty==NULL);
!     hEventEmpty = CreateEvent(&sa, FALSE, FALSE, EVENT_EMPTY_OBJECT_NAME);
!     if (hEventEmpty==NULL) {
!         PyWin_SetAPIError("CreateEvent");
!         return ;
!     }
  }

[pywin32-checkins] pywin32/win32/test test_win32trace.py,1.1,1.2

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

Update of /cvsroot/pywin32/pywin32/win32/test
In directory sc8-pr-cvs1:/tmp/cvs-serv7459/test

Modified Files:
	test_win32trace.py 
Log Message:
Don't just die when we try and write >64k of data (now we only write a max
of 32k at a time, and sleep either 10ms or until a reader empties the 
buffer, then write the next chunk.)

Add tests for the above.


Index: test_win32trace.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32trace.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_win32trace.py	2 May 2003 00:04:45 -0000	1.1
--- test_win32trace.py	31 Aug 2003 04:47:57 -0000	1.2
***************
*** 168,171 ****
--- 168,187 ----
          assert self.areBucketsFull()
  
+ class TestHugeChunks(unittest.TestCase):
+     # BiggestChunk is the size where we stop stressing the writer
+     BiggestChunk = 2**16 # 256k should do it.
+     def setUp(self):
+         win32trace.InitRead()
+         win32trace.InitWrite()
+     def testHugeChunks(self):
+         data = "*" * 1023 + "\n"
+         while len(data) <= self.BiggestChunk:
+             win32trace.write(data)
+             data = data + data
+         # If we made it here, we passed.
+ 
+     def tearDown(self):
+         win32trace.TermRead()
+         win32trace.TermWrite()
  
  import win32event

[pywin32-checkins] pywin32/win32/src win32gui.i,1.27,1.28

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29076

Modified Files:
	win32gui.i 
Log Message:
Oops - IsIconic->IsChild.
Add DeleteObject.


Index: win32gui.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32gui.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** win32gui.i	27 Aug 2003 04:26:25 -0000	1.27
--- win32gui.i	27 Aug 2003 05:13:46 -0000	1.28
***************
*** 1456,1459 ****
--- 1456,1462 ----
  #define	LR_VGACOLOR	LR_VGACOLOR
  
+ // pyswig |DeleteObject||Deletes a logical pen, brush, font, bitmap, region, or palette, freeing all system resources associated with the object. After the object is deleted, the specified handle is no longer valid.
+ BOOLAPI DeleteObject(HANDLE h); // @pyparm int|handle||handle to the object to delete.
+ 
  // @pyswig int|ImageList_Add|Adds an image or images to an image list. 
  // @rdesc Returns the index of the first new image if successful, or -1 otherwise. 
***************
*** 2134,2138 ****
  
  // @pyswig |IsChild|Tests whether a window is a child window or descendant window of a specified parent window
! BOOL IsIconic(  
  	HWND hWndParent,   // @pyparm int|hWndParent||handle to parent window
  	HWND hWnd   // @pyparm int|hWnd||handle to window to test
--- 2137,2141 ----
  
  // @pyswig |IsChild|Tests whether a window is a child window or descendant window of a specified parent window
! BOOL IsChild(  
  	HWND hWndParent,   // @pyparm int|hWndParent||handle to parent window
  	HWND hWnd   // @pyparm int|hWnd||handle to window to test

[pywin32-checkins] pywin32/win32/src win32gui.i,1.26,1.27

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7890

Modified Files:
	win32gui.i 
Log Message:
Clear a couple of pending exceptions that would cause failure.  Add 
IsIconic, ImageList_LoadBitmap, and GetString() takes an optional
length param.


Index: win32gui.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32gui.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** win32gui.i	7 Apr 2003 13:01:46 -0000	1.26
--- win32gui.i	27 Aug 2003 04:26:25 -0000	1.27
***************
*** 233,236 ****
--- 233,237 ----
  	}
  	if (obFunc==NULL) {
+ 		PyErr_Clear();
  		return FALSE;
  	}
***************
*** 340,343 ****
--- 341,346 ----
  		obFunc = PyDict_GetItem(g_DLGMap, key);
  		Py_XDECREF(key);
+ 		if (!obFunc)
+ 			PyErr_Clear();
  	}
  	if (obFunc) {
***************
*** 781,789 ****
  {
  	TCHAR *addr = 0;
  	// @pyparm int|addr||Address of the memory to reference (must be null terminated)
! 	if (!PyArg_ParseTuple(args, "l:PyGetString",&addr))
  		return NULL;
  
! 	int len = _tcslen(addr);
  
      if (len == 0) return PyUnicodeObject_FromString("");
--- 784,794 ----
  {
  	TCHAR *addr = 0;
+ 	int len = -1;
  	// @pyparm int|addr||Address of the memory to reference (must be null terminated)
! 	if (!PyArg_ParseTuple(args, "l|i:PyGetString",&addr, &len))
  		return NULL;
  
! 	if (len==-1)
! 		len = _tcslen(addr);
  
      if (len == 0) return PyUnicodeObject_FromString("");
***************
*** 1359,1362 ****
--- 1364,1370 ----
  
  // @pyswig |EndDialog|Ends a dialog box.
+ // @pyparm int|hwnd||Handle to the window.
+ // @pyparm int|result||result
+ 
  BOOLAPI EndDialog( HWND hwnd, int result );
  
***************
*** 1448,1451 ****
--- 1456,1466 ----
  #define	LR_VGACOLOR	LR_VGACOLOR
  
+ // @pyswig int|ImageList_Add|Adds an image or images to an image list. 
+ // @rdesc Returns the index of the first new image if successful, or -1 otherwise. 
+ int ImageList_Add(HIMAGELIST himl, // @pyswig int|himl||Handle to the image list. 
+                   HBITMAP hbmImage, // @pyswig int|hbmImage||Handle to the bitmap that contains the image or images. The number of images is inferred from the width of the bitmap. 
+ 				  HBITMAP hbmMask); // @pyswig int|hbmMask||Handle to the bitmap that contains the mask. If no mask is used with the image list, this parameter is ignored
+ 
+ 
  // @pyswig HIMAGELIST|ImageList_Create|Create an image list
  HIMAGELIST ImageList_Create(int cx, int cy, UINT flags, int cInitial, int cGrow);
***************
*** 1486,1489 ****
--- 1501,1508 ----
  				 int cx, int cGrow, COLORREF crMask, UINT uType, UINT uFlags);
  
+ // @pyswig HANDLE|ImageList_LoadBitmap|Creates an image list from the specified bitmap resource.
+ HIMAGELIST ImageList_LoadBitmap(HINSTANCE hInst, TCHAR *name,
+ 				 int cx, int cGrow, COLORREF crMask);
+ 
  // @pyswig BOOL|ImageList_Remove|Remove an image from an imagelist
  BOOLAPI ImageList_Remove(HIMAGELIST himl, int i);
***************
*** 1890,1893 ****
--- 1909,1913 ----
  %native (Edit_GetLine) PyEdit_GetLine;
  
+ 
  #ifdef MS_WINCE
  %{
***************
*** 2105,2114 ****
  
  // @pyswig |IsIconic|determines whether the specified window is minimized (iconic).
! BOOLAPI IsIconic(  HWND hWnd   // @pyparm int|hWnd||handle to window
  ); 
  
  
  // @pyswig |IsWindow|determines whether the specified window handle identifies an existing window.
! BOOLAPI IsWindow(  HWND hWnd   // @pyparm int|hWnd||handle to window
  ); 
  
--- 2125,2140 ----
  
  // @pyswig |IsIconic|determines whether the specified window is minimized (iconic).
! BOOL IsIconic(  HWND hWnd   // @pyparm int|hWnd||handle to window
  ); 
  
  
  // @pyswig |IsWindow|determines whether the specified window handle identifies an existing window.
! BOOL IsWindow(  HWND hWnd   // @pyparm int|hWnd||handle to window
! ); 
! 
! // @pyswig |IsChild|Tests whether a window is a child window or descendant window of a specified parent window
! BOOL IsIconic(  
! 	HWND hWndParent,   // @pyparm int|hWndParent||handle to parent window
! 	HWND hWnd   // @pyparm int|hWnd||handle to window to test
  ); 
  

[pywin32-checkins] pywin32 setup_win32all_core.py,1.4,1.5

[<th...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1:/tmp/cvs-serv2340

Modified Files:
	setup_win32all_core.py 
Log Message:
Copying the .lib files for pywintypes and pythoncom did not work.
Hopefully it works with mingw32 any longer (but I have no time to check).


Index: setup_win32all_core.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all_core.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** setup_win32all_core.py	18 Jul 2003 08:36:13 -0000	1.4
--- setup_win32all_core.py	22 Aug 2003 19:58:27 -0000	1.5
***************
*** 141,145 ****
                  prefix = ''
                  extra = extra + '.lib'
!             src = os.path.join(self.build_temp, prefix + name + extra)
              dst = os.path.join(self.build_temp, "..", prefix + ext.name + extra)
              self.copy_file(src, dst)#, update=1)
--- 141,151 ----
                  prefix = ''
                  extra = extra + '.lib'
! 
!             # MSVCCompiler constructs the .lib file in the same directory
!             # as the first source file's object file:
!             #    os.path.dirname(objects[0])
!             src = os.path.join(self.build_temp,
!                                os.path.dirname(ext.sources[0]),
!                                prefix + name + extra)
              dst = os.path.join(self.build_temp, "..", prefix + ext.name + extra)
              self.copy_file(src, dst)#, update=1)

[pywin32-checkins] pywin32/com/win32com/demos excelAddin.py,NONE,1.1

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

Update of /cvsroot/pywin32/pywin32/com/win32com/demos
In directory sc8-pr-cvs1:/tmp/cvs-serv16729

Added Files:
	excelAddin.py 
Log Message:
An Excel addin demo from Eric Koome complements the Outlook one.


--- NEW FILE: excelAddin.py ---
# A demo plugin for Microsoft Excel
#
# This addin simply adds a new button to the main Excel toolbar,
# and displays a message box when clicked.  Thus, it demonstrates
# how to plug in to Excel itself, and hook Excel events.
#
#
# To register the addin, simply execute:
#   excelAddin.py
# This will install the COM server, and write the necessary
# AddIn key to Excel
#
# To unregister completely:
#   excelAddin.py --unregister
#
# To debug, execute:
#   excelAddin.py --debug
#
# Then open Pythonwin, and select "Tools->Trace Collector Debugging Tool"
# Restart excel, and you should see some output generated.
#
# NOTE: If the AddIn fails with an error, Excel will re-register
# the addin to not automatically load next time Excel starts.  To
# correct this, simply re-register the addin (see above)
#
# Author <ek...@ya...> Eric Koome
# Copyright (c) 2003 Wavecom Inc.  All rights reserved
#
# Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions
#are met:
#
#1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED.  IN NO EVENT SHALL ERIC KOOME OR
# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.

from win32com import universal
from win32com.server.exception import COMException
from win32com.client import gencache, DispatchWithEvents
import winerror
import pythoncom
from win32com.client import constants, Dispatch
import sys

# Support for COM objects we use.
gencache.EnsureModule('{00020813-0000-0000-C000-000000000046}', 0, 1, 3, bForDemand=True) # Excel 9
gencache.EnsureModule('{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}', 0, 2, 1, bForDemand=True) # Office 9

# The TLB defiining the interfaces we implement
universal.RegisterInterfaces('{AC0714F2-3D04-11D1-AE7D-00A0C90F26F4}', 0, 1, 0, ["_IDTExtensibility2"])
class ButtonEvent:
    def OnClick(self, button, cancel):
        import win32ui # Possible, but not necessary, to use a Pythonwin GUI
        import win32con
        win32ui.MessageBox("Hello from Python", "Python Test",win32con.MB_OKCANCEL)
        return cancel

class ExcelAddin:
    _com_interfaces_ = ['_IDTExtensibility2']
    _public_methods_ = []
    _reg_clsctx_ = pythoncom.CLSCTX_INPROC_SERVER
    _reg_clsid_ = "{C5482ECA-F559-45A0-B078-B2036E6F011A}"
    _reg_progid_ = "Python.Test.ExcelAddin"
    _reg_policy_spec_ = "win32com.server.policy.EventHandlerPolicy"

    def __init__(self):
        self.appHostApp = None    
    
    def OnConnection(self, application, connectMode, addin, custom):
        print "OnConnection", application, connectMode, addin, custom
        try:
            self.appHostApp = application
            cbcMyBar = self.appHostApp.CommandBars.Add(Name="PythonBar", Position=constants.msoBarTop, MenuBar=constants.msoBarTypeNormal, Temporary=True)
            btnMyButton = cbcMyBar.Controls.Add(Type=constants.msoControlButton, Parameter="Greetings")
            btnMyButton=self.toolbarButton = DispatchWithEvents(btnMyButton, ButtonEvent)
            btnMyButton.Style = constants.msoButtonCaption
            btnMyButton.BeginGroup = True
            btnMyButton.Caption = "&Python"
            btnMyButton.TooltipText = "Python rules the World"
            btnMyButton.Width = "34"
            cbcMyBar.Visible = True
        except pythoncom.com_error, (hr, msg, exc, arg):
            print "The Excel call failed with code %d: %s" % (hr, msg)
            if exc is None:
                print "There is no extended error information"
            else:
                wcode, source, text, helpFile, helpId, scode = exc
                print "The source of the error is", source
                print "The error message is", text
                print "More info can be found in %s (id=%d)" % (helpFile, helpId)

    def OnDisconnection(self, mode, custom):
        print "OnDisconnection"
        self.appHostApp.CommandBars("PythonBar").Delete
        self.appHostApp=None
        
    def OnAddInsUpdate(self, custom):
        print "OnAddInsUpdate", custom
    def OnStartupComplete(self, custom):
        print "OnStartupComplete", custom
    def OnBeginShutdown(self, custom):
        print "OnBeginShutdown", custom

def RegisterAddin(klass):
    import _winreg
    key = _winreg.CreateKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins")
    subkey = _winreg.CreateKey(key, klass._reg_progid_)
    _winreg.SetValueEx(subkey, "CommandLineSafe", 0, _winreg.REG_DWORD, 0)
    _winreg.SetValueEx(subkey, "LoadBehavior", 0, _winreg.REG_DWORD, 3)
    _winreg.SetValueEx(subkey, "Description", 0, _winreg.REG_SZ, "Excel Addin")
    _winreg.SetValueEx(subkey, "FriendlyName", 0, _winreg.REG_SZ, "A Simple Excel Addin")

def UnregisterAddin(klass):
    import _winreg
    try:
        _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Excel\\Addins\\" + klass._reg_progid_)
    except WindowsError:
        pass

if __name__ == '__main__':
    import win32com.server.register
    win32com.server.register.UseCommandLine(ExcelAddin)
    if "--unregister" in sys.argv:
        UnregisterAddin(ExcelAddin)
    else:
        RegisterAddin(ExcelAddin)

[pywin32-checkins] pywin32/win32/src win32security.i,1.9,1.10

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6696

Modified Files:
	win32security.i 
Log Message:
More from Roger, via [ 781823 ] SID/SecurityDescriptor string conversions


Index: win32security.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32security.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32security.i	2 May 2003 00:10:38 -0000	1.9
--- win32security.i	8 Aug 2003 04:02:48 -0000	1.10
***************
*** 19,22 ****
--- 19,24 ----
  #include "Ntsecapi.h"
  #include "subauth.h"
+ #include "lmshare.h"
+ #include "sddl.h"
  %}
  
***************
*** 50,61 ****
  // @comm This is a sequence (eg, list) of (id, attributes)
  %{
! PyObject *PyWinObject_FromTOKEN_PRIVILEGES(TOKEN_PRIVILEGES *pPriv)
  {
! 	PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented");
! 	return NULL;
  }
  
- 
- 
  PyObject *PyWinObject_FromTOKEN_GROUPS(TOKEN_GROUPS *tg)
  {
--- 52,71 ----
  // @comm This is a sequence (eg, list) of (id, attributes)
  %{
! PyObject *PyWinObject_FromTOKEN_PRIVILEGES(TOKEN_PRIVILEGES *tp)
  {
! 	unsigned int privInd;
! 	PyObject *priv = NULL, *obluid = NULL;
! 	PLUID pluid;
! 	PyObject *privs = PyTuple_New(tp->PrivilegeCount);
! 	for (privInd = 0; privInd < tp->PrivilegeCount; privInd++){
! 		pluid = &tp->Privileges[privInd].Luid;
! 		obluid = PyWinObject_FromLARGE_INTEGER(*((LARGE_INTEGER *) pluid));
! 		priv = Py_BuildValue("(Ol)",obluid,tp->Privileges[privInd].Attributes );
! 		PyTuple_SET_ITEM(privs, privInd, priv);
! 		Py_DECREF(obluid);
! 		}
! 	return privs;
  }
  
  PyObject *PyWinObject_FromTOKEN_GROUPS(TOKEN_GROUPS *tg)
  {
***************
*** 185,188 ****
--- 195,214 ----
  }
  
+ static BOOL (WINAPI *cstss)(PSID, WCHAR **) = NULL;
+ static BOOL (WINAPI *cssts)(LPCWSTR, PSID) = NULL;
+ static BOOL (WINAPI *csdtssd)(PSECURITY_DESCRIPTOR,DWORD,SECURITY_INFORMATION, LPTSTR*,PULONG) = NULL;
+ static BOOL (WINAPI *cssdtsd)(LPCTSTR,DWORD,PSECURITY_DESCRIPTOR*,PULONG) = NULL;
+ 
+ BOOL CheckIfSupported(char *funcname, WCHAR *dllname, FARPROC *fp)
+ {
+     *fp=NULL;
+     HMODULE hmodule = GetModuleHandle(dllname);
+     if (hmodule==NULL)
+         return false;
+     *fp = GetProcAddress(hmodule, funcname);
+     if (*fp==NULL)
+         return false;
+     return true;
+ }
  %}
  
***************
*** 229,234 ****
--- 255,300 ----
  	Py_INCREF(PyWinExc_ApiError);
  	PyDict_SetItemString(d, "error", PyWinExc_ApiError);
+ 
+ 	PyDict_SetItemString(d,"SE_CREATE_TOKEN_NAME",PyUnicode_FromWideChar(SE_CREATE_TOKEN_NAME,wcslen(SE_CREATE_TOKEN_NAME)));
+ 	PyDict_SetItemString(d,"SE_ASSIGNPRIMARYTOKEN_NAME",PyUnicode_FromWideChar(SE_ASSIGNPRIMARYTOKEN_NAME,wcslen(SE_ASSIGNPRIMARYTOKEN_NAME)));
+ 	PyDict_SetItemString(d,"SE_LOCK_MEMORY_NAME",PyUnicode_FromWideChar(SE_LOCK_MEMORY_NAME,wcslen(SE_LOCK_MEMORY_NAME)));
+ 	PyDict_SetItemString(d,"SE_INCREASE_QUOTA_NAME",PyUnicode_FromWideChar(SE_INCREASE_QUOTA_NAME,wcslen(SE_INCREASE_QUOTA_NAME)));
+ 	PyDict_SetItemString(d,"SE_UNSOLICITED_INPUT_NAME",PyUnicode_FromWideChar(SE_UNSOLICITED_INPUT_NAME,wcslen(SE_UNSOLICITED_INPUT_NAME)));
+ 	PyDict_SetItemString(d,"SE_MACHINE_ACCOUNT_NAME",PyUnicode_FromWideChar(SE_MACHINE_ACCOUNT_NAME,wcslen(SE_MACHINE_ACCOUNT_NAME)));
+ 	PyDict_SetItemString(d,"SE_TCB_NAME",PyUnicode_FromWideChar(SE_TCB_NAME,wcslen(SE_TCB_NAME)));
+ 	PyDict_SetItemString(d,"SE_SECURITY_NAME",PyUnicode_FromWideChar(SE_SECURITY_NAME,wcslen(SE_SECURITY_NAME)));
+ 	PyDict_SetItemString(d,"SE_TAKE_OWNERSHIP_NAME",PyUnicode_FromWideChar(SE_TAKE_OWNERSHIP_NAME,wcslen(SE_TAKE_OWNERSHIP_NAME)));
+ 	PyDict_SetItemString(d,"SE_LOAD_DRIVER_NAME",PyUnicode_FromWideChar(SE_LOAD_DRIVER_NAME,wcslen(SE_LOAD_DRIVER_NAME)));
+ 	PyDict_SetItemString(d,"SE_SYSTEM_PROFILE_NAME",PyUnicode_FromWideChar(SE_SYSTEM_PROFILE_NAME,wcslen(SE_SYSTEM_PROFILE_NAME)));
+ 	PyDict_SetItemString(d,"SE_SYSTEMTIME_NAME",PyUnicode_FromWideChar(SE_SYSTEMTIME_NAME,wcslen(SE_SYSTEMTIME_NAME)));
+ 	PyDict_SetItemString(d,"SE_PROF_SINGLE_PROCESS_NAME",PyUnicode_FromWideChar(SE_PROF_SINGLE_PROCESS_NAME,wcslen(SE_PROF_SINGLE_PROCESS_NAME)));
+ 	PyDict_SetItemString(d,"SE_INC_BASE_PRIORITY_NAME",PyUnicode_FromWideChar(SE_INC_BASE_PRIORITY_NAME,wcslen(SE_INC_BASE_PRIORITY_NAME)));
+ 	PyDict_SetItemString(d,"SE_CREATE_PAGEFILE_NAME",PyUnicode_FromWideChar(SE_CREATE_PAGEFILE_NAME,wcslen(SE_CREATE_PAGEFILE_NAME)));
+ 	PyDict_SetItemString(d,"SE_CREATE_PERMANENT_NAME",PyUnicode_FromWideChar(SE_CREATE_PERMANENT_NAME,wcslen(SE_CREATE_PERMANENT_NAME)));
+ 	PyDict_SetItemString(d,"SE_BACKUP_NAME",PyUnicode_FromWideChar(SE_BACKUP_NAME,wcslen(SE_BACKUP_NAME)));
+ 	PyDict_SetItemString(d,"SE_RESTORE_NAME",PyUnicode_FromWideChar(SE_RESTORE_NAME,wcslen(SE_RESTORE_NAME)));
+ 	PyDict_SetItemString(d,"SE_SHUTDOWN_NAME",PyUnicode_FromWideChar(SE_SHUTDOWN_NAME,wcslen(SE_SHUTDOWN_NAME)));
+ 	PyDict_SetItemString(d,"SE_DEBUG_NAME",PyUnicode_FromWideChar(SE_DEBUG_NAME,wcslen(SE_DEBUG_NAME)));
+ 	PyDict_SetItemString(d,"SE_AUDIT_NAME",PyUnicode_FromWideChar(SE_AUDIT_NAME,wcslen(SE_AUDIT_NAME)));
+ 	PyDict_SetItemString(d,"SE_SYSTEM_ENVIRONMENT_NAME",PyUnicode_FromWideChar(SE_SYSTEM_ENVIRONMENT_NAME,wcslen(SE_SYSTEM_ENVIRONMENT_NAME)));
+ 	PyDict_SetItemString(d,"SE_CHANGE_NOTIFY_NAME",PyUnicode_FromWideChar(SE_CHANGE_NOTIFY_NAME,wcslen(SE_CHANGE_NOTIFY_NAME)));
+ 	PyDict_SetItemString(d,"SE_REMOTE_SHUTDOWN_NAME",PyUnicode_FromWideChar(SE_REMOTE_SHUTDOWN_NAME,wcslen(SE_REMOTE_SHUTDOWN_NAME)));
+ 	PyDict_SetItemString(d,"SE_UNDOCK_NAME",PyUnicode_FromWideChar(SE_UNDOCK_NAME,wcslen(SE_UNDOCK_NAME)));
+ 	PyDict_SetItemString(d,"SE_SYNC_AGENT_NAME",PyUnicode_FromWideChar(SE_SYNC_AGENT_NAME,wcslen(SE_SYNC_AGENT_NAME)));
+ 	PyDict_SetItemString(d,"SE_ENABLE_DELEGATION_NAME",PyUnicode_FromWideChar(SE_ENABLE_DELEGATION_NAME,wcslen(SE_ENABLE_DELEGATION_NAME)));
+ 	PyDict_SetItemString(d,"SE_MANAGE_VOLUME_NAME",PyUnicode_FromWideChar(SE_MANAGE_VOLUME_NAME,wcslen(SE_MANAGE_VOLUME_NAME)));
+ 
+ 	FARPROC fp=NULL;
+ 	if (CheckIfSupported("ConvertSidToStringSidW",_T("Advapi32.dll"),&fp))
+ 		cstss=  (BOOL (WINAPI *)(PSID, WCHAR **))(fp);
+ 	if (CheckIfSupported("ConvertStringSidToSidW",_T("Advapi32.dll"),&fp))
+ 		cssts=  (BOOL (WINAPI *)(LPCWSTR, PSID))(fp);
+ 	if (CheckIfSupported("ConvertSecurityDescriptorToStringSecurityDescriptorW",_T("Advapi32.dll"),&fp))
+ 		csdtssd=(BOOL (WINAPI *)(PSECURITY_DESCRIPTOR,DWORD,SECURITY_INFORMATION, LPTSTR*,PULONG))(fp);
+ 	if (CheckIfSupported("ConvertStringSecurityDescriptorToSecurityDescriptorW",_T("Advapi32.dll"),&fp))
+ 		cssdtsd=(BOOL (WINAPI *)(LPCTSTR,DWORD,PSECURITY_DESCRIPTOR*,PULONG))(fp);
  %}
  
+ 
  // @pyswig PyACL|ACL|Creates a new <o PyACL> object.
  // @pyparm int|bufSize|64|The size of the buffer for the ACL.
***************
*** 894,917 ****
  			// returns PyTOKEN_PRIVILEGES (tuple of LUID and attribute flags for each privilege)
  			// attributes are combination of SE_PRIVILEGE_ENABLED,SE_PRIVILEGE_ENABLED_BY_DEFAULT,SE_PRIVILEGE_USED_FOR_ACCESS
! 			// should make this into body of PyWinObject_FromTOKEN_PRIVILEGES
! 			unsigned int privInd;
! 			PyObject *priv = NULL;
! 			PyObject *obluid = NULL;
! 			PLUID pluid;
! 			TOKEN_PRIVILEGES *tp = (TOKEN_PRIVILEGES *)buf;
! 			PyObject *privs = PyTuple_New(tp->PrivilegeCount);
! 			for (privInd = 0; privInd < tp->PrivilegeCount; privInd++){
! 				pluid = &tp->Privileges[privInd].Luid;
! 				obluid = PyWinObject_FromLARGE_INTEGER(*((LARGE_INTEGER *) pluid));
! 				priv = Py_BuildValue("(Ol)",obluid,tp->Privileges[privInd].Attributes );
! 				PyTuple_SET_ITEM(privs, privInd, priv);
! 				Py_DECREF(obluid);
! 				}
! 			ret = privs;
  			break;
  			}
  		case TokenPrimaryGroup: {
  			TOKEN_PRIMARY_GROUP *pg = (TOKEN_PRIMARY_GROUP *)buf;
!             ret = PyWinObject_FromSID(pg->PrimaryGroup);
  			break;
  			}
--- 960,969 ----
  			// returns PyTOKEN_PRIVILEGES (tuple of LUID and attribute flags for each privilege)
  			// attributes are combination of SE_PRIVILEGE_ENABLED,SE_PRIVILEGE_ENABLED_BY_DEFAULT,SE_PRIVILEGE_USED_FOR_ACCESS
! 			ret = PyWinObject_FromTOKEN_PRIVILEGES((TOKEN_PRIVILEGES *)buf);
  			break;
  			}
  		case TokenPrimaryGroup: {
  			TOKEN_PRIMARY_GROUP *pg = (TOKEN_PRIMARY_GROUP *)buf;
! 			ret = PyWinObject_FromSID(pg->PrimaryGroup);
  			break;
  			}
***************
*** 1209,1213 ****
  		&obth,        // @pyparm <o PyHANDLE>|handle||Handle to an access token to be modified
  		(long *)&typ, // @pyparm int|TokenInformationClass||Specifies a value from the TOKEN_INFORMATION_CLASS enumerated type identifying the type of information the function retrieves.
! 		&obinfo))     // @pyparm <o PyACL>/<o PySID>/int|obinfo||PyACL, PySID, or int depending on type parm
  		return NULL;
  
--- 1261,1265 ----
  		&obth,        // @pyparm <o PyHANDLE>|handle||Handle to an access token to be modified
  		(long *)&typ, // @pyparm int|TokenInformationClass||Specifies a value from the TOKEN_INFORMATION_CLASS enumerated type identifying the type of information the function retrieves.
! 		&obinfo))     // @pyparm <o>|obinfo||PyACL, PySID, or int depending on type parm
  		return NULL;
  
***************
*** 1712,1715 ****
--- 1764,1885 ----
  %}
  
+ // @pyswig string|ConvertSidToStringSid|Return string representation of a SID
+ %native(ConvertSidToStringSid) PyConvertSidToStringSid;
+ %{
+ static PyObject *PyConvertSidToStringSid(PyObject *self, PyObject *args)
+ {
+     if (cstss==NULL){
+         PyErr_SetString(PyExc_NotImplementedError,"ConvertSidToStringSid not supported by this version of Windows");
+         return NULL;
+         }
+     PyObject *obsid=NULL, *ret=NULL;
+     // @pyparm <o PySID>|Sid||PySID object
+     PSID psid=NULL;
+     WCHAR *stringsid=NULL;
+ 
+     if (!PyArg_ParseTuple(args, "O:ConvertSidToStringSid", &obsid))
+         return NULL;
+     if (!PyWinObject_AsSID(obsid, &psid))
+         return NULL;
+     if (!cstss(psid,&stringsid))
+         PyWin_SetAPIError("ConvertSidToStringSid");
+     else
+         ret=PyWinObject_FromWCHAR(stringsid);
+     if (stringsid!=NULL)
+         LocalFree(stringsid);
+     return ret;
+ }
+ %}
+ 
+ // @pyswig <o PySID>|ConvertStringSidToSid|Creates a SID from a string representation
+ %native(ConvertStringSidToSid) PyConvertStringSidToSid;
+ %{
+ static PyObject *PyConvertStringSidToSid(PyObject *self, PyObject *args)
+ {
+     if (cssts==NULL){
+         PyErr_SetString(PyExc_NotImplementedError,"ConvertStringSidToSid not supported by this version of Windows");
+         return NULL;
+         }
+     PyObject *ret=NULL, *obstringsid=NULL;
+     PSID psid=NULL;
+     TCHAR *stringsid=NULL;
+     // @pyparm string|StringSid||String representation of a SID
+ 
+     if (!PyArg_ParseTuple(args, "O:ConvertStringSidToSid", &obstringsid))
+         return NULL;
+     if (!PyWinObject_AsWCHAR(obstringsid, &stringsid))
+         return NULL;
+     if (!cssts(stringsid, &psid))
+         PyWin_SetAPIError("ConvertStringSidToSid");
+     else
+         ret=PyWinObject_FromSID(psid);
+     if (psid != NULL)
+         LocalFree(psid);
+     if (stringsid!=NULL)
+         PyWinObject_FreeWCHAR(stringsid);
+     return ret;
+ }
+ %}
+ 
+ // @pyswig string|ConvertSecurityDescriptorToStringSecurityDescriptor|Return string representation of a SECURITY_DESCRIPTOR
+ %native(ConvertSecurityDescriptorToStringSecurityDescriptor) PyConvertSecurityDescriptorToStringSecurityDescriptor;
+ %{
+ static PyObject *PyConvertSecurityDescriptorToStringSecurityDescriptor(PyObject *self, PyObject *args)
+ {
+     if (csdtssd==NULL){
+         PyErr_SetString(PyExc_NotImplementedError,"ConvertSecurityDescriptorToStringSecurityDescriptor not supported by this version of Windows");
+         return NULL;
+         }
+     PyObject *obsd=NULL, *ret=NULL;
+     // @pyparm <o PySECURITY_DESCRIPTOR>|SecurityDescriptor||PySECURITY_DESCRIPTOR object
+     // @pyparm int|RequestedStringSDRevision||Only SDDL_REVISION_1 currently valid
+     // @pyparm int|SecurityInformation||Combination of bit flags from SECURITY_INFORMATION enum
+     PSECURITY_DESCRIPTOR psd=NULL;
+     WCHAR *stringsd=NULL;
+     DWORD sd_rev;
+     SECURITY_INFORMATION info;
+     if (!PyArg_ParseTuple(args, "Oii:ConvertSecurityDescriptorToStringSecurityDescriptor", &obsd, &sd_rev, &info))
+         return NULL;
+     if (!PyWinObject_AsSECURITY_DESCRIPTOR(obsd, &psd, FALSE))
+         return NULL;
+     if (!csdtssd(psd, sd_rev, info, &stringsd, NULL))
+         PyWin_SetAPIError("ConvertSecurityDescriptorToStringSecurityDescriptor");
+     else
+         ret=PyWinObject_FromWCHAR(stringsd);
+     if (stringsd!=NULL)
+         LocalFree(stringsd);
+     return ret;
+ }
+ %}
+ 
+ // @pyswig <o PySECURITY_DESCRIPTOR>|ConvertStringSecurityDescriptorToSecurityDescriptor|Turns string representation of a SECURITY_DESCRIPTOR into the real thing
+ %native(ConvertStringSecurityDescriptorToSecurityDescriptor) PyConvertStringSecurityDescriptorToSecurityDescriptor;
+ %{
+ static PyObject *PyConvertStringSecurityDescriptorToSecurityDescriptor(PyObject *self, PyObject *args)
+ {
+     if (cssdtsd==NULL){
+         PyErr_SetString(PyExc_NotImplementedError,"ConvertStringSecurityDescriptorToSecurityDescriptor not supported by this version of Windows");
+         return NULL;
+ 	    }
+     PyObject *obssd=NULL, *ret=NULL;
+     PSECURITY_DESCRIPTOR psd=NULL;
+     // @pyparm string|StringSecurityDescriptor||String representation of a SECURITY_DESCRIPTOR
+     // @pyparm int|StringSDRevision||Only SDDL_REVISION_1 currently valid
+ 
+     WCHAR *stringsd=NULL; 
+     DWORD sd_rev;
+     if (!PyArg_ParseTuple(args, "Oi:ConvertStringSecurityDescriptorToSecurityDescriptor", &obssd, &sd_rev))
+         return NULL;
+     if (!PyWinObject_AsWCHAR(obssd, &stringsd, FALSE))
+         return NULL;
+     if (!cssdtsd(stringsd, sd_rev, &psd, NULL))
+         PyWin_SetAPIError("ConvertStringSecurityDescriptorToSecurityDescriptor");
+     else
+         ret=PyWinObject_FromSECURITY_DESCRIPTOR(psd);
+     PyWinObject_FreeWCHAR(stringsd);
+     LocalFree(psd);
+     return ret;
+ }
+ %}
  
  
***************
*** 1755,1758 ****
--- 1925,1932 ----
  #define DACL_SECURITY_INFORMATION DACL_SECURITY_INFORMATION // Indicates the discretionary ACL of the object is being referenced. 
  #define SACL_SECURITY_INFORMATION SACL_SECURITY_INFORMATION // Indicates the system ACL of the object is being referenced. 
+ #define PROTECTED_DACL_SECURITY_INFORMATION PROTECTED_DACL_SECURITY_INFORMATION
+ #define PROTECTED_SACL_SECURITY_INFORMATION PROTECTED_SACL_SECURITY_INFORMATION
+ #define UNPROTECTED_DACL_SECURITY_INFORMATION UNPROTECTED_DACL_SECURITY_INFORMATION
+ #define UNPROTECTED_SACL_SECURITY_INFORMATION UNPROTECTED_SACL_SECURITY_INFORMATION
  
  /** if (_WIN32_WINNT >= 0x0500)
***************
*** 1897,1902 ****
  // POLICY_SERVER_ENABLE_STATE 
  // markh fails with these!?
! //#define PolicyServerEnabled PolicyServerEnabled 
! //#define PolicyServerDisabled PolicyServerDisabled
  
  // POLICY_NOTIFICATION_INFORMATION_CLASS
--- 2071,2082 ----
  // POLICY_SERVER_ENABLE_STATE 
  // markh fails with these!?
! // from ntsecapi.h
! #ifdef PolicyServerEnabled
! #define PolicyServerEnabled PolicyServerEnabled 
! #endif
! 
! #ifdef PolicyServerDisabled
! #define PolicyServerDisabled PolicyServerDisabled
! #endif
  
  // POLICY_NOTIFICATION_INFORMATION_CLASS
***************
*** 1967,1968 ****
--- 2147,2158 ----
  #define SE_PRIVILEGE_ENABLED SE_PRIVILEGE_ENABLED
  #define SE_PRIVILEGE_USED_FOR_ACCESS SE_PRIVILEGE_USED_FOR_ACCESS
+ 
+ // share types from lmshare.h
+ #define STYPE_DISKTREE STYPE_DISKTREE     
+ #define STYPE_PRINTQ STYPE_PRINTQ
+ #define STYPE_DEVICE STYPE_DEVICE
+ #define STYPE_IPC STYPE_IPC
+ #define STYPE_TEMPORARY STYPE_TEMPORARY
+ #define STYPE_SPECIAL STYPE_SPECIAL
+ 
+ #define SDDL_REVISION_1 SDDL_REVISION_1

[pywin32-checkins] pywin32/com/win32com/src univgw.cpp,1.6,1.7

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5838

Modified Files:
	univgw.cpp 
Log Message:
Fix the vtable order (as per "[ 784643 ] A patch to fix a serious bug 
in univgw.cpp".  Also fix the Python exposed CreateTearOff, which
currently isn't used except by an old test, but would crash.


Index: univgw.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/univgw.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** univgw.cpp	16 Jan 2003 23:40:46 -0000	1.6
--- univgw.cpp	8 Aug 2003 03:57:51 -0000	1.7
***************
*** 393,399 ****
  
  	if (isDispatch) {
! 		vtbl->methods[3] = (pfnGWMethod)univgw_GetIDsOfNames;
  		vtbl->methods[4] = (pfnGWMethod)univgw_GetTypeInfo;
! 		vtbl->methods[5] = (pfnGWMethod)univgw_GetTypeInfoCount;
  		vtbl->methods[6] = (pfnGWMethod)univgw_Invoke;
  	}
--- 393,399 ----
  
  	if (isDispatch) {
! 		vtbl->methods[3] = (pfnGWMethod)univgw_GetTypeInfoCount;
  		vtbl->methods[4] = (pfnGWMethod)univgw_GetTypeInfo;
! 		vtbl->methods[5] = (pfnGWMethod)univgw_GetIDsOfNames;
  		vtbl->methods[6] = (pfnGWMethod)univgw_Invoke;
  	}
***************
*** 502,507 ****
  	}
  
  	// Do all of the grunt work.
! 	punk = CreateTearOff(obInstance, NULL, obVTable);
  	if (!punk)
  	{
--- 502,524 ----
  	}
  
+ 	PyGatewayBase *base = NULL;
+ 	PY_INTERFACE_PRECALL;
+ 	HRESULT hr = PyCom_MakeRegisteredGatewayObject(IID_IUnknown, 
+ 		                                           obInstance,
+ 		                                           NULL,
+ 		                                           (void **)&base);
+ 	PY_INTERFACE_POSTCALL;
+ 	if (FAILED(hr)) {
+ 		PyCom_BuildPyException(hr);
+ 		return NULL;
+ 	}
+ 
  	// Do all of the grunt work.
! 	punk = CreateTearOff(obInstance, base, obVTable);
! 	if (base) {
! 		PY_INTERFACE_PRECALL;
! 		base->Release();
! 		PY_INTERFACE_POSTCALL;
! 	}
  	if (!punk)
  	{

[pywin32-checkins] pywin32/com/win32com/test testuniv.py,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory sc8-pr-cvs1:/tmp/cvs-serv5436

Modified Files:
	testuniv.py 
Log Message:
Make the test semi-work (it is old anyway).  It crashes without a patch
to univgw (which is coming)


Index: testuniv.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testuniv.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testuniv.py	18 Nov 2002 11:20:07 -0000	1.2
--- testuniv.py	8 Aug 2003 03:54:04 -0000	1.3
***************
*** 4,8 ****
  
  import struct
- import univgw
  import pythoncom
  from win32com.server import util
--- 4,7 ----
***************
*** 10,13 ****
--- 9,14 ----
  import winerror
  import time
+ 
+ univgw = pythoncom._univgw
  
  class Definition:

[pywin32-checkins] pywin32/com/win32com/src/extensions PyICreateTypeInfo.cpp,1.3,1.4

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src/extensions
In directory sc8-pr-cvs1:/tmp/cvs-serv23931

Modified Files:
	PyICreateTypeInfo.cpp 
Log Message:
Don't leave an exception pending.


Index: PyICreateTypeInfo.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/extensions/PyICreateTypeInfo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyICreateTypeInfo.cpp	26 Nov 1999 04:00:28 -0000	1.3
--- PyICreateTypeInfo.cpp	7 Aug 2003 22:42:41 -0000	1.4
***************
*** 351,354 ****
--- 351,355 ----
  		return NULL;
  	}
+ 	PyErr_Clear(); // clear the exception set by PyWinObject_AsBstr
  	if (!PySequence_Check(obrgszNames)) {
  		PyErr_SetString(PyExc_TypeError, "The names param must be a sequence of strings/unicodes");

[pywin32-checkins] pywin32/win32 win32event.dsp,1.5,1.6 win32file.dsp,1.6,1.7 win32gui.dsp,1.7,1.8 win32process.dsp,1.4,1.5

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

Update of /cvsroot/pywin32/pywin32/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv22182

Modified Files:
	win32event.dsp win32file.dsp win32gui.dsp win32process.dsp 
Log Message:
Remove all the MIPS etc configs that were still hanging around
(I thought I got rid of them all - indeed, most projects had them gone!)


Index: win32event.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/win32event.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32event.dsp	27 Oct 2001 06:33:24 -0000	1.5
--- win32event.dsp	31 Jul 2003 02:18:42 -0000	1.6
***************
*** 3,9 ****
  # ** DO NOT EDIT **
  
- # TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102
- # TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02
- # TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
--- 3,6 ----
***************
*** 23,32 ****
  !MESSAGE "win32event - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "win32event - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
- !MESSAGE "win32event - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library")
- !MESSAGE "win32event - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
- !MESSAGE "win32event - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library")
- !MESSAGE "win32event - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
- !MESSAGE "win32event - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library")
- !MESSAGE "win32event - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library")
  !MESSAGE 
  
--- 20,23 ----
***************
*** 35,38 ****
--- 26,32 ----
  # PROP Scc_ProjName ""$/Python/win32", DGAAAAAA"
  # PROP Scc_LocalPath "."
+ CPP=cl.exe
+ MTL=midl.exe
+ RSC=rc.exe
  
  !IF  "$(CFG)" == "win32event - Win32 Release"
***************
*** 50,60 ****
  # PROP Target_Dir ""
  F90=df.exe
- CPP=cl.exe
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "NDEBUG" /D "STRICT" /YX /FD /c
- MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
- RSC=rc.exe
  # ADD BASE RSC /l 0xc09 /d "NDEBUG"
  # ADD RSC /l 0xc09 /d "NDEBUG"
--- 44,51 ----
***************
*** 81,91 ****
  # PROP Target_Dir ""
  F90=df.exe
- CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "_DEBUG" /D "DEBUG" /D "STRICT" /YX /FD /c
- MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
- RSC=rc.exe
  # ADD BASE RSC /l 0xc09 /d "_DEBUG"
  # ADD RSC /l 0xc09 /d "_DEBUG"
--- 72,79 ----
***************
*** 97,310 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e810000" /subsystem:windows /dll /debug /machine:I386 /out:"Build\win32event_d.pyd" /pdbtype:sept
  
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE x86em) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32eve"
- # PROP BASE Intermediate_Dir "win32eve"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\x86em"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\x86em\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- EMPFILE=empfile.exe
- # ADD BASE EMPFILE COPY
- # ADD EMPFILE COPY
- CPP=cl.exe
- # ADD BASE CPP /nologo /MLd /W3 /Gm /ZI /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- # ADD CPP /nologo /MT /W3 /Gm /Zi /Od /D "UNICODE" /D "_UNICODE" /D UNDER_CE=$(CEVersion) /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "DEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- # ADD RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib commctrl.lib coredll.lib /nologo /base:"0x1e800000" /subsystem:windows /dll /debug /machine:IX86 /out:"Build\win32event_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /incremental:no
- # ADD LINK32 coredll.lib /nologo /base:"0x1e800000" /entry:"_DllMainCRTStartup@12" /subsystem:windows /dll /debug /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\x86em\win32event_d.pyd" /pdbtype:sept /subsystem:windowsce
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE MIPS) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 0
- # PROP BASE Output_Dir "win32eve"
- # PROP BASE Intermediate_Dir "win32eve"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 0
- # PROP Output_Dir "Build\ce\mips"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\mips\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=clmips.exe
- # ADD BASE CPP /nologo /ML /W3 /Zi /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "__WIN32__" /D "STRICT" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /O1 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "__WIN32__" /D "STRICT" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- # ADD RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /out:"Build\win32event.pyd"
- # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
- # ADD LINK32 coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\mips\win32event.pyd" /subsystem:$(CESubsystem)
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE SH3) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 0
- # PROP BASE Output_Dir "win32ev0"
- # PROP BASE Intermediate_Dir "win32ev0"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 0
- # PROP Output_Dir "Build\ce\sh"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\sh\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=shcl.exe
- # ADD BASE CPP /nologo /ML /W3 /Zi /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "__WIN32__" /D "STRICT" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /O1 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "__WIN32__" /D "STRICT" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- # ADD RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /out:"Build\win32event.pyd"
- # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
- # ADD LINK32 coredll.lib /nologo /dll /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\sh\win32event.pyd" /subsystem:$(CESubsystem)
- # SUBTRACT LINK32 /pdb:none /debug
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE MIPS) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32ev1"
- # PROP BASE Intermediate_Dir "win32ev1"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\mips"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\mips\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=clmips.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "__WIN32__" /D "_DEBUG" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNICODE" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /out:"Build\ce\x86em\win32event_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /pdb:none /incremental:no /nodefaultlib
- # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\mips\win32event_d.pyd" /pdbtype:sept /subsystem:windowsce
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE SH3) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32ev2"
- # PROP BASE Intermediate_Dir "win32ev2"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\sh"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\sh\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=shcl.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D "__WIN32__" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "_DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /out:"Build\ce\x86em\win32event_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /pdb:none /incremental:no /nodefaultlib
- # ADD LINK32 coredll.lib /nologo /dll /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\sh\win32event_d.pyd" /pdbtype:sept
- # SUBTRACT LINK32 /pdb:none /incremental:no /nodefaultlib
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE x86em) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 0
- # PROP BASE Output_Dir "win32ev3"
- # PROP BASE Intermediate_Dir "win32ev3"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 0
- # PROP Output_Dir "Build\ce\x86em"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\x86em\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- EMPFILE=empfile.exe
- # ADD BASE EMPFILE COPY
- # ADD EMPFILE COPY
- CPP=cl.exe
- # ADD BASE CPP /nologo /ML /W3 /Gm /Zi /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- # ADD CPP /nologo /MT /W3 /O1 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
- # ADD RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib commctrl.lib coredll.lib /nologo /base:"0x1e800000" /subsystem:windows /dll /debug /machine:IX86 /out:"Build\win32event.pyd"
- # SUBTRACT BASE LINK32 /pdb:none
- # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib commctrl.lib coredll.lib /nologo /base:"0x1e800000" /subsystem:windows /dll /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\x86em\win32event.pyd"
- # SUBTRACT LINK32 /pdb:none /debug
- 
  !ENDIF 
  
--- 85,88 ----
***************
*** 313,322 ****
  # Name "win32event - Win32 Release"
  # Name "win32event - Win32 Debug"
- # Name "win32event - Win32 (WCE x86em) Debug"
- # Name "win32event - Win32 (WCE MIPS) Release"
- # Name "win32event - Win32 (WCE SH3) Release"
- # Name "win32event - Win32 (WCE MIPS) Debug"
- # Name "win32event - Win32 (WCE SH3) Debug"
- # Name "win32event - Win32 (WCE x86em) Release"
  # Begin Source File
  
--- 91,94 ----
***************
*** 347,410 ****
  # End Custom Build
  
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE x86em) Debug"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32event.i	InputName=win32event	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp             $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE MIPS) Release"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32event.i	InputName=win32event	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp             $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE SH3) Release"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32event.i	InputName=win32event	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp             $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE MIPS) Debug"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32event.i	InputName=win32event	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp             $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE SH3) Debug"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32event.i	InputName=win32event	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp             $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE x86em) Release"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32event.i	InputName=win32event	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp             $(InputName).i
- 
- # End Custom Build
- 
  !ENDIF 
  
--- 119,122 ----
***************
*** 413,579 ****
  
  SOURCE=.\src\win32eventmodule.cpp
- 
- !IF  "$(CFG)" == "win32event - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 Debug"
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE x86em) Debug"
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE MIPS) Release"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32eventmodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\angeobject.h"\
- 	".\bject.h"\
- 	".\bjimpl.h"\
- 	".\bstract.h"\
- 	".\ethodobject.h"\
- 	".\ictobject.h"\
- 	".\ileobject.h"\
- 	".\istobject.h"\
- 	".\lassobject.h"\
- 	".\liceobject.h"\
- 	".\loatobject.h"\
- 	".\mport.h"\
- 	".\ntobject.h"\
- 	".\ntrcheck.h"\
- 	".\odsupport.h"\
- 	".\oduleobject.h"\
- 	".\omplexobject.h"\
- 	".\onfig.h"\
- 	".\ongobject.h"\
- 	".\raceback.h"\
- 	".\rtapi.h"\
- 	".\src\win32eventmodule_wince.cpp"\
- 	".\tringobject.h"\
- 	".\uncobject.h"\
- 	".\upleobject.h"\
- 	".\val.h"\
- 	".\xtapi.h"\
- 	".\ydebug.h"\
- 	".\yerrors.h"\
- 	".\yfpe.h"\
- 	".\ymalloc.h"\
- 	".\yproto.h"\
- 	".\ys\stat.h"\
- 	".\ysmodule.h"\
- 	".\ystate.h"\
- 	".\ython.h"\
- 	".\ythonrun.h"\
- 	".\yWinTypes.h"\
- 	
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE SH3) Release"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32eventmodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\angeobject.h"\
- 	".\bject.h"\
- 	".\bjimpl.h"\
- 	".\bstract.h"\
- 	".\ethodobject.h"\
- 	".\ictobject.h"\
- 	".\ileobject.h"\
- 	".\istobject.h"\
- 	".\lassobject.h"\
- 	".\liceobject.h"\
- 	".\loatobject.h"\
- 	".\mport.h"\
- 	".\ntobject.h"\
- 	".\ntrcheck.h"\
- 	".\odsupport.h"\
- 	".\oduleobject.h"\
- 	".\omplexobject.h"\
- 	".\onfig.h"\
- 	".\ongobject.h"\
- 	".\raceback.h"\
- 	".\rtapi.h"\
- 	".\src\win32eventmodule_wince.cpp"\
- 	".\tringobject.h"\
- 	".\uncobject.h"\
- 	".\upleobject.h"\
- 	".\val.h"\
- 	".\xtapi.h"\
- 	".\ydebug.h"\
- 	".\yerrors.h"\
- 	".\yfpe.h"\
- 	".\ymalloc.h"\
- 	".\yproto.h"\
- 	".\ys\stat.h"\
- 	".\ysmodule.h"\
- 	".\ystate.h"\
- 	".\ython.h"\
- 	".\ythonrun.h"\
- 	".\yWinTypes.h"\
- 	
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE MIPS) Debug"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32eventmodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\angeobject.h"\
- 	".\atchlevel.h"\
- 	".\bject.h"\
- 	".\bjimpl.h"\
- 	".\bstract.h"\
- 	".\e\crtapi.h"\
- 	".\ethodobject.h"\
- 	".\eval.h"\
- 	".\ictobject.h"\
- 	".\ileobject.h"\
- 	".\istobject.h"\
- 	".\lassobject.h"\
- 	".\liceobject.h"\
- 	".\loatobject.h"\
- 	".\mport.h"\
- 	".\nicodeobject.h"\
- 	".\ntobject.h"\
- 	".\ntrcheck.h"\
- 	".\object.h"\
- 	".\odsupport.h"\
- 	".\oduleobject.h"\
- 	".\omplexobject.h"\
- 	".\onfig.h"\
- 	".\ongobject.h"\
- 	".\raceback.h"\
- 	".\src\win32eventmodule_wince.cpp"\
- 	".\tringobject.h"\
- 	".\ufferobject.h"\
- 	".\uncobject.h"\
- 	".\upleobject.h"\
- 	".\ydebug.h"\
- 	".\yerrors.h"\
- 	".\yfpe.h"\
- 	".\ymalloc.h"\
- 	".\yproto.h"\
- 	".\ysmodule.h"\
- 	".\ystate.h"\
- 	".\ython.h"\
- 	".\ythonrun.h"\
- 	".\yWinTypes.h"\
- 	
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE SH3) Debug"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32eventmodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\src\Python.h"\
- 	".\src\unicodeobject.h"\
- 	".\src\win32eventmodule_wince.cpp"\
- 	".\yWinTypes.h"\
- 	
- 
- !ELSEIF  "$(CFG)" == "win32event - Win32 (WCE x86em) Release"
- 
- !ENDIF 
- 
  # End Source File
  # End Target
--- 125,128 ----

Index: win32file.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/win32file.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32file.dsp	27 Oct 2001 06:33:24 -0000	1.6
--- win32file.dsp	31 Jul 2003 02:18:42 -0000	1.7
***************
*** 3,9 ****
  # ** DO NOT EDIT **
  
- # TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102
- # TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02
- # TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
--- 3,6 ----
***************
*** 23,32 ****
  !MESSAGE "win32file - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "win32file - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
- !MESSAGE "win32file - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library")
- !MESSAGE "win32file - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library")
- !MESSAGE "win32file - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library")
- !MESSAGE "win32file - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
- !MESSAGE "win32file - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library")
- !MESSAGE "win32file - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
  !MESSAGE 
  
--- 20,23 ----
***************
*** 35,38 ****
--- 26,32 ----
  # PROP Scc_ProjName ""$/Python/win32", OGAAAAAA"
  # PROP Scc_LocalPath "."
+ CPP=cl.exe
+ MTL=midl.exe
+ RSC=rc.exe
  
  !IF  "$(CFG)" == "win32file - Win32 Release"
***************
*** 50,60 ****
  # PROP Target_Dir ""
  F90=df.exe
- CPP=cl.exe
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "NDEBUG" /D "STRICT" /YX /FD /c
- MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
- RSC=rc.exe
  # ADD BASE RSC /l 0xc09 /d "NDEBUG"
  # ADD RSC /l 0xc09 /d "NDEBUG"
--- 44,51 ----
***************
*** 81,91 ****
  # PROP Target_Dir ""
  F90=df.exe
- CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "_DEBUG" /D "DEBUG" /D "STRICT" /YX /FD /c
- MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
- RSC=rc.exe
  # ADD BASE RSC /l 0xc09 /d "_DEBUG"
  # ADD RSC /l 0xc09 /d "_DEBUG"
--- 72,79 ----
***************
*** 97,310 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e730000" /subsystem:windows /dll /debug /machine:I386 /out:"Build\win32file_d.pyd" /pdbtype:sept /libpath:".\Build"
  
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32fil"
- # PROP BASE Intermediate_Dir "win32fil"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\x86em"
- # PROP Intermediate_Dir "Build\Temp\win32file\ce\x86em\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- EMPFILE=empfile.exe
- # ADD BASE EMPFILE COPY
- # ADD EMPFILE COPY
- CPP=cl.exe
- # ADD BASE CPP /nologo /MLd /W3 /Gm /ZI /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- # ADD CPP /nologo /MT /W3 /Gm /Zi /Od /D "UNICODE" /D "_UNICODE" /D UNDER_CE=$(CEVersion) /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "DEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- # ADD RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib commctrl.lib coredll.lib /nologo /base:"0x1e700000" /subsystem:windows /dll /debug /machine:IX86 /out:"Build\win32file_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /incremental:no
- # ADD LINK32 coredll.lib /nologo /base:"0x1e700000" /entry:"_DllMainCRTStartup@12" /subsystem:windows /dll /debug /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\x86em\win32file_d.pyd" /pdbtype:sept /subsystem:windowsce
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32fil"
- # PROP BASE Intermediate_Dir "win32fil"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\x86em"
- # PROP Intermediate_Dir "Build\Temp\win32file\ce\x86em\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- EMPFILE=empfile.exe
- # ADD BASE EMPFILE COPY
- # ADD EMPFILE COPY
- CPP=cl.exe
- # ADD BASE CPP /nologo /MT /W3 /Gm /Zi /Od /D "UNICODE" /D "_UNICODE" /D UNDER_CE=$(CEVersion) /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "DEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- # ADD CPP /nologo /MT /W3 /O1 /D "UNICODE" /D "_UNICODE" /D UNDER_CE=$(CEVersion) /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "__WIN32__" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- # ADD RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x1e700000" /subsystem:windows /dll /debug /machine:IX86 /out:"Build\ce\x86em\win32file_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /incremental:no
- # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x1e700000" /entry:"_DllMainCRTStartup@12" /subsystem:windows /dll /incremental:no /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\x86em\win32file.pyd" /pdbtype:sept
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32fi0"
- # PROP BASE Intermediate_Dir "win32fi0"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\sh"
- # PROP Intermediate_Dir "Build\Temp\win32file\ce\sh\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=shcl.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D "__WIN32__" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "_DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /out:"Build\ce\x86em\win32file_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /pdb:none /incremental:no /nodefaultlib
- # ADD LINK32 coredll.lib /nologo /dll /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\sh\win32file_d.pyd" /pdbtype:sept /subsystem:windowsce
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32fi1"
- # PROP BASE Intermediate_Dir "win32fi1"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\mips"
- # PROP Intermediate_Dir "Build\Temp\win32file\ce\mips\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=clmips.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "__WIN32__" /D "_DEBUG" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNICODE" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /out:"Build\ce\x86em\win32file_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /pdb:none /incremental:no /nodefaultlib
- # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\mips\win32file_d.pyd" /pdbtype:sept /subsystem:windowsce
- # SUBTRACT LINK32 /pdb:none
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32fi2"
- # PROP BASE Intermediate_Dir "win32fi2"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\sh"
- # PROP Intermediate_Dir "Build\Temp\win32file\ce\sh\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=shcl.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /O1 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "__WIN32__" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /out:"Build\ce\x86em\win32file_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /pdb:none /incremental:no /nodefaultlib
- # ADD LINK32 coredll.lib /nologo /dll /incremental:no /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\sh\win32file.pyd" /pdbtype:sept /subsystem:$(CESubsystem)
- # SUBTRACT LINK32 /pdb:none /debug
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "win32fi3"
- # PROP BASE Intermediate_Dir "win32fi3"
- # PROP BASE Ignore_Export_Lib 0
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\mips"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\mips\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- CPP=clmips.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /FD /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /O1 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "__WIN32__" /YX /FD /c
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /out:"Build\ce\x86em\win32file_d.pyd" /pdbtype:sept
- # SUBTRACT BASE LINK32 /pdb:none /incremental:no /nodefaultlib
- # ADD LINK32 coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\mips\win32file.pyd" /pdbtype:sept /subsystem:$(CESubsystem)
- # SUBTRACT LINK32 /pdb:none
- 
  !ENDIF 
  
--- 85,88 ----
***************
*** 313,322 ****
  # Name "win32file - Win32 Release"
  # Name "win32file - Win32 Debug"
- # Name "win32file - Win32 (WCE x86em) Debug"
- # Name "win32file - Win32 (WCE x86em) Release"
- # Name "win32file - Win32 (WCE SH3) Debug"
- # Name "win32file - Win32 (WCE MIPS) Debug"
- # Name "win32file - Win32 (WCE SH3) Release"
- # Name "win32file - Win32 (WCE MIPS) Release"
  # Begin Source File
  
--- 91,94 ----
***************
*** 347,410 ****
  # End Custom Build
  
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Debug"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32file.i	InputName=win32file	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp              $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Release"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32file.i	InputName=win32file	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp              $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Debug"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32file.i	InputName=win32file	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp              $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Debug"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32file.i	InputName=win32file	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp              $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Release"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32file.i	InputName=win32file	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp              $(InputName).i
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Release"
- 
- # Begin Custom Build - Invoking SWIG...
- InputDir=.\src	InputPath=.\src\win32file.i	InputName=win32file	
- 
- "$(InputDir)\$(InputName)module_wince.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	..\swig.bat $(InputDir) -python -c++ -DMS_WINCE -o $(InputName)module_wince.cpp              $(InputName).i
- 
- # End Custom Build
- 
  !ENDIF 
  
--- 119,122 ----
***************
*** 413,604 ****
  
  SOURCE=.\src\win32file_comm.cpp
- 
- !IF  "$(CFG)" == "win32file - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 Debug"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Debug"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Release"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Debug"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Debug"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Release"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Release"
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\win32filemodule.cpp
- 
- !IF  "$(CFG)" == "win32file - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 Debug"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Debug"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE x86em) Release"
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Debug"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32filemodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\src\Python.h"\
- 	".\src\unicodeobject.h"\
- 	".\src\win32filemodule_wince.cpp"\
- 	".\yWinTypes.h"\
- 	
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Debug"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32filemodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\angeobject.h"\
- 	".\atchlevel.h"\
- 	".\bject.h"\
- 	".\bjimpl.h"\
- 	".\bstract.h"\
- 	".\e\crtapi.h"\
- 	".\ethodobject.h"\
- 	".\eval.h"\
- 	".\ictobject.h"\
- 	".\ileobject.h"\
- 	".\istobject.h"\
- 	".\lassobject.h"\
- 	".\liceobject.h"\
- 	".\loatobject.h"\
- 	".\mport.h"\
- 	".\nicodeobject.h"\
- 	".\ntobject.h"\
- 	".\ntrcheck.h"\
- 	".\object.h"\
- 	".\odsupport.h"\
- 	".\oduleobject.h"\
- 	".\omplexobject.h"\
- 	".\onfig.h"\
- 	".\ongobject.h"\
- 	".\raceback.h"\
- 	".\src\win32filemodule_wince.cpp"\
- 	".\tringobject.h"\
- 	".\ufferobject.h"\
- 	".\uncobject.h"\
- 	".\upleobject.h"\
- 	".\ydebug.h"\
- 	".\yerrors.h"\
- 	".\yfpe.h"\
- 	".\ymalloc.h"\
- 	".\yproto.h"\
- 	".\ysmodule.h"\
- 	".\ystate.h"\
- 	".\ython.h"\
- 	".\ythonrun.h"\
- 	".\yWinTypes.h"\
- 	
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE SH3) Release"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32filemodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\angeobject.h"\
- 	".\bject.h"\
- 	".\bjimpl.h"\
- 	".\bstract.h"\
- 	".\ethodobject.h"\
- 	".\eval.h"\
- 	".\ictobject.h"\
- 	".\ileobject.h"\
- 	".\istobject.h"\
- 	".\lassobject.h"\
- 	".\liceobject.h"\
- 	".\loatobject.h"\
- 	".\mport.h"\
- 	".\ntobject.h"\
- 	".\ntrcheck.h"\
- 	".\object.h"\
- 	".\odsupport.h"\
- 	".\oduleobject.h"\
- 	".\omplexobject.h"\
- 	".\onfig.h"\
- 	".\ongobject.h"\
- 	".\raceback.h"\
- 	".\rtapi.h"\
- 	".\src\win32filemodule_wince.cpp"\
- 	".\tringobject.h"\
- 	".\uncobject.h"\
- 	".\upleobject.h"\
- 	".\xtapi.h"\
- 	".\ydebug.h"\
- 	".\yerrors.h"\
- 	".\yfpe.h"\
- 	".\ymalloc.h"\
- 	".\yproto.h"\
- 	".\ys\stat.h"\
- 	".\ysmodule.h"\
- 	".\ystate.h"\
- 	".\ython.h"\
- 	".\ythonrun.h"\
- 	".\yWinTypes.h"\
- 	
- 
- !ELSEIF  "$(CFG)" == "win32file - Win32 (WCE MIPS) Release"
- 
- DEP_CPP_WIN32=\
- 	".\src\win32filemodule_win32.cpp"\
- 	
- NODEP_CPP_WIN32=\
- 	".\angeobject.h"\
- 	".\bject.h"\
- 	".\bjimpl.h"\
- 	".\bstract.h"\
- 	".\ethodobject.h"\
- 	".\eval.h"\
- 	".\ictobject.h"\
- 	".\ileobject.h"\
- 	".\istobject.h"\
- 	".\lassobject.h"\
- 	".\liceobject.h"\
- 	".\loatobject.h"\
- 	".\mport.h"\
- 	".\ntobject.h"\
- 	".\ntrcheck.h"\
- 	".\object.h"\
- 	".\odsupport.h"\
- 	".\oduleobject.h"\
- 	".\omplexobject.h"\
- 	".\onfig.h"\
- 	".\ongobject.h"\
- 	".\raceback.h"\
- 	".\rtapi.h"\
- 	".\src\win32filemodule_wince.cpp"\
- 	".\tringobject.h"\
- 	".\uncobject.h"\
- 	".\upleobject.h"\
- 	".\xtapi.h"\
- 	".\ydebug.h"\
- 	".\yerrors.h"\
- 	".\yfpe.h"\
- 	".\ymalloc.h"\
- 	".\yproto.h"\
- 	".\ys\stat.h"\
- 	".\ysmodule.h"\
- 	".\ystate.h"\
- 	".\ython.h"\
- 	".\ythonrun.h"\
- 	".\yWinTypes.h"\
- 	
- 
- !ENDIF 
- 
  # End Source File
  # End Target
--- 125,132 ----

Index: win32gui.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/win32gui.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** win32gui.dsp	6 Apr 2003 23:49:52 -0000	1.7
--- win32gui.dsp	31 Jul 2003 02:18:42 -0000	1.8
***************
*** 3,9 ****
  # ** DO NOT EDIT **
  
- # TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102
- # TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02
- # TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
--- 3,6 ----
***************
*** 23,32 ****
  !MESSAGE "win32gui - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "win32gui - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
- !MESSAGE "win32gui - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library")
- !MESSAGE "win32gui - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library")
- !MESSAGE "win32gui - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
- !MESSAGE "win32gui - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library")
- !MESSAGE "win32gui - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library")
- !MESSAGE "win32gui - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library")
  !MESSAGE 
  
--- 20,23 ----
***************
*** 35,38 ****
--- 26,32 ----
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath "H/PC Ver. 2.00"
+ CPP=cl.exe
+ MTL=midl.exe
+ RSC=rc.exe
  
  !IF  "$(CFG)" == "win32gui - Win32 Release"
***************
*** 50,60 ****
  # PROP Target_Dir ""
  F90=df.exe
- CPP=cl.exe
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "WIN32GUI" /YX /FD /c
- MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
- RSC=rc.exe
  # ADD BASE RSC /l 0xc09 /d "NDEBUG"
  # ADD RSC /l 0xc09 /d "NDEBUG"
--- 44,51 ----
***************
*** 81,91 ****
  # PROP Target_Dir ""
  F90=df.exe
- CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "DEBUG" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "WIN32GUI" /YX /FD /c
- MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
- RSC=rc.exe
  # ADD BASE RSC /l 0xc09 /d "_DEBUG"
  # ADD RSC /l 0xc09 /d "_DEBUG"
--- 72,79 ----
***************
*** 97,301 ****
  # ADD LINK32 comdlg32.lib kernel32.lib user32.lib shell32.lib gdi32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib /nologo /base:"0x1e2e0000" /subsystem:windows /dll /debug /machine:I386 /out:"Build/win32gui_d.pyd" /pdbtype:sept /libpath:".\Build"
  
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE x86em) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 0
- # PROP BASE Output_Dir "x86emRel"
- # PROP BASE Intermediate_Dir "x86emRel"
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 0
- # PROP Output_Dir "Build\ce\x86em"
- # PROP Intermediate_Dir "Build\Temp\win32file\ce\x86em\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /dll /machine:I386 /windowsce:emulation
- # ADD LINK32 commdlg.lib commctrl.lib coredll.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\x86em\win32gui.pyd" /windowsce:emulation
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
- # ADD RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
- CPP=cl.exe
- # ADD BASE CPP /nologo /ML /W3 /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c
- # ADD CPP /nologo /MT /W3 /O1 /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "__WIN32__" /YX /c
- EMPFILE=empfile.exe
- # ADD BASE EMPFILE COPY
- # ADD EMPFILE COPY
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE x86em) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "x86emDbg"
- # PROP BASE Intermediate_Dir "x86emDbg"
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\x86em"
- # PROP Intermediate_Dir "Build\Temp\win32gui\ce\x86em\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /dll /debug /machine:I386 /windowsce:emulation
- # ADD LINK32 commdlg.lib commctrl.lib coredll.lib /nologo /entry:"_DllMainCRTStartup@12" /dll /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\x86em\win32gui_d.pyd" /windowsce:emulation
- # SUBTRACT LINK32 /pdb:none
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- # ADD RSC /l 0xc09 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
- CPP=cl.exe
- # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c
- # ADD CPP /nologo /MT /W3 /Gm /Zi /Od /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "DEBUG" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "__WIN32__" /YX /c
- EMPFILE=empfile.exe
- # ADD BASE EMPFILE COPY
- # ADD EMPFILE COPY
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE MIPS) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 0
- # PROP BASE Output_Dir "WMIPSRel"
- # PROP BASE Intermediate_Dir "WMIPSRel"
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 0
- # PROP Output_Dir "Build\ce\mips"
- # PROP Intermediate_Dir "Build\Temp\win32event\ce\mips\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /machine:MIPS /subsystem:$(CESubsystem)
- # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
- # ADD LINK32 commdlg.lib commctrl.lib coredll.lib /nologo /dll /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\mips\win32gui.pyd" /subsystem:windowsce,1.0
- # SUBTRACT LINK32 /pdb:none
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- # ADD RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- CPP=clmips.exe
- # ADD BASE CPP /nologo /ML /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /O1 /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "__WIN32__" /YX /QMRWCE /c
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE MIPS) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "WMIPSDbg"
- # PROP BASE Intermediate_Dir "WMIPSDbg"
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\mips"
- # PROP Intermediate_Dir "Build\Temp\win32gui\ce\mips\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /subsystem:$(CESubsystem)
- # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
- # ADD LINK32 commdlg.lib commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\mips\win32gui_d.pyd" /subsystem:$(CESubsystem)
- # SUBTRACT LINK32 /pdb:none /nodefaultlib
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- CPP=clmips.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /Zi /Od /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "__WIN32__" /D "_DEBUG" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNICODE" /YX /c
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE SH3) Release"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 0
- # PROP BASE Output_Dir "WCESHRel"
- # PROP BASE Intermediate_Dir "WCESHRel"
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 0
- # PROP Output_Dir "Build\ce\sh"
- # PROP Intermediate_Dir "Build\Temp\win32gui\ce\sh\Release"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /machine:SH3 /subsystem:$(CESubsystem)
- # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
- # ADD LINK32 commdlg.lib commctrl.lib coredll.lib /nologo /dll /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\sh\win32gui.pyd" /subsystem:$(CESubsystem)
- # SUBTRACT LINK32 /pdb:none /nodefaultlib
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- # ADD RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
- CPP=shcl.exe
- # ADD BASE CPP /nologo /ML /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c
- # ADD CPP /nologo /M$(CECrtMT) /W3 /O1 /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "__WIN32__" /YX /c
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE SH3) Debug"
- 
- # PROP BASE Use_MFC 0
- # PROP BASE Use_Debug_Libraries 1
- # PROP BASE Output_Dir "WCESHDbg"
- # PROP BASE Intermediate_Dir "WCESHDbg"
- # PROP BASE Target_Dir ""
- # PROP Use_MFC 0
- # PROP Use_Debug_Libraries 1
- # PROP Output_Dir "Build\ce\sh"
- # PROP Intermediate_Dir "Build\Temp\win32gui\ce\sh\Debug"
- # PROP Ignore_Export_Lib 0
- # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /subsystem:$(CESubsystem)
- # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
- # ADD LINK32 commdlg.lib commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"Build\ce\sh\win32gui_d.pyd" /subsystem:$(CESubsystem)
- # SUBTRACT LINK32 /pdb:none /nodefaultlib
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- RSC=rc.exe
- # ADD BASE RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- # ADD RSC /l 0xc09 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
- CPP=shcl.exe
- # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c
- # ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D "_UNICODE" /D "__WIN32__" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "_DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c
- PFILE=pfile.exe
- # ADD BASE PFILE COPY
- # ADD PFILE COPY
- 
  !ENDIF 
  
--- 85,88 ----
***************
*** 304,335 ****
  # Name "win32gui - Win32 Release"
  # Name "win32gui - Win32 Debug"
- # Name "win32gui - Win32 (WCE x86em) Release"
- # Name "win32gui - Win32 (WCE x86em) Debug"
- # Name "win32gui - Win32 (WCE MIPS) Release"
- # Name "win32gui - Win32 (WCE MIPS) Debug"
- # Name "win32gui - Win32 (WCE SH3) Release"
- # Name "win32gui - Win32 (WCE SH3) Debug"
  # Begin Source File
  
  SOURCE=.\src\win32dynamicdialog.cpp
- 
- !IF  "$(CFG)" == "win32gui - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 Debug"
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE x86em) Release"
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE x86em) Debug"
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE MIPS) Release"
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE MIPS) Debug"
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE SH3) Release"
- 
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE SH3) Debug"
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 91,97 ----
***************
*** 361,424 ****
  # End Custom Build
  
- !ELSEIF  "$(CFG)" == "win32gui - Win32 (WCE x86em) Release"
- 
- # Begin...
 
[truncated message content]

[pywin32-checkins] pywin32/com win32com.dsp,1.22,1.23

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

Update of /cvsroot/pywin32/pywin32/com
In directory sc8-pr-cvs1:/tmp/cvs-serv21746

Modified Files:
	win32com.dsp 
Log Message:
pythoncom23.dll -> 24 (and the same bullshit configuration stuff)


Index: win32com.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com.dsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** win32com.dsp	16 Jan 2003 23:53:12 -0000	1.22
--- win32com.dsp	31 Jul 2003 02:16:21 -0000	1.23
***************
*** 3,9 ****
  # ** DO NOT EDIT **
  
- # TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02
- # TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102
- # TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
--- 3,6 ----
***************
*** 23,30 ****
[...8252 lines suppressed...]
- !ELSEIF  "$(CFG)" == "win32com - Win32 (WCE SH3) Release"
- 
- # PROP BASE Exclude_From_Build 1
- # PROP Exclude_From_Build 1
- 
- !ELSEIF  "$(CFG)" == "win32com - Win32 (WCE x86em) Debug"
- 
- # PROP BASE Exclude_From_Build 1
  # PROP Exclude_From_Build 1
- 
- !ELSEIF  "$(CFG)" == "win32com - Win32 (WCE MIPS) Debug"
- 
- # PROP BASE Exclude_From_Build 1
- # PROP Exclude_From_Build 1
- 
- !ENDIF 
- 
  # End Source File
  # End Group
--- 517,521 ----

[pywin32-checkins] pywin32/win32 PyWinTypes.dsp,1.14,1.15

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

Update of /cvsroot/pywin32/pywin32/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv21350

Modified Files:
	PyWinTypes.dsp 
Log Message:
Supposed to just be changing from pywintypes23 -> 24

But MSVC did something strange with the configuration.  So I removed all
the MIPS etc configs - but still the diff remains strangely huge.
Removing these configs is the right thing, so I am leaving it!


Index: PyWinTypes.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/PyWinTypes.dsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PyWinTypes.dsp	6 Apr 2003 23:49:52 -0000	1.14
--- PyWinTypes.dsp	31 Jul 2003 02:14:35 -0000	1.15
***************
*** 3,9 ****
  # ** DO NOT EDIT **
  
- # TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102
- # TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02
- # TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
--- 3,6 ----
***************
*** 23,32 ****
[...1760 lines suppressed...]
- 	".\uncobject.h"\
- 	".\upleobject.h"\
- 	".\val.h"\
- 	".\ydebug.h"\
- 	".\yerrors.h"\
- 	".\yfpe.h"\
- 	".\ymalloc.h"\
- 	".\yproto.h"\
- 	".\ysmodule.h"\
- 	".\ystate.h"\
- 	".\ython.h"\
- 	".\ythonrun.h"\
- 	".\yWinTypes.h"\
- 	
- 
- !ENDIF 
- 
  # End Source File
  # End Target
--- 169,172 ----

[pywin32-checkins] pywin32/win32/src PySECURITY_DESCRIPTOR.cpp,1.8,1.9

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30686

Modified Files:
	PySECURITY_DESCRIPTOR.cpp 
Log Message:
Fix memory leaks - from Roger Upole, from:
[ 732056 ] Fix memory leak in security descriptor functions


Index: PySECURITY_DESCRIPTOR.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PySECURITY_DESCRIPTOR.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PySECURITY_DESCRIPTOR.cpp	10 Mar 2003 01:18:16 -0000	1.8
--- PySECURITY_DESCRIPTOR.cpp	29 Jul 2003 06:47:58 -0000	1.9
***************
*** 50,58 ****
  void FreeAbsoluteSD(PSECURITY_DESCRIPTOR psd)
  {
! 		FreeSD_DACL(psd);
! 		FreeSD_SACL(psd);
! 		FreeSD_Owner(psd);
! 		FreeSD_Group(psd);
! 		free(psd);
  }
  
--- 50,58 ----
  void FreeAbsoluteSD(PSECURITY_DESCRIPTOR psd)
  {
! 	FreeSD_DACL(psd);
! 	FreeSD_SACL(psd);
! 	FreeSD_Owner(psd);
! 	FreeSD_Group(psd);
! 	free(psd);
  }
  
***************
*** 162,192 ****
  {
  	PSECURITY_DESCRIPTOR psd_absolute = NULL;
! 	PACL pdacl;
! 	PACL psacl;
! 	PSID powner;
! 	PSID pgroup;
!     DWORD origsdsize = SECURITY_DESCRIPTOR_MIN_LENGTH;
! 	DWORD origdaclsize = sizeof(ACL);
! 	DWORD origsaclsize = sizeof(ACL);
! 	DWORD origownersize = sizeof(SID);
! 	DWORD origgroupsize = sizeof(SID);
! 	DWORD sdsize,daclsize,saclsize,ownersize,groupsize;
! 
! 	sdsize = origsdsize;
! 	daclsize = origdaclsize;
! 	saclsize = origsaclsize;
! 	ownersize = origownersize;
! 	groupsize = origgroupsize;
  
  	psd_absolute = malloc(sdsize);
  	ZeroMemory(psd_absolute,sdsize);
  	::InitializeSecurityDescriptor(psd_absolute,SECURITY_DESCRIPTOR_REVISION);
- 	pdacl =  (ACL *)malloc(daclsize);
- 	psacl =  (ACL *)malloc(saclsize);
- 	powner = malloc(ownersize);
- 	pgroup = malloc(groupsize);
  	BOOL resize = FALSE;
  
!     if(MakeAbsoluteSD(psd_relative, psd_absolute, &sdsize,
  					pdacl, &daclsize, psacl, &saclsize,
  					powner, &ownersize, pgroup, &groupsize)){
--- 162,182 ----
  {
  	PSECURITY_DESCRIPTOR psd_absolute = NULL;
! 	PACL pdacl = NULL;
! 	PACL psacl = NULL;
! 	PSID powner = NULL;
! 	PSID pgroup = NULL;
! 	DWORD sdsize = SECURITY_DESCRIPTOR_MIN_LENGTH;
! 	DWORD origsdsize = SECURITY_DESCRIPTOR_MIN_LENGTH;
! 	DWORD daclsize = 0;
! 	DWORD saclsize = 0;
! 	DWORD ownersize = 0;
! 	DWORD groupsize = 0;
  
  	psd_absolute = malloc(sdsize);
  	ZeroMemory(psd_absolute,sdsize);
  	::InitializeSecurityDescriptor(psd_absolute,SECURITY_DESCRIPTOR_REVISION);
  	BOOL resize = FALSE;
  
! 	if(MakeAbsoluteSD(psd_relative, psd_absolute, &sdsize,
  					pdacl, &daclsize, psacl, &saclsize,
  					powner, &ownersize, pgroup, &groupsize)){
***************
*** 200,221 ****
  		::InitializeSecurityDescriptor(psd_absolute,SECURITY_DESCRIPTOR_REVISION);
  		}
! 	if (daclsize > origdaclsize){
  		resize = TRUE;
- 		free(pdacl);
  		pdacl =  (ACL *)malloc(daclsize);
  		}
! 	if (saclsize > origsaclsize){
  		resize = TRUE;
- 		free(psacl);
  		psacl = (ACL *)malloc(saclsize);
  		}
! 	if (ownersize > origownersize){
  		resize = TRUE;
- 		free(powner);
  		powner = (SID *)malloc(ownersize);
  		}
! 	if (groupsize > origgroupsize){
  		resize = TRUE;
- 		free(pgroup);
  		pgroup = (SID *)malloc(groupsize);
  		}
--- 190,207 ----
  		::InitializeSecurityDescriptor(psd_absolute,SECURITY_DESCRIPTOR_REVISION);
  		}
! 	if (daclsize > 0){
  		resize = TRUE;
  		pdacl =  (ACL *)malloc(daclsize);
  		}
! 	if (saclsize > 0){
  		resize = TRUE;
  		psacl = (ACL *)malloc(saclsize);
  		}
! 	if (ownersize > 0){
  		resize = TRUE;
  		powner = (SID *)malloc(ownersize);
  		}
! 	if (groupsize > 0){
  		resize = TRUE;
  		pgroup = (SID *)malloc(groupsize);
  		}
***************
*** 229,233 ****
  					powner, &ownersize, pgroup, &groupsize)){
  		*ppsd_absolute = psd_absolute;
- 		DWORD sdsize=::GetSecurityDescriptorLength(psd_absolute);
  		return TRUE;
  		}
--- 215,218 ----
***************
*** 267,271 ****
  	if (!::InitializeSecurityDescriptor(psd, SECURITY_DESCRIPTOR_REVISION))
  		return PyWin_SetAPIError("InitializeSecurityDescriptor");
!     // above always returns in absolute format, change back to self-relative
  	if (_MakeSelfRelativeSD(psd,&psd_relative))
  		if (This->SetSD(psd_relative))
--- 252,256 ----
  	if (!::InitializeSecurityDescriptor(psd, SECURITY_DESCRIPTOR_REVISION))
  		return PyWin_SetAPIError("InitializeSecurityDescriptor");
! 	// above always returns in absolute format, change back to self-relative
  	if (_MakeSelfRelativeSD(psd,&psd_relative))
  		if (This->SetSD(psd_relative))
***************
*** 285,289 ****
  	PySECURITY_DESCRIPTOR *This = (PySECURITY_DESCRIPTOR *)self;
  	PSECURITY_DESCRIPTOR psd=NULL, psd_relative=NULL;
- 	DWORD sdsize=0,required_size=0,aclsize=0;
  	BOOL bDaclPresent, bDaclDefaulted;
  	PACL pdacl;
--- 270,273 ----
***************
*** 296,300 ****
  	// @pyparm int|bDaclDefaulted||A flag indicating if the SE_DACL_DEFAULTED flag should be set.
  
!     PSECURITY_DESCRIPTOR obpsd = This->GetSD();
  	// will alway be in relative format in python object, convert to absolute
  	if (!_MakeAbsoluteSD(obpsd, &psd))
--- 280,284 ----
  	// @pyparm int|bDaclDefaulted||A flag indicating if the SE_DACL_DEFAULTED flag should be set.
  
! 	PSECURITY_DESCRIPTOR obpsd = This->GetSD();
  	// will alway be in relative format in python object, convert to absolute
  	if (!_MakeAbsoluteSD(obpsd, &psd))
***************
*** 336,340 ****
  	PACL psacl;
  	BOOL bSaclPresent, bSaclDefaulted;
- 	DWORD sdsize=0,required_size=0,aclsize=0;
  	// @pyparm int|bSaclPresent||A flag indicating if SACL is to be used. If false, last 2 parms are ignored.
  	// @pyparm <o PyACL>|SACL||The SACL to set in the security descriptor
--- 320,323 ----
***************
*** 345,349 ****
  		return NULL;
  
!     PSECURITY_DESCRIPTOR obpsd = This->GetSD();
  	if (!_MakeAbsoluteSD(obpsd,&psd))
  		goto done;
--- 328,332 ----
  		return NULL;
  
! 	PSECURITY_DESCRIPTOR obpsd = This->GetSD();
  	if (!_MakeAbsoluteSD(obpsd,&psd))
  		goto done;
***************
*** 411,415 ****
  	PySECURITY_DESCRIPTOR *This = (PySECURITY_DESCRIPTOR *)self;
  	PSID NewOwnerSid = NULL;
! 	PySID *obNewOwnerSid = NULL;
  	PyObject *ret = NULL;
  	if (!PyArg_ParseTuple(args, "Oi:SetSecurityDescriptorOwner", &obNewOwnerSid, &bOwnerDefaulted))
--- 394,398 ----
  	PySECURITY_DESCRIPTOR *This = (PySECURITY_DESCRIPTOR *)self;
  	PSID NewOwnerSid = NULL;
! 	PyObject *obNewOwnerSid = NULL;
  	PyObject *ret = NULL;
  	if (!PyArg_ParseTuple(args, "Oi:SetSecurityDescriptorOwner", &obNewOwnerSid, &bOwnerDefaulted))
***************
*** 433,437 ****
  
  	done:
! 	if (psd){
  		FreeSD_DACL(psd);
  		FreeSD_SACL(psd);
--- 416,420 ----
  
  	done:
! 	if (psd != NULL){
  		FreeSD_DACL(psd);
  		FreeSD_SACL(psd);
***************
*** 440,444 ****
  		free(psd);
  		}
! 	if (psd_relative)
  		free(psd_relative);
  	Py_XINCREF(ret);
--- 423,427 ----
  		free(psd);
  		}
! 	if (psd_relative != NULL)
  		free(psd_relative);
  	Py_XINCREF(ret);
***************
*** 456,460 ****
  	PSECURITY_DESCRIPTOR psd_relative = NULL;
  	PSID NewGroupSid = NULL;
! 	PySID *obNewGroupSid = NULL;
  	PyObject *ret = NULL;
  
--- 439,443 ----
  	PSECURITY_DESCRIPTOR psd_relative = NULL;
  	PSID NewGroupSid = NULL;
! 	PyObject *obNewGroupSid = NULL;
  	PyObject *ret = NULL;
  
***************
*** 478,482 ****
  
  	done:
! 	if (psd){
  		FreeSD_DACL(psd);
  		FreeSD_SACL(psd);
--- 461,465 ----
  
  	done:
! 	if (psd != NULL){
  		FreeSD_DACL(psd);
  		FreeSD_SACL(psd);
***************
*** 485,489 ****
  		// *Don't* free group, will still be owned by passed in PySID
  		}
! 	if (psd_relative)
  		free(psd_relative);
  	Py_XINCREF(ret);
--- 468,472 ----
  		// *Don't* free group, will still be owned by passed in PySID
  		}
! 	if (psd_relative != NULL)
  		free(psd_relative);
  	Py_XINCREF(ret);
***************
*** 591,595 ****
  	if (!::GetSecurityDescriptorControl(psd, &Control, 	&dwRevision))
  		return PyWin_SetAPIError("GetSecurityDescriptorControl");
!     return Py_BuildValue("(ii)", Control, dwRevision);
  }
  
--- 574,578 ----
  	if (!::GetSecurityDescriptorControl(psd, &Control, 	&dwRevision))
  		return PyWin_SetAPIError("GetSecurityDescriptorControl");
! 	return Py_BuildValue("(ii)", Control, dwRevision);
  }