dbghelp: Brought dbghelp.h a bit closer to PSDK definitions.

dlls/dbghelp/dbghelp.c

@@ -118,7 +118,7 @@ BOOL validate_addr64(DWORD64 addr)
  *		SymSetSearchPath (DBGHELP.@)
  *
  */
-BOOL WINAPI SymSetSearchPath(HANDLE hProcess, PSTR searchPath)
+BOOL WINAPI SymSetSearchPath(HANDLE hProcess, PCSTR searchPath)
 {
     struct process* pcs = process_find_by_handle(hProcess);
 
@@ -200,7 +200,7 @@ static BOOL check_live_target(struct process* pcs)
  * Note also that this scheme can be intertwined with the deferred loading 
  * mechanism (ie only load the debug information when we actually need it).
  */
-BOOL WINAPI SymInitialize(HANDLE hProcess, PSTR UserSearchPath, BOOL fInvadeProcess)
+BOOL WINAPI SymInitialize(HANDLE hProcess, PCSTR UserSearchPath, BOOL fInvadeProcess)
 {
     struct process*     pcs;
 

dlls/dbghelp/dbghelp_private.h

@@ -367,7 +367,7 @@ extern BOOL         pe_load_debug_directory(const struct process* pcs,
 /* 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, char* name,
+                    pe_load_module(struct process* pcs, const char* name,
                                    HANDLE hFile, DWORD base, DWORD size);
 extern struct module*
                     pe_load_module_from_pcs(struct process* pcs, const char* name, 

dlls/dbghelp/module.c

@@ -362,8 +362,8 @@ enum module_type module_get_type_by_name(const char* name)
 /***********************************************************************
  *			SymLoadModule (DBGHELP.@)
  */
-DWORD WINAPI SymLoadModule(HANDLE hProcess, HANDLE hFile, char* ImageName,
-                           char* ModuleName, DWORD BaseOfDll, DWORD SizeOfDll)
+DWORD WINAPI SymLoadModule(HANDLE hProcess, HANDLE hFile, const char* ImageName,
+                           const char* ModuleName, DWORD BaseOfDll, DWORD SizeOfDll)
 {
     struct process*     pcs;
     struct module*	module = NULL;
@@ -449,8 +449,8 @@ DWORD64 WINAPI  SymLoadModuleEx(HANDLE hProcess, HANDLE hFile, PCSTR ImageName,
 /***********************************************************************
  *                     SymLoadModule64 (DBGHELP.@)
  */
-DWORD64 WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, PSTR ImageName,
-                               PSTR ModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll)
+DWORD64 WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, PCSTR ImageName,
+                               PCSTR ModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll)
 {
     if (!validate_addr64(BaseOfDll)) return FALSE;
     return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, SizeOfDll);

dlls/dbghelp/path.c

@@ -33,9 +33,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 
 static inline BOOL is_sep(char ch) {return ch == '/' || ch == '\\';}
 
-static inline char* file_name(char* str)
+static inline const char* file_name(const char* str)
 {
-    char*       p;
+    const char*       p;
 
     for (p = str + strlen(str) - 1; p >= str && !is_sep(*p); p--);
     return p + 1;
@@ -45,7 +45,7 @@ static inline char* file_name(char* str)
  *		FindDebugInfoFile (DBGHELP.@)
  *
  */
-HANDLE WINAPI FindDebugInfoFile(PSTR FileName, PSTR SymbolPath, PSTR DebugFilePath)
+HANDLE WINAPI FindDebugInfoFile(PCSTR FileName, PCSTR SymbolPath, PSTR DebugFilePath)
 {
     HANDLE      h;
 
@@ -65,7 +65,7 @@ HANDLE WINAPI FindDebugInfoFile(PSTR FileName, PSTR SymbolPath, PSTR DebugFilePa
  *		FindDebugInfoFileEx (DBGHELP.@)
  *
  */
-HANDLE WINAPI FindDebugInfoFileEx(PSTR FileName, PSTR SymbolPath,
+HANDLE WINAPI FindDebugInfoFileEx(PCSTR FileName, PCSTR SymbolPath,
                                   PSTR DebugFilePath, 
                                   PFIND_DEBUG_FILE_CALLBACK Callback,
                                   PVOID CallerData)
@@ -79,7 +79,7 @@ HANDLE WINAPI FindDebugInfoFileEx(PSTR FileName, PSTR SymbolPath,
  *		FindExecutableImage (DBGHELP.@)
  *
  */
-HANDLE WINAPI FindExecutableImage(PSTR FileName, PSTR SymbolPath, PSTR ImageFilePath)
+HANDLE WINAPI FindExecutableImage(PCSTR FileName, PCSTR SymbolPath, PSTR ImageFilePath)
 {
     HANDLE h;
     if (!SearchPathA(SymbolPath, FileName, NULL, MAX_PATH, ImageFilePath, NULL))
@@ -180,7 +180,7 @@ static BOOL do_search(const char* file, char* buffer, BOOL recurse,
 /***********************************************************************
  *           SearchTreeForFile (DBGHELP.@)
  */
-BOOL WINAPI SearchTreeForFile(LPSTR root, LPSTR file, LPSTR buffer)
+BOOL WINAPI SearchTreeForFile(PCSTR root, PCSTR file, PSTR buffer)
 {
     TRACE("(%s, %s, %p)\n", 
           debugstr_a(root), debugstr_a(file), buffer);
@@ -293,7 +293,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buffer, void* user)
  *		SymFindFileInPath (DBGHELP.@)
  *
  */
-BOOL WINAPI SymFindFileInPath(HANDLE hProcess, LPSTR searchPath, LPSTR full_path,
+BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR searchPath, PCSTR full_path,
                               PVOID id, DWORD two, DWORD three, DWORD flags,
                               LPSTR buffer, PFINDFILEINPATHCALLBACK cb,
                               PVOID user)
@@ -302,7 +302,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, LPSTR searchPath, LPSTR full_path
     struct process*     pcs = process_find_by_handle(hProcess);
     char                tmp[MAX_PATH];
     char*               ptr;
-    char*               filename;
+    const char*         filename;
 
     TRACE("(%p %s %s %p %08lx %08lx %08lx %p %p %p)\n",
           hProcess, searchPath, full_path, id, two, three, flags, 

dlls/dbghelp/pe_module.c

@@ -324,7 +324,7 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module)
  *		pe_load_module
  *
  */
-struct module* pe_load_module(struct process* pcs, char* name,
+struct module* pe_load_module(struct process* pcs, const char* name,
                               HANDLE hFile, DWORD base, DWORD size)
 {
     struct module*      module = NULL;

dlls/dbghelp/source.c

@@ -97,7 +97,7 @@ const char* source_get(const struct module* module, unsigned idx)
  *		SymEnumSourceFiles (DBGHELP.@)
  *
  */
-BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, LPSTR Mask,
+BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask,
                                PSYM_ENUMSOURCEFILES_CALLBACK cbSrcFiles,
                                PVOID UserContext)
 {

dlls/dbghelp/symbol.c

@@ -925,7 +925,7 @@ BOOL WINAPI SymGetSymFromAddr(HANDLE hProcess, DWORD Address,
  *		SymFromName (DBGHELP.@)
  *
  */
-BOOL WINAPI SymFromName(HANDLE hProcess, LPSTR Name, PSYMBOL_INFO Symbol)
+BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol)
 {
     struct process*             pcs = process_find_by_handle(hProcess);
     struct module*              module;
@@ -977,7 +977,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, LPSTR Name, PSYMBOL_INFO Symbol)
 /***********************************************************************
  *		SymGetSymFromName (DBGHELP.@)
  */
-BOOL WINAPI SymGetSymFromName(HANDLE hProcess, LPSTR Name, PIMAGEHLP_SYMBOL Symbol)
+BOOL WINAPI SymGetSymFromName(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL Symbol)
 {
     char        buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME];
     SYMBOL_INFO*si = (SYMBOL_INFO*)buffer;

dlls/dbghelp/type.c

@@ -796,7 +796,7 @@ BOOL WINAPI SymGetTypeInfo(HANDLE hProcess, DWORD64 ModBase,
  *
  */
 BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll,
-                               LPSTR Name, PSYMBOL_INFO Symbol)
+                               PCSTR Name, PSYMBOL_INFO Symbol)
 {
     struct process*     pcs = process_find_by_handle(hProcess);
     struct module*      module;