February 2020 - Wine-Devel - list.winehq.org

[PATCH 2/2] inetcomm/tests: Get rid of a2w()
by Michael Stefaniuc Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 71 +++++++++++++---------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 25ae8b6848..afd25af015 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -112,20 +112,6 @@ static const char mhtml_page1[] = "\r\n\t\t\t\tVGVzdA==\r\n\r\n" "------=_NextPart_000_00--"; -static WCHAR *a2w(const char *str) -{ - WCHAR *ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - static void test_CreateVirtualStream(void) { HRESULT hr; @@ -1453,49 +1439,50 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) } static const struct { - const char *base_url; - const char *relative_url; + const WCHAR *base_url; + const WCHAR *relative_url; const WCHAR *expected_result; BOOL todo; } combine_tests[] = { { - "mhtml:file:///c:/dir/test.mht", "http://test.org", + L"mhtml:file:///c:/dir/test.mht", L"http://test.org", L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" }, { - "mhtml:file:///c:/dir/test.mht", "3D\"http://test.org\"", + L"mhtml:file:///c:/dir/test.mht", L"3D\"http://test.org\"", L"mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" }, { - "mhtml:file:///c:/dir/test.mht", "123abc", + L"mhtml:file:///c:/dir/test.mht", L"123abc", L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "123abc", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"123abc", L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { - "MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", "../..", + L"MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", L"../..", L"mhtml:file:///c:/dir/test.mht!x-usc:../.." - }, {"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", "../..", + }, { + L"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", L"../..", L"mhtml:file:///c:/dir/test.mht!x-usc:../.." }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"", L"mhtml:file:///c:/dir/test.mht" }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///d:/file.html", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"mhtml:file:///d:/file.html", L"file:///d:/file.html", TRUE }, { - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", L"mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", L"mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE }, { - "mhtml:file:///c:/dir/test.mht!http://test.org", "123abc", + L"mhtml:file:///c:/dir/test.mht!http://test.org", L"123abc", L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { - "mhtml:file:///c:/dir/test.mht!http://test.org", "", + L"mhtml:file:///c:/dir/test.mht!http://test.org", L"", L"mhtml:file:///c:/dir/test.mht" } }; static void test_mhtml_protocol_info(void) { - WCHAR *base_url, *relative_url, combined_url[INTERNET_MAX_URL_LENGTH]; + WCHAR combined_url[INTERNET_MAX_URL_LENGTH]; IInternetProtocolInfo *protocol_info; DWORD combined_len; unsigned i, exlen; @@ -1508,11 +1495,9 @@ static void test_mhtml_protocol_info(void) ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); for(i = 0; i < ARRAY_SIZE(combine_tests); i++) { - base_url = a2w(combine_tests[i].base_url); - relative_url = a2w(combine_tests[i].relative_url); - combined_len = 0xdeadbeef; - hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + hres = IInternetProtocolInfo_CombineUrl(protocol_info, combine_tests[i].base_url, + combine_tests[i].relative_url, ICU_BROWSER_MODE, combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); @@ -1523,14 +1508,12 @@ static void test_mhtml_protocol_info(void) i, wine_dbgstr_w(combined_url), wine_dbgstr_w(combine_tests[i].expected_result)); combined_len = 0xdeadbeef; - hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + hres = IInternetProtocolInfo_CombineUrl(protocol_info, combine_tests[i].base_url, + combine_tests[i].relative_url, ICU_BROWSER_MODE, combined_url, exlen, &combined_len, 0); ok(hres == E_FAIL, "[%u] CombineUrl returned: %08x\n", i, hres); ok(!combined_len, "[%u] combined_len = %u\n", i, combined_len); } - - HeapFree(GetProcessHeap(), 0, base_url); - HeapFree(GetProcessHeap(), 0, relative_url); } hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, @@ -1605,27 +1588,25 @@ static void test_mhtml_protocol(void) static void test_MimeOleObjectFromMoniker(void) { IMoniker *mon, *new_mon; - WCHAR *mhtml_url, *url; + WCHAR *mhtml_url; IBindCtx *bind_ctx; IUnknown *unk; unsigned i; HRESULT hres; static const struct { - const char *url; + const WCHAR *url; const WCHAR *mhtml_url; } tests[] = { - {"file:///x:\\dir\\file.mht", L"mhtml:file://x:\\dir\\file.mht"}, - {"file:///x:/dir/file.mht", L"mhtml:file://x:\\dir\\file.mht"}, - {"http://www.winehq.org/index.html?query#hash", L"mhtml:http://www.winehq.org/index.html?query#hash"}, - {"../test.mht", L"mhtml:../test.mht"} + {L"file:///x:\\dir\\file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {L"file:///x:/dir/file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {L"http://www.winehq.org/index.html?query#hash", L"mhtml:http://www.winehq.org/index.html?query#hash"}, + {L"../test.mht", L"mhtml:../test.mht"} }; for(i = 0; i < ARRAY_SIZE(tests); i++) { - url = a2w(tests[i].url); - hres = CreateURLMoniker(NULL, url, &mon); + hres = CreateURLMoniker(NULL, tests[i].url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); - HeapFree(GetProcessHeap(), 0, url); hres = CreateBindCtx(0, &bind_ctx); ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); -- 2.24.1

1 0

[PATCH 1/2] inetcomm/tests: Get rid of strcmp_wa()
by Michael Stefaniuc Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 57 +++++++++++++++-------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 02b93e9911..25ae8b6848 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -126,13 +126,6 @@ static WCHAR *a2w(const char *str) return ret; } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - static void test_CreateVirtualStream(void) { HRESULT hr; @@ -1196,7 +1189,7 @@ static void test_MimeOleGetPropertySchema(void) typedef struct { const char *url; const char *content; - const char *mime; + const WCHAR *mime; const char *data; } mhtml_binding_test_t; @@ -1204,13 +1197,13 @@ static const mhtml_binding_test_t binding_tests[] = { { "mhtml:file://%s", mhtml_page1, - "text/html", + L"text/html", "<HTML></HTML>" }, { "mhtml:file://%s!http://winehq.org/mhtmltest.html", mhtml_page1, - "Image/Jpeg", + L"Image/Jpeg", "Test" } }; @@ -1348,7 +1341,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - ok(!strcmp_wa(szStatusText, current_binding_test->mime), "status text %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, current_binding_test->mime), "status text %s\n", wine_dbgstr_w(szStatusText)); return S_OK; case BINDSTATUS_CACHEFILENAMEAVAILABLE: CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -1462,41 +1455,41 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) static const struct { const char *base_url; const char *relative_url; - const char *expected_result; + const WCHAR *expected_result; BOOL todo; } combine_tests[] = { { "mhtml:file:///c:/dir/test.mht", "http://test.org", - "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" + L"mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" }, { "mhtml:file:///c:/dir/test.mht", "3D\"http://test.org\"", - "mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" + L"mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" }, { "mhtml:file:///c:/dir/test.mht", "123abc", - "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "123abc", - "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { "MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", "../..", - "mhtml:file:///c:/dir/test.mht!x-usc:../.." + L"mhtml:file:///c:/dir/test.mht!x-usc:../.." }, {"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", "../..", - "mhtml:file:///c:/dir/test.mht!x-usc:../.." + L"mhtml:file:///c:/dir/test.mht!x-usc:../.." }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "", - "mhtml:file:///c:/dir/test.mht" + L"mhtml:file:///c:/dir/test.mht" }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///d:/file.html", - "file:///d:/file.html", TRUE + L"file:///d:/file.html", TRUE }, { "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", - "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE + L"mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE }, { "mhtml:file:///c:/dir/test.mht!http://test.org", "123abc", - "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + L"mhtml:file:///c:/dir/test.mht!x-usc:123abc" }, { "mhtml:file:///c:/dir/test.mht!http://test.org", "", - "mhtml:file:///c:/dir/test.mht" + L"mhtml:file:///c:/dir/test.mht" } }; @@ -1524,10 +1517,10 @@ static void test_mhtml_protocol_info(void) todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); if(SUCCEEDED(hres)) { - exlen = strlen(combine_tests[i].expected_result); + exlen = lstrlenW(combine_tests[i].expected_result); ok(combined_len == exlen, "[%u] combined len is %u, expected %u\n", i, combined_len, exlen); - ok(!strcmp_wa(combined_url, combine_tests[i].expected_result), "[%u] combined URL is %s, expected %s\n", - i, wine_dbgstr_w(combined_url), combine_tests[i].expected_result); + ok(!lstrcmpW(combined_url, combine_tests[i].expected_result), "[%u] combined URL is %s, expected %s\n", + i, wine_dbgstr_w(combined_url), wine_dbgstr_w(combine_tests[i].expected_result)); combined_len = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, @@ -1620,12 +1613,12 @@ static void test_MimeOleObjectFromMoniker(void) static const struct { const char *url; - const char *mhtml_url; + const WCHAR *mhtml_url; } tests[] = { - {"file:///x:\\dir\\file.mht", "mhtml:file://x:\\dir\\file.mht"}, - {"file:///x:/dir/file.mht", "mhtml:file://x:\\dir\\file.mht"}, - {"http://www.winehq.org/index.html?query#hash", "mhtml:http://www.winehq.org/index.html?query#hash"}, - {"../test.mht", "mhtml:../test.mht"} + {"file:///x:\\dir\\file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {"file:///x:/dir/file.mht", L"mhtml:file://x:\\dir\\file.mht"}, + {"http://www.winehq.org/index.html?query#hash", L"mhtml:http://www.winehq.org/index.html?query#hash"}, + {"../test.mht", L"mhtml:../test.mht"} }; for(i = 0; i < ARRAY_SIZE(tests); i++) { @@ -1648,7 +1641,7 @@ static void test_MimeOleObjectFromMoniker(void) hres = IMoniker_GetDisplayName(new_mon, NULL, NULL, &mhtml_url); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - ok(!strcmp_wa(mhtml_url, tests[i].mhtml_url), "[%d] unexpected mhtml URL: %s\n", i, wine_dbgstr_w(mhtml_url)); + ok(!lstrcmpW(mhtml_url, tests[i].mhtml_url), "[%d] unexpected mhtml URL: %s\n", i, wine_dbgstr_w(mhtml_url)); CoTaskMemFree(mhtml_url); IUnknown_Release(unk); -- 2.24.1

1 0

[PATCH 0/2] winealsa.drv: cooperate with other sequencer clients
by Jacek Konieczny Feb. 9, 2020

Feb. 9, 2020

winealsa.drv uses ALSA sequencer interface to access MIDI ports. It is generally the preferred API for that in Linux, as it allows multiple applications access MIDI hardware at the same time and to route messages between software MIDI ports. The connections between the applications and hardware can be controlled within the app or by external tools. Unfortunately wine uses the API in a way that won't allow other aplications to alter its MIDI connections. It disallows external changes to the connections and does not use the configured connection (subscriptions) to send outgoing messages (instead, it addresses the target device directly). That has been already confusing, as e.g. https://bugs.winehq.org/show_bug.cgi?id=43725 shows. Enabling other apps to alter wine MIDI connection has many use cases, like: - fixing Windows application that fail to select proper MIDI device - reverse-engineering Windows application controlling external MIDI hardware (recording SYSEX messages) - adding Linux application in the MIDI chain for processing MIDI streams before they hit the target device Jacek Konieczny (2): winealsa.drv: allow external MIDI port connection changes winealsa.drv: send MIDI events to port subscribers dlls/winealsa.drv/midi.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.17.1

1 2

[PATCH 6/6] shlwapi: Fix wnsprintfW/wvnsprintfW %S conversion.
by Akihiro Sagawa Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shlwapi/wsprintf.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-)

2 1

[PATCH 4/6] user32/tests: Add wsprintfW %S conversion tests.
by Akihiro Sagawa Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)

2 1

[PATCH 3/6] shlwapi: Fix wnsprintfA/wvnsprintfA %S conversion.
by Akihiro Sagawa Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shlwapi/wsprintf.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)

2 1

[PATCH 5/6] user32: Fix wsprintfW %S conversion.
by Akihiro Sagawa Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 3 +-- dlls/user32/wsprintf.c | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-)

1 0

[PATCH 2/6] user32: Fix wsprintfA %S conversion.
by Akihiro Sagawa Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 16 ++++++---------- dlls/user32/wsprintf.c | 31 +++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 16 deletions(-)

1 0

[PATCH 1/6] user32/tests: Add wsprintfA %S conversion tests.
by Akihiro Sagawa Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/wsprintf.c | 50 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)

1 0

[PATCH] iphlpapi: Remove unnecessary memcpy from build_udp6_table
by Alex Henrie Feb. 9, 2020

Feb. 9, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/iphlpapi/ipstats.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 83259f4743..f09f042135 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2719,13 +2719,12 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets( buf, sizeof(buf), fp ); while ((ptr = fgets( buf, sizeof(buf), fp ))) { - DWORD in6_addr32[4]; + DWORD *local_addr = (DWORD *)&row.ucLocalAddr; if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, - &in6_addr32[0], &in6_addr32[1], &in6_addr32[2], &in6_addr32[3], + &local_addr[0], &local_addr[1], &local_addr[2], &local_addr[3], &row.dwLocalPort, &inode ) != 7) continue; - memcpy(&row.ucLocalAddr, in6_addr32, sizeof(row.ucLocalAddr)); row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); row.dwLocalPort = htons( row.dwLocalPort ); -- 2.25.0

1 0