[ros-diffs] [reactos] 117/179: [WINESYNC] dbghelp: Explicitly pass file type to path_find_symbol_file.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=065f0d9772fe95f3cb2b4…

commit 065f0d9772fe95f3cb2b48716ea7173e187d23e6
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 18:27:43 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:49 2020 +0200

    [WINESYNC] dbghelp: Explicitly pass file type to path_find_symbol_file.
    
    Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id c8b5a3be55963fcda51b8e13c10bcd45ecc4bc97 by Jacek Caban
<jacek(a)codeweavers.com>
---
 dll/win32/dbghelp/dbghelp_private.h | 4 +---
 dll/win32/dbghelp/msc.c             | 4 ++--
 dll/win32/dbghelp/path.c            | 4 ++--
 dll/win32/dbghelp/pe_module.c       | 2 +-
 sdk/tools/winesync/dbghelp.cfg      | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h
index 39394ead267..d2f4b27bf90 100644
--- a/dll/win32/dbghelp/dbghelp_private.h
+++ b/dll/win32/dbghelp/dbghelp_private.h
@@ -672,8 +672,6 @@ extern struct module*
 extern struct module*
                     module_get_containee(const struct process* pcs,
                                          const struct module* inner) DECLSPEC_HIDDEN;
-extern enum module_type
-                    module_get_type_by_name(const WCHAR* name) DECLSPEC_HIDDEN;
 extern void         module_reset_debug_info(struct module* module) DECLSPEC_HIDDEN;
 extern BOOL         module_remove(struct process* pcs,
                                   struct module* module) DECLSPEC_HIDDEN;
@@ -698,7 +696,7 @@ extern BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR
ip,
 
 /* path.c */
 extern BOOL         path_find_symbol_file(const struct process* pcs, const struct module*
module,
-                                          PCSTR full_path, const GUID* guid, DWORD dw1,
DWORD dw2,
+                                          PCSTR full_path, enum module_type type, const
GUID* guid, DWORD dw1, DWORD dw2,
                                           WCHAR *buffer, BOOL* is_unmatched)
DECLSPEC_HIDDEN;
 extern WCHAR *get_dos_file_name(const WCHAR *filename) DECLSPEC_HIDDEN;
 extern BOOL search_dll_path(const WCHAR *name, BOOL (*match)(void*, HANDLE, const
WCHAR*), void *param) DECLSPEC_HIDDEN;
diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c
index 4be0cb244da..6696fa02e4e 100644
--- a/dll/win32/dbghelp/msc.c
+++ b/dll/win32/dbghelp/msc.c
@@ -2458,11 +2458,11 @@ static HANDLE map_pdb_file(const struct process* pcs,
     switch (lookup->kind)
     {
     case PDB_JG:
-        ret = path_find_symbol_file(pcs, module, lookup->filename, NULL,
lookup->timestamp,
+        ret = path_find_symbol_file(pcs, module, lookup->filename, DMT_PDB, NULL,
lookup->timestamp,
                                     lookup->age, dbg_file_path,
&module->module.PdbUnmatched);
         break;
     case PDB_DS:
-        ret = path_find_symbol_file(pcs, module, lookup->filename,
&lookup->guid, 0,
+        ret = path_find_symbol_file(pcs, module, lookup->filename, DMT_PDB,
&lookup->guid, 0,
                                     lookup->age, dbg_file_path,
&module->module.PdbUnmatched);
         break;
     }
diff --git a/dll/win32/dbghelp/path.c b/dll/win32/dbghelp/path.c
index 023adfa1037..4e7354f93ad 100644
--- a/dll/win32/dbghelp/path.c
+++ b/dll/win32/dbghelp/path.c
@@ -619,7 +619,7 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user)
 }
 
 BOOL path_find_symbol_file(const struct process* pcs, const struct module* module,
-                           PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2,
+                           PCSTR full_path, enum module_type type, const GUID* guid,
DWORD dw1, DWORD dw2,
                            WCHAR *buffer, BOOL* is_unmatched)
 {
     struct module_find  mf;
@@ -638,7 +638,7 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct
module* modul
 
     MultiByteToWideChar(CP_ACP, 0, full_path, -1, full_pathW, MAX_PATH);
     filename = file_name(full_pathW);
-    mf.kind = module_get_type_by_name(filename);
+    mf.kind = type;
     *is_unmatched = FALSE;
 
     /* first check full path to file */
diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c
index 62328bb8d49..b915911d6ce 100644
--- a/dll/win32/dbghelp/pe_module.c
+++ b/dll/win32/dbghelp/pe_module.c
@@ -577,7 +577,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module*
module,
 
     TRACE("Processing DBG file %s\n", debugstr_a(dbg_name));
 
-    if (path_find_symbol_file(pcs, module, dbg_name, NULL, timestamp, 0, tmp,
&module->module.DbgUnmatched) &&
+    if (path_find_symbol_file(pcs, module, dbg_name, DMT_DBG, NULL, timestamp, 0, tmp,
&module->module.DbgUnmatched) &&
         (hFile = CreateFileW(tmp, GENERIC_READ, FILE_SHARE_READ, NULL,
                              OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) !=
INVALID_HANDLE_VALUE &&
         ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0)
&&
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index 0225532289a..c4d061cf398 100644
--- a/sdk/tools/winesync/dbghelp.cfg
+++ b/sdk/tools/winesync/dbghelp.cfg
@@ -4,4 +4,4 @@ files:
   include/dbghelp.h: sdk/include/psdk/dbghelp.h
   include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
 tags:
-  wine: a676c5785ea56fede37370cd6d5e4508e9d8c62a
+  wine: c8b5a3be55963fcda51b8e13c10bcd45ecc4bc97