winedbg: Fixed a few data types.

This commit is contained in:
Alexandre Julliard 2006-12-20 14:10:47 +01:00
parent 938657b1c1
commit 2bc33389e8
5 changed files with 13 additions and 13 deletions

View File

@ -574,7 +574,7 @@ static unsigned be_i386_is_func_call(const void* insn, ADDRESS64* callee)
#define DR7_ENABLE_MASK(dr) (1<<(DR7_LOCAL_ENABLE_SHIFT+DR7_ENABLE_SIZE*(dr)))
#define IS_DR7_SET(ctrl,dr) ((ctrl)&DR7_ENABLE_MASK(dr))
static inline int be_i386_get_unused_DR(CONTEXT* ctx, unsigned long** r)
static inline int be_i386_get_unused_DR(CONTEXT* ctx, DWORD** r)
{
if (!IS_DR7_SET(ctx->Dr7, 0))
{
@ -607,7 +607,7 @@ static unsigned be_i386_insert_Xpoint(HANDLE hProcess, const struct be_process_i
{
unsigned char ch;
SIZE_T sz;
unsigned long* pr;
DWORD *pr;
int reg;
unsigned long bits;
@ -630,7 +630,7 @@ static unsigned be_i386_insert_Xpoint(HANDLE hProcess, const struct be_process_i
bits = DR7_RW_WRITE;
hw_bp:
if ((reg = be_i386_get_unused_DR(ctx, &pr)) == -1) return 0;
*pr = (unsigned long)addr;
*pr = (DWORD)addr;
if (type != be_xpoint_watch_exec) switch (size)
{
case 4: bits |= DR7_LEN_4; break;

View File

@ -132,7 +132,7 @@ struct dbg_breakpoint
xpoint_type : 2,
refcount : 13,
skipcount : 16;
DWORD info;
unsigned long info;
struct /* only used for watchpoints */
{
BYTE len : 2;
@ -325,7 +325,7 @@ extern int expr_print(const struct expr* exp);
/* info.c */
extern void print_help(void);
extern void info_help(void);
extern void info_win32_module(DWORD mod);
extern void info_win32_module(DWORD64 mod);
extern void info_win32_class(HWND hWnd, const char* clsName);
extern void info_win32_window(HWND hWnd, BOOL detailed);
extern void info_win32_processes(void);

View File

@ -609,7 +609,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de)
}
}
static void resume_debuggee(struct gdb_context* gdbctx, unsigned long cont)
static void resume_debuggee(struct gdb_context* gdbctx, DWORD cont)
{
if (dbg_curr_thread)
{
@ -626,7 +626,7 @@ static void resume_debuggee(struct gdb_context* gdbctx, unsigned long cont)
}
static void resume_debuggee_thread(struct gdb_context* gdbctx, unsigned long cont, unsigned int threadid)
static void resume_debuggee_thread(struct gdb_context* gdbctx, DWORD cont, unsigned int threadid)
{
if (dbg_curr_thread)
@ -725,7 +725,7 @@ static void detach_debuggee(struct gdb_context* gdbctx, BOOL kill)
static void get_process_info(struct gdb_context* gdbctx, char* buffer, size_t len)
{
unsigned long status;
DWORD status;
if (!GetExitCodeProcess(gdbctx->process->handle, &status))
{
@ -760,7 +760,7 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid,
char* buffer, size_t len)
{
struct dbg_thread* thd;
unsigned long status;
DWORD status;
int prio;
/* FIXME: use the size of buffer */

View File

@ -198,7 +198,7 @@ static BOOL CALLBACK info_mod_cb(PSTR mod_name, DWORD64 base, void* ctx)
*
* Display information about a given module (DLL or EXE), or about all modules
*/
void info_win32_module(DWORD base)
void info_win32_module(DWORD64 base)
{
struct info_module im;
int i, j, num_printed = 0;
@ -263,7 +263,7 @@ void info_win32_module(DWORD base)
HeapFree(GetProcessHeap(), 0, im.mi);
if (base && !num_printed)
dbg_printf("'0x%08lx' is not a valid module address\n", base);
dbg_printf("'0x%lx%08lx' is not a valid module address\n", (DWORD)(base >> 32), (DWORD)base);
}
struct class_walker

View File

@ -85,7 +85,7 @@ static inline struct tgt_process_minidump_data* PRIVATE(struct dbg_process* pcs)
}
static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr,
void* buffer, DWORD len, DWORD* rlen)
void* buffer, SIZE_T len, SIZE_T* rlen)
{
ULONG size;
MINIDUMP_DIRECTORY* dir;
@ -127,7 +127,7 @@ static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr,
}
static BOOL WINAPI tgt_process_minidump_write(HANDLE hProcess, void* addr,
const void* buffer, DWORD len, DWORD* wlen)
const void* buffer, SIZE_T len, SIZE_T* wlen)
{
return FALSE;
}