From 37b5749f5939c7b554597d1c4be7a3cbf0103fd8 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Mon, 22 Jul 2024 19:31:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/wx_info/get_bias_addr.py | 2 +- pywxdump/wx_info/merge_db.py | 4 ++-- pywxdump/wx_info/utils.py | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pywxdump/wx_info/get_bias_addr.py b/pywxdump/wx_info/get_bias_addr.py index 39a5250..54099d8 100644 --- a/pywxdump/wx_info/get_bias_addr.py +++ b/pywxdump/wx_info/get_bias_addr.py @@ -15,7 +15,7 @@ import pymem from .utils import get_exe_version, get_exe_bit, verify_key -ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory +ReadProcessMemory = ctypes.windll.kernel32.ReadProcessMemory if sys.platform == "win32" else None void_p = ctypes.c_void_p diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py index 01e0941..7c1f3a2 100644 --- a/pywxdump/wx_info/merge_db.py +++ b/pywxdump/wx_info/merge_db.py @@ -334,7 +334,7 @@ def decrypt_merge(wx_path, key, outpath="", CreateTime: int = 0, endCreateTime: bool, str): """ 解密合并数据库 msg.db, microMsg.db, media.db,注意:会删除原数据库 - :param wx_path: 微信路径 eg: C:\*******\WeChat Files\wxid_********* + :param wx_path: 微信路径 eg: C:\\*******\\WeChat Files\\wxid_********* :param key: 解密密钥 :return: (true,解密后的数据库路径) or (false,错误信息) """ @@ -450,7 +450,7 @@ def all_merge_real_time_db(key, wx_path, merge_path): 注:这是全量合并,会有可能产生重复数据,需要自行去重 :param key: 解密密钥 :param wx_path: 微信路径 - :param merge_path: 合并后的数据库路径 eg: C:\*******\WeChat Files\wxid_*********\merge.db + :param merge_path: 合并后的数据库路径 eg: C:\\*******\\WeChat Files\\wxid_*********\\merge.db :return: """ if not merge_path or not key or not wx_path or not wx_path: diff --git a/pywxdump/wx_info/utils.py b/pywxdump/wx_info/utils.py index f696280..06102f3 100644 --- a/pywxdump/wx_info/utils.py +++ b/pywxdump/wx_info/utils.py @@ -8,10 +8,13 @@ import os import re import hmac +import sys import traceback import hashlib -from win32com.client import Dispatch - +if sys.platform == "win32": + from win32com.client import Dispatch +else: + Dispatch = None def info_error(func): """