Eric Pouech : dbghelp: Renamed pe_load_module (resp pe_load_module_from_pcs )

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9a0e666733ebd00e0f467e7b8cba74d8899ce01b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9a0e666733ebd00e0f467e7b8c...

Author: Eric Pouech <eric.pouech(a)wanadoo.fr>
Date:   Tue Mar 13 17:33:08 2007 +0100

dbghelp: Renamed pe_load_module (resp pe_load_module_from_pcs)
to pe_load_native_module (resp pe_load_builtin_module) to better describe
what those functions actually do.

---

 dlls/dbghelp/dbghelp_private.h |    8 ++++----
 dlls/dbghelp/module.c          |    4 ++--
 dlls/dbghelp/pe_module.c       |   12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index b62b120..9eccde6 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -478,11 +478,11 @@ extern BOOL         pdb_fetch_file_info(struct pdb_lookup* pdb_lookup);
 /* pe_module.c */
 extern BOOL         pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth);
 extern struct module*
-                    pe_load_module(struct process* pcs, const WCHAR* name,
-                                   HANDLE hFile, DWORD base, DWORD size);
+                    pe_load_native_module(struct process* pcs, const WCHAR* name,
+                                          HANDLE hFile, DWORD base, DWORD size);
 extern struct module*
-                    pe_load_module_from_pcs(struct process* pcs, const WCHAR* name,
-                                            DWORD base, DWORD size);
+                    pe_load_builtin_module(struct process* pcs, const WCHAR* name,
+                                           DWORD base, DWORD size);
 extern BOOL         pe_load_debug_info(const struct process* pcs,
                                        struct module* module);
 /* source.c */
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index 81f441a..40e09b8 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -524,13 +524,13 @@ DWORD64 WINAPI  SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
         if (!module && module_is_elf_container_loaded(pcs, wImageName, BaseOfDll))
         {
             /* force the loading of DLL as builtin */
-            module = pe_load_module_from_pcs(pcs, wImageName, BaseOfDll, SizeOfDll);
+            module = pe_load_builtin_module(pcs, wImageName, BaseOfDll, SizeOfDll);
         }
     }
     if (!module)
     {
         /* otherwise, try a regular PE module */
-        if (!(module = pe_load_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll)))
+        if (!(module = pe_load_native_module(pcs, wImageName, hFile, BaseOfDll, SizeOfDll)))
         {
             /* and finally and ELF module */
             if (module_get_type_by_name(wImageName) == DMT_ELF)
diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index b85c658..ee6997f 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -320,11 +320,11 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module)
 }
 
 /******************************************************************
- *		pe_load_module
+ *		pe_load_native_module
  *
  */
-struct module* pe_load_module(struct process* pcs, const WCHAR* name,
-                              HANDLE hFile, DWORD base, DWORD size)
+struct module* pe_load_native_module(struct process* pcs, const WCHAR* name,
+                                     HANDLE hFile, DWORD base, DWORD size)
 {
     struct module*      module = NULL;
     BOOL                opened = FALSE;
@@ -394,11 +394,11 @@ BOOL pe_load_nt_header(HANDLE hProc, DWORD base, IMAGE_NT_HEADERS* nth)
 }
 
 /******************************************************************
- *		pe_load_module_from_pcs
+ *		pe_load_builtin_module
  *
  */
-struct module* pe_load_module_from_pcs(struct process* pcs, const WCHAR* name,
-                                       DWORD base, DWORD size)
+struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name,
+                                      DWORD base, DWORD size)
 {
     struct module*      module = NULL;