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

Andrew Eikum : winmm: Remove unused define.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 3579bbd8ab8213e57f2c035c46cf768ba393b07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3579bbd8ab8213e57f2c035c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 7 10:59:37 2012 -0600 winmm: Remove unused define. --- dlls/winmm/lolvldrv.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 9ee0235..820d28b 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -45,9 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); -/* Default set of drivers to be loaded */ -#define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio" - /* each known type of driver has an instance of this structure */ typedef struct tagWINE_LLTYPE { /* those attributes depend on the specification of the type */

1 0

Henri Verbeet : wined3d: Remove a transformed vertex loading hack in load_vertex_data().
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 639ea0f49c5c67354619ad84b3e94eb8f63785a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639ea0f49c5c67354619ad84b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 18:38:51 2012 +0100 wined3d: Remove a transformed vertex loading hack in load_vertex_data(). This should never be used, we fall back to drawStridedSlow() for transformed vertices. --- dlls/wined3d/state.c | 28 +++++----------------------- 1 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a5d748a..a26240a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4318,29 +4318,11 @@ static void load_vertex_data(const struct wined3d_context *context, curVBO = e->data.buffer_object; } - /* min(WINED3D_ATR_FORMAT(position),3) to Disable RHW mode as 'w' coord - handling for rhw mode should not impact screen position whereas in GL it does. - This may result in very slightly distorted textures in rhw mode. - There's always the other option of fixing the view matrix to - prevent w from having any effect. - - This only applies to user pointer sources, in VBOs the vertices are fixed up - */ - if (!e->data.buffer_object) - { - TRACE("glVertexPointer(3, %#x, %#x, %p);\n", e->format->gl_vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - glVertexPointer(3 /* min(e->format->gl_vtx_format, 3) */, e->format->gl_vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - } - else - { - TRACE("glVertexPointer(%#x, %#x, %#x, %p);\n", - e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - glVertexPointer(e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - } + TRACE("glVertexPointer(%#x, %#x, %#x, %p);\n", + e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, + e->data.addr + state->load_base_vertex_index * e->stride); + glVertexPointer(e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, + e->data.addr + state->load_base_vertex_index * e->stride); checkGLcall("glVertexPointer(...)"); glEnableClientState(GL_VERTEX_ARRAY); checkGLcall("glEnableClientState(GL_VERTEX_ARRAY)");

1 0

Henri Verbeet : wined3d: Don' t use floating point for surface height scaling.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 6d483c2d9d1075df26fb51b1fc34f12e71fc5f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d483c2d9d1075df26fb51b1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 18:38:52 2012 +0100 wined3d: Don't use floating point for surface height scaling. This is the follow-up to commit a4e5bcff4c66aa1041ea32f971b92b40d73e7d72. --- dlls/wined3d/surface.c | 10 ++++++++-- dlls/wined3d/utils.c | 9 ++++++--- dlls/wined3d/wined3d_private.h | 8 +++++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9ec3db3..b7273f7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2282,7 +2282,10 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi } if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) - update_h *= format->heightscale; + { + update_h *= format->height_scale.numerator; + update_h /= format->height_scale.denominator; + } ENTER_GL(); @@ -2517,7 +2520,10 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru } if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) - height *= format->heightscale; + { + height *= format->height_scale.numerator; + height /= format->height_scale.denominator; + } TRACE("(%p) : Creating surface (target %#x) level %d, d3d format %s, internal format %#x, width %d, height %d, gl format %#x, gl type=%#x\n", surface, surface->texture_target, surface->texture_level, debug_d3dformat(format->id), diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e570a13..847366e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1285,7 +1285,8 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) format->glType = format_texture_info[i].gl_type; format->color_fixup = COLOR_FIXUP_IDENTITY; format->flags |= format_texture_info[i].flags; - format->heightscale = 1.0f; + format->height_scale.numerator = 1; + format->height_scale.denominator = 1; if (format->glGammaInternal != format->glInternal) { @@ -1581,7 +1582,8 @@ static void apply_format_fixups(struct wined3d_gl_info *gl_info) idx = getFmtIdx(WINED3DFMT_YV12); gl_info->formats[idx].flags |= WINED3DFMT_FLAG_HEIGHT_SCALE; - gl_info->formats[idx].heightscale = 1.5f; + gl_info->formats[idx].height_scale.numerator = 3; + gl_info->formats[idx].height_scale.denominator = 2; gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); if (gl_info->supported[EXT_PALETTED_TEXTURE] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) @@ -1709,7 +1711,8 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { /* The D3D format requirements make sure that the resulting format is an integer again */ - size = (UINT) (size * format->heightscale); + size *= format->height_scale.numerator; + size /= format->height_scale.denominator; } return size; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cd9690c..472c21a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2805,6 +2805,12 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLOCKS 0x00020000 #define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 +struct wined3d_rational +{ + UINT numerator; + UINT denominator; +}; + struct wined3d_format { enum wined3d_format_id id; @@ -2835,7 +2841,7 @@ struct wined3d_format GLint glType; UINT conv_byte_count; unsigned int flags; - float heightscale; + struct wined3d_rational height_scale; struct color_fixup_desc color_fixup; void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); };

1 0

Henri Verbeet : wined3d: Remove an outdated comment in state_zwritenable().
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 3d5ca7ab647d91481f2c2dbd4ae877ee64a9a9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5ca7ab647d91481f2c2dbd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 18:38:53 2012 +0100 wined3d: Remove an outdated comment in state_zwritenable(). We actually do have tests for this. --- dlls/wined3d/state.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a26240a..c0e0c0e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -205,8 +205,6 @@ static void state_ditherenable(struct wined3d_context *context, const struct win static void state_zwritenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - /* TODO: Test if in d3d z writing is enabled even if ZENABLE is off. - * If yes, this has to be merged with ZENABLE and ZFUNC. */ if (state->render_states[WINED3D_RS_ZWRITEENABLE]) { glDepthMask(1);

1 0

Henri Verbeet : wined3d: Remove an outdated comment from load_vertex_data() .
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: b8a22ebef0d2625829f54f6709f74575e6c8b82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a22ebef0d2625829f54f670… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 18:38:54 2012 +0100 wined3d: Remove an outdated comment from load_vertex_data(). --- dlls/wined3d/state.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c0e0c0e..264d16d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4352,14 +4352,6 @@ static void load_vertex_data(const struct wined3d_context *context, } /* Diffuse Colour --------------------------------------------*/ - /* WARNING: Data here MUST be in RGBA format, so cannot */ - /* go directly into fast mode from app pgm, because */ - /* directx requires data in BGRA format. */ - /* currently fixupVertices swizzles the format, but this isn't*/ - /* very practical when using VBOs */ - /* NOTE: Unless we write a vertex shader to swizzle the colour*/ - /* , or the user doesn't care and wants the speed advantage */ - if (si->use_map & (1 << WINED3D_FFP_DIFFUSE)) { e = &si->elements[WINED3D_FFP_DIFFUSE];

1 0

Henri Verbeet : ddraw: Trace color keys in hex.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 4c8ee13d5b51a9161807e8de89ed28366377c20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8ee13d5b51a9161807e8de8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 18:38:55 2012 +0100 ddraw: Trace color keys in hex. --- dlls/ddraw/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index b341a78..12354dc 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -622,7 +622,7 @@ DDRAW_dump_PTR(const void *in) static void DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck) { - TRACE("Low : %d - High : %d\n", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); + TRACE("Low : 0x%08x - High : 0x%08x\n", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); } static void DDRAW_dump_flags_nolf(DWORD flags, const flag_info* names,

1 0

Nikolay Sivov : msxml3: Add stub support of ISAXDeclHandler for MXWriter.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 02545de4de260c5ab2239094a0e98514c412818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=02545de4de260c5ab2239094a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 8 11:57:48 2012 +0300 msxml3: Add stub support of ISAXDeclHandler for MXWriter. --- dlls/msxml3/mxwriter.c | 83 ++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 16 ++++++++ 2 files changed, 98 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 72db31d..2519a75 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1,7 +1,7 @@ /* * MXWriter implementation * - * Copyright 2011 Nikolay Sivov for CodeWeavers + * Copyright 2011-2012 Nikolay Sivov for CodeWeavers * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or @@ -94,6 +94,7 @@ typedef struct IMXWriter IMXWriter_iface; ISAXContentHandler ISAXContentHandler_iface; ISAXLexicalHandler ISAXLexicalHandler_iface; + ISAXDeclHandler ISAXDeclHandler_iface; LONG ref; MSXML_VERSION class_version; @@ -482,6 +483,11 @@ static inline mxwriter *impl_from_ISAXLexicalHandler(ISAXLexicalHandler *iface) return CONTAINING_RECORD(iface, mxwriter, ISAXLexicalHandler_iface); } +static inline mxwriter *impl_from_ISAXDeclHandler(ISAXDeclHandler *iface) +{ + return CONTAINING_RECORD(iface, mxwriter, ISAXDeclHandler_iface); +} + static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, void **obj) { mxwriter *This = impl_from_IMXWriter( iface ); @@ -504,6 +510,10 @@ static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, voi { *obj = &This->ISAXLexicalHandler_iface; } + else if ( IsEqualGUID( riid, &IID_ISAXDeclHandler ) ) + { + *obj = &This->ISAXDeclHandler_iface; + } else if (dispex_query_interface(&This->dispex, riid, obj)) { return *obj ? S_OK : E_NOINTERFACE; @@ -1279,6 +1289,76 @@ static const struct ISAXLexicalHandlerVtbl SAXLexicalHandlerVtbl = SAXLexicalHandler_comment }; +/*** ISAXDeclHandler ***/ +static HRESULT WINAPI SAXDeclHandler_QueryInterface(ISAXDeclHandler *iface, + REFIID riid, void **obj) +{ + mxwriter *This = impl_from_ISAXDeclHandler( iface ); + return IMXWriter_QueryInterface(&This->IMXWriter_iface, riid, obj); +} + +static ULONG WINAPI SAXDeclHandler_AddRef(ISAXDeclHandler *iface) +{ + mxwriter *This = impl_from_ISAXDeclHandler( iface ); + return IMXWriter_AddRef(&This->IMXWriter_iface); +} + +static ULONG WINAPI SAXDeclHandler_Release(ISAXDeclHandler *iface) +{ + mxwriter *This = impl_from_ISAXDeclHandler( iface ); + return IMXWriter_Release(&This->IMXWriter_iface); +} + +static HRESULT WINAPI SAXDeclHandler_elementDecl(ISAXDeclHandler *iface, + const WCHAR *name, int n_name, const WCHAR *model, int n_model) +{ + mxwriter *This = impl_from_ISAXDeclHandler( iface ); + FIXME("(%p)->(%s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + debugstr_wn(model, n_model), n_model); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, + const WCHAR *element, int n_element, const WCHAR *attr, int n_attr, + const WCHAR *type, int n_type, const WCHAR *Default, int n_default, + const WCHAR *value, int n_value) +{ + mxwriter *This = impl_from_ISAXDeclHandler( iface ); + FIXME("(%p)->(%s:%d %s:%d %s:%d %s:%d %s:%d): stub\n", This, debugstr_wn(element, n_element), n_element, + debugstr_wn(attr, n_attr), n_attr, debugstr_wn(type, n_type), n_type, debugstr_wn(Default, n_default), n_default, + debugstr_wn(value, n_value), n_value); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAXDeclHandler_internalEntityDecl(ISAXDeclHandler *iface, + const WCHAR *name, int n_name, const WCHAR *value, int n_value) +{ + mxwriter *This = impl_from_ISAXDeclHandler( iface ); + FIXME("(%p)->(%s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + debugstr_wn(value, n_value), n_value); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAXDeclHandler_externalEntityDecl(ISAXDeclHandler *iface, + const WCHAR *name, int n_name, const WCHAR *publicId, int n_publicId, + const WCHAR *systemId, int n_systemId) +{ + mxwriter *This = impl_from_ISAXDeclHandler( iface ); + FIXME("(%p)->(%s:%d %s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + debugstr_wn(publicId, n_publicId), n_publicId, debugstr_wn(systemId, n_systemId), n_systemId); + return E_NOTIMPL; +} + +static const ISAXDeclHandlerVtbl SAXDeclHandlerVtbl = { + SAXDeclHandler_QueryInterface, + SAXDeclHandler_AddRef, + SAXDeclHandler_Release, + SAXDeclHandler_elementDecl, + SAXDeclHandler_attributeDecl, + SAXDeclHandler_internalEntityDecl, + SAXDeclHandler_externalEntityDecl +}; + static const tid_t mxwriter_iface_tids[] = { IMXWriter_tid, 0 @@ -1308,6 +1388,7 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) This->IMXWriter_iface.lpVtbl = &MXWriterVtbl; This->ISAXContentHandler_iface.lpVtbl = &SAXContentHandlerVtbl; This->ISAXLexicalHandler_iface.lpVtbl = &SAXLexicalHandlerVtbl; + This->ISAXDeclHandler_iface.lpVtbl = &SAXDeclHandlerVtbl; This->ref = 1; This->class_version = version; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 56f6aa0..368dfeb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1685,6 +1685,7 @@ static void test_mxwriter_handlers(void) { ISAXContentHandler *handler; IMXWriter *writer, *writer2; + ISAXDeclHandler *decl; ISAXLexicalHandler *lh; HRESULT hr; @@ -1720,6 +1721,21 @@ static void test_mxwriter_handlers(void) EXPECT_REF(writer, 3); EXPECT_REF(writer2, 3); IMXWriter_Release(writer2); + ISAXLexicalHandler_Release(lh); + + /* ISAXDeclHandler */ + hr = IMXWriter_QueryInterface(writer, &IID_ISAXDeclHandler, (void**)&decl); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + EXPECT_REF(writer, 2); + EXPECT_REF(lh, 2); + + hr = ISAXDeclHandler_QueryInterface(decl, &IID_IMXWriter, (void**)&writer2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(writer2 == writer, "got %p, expected %p\n", writer2, writer); + EXPECT_REF(writer, 3); + EXPECT_REF(writer2, 3); + IMXWriter_Release(writer2); + ISAXDeclHandler_Release(decl); IMXWriter_Release(writer); }

1 0

Nikolay Sivov : msxml3: Support element declaration output in MXWriter.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: f73e02152cd76851fc7e07fbbdd15e030c81b169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73e02152cd76851fc7e07fbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 8 12:03:27 2012 +0300 msxml3: Support element declaration output in MXWriter. --- dlls/msxml3/mxwriter.c | 22 ++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 2519a75..55159e1 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -389,9 +389,6 @@ static HRESULT write_data_to_stream(mxwriter *This) if (!This->dest) return S_OK; - /* The xmlOutputBuffer doesn't copy its contents from its 'buffer' to the - * 'conv' buffer when UTF8 encoding is used. - */ if (This->xml_enc != XmlEncoding_UTF16) buffer = &This->buffer->encoded; else @@ -1312,10 +1309,25 @@ static ULONG WINAPI SAXDeclHandler_Release(ISAXDeclHandler *iface) static HRESULT WINAPI SAXDeclHandler_elementDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *model, int n_model) { + static const WCHAR elementW[] = {'<','!','E','L','E','M','E','N','T',' '}; + static const WCHAR closeelementW[] = {'>','\r','\n'}; mxwriter *This = impl_from_ISAXDeclHandler( iface ); - FIXME("(%p)->(%s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + + TRACE("(%p)->(%s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(model, n_model), n_model); - return E_NOTIMPL; + + if (!name || !model) return E_INVALIDARG; + + write_output_buffer(This->buffer, elementW, sizeof(elementW)/sizeof(WCHAR)); + if (n_name) { + write_output_buffer(This->buffer, name, n_name); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + if (n_model) + write_output_buffer(This->buffer, model, n_model); + write_output_buffer(This->buffer, closeelementW, sizeof(closeelementW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 368dfeb..494d866 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3124,11 +3124,13 @@ static void test_mxwriter_cdata(void) static void test_mxwriter_dtd(void) { + static const WCHAR contentW[] = {'c','o','n','t','e','n','t'}; static const WCHAR nameW[] = {'n','a','m','e'}; static const WCHAR pubW[] = {'p','u','b'}; static const WCHAR sysW[] = {'s','y','s'}; ISAXContentHandler *content; ISAXLexicalHandler *lexical; + ISAXDeclHandler *decl; IMXWriter *writer; VARIANT dest; HRESULT hr; @@ -3143,6 +3145,9 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_QueryInterface(writer, &IID_ISAXLexicalHandler, (void**)&lexical); EXPECT_HR(hr, S_OK); + hr = IMXWriter_QueryInterface(writer, &IID_ISAXDeclHandler, (void**)&decl); + EXPECT_HR(hr, S_OK); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -3202,8 +3207,46 @@ static void test_mxwriter_dtd(void) V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* element declaration */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_elementDecl(decl, NULL, 0, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXDeclHandler_elementDecl(decl, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXDeclHandler_elementDecl(decl, nameW, sizeof(nameW)/sizeof(WCHAR), contentW, sizeof(contentW)/sizeof(WCHAR)); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ELEMENT name content>\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_elementDecl(decl, nameW, sizeof(nameW)/sizeof(WCHAR), contentW, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ELEMENT name >\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); + ISAXDeclHandler_Release(decl); IMXWriter_Release(writer); free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Check for unsafe cast in addCollection().
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 8889b66ffe88830da2e4f2fadaad89fecf43b262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8889b66ffe88830da2e4f2fad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 8 12:04:41 2012 +0300 msxml3: Check for unsafe cast in addCollection(). --- dlls/msxml3/schema.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 253f901..e6af8b2 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -786,11 +786,23 @@ static LONG cache_entry_release(cache_entry* entry) return ref; } +static const struct IXMLDOMSchemaCollection2Vtbl XMLDOMSchemaCollection2Vtbl; + static inline schema_cache* impl_from_IXMLDOMSchemaCollection2(IXMLDOMSchemaCollection2* iface) { return CONTAINING_RECORD(iface, schema_cache, IXMLDOMSchemaCollection2_iface); } +static inline schema_cache* impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection* iface) +{ + return CONTAINING_RECORD(iface, schema_cache, IXMLDOMSchemaCollection2_iface); +} + +static inline schema_cache* unsafe_impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection *iface) +{ + return iface->lpVtbl == (void*)&XMLDOMSchemaCollection2Vtbl ? impl_from_IXMLDOMSchemaCollection(iface) : NULL; +} + static inline CacheEntryType cache_type_from_xmlDocPtr(xmlDocPtr schema) { xmlNodePtr root = NULL; @@ -1292,15 +1304,23 @@ static void cache_copy(void* data, void* dest, xmlChar* name) } static HRESULT WINAPI schema_cache_addCollection(IXMLDOMSchemaCollection2* iface, - IXMLDOMSchemaCollection* otherCollection) + IXMLDOMSchemaCollection* collection) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - schema_cache* That = impl_from_IXMLDOMSchemaCollection2((IXMLDOMSchemaCollection2*)otherCollection); - TRACE("(%p)->(%p)\n", This, That); + schema_cache* That; + + TRACE("(%p)->(%p)\n", This, collection); - if (!otherCollection) + if (!collection) return E_POINTER; + That = unsafe_impl_from_IXMLDOMSchemaCollection(collection); + if (!That) + { + ERR("external collection implementation\n"); + return E_FAIL; + } + /* TODO: detect errors while copying & return E_FAIL */ xmlHashScan(That->cache, cache_copy, This);

1 0

Jacek Caban : mshtml: Get rid of no longer used silent argument of load_gecko.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: a729027c69b698e272e143ed145410f6cf7c9852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a729027c69b698e272e143ed1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:18:04 2012 +0100 mshtml: Get rid of no longer used silent argument of load_gecko. --- dlls/mshtml/main.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index c1dfd13..165bf03 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -484,7 +484,7 @@ HRESULT WINAPI DllRegisterServer(void) if(SUCCEEDED(hres)) hres = register_server(TRUE); if(SUCCEEDED(hres)) - load_gecko(FALSE); + load_gecko(); return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2385588..75591f2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -671,7 +671,7 @@ HRESULT get_client_disp_property(IOleClientSite*,DISPID,VARIANT*) DECLSPEC_HIDDE HRESULT ProtocolFactory_Create(REFCLSID,REFIID,void**) DECLSPEC_HIDDEN; -BOOL load_gecko(BOOL) DECLSPEC_HIDDEN; +BOOL load_gecko(void) DECLSPEC_HIDDEN; void close_gecko(void) DECLSPEC_HIDDEN; void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*) DECLSPEC_HIDDEN; void init_nsio(nsIComponentManager*,nsIComponentRegistrar*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d96bcaf..057a495 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -230,7 +230,7 @@ static void register_nscontainer_class(void) nscontainer_class = RegisterClassExW(&wndclass); } -static BOOL install_wine_gecko(BOOL silent) +static BOOL install_wine_gecko(void) { PROCESS_INFORMATION pi; STARTUPINFOW si; @@ -573,7 +573,7 @@ static CRITICAL_SECTION_DEBUG cs_load_gecko_dbg = }; static CRITICAL_SECTION cs_load_gecko = { &cs_load_gecko_dbg, -1, 0, 0, 0, 0 }; -BOOL load_gecko(BOOL silent) +BOOL load_gecko(void) { PRUnichar gre_path[MAX_PATH]; BOOL ret = FALSE; @@ -592,7 +592,7 @@ BOOL load_gecko(BOOL silent) loading_thread = GetCurrentThreadId(); if(load_wine_gecko(gre_path) - || (install_wine_gecko(silent) && load_wine_gecko(gre_path))) + || (install_wine_gecko() && load_wine_gecko(gre_path))) ret = init_xpcom(gre_path); else MESSAGE("Could not load wine-gecko. HTML rendering will be disabled.\n"); @@ -1862,7 +1862,7 @@ HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer *parent, NSContaine NSContainer *ret; HRESULT hres; - if(!load_gecko(TRUE)) + if(!load_gecko()) return CLASS_E_CLASSNOTAVAILABLE; ret = heap_alloc_zero(sizeof(NSContainer));

1 0