November 2011 - Wine-Commits

Henri Verbeet : wined3d: Make the surface parameter to blit_shader. set_shader() const.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: a64271c07efeecd4ed9db56c3bbfe3ddfac7f608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64271c07efeecd4ed9db56c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:59 2011 +0100 wined3d: Make the surface parameter to blit_shader.set_shader() const. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4fabeea..a4f2e68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7121,7 +7121,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { GLenum shader; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d70e22d..8def5b5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6260,7 +6260,7 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co } /* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); @@ -6409,7 +6409,7 @@ static void cpu_blit_free(struct wined3d_device *device) } /* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b560f5..b4bc30d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1201,7 +1201,7 @@ struct blit_shader { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); - HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface); + HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface); void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format,

1 0

Henri Verbeet : wined3d: Make the surface parameter to upload_palette() const.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 12268879a2b36cd1eabeccffffe9d5683529e784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12268879a2b36cd1eabeccfff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:58 2011 +0100 wined3d: Make the surface parameter to upload_palette() const. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d32b5f1..4fabeea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6932,7 +6932,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, } /* Context activation is done by the caller. */ -static void upload_palette(struct wined3d_surface *surface, struct wined3d_context *context) +static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context) { BYTE table[256][4]; struct wined3d_device *device = surface->resource.device;

1 0

Alexandre Julliard : gdi32/tests: Avoid some array bounds warnings.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 6098a0457bff4c68170931f161007dc51004e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6098a0457bff4c68170931f16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:43:46 2011 +0100 gdi32/tests: Avoid some array bounds warnings. --- dlls/gdi32/tests/pen.c | 74 +++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6098a0457bff4c6817093…

1 0

Andrew Talbot : wined3d: Remove extraneous braces from switch statements.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: e0cd19d88dbdd6a8a69989747e5a8335fad4c086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0cd19d88dbdd6a8a69989747… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:17 2011 +0000 wined3d: Remove extraneous braces from switch statements. --- dlls/wined3d/glsl_shader.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d1f3bff..32ac385 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -426,11 +426,9 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con } case HEAP_NODE_POP: - { heap_idx >>= 1; --stack_idx; break; - } } } checkGLcall("walk_constant_heap()"); @@ -501,11 +499,9 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i } case HEAP_NODE_POP: - { heap_idx >>= 1; --stack_idx; break; - } } } checkGLcall("walk_constant_heap_clamped()");

1 0

Rafał Mużyło : configure: Fix a typo.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 78f717bff2b22eb0477b0d146e47509c57860df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f717bff2b22eb0477b0d146… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Fri Nov 4 23:20:30 2011 +0100 configure: Fix a typo. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 887fef9..e7767ad 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -220,7 +220,7 @@ $ac_dir/msg.pot: tools/wmc include" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir/rsrc.pot: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) rsrc.pot -$ac_dir/srsrc.pot: tools/wrc include" +$ac_dir/rsrc.pot: tools/wrc include" fi } diff --git a/configure b/configure index 9350761..9251e6f 100755 --- a/configure +++ b/configure @@ -14324,7 +14324,7 @@ $ac_dir/msg.pot: tools/wmc include" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir/rsrc.pot: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) rsrc.pot -$ac_dir/srsrc.pot: tools/wrc include" +$ac_dir/rsrc.pot: tools/wrc include" fi }

1 0

André Hentschel : winebuild: Add support for building on powerpc64.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 64d883a356f6a046a7104ce243b6588a21342e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d883a356f6a046a7104ce24… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 6 17:30:33 2011 +0100 winebuild: Add support for building on powerpc64. With much help from Austin English. --- tools/winebuild/utils.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 2edb9e3..09f9b73 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -358,7 +358,15 @@ struct strarray *get_as_command(void) strarray_add( args, "-arch", (force_pointer_size == 8) ? "x86_64" : "i386", NULL ); break; default: - strarray_add_one( args, (force_pointer_size == 8) ? "--64" : "--32" ); + switch(target_cpu) + { + case CPU_POWERPC: + strarray_add_one( args, (force_pointer_size == 8) ? "-a64" : "-a32" ); + break; + default: + strarray_add_one( args, (force_pointer_size == 8) ? "--64" : "--32" ); + break; + } break; } } @@ -389,7 +397,15 @@ struct strarray *get_ld_command(void) strarray_add( args, "-m", (force_pointer_size == 8) ? "elf_x86_64_fbsd" : "elf_i386_fbsd", NULL ); break; default: - strarray_add( args, "-m", (force_pointer_size == 8) ? "elf_x86_64" : "elf_i386", NULL ); + switch(target_cpu) + { + case CPU_POWERPC: + strarray_add( args, "-m", (force_pointer_size == 8) ? "elf64ppc" : "elf32ppc", NULL ); + break; + default: + strarray_add( args, "-m", (force_pointer_size == 8) ? "elf_x86_64" : "elf_i386", NULL ); + break; + } break; } }

1 0

Nikolay Sivov : msxml3: Fix IDispatch support for IXMLDocument.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: c32db174175c3d4add62a3d8a9435887e00d0b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32db174175c3d4add62a3d8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 11:46:45 2011 +0300 msxml3: Fix IDispatch support for IXMLDocument. --- dlls/msxml3/dispex.c | 129 ++++++++++++++++++++++++++----------------- dlls/msxml3/tests/xmldoc.c | 62 ++++++++++++--------- dlls/msxml3/xmldoc.c | 21 +++---- 3 files changed, 122 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c32db174175c3d4add62a…

1 0

Nikolay Sivov : msxml3: Fix collection index based support for IXMLDOMSelection.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 2ce0f8fd735650f230b6118b6795258e58c85c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0f8fd735650f230b6118b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 19:00:47 2011 +0300 msxml3: Fix collection index based support for IXMLDOMSelection. --- dlls/msxml3/selection.c | 9 +-------- dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 274e239..18b82bb 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -185,13 +185,10 @@ static HRESULT WINAPI domselection_GetTypeInfo( ITypeInfo** ppTInfo ) { domselection *This = impl_from_IXMLDOMSelection( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMSelection_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMSelection_tid, ppTInfo); } static HRESULT WINAPI domselection_GetIDsOfNames( @@ -606,7 +603,6 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) { - domselection *This = impl_from_IXMLDOMSelection( (IXMLDOMSelection*)iface ); WCHAR *ptr; int idx = 0; @@ -615,9 +611,6 @@ static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, if(*ptr) return DISP_E_UNKNOWNNAME; - if(idx >= xmlXPathNodeSetGetLength(This->result->nodesetval)) - return DISP_E_UNKNOWNNAME; - *dispid = DISPID_DOM_COLLECTION_BASE + idx; TRACE("ret %x\n", *dispid); return S_OK; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index efd8ccc..a883da0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9999,10 +9999,12 @@ static void test_selection(void) IEnumVARIANT *enum1, *enum2, *enum3; IXMLDOMNodeList *list; IXMLDOMDocument *doc; + IDispatchEx *dispex; IXMLDOMNode *node; IDispatch *disp; VARIANT_BOOL b; HRESULT hr; + DISPID did; VARIANT v; BSTR name; ULONG ret; @@ -10020,6 +10022,22 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); IXMLDOMSelection_Release(selection); + /* collection disp id */ + hr = IXMLDOMSelection_QueryInterface(selection, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + did = 0; + hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE, "got %d\n", did); + len = 0; + hr = IXMLDOMSelection_get_length(selection, &len); + EXPECT_HR(hr, S_OK); + ok(len == 1, "got %d\n", len); + hr = IDispatchEx_GetDispID(dispex, _bstr_("10"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE+10, "got %d\n", did); + IDispatchEx_Release(dispex); + /* IEnumVARIANT tests */ enum1 = NULL; hr = IXMLDOMSelection_QueryInterface(selection, &IID_IEnumVARIANT, (void**)&enum1);

1 0

Henri Verbeet : wined3d: Remove surface_preload from wined3d_surface_ops.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 48b6050ca36f6da3bc6a5858aea97a79998fe47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b6050ca36f6da3bc6a5858a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:55 2011 +0100 wined3d: Remove surface_preload from wined3d_surface_ops. --- dlls/wined3d/surface.c | 24 +++++++----------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5568695..a123016 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -849,13 +849,6 @@ static HRESULT surface_draw_overlay(struct wined3d_surface *surface) return hr; } -static void surface_preload(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - surface_internal_preload(surface, SRGB_ANY); -} - static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { struct wined3d_device *device = surface->resource.device; @@ -1916,7 +1909,6 @@ static const struct wined3d_surface_ops surface_ops = surface_private_setup, surface_realize_palette, surface_draw_overlay, - surface_preload, surface_map, surface_unmap, }; @@ -2009,13 +2001,6 @@ static HRESULT gdi_surface_draw_overlay(struct wined3d_surface *surface) return E_FAIL; } -static void gdi_surface_preload(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - ERR("Preloading GDI surfaces is not supported.\n"); -} - static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { TRACE("surface %p, rect %s, flags %#x.\n", @@ -2052,7 +2037,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_private_setup, gdi_surface_realize_palette, gdi_surface_draw_overlay, - gdi_surface_preload, gdi_surface_map, gdi_surface_unmap, }; @@ -2947,7 +2931,13 @@ void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); - surface->surface_ops->surface_preload(surface); + if (!surface->resource.device->d3d_initialized) + { + ERR("D3D not initialized.\n"); + return; + } + + surface_internal_preload(surface, SRGB_ANY); } void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c4784b0..ba78162 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2002,7 +2002,6 @@ struct wined3d_surface_ops HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); HRESULT (*surface_draw_overlay)(struct wined3d_surface *surface); - void (*surface_preload)(struct wined3d_surface *surface); void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

André Hentschel : ntdll: Declare debug channel only when used.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 2741edb9989d33ae7bb3d2dceba5e5d916655340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2741edb9989d33ae7bb3d2dce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 6 15:08:06 2011 +0100 ntdll: Declare debug channel only when used. --- dlls/ntdll/relay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 23e6675..3588f1c 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -37,10 +37,11 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(relay); -WINE_DECLARE_DEBUG_CHANNEL(timestamp); #if defined(__i386__) || defined(__x86_64__) +WINE_DECLARE_DEBUG_CHANNEL(timestamp); + struct relay_descr /* descriptor for a module */ { void *magic; /* signature */

1 0