Code now use renamed/improved windows.com.Variant

This commit is contained in:
hakril
2018-11-24 21:44:46 +01:00
parent cf6c813002
commit b6f57b8342
4 changed files with 5 additions and 9 deletions
+1 -1
View File
@@ -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:")
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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):
+2 -6
View File
@@ -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