wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Dmitry Timoshkov : gdi32: Fix some DC leaks in gdi32 bitmap tests.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: fb9bca41e57582abde20f0e679767d9e4df7cca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9bca41e57582abde20f0e67… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 7 12:44:39 2010 +0900 gdi32: Fix some DC leaks in gdi32 bitmap tests. --- dlls/gdi32/tests/bitmap.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f6a4434..df658ff 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -411,7 +411,7 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; DWORD data[256]; BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; - HDC hdc = GetDC(0); + HDC hdc; char filename[MAX_PATH]; HANDLE file; DWORD written; @@ -435,11 +435,15 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) pbmi->bmiHeader.biPlanes = 1; pbmi->bmiHeader.biCompression = BI_RGB; + hdc = GetDC(0); + ret = SetDIBits( hdc, hdib, 0, 16, data, pbmi, DIB_RGB_COLORS ); ok(ret == 16 || broken(ret == 0), /* win9x */ "SetDIBits failed: expected 16 got %d\n", ret); + ReleaseDC(0, hdc); + ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); ok(info.BaseAddress == bits, "%p != %p\n", info.BaseAddress, bits); @@ -864,8 +868,8 @@ static void test_dibsections(void) DeleteObject(hdib); DeleteObject(hpal); - DeleteDC(hdcmem); + DeleteDC(hdcmem2); ReleaseDC(0, hdc); }

1 0

Eric Pouech : winedbg: Allow using 8-byte long hardware assisted breakpoints on x86_64 CPUs.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 5f23b94a27eec0ad405682f4c16f54a78f370596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f23b94a27eec0ad405682f4c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:49 2010 +0200 winedbg: Allow using 8-byte long hardware assisted breakpoints on x86_64 CPUs. --- programs/winedbg/be_x86_64.c | 4 +++- programs/winedbg/break.c | 11 ++++++----- programs/winedbg/debugger.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index ac7f1fc..514310b 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -355,6 +355,7 @@ extern void be_x86_64_disasm_one_insn(ADDRESS64* addr, int display); #define DR7_LEN_1 (0x0) #define DR7_LEN_2 (0x4) #define DR7_LEN_4 (0xC) +#define DR7_LEN_8 (0x8) #define DR7_LOCAL_ENABLE_SHIFT 0 #define DR7_GLOBAL_ENABLE_SHIFT 1 @@ -429,10 +430,11 @@ static unsigned be_x86_64_insert_Xpoint(HANDLE hProcess, const struct be_process *pr = (DWORD64)addr; if (type != be_xpoint_watch_exec) switch (size) { + case 8: bits |= DR7_LEN_8; break; case 4: bits |= DR7_LEN_4; break; case 2: bits |= DR7_LEN_2; break; case 1: bits |= DR7_LEN_1; break; - default: return 0; + default: WINE_FIXME("Unsupported xpoint_watch of size %d\n", size); return 0; } *val = reg; /* clear old values */ diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index e72f2b6..e35250c 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -137,7 +137,7 @@ static int init_xpoint(int type, const ADDRESS64* addr) * * Returns the value watched by watch point 'num'. */ -static BOOL get_watched_value(int num, LPDWORD val) +static BOOL get_watched_value(int num, DWORD64* val) { BYTE buf[4]; @@ -147,6 +147,7 @@ static BOOL get_watched_value(int num, LPDWORD val) switch (dbg_curr_process->bp[num].w.len + 1) { + case 8: *val = *(DWORD64*)buf; break; case 4: *val = *(DWORD*)buf; break; case 2: *val = *(WORD*)buf; break; case 1: *val = *(BYTE*)buf; break; @@ -554,7 +555,7 @@ static int find_triggered_watch(void) */ for (i = 0; i < dbg_curr_process->next_bp; i++) { - DWORD val = 0; + DWORD64 val = 0; if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && (be_cpu->is_watchpoint_set(&dbg_context, bp[i].info))) @@ -577,7 +578,7 @@ static int find_triggered_watch(void) */ for (i = 0; i < dbg_curr_process->next_bp; i++) { - DWORD val = 0; + DWORD64 val = 0; if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && get_watched_value(i, &val)) @@ -740,8 +741,8 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) case be_xpoint_watch_write: dbg_printf("Stopped on watchpoint %d at ", dbg_curr_thread->stopped_xpoint); print_address(addr, TRUE); - dbg_printf(" new value %u\n", - dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval); + dbg_printf(" new value %s\n", + wine_dbgstr_longlong(dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval)); } return FALSE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 9d9c1b2..d8e1ef4 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -139,7 +139,7 @@ struct dbg_breakpoint struct /* only used for watchpoints */ { BYTE len : 2; - DWORD oldval; + DWORD64 oldval; } w; struct expr* condition; };

1 0

Eric Pouech : winedbg: Simplify a bit the find_triggered_watch function.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 23671868054c2dfc8150f1aeb8086a44998cf785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23671868054c2dfc8150f1aeb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:43 2010 +0200 winedbg: Simplify a bit the find_triggered_watch function. --- programs/winedbg/break.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index ed382bc..e72f2b6 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -535,16 +535,15 @@ void break_enable_xpoint(int num, BOOL enable) * find_triggered_watch * * Lookup the watchpoints to see if one has been triggered - * Return >= (watch point index) if one is found and *oldval is set to - * the value watched before the TRAP - * Return -1 if none found (*oldval is undetermined) + * Return >= (watch point index) if one is found + * Return -1 if none found * - * Unfortunately, Linux does *NOT* (A REAL PITA) report with ptrace + * Unfortunately, Linux used to *NOT* (A REAL PITA) report with ptrace * the DR6 register value, so we have to look with our own need the * cause of the TRAP. * -EP */ -static int find_triggered_watch(LPDWORD oldval) +static int find_triggered_watch(void) { int found = -1; int i; @@ -562,7 +561,6 @@ static int find_triggered_watch(LPDWORD oldval) { be_cpu->clear_watchpoint(&dbg_context, bp[i].info); - *oldval = bp[i].w.oldval; if (get_watched_value(i, &val)) { bp[i].w.oldval = val; @@ -584,8 +582,7 @@ static int find_triggered_watch(LPDWORD oldval) if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && get_watched_value(i, &val)) { - *oldval = bp[i].w.oldval; - if (val != *oldval) + if (val != bp[i].w.oldval) { be_cpu->clear_watchpoint(&dbg_context, bp[i].info); bp[i].w.oldval = val; @@ -782,8 +779,6 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) */ void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break) { - DWORD oldval = 0; - /* break / watch points are handled on first chance */ if ( !first_chance ) { @@ -806,7 +801,7 @@ void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_br { dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); if (dbg_curr_thread->stopped_xpoint < 0) - dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); + dbg_curr_thread->stopped_xpoint = find_triggered_watch(); if (dbg_curr_thread->stopped_xpoint > 0) { /* If not single-stepping, do not back up over the break instruction */

1 0

Eric Pouech : ntdll: On x86_64 systems (as on i386 ones), hw breakpoints must generate a EXCEPTION_SINGLE_STEP exception.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 2bebb68a0b0a520a3152e6909ab2d09c98b10e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bebb68a0b0a520a3152e6909… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:37 2010 +0200 ntdll: On x86_64 systems (as on i386 ones), hw breakpoints must generate a EXCEPTION_SINGLE_STEP exception. --- dlls/ntdll/signal_x86_64.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 45cdb32..59d1d6c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2096,6 +2096,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) switch (siginfo->si_code) { case TRAP_TRACE: /* Single-step exception */ + case 4 /* TRAP_HWBKPT */: /* Hardware breakpoint exception */ rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: /* Breakpoint exception */

1 0

Eric Pouech : dbghelp: Added support for DW_CFA_GNU_args_size.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 196f8f070d039a703dc080aa7e4173ecf59476aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=196f8f070d039a703dc080aa7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:24 2010 +0200 dbghelp: Added support for DW_CFA_GNU_args_size. --- dlls/dbghelp/dwarf.c | 8 ++++++++ dlls/dbghelp/dwarf.h | 5 +++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 41e2397..4be0f6a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2672,6 +2672,14 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, ctx->data += len; break; } + case DW_CFA_GNU_args_size: + /* FIXME: should check that GCC is the compiler for this CU */ + { + ULONG_PTR args = dwarf2_leb128_as_unsigned(ctx); + TRACE("%lx: DW_CFA_GNU_args_size %lu\n", info->ip, args); + /* ignored */ + break; + } default: FIXME("%lx: unknown CFA opcode %02x\n", info->ip, op); break; diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 2a01c1b..23493d6 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -449,6 +449,11 @@ enum dwarf_call_frame_info DW_CFA_val_offset = 0x14, DW_CFA_val_offset_sf = 0x15, DW_CFA_val_expression = 0x16, + /* GNU extensions */ + DW_CFA_GNU_window_save = 0x2d, + DW_CFA_GNU_args_size = 0x2e, + DW_CFA_GNU_negative_offset_extended = 0x2f, + }; #define DW_EH_PE_native 0x00

1 0

Vincent Povirk : oleaut32: Limit the number of arguments traced.
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: d9c01dcc40f77ce7ac52a5fa2154107455af3447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c01dcc40f77ce7ac52a5fa2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 6 14:37:57 2010 -0500 oleaut32: Limit the number of arguments traced. --- dlls/oleaut32/typelib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 468f001..fd7d761 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5703,7 +5703,8 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { if (TRACE_ON(ole)) { int i; TRACE("Calling %p(",func); - for (i=0;i<nrargs;i++) TRACE("%08x,",args[i]); + for (i=0;i<min(nrargs,30);i++) TRACE("%08x,",args[i]); + if (nrargs > 30) TRACE("..."); TRACE(")\n"); }

1 0

Henri Verbeet : wined3d: Add a separate function for adding declaration elements in ConvertFvfToDeclaration ().
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 55a96174c847a807ed5672a20ea8ed0c4d70a35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a96174c847a807ed5672a20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:19 2010 +0200 wined3d: Add a separate function for adding declaration elements in ConvertFvfToDeclaration(). --- dlls/wined3d/device.c | 183 ++++++++++++++++++++++++------------------------- 1 files changed, 91 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55a96174c847a807ed567…

1 0

Henri Verbeet : wined3d: Pass the correct window to Present() in IWineGDISurfaceImpl_Flip().
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: be9e077a4d35590d06df24fb98f18ca8f34b26be URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9e077a4d35590d06df24fb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:18 2010 +0200 wined3d: Pass the correct window to Present() in IWineGDISurfaceImpl_Flip(). --- dlls/wined3d/surface_gdi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 6062a1a..a648cde 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -240,7 +240,8 @@ IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, return WINEDDERR_NOTFLIPPABLE; } - hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *) swapchain, NULL, NULL, 0, NULL, 0); + hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, + NULL, NULL, swapchain->win_handle, NULL, 0); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); return hr; }

1 0

Henri Verbeet : wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_Flip().
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 83443273c1caabec39ccf66fb36424ce23251105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83443273c1caabec39ccf66fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:17 2010 +0200 wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_Flip(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40fdff3..a6d64dc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3343,7 +3343,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS } /* Flipping a OpenGL surface -> Use WineD3DDevice::Present */ - hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *) swapchain, NULL, NULL, 0, NULL, 0); + hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, + NULL, NULL, swapchain->win_handle, NULL, 0); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); return hr; }

1 0

Henri Verbeet : wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard 07 Apr '10

07 Apr '10

Module: wine Branch: master Commit: 3b7774b37bd0fcced3b8310571d8583d6250b1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7774b37bd0fcced3b831057… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 6 20:05:16 2010 +0200 wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f0bd431..40fdff3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3856,7 +3856,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const dstSwapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; TRACE("Full screen back buffer -> front buffer blt, performing a flip instead\n"); - IWineD3DSwapChain_Present((IWineD3DSwapChain *) dstSwapchain, NULL, NULL, 0, NULL, 0); + IWineD3DSwapChain_Present((IWineD3DSwapChain *)dstSwapchain, + NULL, NULL, dstSwapchain->win_handle, NULL, 0); dstSwapchain->presentParms.SwapEffect = orig_swap;

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010