wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Michael Stefaniuc : gdi32/tests: Use the standard way of allocating a struct with VLA on the stack.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: da425748bb441bb471de728af090b10550917eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=da425748bb441bb471de728af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 19 11:44:18 2013 +0200 gdi32/tests: Use the standard way of allocating a struct with VLA on the stack. --- dlls/gdi32/tests/pen.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index ed7927a..bbbb439 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -511,12 +511,8 @@ static void test_ps_userstyle(void) LOGBRUSH lb; HPEN pen; INT size, i; - - struct - { - EXTLOGPEN elp; - DWORD style_data[15]; - } ext_pen; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + EXTLOGPEN *ext_pen = (EXTLOGPEN *)buffer; lb.lbColor = 0x00ff0000; lb.lbStyle = BS_SOLID; @@ -561,11 +557,11 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 16, style); ok(pen != 0, "ExtCreatePen should not fail\n"); - size = GetObject(pen, sizeof(ext_pen), &ext_pen); + size = GetObject(pen, sizeof(buffer), ext_pen); expect(FIELD_OFFSET(EXTLOGPEN,elpStyleEntry[16]), size); for(i = 0; i < 16; i++) - expect(style[i], ext_pen.elp.elpStyleEntry[i]); + expect(style[i], ext_pen->elpStyleEntry[i]); DeleteObject(pen); }

1 0

Jactry Zeng : include: Add definition of ST_UNICODE.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: c9466dfea42cdae2b73c628b52e33c81d864b0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9466dfea42cdae2b73c628b5… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Mon Aug 19 09:24:13 2013 +0800 include: Add definition of ST_UNICODE. --- include/richedit.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/richedit.h b/include/richedit.h index 095cc8a..6b27fc9 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -1067,8 +1067,8 @@ typedef struct _settextex { #define ST_DEFAULT 0x00000000 #define ST_KEEPUNDO 0x00000001 #define ST_SELECTION 0x00000002 - #define ST_NEWCHARS 0x00000004 +#define ST_UNICODE 0x00000008 #ifdef __cplusplus }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTXFILEENUMOBJECT.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: db2d54ffd026d124d4ad3f59779c6d1e07cc8aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2d54ffd026d124d4ad3f597… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:54 2013 +0200 d3drm: Avoid LPDIRECTXFILEENUMOBJECT. --- dlls/d3drm/d3drm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 823d90a..097d141 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1354,7 +1354,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v { DXFILELOADOPTIONS load_options; IDirectXFile *file = NULL; - LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; + IDirectXFileEnumObject *enum_object = NULL; LPDIRECTXFILEDATA pData = NULL; HRESULT hr; const GUID* pGuid; @@ -1395,11 +1395,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_CreateEnumObject(file, source, load_options, &pEnumObject); + hr = IDirectXFile_CreateEnumObject(file, source, load_options, &enum_object); if (hr != DXFILE_OK) goto end; - hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); if (hr != DXFILE_OK) goto end; @@ -1433,7 +1433,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v while (1) { - hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); if (hr == DXFILEERR_NOMOREOBJECTS) { TRACE("No more object\n"); @@ -1458,8 +1458,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v end: if (pData) IDirectXFileData_Release(pData); - if (pEnumObject) - IDirectXFileEnumObject_Release(pEnumObject); + if (enum_object) + IDirectXFileEnumObject_Release(enum_object); if (file) IDirectXFile_Release(file);

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTXFILE.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 34743e7044d845238451d4f150f3a0c1cf5aba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34743e7044d845238451d4f15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:53 2013 +0200 d3drm: Avoid LPDIRECTXFILE. --- dlls/d3drm/d3drm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3b653de..823d90a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1353,7 +1353,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame3 *parent_frame) { DXFILELOADOPTIONS load_options; - LPDIRECTXFILE pDXFile = NULL; + IDirectXFile *file = NULL; LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEDATA pData = NULL; HRESULT hr; @@ -1387,15 +1387,15 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v return E_NOTIMPL; } - hr = DirectXFileCreate(&pDXFile); + hr = DirectXFileCreate(&file); if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_RegisterTemplates(pDXFile, templates, strlen(templates)); + hr = IDirectXFile_RegisterTemplates(file, templates, strlen(templates)); if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_CreateEnumObject(pDXFile, source, load_options, &pEnumObject); + hr = IDirectXFile_CreateEnumObject(file, source, load_options, &pEnumObject); if (hr != DXFILE_OK) goto end; @@ -1460,8 +1460,8 @@ end: IDirectXFileData_Release(pData); if (pEnumObject) IDirectXFileEnumObject_Release(pEnumObject); - if (pDXFile) - IDirectXFile_Release(pDXFile); + if (file) + IDirectXFile_Release(file); return ret; }

1 0

Henri Verbeet : wined3d: Use the "adapter" local variable in swapchain_init ().
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 390543dd02c009960938464b934a1a811f1da399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390543dd02c009960938464b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:52 2013 +0200 wined3d: Use the "adapter" local variable in swapchain_init(). --- dlls/wined3d/swapchain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ce54aeb..f6cfc2e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -925,7 +925,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 mode.refresh_rate = desc->refresh_rate; mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, adapter->ordinal, &mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); goto err; @@ -944,7 +944,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 WINED3DFMT_S1_UINT_D15_UNORM }; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); if (!swapchain->context)

1 0

Henri Verbeet : wined3d: Store the immediate mode fixed function attribute submission function pointers in struct wined3d_d3d_info .
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: b2721d5f9ce52c90bb25a090ddcddc48a8885a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2721d5f9ce52c90bb25a090d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:51 2013 +0200 wined3d: Store the immediate mode fixed function attribute submission function pointers in struct wined3d_d3d_info. --- dlls/wined3d/directx.c | 252 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 21 ++-- dlls/wined3d/wined3d_private.h | 23 +++-- 3 files changed, 145 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2721d5f9ce52c90bb25a…

1 0

Henri Verbeet : wined3d: Avoid some redundant state_pscale() calls.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: c1a7323fac49852010a690dc292c765b075ff350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a7323fac49852010a690dc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:50 2013 +0200 wined3d: Avoid some redundant state_pscale() calls. --- dlls/wined3d/state.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9fc7840..ffc3101 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4677,10 +4677,6 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), vp.width, vp.height); } - - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) - state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); - checkGLcall("glViewport"); } @@ -4688,7 +4684,8 @@ void viewport_vertexpart(struct wined3d_context *context, const struct wined3d_s { if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)) + && state->render_states[WINED3D_RS_POINTSCALEENABLE]) state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); /* Update the position fixup. */ context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POS_FIXUP;

1 0

Nikolay Sivov : xmllite: Improve attribute value parsing.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: a04064b8868762ebd38aecaafd5d9f1e1a14844a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04064b8868762ebd38aecaaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 19 10:46:49 2013 +0400 xmllite: Improve attribute value parsing. --- dlls/xmllite/reader.c | 94 ++++++++++++++++++++++++++++++++++++++++++- dlls/xmllite/tests/reader.c | 10 +++++ 2 files changed, 102 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4dc8185..efdc6ff 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1766,12 +1766,99 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc return S_OK; } +/* Applies normalization rules to a single char, used for attribute values. + + Rules include 2 steps: + + 1) replacing \r\n with a single \n; + 2) replacing all whitespace chars with ' '. + + */ +static void reader_normalize_space(xmlreader *reader, WCHAR *ptr) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + if (!is_wchar_space(*ptr)) return; + + if (*ptr == '\r' && *(ptr+1) == '\n') + { + int len = buffer->written - ((char*)ptr - buffer->data) - 2*sizeof(WCHAR); + memmove(ptr+1, ptr+2, len); + } + *ptr = ' '; +} + /* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' [67] Reference ::= EntityRef | CharRef [68] EntityRef ::= '&' Name ';' */ static HRESULT reader_parse_reference(xmlreader *reader) { - FIXME("References not supported\n"); + WCHAR *start = reader_get_cur(reader), *ptr; + WCHAR ch = 0; + int len; + + /* skip '&' */ + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + if (*ptr == '#') + { + encoded_buffer *buffer = &reader->input->buffer->utf16; + + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + /* hex char or decimal */ + if (*ptr == 'x') + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + while (*ptr != ';') + { + if ((*ptr >= '0' && *ptr <= '9')) + ch = ch*16 + *ptr - '0'; + else if ((*ptr >= 'a' && *ptr <= 'f')) + ch = ch*16 + *ptr - 'a' + 10; + else if ((*ptr >= 'A' && *ptr <= 'F')) + ch = ch*16 + *ptr - 'A' + 10; + else + return ch ? WC_E_SEMICOLON : WC_E_HEXDIGIT; + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + else + { + while (*ptr != ';') + { + if ((*ptr >= '0' && *ptr <= '9')) + { + ch = ch*10 + *ptr - '0'; + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + else + return ch ? WC_E_SEMICOLON : WC_E_DIGIT; + } + } + + if (!is_char(ch)) return WC_E_XMLCHARACTER; + + /* normalize */ + if (is_wchar_space(ch)) ch = ' '; + + len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); + memmove(start+1, ptr+1, len); + buffer->cur = (char*)start; + + *start = ch; + + return S_OK; + } + else + FIXME("Entity references not supported\n"); + return E_NOTIMPL; } @@ -1806,7 +1893,10 @@ static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) if (FAILED(hr)) return hr; } else + { + reader_normalize_space(reader, ptr); reader_skipn(reader, 1); + } ptr = reader_get_cur(reader); } @@ -1848,7 +1938,7 @@ static HRESULT reader_parse_attribute(xmlreader *reader) hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; - TRACE("%s=\"%s\"\n", debugstr_wn(local.str, local.len), debugstr_wn(value.str, value.len)); + TRACE("%s=%s\n", debugstr_wn(local.str, local.len), debugstr_wn(value.str, value.len)); return reader_add_attr(reader, &local, &value); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 6d81482..b53c044 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1571,6 +1571,16 @@ static struct test_entry attributes_tests[] = { { "<a attr1=\'a\"ttrvalue\'/>", "attr1", "a\"ttrvalue", S_OK }, { "<a attr1=\' \'/>", "attr1", " ", S_OK }, { "<a attr1=\" \"/>", "attr1", " ", S_OK }, + { "<a attr1=\"\r\n \r \n \t\n\r\"/>", "attr1", " ", S_OK }, + { "<a attr1=\" val \"/>", "attr1", " val ", S_OK }, + { "<a attr1=\"\r\n\tval\n\"/>", "attr1", " val ", S_OK }, + { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, + { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, + { "<a attr1=\"val\"/>", NULL, NULL, WC_E_XMLCHARACTER }, + { "<a attr1=\"val &#a;\"/>", NULL, NULL, WC_E_DIGIT, WC_E_SEMICOLON }, + { "<a attr1=\"val &#12a;\"/>", NULL, NULL, WC_E_SEMICOLON }, + { "<a attr1=\"val &#x12g;\"/>", NULL, NULL, WC_E_SEMICOLON }, + { "<a attr1=\"val &#xg;\"/>", NULL, NULL, WC_E_HEXDIGIT, WC_E_SEMICOLON }, { "<a attr1=attrvalue/>", NULL, NULL, WC_E_QUOTE }, { "<a attr1=\"attr<value\"/>", NULL, NULL, WC_E_LESSTHAN }, { NULL }

1 0

Nikolay Sivov : xmllite: Support reporting of a local name and value for attributes.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: e51ab3c03a47a242bd2d0b75f3e75bb4d0a92908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51ab3c03a47a242bd2d0b75f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 19 10:42:38 2013 +0400 xmllite: Support reporting of a local name and value for attributes. --- dlls/xmllite/reader.c | 34 ++++++++++++++++++++++++++++++---- dlls/xmllite/tests/reader.c | 14 +++++--------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 38d539d..4dc8185 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -226,6 +226,7 @@ struct element { struct list entry; strval qname; + strval localname; }; typedef struct @@ -437,7 +438,7 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } -static HRESULT reader_push_element(xmlreader *reader, strval *qname) +static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *localname) { struct element *elem; HRESULT hr; @@ -451,6 +452,14 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) return hr; } + hr = reader_strvaldup(reader, localname, &elem->localname); + if (FAILED(hr)) + { + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + return hr; + } + if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); @@ -473,6 +482,7 @@ static void reader_pop_element(xmlreader *reader) { list_remove(&elem->entry); reader_free_strvalued(reader, &elem->qname); + reader_free_strvalued(reader, &elem->localname); reader_free(reader, elem); reader_dec_depth(reader); } @@ -1524,8 +1534,7 @@ static HRESULT reader_parse_sys_literal(xmlreader *reader, strval *literal) } if (*cur == quote) reader_skipn(reader, 1); - literal->str = start; - literal->len = cur-start; + reader_init_strvalue(start, cur-start, literal); TRACE("%s\n", debugstr_wn(start, cur-start)); return S_OK; } @@ -1872,7 +1881,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '>' */ reader_skipn(reader, 1); - return reader_push_element(reader, qname); + return reader_push_element(reader, qname, local); } hr = reader_parse_attribute(reader); @@ -2413,6 +2422,9 @@ static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) if (!This->attr_count) return S_FALSE; This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); + reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_Value, &This->attr->value); + return S_OK; } @@ -2430,7 +2442,11 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) next = list_next(&This->attrs, &This->attr->entry); if (next) + { This->attr = LIST_ENTRY(next, struct attribute, entry); + reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_Value, &This->attr->value); + } return next ? S_OK : S_FALSE; } @@ -2446,11 +2462,21 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); + struct element *elem; TRACE("(%p)\n", This); if (!This->attr_count) return S_FALSE; This->attr = NULL; + + /* FIXME: support other node types with 'attributes' like DTD */ + elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); + if (elem) + { + reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); + reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + } + return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 548abb1..6d81482 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1048,18 +1048,16 @@ static void test_read_dtd(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(sysW), "got %u\n", len); ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); -} + len = 0; str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(sysvalW), "got %u\n", len); ok(!lstrcmpW(str, sysvalW), "got %s\n", wine_dbgstr_w(str)); -} + hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1067,9 +1065,10 @@ todo_wine { str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); - +} len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1617,12 +1616,11 @@ static void test_read_attribute(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine { ok(len == strlen(test->name), "got %u\n", len); str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); free_str(str_exp); - } + len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1638,13 +1636,11 @@ static void test_read_attribute(void) str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine { ok(len == strlen(test->value), "got %u\n", len); str_exp = a2w(test->value); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); free_str(str_exp); } - } IStream_Release(stream); test++;

1 0

Jacek Caban : mshtml: Use winehq snapshot instead of the main page in tests .
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 36d999527bb19fbe86653a45707a33aa9325cffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d999527bb19fbe86653a457… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 18 13:39:18 2013 +0200 mshtml: Use winehq snapshot instead of the main page in tests. --- dlls/mshtml/tests/htmldoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 079b564..68f0478 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -238,7 +238,7 @@ static const char html_page[] = static const char css_data[] = "body {color: red; margin: 0}"; static const WCHAR http_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_','s','n','a','p','s','h','o','t','/',0}; static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; @@ -2893,7 +2893,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_ShellDocView_67); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); - ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", + ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected \"%s\"\n", wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); ok(pvaOut != NULL, "pvaOut == NULL\n"); ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); @@ -5755,8 +5755,8 @@ static void test_load_history(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres); prev_url = nav_url; - nav_url = "http://www.winehq.org/#test"; - nav_serv_url = "http://www.winehq.org/"; + nav_url = "http://test.winehq.org/tests/winehq_snapshot/#test"; + nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; SET_EXPECT(Exec_ShellDocView_138); SET_EXPECT(Exec_ShellDocView_67); @@ -7327,9 +7327,9 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_travellog(doc); test_binding_ui((IUnknown*)doc); - nav_url = nav_serv_url = "http://www.winehq.org/"; /* for valid prev nav_url */ + nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) { - test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0); + test_put_href(doc, FALSE, "#test", "http://test.winehq.org/tests/winehq_snapshot/#test", FALSE, TRUE, 0); test_travellog(doc); test_refresh(doc); }

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013