[pywin32-checkins] /hgroot/pywin32/pywin32: 3 new changesets

[<pyw...@li...>]

changeset 609dd1df35c5 in /hgroot/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgroot/pywin32/pywin32?cmd=changeset;node=609dd1df35c5
summary: fix a couple of build issues on earlier python versions

changeset 1bf9216a6469 in /hgroot/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgroot/pywin32/pywin32?cmd=changeset;node=1bf9216a6469
summary: Add helper batch files used to build the world

changeset 713ac73c22e5 in /hgroot/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgroot/pywin32/pywin32?cmd=changeset;node=713ac73c22e5
summary: Fix build problem, bump build number to 219, and more changes

diffstat:

 CHANGES.txt             |  21 +++++++++++++++++-
 build_all.bat           |  42 ++++++++++++++++++++++++++++++++++++++
 make_all.bat            |  54 +++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py                |  11 +++++++--
 win32/src/win32evtlog.i |   2 +
 5 files changed, 125 insertions(+), 5 deletions(-)

diffs (204 lines):

diff -r ebe979332110 -r 713ac73c22e5 CHANGES.txt
--- a/CHANGES.txt	Thu May 01 14:10:35 2014 -0600
+++ b/CHANGES.txt	Sat May 03 17:32:59 2014 +1000
@@ -9,7 +9,8 @@
  * win32com.mapi
    Addded outlook interface IConverterSession with methods MIMEToMAPI, MAPIToMIMEStm, and SetAdrBook
    Added method OpenStreamOnFile (Nick Czeczulin)
- 
+   Ignore PT_MV_TSTRING along with PT_TSTRING (Nick Czeczulin) 
+
  * Conversions from a Python object to a variant now does a better job at
    deciding what variant type to use, taking into account the size and sign of
    the value (Stefan Schukat via patch #127)
@@ -32,8 +33,18 @@
 * Fix issue implementing COM objects from within a virtualenv (Kevin Smyth 
   via issue #3597965)
 
+* Fix some issues using decimal objects with Python 3.3 and later (rupole)
+
+* Add a counterpart to VB's Nothing, from patch 3609027 by Stefan Schukat
+
+* win32api
+    Handle REG_QWORD (64-bit ints) (rupole)
+    Add GetEnvironmentVariableW and SetEnvironmentVariableW (rupole)
+    Fix function pointer check for win32api.GetNativeSystemInfo (bug#665)
+
 * win32com.shell
 	Add interfaces IFileOperation and IFileOperationProgressSink
+    Add SHParseDisplayName (feature req #3585998) (rupole)
 
 * win32com.propsys
 	Add interfaces IPropertyChange, IPropertyChangeArray, and IObjectWithPropertyKey
@@ -43,11 +54,17 @@
 	Add functions and objects for handling certificates and certificate stores
 
 * win32gui
-	Add RegisterHotKey
+	Add RegisterHotKey (rupole)
 
 * win32evtlog
 	Add several more Evt* functions (Vista+ event log API)
 
+* win32prociess
+  Add EnumProcessModulesEx (feature request 3608155) (rupole)
+
+* pythonwin
+  Fix a hang using the tools menu
+
 Since build 217:
 ----------------
 * mapiutil.py GetPropTagName has been modified to return the fully qualified
diff -r ebe979332110 -r 713ac73c22e5 build_all.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build_all.bat	Sat May 03 17:32:59 2014 +1000
@@ -0,0 +1,42 @@
+rem Sadly Python 2.5 requires an earlier MSSDK.
+set mssdk=c:\mssdk\6.0
+py -2.5 setup.py -q build
+@if errorlevel 1 goto failed
+
+rem And the rest work with 7.1
+set mssdk=c:\mssdk\7.1
+py -2.6-32 setup.py -q build
+@if errorlevel 1 goto failed
+py -2.6 setup.py -q build
+@if errorlevel 1 goto failed
+py -2.7-32 setup.py -q build
+@if errorlevel 1 goto failed
+py -2.7 setup.py -q build
+@if errorlevel 1 goto failed
+rem py3k
+py -3.1-32 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.1 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.2-32 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.2 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.3-32 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.3 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.4-32 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.4 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.5-32 setup3.py -q build
+@if errorlevel 1 goto failed
+py -3.5 setup3.py -q build
+@if errorlevel 1 goto failed
+
+goto xit
+:failed
+@echo Oops - failed!
+goto xit
+:xit
\ No newline at end of file
diff -r ebe979332110 -r 713ac73c22e5 make_all.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make_all.bat	Sat May 03 17:32:59 2014 +1000
@@ -0,0 +1,54 @@
+@if "%1"=="quick" goto quick
+@if "%1"=="already_built" goto already_built
+if exist build\. rm -rf build
+if exist build\. goto couldnt_rm
+cd autoduck
+call make.bat
+@if errorlevel 1 goto failed
+cd ..
+:quick
+call build_all.bat
+:already_built
+rem Now the binaries.
+
+rem Yuck - 2to3 hackery - must nuke bdist dirs as it may hold py3x syntax.
+if exist build/bdist.win32/. rm -rf build/bdist.win32
+if exist build/bdist.win-amd64/. rm -rf build/bdist.win-amd64
+py -2.7-32 setup.py -q sdist
+py -2.6-32 setup.py -q bdist_wininst --target-version=2.5 --skip-build
+py -2.6-32 setup.py -q bdist_wininst --target-version=2.6 --skip-build
+py -2.6-32 setup.py -q bdist_wininst --target-version=2.6 --skip-build --plat-name=win-amd64 
+py -2.7-32 setup.py -q bdist_wininst --target-version=2.7 --skip-build
+py -2.7-32 setup.py -q bdist_wininst --target-version=2.7 --skip-build --plat-name=win-amd64 
+
+rem Just incase - re-nuke bdist dirs so 2to3 always runs.
+if exist build/bdist.win32/. rm -rf build/bdist.win32
+if exist build/bdist.win-amd64/. rm -rf build/bdist.win-amd64
+
+py -3.1-32 setup3.py -q bdist_wininst --target-version=3.1 --skip-build
+py -3.1-32 setup3.py -q bdist_wininst --target-version=3.1 --skip-build --plat-name=win-amd64 
+
+py -3.2-32 setup3.py -q bdist_wininst --target-version=3.2 --skip-build
+py -3.2-32 setup3.py -q bdist_wininst --target-version=3.2 --skip-build --plat-name=win-amd64 
+
+py -3.3-32 setup3.py -q bdist_wininst --target-version=3.3 --skip-build
+py -3.3-32 setup3.py -q bdist_wininst --target-version=3.3 --skip-build --plat-name=win-amd64 
+
+py -3.4-32 setup3.py -q bdist_wininst --target-version=3.4 --skip-build
+py -3.4-32 setup3.py -q bdist_wininst --target-version=3.4 --skip-build --plat-name=win-amd64 
+
+py -3.5-32 setup3.py -q bdist_wininst --target-version=3.5 --skip-build
+py -3.5-32 setup3.py -q bdist_wininst --target-version=3.5 --skip-build --plat-name=win-amd64 
+
+rem And nuke the dirs one more time :)
+if exist build/bdist.win32/. rm -rf build/bdist.win32
+if exist build/bdist.win-amd64/. rm -rf build/bdist.win-amd64
+
+@goto xit
+:couldnt_rm
+@echo Could not remove the build directory!
+goto xit
+:failed
+@echo Oops - failed!
+goto xit
+:xit
\ No newline at end of file
diff -r ebe979332110 -r 713ac73c22e5 setup.py
--- a/setup.py	Thu May 01 14:10:35 2014 -0600
+++ b/setup.py	Sat May 03 17:32:59 2014 +1000
@@ -1,4 +1,4 @@
-build_id="218.5" # may optionally include a ".{patchno}" suffix.
+build_id="219" # may optionally include a ".{patchno}" suffix.
 # Putting buildno at the top prevents automatic __doc__ assignment, and
 # I *want* the build number at the top :)
 __doc__="""This is a distutils setup-script for the pywin32 extensions
@@ -544,9 +544,14 @@
         sdk_install_dir = None
         libs = kw.get("libraries", "")
         keyname = "SOFTWARE\Microsoft\Exchange\SDK"
+        flags = _winreg.KEY_READ
+        try:
+            flags |= _winreg.KEY_WOW64_32KEY
+        except AttributeError:
+            pass # this version doesn't support 64 bits, so must already be using 32bit key.
         for root in _winreg.HKEY_LOCAL_MACHINE, _winreg.HKEY_CURRENT_USER:
             try:
-                keyob = _winreg.OpenKey(root, keyname, 0, _winreg.KEY_READ | _winreg.KEY_WOW64_32KEY)
+                keyob = _winreg.OpenKey(root, keyname, 0, flags)
                 value, type_id = _winreg.QueryValueEx(keyob, "INSTALLDIR")
                 if type_id == _winreg.REG_SZ:
                     sdk_install_dir = value
@@ -2562,7 +2567,7 @@
                 'isapi/test/*.py',
                 'isapi/test/*.txt',
                 'adodbapi/*.txt',
-                'adodbapi/test/*.py'
+                'adodbapi/test/*.py',
                 'adodbapi/examples/*.py'
         ]) +
                 # The headers and .lib files
diff -r ebe979332110 -r 713ac73c22e5 win32/src/win32evtlog.i
--- a/win32/src/win32evtlog.i	Thu May 01 14:10:35 2014 -0600
+++ b/win32/src/win32evtlog.i	Sat May 03 17:32:59 2014 +1000
@@ -1742,7 +1742,9 @@
 #define EvtChannelPublishingConfigClockType EvtChannelPublishingConfigClockType
 #define EvtChannelPublishingConfigSidType EvtChannelPublishingConfigSidType
 #define EvtChannelPublisherList EvtChannelPublisherList
+#ifdef EvtChannelPublishingConfigFileMax // this is only in SDK versions 7 and up
 #define EvtChannelPublishingConfigFileMax EvtChannelPublishingConfigFileMax
+#endif
 #define EvtChannelConfigPropertyIdEND EvtChannelConfigPropertyIdEND
 
 // Login type used with EvtOpenSession