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

Hugh McMaster : regedit/tests: Test whether the "0x" prefix is valid when importing hex data.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 50fee455c4acee1d3d07a727d9bb23def6ed3a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fee455c4acee1d3d07a727d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:45:59 2017 +0000 regedit/tests: Test whether the "0x" prefix is valid when importing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b6f1a2e..3a08ec0 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -455,7 +455,9 @@ static void test_basic_import(void) "\"Wine13f\"=hex(ffff):56,61,6c,75,65,00\n" "\"Wine13g\"=hex(7fffffff):56,61,6c,75,65,00\n" "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" - "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n\n"); + "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n" + "\"Wine13j\"=hex(0x2):56,61,6c,75,65,00\n" + "\"Wine13k\"=hex(x2):56,61,6c,75,65,00\n\n"); verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0); verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); @@ -465,6 +467,8 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); verify_reg_nonexist(hkey, "Wine13i"); + todo_wine verify_reg_nonexist(hkey, "Wine13j"); + verify_reg_nonexist(hkey, "Wine13k"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit: Simplify a while loop for skipping whitespace.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 50caf838b6f3e93463834e7dbd5bac97e78098f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50caf838b6f3e93463834e7db… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:09 2017 +0000 regedit: Simplify a while loop for skipping whitespace. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 512ddb4..527959a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -506,7 +506,7 @@ static enum reg_versions parse_file_header(const WCHAR *s) 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', 'V','e','r','s','i','o','n',' ','5','.','0','0',0}; - while (*s && (*s == ' ' || *s == '\t')) s++; + while (*s == ' ' || *s == '\t') s++; if (!strcmpW(s, header_31)) return REG_VERSION_31;

1 0

Hugh McMaster : regedit: Skip lines that do not begin with a hexadecimal character during hex data concatenation.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 6ffa89ebd3ad16cb887df78351e3a04798671eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffa89ebd3ad16cb887df7835… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:18 2017 +0000 regedit: Skip lines that do not begin with a hexadecimal character during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ++++++++++ programs/regedit/tests/regedit.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 527959a..b933f03 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -898,8 +898,18 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) while (*line == ' ' || *line == '\t') line++; if (*line == ';') return line; + if (!isxdigitW(*line)) goto invalid; + set_state(parser, HEX_DATA); return line; + +invalid: + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->data_size = 0; + + set_state(parser, LINE_START); + return line; } /* handler for parser UNKNOWN_DATA state */ diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 3a08ec0..cd21b61 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -910,7 +910,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine25d"); verify_reg_nonexist(hkey, "Wine25e"); todo_wine verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); - todo_wine verify_reg_nonexist(hkey, "Wine25g"); + verify_reg_nonexist(hkey, "Wine25g"); todo_wine verify_reg_nonexist(hkey, "Wine25h"); verify_reg_nonexist(hkey, "Wine25i"); verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); @@ -939,7 +939,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine26d"); verify_reg_nonexist(hkey, "Wine26e"); todo_wine verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg_nonexist(hkey, "Wine26g"); + verify_reg_nonexist(hkey, "Wine26g"); todo_wine verify_reg_nonexist(hkey, "Wine26h"); verify_reg_nonexist(hkey, "Wine26i"); verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); @@ -968,7 +968,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27d"); verify_reg_nonexist(hkey, "Wine27e"); todo_wine verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine verify_reg_nonexist(hkey, "Wine27g"); + verify_reg_nonexist(hkey, "Wine27g"); todo_wine verify_reg_nonexist(hkey, "Wine27h"); verify_reg_nonexist(hkey, "Wine27i"); verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -1003,7 +1003,7 @@ static void test_invalid_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" "@=\"Default value 4\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine28d"); + verify_reg_nonexist(hkey, "Wine28d"); todo_wine verify_reg_nonexist(hkey, NULL); exec_import_str("REGEDIT4\n\n" @@ -1021,8 +1021,8 @@ static void test_invalid_import(void) "\"Wine29b\"=hex:11,22,33,\\\n" " \\\n" " 44,55,66\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine29a"); - todo_wine verify_reg_nonexist(hkey, "Wine29b"); + verify_reg_nonexist(hkey, "Wine29a"); + verify_reg_nonexist(hkey, "Wine29b"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1267,7 +1267,7 @@ static void test_comments(void) " 63,61,74,\\\n\n" " 65,6e,\\;comment\n\n" " 61,74,69,6f,6e,00,00\n\n"); - verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1472,7 +1472,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\n\n" " 65,6e,\\\n\n\n\n" " 61,74,69,6f,6e,00,00\n\n"); - verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1481,7 +1481,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\t\n\t\n" " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" " 61,74,69,6f,6e,00,00\n\n"); - verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit: Skip blank and whitespace-only lines during hex data concatenation.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: e336c863597bb05a6de784fd6f26e7d3ca104b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e336c863597bb05a6de784fd6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:26 2017 +0000 regedit: Skip blank and whitespace-only lines during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b933f03..f13c21e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -896,7 +896,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) } while (*line == ' ' || *line == '\t') line++; - if (*line == ';') return line; + if (!*line || *line == ';') return line; if (!isxdigitW(*line)) goto invalid; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index cd21b61..61f136a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -911,7 +911,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine25e"); todo_wine verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); verify_reg_nonexist(hkey, "Wine25g"); - todo_wine verify_reg_nonexist(hkey, "Wine25h"); + verify_reg_nonexist(hkey, "Wine25h"); verify_reg_nonexist(hkey, "Wine25i"); verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); @@ -940,7 +940,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine26e"); todo_wine verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); verify_reg_nonexist(hkey, "Wine26g"); - todo_wine verify_reg_nonexist(hkey, "Wine26h"); + verify_reg_nonexist(hkey, "Wine26h"); verify_reg_nonexist(hkey, "Wine26i"); verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); @@ -969,7 +969,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27e"); todo_wine verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg_nonexist(hkey, "Wine27g"); - todo_wine verify_reg_nonexist(hkey, "Wine27h"); + verify_reg_nonexist(hkey, "Wine27h"); verify_reg_nonexist(hkey, "Wine27i"); verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -1004,7 +1004,7 @@ static void test_invalid_import(void) "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" "@=\"Default value 4\"\n\n"); verify_reg_nonexist(hkey, "Wine28d"); - todo_wine verify_reg_nonexist(hkey, NULL); + verify_reg_nonexist(hkey, NULL); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1267,7 +1267,7 @@ static void test_comments(void) " 63,61,74,\\\n\n" " 65,6e,\\;comment\n\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1472,7 +1472,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\n\n" " 65,6e,\\\n\n\n\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1481,7 +1481,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\t\n\t\n" " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit: Do not remove lines beginning with '#' from the read buffer.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 5d8a1283f2037c0cb70377afc8fcad6896134fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8a1283f2037c0cb70377afc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:36 2017 +0000 regedit: Do not remove lines beginning with '#' from the read buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 4 ++-- programs/regedit/tests/regedit.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f13c21e..92c30e9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -991,7 +991,7 @@ static WCHAR *get_lineA(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';' || *line == '#') + if (*line == ';') { line = next; continue; @@ -1054,7 +1054,7 @@ static WCHAR *get_lineW(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';' || *line == '#') + if (*line == ';') { line = next; continue; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 61f136a..5e127de 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -909,7 +909,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine25c"); verify_reg_nonexist(hkey, "Wine25d"); verify_reg_nonexist(hkey, "Wine25e"); - todo_wine verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); + verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); verify_reg_nonexist(hkey, "Wine25g"); verify_reg_nonexist(hkey, "Wine25h"); verify_reg_nonexist(hkey, "Wine25i"); @@ -938,7 +938,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine26c"); verify_reg_nonexist(hkey, "Wine26d"); verify_reg_nonexist(hkey, "Wine26e"); - todo_wine verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); verify_reg_nonexist(hkey, "Wine26g"); verify_reg_nonexist(hkey, "Wine26h"); verify_reg_nonexist(hkey, "Wine26i"); @@ -967,7 +967,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27c"); verify_reg_nonexist(hkey, "Wine27d"); verify_reg_nonexist(hkey, "Wine27e"); - todo_wine verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg_nonexist(hkey, "Wine27g"); verify_reg_nonexist(hkey, "Wine27h"); verify_reg_nonexist(hkey, "Wine27i"); @@ -994,10 +994,10 @@ static void test_invalid_import(void) "#comment\n" "@=\"Default value 3\"\n\n"); verify_reg_nonexist(hkey, "Wine28c"); - todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); lr = RegDeleteValueW(hkey, NULL); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1326,7 +1326,7 @@ static void test_comments(void) "#comment\n" " 65,6e,\\;comment\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine29c"); + verify_reg_nonexist(hkey, "Wine29c"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Owen Rudge : wsdapi: Implement IWSDUdpAddress_Get/SetMessageType.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: b724f0b2e37176e8f52bac3896a4703eaf161afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b724f0b2e37176e8f52bac389… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:21 2017 +0100 wsdapi: Implement IWSDUdpAddress_Get/SetMessageType. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/address.c | 22 ++++++++++++++++++---- dlls/wsdapi/tests/address.c | 14 +++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index f225930..69d4956 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -38,6 +38,7 @@ typedef struct IWSDUdpAddressImpl { WCHAR ipv4Address[25]; WCHAR ipv6Address[64]; WORD port; + WSDUdpMessageType messageType; } IWSDUdpAddressImpl; static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) @@ -247,14 +248,27 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetExclusive(IWSDUdpAddress *This) static HRESULT WINAPI IWSDUdpAddressImpl_SetMessageType(IWSDUdpAddress *This, WSDUdpMessageType messageType) { - FIXME("(%p, %d)\n", This, messageType); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + + TRACE("(%p, %d)\n", This, messageType); + + impl->messageType = messageType; + return S_OK; } static HRESULT WINAPI IWSDUdpAddressImpl_GetMessageType(IWSDUdpAddress *This, WSDUdpMessageType *pMessageType) { - FIXME("(%p, %p)\n", This, pMessageType); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + + TRACE("(%p, %p)\n", This, pMessageType); + + if (pMessageType == NULL) + { + return E_POINTER; + } + + *pMessageType = impl->messageType; + return S_OK; } static HRESULT WINAPI IWSDUdpAddressImpl_SetTTL(IWSDUdpAddress *This, DWORD dwTTL) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 1a18f02..0a2824a 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -210,26 +210,26 @@ static void GetSetMessageType_udp_tests(void) ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetMessageType(udpAddress, NULL); - todo_wine ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); ok(actualMessageType == 0, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Try setting a message type */ rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType1); - todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); - todo_wine ok(actualMessageType == expectedMessageType1, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(actualMessageType == expectedMessageType1, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Set another one */ rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType2); - todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); ok(actualMessageType == expectedMessageType2, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Release the object */

1 0

Owen Rudge : wsdapi: Implement IWSDUdpAddress_Get/SetSockAddr.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: db94c52719bd2d3a802b587ae76b4ab6b241f2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db94c52719bd2d3a802b587ae… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:23 2017 +0100 wsdapi: Implement IWSDUdpAddress_Get/SetSockAddr. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/address.c | 33 ++++++++++++++++++++++++++---- dlls/wsdapi/tests/address.c | 50 ++++++++++++++++++++++----------------------- 2 files changed, 54 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db94c52719bd2d3a802b5…

1 0

Owen Rudge : wsdapi: Implement WSDXMLGetValueFromAny.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 760190b524ab5c0e6f6804ed195ff8e626d6aa53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760190b524ab5c0e6f6804ed1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:26 2017 +0100 wsdapi: Implement WSDXMLGetValueFromAny. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- dlls/wsdapi/xml.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/wsdutil.h | 1 + 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 41d62bb..22457c9 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -42,4 +42,4 @@ @ stdcall WSDXMLCleanupElement(ptr) @ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace -@ stub WSDXMLGetValueFromAny +@ stdcall WSDXMLGetValueFromAny(wstr wstr ptr wstr) diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 71e9661..145c394 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -238,6 +238,46 @@ HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny) return S_OK; } +HRESULT WINAPI WSDXMLGetValueFromAny(const WCHAR *pszNamespace, const WCHAR *pszName, WSDXML_ELEMENT *pAny, LPCWSTR *ppszValue) +{ + WSDXML_ELEMENT *element; + WSDXML_TEXT *text; + + if (pAny == NULL) + return E_INVALIDARG; + + if (ppszValue == NULL) + return E_POINTER; + + if ((pszNamespace == NULL) || (pszName == NULL) || (lstrlenW(pszNamespace) > WSD_MAX_TEXT_LENGTH) || (lstrlenW(pszName) > WSD_MAX_TEXT_LENGTH)) + return E_INVALIDARG; + + element = pAny; + + while (element != NULL) + { + if (element->Node.Type == ElementType) + { + if ((lstrcmpW(element->Name->LocalName, pszName) == 0) && (lstrcmpW(element->Name->Space->Uri, pszNamespace) == 0)) + { + if ((element->FirstChild == NULL) || (element->FirstChild->Type != TextType)) + { + return E_FAIL; + } + + text = (WSDXML_TEXT *) element->FirstChild; + *ppszValue = (LPCWSTR) text->Text; + + return S_OK; + } + } + + element = (WSDXML_ELEMENT *) element->Node.Next; + } + + return E_FAIL; +} + /* IWSDXMLContext implementation */ struct xmlNamespace diff --git a/include/wsdutil.h b/include/wsdutil.h index 2980d40..402a413 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -28,5 +28,6 @@ HRESULT WINAPI WSDXMLAddChild(WSDXML_ELEMENT *pParent, WSDXML_ELEMENT *pChild); HRESULT WINAPI WSDXMLAddSibling(WSDXML_ELEMENT *pFirst, WSDXML_ELEMENT *pSecond); HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR pszText, WSDXML_ELEMENT **ppAny); HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny); +HRESULT WINAPI WSDXMLGetValueFromAny(const WCHAR *pszNamespace, const WCHAR *pszName, WSDXML_ELEMENT *pAny, LPCWSTR *ppszValue); #endif

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLGetValueFromAny.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 28c040c9b058571d3297238eab7c07e96d9bf8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c040c9b058571d3297238ea… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:28 2017 +0100 wsdapi/tests: Add tests for WSDXMLGetValueFromAny. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index c83f07b..d6a7294 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -268,6 +268,115 @@ static void AddSibling_tests(void) WSDFreeLinkedMemory(parent); } +static void GetValueFromAny_tests(void) +{ + WSDXML_ELEMENT *parent, *child1, *child2, *child3; + WSDXML_NAME parentName, child1Name, child2Name, child3Name; + WSDXML_NAMESPACE ns, ns2; + WCHAR parentNameText[] = {'D','a','d',0}; + WCHAR child1NameText[] = {'T','i','m',0}; + WCHAR child2NameText[] = {'B','o','b',0}; + WCHAR child3NameText[] = {'J','o','e',0}; + WCHAR child1Value[] = {'V','1',0}; + WCHAR child2Value[] = {'V','2',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR uri2[] = {'h','t','t','p',':','/','/','t','e','s','t','2','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + static const WCHAR prefix2[] = {'u',0}; + LPCWSTR returnedValue = NULL, oldReturnedValue; + HRESULT hr; + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + ns2.Uri = uri2; + ns2.PreferredPrefix = prefix2; + + parentName.LocalName = parentNameText; + parentName.Space = &ns; + + child1Name.LocalName = child1NameText; + child1Name.Space = &ns2; + + child2Name.LocalName = child2NameText; + child2Name.Space = &ns; + + child3Name.LocalName = child3NameText; + child3Name.Space = &ns; + + /* Create some elements */ + hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1Value, &child1); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, child2Value, &child2); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child3Name, NULL, &child3); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Attach them to the parent element */ + hr = WSDXMLAddChild(parent, child1); + ok(hr == S_OK, "AddChild failed with %08x\n", hr); + + hr = WSDXMLAddChild(parent, child2); + ok(hr == S_OK, "AddChild failed with %08x\n", hr); + + hr = WSDXMLAddChild(parent, child3); + ok(hr == S_OK, "AddChild failed with %08x\n", hr); + + /* Test invalid arguments */ + hr = WSDXMLGetValueFromAny(NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + + hr = WSDXMLGetValueFromAny(NULL, NULL, NULL, &returnedValue); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + + hr = WSDXMLGetValueFromAny(NULL, NULL, parent, NULL); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + + hr = WSDXMLGetValueFromAny(uri, NULL, parent, NULL); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + + hr = WSDXMLGetValueFromAny(uri, child2NameText, parent, NULL); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + + /* Test calling the function with a text size that exceeds 8192 characters */ + hr = WSDXMLGetValueFromAny(largeText, child2NameText, parent, &returnedValue); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + + hr = WSDXMLGetValueFromAny(uri, largeText, parent, &returnedValue); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + + /* Test with valid parameters */ + hr = WSDXMLGetValueFromAny(uri, child2NameText, child1, &returnedValue); + ok(hr == S_OK, "GetValueFromAny failed with %08x\n", hr); + ok(returnedValue != NULL, "returnedValue == NULL\n"); + ok(lstrcmpW(returnedValue, child2Value) == 0, "returnedValue ('%s') != '%s'\n", wine_dbgstr_w(returnedValue), wine_dbgstr_w(child2Value)); + + hr = WSDXMLGetValueFromAny(uri2, child1NameText, child1, &returnedValue); + ok(hr == S_OK, "GetValueFromAny failed with %08x\n", hr); + ok(returnedValue != NULL, "returnedValue == NULL\n"); + ok(lstrcmpW(returnedValue, child1Value) == 0, "returnedValue ('%s') != '%s'\n", wine_dbgstr_w(returnedValue), wine_dbgstr_w(child1Value)); + + oldReturnedValue = returnedValue; + + hr = WSDXMLGetValueFromAny(uri2, child2NameText, child1, &returnedValue); + ok(hr == E_FAIL, "GetValueFromAny returned unexpected value: %08x\n", hr); + ok(returnedValue == oldReturnedValue, "returnedValue == %p\n", returnedValue); + + oldReturnedValue = returnedValue; + + hr = WSDXMLGetValueFromAny(uri, child3NameText, child1, &returnedValue); + ok(hr == E_FAIL, "GetValueFromAny failed with %08x\n", hr); + ok(returnedValue == oldReturnedValue, "returnedValue == %p\n", returnedValue); + + WSDFreeLinkedMemory(parent); +} + static void XMLContext_AddNamespace_tests(void) { WCHAR ns1Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t',0}; @@ -509,6 +618,7 @@ START_TEST(xml) BuildAnyForSingleElement_tests(); AddChild_tests(); AddSibling_tests(); + GetValueFromAny_tests(); XMLContext_AddNamespace_tests(); XMLContext_AddNameToNamespace_tests();

1 0

Alexandre Julliard : wineandroid: Forward the destroy window ioctl to Java even if the window was freed already.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 5b056f61cf0d5b9e0d3af71877d6a319200e5e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b056f61cf0d5b9e0d3af7187… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 20:57:24 2017 +0200 wineandroid: Forward the destroy window ioctl to Java even if the window was freed already. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 3 ++- dlls/wineandroid.drv/device.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 6c6edd5..16857f2 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -358,7 +358,8 @@ public class WineActivity extends Activity { if (window_group != null) { - if (parent != null) parent.client_group.removeView( window_group ); + if (parent != null && parent.client_group != null) + parent.client_group.removeView( window_group ); window_group.destroy_view(); } if (client_group != null) client_group.destroy_view(); diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 472f4ba..09ac4f4 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -604,7 +604,7 @@ static NTSTATUS destroyWindow_ioctl( void *data, DWORD in_size, DWORD out_size, if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; - if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + win_data = get_ioctl_native_win_data( &res->hdr ); TRACE( "hwnd %08x opengl %u\n", res->hdr.hwnd, res->hdr.opengl ); @@ -613,7 +613,7 @@ static NTSTATUS destroyWindow_ioctl( void *data, DWORD in_size, DWORD out_size, wrap_java_call(); (*jni_env)->CallVoidMethod( jni_env, object, method, res->hdr.hwnd ); unwrap_java_call(); - free_native_win_data( win_data ); + if (win_data) free_native_win_data( win_data ); return STATUS_SUCCESS; }

1 0