March 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Just mark the stencil write mask dirty in IWineD3DDeviceImpl_ClearSurface( ).
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 2e7e118899fc097a40227fd3f50d5269cfc4a08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e7e118899fc097a40227fd3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:36 2010 +0100 wined3d: Just mark the stencil write mask dirty in IWineD3DDeviceImpl_ClearSurface(). --- dlls/wined3d/device.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b25c4ec..fab9e65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4397,10 +4397,11 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); } + glStencilMask(~0U); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); glClearStencil(Stencil); checkGLcall("glClearStencil"); glMask = glMask | GL_STENCIL_BUFFER_BIT; - glStencilMask(0xFFFFFFFF); } if (Flags & WINED3DCLEAR_ZBUFFER) { @@ -4484,10 +4485,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } } - /* Restore the old values (why..?) */ - if (Flags & WINED3DCLEAR_STENCIL) { - glStencilMask(This->stateBlock->renderState[WINED3DRS_STENCILWRITEMASK]); - } if (Flags & WINED3DCLEAR_TARGET) { DWORD mask = This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE]; glColorMask(mask & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE,

1 0

Henri Verbeet : wined3d: Use the same order of operations for depth clears as for stencil clears.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 9eb5ba435ed9f57cfe5cecda2d94ea5701134acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb5ba435ed9f57cfe5cecda2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:37 2010 +0100 wined3d: Use the same order of operations for depth clears as for stencil clears. --- dlls/wined3d/device.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fab9e65..3acbc30 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4404,16 +4404,17 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac glMask = glMask | GL_STENCIL_BUFFER_BIT; } - if (Flags & WINED3DCLEAR_ZBUFFER) { + if (Flags & WINED3DCLEAR_ZBUFFER) + { DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) + surface_load_ds_location(This->stencilBufferTarget, context, location); + glDepthMask(GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); glClearDepth(Z); checkGLcall("glClearDepth"); glMask = glMask | GL_DEPTH_BUFFER_BIT; - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); - - if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) - surface_load_ds_location(This->stencilBufferTarget, context, location); } if (Flags & WINED3DCLEAR_TARGET) {

1 0

Henri Verbeet : wined3d: Just mark the color write mask dirty in IWineD3DDeviceImpl_ClearSurface().
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 9866125e23e76048a2b613dca2002195587b204e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9866125e23e76048a2b613dca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:38 2010 +0100 wined3d: Just mark the color write mask dirty in IWineD3DDeviceImpl_ClearSurface(). --- dlls/wined3d/device.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3acbc30..a6ba6a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4417,16 +4417,12 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac glMask = glMask | GL_DEPTH_BUFFER_BIT; } - if (Flags & WINED3DCLEAR_TARGET) { - TRACE("Clearing screen with glClear to color %x\n", Color); - glClearColor(D3DCOLOR_R(Color), - D3DCOLOR_G(Color), - D3DCOLOR_B(Color), - D3DCOLOR_A(Color)); - checkGLcall("glClearColor"); - - /* Clear ALL colors! */ + if (Flags & WINED3DCLEAR_TARGET) + { glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + glClearColor(D3DCOLOR_R(Color), D3DCOLOR_G(Color), D3DCOLOR_B(Color), D3DCOLOR_A(Color)); + checkGLcall("glClearColor"); glMask = glMask | GL_COLOR_BUFFER_BIT; } @@ -4486,16 +4482,8 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } } - if (Flags & WINED3DCLEAR_TARGET) { - DWORD mask = This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE]; - glColorMask(mask & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, - mask & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, - mask & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, - mask & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE); - - /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists, - * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it - */ + if (Flags & WINED3DCLEAR_TARGET) + { IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); } if (Flags & WINED3DCLEAR_ZBUFFER) {

1 0

Henri Verbeet : d3d9/tests: Add some message processing to test_wndproc().
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: ab4bf7600ae15186d9f614f71a64456390f6b226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4bf7600ae15186d9f614f71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:39 2010 +0100 d3d9/tests: Add some message processing to test_wndproc(). For some reason Windows XP allows device creation to be blocked by the lack of message processing in wndproc_thread(). Thanks to Wylda for helping debug this. Disabled testing the focus and foreground windows after creating the device for the moment. --- dlls/d3d9/tests/device.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index eb424e2..0004715 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2370,8 +2370,19 @@ static DWORD WINAPI wndproc_thread(void *param) ret = SetEvent(p->window_created); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); - res = WaitForSingleObject(p->test_finished, INFINITE); - ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + for (;;) + { + MSG msg; + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + res = WaitForSingleObject(p->test_finished, 100); + if (res == WAIT_OBJECT_0) break; + if (res != WAIT_TIMEOUT) + { + ok(0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + break; + } + } DestroyWindow(p->dummy_window); @@ -2389,6 +2400,7 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; + MSG msg; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2434,6 +2446,8 @@ static void test_wndproc(void) expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + device = create_device(d3d9, device_window, focus_window, FALSE); if (!device) { @@ -2443,10 +2457,13 @@ static void test_wndproc(void) ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", expect_message.message, expect_message.window); - tmp = GetFocus(); - todo_wine ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); - tmp = GetForegroundWindow(); - todo_wine ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + if (0) /* Disabled until we can make this work in a reliable way on Wine. */ + { + tmp = GetFocus(); + ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + } SetForegroundWindow(focus_window); filter_messages = focus_window;

1 0

Henri Verbeet : d3d8/tests: Add some message processing to test_wndproc().
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: d11185a8906ac4bf0dc581e54b0f827abe5618f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11185a8906ac4bf0dc581e54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:40 2010 +0100 d3d8/tests: Add some message processing to test_wndproc(). Disabled testing the focus and foreground windows after creating the device for the moment. --- dlls/d3d8/tests/device.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c0e1985..cd2df9a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1525,8 +1525,19 @@ static DWORD WINAPI wndproc_thread(void *param) ret = SetEvent(p->window_created); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); - res = WaitForSingleObject(p->test_finished, INFINITE); - ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + for (;;) + { + MSG msg; + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + res = WaitForSingleObject(p->test_finished, 100); + if (res == WAIT_OBJECT_0) break; + if (res != WAIT_TIMEOUT) + { + ok(0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + break; + } + } DestroyWindow(p->dummy_window); @@ -1544,6 +1555,7 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; + MSG msg; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1589,6 +1601,8 @@ static void test_wndproc(void) expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + device = create_device(d3d8, device_window, focus_window, FALSE); if (!device) { @@ -1598,10 +1612,13 @@ static void test_wndproc(void) ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", expect_message.message, expect_message.window); - tmp = GetFocus(); - todo_wine ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); - tmp = GetForegroundWindow(); - todo_wine ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + if (0) /* Disabled until we can make this work in a reliable way on Wine. */ + { + tmp = GetFocus(); + ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + } SetForegroundWindow(focus_window); filter_messages = focus_window;

1 0

Mikhail Maroukhine : comctl32/tests: Remove superfluous casts.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: ad68792a14f1226cade9d01019ad872512e5a800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad68792a14f1226cade9d0101… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Thu Mar 25 01:46:25 2010 +0600 comctl32/tests: Remove superfluous casts. --- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/monthcal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5441cfc..aa3db80 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3293,7 +3293,7 @@ static void test_getitemrect(void) expect(18, rect.left); expect(50, rect.right); - r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, 0); ok(r != 0, "should return current list handle\n"); r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ea10b9f..d1fa8de 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -968,7 +968,7 @@ static void test_monthcal_hittest(void) expect(-1, res); expect(0, mchit.uHit); /* test with invalid pointer */ - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)NULL); + res = SendMessage(hwnd, MCM_HITTEST, 0, 0); expect(-1, res); /* resize control to display single Calendar */

1 0

Eric Pouech : dbghelp: Enhanced x86_64 stack unwinding with PE' s function table data.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 51e9951a5f32ba581d15b9b3c11d1d3d09fee931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e9951a5f32ba581d15b9b3c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:03:53 2010 +0100 dbghelp: Enhanced x86_64 stack unwinding with PE's function table data. --- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/cpu_ppc.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 452 ++++++++++++++++++++++++++++++++++++++-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/stack.c | 4 +- 5 files changed, 444 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51e9951a5f32ba581d15b…

1 0

Eric Pouech : dbghelp: Fixed a couple of portability issues to 64bit platforms.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: e6a08a1e15db1f62869c1c15c12687d3959e64e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a08a1e15db1f62869c1c15c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:04:00 2010 +0100 dbghelp: Fixed a couple of portability issues to 64bit platforms. --- dlls/dbghelp/dwarf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2432f89..d8aff0f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2213,7 +2213,7 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE unsigned long ip, dwarf2_traverse_context_t* lctx) { - DWORD beg, end; + DWORD_PTR beg, end; const BYTE* ptr = start; DWORD len; @@ -2240,7 +2240,7 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, const struct symt_function* func, - DWORD ip, struct location* frame) + DWORD_PTR ip, struct location* frame) { struct symt** psym = NULL; struct location* pframe; @@ -2292,7 +2292,7 @@ static void dwarf2_location_compute(struct process* pcs, struct location* loc) { struct location frame; - DWORD ip; + DWORD_PTR ip; int err; dwarf2_traverse_context_t lctx;

1 0

Eric Pouech : dbghelp: Don't try to hardwire the dwarf's "word size", but get it properly.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 8413810c6c2c3a132dcb5b85d8fffef24e617590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8413810c6c2c3a132dcb5b85d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:04:06 2010 +0100 dbghelp: Don't try to hardwire the dwarf's "word size", but get it properly. --- dlls/dbghelp/dwarf.c | 48 ++++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d8aff0f..ebf019d 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -189,7 +189,6 @@ typedef struct dwarf2_parse_context_s struct sparse_array debug_info_table; unsigned long load_offset; unsigned long ref_offset; - unsigned char word_size; struct symt* symt_cache[sc_num]; /* void, int1, int2, int4 */ } dwarf2_parse_context_t; @@ -197,6 +196,7 @@ typedef struct dwarf2_parse_context_s struct dwarf2_module_info_s { dwarf2_section_t debug_loc; + unsigned char word_size; }; #define loc_dwarf2_location_list (loc_user + 0) @@ -489,7 +489,8 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, { case DW_FORM_ref_addr: case DW_FORM_addr: - attr->u.uvalue = dwarf2_get_addr(data, ctx->word_size); + attr->u.uvalue = dwarf2_get_addr(data, + ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); TRACE("addr<0x%lx>\n", attr->u.uvalue); break; @@ -922,7 +923,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, lctx.data = xloc.u.block.ptr; lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; - lctx.word_size = ctx->word_size; + lctx.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; err = compute_location(&lctx, loc, NULL, frame); if (err < 0) @@ -1957,7 +1958,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, traverse.data = sections[section_line].address + offset; traverse.end_data = traverse.data + 4; - traverse.word_size = ctx->word_size; + traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; length = dwarf2_parse_u4(&traverse); traverse.end_data = sections[section_line].address + offset + length; @@ -2149,11 +2150,13 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return FALSE; } + module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = cu_ctx.word_size; + mod_ctx->word_size = cu_ctx.word_size; + pool_init(&ctx.pool, 65536); ctx.sections = sections; ctx.section = section_debug; ctx.module = module; - ctx.word_size = cu_ctx.word_size; ctx.thunks = thunks; ctx.load_offset = load_offset; ctx.ref_offset = comp_unit_start - sections[section_debug].address; @@ -2228,7 +2231,7 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE { lctx->data = ptr; lctx->end_data = ptr + len; - lctx->word_size = 4; /* FIXME word size !!! */ + lctx->word_size = modfmt->u.dwarf2_info->word_size; return TRUE; } ptr += len; @@ -2325,7 +2328,7 @@ static void dwarf2_location_compute(struct process* pcs, lctx.data = (const BYTE*)(ptr + 1); lctx.end_data = lctx.data + *ptr; - lctx.word_size = 4; /* FIXME !! */ + lctx.word_size = modfmt->u.dwarf2_info->word_size; } do_compute: /* now get the variable */ @@ -2350,7 +2353,6 @@ static void dwarf2_location_compute(struct process* pcs, static void dwarf2_module_remove(struct process* pcs, struct module_format* modfmt) { - HeapFree(GetProcessHeap(), 0, modfmt->u.dwarf2_info); HeapFree(GetProcessHeap(), 0, modfmt); } @@ -2381,7 +2383,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_section_t section[section_max]; dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, - debug_line_sect, debug_loclist_sect; + debug_line_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; @@ -2415,29 +2417,23 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, mod_ctx.data = section[section_debug].address; mod_ctx.end_data = mod_ctx.data + section[section_debug].size; + mod_ctx.word_size = 0; /* will be correctly set later on */ - dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt)); - if (!dwarf2_modfmt) return FALSE; + dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, + sizeof(*dwarf2_modfmt) + sizeof(*dwarf2_modfmt->u.dwarf2_info)); + if (!dwarf2_modfmt) + { + ret = FALSE; + goto leave; + } dwarf2_modfmt->module = module; dwarf2_modfmt->remove = dwarf2_module_remove; dwarf2_modfmt->loc_compute = dwarf2_location_compute; - dwarf2_modfmt->u.dwarf2_info = NULL; + dwarf2_modfmt->u.dwarf2_info = (struct dwarf2_module_info_s*)(dwarf2_modfmt + 1); + dwarf2_modfmt->u.dwarf2_info->word_size = 0; /* will be correctly set later on */ dwarf2_modfmt->module->format_info[DFI_DWARF] = dwarf2_modfmt; - image_find_section(fmap, ".debug_loc", &debug_loclist_sect); - if (image_get_map_size(&debug_loclist_sect)) - { - /* initialize the dwarf2 specific info block for this module. - * As we'll need later the .debug_loc section content, we won't unmap this - * section upon existing this function - */ - dwarf2_modfmt->u.dwarf2_info = HeapAlloc(GetProcessHeap(), 0, - sizeof(*dwarf2_modfmt->u.dwarf2_info)); - if (!dwarf2_modfmt->u.dwarf2_info) goto leave; - dwarf2_modfmt->u.dwarf2_info->debug_loc.address = (const BYTE*)image_map_section(&debug_loclist_sect); - dwarf2_modfmt->u.dwarf2_info->debug_loc.size = image_get_map_size(&debug_loclist_sect); - } - else image_unmap_section(&debug_loclist_sect); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); while (mod_ctx.data < mod_ctx.end_data) {

1 0

Eric Pouech : dbghelp: In dwarf parsing, correctly get the size of addresses in location lists.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 403f41687e2b978c5382556cca1c2380fdb0c25b URL: http://source.winehq.org/git/wine.git/?a=commit;h=403f41687e2b978c5382556cc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:04:12 2010 +0100 dbghelp: In dwarf parsing, correctly get the size of addresses in location lists. --- dlls/dbghelp/dwarf.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ebf019d..5513bed 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2213,8 +2213,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, } static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE* start, - unsigned long ip, - dwarf2_traverse_context_t* lctx) + unsigned long ip, dwarf2_traverse_context_t* lctx) { DWORD_PTR beg, end; const BYTE* ptr = start; @@ -2222,8 +2221,8 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE while (ptr < modfmt->u.dwarf2_info->debug_loc.address + modfmt->u.dwarf2_info->debug_loc.size) { - beg = dwarf2_get_u4(ptr); ptr += 4; - end = dwarf2_get_u4(ptr); ptr += 4; + beg = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; + end = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; if (!beg && !end) break; len = dwarf2_get_u2(ptr); ptr += 2;

1 0