October 2019 - Wine-Commits

Zebediah Figura : include: Add more wininet error codes.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 8efa72d1a325a59dd8ae7a8a9e0bb53b4217bcdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8efa72d1a325a59dd8ae7a8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 10:29:46 2019 -0500 include: Add more wininet error codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wininet.h | 6 +++++- include/winineti.h | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wininet.h b/include/wininet.h index e9126de4ba..ce5aebdca8 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1463,6 +1463,8 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_SEC_CERT_ERRORS (INTERNET_ERROR_BASE + 55) #define ERROR_INTERNET_SEC_CERT_NO_REV (INTERNET_ERROR_BASE + 56) #define ERROR_INTERNET_SEC_CERT_REV_FAILED (INTERNET_ERROR_BASE + 57) +#define ERROR_HTTP_HSTS_REDIRECT_REQUIRED (INTERNET_ERROR_BASE + 60) +#define ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE (INTERNET_ERROR_BASE + 62) #define ERROR_FTP_TRANSFER_IN_PROGRESS (INTERNET_ERROR_BASE + 110) #define ERROR_FTP_DROPPED (INTERNET_ERROR_BASE + 111) #define ERROR_FTP_NO_PASSIVE_MODE (INTERNET_ERROR_BASE + 112) @@ -1501,7 +1503,9 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173) #define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174) #define ERROR_INTERNET_DECODING_FAILED (INTERNET_ERROR_BASE + 175) -#define INTERNET_ERROR_LAST ERROR_INTERNET_DECODING_FAILED +#define ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED_PROXY (INTERNET_ERROR_BASE + 187) +#define ERROR_INTERNET_SECURE_FAILURE_PROXY (INTERNET_ERROR_BASE + 188) +#define INTERNET_ERROR_LAST ERROR_INTERNET_SECURE_FAILURE_PROXY #define NORMAL_CACHE_ENTRY 0x00000001 diff --git a/include/winineti.h b/include/winineti.h index 5e38424fa3..812ff79331 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -106,6 +106,17 @@ typedef enum { #define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 #define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 +#define ERROR_INTERNET_NO_NEW_CONTAINERS (INTERNET_ERROR_BASE + 51) +#define ERROR_INTERNET_SOURCE_PORT_IN_USE (INTERNET_ERROR_BASE + 58) +#define ERROR_INTERNET_INSECURE_FALLBACK_REQUIRED (INTERNET_ERROR_BASE + 59) +#define ERROR_INTERNET_PROXY_ALERT (INTERNET_ERROR_BASE + 61) +#define ERROR_INTERNET_NO_CM_CONNECTION (INTERNET_ERROR_BASE + 80) +#define ERROR_HTTP_PUSH_STATUS_CODE_NOT_SUPPORTED (INTERNET_ERROR_BASE + 147) +#define ERROR_HTTP_PUSH_RETRY_NOT_SUPPORTED (INTERNET_ERROR_BASE + 148) +#define ERROR_HTTP_PUSH_ENABLE_FAILED (INTERNET_ERROR_BASE + 149) + +#define ERROR_INTERNET_OFFLINE ERROR_INTERNET_DISCONNECTED + #ifdef __cplusplus extern "C" { #endif

1 0

Alistair Leslie-Hughes : wininet/tests: Add setting Authorization header override tests.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 03c761cf17bb2492c3684c87bb268456a4bf2667 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c761cf17bb2492c3684c87… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 11 01:23:05 2019 +0000 wininet/tests: Add setting Authorization header override tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 99ea0ef48f..9c2b949cdd 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2053,6 +2053,11 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char okmsg201[] = +"HTTP/1.1 201 OK\r\n" +"Server: winetest\r\n" +"\r\n"; + static const char okmsg2[] = "HTTP/1.1 200 OK\r\n" "Date: Mon, 01 Dec 2008 13:44:34 GMT\r\n" @@ -2438,6 +2443,15 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, noauthmsg, sizeof noauthmsg-1, 0); } + if (strstr(buffer, "HEAD /upload4.txt")) + { + if (strstr(buffer, "Authorization: Bearer dXNlcjE6cHdkMQ==")) + send(c, okmsg, sizeof okmsg-1, 0); + else if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, okmsg201, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } if (strstr(buffer, "/test_host_override")) { if (strstr(buffer, host_header_override)) @@ -4677,6 +4691,161 @@ static void test_basic_auth_credentials_different(int port) InternetCloseHandle( ses ); } +/* + * Manually set the Authorization for both calls. + */ +static void test_basic_auth_credentials_manual(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + /* Clear the cached credentials */ + ret = InternetSetOptionA(ses, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "unexpected failure %u\n", GetLastError()); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + /* Set Authorization Header */ + ret = HttpAddRequestHeadersA(req, "Authorization: Basic dXNlcjpwd2Q=\r\n", ~0u, + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders Failed\n"); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + /* Show manual headers are cached. */ + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 401, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload4.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + /* Set Authorization Header */ + ret = HttpAddRequestHeadersA(req, "Authorization: Bearer dXNlcjE6cHdkMQ==\r\n", ~0u, + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders Failed\n"); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + +/* + * Manually set the Authorization for the bearer call, which shows the cached is used. + */ +static void test_basic_auth_credentials_cached_manual(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + /* Clear the cached credentials */ + ret = InternetSetOptionA(ses, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "unexpected failure %u\n", GetLastError()); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload4.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + /* Setting an Authorization Header doesn't override the cached one. */ + ret = HttpAddRequestHeadersA(req, "Authorization: Bearer dXNlcjE6cHdkMQ==\r\n", ~0u, + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders Failed\n"); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 201, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + static void test_async_read(int port) { HINTERNET ses, con, req; @@ -5873,6 +6042,8 @@ static void test_http_connection(void) test_basic_auth_credentials_reuse(si.port); test_basic_auth_credentials_end_session(si.port); test_basic_auth_credentials_different(si.port); + test_basic_auth_credentials_manual(si.port); + test_basic_auth_credentials_cached_manual(si.port); test_async_read(si.port); test_http_read(si.port); test_connection_break(si.port);

1 0

Zebediah Figura : quartz/tests: Filter out extraneous messages in test_video_window_messages().
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 4d4e3e4045b1c0fcde2ad177c790c4290a10f6ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d4e3e4045b1c0fcde2ad177… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 9 23:15:07 2019 -0500 quartz/tests: Filter out extraneous messages in test_video_window_messages(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 69bbc57949..b7b1cb405e 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1881,7 +1881,7 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our for (i = 0; i < ARRAY_SIZE(drain_tests); ++i) { SendMessageA(hwnd, drain_tests[i], 0xdeadbeef, 0); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = PeekMessageA(&msg, 0, drain_tests[i], drain_tests[i], PM_REMOVE); ok(ret, "Expected a message.\n"); ok(msg.hwnd == our_hwnd, "Got hwnd %p.\n", msg.hwnd); ok(msg.message == drain_tests[i], "Got message %#x.\n", msg.message); @@ -1889,7 +1889,7 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our ok(!msg.lParam, "Got lparam %#lx.\n", msg.lParam); DispatchMessageA(&msg); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = PeekMessageA(&msg, 0, drain_tests[i], drain_tests[i], PM_REMOVE); ok(!ret, "Got unexpected message %#x.\n", msg.message); }

1 0

Zebediah Figura : quartz/tests: Wait longer in test_render_with_multithread().
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 2b9596a62611893c6fe673ebaf33d0262ddb670e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9596a62611893c6fe673eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 9 23:15:08 2019 -0500 quartz/tests: Wait longer in test_render_with_multithread(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b6e9f3ab0f..b1a606f061 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -778,7 +778,7 @@ static void test_render_with_multithread(void) thread = CreateThread(NULL, 0, call_RenderFile_multithread, graph, 0, NULL); - ok(WaitForSingleObject(thread, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ok(!WaitForSingleObject(thread, 10000), "Wait timed out.\n"); IFilterGraph2_Release(graph); CloseHandle(thread); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Increase the timeout in test_media_event().
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 44cbb55815f303bf28f6f581126913ac1bd58e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cbb55815f303bf28f6f581… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 9 23:15:09 2019 -0500 quartz/tests: Increase the timeout in test_media_event(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b1a606f061..842f3168cb 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -512,7 +512,7 @@ static void test_media_event(IFilterGraph2 *graph) while (!got_eos) { - if (WaitForSingleObject(event, 1000) == WAIT_TIMEOUT) + if (WaitForSingleObject(event, 2000) == WAIT_TIMEOUT) break; while ((hr = IMediaEvent_GetEvent(media_event, &code, &lparam1, &lparam2, 0)) == S_OK)

1 0

Zebediah Figura : quartz/filtergraph: Ensure that the thread has a message queue before posting messages to it.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 2b45d0fefe4c04a784bce1af796dcdea4da89479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b45d0fefe4c04a784bce1af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 9 23:15:10 2019 -0500 quartz/filtergraph: Ensure that the thread has a message queue before posting messages to it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 3017ee7408..7e72c76eac 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -987,6 +987,10 @@ static DWORD WINAPI message_thread_run(void *ctx) IFilterGraphImpl *graph = ctx; MSG msg; + /* Make sure we have a message queue. */ + PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE); + SetEvent(graph->message_thread_ret); + CoInitializeEx(NULL, COINIT_MULTITHREADED); for (;;) @@ -5686,8 +5690,9 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre if (threaded) { - fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); fimpl->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); + WaitForSingleObject(fimpl->message_thread_ret, INFINITE); } else fimpl->message_thread = NULL;

1 0

Alistair Leslie-Hughes : kernel32: FindFirstFileExW needs to open the directory with FILE_OPEN_FOR_BACKUP_INTENT flag.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: ee266aba74809b0fb4833f2d2762d3c687be4dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee266aba74809b0fb4833f2d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 10 22:47:05 2019 +0000 kernel32: FindFirstFileExW needs to open the directory with FILE_OPEN_FOR_BACKUP_INTENT flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47833 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index bdf429cc05..14a2d6b33a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -754,7 +754,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, status = NtOpenFile( &info->handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT ); if (status != STATUS_SUCCESS) {

1 0

Zebediah Figura : quartz/tests: Bail out if connecting returns E_FAIL.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: d4a0c0f5021552614e498a6684703be33474f866 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4a0c0f5021552614e498a66… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 9 23:15:06 2019 -0500 quartz/tests: Bail out if connecting returns E_FAIL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47911 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 928484ccb6..fa63b5b85c 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -941,7 +941,7 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); IPin_Release(peer); iface->pin.peer = NULL; FreeMediaType(&iface->pin.mtCurrent); @@ -1016,6 +1016,11 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = bpp_tests[j]; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x for subtype %s and bpp %u.\n", hr, wine_dbgstr_guid(subtype_tests[i]), bpp_tests[j]); @@ -1087,6 +1092,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); +out: IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : strmbase: Avoid leaking references to the sink's peer in IVideoWindow::SetWindowForeground().
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: d2b2e60ada6e6f5b1f90ceaa887a68737830a8bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b2e60ada6e6f5b1f90ceaa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:22 2019 -0500 strmbase: Avoid leaking references to the sink's peer in IVideoWindow::SetWindowForeground(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/strmbase/window.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c851146af7..69bbc57949 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2076,7 +2076,7 @@ static void test_video_window(void) ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); - todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %d.\n", ref); DestroyWindow(our_hwnd); } diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 9a91586783..7f4dd40248 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -658,16 +658,13 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowForeground(IVideoWindow *iface, LO { BaseControlWindow *window = impl_from_IVideoWindow(iface); UINT flags = SWP_NOMOVE | SWP_NOSIZE; - IPin* pPin; - HRESULT hr; TRACE("window %p, focus %d.\n", window, focus); if (focus != OAFALSE && focus != OATRUE) return E_INVALIDARG; - hr = IPin_ConnectedTo(&window->pPin->IPin_iface, &pPin); - if ((hr != S_OK) || !pPin) + if (!window->pPin->peer) return VFW_E_NOT_CONNECTED; if (!focus)

1 0

Zebediah Figura : strmbase: IVideoWindow::get_Visible() returns OATRUE, not TRUE.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: 6ef97acd1b151f801a824835c9cbfcc24d24040e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ef97acd1b151f801a824835… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:18 2019 -0500 strmbase: IVideoWindow::get_Visible() returns OATRUE, not TRUE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 16 ++++++++-------- dlls/strmbase/window.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e1b1f17c72..558dc26cb9 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1504,7 +1504,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n"); @@ -1521,7 +1521,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_MINIMIZE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(IsIconic(hwnd), "Window should be minimized.\n"); @@ -1536,7 +1536,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n"); @@ -1551,7 +1551,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw ok(state == SW_MAXIMIZE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should be minimized.\n"); @@ -1584,7 +1584,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n"); @@ -1828,7 +1828,7 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_Visible(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); } static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our_hwnd) @@ -1938,14 +1938,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 66db2d6c07..ecedc17489 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -449,7 +449,7 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *pVis TRACE("(%p/%p)->(%p)\n", This, iface, pVisible); - *pVisible = IsWindowVisible(This->baseWindow.hWnd); + *pVisible = IsWindowVisible(This->baseWindow.hWnd) ? OATRUE : OAFALSE; return S_OK; }

1 0