January 2011 - Wine-commits

Nikolay Sivov : shell32: Fix interface leak (Valgrind).
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 52dc1bcd370398317ae928f6edb6cc9ec6e3f703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52dc1bcd370398317ae928f6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 18 22:45:03 2011 +0300 shell32: Fix interface leak (Valgrind). --- dlls/shell32/shfldr_fs.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 084dffd..c0e9ae5 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -314,8 +314,7 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) 'B','i','n','d',' ','D','a','t','a',0 }; IFileSystemBindData *fsbd = NULL; LPITEMIDLIST pidl = NULL; - IUnknown *param = NULL; - WIN32_FIND_DATAW wfd; + IUnknown *unk = NULL; HRESULT r; TRACE("%p %s\n", pbc, debugstr_w(path)); @@ -324,14 +323,15 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) return NULL; /* see if the caller bound File System Bind Data */ - r = IBindCtx_GetObjectParam( pbc, szfsbc, &param ); + r = IBindCtx_GetObjectParam( pbc, szfsbc, &unk ); if (FAILED(r)) return NULL; - r = IUnknown_QueryInterface( param, &IID_IFileSystemBindData, - (LPVOID*) &fsbd ); + r = IUnknown_QueryInterface( unk, &IID_IFileSystemBindData, (void**)&fsbd ); if (SUCCEEDED(r)) { + WIN32_FIND_DATAW wfd; + r = IFileSystemBindData_GetFindData( fsbd, &wfd ); if (SUCCEEDED(r)) { @@ -340,6 +340,7 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) } IFileSystemBindData_Release( fsbd ); } + IUnknown_Release( unk ); return pidl; }

1 0

Eric Pouech : dbghelp: Use AT_range attribute (for function, block... addresses) when AT_low_pc and AT_high_pc are not present.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 60fbda43cb92f4574f96383eeefc734e1dbf0fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fbda43cb92f4574f96383ee… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 18 21:49:05 2011 +0100 dbghelp: Use AT_range attribute (for function, block... addresses) when AT_low_pc and AT_high_pc are not present. --- dlls/dbghelp/dwarf.c | 108 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 84 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2130c71..d60a5fd 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -163,7 +163,7 @@ typedef struct dwarf2_section_s DWORD_PTR rva; } dwarf2_section_t; -enum dwarf2_sections {section_debug, section_string, section_abbrev, section_line, section_max}; +enum dwarf2_sections {section_debug, section_string, section_abbrev, section_line, section_ranges, section_max}; typedef struct dwarf2_traverse_context_s { @@ -945,6 +945,61 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, } /****************************************************************** + * dwarf2_read_range + * + * read a range for a given debug_info (either using AT_range attribute, in which + * case we don't return all the details, or using AT_low_pc & AT_high_pc attributes) + * in all cases, range is relative to beginning of compilation unit + */ +static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_info_t* di, + unsigned long* plow, unsigned long* phigh) +{ + struct attribute range; + + if (dwarf2_find_attribute(ctx, di, DW_AT_ranges, &range)) + { + dwarf2_traverse_context_t traverse; + unsigned long low, high; + + traverse.data = ctx->sections[section_ranges].address + range.u.uvalue; + traverse.end_data = ctx->sections[section_ranges].address + + ctx->sections[section_ranges].size; + traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; + + *plow = ULONG_MAX; + *phigh = 0; + while (traverse.data + 2 * traverse.word_size < traverse.end_data) + { + low = dwarf2_parse_addr(&traverse); + high = dwarf2_parse_addr(&traverse); + if (low == 0 && high == 0) break; + if (low == ULONG_MAX) FIXME("unsupported yet (base address selection)\n"); + if (low < *plow) *plow = low; + if (high > *phigh) *phigh = high; + } + if (*plow == ULONG_MAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} + if (*plow == *phigh) {FIXME("entry found, but low=high\n"); return FALSE;} + + return TRUE; + } + else + { + struct attribute low_pc; + struct attribute high_pc; + + if (!dwarf2_find_attribute(ctx, di, DW_AT_low_pc, &low_pc) || + !dwarf2_find_attribute(ctx, di, DW_AT_high_pc, &high_pc)) + { + FIXME("missing low or high value\n"); + return FALSE; + } + *plow = low_pc.u.uvalue; + *phigh = high_pc.u.uvalue; + return TRUE; + } +} + +/****************************************************************** * dwarf2_read_one_debug_info * * Loads into memory one debug info entry, and recursively its children (if any) @@ -1563,17 +1618,19 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, const dwarf2_debug_info_t* di) { struct symt_block* block; - struct attribute low_pc; - struct attribute high_pc; + unsigned long low_pc, high_pc; TRACE("%s, for %s\n", dwarf2_debug_ctx(subpgm->ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_high_pc, &high_pc)) high_pc.u.uvalue = 0; + if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) + { + FIXME("cannot read range\n"); + return; + } block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - subpgm->ctx->load_offset + low_pc.u.uvalue - subpgm->func->address, - high_pc.u.uvalue - low_pc.u.uvalue); + subpgm->ctx->load_offset + low_pc - subpgm->func->address, + high_pc - low_pc); if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1614,19 +1671,19 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, const dwarf2_debug_info_t* di) { struct symt_block* block; - struct attribute low_pc; - struct attribute high_pc; + unsigned long low_pc, high_pc; TRACE("%s, for %s\n", dwarf2_debug_ctx(subpgm->ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_low_pc, &low_pc)) - low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_high_pc, &high_pc)) - high_pc.u.uvalue = 0; + if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) + { + FIXME("no range\n"); + return; + } block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - subpgm->ctx->load_offset + low_pc.u.uvalue - subpgm->func->address, - high_pc.u.uvalue - low_pc.u.uvalue); + subpgm->ctx->load_offset + low_pc - subpgm->func->address, + high_pc - low_pc); if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1683,8 +1740,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, struct symt_compiland* compiland) { struct attribute name; - struct attribute low_pc; - struct attribute high_pc; + unsigned long low_pc, high_pc; struct attribute is_decl; struct attribute inline_flags; struct symt* ret_type; @@ -1710,14 +1766,17 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, return NULL; } - if (!dwarf2_find_attribute(ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(ctx, di, DW_AT_high_pc, &high_pc)) high_pc.u.uvalue = 0; + if (!dwarf2_read_range(ctx, di, &low_pc, &high_pc)) + { + FIXME("cannot get range\n"); + return NULL; + } + /* As functions (defined as inline assembly) get debug info with dwarf * (not the case for stabs), we just drop Wine's thunks here... * Actual thunks will be created in elf_module from the symbol table */ - if (elf_is_in_thunk_area(ctx->load_offset + low_pc.u.uvalue, - ctx->thunks) >= 0) + if (elf_is_in_thunk_area(ctx->load_offset + low_pc, ctx->thunks) >= 0) return NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl)) is_decl.u.uvalue = 0; @@ -1733,8 +1792,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, if (!is_decl.u.uvalue) { subpgm.func = symt_new_function(ctx->module, compiland, name.u.string, - ctx->load_offset + low_pc.u.uvalue, - high_pc.u.uvalue - low_pc.u.uvalue, + ctx->load_offset + low_pc, high_pc - low_pc, &sig_type->symt); di->symt = &subpgm.func->symt; } @@ -3119,7 +3177,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_line_sect, debug_ranges_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; @@ -3130,6 +3188,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); + dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", &debug_ranges_sect); if (section[section_debug].address == IMAGE_NO_MAP || section[section_abbrev].address == IMAGE_NO_MAP || @@ -3192,6 +3251,7 @@ leave: image_unmap_section(&debug_abbrev_sect); image_unmap_section(&debug_str_sect); image_unmap_section(&debug_line_sect); + image_unmap_section(&debug_ranges_sect); return ret; }

1 0

Nikolay Sivov : msvcrt: Add _atoflt and _atoflt_l implementations.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: ad6bc9449162567f1b6cfcd4d61015783e87254b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6bc9449162567f1b6cfcd4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 18 19:06:07 2011 +0300 msvcrt: Add _atoflt and _atoflt_l implementations. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.c | 8 +++ dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcr90/tests/msvcr90.c | 65 ++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 8 +++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 105 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/headers.c | 3 + include/msvcrt/crtdefs.h | 54 +++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 11 files changed, 251 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad6bc9449162567f1b6cf…

1 0

Henri Verbeet : wined3d: Pass an IWineD3DVolumeImpl pointer to volume_add_dirty_box().
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: ace5f8e60e1c29dc2ba993d26037aa18f0bc9258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace5f8e60e1c29dc2ba993d26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 18 17:55:19 2011 +0100 wined3d: Pass an IWineD3DVolumeImpl pointer to volume_add_dirty_box(). --- dlls/wined3d/volume.c | 34 ++++++++++++++++------------------ dlls/wined3d/volumetexture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 566135c..b98d638 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -63,28 +63,26 @@ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { container->baseTexture.texture_ops->texture_bind(container, FALSE); } -void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) +void volume_add_dirty_box(struct IWineD3DVolumeImpl *volume, const WINED3DBOX *dirty_box) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - - This->dirty = TRUE; + volume->dirty = TRUE; if (dirty_box) { - This->lockedBox.Left = min(This->lockedBox.Left, dirty_box->Left); - This->lockedBox.Top = min(This->lockedBox.Top, dirty_box->Top); - This->lockedBox.Front = min(This->lockedBox.Front, dirty_box->Front); - This->lockedBox.Right = max(This->lockedBox.Right, dirty_box->Right); - This->lockedBox.Bottom = max(This->lockedBox.Bottom, dirty_box->Bottom); - This->lockedBox.Back = max(This->lockedBox.Back, dirty_box->Back); + volume->lockedBox.Left = min(volume->lockedBox.Left, dirty_box->Left); + volume->lockedBox.Top = min(volume->lockedBox.Top, dirty_box->Top); + volume->lockedBox.Front = min(volume->lockedBox.Front, dirty_box->Front); + volume->lockedBox.Right = max(volume->lockedBox.Right, dirty_box->Right); + volume->lockedBox.Bottom = max(volume->lockedBox.Bottom, dirty_box->Bottom); + volume->lockedBox.Back = max(volume->lockedBox.Back, dirty_box->Back); } else { - This->lockedBox.Left = 0; - This->lockedBox.Top = 0; - This->lockedBox.Front = 0; - This->lockedBox.Right = This->currentDesc.Width; - This->lockedBox.Bottom = This->currentDesc.Height; - This->lockedBox.Back = This->currentDesc.Depth; + volume->lockedBox.Left = 0; + volume->lockedBox.Top = 0; + volume->lockedBox.Front = 0; + volume->lockedBox.Right = volume->currentDesc.Width; + volume->lockedBox.Bottom = volume->currentDesc.Height; + volume->lockedBox.Back = volume->currentDesc.Depth; } } @@ -255,7 +253,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface, if (!(flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY))) { - volume_add_dirty_box(iface, &This->lockedBox); + volume_add_dirty_box(This, &This->lockedBox); This->container->baseTexture.texture_rgb.dirty = TRUE; This->container->baseTexture.texture_srgb.dirty = TRUE; } @@ -368,7 +366,7 @@ HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); volume->dirty = TRUE; - volume_add_dirty_box((IWineD3DVolume *)volume, NULL); + volume_add_dirty_box(volume, NULL); return WINED3D_OK; } diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 94f5b05..4a744eb 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -70,9 +70,9 @@ static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3D { for (i = 0; i < texture->baseTexture.level_count; ++i) { - IWineD3DVolume *volume = (IWineD3DVolume *)texture->baseTexture.sub_resources[i]; + IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)texture->baseTexture.sub_resources[i]; volume_add_dirty_box(volume, NULL); - IWineD3DVolume_LoadTexture(volume, i, srgb_mode); + IWineD3DVolume_LoadTexture((IWineD3DVolume *)volume, i, srgb_mode); } } else @@ -336,11 +336,11 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *ifa static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTexture *iface, const WINED3DBOX *dirty_box) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - IWineD3DVolume *volume; + IWineD3DVolumeImpl *volume; TRACE("iface %p, dirty_box %p.\n", iface, dirty_box); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0))) + if (!(volume = (IWineD3DVolumeImpl *)basetexture_get_sub_resource(texture, 0))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b1202f3..115846a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2001,7 +2001,7 @@ typedef struct IWineD3DVolumeImpl BOOL dirty; } IWineD3DVolumeImpl; -void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) DECLSPEC_HIDDEN; +void volume_add_dirty_box(struct IWineD3DVolumeImpl *volume, const WINED3DBOX *dirty_box) DECLSPEC_HIDDEN; HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, UINT depth, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DVolumeImpl pointer to volume_bind_and_dirtify().
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 237cdefe7fb6983e5f8b27fce634c37359ceff36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237cdefe7fb6983e5f8b27fce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 18 17:55:20 2011 +0100 wined3d: Pass an IWineD3DVolumeImpl pointer to volume_bind_and_dirtify(). --- dlls/wined3d/volume.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b98d638..a75ca78 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,10 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* Context activation is done by the caller. */ -static void volume_bind_and_dirtify(IWineD3DVolume *iface) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; - IWineD3DBaseTextureImpl *container = (IWineD3DBaseTextureImpl *)This->container; +static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume) +{ + const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info; + IWineD3DBaseTextureImpl *container = (IWineD3DBaseTextureImpl *)volume->container; DWORD active_sampler; /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. @@ -50,14 +50,14 @@ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { ENTER_GL(); glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); LEAVE_GL(); - active_sampler = This->resource.device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; + active_sampler = volume->resource.device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; } else { active_sampler = 0; } if (active_sampler != WINED3D_UNMAPPED_STAGE) { - IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_SAMPLER(active_sampler)); + IWineD3DDeviceImpl_MarkStateDirty(volume->resource.device, STATE_SAMPLER(active_sampler)); } container->baseTexture.texture_ops->texture_bind(container, FALSE); @@ -289,7 +289,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int TRACE("iface %p, level %u, srgb %#x, format %s (%#x).\n", iface, gl_level, srgb_mode, debug_d3dformat(format->id), format->id); - volume_bind_and_dirtify(iface); + volume_bind_and_dirtify(This); TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", GL_TEXTURE_3D, gl_level, format->glInternal, This->currentDesc.Width, This->currentDesc.Height,

1 0

Henri Verbeet : wined3d: Pass an IWineD3DSwapChainImpl pointer to swapchain_create_context_for_thread ().
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: b439fa9d8ffc27d31eb7b0a4b49f9aded9f3ee4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b439fa9d8ffc27d31eb7b0a4b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 18 17:55:21 2011 +0100 wined3d: Pass an IWineD3DSwapChainImpl pointer to swapchain_create_context_for_thread(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/swapchain.c | 21 ++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 40fd2e3..bd63f9a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1878,7 +1878,7 @@ static struct wined3d_context *findThreadContextForSwapChain(IWineD3DSwapChain * } /* Create a new context for the thread */ - return swapchain_create_context_for_thread(swapchain); + return swapchain_create_context_for_thread((IWineD3DSwapChainImpl *)swapchain); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8f594ae..430c751 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -783,32 +783,31 @@ err: } /* Do not call while under the GL lock. */ -struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *iface) +struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChainImpl *swapchain) { - IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *) iface; struct wined3d_context **newArray; struct wined3d_context *ctx; - TRACE("Creating a new context for swapchain %p, thread %d\n", This, GetCurrentThreadId()); + TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); - if (!(ctx = context_create(This, This->front_buffer, This->ds_format))) + if (!(ctx = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) { ERR("Failed to create a new context for the swapchain\n"); return NULL; } context_release(ctx); - newArray = HeapAlloc(GetProcessHeap(), 0, sizeof(*newArray) * (This->num_contexts + 1)); + newArray = HeapAlloc(GetProcessHeap(), 0, sizeof(*newArray) * (swapchain->num_contexts + 1)); if(!newArray) { ERR("Out of memory when trying to allocate a new context array\n"); - context_destroy(This->device, ctx); + context_destroy(swapchain->device, ctx); return NULL; } - memcpy(newArray, This->context, sizeof(*newArray) * This->num_contexts); - HeapFree(GetProcessHeap(), 0, This->context); - newArray[This->num_contexts] = ctx; - This->context = newArray; - This->num_contexts++; + memcpy(newArray, swapchain->context, sizeof(*newArray) * swapchain->num_contexts); + HeapFree(GetProcessHeap(), 0, swapchain->context); + newArray[swapchain->num_contexts] = ctx; + swapchain->context = newArray; + swapchain->num_contexts++; TRACE("Returning context %p\n", ctx); return ctx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 115846a..7ea5067 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2634,7 +2634,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, WINED3DGAMMARAMP *pRamp) DECLSPEC_HIDDEN; -struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *iface) DECLSPEC_HIDDEN; +struct wined3d_context *swapchain_create_context_for_thread(struct IWineD3DSwapChainImpl *swapchain) DECLSPEC_HIDDEN; HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, void *parent) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DSwapChainImpl pointer to findThreadContextForSwapChain().
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: f250ee66a38f9b00f179ac98e697599b77217487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f250ee66a38f9b00f179ac98e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 18 17:55:22 2011 +0100 wined3d: Pass an IWineD3DSwapChainImpl pointer to findThreadContextForSwapChain(). --- dlls/wined3d/context.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bd63f9a..2265188 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1866,19 +1866,18 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte * If none can be found the swapchain is requested to create a new context * *****************************************************************************/ -static struct wined3d_context *findThreadContextForSwapChain(IWineD3DSwapChain *swapchain, DWORD tid) +static struct wined3d_context *findThreadContextForSwapChain(struct IWineD3DSwapChainImpl *swapchain, DWORD tid) { unsigned int i; - for(i = 0; i < ((IWineD3DSwapChainImpl *) swapchain)->num_contexts; i++) { - if(((IWineD3DSwapChainImpl *) swapchain)->context[i]->tid == tid) { - return ((IWineD3DSwapChainImpl *) swapchain)->context[i]; - } - + for (i = 0; i < swapchain->num_contexts; ++i) + { + if (swapchain->context[i]->tid == tid) + return swapchain->context[i]; } /* Create a new context for the thread */ - return swapchain_create_context_for_thread((IWineD3DSwapChainImpl *)swapchain); + return swapchain_create_context_for_thread(swapchain); } /* Do not call while under the GL lock. */ @@ -1914,12 +1913,9 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur if (target->container.type == WINED3D_CONTAINER_SWAPCHAIN) { - IWineD3DSwapChain *swapchain; - TRACE("Rendering onscreen\n"); - swapchain = (IWineD3DSwapChain *)target->container.u.swapchain; - context = findThreadContextForSwapChain(swapchain, tid); + context = findThreadContextForSwapChain(target->container.u.swapchain, tid); } else { @@ -1938,7 +1934,7 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur * * Can also happen on thread switches - in that case findThreadContextForSwapChain * is perfect to call. */ - context = findThreadContextForSwapChain(This->swapchains[0], tid); + context = findThreadContextForSwapChain((IWineD3DSwapChainImpl *)This->swapchains[0], tid); } }

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3D2 iface.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 2b802135787a0b96a35709ce1c8baa21b5a390d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b802135787a0b96a35709ce1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 18 12:30:17 2011 +0100 ddraw: COM cleanup for the IDirect3D2 iface. --- dlls/ddraw/ddraw.c | 43 ++++++++++++++++++++++++++++++++----------- dlls/ddraw/ddraw_private.h | 7 +------ dlls/ddraw/device.c | 6 +++--- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fa7777c..c398237 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -71,6 +71,11 @@ static inline IDirectDrawImpl *impl_from_IDirect3D(IDirect3D *iface) return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirect3D_iface); } +static inline IDirectDrawImpl *impl_from_IDirect3D2(IDirect3D2 *iface) +{ + return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirect3D2_iface); +} + /***************************************************************************** * IUnknown Methods *****************************************************************************/ @@ -185,7 +190,7 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, else if ( IsEqualGUID( &IID_IDirect3D2 , refiid ) ) { This->d3dversion = 2; - *obj = &This->IDirect3D2_vtbl; + *obj = &This->IDirect3D2_iface; TRACE(" returning Direct3D2 interface at %p.\n", *obj); } else if ( IsEqualGUID( &IID_IDirect3D3 , refiid ) ) @@ -263,9 +268,11 @@ static HRESULT WINAPI d3d3_QueryInterface(IDirect3D3 *iface, REFIID riid, void * static HRESULT WINAPI d3d2_QueryInterface(IDirect3D2 *iface, REFIID riid, void **object) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw7_QueryInterface((IDirectDraw7 *)ddraw_from_d3d2(iface), riid, object); + return ddraw7_QueryInterface((IDirectDraw7 *)This, riid, object); } static HRESULT WINAPI d3d1_QueryInterface(IDirect3D *iface, REFIID riid, void **object) @@ -371,9 +378,11 @@ static ULONG WINAPI d3d3_AddRef(IDirect3D3 *iface) static ULONG WINAPI d3d2_AddRef(IDirect3D2 *iface) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); + TRACE("iface %p.\n", iface); - return ddraw1_AddRef((IDirectDraw *)&ddraw_from_d3d2(iface)->IDirectDraw_vtbl); + return ddraw1_AddRef((IDirectDraw *)&This->IDirectDraw_vtbl); } static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) @@ -508,9 +517,11 @@ static ULONG WINAPI d3d3_Release(IDirect3D3 *iface) static ULONG WINAPI d3d2_Release(IDirect3D2 *iface) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); + TRACE("iface %p.\n", iface); - return ddraw1_Release((IDirectDraw *)&ddraw_from_d3d2(iface)->IDirectDraw_vtbl); + return ddraw1_Release((IDirectDraw *)&This->IDirectDraw_vtbl); } static ULONG WINAPI d3d1_Release(IDirect3D *iface) @@ -4261,9 +4272,11 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA static HRESULT WINAPI d3d2_EnumDevices(IDirect3D2 *iface, LPD3DENUMDEVICESCALLBACK callback, void *context) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); + TRACE("iface %p, callback %p, context %p.\n", iface, callback, context); - return d3d3_EnumDevices((IDirect3D3 *)&ddraw_from_d3d2(iface)->IDirect3D3_vtbl, callback, context); + return d3d3_EnumDevices((IDirect3D3 *)&This->IDirect3D3_vtbl, callback, context); } static HRESULT WINAPI d3d1_EnumDevices(IDirect3D *iface, LPD3DENUMDEVICESCALLBACK callback, void *context) @@ -4321,9 +4334,11 @@ static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light static HRESULT WINAPI d3d2_CreateLight(IDirect3D2 *iface, IDirect3DLight **light, IUnknown *outer_unknown) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); + TRACE("iface %p, light %p, outer_unknown %p.\n", iface, light, outer_unknown); - return d3d3_CreateLight((IDirect3D3 *)&ddraw_from_d3d2(iface)->IDirect3D3_vtbl, light, outer_unknown); + return d3d3_CreateLight((IDirect3D3 *)&This->IDirect3D3_vtbl, light, outer_unknown); } static HRESULT WINAPI d3d1_CreateLight(IDirect3D *iface, IDirect3DLight **light, IUnknown *outer_unknown) @@ -4380,12 +4395,13 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 **material, IUnknown *outer_unknown) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); IDirect3DMaterial3 *material3; HRESULT hr; TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); - hr = d3d3_CreateMaterial((IDirect3D3 *)&ddraw_from_d3d2(iface)->IDirect3D3_vtbl, &material3, outer_unknown); + hr = d3d3_CreateMaterial((IDirect3D3 *)&This->IDirect3D3_vtbl, &material3, outer_unknown); *material = material3 ? (IDirect3DMaterial2 *)&((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial2_vtbl : NULL; TRACE("Returning material %p.\n", *material); @@ -4455,9 +4471,11 @@ static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 static HRESULT WINAPI d3d2_CreateViewport(IDirect3D2 *iface, IDirect3DViewport2 **viewport, IUnknown *outer_unknown) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); + TRACE("iface %p, viewport %p, outer_unknown %p.\n", iface, viewport, outer_unknown); - return d3d3_CreateViewport((IDirect3D3 *)&ddraw_from_d3d2(iface)->IDirect3D3_vtbl, + return d3d3_CreateViewport((IDirect3D3 *)&This->IDirect3D3_vtbl, (IDirect3DViewport3 **)viewport, outer_unknown); } @@ -4537,9 +4555,11 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); + TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice((IDirect3D3 *)&ddraw_from_d3d2(iface)->IDirect3D3_vtbl, fds, fdr); + return d3d3_FindDevice((IDirect3D3 *)&This->IDirect3D3_vtbl, fds, fdr); } static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) @@ -4648,12 +4668,13 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, IDirectDrawSurface *surface, IDirect3DDevice2 **device) { + IDirectDrawImpl *This = impl_from_IDirect3D2(iface); HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); - hr = d3d7_CreateDevice((IDirect3D7 *)&ddraw_from_d3d2(iface)->IDirect3D7_vtbl, riid, + hr = d3d7_CreateDevice((IDirect3D7 *)&This->IDirect3D7_vtbl, riid, surface ? (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)surface) : NULL, (IDirect3DDevice7 **)device); if (*device) *device = (IDirect3DDevice2 *)&((IDirect3DDeviceImpl *)*device)->IDirect3DDevice2_vtbl; @@ -5784,7 +5805,7 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->IDirectDraw3_vtbl = &ddraw3_vtbl; ddraw->IDirectDraw4_vtbl = &ddraw4_vtbl; ddraw->IDirect3D_iface.lpVtbl = &d3d1_vtbl; - ddraw->IDirect3D2_vtbl = &d3d2_vtbl; + ddraw->IDirect3D2_iface.lpVtbl = &d3d2_vtbl; ddraw->IDirect3D3_vtbl = &d3d3_vtbl; ddraw->IDirect3D7_vtbl = &d3d7_vtbl; ddraw->device_parent_vtbl = &ddraw_wined3d_device_parent_vtbl; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2a7459f..57943a4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -103,7 +103,7 @@ struct IDirectDrawImpl const IDirectDrawVtbl *IDirectDraw_vtbl; const IDirect3D7Vtbl *IDirect3D7_vtbl; const IDirect3D3Vtbl *IDirect3D3_vtbl; - const IDirect3D2Vtbl *IDirect3D2_vtbl; + IDirect3D2 IDirect3D2_iface; IDirect3D IDirect3D_iface; const IWineD3DDeviceParentVtbl *device_parent_vtbl; @@ -184,11 +184,6 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDESC2 *desc, void *Context) DECLSPEC_HIDDEN; IWineD3DVertexDeclaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DECLSPEC_HIDDEN; -static inline IDirectDrawImpl *ddraw_from_d3d2(IDirect3D2 *iface) -{ - return (IDirectDrawImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawImpl, IDirect3D2_vtbl)); -} - static inline IDirectDrawImpl *ddraw_from_d3d3(IDirect3D3 *iface) { return (IDirectDrawImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawImpl, IDirect3D3_vtbl)); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c9e3493..93f649d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -146,7 +146,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, } else if ( IsEqualGUID( &IID_IDirect3D2 , refiid ) ) { - *obj = &This->ddraw->IDirect3D2_vtbl; + *obj = &This->ddraw->IDirect3D2_iface; TRACE("(%p) Returning IDirect3D2 interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3D3 , refiid ) ) @@ -1753,8 +1753,8 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetDirect3D(IDirect3DDevice2 *iface, if(!Direct3D2) return DDERR_INVALIDPARAMS; - IDirect3D2_AddRef((IDirect3D2 *)&This->ddraw->IDirect3D2_vtbl); - *Direct3D2 = (IDirect3D2 *)&This->ddraw->IDirect3D2_vtbl; + IDirect3D2_AddRef(&This->ddraw->IDirect3D2_iface); + *Direct3D2 = &This->ddraw->IDirect3D2_iface; TRACE(" returning interface %p\n", *Direct3D2); return D3D_OK; }

1 0

Jacek Caban : mshtml: Added IUri-based implementation of nsIURL::[Get|Set] Ref.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: e72e7de0e58c41afa928ce4fc81ac60e5d2baf1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72e7de0e58c41afa928ce4fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 18 12:28:17 2011 +0100 mshtml: Added IUri-based implementation of nsIURL::[Get|Set]Ref. --- dlls/mshtml/nsio.c | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e7a6c2c..617b3f3 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2217,34 +2217,53 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) static nsresult NSAPI nsURL_GetRef(nsIURL *iface, nsACString *aRef) { nsWineURI *This = impl_from_nsIURL(iface); + char *refa = NULL; + BSTR ref; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aRef); - if(This->nsurl) - return nsIURL_GetRef(This->nsurl, aRef); + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + hres = IUri_GetFragment(This->uri, &ref); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + refa = heap_strdupWtoA(ref); + SysFreeString(ref); + if(ref && !refa) + return NS_ERROR_OUT_OF_MEMORY; + + nsACString_SetData(aRef, refa && *refa == '#' ? refa+1 : refa); + heap_free(refa); + return NS_OK; } static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) { nsWineURI *This = impl_from_nsIURL(iface); const char *refa; + WCHAR *ref; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetRef(This->nsurl, aRef); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; nsACString_GetData(aRef, &refa); - if(!*refa) - return NS_OK; + ref = heap_strdupAtoW(refa); + if(!ref) + return NS_ERROR_OUT_OF_MEMORY; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + hres = IUriBuilder_SetFragment(This->uri_builder, ref); + heap_free(ref); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory)

1 0

Alexandre Julliard : wmc: Add support for creating resource and plain binary files.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: ecd144b40dc5b06c42e77a7f7d88c023397e89eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd144b40dc5b06c42e77a7f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 18 16:55:37 2011 +0100 wmc: Add support for creating resource and plain binary files. --- tools/wmc/utils.c | 73 +++++++++++++++++++++++++++++++++++ tools/wmc/utils.h | 15 +++++++ tools/wmc/wmc.c | 38 ++++++++++++++++-- tools/wmc/wmc.man.in | 30 ++++++++------ tools/wmc/write.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/wmc/write.h | 1 + 6 files changed, 243 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecd144b40dc5b06c42e77…

1 0