August 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a gl_info pointer to select_shader_backend().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 9aa4f895f084c7384993f3f0a133ced9c1018a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa4f895f084c7384993f3f0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:49 2011 +0200 wined3d: Pass a gl_info pointer to select_shader_backend(). --- dlls/wined3d/directx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cb6d5b..efee8fb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2152,11 +2152,11 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru else return &ffp_fragment_pipeline; } -static const struct wined3d_shader_backend_ops *select_shader_backend(struct wined3d_adapter *adapter) +static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) { int vs_selected_mode, ps_selected_mode; - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; return &none_shader_backend; @@ -2599,7 +2599,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) LEAVE_GL(); adapter->fragment_pipe = select_fragment_implementation(gl_info); - adapter->shader_backend = select_shader_backend(adapter); + adapter->shader_backend = select_shader_backend(gl_info); adapter->blitter = select_blit_implementation(adapter); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps);

1 0

Henri Verbeet : wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state ().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: f65a1ed272a476a2df3c76d3f3ce944fd4eb0d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65a1ed272a476a2df3c76d3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:47 2011 +0200 wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state(). We can do this now because SFLAG_INDRAWABLE is no longer ambiguous. --- dlls/wined3d/context.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e13af5f..95ec3ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -415,15 +415,15 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context->rebind_fbo = FALSE; } - if (render_targets) + if (location == SFLAG_INDRAWABLE) { - context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location); - context_apply_fbo_entry(context, target, context->current_fbo); + context->current_fbo = NULL; + context_bind_fbo(context, target, NULL); } else { - context->current_fbo = NULL; - context_bind_fbo(context, target, NULL); + context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location); + context_apply_fbo_entry(context, target, context->current_fbo); } }

1 0

Marcus Meissner : oleaut32: Fixed buffer size to MBtoWC.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 9d7219dfb965036995bdb2cfdb01507f3dda0faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7219dfb965036995bdb2cfd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Aug 25 10:03:50 2011 +0200 oleaut32: Fixed buffer size to MBtoWC. --- dlls/oleaut32/tests/vartest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c52e3ce..7a6394a 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -348,7 +348,7 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0])); return lstrcmpW(strw, buf); }

1 0

Octavian Voicu : msxml3/tests: Prevent crash in saxreader tests.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: ace8b534185d4e88f751126188d9b2f83228ccf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace8b534185d4e88f75112618… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Aug 25 03:43:05 2011 +0300 msxml3/tests: Prevent crash in saxreader tests. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b205090..e136e33 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1714,7 +1714,7 @@ static void test_mxwriter_encoding(void) hr = IMXWriter_get_output(writer, &dest); todo_wine ok(hr == S_OK, "get_output failed: %08x\n", hr); todo_wine ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + if (V_VT(&dest) == VT_BSTR) todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), "got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest);

1 0

Henri Verbeet : wined3d: Pass a gl_info pointer to select_blit_implementation().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 4503f3d5afa7bc634cb6d2a31f32fbec232298e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503f3d5afa7bc634cb6d2a31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:50 2011 +0200 wined3d: Pass a gl_info pointer to select_blit_implementation(). --- dlls/wined3d/directx.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index efee8fb..a43dc9f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2162,9 +2162,8 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru return &none_shader_backend; } -static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter) +static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; int vs_selected_mode, ps_selected_mode; select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); @@ -2600,7 +2599,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->fragment_pipe = select_fragment_implementation(gl_info); adapter->shader_backend = select_shader_backend(gl_info); - adapter->blitter = select_blit_implementation(adapter); + adapter->blitter = select_blit_implementation(gl_info); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages;

1 0

Henri Verbeet : wined3d: Use draw_binding in swapchain_gl_present().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: f0d8f2aa8914a41b17de3976f07db68fcfc670dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d8f2aa8914a41b17de3976f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:45 2011 +0200 wined3d: Use draw_binding in swapchain_gl_present(). --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 20c2323..fe1a510 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -614,7 +614,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * the texture / sysmem copy needs to be reloaded from the drawable */ if (swapchain->presentParms.SwapEffect == WINED3DSWAPEFFECT_FLIP) - surface_modify_location(swapchain->back_buffers[0], SFLAG_INDRAWABLE, TRUE); + surface_modify_location(swapchain->back_buffers[0], swapchain->back_buffers[0]->draw_binding, TRUE); } if (fb->depth_stencil)

1 0

Henri Verbeet : wined3d: Use draw_binding in surface_realize_palette().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 1d43f07239c7a0b9c014443091d9f627bed844f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d43f07239c7a0b9c01444309… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:43 2011 +0200 wined3d: Use draw_binding in surface_realize_palette(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 604073d..3edb48b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -811,7 +811,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - surface_load_location(surface, SFLAG_INDRAWABLE, NULL); + surface_load_location(surface, surface->draw_binding, NULL); } static HRESULT surface_draw_overlay(struct wined3d_surface *surface)

1 0

Henri Verbeet : wined3d: Use draw_binding in surface_unmap().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 683b52ed92fde8f47dce36640225cd16aaf4009a URL: http://source.winehq.org/git/wine.git/?a=commit;h=683b52ed92fde8f47dce36640… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:42 2011 +0200 wined3d: Use draw_binding in surface_unmap(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95f5052..604073d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -984,7 +984,7 @@ static void surface_unmap(struct wined3d_surface *surface) surface->flags |= SFLAG_INSYSMEM; } - surface_load_location(surface, SFLAG_INDRAWABLE, fullsurface ? NULL : &surface->dirtyRect); + surface_load_location(surface, surface->draw_binding, fullsurface ? NULL : &surface->dirtyRect); /* Partial rectangle tracking is not commonly implemented, it is only * done for render targets. INSYSMEM was set before to tell

1 0

Michael Stefaniuc : ole32: COM cleanup in itemmoniker.c.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: d3c934adcd9f2e84732102f6be226ddab6f69199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c934adcd9f2e84732102f6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 12:14:29 2011 +0200 ole32: COM cleanup in itemmoniker.c. --- dlls/ole32/itemmoniker.c | 95 +++++++++++++++++++++------------------------- 1 files changed, 43 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c934adcd9f2e8473210…

1 0

Henri Verbeet : wined3d: Use draw_binding in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 1ae498dc59bd78fcc0fcfa510af81dcffb75eefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae498dc59bd78fcc0fcfa510… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:41 2011 +0200 wined3d: Use draw_binding in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dea13f8..95f5052 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5565,7 +5565,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa src_surface->CKeyFlags = oldCKeyFlags; src_surface->SrcBltCKey = oldBltCKey; - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); return WINED3D_OK; }

1 0