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

Alistair Leslie-Hughes : iphlpapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: 3548b25108ce3fbc018c3ab8ac3e274e8f11d0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=3548b25108ce3fbc018c3ab8a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:10 2017 +0000 iphlpapi/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d8c319e..dd0cb90 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -167,16 +167,6 @@ static const char *ntoa( DWORD ip ) return buffer; } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -1513,8 +1503,8 @@ static void test_GetAdaptersAddresses(void) } if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; - trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed)); - trace("ReceiveLinkSpeed: %s\n", debugstr_longlong(aa->ReceiveLinkSpeed)); + trace("TransmitLinkSpeed: %s\n", wine_dbgstr_longlong(aa->TransmitLinkSpeed)); + trace("ReceiveLinkSpeed: %s\n", wine_dbgstr_longlong(aa->ReceiveLinkSpeed)); trace("FirstWinsServerAddress:%p\n", aa->FirstWinsServerAddress); trace("FirstGatewayAddress: %p\n", aa->FirstGatewayAddress); trace("Ipv4Metric: %u\n", aa->Ipv4Metric);

1 0

Alistair Leslie-Hughes : apphelp/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: 97b6221c716ee8793a6b6599a8a9ef238ab7eaa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b6221c716ee8793a6b6599a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:55 2017 +0000 apphelp/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/tests/apphelp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/apphelp/tests/apphelp.c b/dlls/apphelp/tests/apphelp.c index 8b264e9..81104d2 100644 --- a/dlls/apphelp/tests/apphelp.c +++ b/dlls/apphelp/tests/apphelp.c @@ -64,14 +64,14 @@ static void test_ApphelpCheckShellObject(void) flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], FALSE, &flags); - ok(res && (flags == 0), "%s 0: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + ok(res && (flags == 0), "%s 0: got %d and %s with 0x%x (expected TRUE and 0)\n", + wine_dbgstr_guid(objects[i]), res, wine_dbgstr_longlong(flags), GetLastError()); flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], TRUE, &flags); - ok(res && (flags == 0), "%s 1: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + ok(res && (flags == 0), "%s 1: got %d and %s with 0x%x (expected TRUE and 0)\n", + wine_dbgstr_guid(objects[i]), res, wine_dbgstr_longlong(flags), GetLastError()); } @@ -86,7 +86,7 @@ static void test_ApphelpCheckShellObject(void) flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(NULL, FALSE, &flags); - trace("NULL as CLSID*: got %d and 0x%x%08x with 0x%x\n", res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + trace("NULL as CLSID*: got %d and %s with 0x%x\n", res, wine_dbgstr_longlong(flags), GetLastError()); } }

1 0

Hugh McMaster : regedit/tests: Test whether registry keys ending with trailing backslashes are imported and created.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: 506d4fd052aeb2d877c74110337a4b58068d94dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=506d4fd052aeb2d877c741103… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:45:51 2017 +0000 regedit/tests: Test whether registry keys ending with trailing backslashes are imported and created. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 41 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e85e2a7..b6f1a2e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1488,7 +1488,7 @@ static void test_import_with_whitespace(void) static void test_key_creation_and_deletion(void) { - HKEY hkey; + HKEY hkey, subkey; LONG lr; exec_import_str("REGEDIT4\n\n" @@ -1526,6 +1526,45 @@ static void test_key_creation_and_deletion(void) lr = RegDeleteKeyA(hkey, "Subkey1d\t"); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n"); + verify_key(hkey, "Subkey1e\\"); + verify_key(hkey, "Subkey1e"); + lr = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + lr = RegDeleteKeyA(hkey, "Subkey1e"); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n"); + verify_key(hkey, "Subkey1f\\\\"); + verify_key(hkey, "Subkey1f\\"); + verify_key(hkey, "Subkey1f"); + lr = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + lr = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n"); + verify_key(hkey, "Subkey1g\\\\\\\\"); + verify_key(hkey, "Subkey1g\\\\"); + verify_key(hkey, "Subkey1g\\"); + verify_key(hkey, "Subkey1g"); + lr = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + lr = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + /* Test key deletion. We start by creating some registry keys. */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n"

1 0

Alistair Leslie-Hughes : msvcp60/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: 8332f9b762336a469c70d020a7fc80830d87967b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8332f9b762336a469c70d020a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:01 2017 +0000 msvcp60/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index a79d51b..087aa2c 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -480,19 +480,6 @@ static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor_cstr_alloc)(ba static const wchar_t* (__thiscall *p_basic_string_wchar_cstr)(basic_string_wchar*); static void (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - /* return a different string if called up to 4 times in the same ok() */ - static char string[4][17]; - static int which; - - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string[which & 3], "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string[which & 3], "%lx", (unsigned long)ll); - return string[which++ & 3]; -} - /* Emulate a __thiscall */ #ifdef __i386__ @@ -1439,7 +1426,7 @@ static void test_istream_tellg(void) ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", debugstr_longlong(tpos.pos)); + ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_stringstream_char_vbase_dtor, &ss); @@ -1464,7 +1451,7 @@ static void test_istream_tellg(void) ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", debugstr_longlong(tpos.pos)); + ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); @@ -1491,7 +1478,7 @@ static void test_istream_tellg(void) rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", - debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); + wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1514,7 +1501,7 @@ static void test_istream_tellg(void) rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", - debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); + wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state);

1 0

Alistair Leslie-Hughes : shlwapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 4, 2017

July 4, 2017

Module: wine Branch: master Commit: ee778749e39813911fcae0698b53782fd3e099fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee778749e39813911fcae0698… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:30:02 2017 +0000 shlwapi/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/string.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index f23ae3f..7f069a4 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -570,8 +570,8 @@ static void test_StrToInt64ExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } @@ -583,8 +583,8 @@ static void test_StrToInt64ExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } } @@ -610,8 +610,8 @@ static void test_StrToInt64ExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } @@ -624,8 +624,8 @@ static void test_StrToInt64ExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", - result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n", + result->string, wine_dbgstr_longlong(return_val)); result++; } } @@ -672,8 +672,8 @@ static void test_StrFormatByteSize64A(void) pStrFormatByteSize64A(result->value, szBuff, 256); ok(!strcmp(result->byte_size_64, szBuff), - "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->byte_size_64); + "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->byte_size_64); result++; } @@ -696,8 +696,8 @@ static void test_StrFormatKBSizeW(void) pStrFormatKBSizeW(result->value, szBuffW, 256); WideCharToMultiByte(CP_ACP,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),NULL,NULL); - ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); + ok(!strcmp(result->kb_size, szBuff), "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->kb_size); result++; } } @@ -721,8 +721,8 @@ static void test_StrFormatKBSizeA(void) * and does not correctly handle extremely large values. */ ok(!strcmp(result->kb_size, szBuff) || (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)), - "Formatted %x%08x wrong: got %s, expected %s\n", - (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); + "Formatted %s wrong: got %s, expected %s\n", + wine_dbgstr_longlong(result->value), szBuff, result->kb_size); result++; } }

1 0

Owen Rudge : wsdapi: Implement IWSDUdpAddress_Get/SetMessageType.
by Alexandre Julliard July 3, 2017

July 3, 2017

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

Andrew Eikum : wineandroid: Add an audio driver.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 287be7c5ee5ed4d070d93209c6cd355be6ed46da URL: http://source.winehq.org/git/wine.git/?a=commit;h=287be7c5ee5ed4d070d93209c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 3 20:59:40 2017 +0200 wineandroid: Add an audio driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/mmdevapi/main.c | 2 +- dlls/wineandroid.drv/AndroidManifest.xml | 1 + dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/mmdevdrv.c | 2937 +++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 6 + 7 files changed, 2949 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287be7c5ee5ed4d070d93…

1 0

Alexandre Julliard : wineandroid: Support running binaries from the application directory.
by Alexandre Julliard July 3, 2017

July 3, 2017

Module: wine Branch: master Commit: 9027b927a47b413445403ec582d828d1035616b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9027b927a47b413445403ec58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 20:58:01 2017 +0200 wineandroid: Support running binaries from the application directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 16857f2..d1fe305 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -91,6 +91,7 @@ public class WineActivity extends Activity env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir ); env.put( "LC_ALL", locale ); env.put( "LANG", locale ); + env.put( "PATH", bindir.toString() + ":" + System.getenv( "PATH" )); if (cmdline == null) {

1 0

Owen Rudge : wsdapi: Implement IWSDUdpAddress_Get/SetSockAddr.
by Alexandre Julliard July 3, 2017

July 3, 2017

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/tests: Add tests for WSDXMLGetValueFromAny.
by Alexandre Julliard July 3, 2017

July 3, 2017

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