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

Nikolay Sivov : xmllite/reader: Explicitly return empty string as qualified name for some node types.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 3b83a44639788c6f9b6821d7186d543507a70397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b83a44639788c6f9b6821d71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:40 2017 +0300 xmllite/reader: Explicitly return empty string as qualified name for some node types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 15 ++++++++------- dlls/xmllite/tests/reader.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1dba23c..056721e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1353,7 +1353,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -1375,7 +1374,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; @@ -2341,7 +2339,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2357,7 +2354,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; @@ -2400,7 +2396,6 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2942,7 +2937,6 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - XmlNodeType nodetype; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -2950,8 +2944,15 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam if (!len) len = &length; - switch ((nodetype = reader_get_nodetype(This))) + switch (reader_get_nodetype(This)) { + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + *name = emptyW; + *len = 0; + break; case XmlNodeType_Element: case XmlNodeType_EndElement: /* empty elements are not added to the stack */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 31b5ce8..4318a29 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1013,6 +1013,11 @@ static void test_read_comment(void) ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1020,6 +1025,11 @@ static void test_read_comment(void) ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + /* value */ len = 1; str = NULL; @@ -1708,10 +1718,13 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - 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); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1; @@ -1779,30 +1792,29 @@ static void test_read_text(void) ok(type == XmlNodeType_Text, "got %d for %s\n", type, test->xml); - str_exp = a2w(test->name); - len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - - free_str(str_exp); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - 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); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1;

1 0

Nikolay Sivov : xmllite/reader: Return correct error for multiple colons in qualified name.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 62a41d035c0a61d5565ab0a17d96aa0195e24adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a41d035c0a61d5565ab0a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:41 2017 +0300 xmllite/reader: Return correct error for multiple colons in qualified name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 9 ++++++--- dlls/xmllite/tests/reader.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 056721e..c9ab4e1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1838,7 +1838,7 @@ static HRESULT reader_parse_dtd(xmlreader *reader) } /* [11 NS] LocalPart ::= NCName */ -static HRESULT reader_parse_local(xmlreader *reader, strval *local) +static HRESULT reader_parse_local(xmlreader *reader, strval *local, BOOL check_for_separator) { WCHAR *ptr; UINT start; @@ -1860,6 +1860,9 @@ static HRESULT reader_parse_local(xmlreader *reader, strval *local) ptr = reader_get_ptr(reader); } + if (check_for_separator && *ptr == ':') + return NC_E_QNAMECOLON; + if (is_reader_pending(reader)) { reader->resume[XmlReadResume_Local] = start; @@ -1898,7 +1901,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc if (reader->resume[XmlReadResume_Local]) { - hr = reader_parse_local(reader, local); + hr = reader_parse_local(reader, local, FALSE); if (FAILED(hr)) return hr; reader_init_strvalue(reader->resume[XmlReadResume_Name], @@ -1923,7 +1926,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* skip ':' */ reader_skipn(reader, 1); - hr = reader_parse_local(reader, local); + hr = reader_parse_local(reader, local, TRUE); if (FAILED(hr)) return hr; } else diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 4318a29..a44af67 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1415,6 +1415,8 @@ static struct test_entry element_tests[] = { { "<a >", "a", "", S_OK }, { "<a \r \t\n>", "a", "", S_OK }, { "</a>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "<a:b:c />", NULL, NULL, NC_E_QNAMECOLON }, + { "<:b:c />", NULL, NULL, NC_E_QNAMECHARACTER }, { NULL } };

1 0

Nikolay Sivov : xmllite/reader: Fix position methods return values in closed reader state.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 79a65678fc158a56e789946e3ce6ebbf6bda0d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a65678fc158a56e789946e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:42 2017 +0300 xmllite/reader: Fix position methods return values in closed reader state. 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 | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c9ab4e1..c5aa99b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3320,7 +3320,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb break; } - return S_OK; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_position) @@ -3355,7 +3355,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po break; } - return S_OK; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index a44af67..f7987c7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2484,6 +2484,8 @@ static void test_reader_position(void) hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); + TEST_READER_STATE(reader, XmlReadState_Closed); + /* position methods with Null args */ hr = IXmlReader_GetLineNumber(reader, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); @@ -2493,13 +2495,11 @@ static void test_reader_position(void) position = 123; hr = IXmlReader_GetLinePosition(reader, &position); -todo_wine ok(hr == S_FALSE, "got %#x\n", hr); ok(position == 0, "got %u\n", position); position = 123; hr = IXmlReader_GetLineNumber(reader, &position); -todo_wine ok(hr == S_FALSE, "got %#x\n", hr); ok(position == 0, "got %u\n", position); @@ -2508,6 +2508,7 @@ todo_wine hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "got %08x\n", hr); + TEST_READER_STATE(reader, XmlReadState_Initial); TEST_READER_POSITION(reader, 0, 0); hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); @@ -2532,6 +2533,7 @@ todo_wine TEST_READER_POSITION2(reader, 1, 37, ~0u, 40); IXmlReader_SetInput(reader, NULL); + TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); TEST_READER_POSITION(reader, 0, 0); IStream_Release(stream);

1 0

Nikolay Sivov : xmllite/reader: Improve line number updating when switching to the next line.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 9685fec1746a6ef348be118bfd026bcb770747ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9685fec1746a6ef348be118bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:43 2017 +0300 xmllite/reader: Improve line number updating when switching to the next line. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 32 +++++++++++++++++--------------- dlls/xmllite/tests/reader.c | 11 +++++++++-- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c5aa99b..b223994 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1050,16 +1050,29 @@ static int reader_cmp(xmlreader *reader, const WCHAR *str) return 0; } +static void reader_update_position(xmlreader *reader, WCHAR ch) +{ + if (ch == '\r') + reader->position.line_position = 1; + else if (ch == '\n') + { + reader->position.line_number++; + reader->position.line_position = 1; + } + else + reader->position.line_position++; +} + /* moves cursor n WCHARs forward */ static void reader_skipn(xmlreader *reader, int n) { encoded_buffer *buffer = &reader->input->buffer->utf16; - const WCHAR *ptr = reader_get_ptr(reader); + const WCHAR *ptr; - while (*ptr++ && n--) + while (*(ptr = reader_get_ptr(reader)) && n--) { + reader_update_position(reader, *ptr); buffer->cur++; - reader->position.line_position++; } } @@ -1071,23 +1084,12 @@ static inline BOOL is_wchar_space(WCHAR ch) /* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ static int reader_skipspaces(xmlreader *reader) { - encoded_buffer *buffer = &reader->input->buffer->utf16; const WCHAR *ptr = reader_get_ptr(reader); UINT start = reader_get_cur(reader); while (is_wchar_space(*ptr)) { - if (*ptr == '\r') - reader->position.line_position = 0; - else if (*ptr == '\n') - { - reader->position.line_number++; - reader->position.line_position = 0; - } - else - reader->position.line_position++; - - buffer->cur++; + reader_skipn(reader, 1); ptr = reader_get_ptr(reader); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f7987c7..fdd2750 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1590,6 +1590,7 @@ static void test_read_pending(void) ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ +todo_wine ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); @@ -2474,7 +2475,7 @@ todo_wine { static void test_reader_position(void) { - static const char *xml = "<c:a xmlns:c=\"nsdef c\" b=\"attr b\"></c:a>"; + static const char *xml = "<c:a xmlns:c=\"nsdef c\" b=\"attr b\">\n</c:a>"; IXmlReader *reader; XmlNodeType type; IStream *stream; @@ -2529,8 +2530,14 @@ static void test_reader_position(void) hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Whitespace, "got type %d\n", type); +todo_wine + TEST_READER_POSITION2(reader, 1, 35, 2, 6); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_EndElement, "got type %d\n", type); - TEST_READER_POSITION2(reader, 1, 37, ~0u, 40); + TEST_READER_POSITION2(reader, 2, 3, 2, 6); IXmlReader_SetInput(reader, NULL); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);

1 0

Nikolay Sivov : xmllite/reader: Improve returned position for whitespace text nodes.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: b115e9675feed5dddb7d0ca2eba71ee837683ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b115e9675feed5dddb7d0ca2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:44 2017 +0300 xmllite/reader: Improve returned position for whitespace text nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 5 +++++ dlls/xmllite/tests/reader.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b223994..b5088e8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2383,6 +2383,7 @@ static HRESULT reader_parse_cdata(xmlreader *reader) /* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ static HRESULT reader_parse_chardata(xmlreader *reader) { + struct reader_position position; WCHAR *ptr; UINT start; @@ -2404,6 +2405,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader_set_strvalue(reader, StringValue_Value, NULL); } + position = reader->position; while (*ptr) { static const WCHAR ampW[] = {'&',0}; @@ -2417,6 +2419,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) { strval value; + reader->empty_element.position = position; reader_init_strvalue(start, reader_get_cur(reader)-start, &value); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -3314,6 +3317,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb case XmlNodeType_Attribute: *line_number = This->attr->position.line_number; break; + case XmlNodeType_Whitespace: case XmlNodeType_XmlDeclaration: *line_number = This->empty_element.position.line_number; break; @@ -3349,6 +3353,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po case XmlNodeType_Attribute: *line_position = This->attr->position.line_position; break; + case XmlNodeType_Whitespace: case XmlNodeType_XmlDeclaration: *line_position = This->empty_element.position.line_position; break; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fdd2750..e66b9e4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2531,7 +2531,6 @@ static void test_reader_position(void) hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Whitespace, "got type %d\n", type); -todo_wine TEST_READER_POSITION2(reader, 1, 35, 2, 6); hr = IXmlReader_Read(reader, &type);

1 0

Ken Thomases : winemac: Discard key repeat events after a modifier key has been pressed.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: c5eca7be915af1eb88faf181e9a6181981ce8c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5eca7be915af1eb88faf181e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 10 02:22:02 2017 -0600 winemac: Discard key repeat events after a modifier key has been pressed. Sierra (macOS 10.12) changed the behavior of key repeat. In previous versions of macOS, key repeat stops when a modifier key is pressed or released. In Sierra, it does not; it just keeps repeating as newly-modified. On Windows, key repeat stops when a modifier key is pressed, although not when one is released. Some programs depend on this behavior. So, the Mac driver emulates it. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index f037b08..b4cc018 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -81,6 +81,8 @@ NSTimeInterval lastDockIconSnapshot; + BOOL allowKeyRepeats; + BOOL ignore_windowDeminiaturize; BOOL ignore_windowResize; BOOL fakingClose; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 118bf3c..af8ebe7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2424,7 +2424,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi /* * ---------- NSResponder method overrides ---------- */ - - (void) keyDown:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } + - (void) keyDown:(NSEvent *)theEvent + { + if ([theEvent isARepeat]) + { + if (!allowKeyRepeats) + return; + } + else + allowKeyRepeats = YES; + + [self postKeyEvent:theEvent]; + } - (void) flagsChanged:(NSEvent *)theEvent { @@ -2461,6 +2472,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { BOOL pressed = (modifierFlags & modifiers[i].mask) != 0; + if (pressed) + allowKeyRepeats = NO; + if (i == last_changed) lastModifierFlags = modifierFlags; else

1 0

Jacek Caban : wininet: Propagate WSAEWOULDBLOCK result from content decoding reads.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 67b56774c5303141948ada19e96d08cf01247a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b56774c5303141948ada19e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:18:10 2017 +0100 wininet: Propagate WSAEWOULDBLOCK result from content decoding reads. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 21b93dd..26f7f87 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -484,10 +484,8 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW break; if(!current_read) { - if(blocking_mode != BLOCKING_DISALLOW) { - WARN("unexpected end of data\n"); - gzip_stream->end_of_data = TRUE; - } + WARN("unexpected end of data\n"); + gzip_stream->end_of_data = TRUE; break; } } @@ -518,6 +516,8 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW } TRACE("read %u bytes\n", ret_read); + if(ret_read) + res = ERROR_SUCCESS; *read = ret_read; return res; } @@ -2572,6 +2572,12 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD DWORD res; res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, blocking_mode); + if(res != ERROR_SUCCESS) { + if(res != WSAEWOULDBLOCK) + return res; + *read = 0; + return ERROR_SUCCESS; + } assert(*read <= size); if(req->hCacheFile) { @@ -2584,7 +2590,7 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD FIXME("WriteFile failed: %u\n", GetLastError()); } - if(req->data_stream->vtbl->end_of_data(req->data_stream, req)) + if(!*read || req->data_stream->vtbl->end_of_data(req->data_stream, req)) commit_cache_entry(req); } @@ -2669,7 +2675,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, break; } - if(ret || (blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK)) + if(res == WSAEWOULDBLOCK && ret) res = ERROR_SUCCESS; } @@ -2750,6 +2756,8 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(res == ERROR_SUCCESS && read_bytes) { chunked_stream->buf_size += read_bytes; }else if(res == WSAEWOULDBLOCK) { + if(ret_read) + res = ERROR_SUCCESS; continue_read = FALSE; continue; }else { @@ -2853,7 +2861,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(ret_read) res = ERROR_SUCCESS; - if(res != ERROR_SUCCESS && res != WSAEWOULDBLOCK) + if(res != ERROR_SUCCESS) return res; TRACE("read %d bytes\n", ret_read);

1 0

Jacek Caban : wininet: Pass blocking mode to HTTPREQ_Read.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: f42a2ccad141cbbf9018f78bcfa474603a0f1288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42a2ccad141cbbf9018f78bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:18:21 2017 +0100 wininet: Pass blocking mode to HTTPREQ_Read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 26f7f87..fcd8d50 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3028,14 +3028,11 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD } /* read data from the http connection (the read section must be held) */ -static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read) +static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read, blocking_mode_t blocking_mode) { DWORD current_read = 0, ret_read = 0; - blocking_mode_t blocking_mode; DWORD res = ERROR_SUCCESS; - blocking_mode = req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC ? BLOCKING_ALLOW : BLOCKING_WAITALL; - EnterCriticalSection( &req->read_section ); if(req->read_size) { @@ -3082,7 +3079,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) DWORD bytes_read, res; BYTE buf[4096]; - res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read); + res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, BLOCKING_ALLOW); if(res != ERROR_SUCCESS) { ret = FALSE; break; @@ -3113,7 +3110,7 @@ static void AsyncReadFileExProc(task_header_t *hdr) TRACE("%p\n", req); if(task->ret_read) - res = HTTPREQ_Read(req, task->buf, task->size, &read); + res = HTTPREQ_Read(req, task->buf, task->size, &read, BLOCKING_ALLOW); if(res == ERROR_SUCCESS) res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); if (res == ERROR_SUCCESS) @@ -3150,7 +3147,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO { if (get_avail_data(req) || end_of_read_data(req)) { - res = HTTPREQ_Read(req, buf, size, &read); + res = HTTPREQ_Read(req, buf, size, &read, BLOCKING_DISALLOW); LeaveCriticalSection( &req->read_section ); goto done; } @@ -3176,7 +3173,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; while(1) { - res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread); + res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, BLOCKING_ALLOW); if(res != ERROR_SUCCESS) break; @@ -3240,7 +3237,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW { if (get_avail_data(req) || end_of_read_data(req)) { - res = HTTPREQ_Read(req, buffer, size, read); + res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_DISALLOW); LeaveCriticalSection( &req->read_section ); return res; } @@ -3262,7 +3259,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW if(hdr->dwError == INTERNET_HANDLE_IN_USE) hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - res = HTTPREQ_Read(req, buffer, size, read); + res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_WAITALL); if(res == ERROR_SUCCESS) res = hdr->dwError; LeaveCriticalSection( &req->read_section );

1 0

Jacek Caban : wininet: Propagate WSAEWOULDBLOCK from read_http_stream.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: c140a7042567a359b044d8d7a9896583168bbb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c140a7042567a359b044d8d7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:19:03 2017 +0100 wininet: Propagate WSAEWOULDBLOCK from read_http_stream. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fcd8d50..947c507 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2572,12 +2572,8 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD DWORD res; res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, blocking_mode); - if(res != ERROR_SUCCESS) { - if(res != WSAEWOULDBLOCK) - return res; + if(res != ERROR_SUCCESS) *read = 0; - return ERROR_SUCCESS; - } assert(*read <= size); if(req->hCacheFile) { @@ -2590,7 +2586,7 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD FIXME("WriteFile failed: %u\n", GetLastError()); } - if(!*read || req->data_stream->vtbl->end_of_data(req->data_stream, req)) + if((res == ERROR_SUCCESS && !*read) || req->data_stream->vtbl->end_of_data(req->data_stream, req)) commit_cache_entry(req); } @@ -2613,6 +2609,9 @@ static DWORD refill_read_buffer(http_request_t *req, blocking_mode_t blocking_mo res = read_http_stream(req, req->read_buf+req->read_size, sizeof(req->read_buf) - req->read_size, &read, blocking_mode); + if(res != ERROR_SUCCESS) + return res; + req->read_size += read; TRACE("read %u bytes, read_size %u\n", read, req->read_size); @@ -3004,17 +3003,19 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD mode = first_notif && req->read_size ? BLOCKING_DISALLOW : BLOCKING_ALLOW; res = refill_read_buffer(req, mode, &read); - if(res == ERROR_SUCCESS) + if(res == ERROR_SUCCESS) { avail = get_avail_data(req); + read += req->read_size; + } LeaveCriticalSection( &req->read_section ); - if(res != ERROR_SUCCESS || (mode != BLOCKING_DISALLOW && !read)) { + if(res != WSAEWOULDBLOCK && (res != ERROR_SUCCESS || !read)) { WARN("res %u read %u, closing connection\n", res, read); http_release_netconn(req, FALSE); } - if(res != ERROR_SUCCESS) { + if(res != ERROR_SUCCESS && res != WSAEWOULDBLOCK) { send_request_complete(req, 0, res); return; } @@ -3046,7 +3047,10 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * if(ret_read < size) { res = read_http_stream(req, (BYTE*)buffer+ret_read, size-ret_read, &current_read, blocking_mode); - ret_read += current_read; + if(res == ERROR_SUCCESS) + ret_read += current_read; + else if(res == WSAEWOULDBLOCK && ret_read) + res = ERROR_SUCCESS; } LeaveCriticalSection( &req->read_section ); @@ -3054,7 +3058,7 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * *read = ret_read; TRACE( "retrieved %u bytes (%u)\n", ret_read, req->contentLength ); - if(size && !ret_read) + if(res != WSAEWOULDBLOCK && (!ret_read || res != ERROR_SUCCESS)) http_release_netconn(req, res == ERROR_SUCCESS); return res; @@ -3111,8 +3115,11 @@ static void AsyncReadFileExProc(task_header_t *hdr) if(task->ret_read) res = HTTPREQ_Read(req, task->buf, task->size, &read, BLOCKING_ALLOW); - if(res == ERROR_SUCCESS) + if(res == ERROR_SUCCESS) { res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); + if(res == WSAEWOULDBLOCK) + res = ERROR_SUCCESS; + } if (res == ERROR_SUCCESS) { if(task->ret_read)

1 0

Jacek Caban : wininet: Rewrite asynchronous read to try to fill whole buffer and not buffer additional data unless requested.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 98bcd00e21b9e588ca773ac1b347c5db657a461f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bcd00e21b9e588ca773ac1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:19:36 2017 +0100 wininet: Rewrite asynchronous read to try to fill whole buffer and not buffer additional data unless requested. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 93 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 947c507..4109849 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3102,34 +3102,65 @@ typedef struct { task_header_t hdr; void *buf; DWORD size; + DWORD read_pos; DWORD *ret_read; -} read_file_ex_task_t; +} read_file_task_t; -static void AsyncReadFileExProc(task_header_t *hdr) +static void async_read_file_proc(task_header_t *hdr) { - read_file_ex_task_t *task = (read_file_ex_task_t*)hdr; + read_file_task_t *task = (read_file_task_t*)hdr; http_request_t *req = (http_request_t*)task->hdr.hdr; - DWORD res = ERROR_SUCCESS, read = 0, buffered = 0; + DWORD res = ERROR_SUCCESS, read = task->read_pos, complete_arg = 0; - TRACE("%p\n", req); + TRACE("req %p buf %p size %u read_pos %u ret_read %p\n", req, task->buf, task->size, task->read_pos, task->ret_read); + + if(task->buf) { + DWORD read_bytes; + while (read < task->size) { + res = HTTPREQ_Read(req, (char*)task->buf + read, task->size - read, &read_bytes, BLOCKING_ALLOW); + if (res != ERROR_SUCCESS || !read_bytes) + break; + read += read_bytes; + } + }else { + EnterCriticalSection(&req->read_section); + res = refill_read_buffer(req, BLOCKING_ALLOW, &read); + LeaveCriticalSection(&req->read_section); - if(task->ret_read) - res = HTTPREQ_Read(req, task->buf, task->size, &read, BLOCKING_ALLOW); - if(res == ERROR_SUCCESS) { - res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); - if(res == WSAEWOULDBLOCK) - res = ERROR_SUCCESS; - } - if (res == ERROR_SUCCESS) - { if(task->ret_read) - *task->ret_read = read; - read += buffered; - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &read, sizeof(read)); + complete_arg = read; /* QueryDataAvailable reports read bytes in request complete notification */ + if(res != ERROR_SUCCESS || !read) + http_release_netconn(req, drain_content(req, FALSE)); } - send_request_complete(req, res == ERROR_SUCCESS, res); + TRACE("res %u read %u\n", res, read); + + if(task->ret_read) + *task->ret_read = read; + + /* FIXME: We should report bytes transferred before decoding content. */ + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &read, sizeof(read)); + + if(res != ERROR_SUCCESS) + complete_arg = res; + send_request_complete(req, res == ERROR_SUCCESS, complete_arg); +} + +static DWORD async_read(http_request_t *req, void *buf, DWORD size, DWORD read_pos, DWORD *ret_read) +{ + read_file_task_t *task; + + task = alloc_async_task(&req->hdr, async_read_file_proc, sizeof(*task)); + if(!task) + return ERROR_OUTOFMEMORY; + + task->buf = buf; + task->size = size; + task->read_pos = read_pos; + task->ret_read = ret_read; + + INTERNET_AsyncCall(&task->hdr); + return ERROR_IO_PENDING; } static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, @@ -3148,8 +3179,6 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - read_file_ex_task_t *task; - if (TryEnterCriticalSection( &req->read_section )) { if (get_avail_data(req) || end_of_read_data(req)) @@ -3161,14 +3190,9 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO LeaveCriticalSection( &req->read_section ); } - task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task)); - task->buf = buf; - task->size = size; - task->ret_read = (flags & IRF_NO_WAIT) ? NULL : ret_read; - - INTERNET_AsyncCall(&task->hdr); - - return ERROR_IO_PENDING; + if(flags & IRF_NO_WAIT) + return async_read(req, NULL, 0, 0, 0); + return async_read(req, buf, size, 0, ret_read); } read = 0; @@ -3238,8 +3262,6 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - read_file_ex_task_t *task; - if (TryEnterCriticalSection( &req->read_section )) { if (get_avail_data(req) || end_of_read_data(req)) @@ -3251,15 +3273,8 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW LeaveCriticalSection( &req->read_section ); } - task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task)); - task->buf = buffer; - task->size = size; - task->ret_read = read; - *read = 0; - INTERNET_AsyncCall(&task->hdr); - - return ERROR_IO_PENDING; + return async_read(req, buffer, size, 0, read); } EnterCriticalSection( &req->read_section );

1 0