Skip to content

W
wine-winehq
Commit f803da49 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

dbghelp: Use LONG_PTR instead of long type.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 8d702a3a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 109 deletions
dlls/dbghelp/cpu_i386.c
View file @ f803da49
......@@ -48,7 +48,7 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD s
}
static BOOL i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr,
unsigned seg, unsigned long offset)
unsigned seg, ULONG_PTR offset)
{
addr->Mode = AddrModeFlat;
addr->Segment = seg;
......
dlls/dbghelp/elf_module.c
View file @ f803da49
......@@ -116,13 +116,13 @@ struct elf_thunk_area
{
const char* symname;
THUNK_ORDINAL ordinal;
unsigned long rva_start;
unsigned long rva_end;
ULONG_PTR rva_start;
ULONG_PTR rva_end;
};
struct elf_module_info
{
unsigned long elf_addr;
ULONG_PTR elf_addr;
unsigned short elf_mark : 1,
elf_loader : 1;
struct image_file_map file_map;
......@@ -355,7 +355,7 @@ static BOOL elf_map_file_read(struct image_file_map* fmap, struct elf_map_file_d
return ReadFile(fmap->u.elf.handle, buf, len, &bytes_read, NULL);
case from_process:
return ReadProcessMemory(emfd->u.process.handle,
(void*)((unsigned long)emfd->u.process.load_addr + (unsigned long)off),
(void*)((ULONG_PTR)emfd->u.process.load_addr + (ULONG_PTR)off),
buf, len, &dw) && dw == len;
default:
assert(0);
......@@ -559,7 +559,7 @@ static void elf_module_remove(struct process* pcs, struct module_format* modfmt)
* Check whether an address lies within one of the thunk area we
* know of.
*/
int elf_is_in_thunk_area(unsigned long addr,
int elf_is_in_thunk_area(ULONG_PTR addr,
const struct elf_thunk_area* thunks)
{
unsigned i;
......@@ -1085,8 +1085,8 @@ static BOOL elf_fetch_file_info(struct process* process, const WCHAR* name, ULON
}
static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
struct image_file_map* fmap, unsigned long load_offset,
unsigned long dyn_addr, struct elf_info* elf_info)
struct image_file_map* fmap, ULONG_PTR load_offset,
ULONG_PTR dyn_addr, struct elf_info* elf_info)
{
BOOL ret = FALSE;
......@@ -1097,7 +1097,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
if (elf_find_section_type(fmap, ".dynamic", SHT_DYNAMIC, &ism))
{
char* ptr = (char*)(ULONG_PTR)fmap->u.elf.sect[ism.sidx].shdr.sh_addr;
unsigned long len;
ULONG_PTR len;
if (load_offset) ptr += load_offset - fmap->u.elf.elf_start;
......@@ -1154,14 +1154,14 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
struct elf_module_info *elf_module_info;
struct module_format* modfmt;
struct image_section_map ism;
unsigned long modbase = load_offset;
ULONG_PTR modbase = load_offset;
if (elf_find_section_type(fmap, ".dynamic", SHT_DYNAMIC, &ism))
{
unsigned long rva_dyn = elf_get_map_rva(&ism);
ULONG_PTR rva_dyn = elf_get_map_rva(&ism);
TRACE("For module %s, got ELF (start=%lx dyn=%lx), link_map (start=%lx dyn=%lx)\n",
debugstr_w(filename), (unsigned long)fmap->u.elf.elf_start, rva_dyn,
debugstr_w(filename), (ULONG_PTR)fmap->u.elf.elf_start, rva_dyn,
load_offset, dyn_addr);
if (dyn_addr && load_offset + rva_dyn != dyn_addr)
{
......@@ -1231,7 +1231,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename,
* 1 on success
*/
static BOOL elf_load_file(struct process* pcs, const WCHAR* filename,
unsigned long load_offset, unsigned long dyn_addr,
ULONG_PTR load_offset, ULONG_PTR dyn_addr,
struct elf_info* elf_info)
{
BOOL ret = FALSE;
......@@ -1279,7 +1279,7 @@ static BOOL elf_load_file_cb(void *param, HANDLE handle, const WCHAR *filename)
*
* locate some a value from the debuggee auxiliary vector
*/
static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned long* val)
static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR* val)
{
char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME];
SYMBOL_INFO*si = (SYMBOL_INFO*)buffer;
......@@ -1350,7 +1350,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned l
* lookup a file in standard ELF locations, and if found, load it
*/
static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
unsigned long load_offset, unsigned long dyn_addr,
ULONG_PTR load_offset, ULONG_PTR dyn_addr,
struct elf_info* elf_info)
{
BOOL ret = FALSE;
......@@ -1384,8 +1384,8 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
return ret;
}
typedef BOOL (*enum_elf_modules_cb)(const WCHAR*, unsigned long load_addr,
unsigned long dyn_addr, BOOL is_system, void* user);
typedef BOOL (*enum_elf_modules_cb)(const WCHAR*, ULONG_PTR load_addr,
ULONG_PTR dyn_addr, BOOL is_system, void* user);
/******************************************************************
* elf_enum_modules_internal
......@@ -1427,7 +1427,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs,
bufstr[sizeof(bufstr) - 1] = '\0';
MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, ARRAY_SIZE(bufstrW));
if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name);
if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user))
if (!cb(bufstrW, (ULONG_PTR)lm.l_addr, (ULONG_PTR)lm.l_ld, FALSE, user))
break;
}
}
......@@ -1461,7 +1461,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs,
bufstr[sizeof(bufstr) - 1] = '\0';
MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, ARRAY_SIZE(bufstrW));
if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name);
if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user))
if (!cb(bufstrW, (ULONG_PTR)lm.l_addr, (ULONG_PTR)lm.l_ld, FALSE, user))
break;
}
}
......@@ -1470,7 +1470,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs,
#ifdef AT_SYSINFO_EHDR
if (!lm_addr)
{
unsigned long ehdr_addr;
ULONG_PTR ehdr_addr;
if (elf_search_auxv(pcs, AT_SYSINFO_EHDR, &ehdr_addr))
{
......@@ -1488,8 +1488,8 @@ struct elf_enum_user
void* user;
};
static BOOL elf_enum_modules_translate(const WCHAR* name, unsigned long load_addr,
unsigned long dyn_addr, BOOL is_system, void* user)
static BOOL elf_enum_modules_translate(const WCHAR* name, ULONG_PTR load_addr,
ULONG_PTR dyn_addr, BOOL is_system, void* user)
{
struct elf_enum_user* eeu = user;
return eeu->cb(name, load_addr, eeu->user);
......@@ -1531,8 +1531,8 @@ struct elf_load
* Callback for elf_load_module, used to walk the list of loaded
* modules.
*/
static BOOL elf_load_cb(const WCHAR* name, unsigned long load_addr,
unsigned long dyn_addr, BOOL is_system, void* user)
static BOOL elf_load_cb(const WCHAR* name, ULONG_PTR load_addr,
ULONG_PTR dyn_addr, BOOL is_system, void* user)
{
struct elf_load* el = user;
BOOL ret = TRUE;
......@@ -1583,7 +1583,7 @@ static BOOL elf_load_cb(const WCHAR* name, unsigned long load_addr,
* Also, find module real name and load address from
* the real loaded modules list in pcs address space
*/
static struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned long addr)
static struct module* elf_load_module(struct process* pcs, const WCHAR* name, ULONG_PTR addr)
{
struct elf_load el;
......@@ -1707,7 +1707,7 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
return FALSE;
}
int elf_is_in_thunk_area(unsigned long addr,
int elf_is_in_thunk_area(ULONG_PTR addr,
const struct elf_thunk_area* thunks)
{
return -1;
......
dlls/dbghelp/image_private.h
View file @ f803da49
......@@ -130,7 +130,7 @@ struct image_file_map
struct image_section_map
{
struct image_file_map* fmap;
long sidx;
LONG_PTR sidx;
};
BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN;
......
dlls/dbghelp/minidump.c
View file @ f803da49
......@@ -255,7 +255,7 @@ static BOOL WINAPI fetch_pe_module_info_cb(PCWSTR name, DWORD64 base, ULONG size
*
* Callback for accumulating in dump_context an host modules set
*/
static BOOL fetch_host_module_info_cb(const WCHAR* name, unsigned long base,
static BOOL fetch_host_module_info_cb(const WCHAR* name, ULONG_PTR base,
void* user)
{
struct dump_context* dc = user;
......
dlls/dbghelp/module.c
View file @ f803da49
......@@ -187,7 +187,7 @@ static const char* get_module_type(enum module_type type, BOOL virtual)
struct module* module_new(struct process* pcs, const WCHAR* name,
enum module_type type, BOOL virtual,
DWORD64 mod_addr, DWORD64 size,
unsigned long stamp, unsigned long checksum)
ULONG_PTR stamp, ULONG_PTR checksum)
{
struct module* module;
unsigned i;
......@@ -1354,7 +1354,7 @@ static BOOL native_synchronize_module_list(struct process* pcs)
return FALSE;
}
static struct module* native_load_module(struct process* pcs, const WCHAR* name, unsigned long addr)
static struct module* native_load_module(struct process* pcs, const WCHAR* name, ULONG_PTR addr)
{
return NULL;
}
......
dlls/dbghelp/msc.c
View file @ f803da49
......@@ -1393,7 +1393,7 @@ static BOOL codeview_parse_type_table(struct codeview_type_parse* ctp)
/*========================================================================
* Process CodeView line number information.
*/
static unsigned long codeview_get_address(const struct msc_debug_info* msc_dbg,
static ULONG_PTR codeview_get_address(const struct msc_debug_info* msc_dbg,
unsigned seg, unsigned offset);
static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const BYTE* linetab,
......@@ -1408,7 +1408,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B
const unsigned short* linenos;
const struct startend* start;
unsigned source;
unsigned long addr, func_addr0;
ULONG_PTR addr, func_addr0;
struct symt_function* func;
const struct codeview_linetab_block* ltb;
......@@ -1555,7 +1555,7 @@ static unsigned int codeview_map_offset(const struct msc_debug_info* msc_dbg,
return 0;
}
static unsigned long codeview_get_address(const struct msc_debug_info* msc_dbg,
static ULONG_PTR codeview_get_address(const struct msc_debug_info* msc_dbg,
unsigned seg, unsigned offset)
{
int nsect = msc_dbg->nsect;
......
dlls/dbghelp/stabs.c
View file @ f803da49
......@@ -153,7 +153,7 @@ static void stab_strcpy(char* dest, int sz, const char* source)
typedef struct
{
char* name;
unsigned long value;
ULONG_PTR value;
struct symt** vector;
int nrofentries;
} include_def;
......@@ -169,7 +169,7 @@ static struct symt** cu_vector = NULL;
static int cu_nrofentries = 0;
static struct symt_basic* stabs_basic[36];
static int stabs_new_include(const char* file, unsigned long val)
static int stabs_new_include(const char* file, ULONG_PTR val)
{
if (num_include_def == num_alloc_include_def)
{
......@@ -194,7 +194,7 @@ static int stabs_new_include(const char* file, unsigned long val)
return num_include_def++;
}
static int stabs_find_include(const char* file, unsigned long val)
static int stabs_find_include(const char* file, ULONG_PTR val)
{
int i;
......@@ -248,7 +248,7 @@ static void stabs_free_includes(void)
cu_nrofentries = 0;
}
static struct symt** stabs_find_ref(long filenr, long subnr)
static struct symt** stabs_find_ref(LONG_PTR filenr, LONG_PTR subnr)
{
struct symt** ret;
......@@ -294,7 +294,7 @@ static struct symt** stabs_find_ref(long filenr, long subnr)
static struct symt** stabs_read_type_enum(const char** x)
{
long filenr, subnr;
LONG_PTR filenr, subnr;
const char* iter;
char* end;
......@@ -418,7 +418,7 @@ static int stabs_pts_read_id(struct ParseTypedefData* ptd)
return -1;
}
static int stabs_pts_read_number(struct ParseTypedefData* ptd, long* v)
static int stabs_pts_read_number(struct ParseTypedefData* ptd, LONG_PTR* v)
{
char* last;
......@@ -429,7 +429,7 @@ static int stabs_pts_read_number(struct ParseTypedefData* ptd, long* v)
}
static int stabs_pts_read_type_reference(struct ParseTypedefData* ptd,
long* filenr, long* subnr)
LONG_PTR* filenr, LONG_PTR* subnr)
{
if (*ptd->ptr == '(')
{
......@@ -604,7 +604,7 @@ static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd)
ptd->ptr++;
if (mthd == '*')
{
long int ofs;
LONG_PTR ofs;
PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &ofs) == -1);
PTS_ABORTIF(ptd, *ptd->ptr++ != ';');
......@@ -620,7 +620,7 @@ static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd)
static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
struct symt_udt* sdt)
{
long sz, ofs;
LONG_PTR sz, ofs;
struct symt* adt;
struct symt* dt = NULL;
int idx;
......@@ -631,7 +631,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
doadd = symt_set_udt_size(ptd->module, sdt, sz);
if (*ptd->ptr == '!') /* C++ inheritance */
{
long num_classes;
LONG_PTR num_classes;
ptd->ptr++;
PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &num_classes) == -1);
......@@ -678,7 +678,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
if (ptd->ptr[0] == '$' && ptd->ptr[1] == 'v')
{
long x;
LONG_PTR x;
if (ptd->ptr[2] == 'f')
{
......@@ -762,7 +762,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
static inline int stabs_pts_read_enum(struct ParseTypedefData* ptd,
struct symt_enum* edt)
{
long value;
LONG_PTR value;
int idx;
while (*ptd->ptr != ';')
......@@ -781,7 +781,7 @@ static inline int stabs_pts_read_enum(struct ParseTypedefData* ptd,
static inline int stabs_pts_read_array(struct ParseTypedefData* ptd,
struct symt** adt)
{
long lo, hi;
LONG_PTR lo, hi;
struct symt* range_dt;
struct symt* base_dt;
......@@ -806,10 +806,10 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ
struct symt** ret_dt)
{
int idx;
long sz = -1;
LONG_PTR sz = -1;
struct symt* new_dt = NULL; /* newly created data type */
struct symt* ref_dt; /* referenced data type (pointer...) */
long filenr1, subnr1, tmp;
LONG_PTR filenr1, subnr1, tmp;
/* things are a bit complicated because of the way the typedefs are stored inside
* the file, because addresses can change when realloc is done, so we must call
......@@ -970,8 +970,8 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ
break;
case 'R':
{
long type, len, unk;
int basic;
LONG_PTR type, len, unk;
int basic;
PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &type) == -1);
PTS_ABORTIF(ptd, *ptd->ptr++ != ';'); /* ';' */
......@@ -1122,8 +1122,8 @@ struct pending_line
{
int source_idx;
int line_num;
unsigned long offset;
unsigned long load_offset;
ULONG_PTR offset;
ULONG_PTR load_offset;
};
struct pending_object
......@@ -1175,8 +1175,8 @@ static inline void pending_add_var(struct pending_list* pending, const char* nam
}
static inline void pending_add_line(struct pending_list* pending, int source_idx,
int line_num, unsigned long offset,
unsigned long load_offset)
int line_num, ULONG_PTR offset,
ULONG_PTR load_offset)
{
pending_make_room(pending);
pending->objs[pending->num].tag = PENDING_LINE;
......@@ -1225,7 +1225,7 @@ static void pending_flush(struct pending_list* pending, struct module* module,
* function (assuming that current function ends where next function starts)
*/
static void stabs_finalize_function(struct module* module, struct symt_function* func,
unsigned long size)
ULONG_PTR size)
{
IMAGEHLP_LINE64 il;
struct location loc;
......@@ -1261,7 +1261,7 @@ static inline void stabbuf_append(char **buf, unsigned *buf_size, const char *st
strcpy(*buf+buf_len, str);
}
BOOL stabs_parse(struct module* module, unsigned long load_offset,
BOOL stabs_parse(struct module* module, ULONG_PTR load_offset,
const char* pv_stab_ptr, int stablen,
const char* strs, int strtablen,
stabs_def_cb callback, void* user)
......@@ -1478,7 +1478,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
case 35:
case 36: loc.reg = CV_REG_MM0 + n_value - 29; break;
default:
FIXME("Unknown register value (%lu)\n", (unsigned long)n_value);
FIXME("Unknown register value (%lu)\n", (ULONG_PTR)n_value);
loc.reg = CV_REG_NONE;
break;
}
......@@ -1512,7 +1512,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
assert(source_idx >= 0);
if (curr_func != NULL)
{
unsigned long offset = n_value;
ULONG_PTR offset = n_value;
if (module->type == DMT_MACHO)
offset -= curr_func->address - load_offset;
symt_add_func_line(module, curr_func, source_idx,
......@@ -1628,7 +1628,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
case N_EXCL:
if (stabs_add_include(stabs_find_include(ptr, n_value)) < 0)
{
ERR("Excluded header not found (%s,%ld)\n", ptr, (unsigned long)n_value);
ERR("Excluded header not found (%s,%ld)\n", ptr, (ULONG_PTR)n_value);
module_reset_debug_info(module);
ret = FALSE;
goto done;
......@@ -1675,7 +1675,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset,
}
stabbuff[0] = '\0';
TRACE("0x%02x %lx %s\n",
stab_ptr->n_type, (unsigned long)n_value, debugstr_a(strs + stab_ptr->n_strx));
stab_ptr->n_type, (ULONG_PTR)n_value, debugstr_a(strs + stab_ptr->n_strx));
}
module->module.SymType = SymDia;
module->module.CVSig = 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24);
......
dlls/dbghelp/storage.c
View file @ f803da49
......@@ -205,7 +205,7 @@ void* vector_add(struct vector* v, struct pool* pool)
*/
struct key2index
{
unsigned long key;
ULONG_PTR key;
unsigned index;
};
......@@ -221,7 +221,7 @@ void sparse_array_init(struct sparse_array* sa, unsigned elt_sz, unsigned bucket
* Returns the first index which key is >= at passed key
*/
static struct key2index* sparse_array_lookup(const struct sparse_array* sa,
unsigned long key, unsigned* idx)
ULONG_PTR key, unsigned* idx)
{
struct key2index* pk2i;
unsigned low, high;
......@@ -267,7 +267,7 @@ static struct key2index* sparse_array_lookup(const struct sparse_array* sa,
return pk2i;
}
void* sparse_array_find(const struct sparse_array* sa, unsigned long key)
void* sparse_array_find(const struct sparse_array* sa, ULONG_PTR key)
{
unsigned idx;
struct key2index* pk2i;
......@@ -277,7 +277,7 @@ void* sparse_array_find(const struct sparse_array* sa, unsigned long key)
return NULL;
}
void* sparse_array_add(struct sparse_array* sa, unsigned long key,
void* sparse_array_add(struct sparse_array* sa, ULONG_PTR key,
struct pool* pool)
{
unsigned idx, i;
......
dlls/dbghelp/symbol.c
View file @ f803da49
......@@ -183,7 +183,7 @@ static WCHAR* file_regex(const char* srcfile)
}
struct symt_compiland* symt_new_compiland(struct module* module,
unsigned long address, unsigned src_idx)
ULONG_PTR address, unsigned src_idx)
{
struct symt_compiland* sym;
......@@ -203,7 +203,7 @@ struct symt_public* symt_new_public(struct module* module,
struct symt_compiland* compiland,
const char* name,
BOOL is_function,
unsigned long address, unsigned size)
ULONG_PTR address, unsigned size)
{
struct symt_public* sym;
struct symt** p;
......@@ -234,7 +234,7 @@ struct symt_public* symt_new_public(struct module* module,
struct symt_data* symt_new_global_variable(struct module* module,
struct symt_compiland* compiland,
const char* name, unsigned is_static,
struct location loc, unsigned long size,
struct location loc, ULONG_PTR size,
struct symt* type)
{
struct symt_data* sym;
......@@ -271,7 +271,7 @@ struct symt_data* symt_new_global_variable(struct module* module,
struct symt_function* symt_new_function(struct module* module,
struct symt_compiland* compiland,
const char* name,
unsigned long addr, unsigned long size,
ULONG_PTR addr, ULONG_PTR size,
struct symt* sig_type)
{
struct symt_function* sym;
......@@ -302,7 +302,7 @@ struct symt_function* symt_new_function(struct module* module,
}
void symt_add_func_line(struct module* module, struct symt_function* func,
unsigned source_idx, int line_num, unsigned long offset)
unsigned source_idx, int line_num, ULONG_PTR offset)
{
struct line_info* dli;
BOOL last_matches = FALSE;
......@@ -474,7 +474,7 @@ BOOL symt_normalize_function(struct module* module, const struct symt_function*
struct symt_thunk* symt_new_thunk(struct module* module,
struct symt_compiland* compiland,
const char* name, THUNK_ORDINAL ord,
unsigned long addr, unsigned long size)
ULONG_PTR addr, ULONG_PTR size)
{
struct symt_thunk* sym;
......@@ -531,7 +531,7 @@ struct symt_data* symt_new_constant(struct module* module,
struct symt_hierarchy_point* symt_new_label(struct module* module,
struct symt_compiland* compiland,
const char* name, unsigned long address)
const char* name, ULONG_PTR address)
{
struct symt_hierarchy_point* sym;
......@@ -656,8 +656,8 @@ static void symt_fill_sym_info(struct module_pair* pair,
switch (data->u.value.n1.n2.vt)
{
case VT_I4: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.lVal; break;
case VT_I2: sym_info->Value = (ULONG)(long)data->u.value.n1.n2.n3.iVal; break;
case VT_I1: sym_info->Value = (ULONG)(long)data->u.value.n1.n2.n3.cVal; break;
case VT_I2: sym_info->Value = (ULONG)(LONG_PTR)data->u.value.n1.n2.n3.iVal; break;
case VT_I1: sym_info->Value = (ULONG)(LONG_PTR)data->u.value.n1.n2.n3.cVal; break;
case VT_UI4: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.ulVal; break;
case VT_UI2: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.uiVal; break;
case VT_UI1: sym_info->Value = (ULONG)data->u.value.n1.n2.n3.bVal; break;
......
dlls/dbghelp/type.c
View file @ f803da49
......@@ -410,7 +410,7 @@ BOOL symt_add_function_signature_parameter(struct module* module,
return TRUE;
}
struct symt_pointer* symt_new_pointer(struct module* module, struct symt* ref_type, unsigned long size)
struct symt_pointer* symt_new_pointer(struct module* module, struct symt* ref_type, ULONG_PTR size)
{
struct symt_pointer* sym;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment