From 69ee8e77c1b8b5ceead9168521a41abd2cbf5bdf Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Sun, 3 Dec 2023 17:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug=20#34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/wx_info/get_wx_db.py   | 19 ++++++++++++-------
 pywxdump/wx_info/get_wx_info.py |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pywxdump/wx_info/get_wx_db.py b/pywxdump/wx_info/get_wx_db.py
index dfd057d..e920e56 100644
--- a/pywxdump/wx_info/get_wx_db.py
+++ b/pywxdump/wx_info/get_wx_db.py
@@ -20,13 +20,18 @@ def get_wechat_db(require_list: Union[List[str], str] = "all", msg_dir: str = No
             winreg.CloseKey(key)
             w_dir = value
         except Exception as e:
-            w_dir = "MyDocument:"
-
-        if w_dir == "MyDocument:":
-            profile = os.path.expanduser("~")
-            msg_dir = os.path.join(profile, "Documents", "WeChat Files")
-        else:
-            msg_dir = os.path.join(w_dir, "WeChat Files")
+            # 获取文档实际目录
+            try:
+                # 打开注册表路径
+                key = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
+                                     r"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders")
+                documents_path = winreg.QueryValueEx(key, "Personal")[0]  # 读取文档实际目录路径
+                winreg.CloseKey(key)  # 关闭注册表
+                w_dir = documents_path
+            except Exception as e:
+                profile = os.path.expanduser("~")
+                w_dir = os.path.join(profile, "Documents")
+        msg_dir = os.path.join(w_dir, "WeChat Files")
 
     if not os.path.exists(msg_dir):
         error = "[-] 目录不存在"
diff --git a/pywxdump/wx_info/get_wx_info.py b/pywxdump/wx_info/get_wx_info.py
index 4e734c1..fb20317 100644
--- a/pywxdump/wx_info/get_wx_info.py
+++ b/pywxdump/wx_info/get_wx_info.py
@@ -81,7 +81,7 @@ def get_info_filePath(wxid="all"):
         # 获取文档实际目录
         try:
             # 打开注册表路径
-            key = winreg.OpenKey(winreg.HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders")
+            key = winreg.OpenKey(winreg.HKEY_CURRENT_USER,r"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders")
             documents_path = winreg.QueryValueEx(key, "Personal")[0]# 读取文档实际目录路径
             winreg.CloseKey(key) # 关闭注册表
             w_dir = documents_path