December 2011 - Wine-commits

Alexandre Julliard : gdi32: Make sure that biSizeImage always contains the correct size in internal BITMAPINFO structures .
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 82e1a4616cd4802e2c14c057732f6296be73580b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e1a4616cd4802e2c14c0577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 10 13:27:16 2011 +0100 gdi32: Make sure that biSizeImage always contains the correct size in internal BITMAPINFO structures. --- dlls/gdi32/bitblt.c | 14 +++++++++----- dlls/gdi32/brush.c | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index abd4dfc..7167c4a 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -170,7 +170,9 @@ DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, DWORD err; dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; - if (!(ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) + dst_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); + + if (!(ptr = HeapAlloc( GetProcessHeap(), 0, dst_info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY; err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr, add_alpha ); @@ -190,8 +192,10 @@ DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, dst_info->bmiHeader.biWidth = dst->visrect.right - dst->visrect.left; dst_info->bmiHeader.biHeight = dst->visrect.bottom - dst->visrect.top; + dst_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); + if (src_info->bmiHeader.biHeight < 0) dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; - if (!(ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) + if (!(ptr = HeapAlloc( GetProcessHeap(), 0, dst_info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY; err = stretch_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr, dst, mode ); @@ -208,7 +212,7 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits { if (!dst_bits->is_copy) { - int size = get_dib_image_size( dst_info ); + int size = dst_info->bmiHeader.biSizeImage; void *ptr = HeapAlloc( GetProcessHeap(), 0, size ); if (!ptr) return ERROR_OUTOFMEMORY; memcpy( ptr, dst_bits->ptr, size ); @@ -446,11 +450,11 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dst.visrect.right - dst.visrect.left; info->bmiHeader.biHeight = dst.visrect.bottom - dst.visrect.top; - info->bmiHeader.biSizeImage = 0; + info->bmiHeader.biSizeImage = get_dib_image_size( info ); dev = GET_DC_PHYSDEV( dc, pPutImage ); err = dev->funcs->pPutImage( dev, 0, 0, info, NULL, NULL, NULL, 0 ); if ((err && err != ERROR_BAD_FORMAT) || - !(bits.ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, get_dib_image_size( info )))) + !(bits.ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) { ret = FALSE; goto done; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 34d3a57..c86421c 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -126,12 +126,12 @@ static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) memcpy( &info->bmiHeader + 1, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); else if (info->bmiHeader.biClrUsed) memcpy( &info->bmiHeader + 1, bmp->color_table, info->bmiHeader.biClrUsed * sizeof(RGBQUAD) ); - if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )))) + if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) { HeapFree( GetProcessHeap(), 0, info ); goto done; } - memcpy( brush->bits.ptr, bmp->dib->dsBm.bmBits, get_dib_image_size( info )); + memcpy( brush->bits.ptr, bmp->dib->dsBm.bmBits, info->bmiHeader.biSizeImage ); brush->bits.is_copy = TRUE; brush->bits.free = free_heap_bits; brush->info = info;

1 0

Alexandre Julliard : gdi32: Simplify computation of the DIB header size for internal BITMAPINFO structures .
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 8db263d2eb7afaaad11b82a3febe029ad9bb44f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db263d2eb7afaaad11b82a3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 10 13:28:08 2011 +0100 gdi32: Simplify computation of the DIB header size for internal BITMAPINFO structures. --- dlls/gdi32/brush.c | 8 ++++---- dlls/gdi32/dib.c | 16 +++++++++++----- dlls/gdi32/enhmfdrv/bitblt.c | 4 ++-- dlls/gdi32/enhmfdrv/objects.c | 10 +++++----- dlls/gdi32/gdi_private.h | 15 ++++++++++++--- dlls/gdi32/mfdrv/bitblt.c | 7 +++---- dlls/gdi32/mfdrv/objects.c | 9 ++++----- 7 files changed, 41 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8db263d2eb7afaaad11b8…

1 0

Alexandre Julliard : gdi32/tests: Fix some test failures on Windows.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 2e42ab1527b6018385d2c5c20a0a6864000b019e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e42ab1527b6018385d2c5c20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 10 18:08:35 2011 +0100 gdi32/tests: Fix some test failures on Windows. --- dlls/gdi32/tests/bitmap.c | 12 ++++++++---- dlls/gdi32/tests/clipping.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 6c500ec..accfc91 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -881,7 +881,7 @@ static void test_dib_formats(void) HBITMAP hdib, hbmp; HDC hdc, memdc; UINT ret; - BOOL expect_ok; + BOOL format_ok, expect_ok; bi = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); hdc = GetDC( 0 ); @@ -927,6 +927,7 @@ static void test_dib_formats(void) "GetDIBits succeeded for %u/%u/%u/%u\n", bpp, planes, compr, format ); /* all functions check planes except GetDIBits with 0 lines */ + format_ok = expect_ok; if (!planes) expect_ok = FALSE; memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -1019,7 +1020,8 @@ static void test_dib_formats(void) if (expect_ok || !bpp) ok( ret, "GetDIBits failed for %u/%u/%u/%u\n", bpp, planes, compr, format ); else - ok( !ret, "GetDIBits succeeded for %u/%u/%u/%u\n", bpp, planes, compr, format ); + ok( !ret || broken(format_ok && !planes), /* nt4 */ + "GetDIBits succeeded for %u/%u/%u/%u\n", bpp, planes, compr, format ); } } } @@ -1841,7 +1843,8 @@ static void test_GetDIBits(void) broken(GetLastError() == 0xdeadbeef), /* winnt */ "wrong error %u\n", GetLastError()); ok(bi->bmiHeader.biSizeImage == 0, "expected 0, got %u\n", bi->bmiHeader.biSizeImage); - ok(bi->bmiHeader.biClrUsed == 37, "wrong biClrUsed %u\n", bi->bmiHeader.biClrUsed); + ok(bi->bmiHeader.biClrUsed == 37 || broken(bi->bmiHeader.biClrUsed == 0), + "wrong biClrUsed %u\n", bi->bmiHeader.biClrUsed); memset(buf, 0xAA, sizeof(buf)); SetLastError(0xdeadbeef); @@ -4365,7 +4368,8 @@ static void test_SetDIBits(void) int ent = (255 - idx) % pal->palNumEntries; DWORD expect = idx >= info->bmiHeader.biClrUsed ? 0 : (palent[ent].peRed << 16 | palent[ent].peGreen << 8 | palent[ent].peBlue); - ok( dib_bits[i] == expect, "%d: got %08x instead of %08x\n", i, dib_bits[i], expect ); + ok( dib_bits[i] == expect || broken(dib_bits[i] == 0), /* various Windows versions get some values wrong */ + "%d: got %08x instead of %08x\n", i, dib_bits[i], expect ); } memset( dib_bits, 0xaa, 64 * 4 ); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 3019d67..dcdc8d7 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -112,6 +112,8 @@ static void test_GetRandomRgn(void) GetRgnBox(hrgn, &ret_rc); if(GetVersion() & 0x80000000) OffsetRect(&window_rc, -window_rc.left, -window_rc.top); + /* the window may be partially obscured so the region may be smaller */ + IntersectRect( &window_rc, &ret_rc, &ret_rc ); ok(EqualRect(&window_rc, &ret_rc) || broken(IsRectEmpty(&ret_rc)), /* win95 */ "GetRandomRgn %d,%d - %d,%d\n",

1 0

Dmitry Timoshkov : user32: Strip WS_CAPTION|WS_SYSMENU when a dialog has DS_CONTROL style set.
by Alexandre Julliard 12 Dec '11

12 Dec '11

1 0

Rico Schüller : d3dx9: Implement D3DXSHAdd().
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: b83d322dba18cb2efee2d9767fefdd074a351965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83d322dba18cb2efee2d9767… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Dec 10 17:51:32 2011 +0100 d3dx9: Implement D3DXSHAdd(). --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 12 ++++++++++ dlls/d3dx9_36/tests/math.c | 50 ++++++++++++++++++++++++++++++++++++++++++- dlls/user32/dialog.c | 3 -- dlls/user32/tests/win.c | 38 -------------------------------- include/d3dx9math.h | 7 ++++- 6 files changed, 67 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b83d322dba18cb2efee2d…

1 0

Nikolay Sivov : msxml3: Escape '<', '&', '"' and '>' in attribute value.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: d80ee5b3ae36275f813b096576b5beecea2c2d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80ee5b3ae36275f813b09657… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 02:32:51 2011 +0300 msxml3: Escape '<','&','"' and '>' in attribute value. --- dlls/msxml3/mxwriter.c | 72 +++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 58 +++++++++++++++++--------------- 2 files changed, 101 insertions(+), 29 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index febabe1..5c5aca8 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -57,7 +57,7 @@ typedef enum MXWriter_LastProp } MXWRITER_PROPS; -typedef struct _mxwriter +typedef struct { DispatchEx dispex; IMXWriter IMXWriter_iface; @@ -106,6 +106,71 @@ static HRESULT bstr_from_xmlCharEncoding(xmlCharEncoding enc, BSTR *encoding) return *encoding ? S_OK : E_OUTOFMEMORY; } +/* escapes special characters like: + '<' -> "<" + '&' -> "&" + '"' -> """ + '>' -> ">" +*/ +static WCHAR *get_escaped_string(const WCHAR *str, int *len) +{ + static const WCHAR ltW[] = {'&','l','t',';'}; + static const WCHAR ampW[] = {'&','a','m','p',';'}; + static const WCHAR quotW[] = {'&','q','u','o','t',';'}; + static const WCHAR gtW[] = {'&','g','t',';'}; + + const int default_alloc = 100; + const int grow_thresh = 10; + int p = *len, conv_len; + WCHAR *ptr, *ret; + + /* default buffer size to something if length is unknown */ + conv_len = *len == -1 ? default_alloc : max(2**len, default_alloc); + ptr = ret = heap_alloc(conv_len*sizeof(WCHAR)); + + while (*str && p) + { + if (ptr - ret > conv_len - grow_thresh) + { + int written = ptr - ret; + conv_len *= 2; + ptr = ret = heap_realloc(ret, conv_len*sizeof(WCHAR)); + ptr += written; + } + + switch (*str) + { + case '<': + memcpy(ptr, ltW, sizeof(ltW)); + ptr += sizeof(ltW)/sizeof(WCHAR); + break; + case '&': + memcpy(ptr, ampW, sizeof(ampW)); + ptr += sizeof(ampW)/sizeof(WCHAR); + break; + case '"': + memcpy(ptr, quotW, sizeof(quotW)); + ptr += sizeof(quotW)/sizeof(WCHAR); + break; + case '>': + memcpy(ptr, gtW, sizeof(gtW)); + ptr += sizeof(gtW)/sizeof(WCHAR); + break; + default: + *ptr++ = *str; + break; + } + + str++; + if (*len != -1) p--; + } + + if (*len != -1) *len = ptr-ret; + *++ptr = 0; + + return ret; +} + /* creates UTF-8 encoded prolog string with specified or store encoding value */ static int write_prolog_buffer(const mxwriter *This, xmlCharEncoding enc, xmlOutputBufferPtr buffer) { @@ -824,6 +889,7 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( for (i = 0; i < length; i++) { const WCHAR *str; + WCHAR *escaped; INT len = 0; hr = ISAXAttributes_getQName(attr, i, &str, &len); @@ -842,8 +908,10 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; - s = xmlchar_from_wcharn(str, len); + escaped = get_escaped_string(str, &len); + s = xmlchar_from_wcharn(escaped, len); write_output_buffer_str(This, (char*)s); + heap_free(escaped); heap_free(s); write_output_buffer(This, "\"", 1); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d713fd3..7b3feea 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -737,7 +737,7 @@ static ULONG WINAPI isaxattributes_Release(ISAXAttributes* iface) static HRESULT WINAPI isaxattributes_getLength(ISAXAttributes* iface, int *length) { - *length = 2; + *length = 3; return S_OK; } @@ -763,17 +763,19 @@ static HRESULT WINAPI isaxattributes_getLocalName( static HRESULT WINAPI isaxattributes_getQName( ISAXAttributes* iface, - int nIndex, - const WCHAR **pQName, - int *pQNameLength) + int index, + const WCHAR **QName, + int *QNameLength) { - static const WCHAR attr1W[] = {'a',':','a','t','t','r','1','j','u','n','k',0}; - static const WCHAR attr2W[] = {'a','t','t','r','2','j','u','n','k',0}; + static const WCHAR attrqnamesW[][15] = {{'a',':','a','t','t','r','1','j','u','n','k',0}, + {'a','t','t','r','2','j','u','n','k',0}, + {'a','t','t','r','3',0}}; + static const int attrqnamelen[] = {7, 5, 5}; - ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); + ok(index >= 0 && index <= 2, "invalid index received %d\n", index); - *pQName = (nIndex == 0) ? attr1W : attr2W; - *pQNameLength = (nIndex == 0) ? 7 : 5; + *QName = attrqnamesW[index]; + *QNameLength = attrqnamelen[index]; return S_OK; } @@ -848,19 +850,18 @@ static HRESULT WINAPI isaxattributes_getTypeFromQName( return E_NOTIMPL; } -static HRESULT WINAPI isaxattributes_getValue( - ISAXAttributes* iface, - int nIndex, - const WCHAR ** pValue, - int * nValue) +static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, + const WCHAR **value, int *nValue) { - static const WCHAR attrval1W[] = {'a','1','j','u','n','k',0}; - static const WCHAR attrval2W[] = {'a','2','j','u','n','k',0}; + static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0}, + {'a','2','j','u','n','k',0}, + {'<','&','"','>',0}}; + static const int attrvalueslen[] = {2, 2, 4}; - ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); + ok(index >= 0 && index <= 2, "invalid index received %d\n", index); - *pValue = (nIndex == 0) ? attrval1W : attrval2W; - *nValue = 2; + *value = attrvaluesW[index]; + *nValue = attrvalueslen[index]; return S_OK; } @@ -2039,6 +2040,9 @@ struct writer_startendelement_t { ISAXAttributes *attr; }; +static const char startelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\">"; +static const char startendelement_xml[] = "<uri:local a:attr1=\"a1\" attr2=\"a2\" attr3=\"<&">\"/>"; + static const struct writer_startendelement_t writer_startendelement[] = { /* 0 */ { &CLSID_MXXMLWriter, StartElement, NULL, NULL, NULL, NULL, E_INVALIDARG }, @@ -2120,17 +2124,17 @@ static const struct writer_startendelement_t writer_startendelement[] = { { &CLSID_MXXMLWriter60, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK }, /* with attributes */ - { &CLSID_MXXMLWriter, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, + { &CLSID_MXXMLWriter, StartElement, "uri", "local", "uri:local", startelement_xml, S_OK, &saxattributes }, /* 65 */ - { &CLSID_MXXMLWriter30, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, - { &CLSID_MXXMLWriter40, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, - { &CLSID_MXXMLWriter60, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, + { &CLSID_MXXMLWriter30, StartElement, "uri", "local", "uri:local", startelement_xml, S_OK, &saxattributes }, + { &CLSID_MXXMLWriter40, StartElement, "uri", "local", "uri:local", startelement_xml, S_OK, &saxattributes }, + { &CLSID_MXXMLWriter60, StartElement, "uri", "local", "uri:local", startelement_xml, S_OK, &saxattributes }, /* empty elements */ - { &CLSID_MXXMLWriter, StartEndElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\"/>", S_OK, &saxattributes }, - { &CLSID_MXXMLWriter30, StartEndElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\"/>", S_OK, &saxattributes }, + { &CLSID_MXXMLWriter, StartEndElement, "uri", "local", "uri:local", startendelement_xml, S_OK, &saxattributes }, + { &CLSID_MXXMLWriter30, StartEndElement, "uri", "local", "uri:local", startendelement_xml, S_OK, &saxattributes }, /* 70 */ - { &CLSID_MXXMLWriter40, StartEndElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\"/>", S_OK, &saxattributes }, - { &CLSID_MXXMLWriter60, StartEndElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\"/>", S_OK, &saxattributes }, + { &CLSID_MXXMLWriter40, StartEndElement, "uri", "local", "uri:local", startendelement_xml, S_OK, &saxattributes }, + { &CLSID_MXXMLWriter60, StartEndElement, "uri", "local", "uri:local", startendelement_xml, S_OK, &saxattributes }, { &CLSID_MXXMLWriter, StartEndElement, "", "", "", "</>", S_OK }, { &CLSID_MXXMLWriter30, StartEndElement, "", "", "", "</>", S_OK }, { &CLSID_MXXMLWriter40, StartEndElement, "", "", "", "</>", S_OK },

1 0

Nikolay Sivov : msxml3: Trace parameters in stub methods.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 42bd2051d50d7a36c4ef86e673dd74a3ae016ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=42bd2051d50d7a36c4ef86e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 03:08:03 2011 +0300 msxml3: Trace parameters in stub methods. --- dlls/msxml3/schema.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 1c5255b..9cdccb0 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -684,7 +684,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, { xmlParserInputPtr input; - TRACE("(%s, %s, %p)\n", wine_dbgstr_a(URL), wine_dbgstr_a(ID), ctxt); + TRACE("(%s %s %p)\n", wine_dbgstr_a(URL), wine_dbgstr_a(ID), ctxt); assert(MSXML_hInstance != NULL); assert(datatypes_rsrc != NULL); @@ -746,14 +746,14 @@ void schemasCleanup(void) static LONG cache_entry_add_ref(cache_entry* entry) { LONG ref = InterlockedIncrement(&entry->ref); - TRACE("%p new ref %d\n", entry, ref); + TRACE("(%p)->(%d)\n", entry, ref); return ref; } static LONG cache_entry_release(cache_entry* entry) { LONG ref = InterlockedDecrement(&entry->ref); - TRACE("%p new ref %d\n", entry, ref); + TRACE("(%p)->(%d)\n", entry, ref); if (ref == 0) { @@ -974,7 +974,7 @@ static ULONG WINAPI schema_cache_AddRef(IXMLDOMSchemaCollection2* iface) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("%p new ref %d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); return ref; } @@ -987,7 +987,7 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p new ref %d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) { @@ -1170,7 +1170,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); xmlChar* name; cache_entry* entry; - TRACE("(%p)->(%s, %p)\n", This, wine_dbgstr_w(uri), node); + TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_w(uri), node); if (!node) return E_POINTER; @@ -1222,7 +1222,7 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); cache_index_data data = {index,len}; - TRACE("(%p)->(%i, %p)\n", This, index, len); + TRACE("(%p)->(%i %p)\n", This, index, len); if (!len) return E_POINTER; @@ -1266,7 +1266,8 @@ static HRESULT WINAPI schema_cache_addCollection(IXMLDOMSchemaCollection2* iface static HRESULT WINAPI schema_cache_get__newEnum(IXMLDOMSchemaCollection2* iface, IUnknown** ppUnk) { - FIXME("stub\n"); + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + FIXME("(%p)->(%p): stub\n", This, ppUnk); if (ppUnk) *ppUnk = NULL; return E_NOTIMPL; @@ -1274,28 +1275,32 @@ static HRESULT WINAPI schema_cache_get__newEnum(IXMLDOMSchemaCollection2* iface, static HRESULT WINAPI schema_cache_validate(IXMLDOMSchemaCollection2* iface) { - FIXME("stub\n"); + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + FIXME("(%p): stub\n", This); return E_NOTIMPL; } static HRESULT WINAPI schema_cache_put_validateOnLoad(IXMLDOMSchemaCollection2* iface, - VARIANT_BOOL validateOnLoad) + VARIANT_BOOL value) { - FIXME("stub\n"); + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + FIXME("(%p)->(%d): stub\n", This, value); return E_NOTIMPL; } static HRESULT WINAPI schema_cache_get_validateOnLoad(IXMLDOMSchemaCollection2* iface, - VARIANT_BOOL* validateOnLoad) + VARIANT_BOOL* value) { - FIXME("stub\n"); + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + FIXME("(%p)->(%p): stub\n", This, value); return E_NOTIMPL; } static HRESULT WINAPI schema_cache_getSchema(IXMLDOMSchemaCollection2* iface, BSTR namespaceURI, ISchema** schema) { - FIXME("stub\n"); + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_w(namespaceURI), schema); if (schema) *schema = NULL; return E_NOTIMPL; @@ -1304,7 +1309,8 @@ static HRESULT WINAPI schema_cache_getSchema(IXMLDOMSchemaCollection2* iface, static HRESULT WINAPI schema_cache_getDeclaration(IXMLDOMSchemaCollection2* iface, IXMLDOMNode* node, ISchemaItem** item) { - FIXME("stub\n"); + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + FIXME("(%p)->(%p %p): stub\n", This, node, item); if (item) *item = NULL; return E_NOTIMPL;

1 0

Nikolay Sivov : msxml3: Accept disabled on load validation.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 91c4b4c96789cf80d0f89e8ed956d7f8a9c640a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c4b4c96789cf80d0f89e8ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 12:57:36 2011 +0300 msxml3: Accept disabled on load validation. --- dlls/msxml3/schema.c | 22 ++++++++++++++++++---- dlls/msxml3/tests/schema.c | 24 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 9cdccb0..e9a9a84 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -93,6 +93,8 @@ typedef struct _schema_cache MSXML_VERSION version; xmlHashTablePtr cache; LONG ref; + + VARIANT_BOOL validateOnLoad; } schema_cache; typedef struct _cache_entry @@ -1285,6 +1287,11 @@ static HRESULT WINAPI schema_cache_put_validateOnLoad(IXMLDOMSchemaCollection2* { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); FIXME("(%p)->(%d): stub\n", This, value); + + This->validateOnLoad = value; + /* it's ok to disable it, cause we don't validate on load anyway */ + if (value == VARIANT_FALSE) return S_OK; + return E_NOTIMPL; } @@ -1292,8 +1299,12 @@ static HRESULT WINAPI schema_cache_get_validateOnLoad(IXMLDOMSchemaCollection2* VARIANT_BOOL* value) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + + if (!value) return E_POINTER; + *value = This->validateOnLoad; + + return S_OK; } static HRESULT WINAPI schema_cache_getSchema(IXMLDOMSchemaCollection2* iface, @@ -1425,18 +1436,21 @@ XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node) return dt; } -HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* pUnkOuter, void** ppObj) +HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) { schema_cache* This = heap_alloc(sizeof(schema_cache)); if (!This) return E_OUTOFMEMORY; + TRACE("(%d %p %p)\n", version, outer, obj); + This->lpVtbl = &schema_cache_vtbl; This->cache = xmlHashCreate(DEFAULT_HASHTABLE_SIZE); This->ref = 1; This->version = version; + This->validateOnLoad = VARIANT_TRUE; - *ppObj = &This->lpVtbl; + *obj = &This->lpVtbl; return S_OK; } diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 56a77e6..951ee68 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -31,6 +31,9 @@ #include "wine/test.h" +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + static const WCHAR xdr_schema_uri[] = {'x','-','s','c','h','e','m','a',':','t','e','s','t','.','x','m','l',0}; static const WCHAR xdr_schema_xml[] = { @@ -1973,6 +1976,26 @@ static void test_XDR_datatypes(void) free_bstrs(); } +static void test_validate_on_load(void) +{ + IXMLDOMSchemaCollection2 *cache; + VARIANT_BOOL b; + HRESULT hr; + + cache = create_cache_version(40, &IID_IXMLDOMSchemaCollection2); + if (!cache) return; + + hr = IXMLDOMSchemaCollection2_get_validateOnLoad(cache, NULL); + EXPECT_HR(hr, E_POINTER); + + b = VARIANT_FALSE; + hr = IXMLDOMSchemaCollection2_get_validateOnLoad(cache, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + IXMLDOMSchemaCollection2_Release(cache); +} + START_TEST(schema) { HRESULT r; @@ -1986,6 +2009,7 @@ START_TEST(schema) test_collection_content(); test_XDR_schemas(); test_XDR_datatypes(); + test_validate_on_load(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Schema cache COM cleanup.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: c381abd84f79966d76b371f5008e950c21464cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=c381abd84f79966d76b371f50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 13:35:07 2011 +0300 msxml3: Schema cache COM cleanup. --- dlls/msxml3/schema.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e9a9a84..aff763e 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -87,12 +87,13 @@ typedef enum _SCHEMA_TYPE { SCHEMA_TYPE_XSD } SCHEMA_TYPE; -typedef struct _schema_cache +typedef struct { - const struct IXMLDOMSchemaCollection2Vtbl* lpVtbl; + IXMLDOMSchemaCollection2 IXMLDOMSchemaCollection2_iface; + LONG ref; + MSXML_VERSION version; xmlHashTablePtr cache; - LONG ref; VARIANT_BOOL validateOnLoad; } schema_cache; @@ -780,7 +781,7 @@ static LONG cache_entry_release(cache_entry* entry) static inline schema_cache* impl_from_IXMLDOMSchemaCollection2(IXMLDOMSchemaCollection2* iface) { - return (schema_cache*)((char*)iface - FIELD_OFFSET(schema_cache, lpVtbl)); + return CONTAINING_RECORD(iface, schema_cache, IXMLDOMSchemaCollection2_iface); } static inline SCHEMA_TYPE schema_type_from_xmlDocPtr(xmlDocPtr schema) @@ -1065,7 +1066,7 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, hr = get_typeinfo(IXMLDOMSchemaCollection_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMSchemaCollection2_iface.lpVtbl, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -1327,7 +1328,7 @@ static HRESULT WINAPI schema_cache_getDeclaration(IXMLDOMSchemaCollection2* ifac return E_NOTIMPL; } -static const struct IXMLDOMSchemaCollection2Vtbl schema_cache_vtbl = +static const struct IXMLDOMSchemaCollection2Vtbl XMLDOMSchemaCollection2Vtbl = { schema_cache_QueryInterface, schema_cache_AddRef, @@ -1444,13 +1445,13 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) TRACE("(%d %p %p)\n", version, outer, obj); - This->lpVtbl = &schema_cache_vtbl; + This->IXMLDOMSchemaCollection2_iface.lpVtbl = &XMLDOMSchemaCollection2Vtbl; This->cache = xmlHashCreate(DEFAULT_HASHTABLE_SIZE); This->ref = 1; This->version = version; This->validateOnLoad = VARIANT_TRUE; - *obj = &This->lpVtbl; + *obj = &This->IXMLDOMSchemaCollection2_iface; return S_OK; }

1 0

Nikolay Sivov : msxml3: Added IDispatchEx support for IXMLDOMSchemaCollection2.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: ae6ef458117b45fe9747806acdd1ed1d4848d794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6ef458117b45fe9747806ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 13:58:24 2011 +0300 msxml3: Added IDispatchEx support for IXMLDOMSchemaCollection2. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 71 ++++++++++++++++--------------------------- dlls/msxml3/tests/schema.c | 66 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 45 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 529fd96..5114222 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -129,6 +129,7 @@ static tid_id_t tid_ids[] = { { &IID_IXMLDOMParseError, LibXml2 }, { &IID_IXMLDOMProcessingInstruction, LibXml2 }, { &IID_IXMLDOMSchemaCollection, LibXml2 }, + { &IID_IXMLDOMSchemaCollection2, LibXml2 }, { &IID_IXMLDOMSelection, LibXml2 }, { &IID_IXMLDOMText, LibXml2 }, { &IID_IXMLElement, LibXml }, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index bb517a7..cba00bb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -56,6 +56,7 @@ typedef enum tid_t { IXMLDOMParseError_tid, IXMLDOMProcessingInstruction_tid, IXMLDOMSchemaCollection_tid, + IXMLDOMSchemaCollection2_tid, IXMLDOMSelection_tid, IXMLDOMText_tid, IXMLElement_tid, diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index aff763e..7473dbb 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -89,6 +89,7 @@ typedef enum _SCHEMA_TYPE { typedef struct { + DispatchEx dispex; IXMLDOMSchemaCollection2 IXMLDOMSchemaCollection2_iface; LONG ref; @@ -961,6 +962,10 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -995,6 +1000,7 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface) if (ref == 0) { xmlHashFree(This->cache, cache_free); + release_dispex(&This->dispex); heap_free(This); } @@ -1005,25 +1011,15 @@ static HRESULT WINAPI schema_cache_GetTypeInfoCount(IXMLDOMSchemaCollection2* if UINT* pctinfo) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI schema_cache_GetTypeInfo(IXMLDOMSchemaCollection2* iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - HRESULT hr; - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hr = get_typeinfo(IXMLDOMSchemaCollection_tid, ppTInfo); - - return hr; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI schema_cache_GetIDsOfNames(IXMLDOMSchemaCollection2* iface, @@ -1031,23 +1027,8 @@ static HRESULT WINAPI schema_cache_GetIDsOfNames(IXMLDOMSchemaCollection2* iface UINT cNames, LCID lcid, DISPID* rgDispId) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - ITypeInfo* typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXMLDOMSchemaCollection_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, @@ -1057,21 +1038,8 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, UINT* puArgErr) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - ITypeInfo* typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXMLDOMSchemaCollection_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMSchemaCollection2_iface.lpVtbl, dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri, VARIANT var) @@ -1437,6 +1405,18 @@ XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node) return dt; } +static const tid_t schemacache_iface_tids[] = { + IXMLDOMSchemaCollection2_tid, + 0 +}; + +static dispex_static_data_t schemacache_dispex = { + NULL, + IXMLDOMSchemaCollection2_tid, + NULL, + schemacache_iface_tids +}; + HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) { schema_cache* This = heap_alloc(sizeof(schema_cache)); @@ -1450,6 +1430,7 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) This->ref = 1; This->version = version; This->validateOnLoad = VARIANT_TRUE; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSchemaCollection2_iface, &schemacache_dispex); *obj = &This->IXMLDOMSchemaCollection2_iface; return S_OK; diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 951ee68..59ceac5 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -27,6 +27,7 @@ #include "windows.h" #include "ole2.h" #include "msxml2.h" +#include "msxml2did.h" #include "dispex.h" #include "wine/test.h" @@ -1996,6 +1997,70 @@ static void test_validate_on_load(void) IXMLDOMSchemaCollection2_Release(cache); } +static void test_obj_dispex(IUnknown *obj) +{ + static const WCHAR starW[] = {'*',0}; + DISPID dispid = DISPID_SAX_XMLREADER_GETFEATURE; + IDispatchEx *dispex; + IUnknown *unk; + DWORD props; + UINT ticnt; + HRESULT hr; + BSTR name; + + hr = IUnknown_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + if (FAILED(hr)) return; + + ticnt = 0; + hr = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); + EXPECT_HR(hr, S_OK); + ok(ticnt == 1, "ticnt=%u\n", ticnt); + + name = SysAllocString(starW); + hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive); + EXPECT_HR(hr, E_NOTIMPL); + SysFreeString(name); + + hr = IDispatchEx_DeleteMemberByDispID(dispex, dispid); + EXPECT_HR(hr, E_NOTIMPL); + + props = 0; + hr = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &props); + EXPECT_HR(hr, E_NOTIMPL); + ok(props == 0, "expected 0 got %d\n", props); + + hr = IDispatchEx_GetMemberName(dispex, dispid, &name); + EXPECT_HR(hr, E_NOTIMPL); + if (SUCCEEDED(hr)) SysFreeString(name); + + hr = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_SCHEMACOLLECTION_ADD, &dispid); + EXPECT_HR(hr, E_NOTIMPL); + + hr = IDispatchEx_GetNameSpaceParent(dispex, &unk); + EXPECT_HR(hr, E_NOTIMPL); + if (hr == S_OK && unk) IUnknown_Release(unk); + + IDispatchEx_Release(dispex); +} + +static void test_dispex(void) +{ + IXMLDOMSchemaCollection *cache; + IUnknown *unk; + HRESULT hr; + + cache = create_cache(&IID_IXMLDOMSchemaCollection); + if (!cache) return; + + hr = IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + + IXMLDOMSchemaCollection_Release(cache); +} + START_TEST(schema) { HRESULT r; @@ -2010,6 +2075,7 @@ START_TEST(schema) test_XDR_schemas(); test_XDR_datatypes(); test_validate_on_load(); + test_dispex(); CoUninitialize(); }

1 0