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

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

Aug. 19, 2013

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

Kai Tietz : widl: Allow inputsync-attribute on functions.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: f58353ecb6c862822e8070d663b467e9831192a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58353ecb6c862822e8070d66… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:10:30 2013 +0200 widl: Allow inputsync-attribute on functions. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8217e2e..c55ee41 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2064,7 +2064,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, /* ATTR_IN */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, /* ATTR_INLINE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inline" }, - /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, + /* ATTR_INPUTSYNC */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "length_is" }, /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "lcid" }, /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "licensed" },

1 0

Andrew Eikum : oleaut32: Run LayOut on typeinfos that require it before saving.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 341ff65b95e61b8c2580ec2d54fab8ab0416f26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=341ff65b95e61b8c2580ec2d5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:17 2013 -0500 oleaut32: Run LayOut on typeinfos that require it before saving. --- dlls/oleaut32/typelib.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 48a698f..4cccbac 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9689,9 +9689,14 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) HANDLE outfile; HRESULT hres; DWORD *junk; + UINT i; TRACE("%p\n", This); + for(i = 0; i < This->TypeInfoCount; ++i) + if(This->typeinfos[i]->needs_layout) + ICreateTypeInfo2_LayOut(&This->typeinfos[i]->ICreateTypeInfo2_iface); + memset(&file, 0, sizeof(file)); file.header.magic1 = 0x5446534D;

1 0

Alexandre Julliard : kernel32: Don't call from A to W function in Get/ SetCurrentDirectory.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: fe64e21e3b6f923c55dee50c866005293fe2a9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe64e21e3b6f923c55dee50c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 18 19:57:05 2013 +0200 kernel32: Don't call from A to W function in Get/SetCurrentDirectory. --- dlls/kernel32/path.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 5cd3c4b..3ee0dd6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1502,10 +1502,9 @@ UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf ) return 0; } - ret = GetCurrentDirectoryW(MAX_PATH, bufferW); - + ret = RtlGetCurrentDirectory_U( sizeof(bufferW), bufferW ); if (!ret) return 0; - if (ret > MAX_PATH) + if (ret > sizeof(bufferW)) { SetLastError(ERROR_FILENAME_EXCED_RANGE); return 0; @@ -1524,12 +1523,8 @@ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dir ) RtlInitUnicodeString( &dirW, dir ); status = RtlSetCurrentDirectory_U( &dirW ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } @@ -1539,9 +1534,14 @@ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dir ) BOOL WINAPI SetCurrentDirectoryA( LPCSTR dir ) { WCHAR *dirW; + UNICODE_STRING strW; + NTSTATUS status; if (!(dirW = FILE_name_AtoW( dir, FALSE ))) return FALSE; - return SetCurrentDirectoryW( dirW ); + RtlInitUnicodeString( &strW, dirW ); + status = RtlSetCurrentDirectory_U( &strW ); + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTXFILEENUMOBJECT.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

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

Nikolay Sivov : xmllite: Improve attribute value parsing.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

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 Aug. 19, 2013

Aug. 19, 2013

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

Marcus Meissner : usp10: Added missing break (Coverity).
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 90117bd1753acf3e4264d3f12e9c902572abb8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=90117bd1753acf3e4264d3f12… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 17 09:37:15 2013 +0200 usp10: Added missing break (Coverity). --- dlls/usp10/breaking.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 6e044b2..2f80f9a 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -97,6 +97,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT break; case b_CM: la[i].fCharStop = FALSE; + break; } } @@ -111,8 +112,10 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT case b_SG: case b_XX: break_class[i] = b_AL; + break; case b_CJ: break_class[i] = b_NS; + break; } }

1 0

Marcus Meissner : scrrun: Added missing FindClose in error case (Coverity).
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 1cefdf3f66ee7a3370092acffdf7b9ec0c17351e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cefdf3f66ee7a3370092acff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 17 09:37:04 2013 +0200 scrrun: Added missing FindClose in error case (Coverity). --- dlls/scrrun/filesystem.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 19f5f2b..2750108 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1375,8 +1375,10 @@ static inline HRESULT delete_file(const WCHAR *file, DWORD file_len, VARIANT_BOO return create_error(GetLastError()); len = get_parent_folder_name(file, file_len); - if(len+1 >= MAX_PATH) + if(len+1 >= MAX_PATH) { + FindClose(f); return E_FAIL; + } if(len) { memcpy(path, file, len*sizeof(WCHAR)); path[len++] = '\\'; @@ -1432,8 +1434,10 @@ static HRESULT delete_folder(const WCHAR *folder, DWORD folder_len, VARIANT_BOOL return create_error(GetLastError()); len = get_parent_folder_name(folder, folder_len); - if(len+1 >= MAX_PATH) + if(len+1 >= MAX_PATH) { + FindClose(f); return E_FAIL; + } if(len) { memcpy(path, folder, len*sizeof(WCHAR)); path[len++] = '\\'; @@ -1547,8 +1551,10 @@ static inline HRESULT copy_file(const WCHAR *source, DWORD source_len, } dst_len = destination_len; - if(dst_len+1 >= MAX_PATH) + if(dst_len+1 >= MAX_PATH) { + FindClose(f); return E_FAIL; + } memcpy(dst_path, destination, dst_len*sizeof(WCHAR)); if(dst_path[dst_len-1]!= '\\' && dst_path[dst_len-1]!='/') dst_path[dst_len++] = '\\';

1 0

Kai Tietz : widl: Add async_uuid attribute base support in parser.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: f05853b28a8bf288d300e42f53fff9feeac327d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05853b28a8bf288d300e42f5… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:48:34 2013 +0200 widl: Add async_uuid attribute base support in parser. --- tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 08a42bb..5751598 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -556,6 +556,7 @@ attribute: { $$ = NULL; } | tUSESGETLASTERROR { $$ = make_attr(ATTR_USESGETLASTERROR); } | tUSERMARSHAL '(' type ')' { $$ = make_attrp(ATTR_USERMARSHAL, $3); } | tUUID '(' uuid_string ')' { $$ = make_attrp(ATTR_UUID, $3); } + | tASYNCUUID '(' uuid_string ')' { $$ = make_attrp(ATTR_ASYNCUUID, $3); } | tV1ENUM { $$ = make_attr(ATTR_V1ENUM); } | tVARARG { $$ = make_attr(ATTR_VARARG); } | tVERSION '(' version ')' { $$ = make_attrv(ATTR_VERSION, $3); } @@ -2020,6 +2021,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, + /* ATTR_ASYNCUUID */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "async_uuid" }, /* ATTR_AUTO_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, /* ATTR_BINDABLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "bindable" }, /* ATTR_BROADCAST */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "broadcast" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 84e4467..efde0b0 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -70,6 +70,7 @@ enum attr_type ATTR_ANNOTATION, ATTR_APPOBJECT, ATTR_ASYNC, + ATTR_ASYNCUUID, ATTR_AUTO_HANDLE, ATTR_BINDABLE, ATTR_BROADCAST,

1 0