October 2010 - Wine-Commits

Henri Verbeet : wined3d: Pass a sub-resource index instead of a miplevel to volume texture methods.
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: 7f8ea7fffce72ee7d4bcfe9d3adf95b343b66fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8ea7fffce72ee7d4bcfe9d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 21 12:40:46 2010 +0200 wined3d: Pass a sub-resource index instead of a miplevel to volume texture methods. For volume textures this is mostly just a conceptual change, it'll only make a difference for texture arrays and cube textures. --- dlls/wined3d/volumetexture.c | 44 +++++++++++++++++++++++++---------------- include/wine/wined3d.idl | 8 +++--- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index c8f596d..9773c60 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -249,18 +249,28 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *if return FALSE; } -/* ******************************************* - IWineD3DVolumeTexture IWineD3DVolumeTexture parts follow - ******************************************* */ +static IWineD3DResourceImpl *volumetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) +{ + UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count; + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return NULL; + } + + return texture->baseTexture.sub_resources[sub_resource_idx]; +} + static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTexture *iface, - UINT level, WINED3DVOLUME_DESC *desc) + UINT sub_resource_idx, WINED3DVOLUME_DESC *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *volume; - TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); + TRACE("iface %p, sub_resource_idx %u, desc %p.\n", iface, sub_resource_idx, desc); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -272,14 +282,14 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTexture *iface, - UINT level, IWineD3DVolume **volume) + UINT sub_resource_idx, IWineD3DVolume **volume) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *v; - TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); + TRACE("iface %p, sub_resource_idx %u, volume %p.\n", iface, sub_resource_idx, volume); - if (!(v = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(v= (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -294,15 +304,15 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTex } static HRESULT WINAPI IWineD3DVolumeTextureImpl_Map(IWineD3DVolumeTexture *iface, - UINT level, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) + UINT sub_resource_idx, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *volume; - TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", - iface, level, locked_box, box, flags); + TRACE("iface %p, sub_resource_idx %u, locked_box %p, box %p, flags %#x.\n", + iface, sub_resource_idx, locked_box, box, flags); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -311,14 +321,14 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_Map(IWineD3DVolumeTexture *iface return IWineD3DVolume_Map(volume, locked_box, box, flags); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT level) +static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT sub_resource_idx) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *volume; - TRACE("iface %p, level %u.\n", iface, level); + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -334,7 +344,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTextur TRACE("iface %p, dirty_box %p.\n", iface, dirty_box); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, 0))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, 0))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index fda722a..d720db5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2606,21 +2606,21 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture interface IWineD3DVolumeTexture : IWineD3DBaseTexture { HRESULT GetLevelDesc( - [in] UINT level, + [in] UINT sub_resource_idx, [out] WINED3DVOLUME_DESC *desc ); HRESULT GetVolumeLevel( - [in] UINT level, + [in] UINT sub_resource_idx, [out] IWineD3DVolume **volume ); HRESULT Map( - [in] UINT level, + [in] UINT sub_resource_idx, [out] WINED3DLOCKED_BOX *locked_box, [in] const WINED3DBOX *box, [in] DWORD flags ); HRESULT Unmap( - [in] UINT level + [in] UINT sub_resource_idx ); HRESULT AddDirtyBox( [in] const WINED3DBOX *dirty_box

1 0

David Hedberg : shell32: Handle INameSpaceTreeControlEvents:: OnSelectionChanged.
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: c143f805cd883ef5dc8ce95e2c7c15b3fd8a508f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c143f805cd883ef5dc8ce95e2… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Oct 21 13:19:46 2010 +0200 shell32: Handle INameSpaceTreeControlEvents::OnSelectionChanged. --- dlls/shell32/ebrowser.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index fed9ace..9cee1f0 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -1809,8 +1809,19 @@ static HRESULT WINAPI NSTCEvents_fnOnSelectionChanged(INameSpaceTreeControlEvent IShellItemArray *psiaSelection) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + IShellItem *psi; + HRESULT hr; TRACE("%p (%p)\n", This, psiaSelection); - return E_NOTIMPL; + + hr = IShellItemArray_GetItemAt(psiaSelection, 0, &psi); + if(SUCCEEDED(hr)) + { + hr = IExplorerBrowser_BrowseToObject((IExplorerBrowser*)This, + (IUnknown*)psi, SBSP_DEFBROWSER); + IShellItem_Release(psi); + } + + return hr; } static HRESULT WINAPI NSTCEvents_fnOnKeyboardInput(INameSpaceTreeControlEvents *iface,

1 0

Juan Lang : crypt32/tests: Fix test failures on Win98/NT4.
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: 2b8cad3235fcb186045d80013142bf4fcd6f768d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8cad3235fcb186045d80013… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 21 05:09:24 2010 -0700 crypt32/tests: Fix test failures on Win98/NT4. --- dlls/crypt32/tests/str.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index ff652f3..8dbc60f 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -287,8 +287,6 @@ static void test_CertRDNValueToStrW(void) { sizeof(bin6), bin6 }, localhostW }, { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, { sizeof(bin7), bin7 }, aricW }, - { "2.5.4.3", CERT_RDN_UTF8_STRING, - { sizeof(bin8), bin8 }, ePKIW }, }; DWORD i, ret; WCHAR buffer[2000];

1 0

David Hedberg : shell32: Replace bitwise XOR with a contextually more proper operator.
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: aefe637b56c73b963550dda0deaadeece312e2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aefe637b56c73b963550dda0d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Oct 21 13:19:45 2010 +0200 shell32: Replace bitwise XOR with a contextually more proper operator. --- dlls/shell32/ebrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 9cee1f0..87ff578 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -472,7 +472,7 @@ static void update_panestate(ExplorerBrowserImpl *This) else show_navpane = FALSE; - if(This->navpane.show ^ show_navpane) + if(This->navpane.show != show_navpane) { update_layout(This); size_panes(This);

1 0

Henri Verbeet : wined3d: Use surface_blt_to_drawable() in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: 2b58f80c27810aa999bee76a13fc4a30ffb97247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b58f80c27810aa999bee76a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 21 12:40:45 2010 +0200 wined3d: Use surface_blt_to_drawable() in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 190 ++++++++++++++++++++++------------------------- 1 files changed, 89 insertions(+), 101 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a1587b0..b24a6de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3344,6 +3344,89 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT context_release(context); } +static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, + WINED3DTEXTUREFILTERTYPE filter, BOOL color_key, + IWineD3DSurfaceImpl *src_surface, const RECT *src_rect_in, + IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in) +{ + IWineD3DSwapChainImpl *swapchain = NULL; + struct wined3d_context *context; + RECT src_rect, dst_rect; + + src_rect = *src_rect_in; + dst_rect = *dst_rect_in; + + if (dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) + swapchain = dst_surface->container.u.swapchain; + + /* Make sure the surface is up-to-date. This should probably use + * surface_load_location() and worry about the destination surface too, + * unless we're overwriting it completely. */ + surface_internal_preload(src_surface, SRGB_RGB); + + /* Activate the destination context, set it up for blitting */ + context = context_acquire(device, dst_surface); + context_apply_blit_state(context, device); + + /* context_apply_blit_state() sets up a flipped (in GL terms) projection + * matrix. As a result, we need to skip the flip for onscreen surfaces, + * and have to flip for offscreen surfaces instead, to undo the flip done + * by the projection matrix. */ + if (swapchain && dst_surface == swapchain->front_buffer) + { + surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); + } + else if (surface_is_offscreen(dst_surface)) + { + dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; + dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; + } + + device->blitter->set_shader((IWineD3DDevice *)device, src_surface); + + ENTER_GL(); + + if (color_key) + { + glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable(GL_ALPHA_TEST)"); + + /* When the primary render target uses P8, the alpha component + * contains the palette index. Which means that the colorkey is one of + * the palette entries. In other cases pixels that should be masked + * away have alpha set to 0. */ + if (primary_render_target_is_p8(device)) + glAlphaFunc(GL_NOTEQUAL, (float)src_surface->SrcBltCKey.dwColorSpaceLowValue / 256.0f); + else + glAlphaFunc(GL_NOTEQUAL, 0.0f); + checkGLcall("glAlphaFunc"); + } + else + { + glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + + draw_textured_quad(src_surface, &src_rect, &dst_rect, filter); + + if (color_key) + { + glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + + LEAVE_GL(); + + /* Leave the opengl state valid for blitting */ + device->blitter->unset_shader((IWineD3DDevice *)device); + + if (wined3d_settings.strict_draw_ordering || (swapchain + && (dst_surface == swapchain->front_buffer || swapchain->num_contexts > 1))) + wglFlush(); /* Flush to ensure ordering across contexts. */ + + context_release(context); +} + /* Do not call while under the GL lock. */ HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) { @@ -3611,7 +3694,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, /* Blit from offscreen surface to render target */ DWORD oldCKeyFlags = src_surface->CKeyFlags; WINEDDCOLORKEY oldBltCKey = src_surface->SrcBltCKey; - struct wined3d_context *context; TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); @@ -3668,72 +3750,13 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, src_surface->CKeyFlags &= ~WINEDDSD_CKSRCBLT; } - /* Now load the surface */ - surface_internal_preload(src_surface, SRGB_RGB); - - /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); - context_apply_blit_state(context, device); - - if (dstSwapchain && dst_surface == dstSwapchain->front_buffer) - surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - else if (surface_is_offscreen(dst_surface)) - { - dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; - dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; - } - - device->blitter->set_shader((IWineD3DDevice *)device, src_surface); - - ENTER_GL(); - - /* This is for color keying */ - if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { - glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable(GL_ALPHA_TEST)"); - - /* When the primary render target uses P8, the alpha component contains the palette index. - * Which means that the colorkey is one of the palette entries. In other cases pixels that - * should be masked away have alpha set to 0. */ - if (primary_render_target_is_p8(device)) - glAlphaFunc(GL_NOTEQUAL, (float)src_surface->SrcBltCKey.dwColorSpaceLowValue / 256.0f); - else - glAlphaFunc(GL_NOTEQUAL, 0.0f); - checkGLcall("glAlphaFunc"); - } else { - glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - - /* Draw a textured quad - */ - draw_textured_quad(src_surface, &src_rect, &dst_rect, Filter); - - if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { - glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } + surface_blt_to_drawable(device, Filter, Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE), + src_surface, &src_rect, dst_surface, &dst_rect); /* Restore the color key parameters */ src_surface->CKeyFlags = oldCKeyFlags; src_surface->SrcBltCKey = oldBltCKey; - LEAVE_GL(); - - /* Leave the opengl state valid for blitting */ - device->blitter->unset_shader((IWineD3DDevice *)device); - - if (wined3d_settings.strict_draw_ordering || (dstSwapchain - && (dst_surface == dstSwapchain->front_buffer - || dstSwapchain->num_contexts > 1))) - wglFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); - - /* TODO: If the surface is locked often, perform the Blt in software on the memory instead */ - /* The surface is now in the drawable. On onscreen surfaces or without fbos the texture - * is outdated now - */ surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); return WINED3D_OK; @@ -4325,44 +4348,6 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers } } -static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) -{ - IWineD3DDeviceImpl *device = This->resource.device; - IWineD3DSwapChainImpl *swapchain; - struct wined3d_context *context; - RECT src_rect, dst_rect; - - surface_get_rect(This, rect_in, &src_rect); - - context = context_acquire(device, This); - context_apply_blit_state(context, device); - - dst_rect = src_rect; - if (context->render_offscreen) - { - dst_rect.top = This->currentDesc.Height - dst_rect.top; - dst_rect.bottom = This->currentDesc.Height - dst_rect.bottom; - } - - swapchain = This->container.type == WINED3D_CONTAINER_SWAPCHAIN ? This->container.u.swapchain : NULL; - if (swapchain && This == swapchain->front_buffer) - surface_translate_frontbuffer_coords(This, context->win_handle, &dst_rect); - - device->blitter->set_shader((IWineD3DDevice *) device, This); - - ENTER_GL(); - draw_textured_quad(This, &src_rect, &dst_rect, WINED3DTEXF_POINT); - LEAVE_GL(); - - device->blitter->unset_shader((IWineD3DDevice *) device); - - if (wined3d_settings.strict_draw_ordering || (swapchain - && (This == swapchain->front_buffer || swapchain->num_contexts > 1))) - wglFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); -} - HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RECT *rect) { IWineD3DDeviceImpl *device = surface->resource.device; @@ -4448,7 +4433,10 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE { if (surface->Flags & SFLAG_INTEXTURE) { - surface_blt_to_drawable(surface, rect); + RECT r; + + surface_get_rect(surface, rect, &r); + surface_blt_to_drawable(device, WINED3DTEXF_POINT, FALSE, surface, &r, surface, &r); } else {

1 0

Henri Verbeet : wined3d: Check if we can do the blit before messing with surface flags in IWineD3DSurfaceImpl_BltOverride ().
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: 574169174ec479317986176e635d4d3bf5afb7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=574169174ec479317986176e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 21 12:40:44 2010 +0200 wined3d: Check if we can do the blit before messing with surface flags in IWineD3DSurfaceImpl_BltOverride(). As an added benefit blit_supported() will now get the rectangles in the correct coordinate system. --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6ebffbe..a1587b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3642,6 +3642,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, return arbfp_blit_surface(device, src_surface, &src_rect, dst_surface, &dst_rect, BLIT_OP_BLIT, Filter); } + if (!device->blitter->blit_supported(gl_info, BLIT_OP_BLIT, + &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, + &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + { + FIXME("Unsupported blit operation falling back to software\n"); + return WINED3DERR_INVALIDCALL; + } + /* Color keying: Check if we have to do a color keyed blt, * and if not check if a color key is activated. * @@ -3675,14 +3683,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; } - if (!device->blitter->blit_supported(gl_info, BLIT_OP_BLIT, - &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) - { - FIXME("Unsupported blit operation falling back to software\n"); - return WINED3DERR_INVALIDCALL; - } - device->blitter->set_shader((IWineD3DDevice *)device, src_surface); ENTER_GL();

1 0

Henri Verbeet : wined3d: Flip destination coordinates when blitting to an offscreen target in arbfp_blit_surface ().
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: b0c8b4dd95f0328c9cf61a3d06c7fb80b3f5047a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c8b4dd95f0328c9cf61a3d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 21 12:40:43 2010 +0200 wined3d: Flip destination coordinates when blitting to an offscreen target in arbfp_blit_surface(). --- dlls/wined3d/arb_program_shader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3678f44..2623b57 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7174,6 +7174,11 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ ? dst_surface->container.u.swapchain : NULL; if (dst_swapchain && dst_surface == dst_swapchain->front_buffer) surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); + else if (surface_is_offscreen(dst_surface)) + { + dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; + dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; + } arbfp_blit_set((IWineD3DDevice *)device, src_surface);

1 0

Adam Martinson : msxml3: Implement schema_cache_get().
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: 70f10e1a9f3dc468b446188bd96993ea2b3bafb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f10e1a9f3dc468b446188bd… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:37:23 2010 -0500 msxml3: Implement schema_cache_get(). --- dlls/msxml3/schema.c | 20 +++++++++++++- dlls/msxml3/tests/schema.c | 58 +++++++++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 93aa2ca..bf3bc7e 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -448,8 +448,24 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection *iface, BSTR uri, static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection *iface, BSTR uri, IXMLDOMNode **node) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache* This = impl_from_IXMLDOMSchemaCollection(iface); + xmlChar* name; + cache_entry* entry; + TRACE("(%p)->(%s, %p)\n", This, wine_dbgstr_w(uri), node); + + if (!node) + return E_POINTER; + + name = xmlChar_from_wchar(uri); + entry = (cache_entry*) xmlHashLookup(This->cache, name); + heap_free(name); + + /* TODO: this should be read-only */ + if (entry) + return DOMDocument_create_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); + + *node = NULL; + return S_OK; } static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection *iface, BSTR uri) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 69a0dc3..9b3a6eb 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -368,14 +368,14 @@ static void test_collection_refs(void) schema3 = NULL; /* releasing the original doc does not affect the schema cache */ - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); + ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); + ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); + ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); /* we get a read-only domdoc interface, created just for us */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); ole_expect(IXMLDOMSchemaCollection_addCollection(cache1, NULL), E_POINTER); ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); @@ -400,26 +400,26 @@ static void test_collection_refs(void) check_refs(IXMLDOMSchemaCollection, cache3, 1); /* nor does it affect the domdoc instances */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); - if (schema1) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); - if (schema2) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); - if (schema3) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); + if (schema1) check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); + if (schema2) check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); + if (schema3) check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); schema1 = NULL; schema2 = NULL; schema3 = NULL; /* releasing the domdoc instances doesn't change the cache */ - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); + ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); + ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); + ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); /* we can just get them again */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); /* releasing the caches does not affect the domdoc instances */ check_ref_expr(IXMLDOMSchemaCollection_Release(cache1), 0); @@ -427,13 +427,13 @@ static void test_collection_refs(void) check_ref_expr(IXMLDOMSchemaCollection_Release(cache3), 0); /* they're just for us */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); - if (schema1) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); - if (schema2) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); - if (schema3) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); + if (schema1) check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); + if (schema2) check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); + if (schema3) check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); free_bstrs(); } @@ -624,6 +624,16 @@ static void test_collection_content(void) /* pointer is checked first */ ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, NULL), E_POINTER); + schema1 = NULL; + /* no error if ns uri does not exist */ + ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xsd_schema1_uri), (IXMLDOMNode**)&schema1)); + ok(!schema1, "expected NULL\n"); + /* a NULL bstr corresponds to no-uri ns */ + ole_check(IXMLDOMSchemaCollection_get(cache1, NULL, (IXMLDOMNode**)&schema1)); + ok(!schema1, "expected NULL\n"); + /* error if return pointer is NULL */ + ole_expect(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), NULL), E_POINTER); + for (i = 0; i < 3; ++i) { bstr = NULL;

1 0

Adam Martinson : msxml3: Implement schema_cache_addCollection().
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: 491ec41f5a5433d9387a1da1de137819084fa033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491ec41f5a5433d9387a1da1d… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:36:50 2010 -0500 msxml3: Implement schema_cache_addCollection(). --- dlls/msxml3/schema.c | 25 +++++++++++++++++++++++-- dlls/msxml3/tests/schema.c | 19 +++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 7eadd51..2df038f 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -474,10 +474,31 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection *ifa return E_NOTIMPL; } +static void cache_copy(void* data, void* dest, xmlChar* name) +{ + schema_cache* This = (schema_cache*) dest; + cache_entry* entry = (cache_entry*) data; + + if (xmlHashLookup(This->cache, name) == NULL) + { + cache_entry_add_ref(entry); + xmlHashAddEntry(This->cache, name, entry); + } +} + static HRESULT WINAPI schema_cache_addCollection(IXMLDOMSchemaCollection *iface, IXMLDOMSchemaCollection *otherCollection) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache* This = impl_from_IXMLDOMSchemaCollection(iface); + schema_cache* That = impl_from_IXMLDOMSchemaCollection(otherCollection); + TRACE("(%p)->(%p)\n", This, That); + + if (!otherCollection) + return E_POINTER; + + /* TODO: detect errors while copying & return E_FAIL */ + xmlHashScan(That->cache, cache_copy, This); + + return S_OK; } static HRESULT WINAPI schema_cache_get__newEnum(IXMLDOMSchemaCollection *iface, IUnknown **ppUnk) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index ba99c28..0754a1b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -324,6 +324,7 @@ static void test_collection_refs(void) IXMLDOMDocument2 *schema1, *schema2, *schema3; IXMLDOMSchemaCollection *cache1, *cache2, *cache3; VARIANT_BOOL b; + LONG length; schema1 = create_document(&IID_IXMLDOMDocument2); schema2 = create_document(&IID_IXMLDOMDocument2); @@ -376,8 +377,22 @@ static void test_collection_refs(void) if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); - todo_wine ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); - todo_wine ole_check(IXMLDOMSchemaCollection_addCollection(cache3, cache2)); + ole_expect(IXMLDOMSchemaCollection_addCollection(cache1, NULL), E_POINTER); + ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); + ole_check(IXMLDOMSchemaCollection_addCollection(cache3, cache2)); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache1, &length)); + ok(length == 1, "expected length 1, got %i", length); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache2, &length)); + ok(length == 2, "expected length 2, got %i", length); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache3, &length)); + ok(length == 3, "expected length 3, got %i", length); + /* merging collections does not affect the ref count */ check_refs(IXMLDOMSchemaCollection, cache1, 1);

1 0

Adam Martinson : msxml3: Fix a regression bug in domdoc_loadXML().
by Alexandre Julliard Oct. 21, 2010

Oct. 21, 2010

Module: wine Branch: master Commit: fd9bcfcfe812c0c4f13f9c081e8d029d3966b605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9bcfcfe812c0c4f13f9c081… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 17:00:21 2010 -0500 msxml3: Fix a regression bug in domdoc_loadXML(). Caused by commit 776a8662f088e75e88284cc0fc8e72d768771a6f. Fixes parse failures for BSTR's where encoding is explicitly UTF-16. --- dlls/msxml3/domdoc.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c401100..7669220 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -51,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #include <libxml/xpathInternals.h> #include <libxml/xmlsave.h> #include <libxml/SAX2.h> +#include <libxml/parserInternals.h> /* not defined in older versions */ #define XML_SAVE_FORMAT 1 @@ -321,9 +322,10 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) xmlSAX2Characters(ctx, ch, len); } -static xmlDocPtr doparse(domdoc* This, char *ptr, int len) +static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encoding) { - xmlDocPtr doc; + xmlDocPtr doc = NULL; + xmlParserCtxtPtr pctx; static xmlSAXHandler sax_handler = { xmlSAX2InternalSubset, /* internalSubset */ xmlSAX2IsStandalone, /* isStandalone */ @@ -358,8 +360,33 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len) xmlSAX2EndElementNs, /* endElementNs */ NULL /* TODO: serror */ }; + xmlInitParser(); - doc = xmlSAXParseMemoryWithData(&sax_handler, ptr, len, 0, This); + pctx = xmlCreateMemoryParserCtxt(ptr, len); + if (!pctx) + { + ERR("Failed to create parser context\n"); + return NULL; + } + + if (pctx->sax) xmlFree(pctx->sax); + pctx->sax = &sax_handler; + pctx->_private = This; + pctx->recovery = 0; + pctx->encoding = xmlStrdup(encoding); + xmlParseDocument(pctx); + + if (pctx->wellFormed) + { + doc = pctx->myDoc; + } + else + { + xmlFreeDoc(pctx->myDoc); + pctx->myDoc = NULL; + } + pctx->sax = NULL; + xmlFreeParserCtxt(pctx); /* TODO: put this in one of the SAX callbacks */ /* create first child as a <?xml...?> */ @@ -597,7 +624,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) - xmldoc = doparse(This, ptr, len); + xmldoc = doparse(This, ptr, len, NULL); GlobalUnlock(hglobal); if (!xmldoc) @@ -1789,7 +1816,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) domdoc *This = obj; xmlDocPtr xmldoc; - xmldoc = doparse(This, ptr, len); + xmldoc = doparse(This, ptr, len, NULL); if(xmldoc) { xmldoc->_private = create_priv(); return attach_xmldoc(This, xmldoc); @@ -2017,6 +2044,7 @@ static HRESULT WINAPI domdoc_loadXML( VARIANT_BOOL* isSuccessful ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + static const xmlChar encoding[] = "UTF-8"; xmlDocPtr xmldoc = NULL; HRESULT hr = S_FALSE, hr2; char *str; @@ -2032,10 +2060,13 @@ static HRESULT WINAPI domdoc_loadXML( if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) { - xmldoc = doparse(This, str, len); + xmldoc = doparse(This, str, len, encoding); heap_free( str ); if ( !xmldoc ) + { This->error = E_FAIL; + TRACE("failed to parse document\n"); + } else { hr = This->error = S_OK;

1 0