wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Alistair Leslie-Hughes : wmiutils/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 2c0a3b2a6c5cf32c244493f8eefea752575c01ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0a3b2a6c5cf32c244493f8e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:44 2017 +0000 wmiutils/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/tests/path.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 99907a3..3709748 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -443,7 +443,7 @@ static void test_IWbemPath_SetClassName(void) ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); IWbemPath_Release( path ); } @@ -514,7 +514,7 @@ static void test_IWbemPath_GetInfo(void) hr = IWbemPath_GetInfo( path, 0, &resp ); ok( hr == S_OK, "got %08x\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -531,7 +531,7 @@ static void test_IWbemPath_GetInfo(void) ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); IWbemPath_Release( path ); if (!(path = create_path())) return; @@ -545,7 +545,7 @@ static void test_IWbemPath_GetInfo(void) ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -554,7 +554,7 @@ static void test_IWbemPath_GetInfo(void) hr = IWbemPath_GetInfo( path, 0, &resp ); ok( hr == S_OK, "got %08x\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(resp >> 32), (unsigned long)resp ); + "got %s\n", wine_dbgstr_longlong(resp) ); IWbemPath_Release( path ); } @@ -596,7 +596,7 @@ static void test_IWbemPath_SetServer(void) ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_SetServer( path, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -609,7 +609,7 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); IWbemPath_Release( path ); } @@ -694,7 +694,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_RemoveAllNamespaces( path ); ok( hr == S_OK, "got %08x\n", hr ); @@ -703,7 +703,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); @@ -738,7 +738,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -752,7 +752,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -773,7 +773,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); @@ -822,7 +822,7 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); @@ -838,7 +838,7 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); ok( flags == expected_flags, - "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count );

1 0

Alistair Leslie-Hughes : shlwapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

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

Alistair Leslie-Hughes : apphelp/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

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

Alistair Leslie-Hughes : quartz/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 1234ae80240a2c339cf8064352c18d079adb8063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1234ae80240a2c339cf806435… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:37 2017 +0000 quartz/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/quartz/tests/filtergraph.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index eed7872..a895071 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -581,21 +581,21 @@ static void test_mediacontrol(void) pos = 0xdeadbeef; hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); pos = 0xdeadbeef; hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); pos = 0xdeadbeef; hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); - ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%s)\n", wine_dbgstr_longlong(pos)); hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); ok(hr == S_OK, "SetPositions failed: %08x\n", hr); @@ -606,7 +606,7 @@ static void test_mediacontrol(void) pos = 0xdeadbeef; hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); hr = IMediaControl_GetState(control, 1000, NULL); ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr);

1 0

Alistair Leslie-Hughes : iphlpapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

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

Andrew Eikum : wineandroid: Add an audio driver.
by Alexandre Julliard 03 Jul '17

03 Jul '17

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 03 Jul '17

03 Jul '17

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

Alexandre Julliard : wineandroid: Add networking permissions.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: bc70768c981c60e8583c5c7e99b15a372de45fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc70768c981c60e8583c5c7e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 20:57:50 2017 +0200 wineandroid: Add networking permissions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineandroid.drv/AndroidManifest.xml b/dlls/wineandroid.drv/AndroidManifest.xml index 631cc1a..c4c83d6 100644 --- a/dlls/wineandroid.drv/AndroidManifest.xml +++ b/dlls/wineandroid.drv/AndroidManifest.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.winehq.wine"> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <application android:icon="@drawable/wine" android:label="Wine" >

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

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

← Newer
1
...
57
58
59
60
61
62
63
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017