admin/hakril-PythonForWindows
1
0
Fork 0
mirror of https://github.com/hakril/PythonForWindows synced 2026-06-08 14:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Passed process relation API to Wide functions

Browse Source
This commit is contained in:
hakril
2020-07-30 14:15:52 +02:00
parent 7883e5f189
commit 9eb4405cce
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/winobject/process.py
+13 -14
View File
@@ -29,7 +29,7 @@ from windows.winobject import apisetmap
from windows.winobject import token
from windows import security
from windows.pycompat import raw_encode, raw_decode, basestring
from windows.pycompat import raw_encode, raw_decode, basestring, urepr_encode
TimeInfo = namedtuple("TimeInfo", ["creation", "exit", "kernel", "user"])
"""Time information about a process"""
@@ -702,7 +702,7 @@ class CurrentProcess(Process):
:rtype: :class:`LoadedModule`
"""
dllbase = winproxy.LoadLibraryA(dll_path)
dllbase = winproxy.LoadLibraryW(dll_path)
return [m for m in self.peb.modules if m.baseaddr == dllbase][0]
def execute(self, code, parameter=0):
@@ -958,7 +958,7 @@ class WinThread(Thread):
owner_name = owner.name
except EnvironmentError:
owner_name = "!cannot-retrieve-owner-name"
return '<{0} {1} owner "{2}" at {3}>'.format(self.__class__.__name__, self.tid, owner_name, hex(id(self)))
return urepr_encode(u'<{0} {1} owner "{2}" at {3}>'.format(self.__class__.__name__, self.tid, owner_name, hex(id(self))))
@staticmethod
@@ -1001,9 +1001,8 @@ class WinProcess(Process):
return WinProcess(handle=handle)
@classmethod
def _from_PROCESSENTRY32(cls, entry):
# Temporary encoded name
name = entry.szExeFile.encode(errors="backslashreplace")
def _from_PROCESSENTRY32W(cls, entry):
name = entry.szExeFile
pid = entry.th32ProcessID
ppid = entry.th32ParentProcessID
return cls(pid=pid, name=name, ppid=ppid)
@@ -1015,10 +1014,10 @@ class WinProcess(Process):
:type: :class:`str`
"""
buffer = ctypes.c_buffer(0x1024)
rsize = winproxy.GetProcessImageFileNameA(self.limited_handle, buffer) # Use a syscall and not some remote process reading
# GetProcessImageFileNameA returns the fullpath
return buffer[:rsize].decode().split("\\")[-1]
buffer = ctypes.create_unicode_buffer(0x1024)
rsize = winproxy.GetProcessImageFileNameW(self.limited_handle, buffer)
# GetProcessImageFileNameW returns the fullpath
return buffer[:rsize].split("\\")[-1]
@utils.fixedpropety
def pid(self):
@@ -1035,13 +1034,13 @@ class WinProcess(Process):
try:
exe_name = self.name
except WindowsError as e:
exe_name = "!cannot-retrieve-name"
exe_name = u"!cannot-retrieve-name"
try:
if self.is_exit:
return '<{0} "{1}" pid {2} (DEAD) at {3}>'.format(self.__class__.__name__, exe_name, self.pid, hex(id(self)))
return urepr_encode(u'<{0} "{1}" pid {2} (DEAD) at {3}>'.format(self.__class__.__name__, exe_name, self.pid, hex(id(self))))
except WindowsError: # Cannot open process
pass
return '<{0} "{1}" pid {2} at {3}>'.format(self.__class__.__name__, exe_name, self.pid, hex(id(self)))
return urepr_encode(u'<{0} "{1}" pid {2} at {3}>'.format(self.__class__.__name__, exe_name, self.pid, hex(id(self))))
def virtual_alloc(self, size, prot=PAGE_EXECUTE_READWRITE, addr=None):
"""Allocate memory in the process
@@ -1260,7 +1259,7 @@ class LoadedModule(LDR_DATA_TABLE_ENTRY):
return self.FullDllName.str.lower()
def __repr__(self):
return '<{0} "{1}" at {2}>'.format(self.__class__.__name__, self.name, hex(id(self)))
return urepr_encode(u'<{0} "{1}" at {2}>'.format(self.__class__.__name__, self.name, hex(id(self))))
@property
def pe(self):