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

Mark Jansen : msi: Use the correct type when calculating feature cost.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: b53957df2a73ae51ca6ebc1e88bb9c4ed8b8d274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53957df2a73ae51ca6ebc1e8… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Tue Mar 7 15:48:59 2017 +0100 msi: Use the correct type when calculating feature cost. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index a0f69c9..0ccc8e3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1189,11 +1189,11 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, static INT feature_cost( MSIFEATURE *feature ) { INT cost = 0; - MSICOMPONENT *comp; + ComponentList *cl; - LIST_FOR_EACH_ENTRY( comp, &feature->Components, MSICOMPONENT, entry ) + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { - cost += comp->Cost; + cost += cl->component->Cost; } return cost; }

1 0

Sebastian Lackner : ntdll: Implement FileAccessInformation class in NtQueryInformationFile.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 2c733057e9e7e3b482fd52c86506dcd53949bf22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c733057e9e7e3b482fd52c86… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 7 17:01:52 2017 +0100 ntdll: Implement FileAccessInformation class in NtQueryInformationFile. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 13 +++++++++++++ dlls/ntdll/tests/file.c | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e2cfe7f..c2678d5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2446,6 +2446,19 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, info->EaSize = 0; } break; + case FileAccessInformation: + { + FILE_ACCESS_INFORMATION *info = ptr; + SERVER_START_REQ( get_object_info ) + { + req->handle = wine_server_obj_handle( hFile ); + io->u.Status = wine_server_call( req ); + if (io->u.Status == STATUS_SUCCESS) + info->AccessFlags = reply->access; + } + SERVER_END_REQ; + } + break; case FileEndOfFileInformation: if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else fill_file_info( &st, attr, ptr, class ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 09bf688..091142a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3433,6 +3433,29 @@ static void test_file_id_information(void) CloseHandle( h ); } +static void test_file_access_information(void) +{ + FILE_ACCESS_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE h; + + if (!(h = create_temp_file(0))) return; + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAccessInformation ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + + status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAccessInformation ); + ok( status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAccessInformation ); + ok( status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status ); + ok( info.AccessFlags == 0x13019f, "got %08x\n", info.AccessFlags ); + + CloseHandle( h ); +} + static void test_query_volume_information_file(void) { NTSTATUS status; @@ -4506,6 +4529,7 @@ START_TEST(file) test_file_disposition_information(); test_file_completion_information(); test_file_id_information(); + test_file_access_information(); test_query_volume_information_file(); test_query_attribute_information_file(); test_ioctl();

1 0

Andrew Wesie : ntdll: Save rdi and rsi in raise_func_trampoline.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 9eecacbeb1561218d4870c83f89a233cabbf7e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eecacbeb1561218d4870c83f… Author: Andrew Wesie <awesie(a)gmail.com> Date: Tue Mar 7 19:11:11 2017 +0100 ntdll: Save rdi and rsi in raise_func_trampoline. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f33fe4c..61bb2dd 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2066,9 +2066,11 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); __ASM_GLOBAL_FUNC( raise_func_trampoline, __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,144\n\t") /* red zone + rip + rbp */ - __ASM_CFI(".cfi_rel_offset %rip,8\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,160\n\t") /* red zone + rip + rbp + rdi + rsi */ + __ASM_CFI(".cfi_rel_offset %rip,24\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,16\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,8\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,0\n\t") "call *%rdx\n\t" "int $3") @@ -2085,6 +2087,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun { CONTEXT context; EXCEPTION_RECORD rec; + ULONG64 rsi; + ULONG64 rdi; ULONG64 rbp; ULONG64 rip; ULONG64 red_zone[16]; @@ -2154,6 +2158,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; *(--rsp_ptr) = RIP_sig(sigcontext); *(--rsp_ptr) = RBP_sig(sigcontext); + *(--rsp_ptr) = RDI_sig(sigcontext); + *(--rsp_ptr) = RSI_sig(sigcontext); /* now modify the sigcontext to return to the raise function */ RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline;

1 0

Nikolay Sivov : xmllite/reader: Return proper name for xml declaration PI.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 7c44c65ebb28a0dbc68f874b0d22f482f6c2a04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c44c65ebb28a0dbc68f874b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:55 2017 +0300 xmllite/reader: Return proper name for xml declaration PI. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 ++-- dlls/xmllite/tests/reader.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5f53d3f..9e0d11e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1299,8 +1299,8 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader_skipn(reader, 2); reader->nodetype = XmlNodeType_XmlDeclaration; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 07e149f..7153474 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -869,9 +869,14 @@ todo_wine { ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + val = NULL; hr = IXmlReader_GetLocalName(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine + ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + + val = NULL; + hr = IXmlReader_GetQualifiedName(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); /* check attributes */

1 0

Nikolay Sivov : xmllite/reader: Return empty value for elements.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 70028b7d0a9bcd3d2e871e9364e4a588e6bc0882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70028b7d0a9bcd3d2e871e936… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:56 2017 +0300 xmllite/reader: Return empty value for elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9e0d11e..84f38d5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2244,6 +2244,7 @@ static HRESULT reader_parse_element(xmlreader *reader) reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); break; } default: @@ -2899,6 +2900,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } } + reader_set_strvalue(This, StringValue_Value, &strval_empty); return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7153474..84316e4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -909,7 +909,6 @@ todo_wine { hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); hr = IXmlReader_GetLocalName(reader, &val, NULL); @@ -1473,9 +1472,17 @@ static void test_read_element(void) /* moving to attributes increases depth */ if (count) { + const WCHAR *value; + + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value == 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value != 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + depth = 123; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr); @@ -1484,6 +1491,9 @@ static void test_read_element(void) hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value == 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + depth = 123; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : xmllite/reader: Fix prefix returned after moving back to element.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 3fe5f25b17525f7bb43c37b1746260f3d80f62ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe5f25b17525f7bb43c37b17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:57 2017 +0300 xmllite/reader: Fix prefix returned after moving back to element. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 84f38d5..7aaaebf 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2890,12 +2890,14 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) /* FIXME: support other node types with 'attributes' like DTD */ if (This->is_empty_element) { + reader_set_strvalue(This, StringValue_Prefix, &This->empty_element.prefix); reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); } else { struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); if (element) { + reader_set_strvalue(This, StringValue_Prefix, &element->prefix); reader_set_strvalue(This, StringValue_LocalName, &element->localname); reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 84316e4..8a736bf 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2034,6 +2034,17 @@ static void test_prefix(void) wine_dbgstr_w(expected)); free_str(expected); + /* back to the element, check prefix */ + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "MoveToElement() failed, %#x.\n", hr); + + expected = a2w(prefix_tests[i].prefix1); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + IStream_Release(stream); }

1 0

Nikolay Sivov : xmllite/reader: Return qualified names for attributes.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: ce84b20554705d83edb87f4f8e3fc26337b2d64e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce84b20554705d83edb87f4f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:58 2017 +0300 xmllite/reader: Return qualified names for attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 21 +++++++++++++-------- dlls/xmllite/tests/reader.c | 9 +++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 7aaaebf..63adc9c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -229,6 +229,7 @@ struct attribute struct list entry; strval prefix; strval localname; + strval qname; strval value; }; @@ -386,7 +387,8 @@ static void reader_clear_attrs(xmlreader *reader) /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ -static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *value) +static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *qname, + strval *value) { struct attribute *attr; @@ -398,6 +400,7 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn else memset(&attr->prefix, 0, sizeof(attr->prefix)); attr->localname = *localname; + attr->qname = qname ? *qname : *localname; attr->value = *value; list_add_tail(&reader->attrs, &attr->entry); reader->attr_count++; @@ -1150,7 +1153,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, &val); + return reader_add_attr(reader, NULL, &name, NULL, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -1226,7 +1229,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, &val); + return reader_add_attr(reader, NULL, &name, NULL, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1268,7 +1271,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, &val); + return reader_add_attr(reader, NULL, &name, NULL, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1737,7 +1740,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(publicW, strlenW(publicW), &name); - hr = reader_add_attr(reader, NULL, &name, &pub); + hr = reader_add_attr(reader, NULL, &name, NULL, &pub); if (FAILED(hr)) return hr; cnt = reader_skipspaces(reader); @@ -1748,7 +1751,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return S_OK; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - hr = reader_add_attr(reader, NULL, &name, &sys); + hr = reader_add_attr(reader, NULL, &name, NULL, &sys); if (FAILED(hr)) return hr; return S_OK; @@ -1762,7 +1765,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, NULL, &name, &sys); + return reader_add_attr(reader, NULL, &name, NULL, &sys); } return S_FALSE; @@ -2160,7 +2163,7 @@ static HRESULT reader_parse_attribute(xmlreader *reader) reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &prefix, &local, &value); + return reader_add_attr(reader, &prefix, &local, &qname, &value); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2829,6 +2832,7 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader) reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); reader_set_strvalue(reader, StringValue_LocalName, &reader->attr->localname); + reader_set_strvalue(reader, StringValue_QualifiedName, &reader->attr->qname); reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); return S_OK; @@ -2861,6 +2865,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) This->attr = LIST_ENTRY(next, struct attribute, entry); reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); reader_set_strvalue(This, StringValue_Value, &This->attr->value); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8a736bf..e551a48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1275,9 +1275,10 @@ todo_wine { str = NULL; hr = IXmlReader_GetQualifiedName(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)); - +} IStream_Release(stream); IXmlReader_Release(reader); } @@ -1355,9 +1356,10 @@ todo_wine { str = NULL; hr = IXmlReader_GetQualifiedName(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)); - +} type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got 0x%8x\n", hr); @@ -1925,12 +1927,11 @@ static void test_read_attribute(void) str = NULL; hr = IXmlReader_GetQualifiedName(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); - } + /* value */ len = 1; str = NULL;

1 0

Nikolay Sivov : xmllite/reader: Enforce maximum element depth limit.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 71a07330529242c7877d498f95989c0a1fb0a8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a07330529242c7877d498f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:59 2017 +0300 xmllite/reader: Enforce maximum element depth limit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 24 +++--- dlls/xmllite/tests/reader.c | 206 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 181 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71a07330529242c7877d4…

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in surface_upload_from_surface().
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: aaa431d8a8a31c48aee73c0f423a0389bf518b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa431d8a8a31c48aee73c0f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:25 2017 +0100 wined3d: Use wined3d_texture_blt() in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3e95876..a2a7d98 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1098,9 +1098,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ + /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ if (dst_format->convert || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT); + return wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, src_rect, 0, NULL, WINED3D_TEXF_POINT); context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Validate blit parameters in wined3d_texture_blt() .
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 54c3f5c0bc223f3f11703242adb8c84db85aa6e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c3f5c0bc223f3f11703242a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:26 2017 +0100 wined3d: Validate blit parameters in wined3d_texture_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 28 +++------------------------- dlls/wined3d/texture.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a2a7d98..7c84ffd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3598,7 +3598,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst unsigned int src_sub_resource_idx = 0; DWORD src_ds_flags, dst_ds_flags; BOOL scale, convert; - HRESULT hr; static const DWORD simple_blit = WINED3D_BLT_ASYNC | WINED3D_BLT_COLOR_FILL @@ -3632,20 +3631,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); } - if (dst_texture->sub_resources[dst_sub_resource_idx].map_count - || (src_texture && src_texture->sub_resources[src_sub_resource_idx].map_count)) - { - WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); - return WINEDDERR_SURFACEBUSY; - } - - if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_surface->texture_level, &dst_box))) - return hr; - - if (src_texture && FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, - src_surface->texture_level, &src_box))) - return hr; - if (!fx || !(fx->fx)) flags &= ~WINED3D_BLT_FX; @@ -3738,17 +3723,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, dst_rect, color.r))) return WINED3D_OK; } - else + else if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_texture->resource.draw_binding, + src_rect, dst_surface, dst_texture->resource.draw_binding, dst_rect))) { - if (src_ds_flags != dst_ds_flags) - { - WARN("Rejecting depth / stencil blit between incompatible formats.\n"); - return WINED3DERR_INVALIDCALL; - } - - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_texture->resource.draw_binding, - src_rect, dst_surface, dst_texture->resource.draw_binding, dst_rect))) - return WINED3D_OK; + return WINED3D_OK; } } else diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdb728d..4dea254 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2627,7 +2627,11 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { + struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; + struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; struct wined3d_texture_sub_resource *dst_resource, *src_resource = NULL; + unsigned int dst_format_flags, src_format_flags = 0; + HRESULT hr; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " "src_sub_resource_idx %u, src_rect %s, flags %#x, fx %p, filter %s.\n", @@ -2638,11 +2642,42 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; + dst_format_flags = dst_texture->resource.format_flags; + if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, + dst_sub_resource_idx % dst_texture->level_count, &dst_box))) + return hr; + if (src_texture) { if (!(src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx)) || src_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; + + src_format_flags = src_texture->resource.format_flags; + if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, + src_sub_resource_idx % src_texture->level_count, &src_box))) + return hr; + } + + if (dst_texture->sub_resources[dst_sub_resource_idx].map_count + || (src_texture && src_texture->sub_resources[src_sub_resource_idx].map_count)) + { + WARN("Sub-resource is busy, returning WINEDDERR_SURFACEBUSY.\n"); + return WINEDDERR_SURFACEBUSY; + } + + if ((dst_format_flags & WINED3DFMT_FLAG_BLOCKS) && (flags & WINED3D_BLT_COLOR_FILL)) + { + WARN("Color fill not supported on block-based formats.\n"); + return WINED3DERR_INVALIDCALL; + } + + if ((src_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + != (dst_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + && !(flags & WINED3D_BLT_DEPTH_FILL)) + { + WARN("Rejecting depth/stencil blit between incompatible formats.\n"); + return WINED3DERR_INVALIDCALL; } return wined3d_surface_blt(dst_resource->u.surface, dst_rect,

1 0