[commit] r2707 - trunk/Tests/GPyUnit/util

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Oct 30 15:58:13 2017
New Revision: 2707

Log:
Tests: use in-proc COM if testing 64bit GME under 64bit Python

Modified:
   trunk/Tests/GPyUnit/util/__init__.py

Modified: trunk/Tests/GPyUnit/util/__init__.py
==============================================================================
--- trunk/Tests/GPyUnit/util/__init__.py	Mon Oct 30 15:58:10 2017	(r2706)
+++ trunk/Tests/GPyUnit/util/__init__.py	Mon Oct 30 15:58:13 2017	(r2707)
@@ -12,15 +12,19 @@
 
 def DispatchEx(progid):
     import win32com.client
+    import platform
 
     CLSCTX_ALL = 23
+    CLSCTX_INPROC_SERVER = 1
     CLSCTX_LOCAL_SERVER = 4
     CLSCTX_ACTIVATE_32_BIT_SERVER = 0x40000
     CLSCTX_ACTIVATE_64_BIT_SERVER = 0x80000
     if _opts.Dispatch_x64:
-        return win32com.client.DispatchEx(progid, clsctx=CLSCTX_LOCAL_SERVER | CLSCTX_ACTIVATE_64_BIT_SERVER)
+        if '64bit' not in platform.architecture() or progid == "GME.Application":
+            return win32com.client.DispatchEx(progid, clsctx=CLSCTX_LOCAL_SERVER | CLSCTX_ACTIVATE_64_BIT_SERVER)
+        else:
+            return win32com.client.DispatchEx(progid, clsctx=CLSCTX_INPROC_SERVER)
     else:
-        import platform
         # FIXME: does this work with 64bit Jython?
         if platform.system() != 'Java' and '64bit' in platform.architecture():
             return win32com.client.DispatchEx(progid, clsctx=CLSCTX_LOCAL_SERVER | CLSCTX_ACTIVATE_32_BIT_SERVER)