Merge pull request #209 from forderud/tlb-clsid

Extend GetModule with CLSID support

Author: vasily-v-ryabov

comtypes/client/_generate.py

@@ -37,8 +37,8 @@ def GetModule(tlib):
     """Create a module wrapping a COM typelibrary on demand.
 
     'tlib' must be an ITypeLib COM pointer instance, the pathname of a
-    type library, or a tuple/list specifying the arguments to a
-    comtypes.typeinfo.LoadRegTypeLib call:
+    type library, a COM CLSID GUID, or a tuple/list specifying the
+    arguments to a comtypes.typeinfo.LoadRegTypeLib call:
 
       (libid, wMajorVerNum, wMinorVerNum, lcid=0)
 
@@ -93,6 +93,19 @@ def GetModule(tlib):
         logger.debug("GetModule(%s)", tlib)
         pathname = tlib
         tlib = comtypes.typeinfo.LoadTypeLibEx(tlib)
+    elif isinstance(tlib, comtypes.GUID):
+        # tlib contain a clsid
+        clsid = str(tlib)
+        
+        # lookup associated typelib in registry
+        import _winreg
+        with _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, r"CLSID\%s\TypeLib" % clsid, 0, _winreg.KEY_READ) as key:
+            typelib = _winreg.EnumValue(key, 0)[1]
+        with _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, r"CLSID\%s\Version" % clsid, 0, _winreg.KEY_READ) as key:
+            version = _winreg.EnumValue(key, 0)[1].split(".")
+        
+        logger.debug("GetModule(%s)", typelib)
+        tlib = comtypes.typeinfo.LoadRegTypeLib(comtypes.GUID(typelib), int(version[0]), int(version[1]), 0)
     elif isinstance(tlib, (tuple, list)):
         # sequence containing libid and version numbers
         logger.debug("GetModule(%s)", (tlib,))

comtypes/test/test_client.py

@@ -26,6 +26,10 @@ def test_clsid_string(self):
         comtypes.client.CreateObject(unicode(Scripting.Dictionary._reg_clsid_))
         comtypes.client.CreateObject(str(Scripting.Dictionary._reg_clsid_))
 
+    def test_GetModule_clsid(self):
+        clsid = comtypes.GUID.from_progid("MediaPlayer.MediaPlayer")
+        tlib = comtypes.client.GetModule(clsid)
+
     def test_remote(self):
         ie = comtypes.client.CreateObject("InternetExplorer.Application",
                                           machine="localhost")