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

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: 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

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

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 : 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: 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: Check the alignment of mapped buffer pointers.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: cc6d17ba7cacb171a478f63ed81473ee0730ef35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6d17ba7cacb171a478f63ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 11 13:20:32 2010 +0100 wined3d: Check the alignment of mapped buffer pointers. Windows returns 32 byte aligned pointers when locking vertex and index buffers, and some applications(Half Life 2, Alpha Prime, possibly others) rely on this. Check the alignment and fall back to double buffered buffers with HeapAlloced and aligned pointers if the alignment doesn't fit. --- dlls/wined3d/buffer.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 08d3097..46131af 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1186,6 +1186,21 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); } LEAVE_GL(); + + if (((DWORD_PTR) This->resource.allocatedMemory) & (RESOURCE_ALIGNMENT - 1)) + { + WARN("Pointer %p is not %u byte aligned, falling back to double buffered operation\n", + This->resource.allocatedMemory, RESOURCE_ALIGNMENT); + + ENTER_GL(); + GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); + checkGLcall("glUnmapBufferARB"); + LEAVE_GL(); + This->resource.allocatedMemory = NULL; + + buffer_get_sysmem(This); + TRACE("New pointer is %p\n", This->resource.allocatedMemory); + } context_release(context); } }

1 0

Paul Vriens : mshtml/tests: Fix some test failures on Win9x/ WinMe by using a A-function.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: e014154fb7db071da787aa4e54d5fa9903100769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e014154fb7db071da787aa4e5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 10:18:52 2010 +0100 mshtml/tests: Fix some test failures on Win9x/WinMe by using a A-function. --- dlls/mshtml/tests/dom.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 264f9fb..c6f5479 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3195,8 +3195,6 @@ static void test_screen(IHTMLWindow2 *window) HDC hdc; HRESULT hres; - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - screen = NULL; hres = IHTMLWindow2_get_screen(window, &screen); ok(hres == S_OK, "get_screen failed: %08x\n", hres); @@ -3216,7 +3214,7 @@ static void test_screen(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } - hdc = CreateICW(displayW, NULL, NULL, NULL); + hdc = CreateICA("DISPLAY", NULL, NULL, NULL); exl = GetDeviceCaps(hdc, HORZRES); l = 0xdeadbeef;

1 0

Justin Chevrier : gdiplus: Basic implementation of GdipImageGetFrameCount with updated tests.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 818420a378ab26aa5411bd1fbf28875fde0746f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818420a378ab26aa5411bd1fb… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Mon Mar 15 19:14:28 2010 -0400 gdiplus: Basic implementation of GdipImageGetFrameCount with updated tests. --- dlls/gdiplus/image.c | 9 ++++++--- dlls/gdiplus/tests/image.c | 12 ++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0d95579..58f3c65 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2196,6 +2196,7 @@ struct image_format_dimension image_format_dimensions[] = {NULL} }; +/* FIXME: Need to handle multi-framed images */ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, GDIPCONST GUID* dimensionID, UINT* count) { @@ -2203,13 +2204,15 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, TRACE("(%p,%s,%p)\n", image, debugstr_guid(dimensionID), count); - if(!image || !dimensionID || !count) + if(!image || !count) return InvalidParameter; if(!(calls++)) - FIXME("not implemented\n"); + FIXME("returning frame count of 1\n"); - return NotImplemented; + *count = 1; + + return Ok; } GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 682c49f..5f20468 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -237,12 +237,12 @@ static void test_GdipImageGetFrameDimensionsCount(void) } stat = GdipImageGetFrameCount((GpImage*)bm, NULL, &count); - todo_wine expect(Ok, stat); + expect(Ok, stat); count = 12345; stat = GdipImageGetFrameCount((GpImage*)bm, &dimension, &count); - todo_wine expect(Ok, stat); - todo_wine expect(1, count); + expect(Ok, stat); + expect(1, count); GdipBitmapSetPixel(bm, 0, 0, 0xffffffff); @@ -1601,7 +1601,7 @@ static void test_multiframegif(void) count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); - todo_wine expect(Ok, stat); + expect(Ok, stat); todo_wine expect(2, count); /* SelectActiveFrame overwrites our current data */ @@ -1675,8 +1675,8 @@ static void test_multiframegif(void) count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); - todo_wine expect(Ok, stat); - todo_wine expect(1, count); + expect(Ok, stat); + expect(1, count); GdipDisposeImage((GpImage*)bmp); IStream_Release(stream);

1 0

Ričardas Barkauskas : wined3d: Fix ATI2N pitch and offset calculations.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: a7aa4a87e2c6eb171f5ab12184df914975ed2023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7aa4a87e2c6eb171f5ab1218… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Tue Mar 16 01:19:23 2010 +0200 wined3d: Fix ATI2N pitch and offset calculations. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cfa2f2b..73091ff 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -183,7 +183,7 @@ static const struct wined3d_format_compression_info format_compression_info[] = {WINED3DFMT_DXT3, 4, 4, 16}, {WINED3DFMT_DXT4, 4, 4, 16}, {WINED3DFMT_DXT5, 4, 4, 16}, - {WINED3DFMT_ATI2N, 4, 4, 16}, + {WINED3DFMT_ATI2N, 1, 1, 1}, }; struct wined3d_format_vertex_info

1 0