dbghelp: Cast-qual warnings fix

Andrew Talbot Andrew.Talbot at talbotville.com
Wed Sep 6 11:55:40 CDT 2006


Depends on my kernel patch, which, in turn, depends on my ntdll patch.

-- Andy.
---
Changelog:
    dbghelp: Cast-qual warnings fix.

diff -urN a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
--- a/dlls/dbghelp/module.c	2006-06-27 10:55:19.000000000 +0100
+++ b/dlls/dbghelp/module.c	2006-09-06 17:28:05.000000000 +0100
@@ -473,8 +473,7 @@
     if (Flags & ~(SLMFLAG_VIRTUAL))
         FIXME("Unsupported Flags %08lx for %s\n", Flags, ImageName);
 
-    return SymLoadModule(hProcess, hFile, (char*)ImageName, (char*)ModuleName,
-                         (DWORD)BaseOfDll, DllSize);
+    return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, DllSize);
 }
 
 /***********************************************************************
diff -urN a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
--- a/dlls/dbghelp/pe_module.c	2006-05-23 13:47:46.000000000 +0100
+++ b/dlls/dbghelp/pe_module.c	2006-09-06 13:15:19.000000000 +0100
@@ -100,9 +100,7 @@
 
     WINE_TRACE("Processing DBG file %s\n", dbg_name);
 
-    if (SymFindFileInPath(pcs->handle, NULL, (char*)dbg_name, 
-                          NULL, 0, 0, 0,
-                          tmp, dbg_match, NULL) &&
+    if (SymFindFileInPath(pcs->handle, NULL, dbg_name, NULL, 0, 0, 0, tmp, dbg_match, NULL) &&
         (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, 
                              OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE &&
         ((hMap = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) &&
@@ -142,7 +140,7 @@
     else
         WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", dbg_name, debugstr_a(tmp));
 
-    if (dbg_mapping) UnmapViewOfFile((void*)dbg_mapping);
+    if (dbg_mapping) UnmapViewOfFile(dbg_mapping);
     if (hMap) CloseHandle(hMap);
     if (hFile != NULL) CloseHandle(hFile);
     return ret;
diff -urN a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
--- a/dlls/dbghelp/symbol.c	2006-08-10 17:27:47.000000000 +0100
+++ b/dlls/dbghelp/symbol.c	2006-09-06 13:30:38.000000000 +0100
@@ -1121,7 +1121,7 @@
         memcpy(tmp, Name, name - Name);
         tmp[name - Name] = '\0';
         module = module_find_by_name(pcs, tmp, DMT_UNKNOWN);
-        return find_name(pcs, module, (char*)(name + 1), Symbol);
+        return find_name(pcs, module, name + 1, Symbol);
     }
     for (module = pcs->lmodules; module; module = module->next)
     {



More information about the wine-patches mailing list