April 2011 - Wine-Commits - list.winehq.org

Andrew Nguyen : winevdm: Fix incorrect heap allocation sizes and possible out-of-bounds access in find_dosbox helper .
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 3474e3da22c767c2ea3472120f032576733bcdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3474e3da22c767c2ea3472120… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:25:15 2011 -0500 winevdm: Fix incorrect heap allocation sizes and possible out-of-bounds access in find_dosbox helper. --- programs/winevdm/winevdm.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index ca55d80..0aaf041 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -114,11 +114,15 @@ static char *find_dosbox(void) const char *envpath = getenv( "PATH" ); struct stat st; char *path, *p, *buffer, *dir; + size_t envpath_len; if (!envpath) return NULL; - path = HeapAlloc( GetProcessHeap(), 0, strlen(envpath) ); - buffer = HeapAlloc( GetProcessHeap(), 0, strlen(path) + sizeof("/dosbox") ); + + envpath_len = strlen( envpath ); + path = HeapAlloc( GetProcessHeap(), 0, envpath_len + 1 ); + buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + sizeof("/dosbox") ); strcpy( path, envpath ); + p = path; while (*p) { @@ -126,7 +130,7 @@ static char *find_dosbox(void) if (!*p) break; dir = p; while (*p && *p != ':') p++; - *p++ = 0; + if (*p == ':') *p++ = 0; strcpy( buffer, dir ); strcat( buffer, "/dosbox" ); if (!stat( buffer, &st ))

1 0

André Hentschel : ntdll: Implement call_stack_handlers on ARM.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 372a32b53ecae0f1e9d0843f3b33bc7201f7154f URL: http://source.winehq.org/git/wine.git/?a=commit;h=372a32b53ecae0f1e9d0843f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:37:58 2011 +0200 ntdll: Implement call_stack_handlers on ARM. --- dlls/ntdll/signal_arm.c | 59 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index eb2a1b1..c87bb1c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -93,6 +93,16 @@ static inline int dispatch_signal(unsigned int sig) return handlers[sig](sig); } +/******************************************************************* + * is_valid_frame + */ +static inline BOOL is_valid_frame( void *frame ) +{ + if ((ULONG_PTR)frame & 3) return FALSE; + return (frame >= NtCurrentTeb()->Tib.StackLimit && + (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); +} + /*********************************************************************** * save_context * @@ -305,14 +315,49 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) */ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) { - EXCEPTION_POINTERS ptrs; + EXCEPTION_REGISTRATION_RECORD *frame, *dispatch, *nested_frame; + DWORD res; - FIXME( "not implemented on ARM, exceptioncode: %x\n", rec->ExceptionCode ); + frame = NtCurrentTeb()->Tib.ExceptionList; + nested_frame = NULL; + while (frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) + { + /* Check frame address */ + if (!is_valid_frame( frame )) + { + rec->ExceptionFlags |= EH_STACK_INVALID; + break; + } - /* hack: call unhandled exception filter directly */ - ptrs.ExceptionRecord = rec; - ptrs.ContextRecord = context; - unhandled_exception_filter( &ptrs ); + /* Call handler */ + TRACE( "calling handler at %p code=%x flags=%x\n", + frame->Handler, rec->ExceptionCode, rec->ExceptionFlags ); + res = frame->Handler( rec, frame, context, &dispatch ); + TRACE( "handler at %p returned %x\n", frame->Handler, res ); + + if (frame == nested_frame) + { + /* no longer nested */ + nested_frame = NULL; + rec->ExceptionFlags &= ~EH_NESTED_CALL; + } + + switch(res) + { + case ExceptionContinueExecution: + if (!(rec->ExceptionFlags & EH_NONCONTINUABLE)) return STATUS_SUCCESS; + return STATUS_NONCONTINUABLE_EXCEPTION; + case ExceptionContinueSearch: + break; + case ExceptionNestedException: + if (nested_frame < dispatch) nested_frame = dispatch; + rec->ExceptionFlags |= EH_NESTED_CALL; + break; + default: + return STATUS_INVALID_DISPOSITION; + } + frame = frame->Prev; + } return STATUS_UNHANDLED_EXCEPTION; }

1 0

André Hentschel : winedbg: Be more verbose about what' s not done.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 12a4706fdee530751027a97006176d9598afd3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a4706fdee530751027a9700… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:36:25 2011 +0200 winedbg: Be more verbose about what's not done. --- programs/winedbg/be_arm.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3a4df2b..8f07251 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -52,7 +52,7 @@ static unsigned be_arm_get_register_info(int regno, enum be_cpu_addr* kind) static void be_arm_single_step(CONTEXT* ctx, unsigned enable) { - dbg_printf("not done\n"); + dbg_printf("be_arm_single_step: not done\n"); } static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) @@ -81,19 +81,19 @@ static struct dbg_internal_var be_arm_ctx[] = static unsigned be_arm_is_step_over_insn(const void* insn) { - dbg_printf("not done\n"); + dbg_printf("be_arm_is_step_over_insn: not done\n"); return FALSE; } static unsigned be_arm_is_function_return(const void* insn) { - dbg_printf("not done\n"); + dbg_printf("be_arm_is_function_return: not done\n"); return FALSE; } static unsigned be_arm_is_break_insn(const void* insn) { - dbg_printf("not done\n"); + dbg_printf("be_arm_is_break_insn: not done\n"); return FALSE; } @@ -151,13 +151,13 @@ static unsigned be_arm_remove_Xpoint(HANDLE hProcess, const struct be_process_io static unsigned be_arm_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) { - dbg_printf("not done\n"); + dbg_printf("be_arm_is_watchpoint_set: not done\n"); return FALSE; } static void be_arm_clear_watchpoint(CONTEXT* ctx, unsigned idx) { - dbg_printf("not done\n"); + dbg_printf("be_arm_clear_watchpoint: not done\n"); } static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) @@ -174,14 +174,14 @@ static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, unsigned ext_sign, LONGLONG* ret) { - dbg_printf("not done\n"); + dbg_printf("be_arm_fetch_integer: not done\n"); return FALSE; } static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - dbg_printf("not done\n"); + dbg_printf("be_arm_fetch_float: not done\n"); return FALSE; }

1 0

Andrew Nguyen : nddeapi: Implement the documented Network DDE functions.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 281f86eae4fcd557a5bd1adc56dd5900ef10cc87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281f86eae4fcd557a5bd1adc5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:21:46 2011 -0500 nddeapi: Implement the documented Network DDE functions. --- dlls/nddeapi/nddeapi.c | 305 ++++++++++++++++++++++++++++++++++++++++++++- dlls/nddeapi/nddeapi.spec | 53 ++++---- 2 files changed, 328 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=281f86eae4fcd557a5bd1…

1 0

André Hentschel : winedbg: Implement be_arm_get_register_info.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: c9f76576ab162bec94a31e8a5c978f6ebc1a1961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f76576ab162bec94a31e8a5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 16 15:06:50 2011 +0200 winedbg: Implement be_arm_get_register_info. --- programs/winedbg/be_arm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 8bef147..3a4df2b 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -41,7 +41,12 @@ static unsigned be_arm_get_addr(HANDLE hThread, const CONTEXT* ctx, static unsigned be_arm_get_register_info(int regno, enum be_cpu_addr* kind) { - dbg_printf("not done\n"); + switch (regno) + { + case CV_ARM_PC: *kind = be_cpu_addr_pc; return TRUE; + case CV_ARM_R0 + 11: *kind = be_cpu_addr_frame; return TRUE; + case CV_ARM_SP: *kind = be_cpu_addr_stack; return TRUE; + } return FALSE; }

1 0

André Hentschel : winedbg: Implement be_arm_print_context.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: becb336dc7d5e5d525fa78120ad2bbceb681093b URL: http://source.winehq.org/git/wine.git/?a=commit;h=becb336dc7d5e5d525fa78120… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:33:54 2011 +0200 winedbg: Implement be_arm_print_context. --- programs/winedbg/be_arm.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 99336e2..8bef147 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -52,7 +52,17 @@ static void be_arm_single_step(CONTEXT* ctx, unsigned enable) static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { - dbg_printf("Context printing for arm not done yet\n"); + dbg_printf("Register dump:\n"); + dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x\n", + ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr); + dbg_printf(" r0:%04x r1:%04x r2:%04x r3:%04x\n", + ctx->R0, ctx->R1, ctx->R2, ctx->R3); + dbg_printf(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x\n", + ctx->R4, ctx->R5, ctx->R6, ctx->R7, ctx->R8 ); + dbg_printf(" r9:%04x r10:%04x Fp:%04x Ip:%04x\n", + ctx->R9, ctx->R10, ctx->Fp, ctx->Ip ); + + if (all_regs) dbg_printf( "Floating point ARM dump not implemented\n" ); } static void be_arm_print_segment_info(HANDLE hThread, const CONTEXT* ctx)

1 0

André Hentschel : ntdll: Trace context on ARM.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 5b345c9b6089ec61701849dfefd1f40f708c6c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b345c9b6089ec61701849dfe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:33:23 2011 +0200 ntdll: Trace context on ARM. --- dlls/ntdll/signal_arm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e92ebcc..eb2a1b1 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -345,7 +345,12 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f } else { - /* FIXME: dump context */ + TRACE(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x r0:%04x r1:%04x r2:%04x r3:%04x\n", + context->Pc, context->Sp, context->Lr, context->Cpsr, + context->R0, context->R1, context->R2, context->R3); + TRACE(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x r9:%04x r10:%04x Fp:%04x Ip:%04x\n", + context->R4, context->R5, context->R6, context->R7, context->R8, + context->R9, context->R10, context->Fp, context->Ip ); } status = send_debug_event( rec, TRUE, context );

1 0

André Hentschel : dbghelp: Implement arm_fetch_regname .
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 1bae92b9bbf0a333dd1606d46b9112b3ea98731a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bae92b9bbf0a333dd1606d46… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:34:11 2011 +0200 dbghelp: Implement arm_fetch_regname. --- dlls/dbghelp/cpu_arm.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 2dd20a0..f201a1d 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -69,6 +69,27 @@ static void* arm_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) static const char* arm_fetch_regname(unsigned regno) { + switch (regno) + { + case CV_ARM_R0 + 0: return "r0"; + case CV_ARM_R0 + 1: return "r1"; + case CV_ARM_R0 + 2: return "r2"; + case CV_ARM_R0 + 3: return "r3"; + case CV_ARM_R0 + 4: return "r4"; + case CV_ARM_R0 + 5: return "r5"; + case CV_ARM_R0 + 6: return "r6"; + case CV_ARM_R0 + 7: return "r7"; + case CV_ARM_R0 + 8: return "r8"; + case CV_ARM_R0 + 9: return "r9"; + case CV_ARM_R0 + 10: return "r10"; + case CV_ARM_R0 + 11: return "r11"; + case CV_ARM_R0 + 12: return "r12"; + + case CV_ARM_SP: return "sp"; + case CV_ARM_LR: return "lr"; + case CV_ARM_PC: return "pc"; + case CV_ARM_CPSR: return "cpsr"; + } FIXME("Unknown register %x\n", regno); return NULL; }

1 0

André Hentschel : dbghelp: Implement arm_fetch_context_reg.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: bdcc47d9e75f57fef016bacd4b0b5d563e424fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcc47d9e75f57fef016bacd4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:34:32 2011 +0200 dbghelp: Implement arm_fetch_context_reg. --- dlls/dbghelp/cpu_arm.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index f201a1d..365caa3 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -63,7 +63,30 @@ static unsigned arm_map_dwarf_register(unsigned regno) static void* arm_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) { - FIXME("not done for ARM\n"); +#ifdef __arm__ + switch (regno) + { + case CV_ARM_R0 + 0: *size = sizeof(ctx->R0); return &ctx->R0; + case CV_ARM_R0 + 1: *size = sizeof(ctx->R1); return &ctx->R1; + case CV_ARM_R0 + 2: *size = sizeof(ctx->R2); return &ctx->R2; + case CV_ARM_R0 + 3: *size = sizeof(ctx->R3); return &ctx->R3; + case CV_ARM_R0 + 4: *size = sizeof(ctx->R4); return &ctx->R4; + case CV_ARM_R0 + 5: *size = sizeof(ctx->R5); return &ctx->R5; + case CV_ARM_R0 + 6: *size = sizeof(ctx->R6); return &ctx->R6; + case CV_ARM_R0 + 7: *size = sizeof(ctx->R7); return &ctx->R7; + case CV_ARM_R0 + 8: *size = sizeof(ctx->R8); return &ctx->R8; + case CV_ARM_R0 + 9: *size = sizeof(ctx->R9); return &ctx->R9; + case CV_ARM_R0 + 10: *size = sizeof(ctx->R10); return &ctx->R10; + case CV_ARM_R0 + 11: *size = sizeof(ctx->Fp); return &ctx->Fp; + case CV_ARM_R0 + 12: *size = sizeof(ctx->Ip); return &ctx->Ip; + + case CV_ARM_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; + case CV_ARM_LR: *size = sizeof(ctx->Lr); return &ctx->Lr; + case CV_ARM_PC: *size = sizeof(ctx->Pc); return &ctx->Pc; + case CV_ARM_CPSR: *size = sizeof(ctx->Cpsr); return &ctx->Cpsr; + } +#endif + FIXME("Unknown register %x\n", regno); return NULL; }

1 0

André Hentschel : ntdll: Add implementation for RtlCaptureContext on ARM.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: c8c5b6e08fe784e9a56a13d59239f08e2b1e5c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c5b6e08fe784e9a56a13d59… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:32:55 2011 +0200 ntdll: Add implementation for RtlCaptureContext on ARM. --- dlls/ntdll/signal_arm.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0934164..e92ebcc 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -160,11 +160,17 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -void WINAPI RtlCaptureContext( CONTEXT *context ) -{ - FIXME("not implemented\n"); - memset( context, 0, sizeof(*context) ); -} +/* FIXME: Use the Stack instead of the actual register values */ +__ASM_STDCALL_FUNC( RtlCaptureContext, 4, + "stmfd SP!, {r1}\n\t" + "mov r1, #0x40\n\t" /* CONTEXT_ARM */ + "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ + "str r1, [r0]\n\t" /* context->ContextFlags */ + "ldmfd SP!, {r1}\n\t" + "stmib r0, {r0-pc}\n\t" /* Push registers to pointer */ + "mrs r1, CPSR\n\t" + "stmib r0, {r1}\n\t" /* context->Cpsr */ + ) /***********************************************************************

1 0