From 70d330961a2775fdec2935b8bbbf0822d9d92eb3 Mon Sep 17 00:00:00 2001
From: Clement Rouault <project@hakril.net>
Date: Wed, 12 Apr 2017 17:11:57 +0200
Subject: [PATCH] exception reraised by registry have a winerror + remove dead
 code windows windows.com

---
 windows/com.py                | 56 -----------------------------------
 windows/winobject/registry.py |  6 ++--
 2 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/windows/com.py b/windows/com.py
index c9d34c1..3581a6d 100644
--- a/windows/com.py
+++ b/windows/com.py
@@ -15,16 +15,6 @@ from windows.generated_def.interfaces import generate_IID, IID
 # Simple raw -> UUID
 # "-".join("{:02X}".format(c) for c in struct.unpack("<IHHHBBBBBB", x))
 
-# Simple Implem to create COM Interface in Python (COM -> Python)
-def create_c_callable(func, types, keepalive=[]):
-    func_type = ctypes.WINFUNCTYPE(*types)
-    c_callable = func_type(func)
-    # Dirty, but the other method require native code execution
-    c_callback_addr = ctypes.c_ulong.from_address(id(c_callable._objects['0']) + 3 * ctypes.sizeof(ctypes.c_void_p)).value
-    keepalive.append(c_callable)
-    return c_callback_addr
-
-
 def init():
     t = winproxy.CoInitializeEx()
     if t:
@@ -130,49 +120,3 @@ def create_instance(clsiid, targetinterface, custom_iid=None, context=CLSCTX_INP
     if custom_iid is None:
         custom_iid = targetinterface.IID
     return winproxy.CoCreateInstance(byref(clsiid), None, context, byref(custom_iid), byref(targetinterface))
-
-
-class ComVtable(object):
-    # Name, types
-    _funcs_ = [("QueryInterface", [ctypes.HRESULT, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]),
-               ("AddRef", [ctypes.HRESULT, ctypes.c_void_p]),
-               ("Release", [ctypes.HRESULT, ctypes.c_void_p])
-               ]
-
-    def __init__(self, **implem_overwrite):
-        self.implems = []
-        self.vtable = self._create_vtable(**implem_overwrite)
-        self.vtable_pointer = ctypes.pointer(self.vtable)
-        self._as_parameter_ = ctypes.addressof(self.vtable_pointer)
-
-    def _create_vtable(self, **implem_overwrite):
-        vtables_names = [x[0] for x in self._funcs_]
-        non_expected_args = [func_name for func_name in implem_overwrite if func_name not in vtables_names]
-        if non_expected_args:
-            raise ValueError("Non expected function : {0}".format(non_expected_args))
-
-        for name, types in self._funcs_:
-            func_implem = implem_overwrite.get(name)
-            if func_implem is None:
-                if hasattr(self, name):
-                    func_implem = getattr(self, name)
-                else:
-                    raise ValueError("Missing implementation for function <{0}>".format(name))
-
-            if isinstance(func_implem, (int, long)):
-                self.implems.append(func_implem)
-            else:
-                self.implems.append(create_c_callable(func_implem, types))
-
-        class Vtable(ctypes.Structure):
-            _fields_ = [(name, ctypes.c_void_p) for name in vtables_names]
-        return Vtable(*self.implems)
-
-    def QueryInterface(self, *args):
-        return 1
-
-    def AddRef(self, *args):
-        return 1
-
-    def Release(self, *args):
-        return 0
\ No newline at end of file
diff --git a/windows/winobject/registry.py b/windows/winobject/registry.py
index 1d2de10..61da02e 100644
--- a/windows/winobject/registry.py
+++ b/windows/winobject/registry.py
@@ -43,7 +43,7 @@ class PyHKey(object):
         try:
             self._phkey = _winreg.OpenKeyEx(self.surkey.phkey, self.name, 0, self.sam)
         except WindowsError as e:
-            raise WindowsError("Could not open registry key <{0}> ({1})".format(self.fullname, e))
+            raise WindowsError(e.winerror, "Could not open registry key <{0}> ({1})".format(self.fullname, e.strerror))
         return self._phkey
 
 
@@ -165,8 +165,8 @@ class Registry(object):
     def __call__(self, name, sam=KEY_READ):
         """Get a registry key::
 
-            registry[r"HKEY_LOCAL_MACHINE\\Software"]
-            registry["HKEY_LOCAL_MACHINE"]["Software"]
+            registry(r"HKEY_LOCAL_MACHINE\\Software")
+            registry("HKEY_LOCAL_MACHINE")("Software")
 
         :rtype: :class:`PyHKey`
         """