dbghelp: Remove some 64bit compiler warnings - resubmit 2

Adam Stoelting astoelting at gmail.com
Wed Mar 4 02:50:03 CST 2009


3rd attempt at avoiding patch corruption, apologies for the first two.

Changelog:
Remove some 64bit compiler warnings by changing pointer casts to DWORD_PTR.
-------------- next part --------------
From 99909def3c13ba29b1fd9de34bacaab20f2eb91d Mon Sep 17 00:00:00 2001
From: Adam Stoelting <astoelting at ucla.edu>
Date: Tue, 3 Mar 2009 17:45:49 -0800
Subject: Pointer cast changed from DWORD to DWORD_PTR

---
 dlls/dbghelp/dbghelp.c |    4 ++--
 dlls/dbghelp/symbol.c  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c
index 1bfc338..ab0bd59 100644
--- a/dlls/dbghelp/dbghelp.c
+++ b/dlls/dbghelp/dbghelp.c
@@ -477,7 +477,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U
     case CBA_DEFERRED_SYMBOL_LOAD_FAILURE:
     case CBA_DEFERRED_SYMBOL_LOAD_PARTIAL:
     case CBA_DEFERRED_SYMBOL_LOAD_START:
-        idsl64 = (IMAGEHLP_DEFERRED_SYMBOL_LOAD64*)(DWORD)data;
+        idsl64 = (IMAGEHLP_DEFERRED_SYMBOL_LOAD64*)(DWORD_PTR)data;
         if (!validate_addr64(idsl64->BaseOfImage))
             return FALSE;
         idsl.SizeOfStruct = sizeof(idsl);
@@ -522,7 +522,7 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data)
         case CBA_DEFERRED_SYMBOL_LOAD_FAILURE:
         case CBA_DEFERRED_SYMBOL_LOAD_PARTIAL:
         case CBA_DEFERRED_SYMBOL_LOAD_START:
-            idslW = (IMAGEHLP_DEFERRED_SYMBOL_LOADW64*)(DWORD)data;
+            idslW = (IMAGEHLP_DEFERRED_SYMBOL_LOADW64*)(DWORD_PTR)data;
             idsl.SizeOfStruct = sizeof(idsl);
             idsl.BaseOfImage = idslW->BaseOfImage;
             idsl.CheckSum = idslW->CheckSum;
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 0810506..d1d39d7 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -603,7 +603,7 @@ static void symt_fill_sym_info(const struct module_pair* pair,
 
     if (!symt_get_info(sym, TI_GET_TYPE, &sym_info->TypeIndex))
         sym_info->TypeIndex = 0;
-    sym_info->info = (DWORD)sym;
+    sym_info->info = (DWORD_PTR)sym;
     sym_info->Reserved[0] = sym_info->Reserved[1] = 0;
     if (!symt_get_info(sym, TI_GET_LENGTH, &size) &&
         (!sym_info->TypeIndex ||
-- 
1.5.6.3


More information about the wine-patches mailing list