diff --git a/pywxdump/api/api.py b/pywxdump/api/api.py index 6a8fd70..70f4ccd 100644 --- a/pywxdump/api/api.py +++ b/pywxdump/api/api.py @@ -13,10 +13,7 @@ import re import time import shutil import sys -if sys.platform == "win32": - import pythoncom -else: - pythoncom = None +pythoncom = __import__('pythoncom') if sys.platform == "win32" else None import pywxdump from pywxdump.file import AttachmentContext diff --git a/pywxdump/wx_info/get_bias_addr.py b/pywxdump/wx_info/get_bias_addr.py index e0c77b3..54099d8 100644 --- a/pywxdump/wx_info/get_bias_addr.py +++ b/pywxdump/wx_info/get_bias_addr.py @@ -15,10 +15,7 @@ import pymem from .utils import get_exe_version, get_exe_bit, verify_key -if sys.platform == "win32": - ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory -else: - ReadProcessMemory = None +ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory if sys.platform == "win32" else None void_p = ctypes.c_void_p diff --git a/pywxdump/wx_info/get_wx_info.py b/pywxdump/wx_info/get_wx_info.py index 2c82780..26c3d78 100644 --- a/pywxdump/wx_info/get_wx_info.py +++ b/pywxdump/wx_info/get_wx_info.py @@ -10,19 +10,14 @@ import json import os import re import sys -if sys.platform == "win32": - import winreg -else: - winreg = None +winreg = __import__('winreg') if sys.platform == "win32" else None import psutil import pymem from typing import List, Union from .utils import pattern_scan_all, verify_key, get_exe_version, get_exe_bit, info_error -if sys.platform == "win32": - ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory -else: - ReadProcessMemory = None +ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory if sys.platform == "win32" else None + void_p = ctypes.c_void_p @@ -213,10 +208,8 @@ def get_details(process, version_list: dict = None, is_logging: bool = False): "account": "None", "mobile": "None", "name": "None", "mail": "None", "wxid": "None", "key": "None", "filePath": "None"} try: - if sys.platform == "win32": - Handle = ctypes.windll.kernel32.OpenProcess(0x1F0FFF, False, process.pid) - else: - Handle = None + Handle = ctypes.windll.kernel32.OpenProcess(0x1F0FFF, False, process.pid) if sys.platform == "win32" else None + bias_list = version_list.get(rd['version'], None) addrLen = get_exe_bit(process.exe()) // 8