From b6f57b8342abf82b7852c5ff3fb8f470da741453 Mon Sep 17 00:00:00 2001
From: hakril <project@hakril.net>
Date: Sat, 24 Nov 2018 21:44:46 +0100
Subject: [PATCH] Code now use renamed/improved windows.com.Variant

---
 samples/com/icallinterceptor.py     | 2 +-
 windows/remotectypes.py             | 2 +-
 windows/winobject/network.py        | 2 +-
 windows/winobject/task_scheduler.py | 8 ++------
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/samples/com/icallinterceptor.py b/samples/com/icallinterceptor.py
index 2ad190b..4e9708f 100644
--- a/samples/com/icallinterceptor.py
+++ b/samples/com/icallinterceptor.py
@@ -27,7 +27,7 @@ class MySink(windows.com.COMImplementation):
         frame.GetNames(ifname, methodname)
         print("Catching call to <{0}.{1}>".format(ifname.value, methodname.value))
         param0info = gdef.CALLFRAMEPARAMINFO()
-        param0 = windows.com.ImprovedVariant()
+        param0 = windows.com.Variant()
         frame.GetParamInfo(0, param0info)
         frame.GetParam(0, param0)
         print("Info about parameters 0:")
diff --git a/windows/remotectypes.py b/windows/remotectypes.py
index 9c2aa6b..decbe21 100644
--- a/windows/remotectypes.py
+++ b/windows/remotectypes.py
@@ -122,7 +122,7 @@ class RemoteWCharP(RemotePtr, ctypes.c_char_p):
         while True:
             try:
                 x = self.read_memory(addr + readden, read_size)
-            except winproxy.Kernel32Error as e:
+            except winproxy.WinproxyError as e:
                 if read_size == 2:
                     raise
                 # handle read_wstring at end of page
diff --git a/windows/winobject/network.py b/windows/winobject/network.py
index e38e597..fe1cd83 100644
--- a/windows/winobject/network.py
+++ b/windows/winobject/network.py
@@ -191,7 +191,7 @@ class Firewall(cominterfaces.INetFwPolicy2):
         unknw.QueryInterface(pVariant.IID, pVariant)
 
         count = gdef.ULONG()
-        var = windows.com.ImprovedVariant()
+        var = windows.com.Variant()
 
         rules = []
         for i in range(nb_rules.value):
diff --git a/windows/winobject/task_scheduler.py b/windows/winobject/task_scheduler.py
index b70d3b0..55ce553 100644
--- a/windows/winobject/task_scheduler.py
+++ b/windows/winobject/task_scheduler.py
@@ -30,10 +30,6 @@ class TaskCollectionType(object):
 
     def get_item(self, index):
         """Return elements nb ``index``. Collection index starts at 1"""
-        # TODO: ImprovedVariant.from_int()
-        # vindex = windows.com.ImprovedVariant()
-        # vindex.vt = gdef.VT_I4
-        # vindex._VARIANT_NAME_3.lVal = index
         if index == 0:
             raise IndexError("<{0}> Index start as 1".format(type(self).__name__))
         index = self.get_index(index)
@@ -214,7 +210,7 @@ class Task(gdef.IRegisteredTask):
 class TaskCollection(gdef.IRegisteredTaskCollection, TaskCollectionType):
     ITEM_TYPE = Task
     def get_index(self, index):
-        vindex = windows.com.ImprovedVariant()
+        vindex = windows.com.Variant()
         vindex.vt = gdef.VT_I4
         vindex._VARIANT_NAME_3.lVal = index
         return vindex
@@ -343,7 +339,7 @@ class TaskFolderCollection(gdef.ITaskFolderCollection, TaskCollectionType):
     ITEM_TYPE = TaskFolder
 
     def get_index(self, index):
-        vindex = windows.com.ImprovedVariant()
+        vindex = windows.com.Variant()
         vindex.vt = gdef.VT_I4
         vindex._VARIANT_NAME_3.lVal = index
         return vindex