wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Stefan Dösinger : wined3d: Implement unfenced updates of double buffered buffers.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 6c53871d302cdd257675b88a01a7b6fc4944b06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c53871d302cdd257675b88a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 11 12:34:22 2010 +0100 wined3d: Implement unfenced updates of double buffered buffers. --- dlls/wined3d/buffer.c | 83 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 62 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 37c3feb..08d3097 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -767,7 +767,7 @@ static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) } /* The caller provides a GL context */ -static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) +static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info, DWORD flags) { BYTE *map; UINT start = 0, len = 0; @@ -779,6 +779,14 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined { GLbitfield mapflags; mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + if (flags & WINED3D_BUFFER_DISCARD) + { + mapflags |= GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT; + } + else if (flags & WINED3D_BUFFER_NOSYNC) + { + mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; + } map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, This->resource.size, mapflags)); checkGLcall("glMapBufferRange"); @@ -828,8 +836,10 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) BOOL decl_changed = FALSE; unsigned int i, j; BYTE *data; + DWORD flags = This->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); TRACE("iface %p\n", iface); + This->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); @@ -927,6 +937,10 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) ERR("buffer_add_dirty_area failed, this is not expected\n"); return; } + /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application + * cleared for unsynchronized updates + */ + flags = 0; } if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) @@ -949,7 +963,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) return; } - buffer_direct_upload(This, context->gl_info); + buffer_direct_upload(This, context->gl_info, flags); context_release(context); return; @@ -1129,6 +1143,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; LONG count; + BOOL dirty = buffer_is_dirty(This); TRACE("iface %p, offset %u, size %u, data %p, flags %#x\n", iface, offset, size, data, flags); @@ -1140,36 +1155,58 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, count = InterlockedIncrement(&This->lock_count); - if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) && This->buffer_object) + if (This->buffer_object) { - if(count == 1) + if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { - IWineD3DDeviceImpl *device = This->resource.device; - struct wined3d_context *context; - const struct wined3d_gl_info *gl_info; - - if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + if(count == 1) { - IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_INDEXBUFFER); - } + IWineD3DDeviceImpl *device = This->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; - context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - gl_info = context->gl_info; - ENTER_GL(); - GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); + if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + { + IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_INDEXBUFFER); + } - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); + gl_info = context->gl_info; + ENTER_GL(); + GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield mapflags = buffer_gl_map_flags(flags); + This->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, + This->resource.size, mapflags)); + } + else + { + This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + } + LEAVE_GL(); + context_release(context); + } + } + else + { + if (dirty) { - GLbitfield mapflags = buffer_gl_map_flags(flags); - This->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, - This->resource.size, mapflags)); + if (This->flags & WINED3D_BUFFER_NOSYNC && !(flags & WINED3DLOCK_NOOVERWRITE)) + { + This->flags &= ~WINED3D_BUFFER_NOSYNC; + } } - else + else if(flags & WINED3DLOCK_NOOVERWRITE) { - This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + This->flags |= WINED3D_BUFFER_NOSYNC; + } + + if (flags & WINED3DLOCK_DISCARD) + { + This->flags |= WINED3D_BUFFER_DISCARD; } - LEAVE_GL(); - context_release(context); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c362bf..2271d4e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2478,6 +2478,8 @@ struct wined3d_map_range #define WINED3D_BUFFER_CREATEBO 0x04 /* Attempt to create a buffer object next PreLoad */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x08 /* Use a vbo and local allocated memory */ #define WINED3D_BUFFER_FLUSH 0x10 /* Manual unmap flushing */ +#define WINED3D_BUFFER_DISCARD 0x20 /* A DISCARD lock has occured since the last PreLoad */ +#define WINED3D_BUFFER_NOSYNC 0x40 /* All locks since the last PreLoad had NOOVERWRITE set */ struct wined3d_buffer {

1 0

Stefan Dösinger : wined3d: Use glMapBuffer for 1: 1 uploads in PreLoad.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 1691a6d7d0d763ccfda489a44fa3a1e7df223ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1691a6d7d0d763ccfda489a44… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 11 12:23:19 2010 +0100 wined3d: Use glMapBuffer for 1:1 uploads in PreLoad. This is needed to take advantage of asynchronous uploads with double buffered buffers --- dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 86d6fb4..37c3feb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -766,6 +766,59 @@ static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) return resource_get_priority((IWineD3DResource *)iface); } +/* The caller provides a GL context */ +static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) +{ + BYTE *map; + UINT start = 0, len = 0; + + ENTER_GL(); + GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); + checkGLcall("glBindBufferARB"); + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield mapflags; + mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, + This->resource.size, mapflags)); + checkGLcall("glMapBufferRange"); + } + else + { + map = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_WRITE_ONLY_ARB)); + checkGLcall("glMapBufferARB"); + } + if (!map) + { + LEAVE_GL(); + ERR("Failed to map opengl buffer\n"); + return; + } + + while(This->modified_areas) + { + This->modified_areas--; + start = This->maps[This->modified_areas].offset; + len = This->maps[This->modified_areas].size; + + memcpy(map + start, This->resource.allocatedMemory + start, len); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GL_EXTCALL(glFlushMappedBufferRange(This->buffer_type_hint, start, len)); + checkGLcall("glFlushMappedBufferRange"); + } + else if (This->flags & WINED3D_BUFFER_FLUSH) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, start, len)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } + } + GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); + checkGLcall("glUnmapBufferARB"); + LEAVE_GL(); +} + static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -896,18 +949,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) return; } - ENTER_GL(); - GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); - checkGLcall("glBindBufferARB"); - while(This->modified_areas) - { - This->modified_areas--; - start = This->maps[This->modified_areas].offset; - len = This->maps[This->modified_areas].size; - GL_EXTCALL(glBufferSubDataARB(This->buffer_type_hint, start, len, This->resource.allocatedMemory + start)); - checkGLcall("glBufferSubDataARB"); - } - LEAVE_GL(); + buffer_direct_upload(This, context->gl_info); context_release(context); return;

1 0

Stefan Dösinger : wined3d: Don' t DISCARD or NOOVERWRITE non-dynamic buffers.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 04752991b1b427282229da6fba2fa2c6075ffabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=04752991b1b427282229da6fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 11 12:05:23 2010 +0100 wined3d: Don't DISCARD or NOOVERWRITE non-dynamic buffers. Shaiya locks a non-dynamic buffer with the DISCARD flag and expects the contents to be retained. The SDK says DISCARD requires dynamic resources, and Windows 7 returns an error in this situation, crashing Shaiya. This patch sticks to the Windows XP behavior and allows the lock, but ignores the DISCARD flag to retain the buffer contents. --- dlls/wined3d/buffer.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e22d311..86d6fb4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1033,7 +1033,7 @@ static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *ifac /* IWineD3DBuffer methods */ -static DWORD buffer_sanitize_flags(DWORD flags) +static DWORD buffer_sanitize_flags(struct wined3d_buffer *buffer, DWORD flags) { /* Not all flags make sense together, but Windows never returns an error. Catch the * cases that could cause issues */ @@ -1055,6 +1055,11 @@ static DWORD buffer_sanitize_flags(DWORD flags) WARN("WINED3DLOCK_DISCARD and WINED3DLOCK_NOOVERWRITE used together, ignoring\n"); return 0; } + else if (flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE) && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE lock on non-dynamic buffer, ignoring\n"); + return 0; + } return flags; } @@ -1085,7 +1090,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, TRACE("iface %p, offset %u, size %u, data %p, flags %#x\n", iface, offset, size, data, flags); - flags = buffer_sanitize_flags(flags); + flags = buffer_sanitize_flags(This, flags); if (!(flags & WINED3DLOCK_READONLY)) { if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY;

1 0

Stefan Dösinger : d3d9: Fix test failures on Windows 7 .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: eb355ece4aeb6a1e6fb348c3662378ab76809667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb355ece4aeb6a1e6fb348c36… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 14 12:59:29 2010 +0100 d3d9: Fix test failures on Windows 7. --- dlls/d3d9/tests/buffer.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/buffer.c b/dlls/d3d9/tests/buffer.c index 1347121..57a6495 100644 --- a/dlls/d3d9/tests/buffer.c +++ b/dlls/d3d9/tests/buffer.c @@ -78,7 +78,7 @@ static void lock_flag_test(IDirect3DDevice9 *device) { DWORD flags; const char *debug_string; - HRESULT result; + HRESULT win7_result; } test_data[] = { @@ -87,9 +87,9 @@ static void lock_flag_test(IDirect3DDevice9 *device) {D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK }, {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK }, {D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK }, - {D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3DERR_INVALIDCALL }, /* Completely bogous flags aren't an error */ - {0xdeadbeef, "0xdeadbeef", D3D_OK }, + {0xdeadbeef, "0xdeadbeef", D3DERR_INVALIDCALL }, }; hr = IDirect3DDevice9_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer, NULL); @@ -98,8 +98,12 @@ static void lock_flag_test(IDirect3DDevice9 *device) for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++) { hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, test_data[i].flags); - ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n", - test_data[i].debug_string, hr, test_data[i].result); + /* Windows XP always returns D3D_OK even with flags that don't make sense. Windows 7 returns + * an error. At least one game(Shaiya) depends on the Windows XP result, so mark the Windows 7 + * behavior as broken() + */ + ok(hr == D3D_OK || broken(hr == test_data[i].win7_result), "Lock flags %s returned 0x%08x, expected D3D_OK\n", + test_data[i].debug_string, hr); if(SUCCEEDED(hr)) {

1 0

Eric Pouech : dbghelp: Store the file map in ELF's module specific data.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 8c4f96d2327f40f9766159c8ea8278cd9b40f58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4f96d2327f40f9766159c8e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 15 21:12:37 2010 +0100 dbghelp: Store the file map in ELF's module specific data. --- dlls/dbghelp/elf_module.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 11399b4..301369b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -75,13 +75,6 @@ #include "wine/library.h" #include "wine/debug.h" -struct elf_module_info -{ - DWORD_PTR elf_addr; - unsigned short elf_mark : 1, - elf_loader : 1; -}; - #ifdef __ELF__ #define ELF_INFO_DEBUG_HEADER 0x0001 @@ -152,6 +145,14 @@ struct elf_thunk_area unsigned long rva_end; }; +struct elf_module_info +{ + unsigned long elf_addr; + unsigned short elf_mark : 1, + elf_loader : 1; + struct elf_file_map file_map; +}; + /****************************************************************** * elf_map_section * @@ -258,6 +259,13 @@ static inline unsigned elf_get_map_size(const struct elf_section_map* esm) return esm->fmap->sect[esm->sidx].shdr.sh_size; } +static inline void elf_reset_file_map(struct elf_file_map* fmap) +{ + fmap->fd = -1; + fmap->shstrtab = ELF_NO_MAP; + fmap->alternate = NULL; +} + /****************************************************************** * elf_map_file * @@ -278,9 +286,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); - fmap->fd = -1; - fmap->shstrtab = ELF_NO_MAP; - fmap->alternate = NULL; + elf_reset_file_map(fmap); /* check that the file exists, and that the module hasn't been loaded yet */ if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; @@ -1044,6 +1050,12 @@ BOOL elf_load_debug_info(struct module* module, struct elf_file_map* fmap) if (ret) ret = elf_load_debug_info_from_map(module, fmap, &pool, &ht_symtab); + if (ret) + { + module->elf_info->file_map = *fmap; + elf_reset_file_map(fmap); + } + pool_destroy(&pool); if (fmap == &my_fmap) elf_unmap_file(fmap); return ret;

1 0

Eric Pouech : dbghelp: Added helper to free module's specific data (ELF, MSC...) upon removal.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 9d7b6b65ef2e748d771c7e381c0316ac6564850e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7b6b65ef2e748d771c7e381… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 15 21:12:31 2010 +0100 dbghelp: Added helper to free module's specific data (ELF, MSC...) upon removal. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 6 ++++++ dlls/dbghelp/module.c | 3 +++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index e7e3c7c..24c9cfb 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -326,6 +326,7 @@ struct module /* specific information for debug types */ struct elf_module_info* elf_info; struct dwarf2_module_info_s*dwarf2_info; + void (*module_remove)(struct process* pcs, struct module* module); struct macho_module_info* macho_info; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 6a8a151..11399b4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -358,6 +358,11 @@ static void elf_unmap_file(struct elf_file_map* fmap) } } +static void elf_module_remove(struct process* pcs, struct module* module) +{ + HeapFree(GetProcessHeap(), 0, module->elf_info); +} + /****************************************************************** * elf_is_in_thunk_area * @@ -1132,6 +1137,7 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, (load_offset) ? load_offset : fmap.elf_start, fmap.elf_size, 0, calc_crc32(fmap.fd)); + elf_info->module->module_remove = elf_module_remove; if (!elf_info->module) { HeapFree(GetProcessHeap(), 0, elf_module_info); diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 53f56c2..cbb5c40 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -168,6 +168,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->type = type; module->is_virtual = virtual ? TRUE : FALSE; + module->module_remove = NULL; module->sortlist_valid = FALSE; module->sorttab_size = 0; module->addr_sorttab = NULL; @@ -624,6 +625,8 @@ BOOL module_remove(struct process* pcs, struct module* module) struct module** p; TRACE("%s (%p)\n", debugstr_w(module->module.ModuleName), module); + + if (module->module_remove) module->module_remove(pcs, module); hash_table_destroy(&module->ht_symbols); hash_table_destroy(&module->ht_types); HeapFree(GetProcessHeap(), 0, module->sources);

1 0

Eric Pouech : dbghelp: Added full support for DW_FORM_data8 attributes, as well as primary support for DW_FORM_block* attributes.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 09a7e2d3d0ed226cf3d4a410112596873770c7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a7e2d3d0ed226cf3d4a4101… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 15 21:12:22 2010 +0100 dbghelp: Added full support for DW_FORM_data8 attributes, as well as primary support for DW_FORM_block* attributes. --- dlls/dbghelp/dwarf.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 433dca8..81a1333 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -139,6 +139,7 @@ struct attribute union { unsigned long uvalue; + ULONGLONG lluvalue; long svalue; const char* string; struct dwarf2_block block; @@ -512,9 +513,8 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_data8: - attr->u.block.size = 8; - attr->u.block.ptr = data; - data += 8; + attr->u.lluvalue = dwarf2_get_u8(data); + TRACE("data8<%s>\n", wine_dbgstr_longlong(attr->u.uvalue)); break; case DW_FORM_ref1: @@ -1480,6 +1480,11 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, v.n1.n2.n3.lVal = value.u.uvalue; break; + case DW_FORM_data8: + v.n1.n2.vt = VT_UI8; + v.n1.n2.n3.llVal = value.u.lluvalue; + break; + case DW_FORM_sdata: v.n1.n2.vt = VT_I4; v.n1.n2.n3.lVal = value.u.svalue; @@ -1511,12 +1516,6 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, } break; - case DW_FORM_data8: - v.n1.n2.vt = VT_I1 | VT_BYREF; - v.n1.n2.n3.byref = pool_alloc(&subpgm->ctx->module->pool, value.u.block.size); - memcpy(v.n1.n2.n3.byref, value.u.block.ptr, value.u.block.size); - break; - default: FIXME("Unsupported form for const value %s (%lx)\n", name.u.string, value.form);

1 0

Alexandre Julliard : makefiles: Remove the no longer needed explicit dependencies for bison files.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: fbef7217b92a52de6e350598ebd7b667b32439b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbef7217b92a52de6e350598e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 13:27:27 2010 +0100 makefiles: Remove the no longer needed explicit dependencies for bison files. --- dlls/jscript/Makefile.in | 2 -- dlls/msi/Makefile.in | 2 -- libs/wpp/Makefile.in | 2 -- programs/winedbg/Makefile.in | 2 -- tools/widl/Makefile.in | 2 -- tools/wmc/Makefile.in | 2 -- tools/wrc/Makefile.in | 2 -- 7 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index ac26969..3d3ffff 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -42,5 +42,3 @@ BISON_SRCS = \ parser.y @MAKE_DLL_RULES@ - -parser.tab.c: parser.tab.h # for parallel makes diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index e4c3193..194c1a2 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -87,5 +87,3 @@ RC_SRCS = \ version.rc @MAKE_DLL_RULES@ - -sql.tab.c: sql.tab.h # for parallel makes diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 9987812..950712f 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -19,5 +19,3 @@ $(MODULE): $(OBJS) $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ - -ppy.tab.c: ppy.tab.h # for parallel makes diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 7a2eff6..ad9350f 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -60,5 +60,3 @@ install install-lib:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) - -dbg.tab.c: dbg.tab.h # for parallel makes diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 88dd243..8936782 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -41,5 +41,3 @@ install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) uninstall:: $(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) - -parser.tab.c: parser.tab.h # for parallel makes diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 04f0a95..add09e1 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -36,5 +36,3 @@ install install-dev:: wmc-installed $(MANPAGES) $(INSTALLDIRS) uninstall:: $(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) - -mcy.tab.c: mcy.tab.h # for parallel makes diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 229c9be..77eeecb 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -41,5 +41,3 @@ install install-dev:: wrc-installed $(MANPAGES) $(INSTALLDIRS) uninstall:: $(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) - -parser.tab.c: parser.tab.h # for parallel makes

1 0

Alexandre Julliard : makefiles: Remove the no longer needed explicit separators for dependencies.
by Alexandre Julliard 16 Mar '10

16 Mar '10

1 0

Alexandre Julliard : makedep: Output source dependency for bison files needed for parallel makes.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 133d4cde265cee06c6cebfb8665e0ced6cf80498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133d4cde265cee06c6cebfb86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 13:27:51 2010 +0100 makedep: Output source dependency for bison files needed for parallel makes. --- tools/makedep.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c3b8720..9ce5bef 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -262,6 +262,18 @@ static INCL_FILE *find_src_file( const char *name ) } /******************************************************************* + * find_include_file + */ +static INCL_FILE *find_include_file( const char *name ) +{ + INCL_FILE *file; + + LIST_FOR_EACH_ENTRY( file, &includes, INCL_FILE, entry ) + if (!strcmp( name, file->name )) return file; + return NULL; +} + +/******************************************************************* * add_include * * Add an include file if it doesn't already exists. @@ -829,6 +841,10 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) *ext++ = 0; if (!strcmp( ext, "y" )) /* yacc file */ { + /* add source file dependency for parallel makes */ + char *header = strmake( "%s.tab.h", obj ); + if (find_include_file( header )) fprintf( file, "%s.tab.c: %s\n", obj, header ); + free( header ); *column += fprintf( file, "%s.tab.o: %s.tab.c", obj, obj ); } else if (!strcmp( ext, "l" )) /* lex file */

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
92
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 March 2010