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

Jacek Caban : wininet: Correctly handle redirects to non-http URLs.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 9c959154f62840f2c8de45f2a082d5793ae1ece4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c959154f62840f2c8de45f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:03:57 2017 +0200 wininet: Correctly handle redirects to non-http URLs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2172f5f..17a1919 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3993,7 +3993,16 @@ static WCHAR *get_redirect_url(http_request_t *request) return NULL; } + urlComponents.dwSchemeLength = 1; + b = InternetCrackUrlW(redirect_url, url_length, 0, &urlComponents); + if(b && urlComponents.dwSchemeLength && + urlComponents.nScheme != INTERNET_SCHEME_HTTP && urlComponents.nScheme != INTERNET_SCHEME_HTTPS) { + TRACE("redirect to non-http URL\n"); + return NULL; + } + urlComponents.lpszScheme = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; + urlComponents.dwSchemeLength = 0; urlComponents.lpszHostName = request->server->name; urlComponents.nPort = request->server->port; urlComponents.lpszUserName = session->userName;

1 0

Jacek Caban : wininet/tests: Added a helper for testing INTERNET_OPTION_URL.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 6d6c73863fb2cc707bab221fce992a8741026767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6c73863fb2cc707bab221fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:04:05 2017 +0200 wininet/tests: Added a helper for testing INTERNET_OPTION_URL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 441a782..c0dd3b1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -287,6 +287,19 @@ static void _test_request_flags(unsigned line, HINTERNET req, DWORD exflags, BOO ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); } +#define test_request_url(a,b) _test_request_url(__LINE__,a,b) +static void _test_request_url(unsigned line, HINTERNET req, const char *expected_url) +{ + char buf[INTERNET_MAX_URL_LENGTH]; + DWORD size = sizeof(buf); + BOOL res; + + res = InternetQueryOptionA(req, INTERNET_OPTION_URL, buf, &size); + ok_(__FILE__,line)(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(size == strlen(expected_url), "size = %u\n", size); + ok_(__FILE__,line)(!strcmp(buf, expected_url), "unexpected URL %s, expected %s\n", buf, expected_url); +} + #define test_http_version(a) _test_http_version(__LINE__,a) static void _test_http_version(unsigned line, HINTERNET req) { @@ -557,11 +570,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if (hor == 0x0) goto abort; test_request_flags(hor, INTERNET_REQFLAG_NO_HEADERS); - - length = sizeof(buffer); - res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); - ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, test->url), "Wrong URL %s, expected %s\n", buffer, test->url); + test_request_url(hor, test->url); length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); @@ -722,10 +731,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(wbuffer[length2+1] == 0x7777, "Expected 0x7777, got %04X\n", wbuffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); - length = sizeof(buffer); - res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); - ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, test->redirected_url), "Wrong URL %s\n", buffer); + test_request_url(hor, test->redirected_url); index = 0; length = 0; @@ -3023,11 +3029,7 @@ static void test_header_override(int port) ok(!ret, "HttpQueryInfo succeeded\n"); ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); - size = sizeof(buffer) - 1; - memset(buffer, 0, sizeof(buffer)); - ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); - ok(ret, "InternetQueryOption failed\n"); - ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + test_request_url(req, full_url); ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); ok(ret, "HttpAddRequestHeaders failed\n"); @@ -3038,11 +3040,7 @@ static void test_header_override(int port) ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); ok(ret, "HttpQueryInfo failed\n"); - size = sizeof(buffer) - 1; - memset(buffer, 0, sizeof(buffer)); - ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); - ok(ret, "InternetQueryOption failed\n"); - ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + test_request_url(req, full_url); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); @@ -6436,7 +6434,7 @@ static void test_InternetCloseHandle(void) len = sizeof(flags); res = InternetQueryOptionA(closetest_req, INTERNET_OPTION_REQUEST_FLAGS, &flags, &len); ok(!res && GetLastError() == ERROR_INVALID_HANDLE, - "InternetQueryOptionA(%p INTERNET_OPTION_URL) failed: %x %u, expected TRUE ERROR_INVALID_HANDLE\n", + "InternetQueryOptionA(%p INTERNET_OPTION_REQUEST_FLAGS) failed: %x %u, expected TRUE ERROR_INVALID_HANDLE\n", closetest_req, res, GetLastError()); }

1 0

Jacek Caban : wininet/tests: Create events once for all tests.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 74beb8236d31fbec062009c42b7ccc201d79cf22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74beb8236d31fbec062009c42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:04:21 2017 +0200 wininet/tests: Create events once for all tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 198 ++++++++++++++++++++++------------------------ 1 file changed, 95 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74beb8236d31fbec06200…

1 0

Jacek Caban : wininet/tests: Introduce open_socket_request helper.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 71ae1923d97bc6ae08664fc1d845077d4e5d543b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ae1923d97bc6ae08664fc1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:04:38 2017 +0200 wininet/tests: Introduce open_socket_request helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8d6a041..249658a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -109,7 +109,7 @@ static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; static const char *status_string[MAX_INTERNET_STATUS]; -static HANDLE complete_event, conn_close_event, conn_wait_event, server_req_rec_event; +static HANDLE complete_event, conn_close_event, conn_wait_event, server_req_rec_event, request_sent_event; static DWORD req_error; static BOOL is_ie7plus = TRUE; @@ -201,6 +201,7 @@ static void init_events(void) conn_close_event = CreateEventW(NULL, FALSE, FALSE, NULL); conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); + request_sent_event = CreateEventW(NULL, FALSE, FALSE, NULL); } static void free_events(void) @@ -209,6 +210,7 @@ static void free_events(void) CloseHandle(conn_close_event); CloseHandle(conn_wait_event); CloseHandle(server_req_rec_event); + CloseHandle(request_sent_event); } static void reset_events(void) @@ -217,6 +219,7 @@ static void reset_events(void) ResetEvent(conn_close_event); ResetEvent(conn_wait_event); ResetEvent(server_req_rec_event); + ResetEvent(request_sent_event); } #define test_status_code(a,b) _test_status_code(__LINE__,a,b, FALSE) @@ -4573,12 +4576,16 @@ static void WINAPI readex_callback(HINTERNET handle, DWORD_PTR context, DWORD st callback(handle, context, status, info, info_size); received_response_size = *(DWORD*)info; break; + case INTERNET_STATUS_REQUEST_SENT: + callback(handle, context, status, info, info_size); + SetEvent(request_sent_event); + break; default: callback(handle, context, status, info, info_size); } } -static void open_read_test_request(int port, test_request_t *req, const char *response) +static void open_socket_request(int port, test_request_t *req) { BOOL ret; @@ -4613,12 +4620,22 @@ static void open_read_test_request(int port, test_request_t *req, const char *re ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError()); WaitForSingleObject(server_req_rec_event, INFINITE); + WaitForSingleObject(request_sent_event, INFINITE); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); +} + +static void open_read_test_request(int port, test_request_t *req, const char *response) +{ + if(!skip_receive_notification_tests) + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + + open_socket_request(port, req); if(!skip_receive_notification_tests) { SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); @@ -4635,7 +4652,6 @@ static void open_read_test_request(int port, test_request_t *req, const char *re todo_wine ok(received_response_size == strlen(response), "received_response_size = %u\n", received_response_size); } - CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); }

1 0

Jacek Caban : wininet/tests: Added redirection tests using test server.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 23e78c01afea3e406a3728fe6d75cbdc96d601f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e78c01afea3e406a3728fe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:04:46 2017 +0200 wininet/tests: Added redirection tests using test server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 249658a..ddc1137 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4561,6 +4561,11 @@ static void server_send_string(const char *msg) send(server_socket, msg, strlen(msg), 0); } +static size_t server_read_data(char *buf, size_t buf_size) +{ + return recv(server_socket, buf, buf_size, 0); +} + static BOOL skip_receive_notification_tests; static DWORD received_response_size; @@ -5152,6 +5157,98 @@ static void test_long_url(int port) close_request(&req); } +static void test_redirect(int port) +{ + char buf[4000], *p, expect_url[INTERNET_MAX_URL_LENGTH]; + INTERNET_BUFFERSW ib; + test_request_t req; + size_t size; + + if(!is_ie7plus) + return; + + skip_receive_notification_tests = TRUE; + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + trace("Testing redirection...\n"); + + open_socket_request(port, &req); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_EXPECT(INTERNET_STATUS_REDIRECT); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: test_redirection\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + size = server_read_data(buf, sizeof(buf)); + buf[size] = 0; + p = strstr(buf, "\r\n"); + if(p) *p = 0; + ok(p && !strcmp(buf, "GET /test_redirection HTTP/1.1"), "unexpected request %s\n", buf); + + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + + sprintf(expect_url, "http://localhost:%u/test_redirection", port); + test_request_url(req.request, expect_url); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 3\r\n" + "\r\n" + "xxx"); + + WaitForSingleObject(complete_event, INFINITE); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + test_status_code(req.request, 200); + + close_connection(); + close_async_handle(req.session, 2); + + trace("Test redirect to non-http URL...\n"); + + open_socket_request(port, &req); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: test:non:http/url\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + WaitForSingleObject(complete_event, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + sprintf(expect_url, "http://localhost:%u/socket", port); + test_request_url(req.request, expect_url); + test_status_code(req.request, 302); + + close_connection(); + close_async_handle(req.session, 2); + + skip_receive_notification_tests = FALSE; +} + static void test_remove_dot_segments(int port) { test_request_t req; @@ -5218,6 +5315,7 @@ static void test_http_connection(void) test_http_read(si.port); test_connection_break(si.port); test_long_url(si.port); + test_redirect(si.port); test_remove_dot_segments(si.port); /* send the basic request again to shutdown the server thread */

1 0

Jacek Caban : wmp: Added IOleObject:: GetExtent and SetExtent implementation.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: a8d956b5b60759f144a863db6fb563ea8b0873b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d956b5b60759f144a863db6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:05:58 2017 +0200 wmp: Added IOleObject::GetExtent and SetExtent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 30 +++++++++++++++++++++++---- dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/oleobj.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 1 + 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 75957a4..8dcdfbd 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -457,15 +457,27 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfTyp static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if(dwDrawAspect != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + This->extent = *psizel; + return S_OK; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + + if(dwDrawAspect != DVASPECT_CONTENT) + return E_FAIL; + + *psizel = This->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, DWORD *pdwConnection) @@ -905,6 +917,8 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { WindowsMediaPlayer *wmp; + DWORD dpi_x, dpi_y; + HDC hdc; HRESULT hres; TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); @@ -924,6 +938,14 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, init_player_ifaces(wmp); + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + wmp->extent.cx = MulDiv(192, 2540, dpi_x); + wmp->extent.cy = MulDiv(192, 2540, dpi_y); + hres = IOleObject_QueryInterface(&wmp->IOleObject_iface, riid, ppv); IOleObject_Release(&wmp->IOleObject_iface); return hres; diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index 465b878..df770c7 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,4 +1,4 @@ TESTDLL = wmp.dll -IMPORTS = ole32 oleaut32 user32 +IMPORTS = ole32 oleaut32 user32 gdi32 C_SRCS = oleobj.c diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 971a2fe..b008af1 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -857,6 +857,56 @@ static void test_QI(IUnknown *unk) IUnknown_Release(tmp); } +static void test_extent(IOleObject *oleobj) +{ + SIZE expected, extent; + DWORD dpi_x; + DWORD dpi_y; + HDC hdc; + HRESULT hres; + + /* default aspect ratio is 96dpi / 96dpi */ + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + if (dpi_x != 96 || dpi_y != 96) + trace("dpi: %d / %d\n", dpi_y, dpi_y); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + expected.cx = MulDiv(192, 2540, dpi_x); + expected.cy = MulDiv(192, 2540, dpi_y); + ok(extent.cx == expected.cx && extent.cy == expected.cy, "size = {%d %d} (expected %d %d)\n", + extent.cx, extent.cy, expected.cx, expected.cy ); + + extent.cx = 800; + extent.cy = 700; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + extent.cx = extent.cy = 0xdeadbeef; + hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); + ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(extent.cx == 800 && extent.cy == 700, "size = {%d %d}\n", extent.cx, extent.cy); + + hres = IOleObject_GetExtent(oleobj, 0, &extent); + ok(hres == E_FAIL, "GetExtent failed: %08x\n", hres); + hres = IOleObject_GetExtent(oleobj, 7, &extent); + ok(hres == E_FAIL, "GetExtent failed: %08x\n", hres); + + extent.cx = 900; + extent.cy = 800; + hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &expected); + ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + + hres = IOleObject_SetExtent(oleobj, 0, &expected); + ok(hres == DV_E_DVASPECT, "SetExtent failed: %08x\n", hres); + hres = IOleObject_SetExtent(oleobj, 7, &expected); + ok(hres == DV_E_DVASPECT, "SetExtent failed: %08x\n", hres); +} + static void test_wmp(void) { IProvideClassInfo2 *class_info; @@ -902,6 +952,7 @@ static void test_wmp(void) IProvideClassInfo2_Release(class_info); test_QI((IUnknown*)oleobj); + test_extent(oleobj); hres = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &misc_status); ok(hres == S_OK, "GetMiscStatus failed: %08x\n", hres); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index a44aa35..7b7f51c 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -36,6 +36,7 @@ struct WindowsMediaPlayer { IOleClientSite *client_site; HWND hwnd; + SIZEL extent; }; void init_player_ifaces(WindowsMediaPlayer*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : rpcrt4: Store server thread handle in RpcServerProtseq.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 5c81f8295e379bf09b51466eb387b6df9c9d70bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c81f8295e379bf09b51466eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 17:30:10 2017 +0200 rpcrt4: Store server thread handle in RpcServerProtseq. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 37 ++++++++++++++++++------------------- dlls/rpcrt4/rpc_server.h | 4 ++-- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index dcfac70..d8225f3 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -669,21 +669,26 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) { /* cleanup */ cps->ops->free_wait_array(cps, objs); - - EnterCriticalSection(&cps->cs); - LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) - RPCRT4_CloseConnection(conn); - LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) - rpcrt4_conn_close_read(conn); - LeaveCriticalSection(&cps->cs); - - if (res == 0 && !std_listen) - SetEvent(cps->server_ready_event); break; } else if (res == 0) set_ready_event = TRUE; } + + EnterCriticalSection(&cps->cs); + LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) + RPCRT4_CloseConnection(conn); + LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) + rpcrt4_conn_close_read(conn); + LeaveCriticalSection(&cps->cs); + + if (res == 0 && !std_listen) + SetEvent(cps->server_ready_event); + + EnterCriticalSection(&listen_cs); + CloseHandle(cps->server_thread); + cps->server_thread = NULL; + LeaveCriticalSection(&listen_cs); return 0; } @@ -707,21 +712,15 @@ static void RPCRT4_sync_with_server_thread(RpcServerProtseq *ps) static RPC_STATUS RPCRT4_start_listen_protseq(RpcServerProtseq *ps, BOOL auto_listen) { RPC_STATUS status = RPC_S_OK; - HANDLE server_thread; EnterCriticalSection(&listen_cs); - if (ps->is_listening) goto done; + if (ps->server_thread) goto done; if (!ps->mgr_mutex) ps->mgr_mutex = CreateMutexW(NULL, FALSE, NULL); if (!ps->server_ready_event) ps->server_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, ps, 0, NULL); - if (!server_thread) - { + ps->server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, ps, 0, NULL); + if (!ps->server_thread) status = RPC_S_OUT_OF_RESOURCES; - goto done; - } - ps->is_listening = TRUE; - CloseHandle(server_thread); done: LeaveCriticalSection(&listen_cs); diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index 130dde7..5e04365 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -37,8 +37,8 @@ typedef struct _RpcServerProtseq struct list connections; /* CS cs */ CRITICAL_SECTION cs; - /* is the server currently listening? */ - BOOL is_listening; /* CS ::listen_cs */ + /* handle to listening thread */ + HANDLE server_thread; /* CS ::listen_cs */ /* mutex for ensuring only one thread can change state at a time */ HANDLE mgr_mutex; /* set when server thread has finished opening connections */

1 0

Jacek Caban : rpcrt4: Store listening pipe name in RpcConnection_np.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 5c2083fd22d252c1d1c082d5852d76a2aaf11436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2083fd22d252c1d1c082d58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 17:30:23 2017 +0200 rpcrt4: Store listening pipe name in RpcConnection_np. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 61 +++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e2fbbfd..ca33c3e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -67,6 +67,7 @@ typedef struct _RpcConnection_np RpcConnection common; HANDLE pipe; HANDLE listen_event; + char *listen_pipe; IO_STATUS_BLOCK io_status; HANDLE event_cache; BOOL read_closed; @@ -91,26 +92,26 @@ static void release_np_event(RpcConnection_np *connection, HANDLE event) CloseHandle(event); } -static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) +static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *conn) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - TRACE("listening on %s\n", pname); - - npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, - PIPE_UNLIMITED_INSTANCES, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); - if (npc->pipe == INVALID_HANDLE_VALUE) { - WARN("CreateNamedPipe failed with error %d\n", GetLastError()); - if (GetLastError() == ERROR_FILE_EXISTS) - return RPC_S_DUPLICATE_ENDPOINT; - else - return RPC_S_CANT_CREATE_ENDPOINT; - } + RpcConnection_np *connection = (RpcConnection_np *) conn; - /* Note: we don't call ConnectNamedPipe here because it must be done in the - * server thread as the thread must be alertable */ - return RPC_S_OK; + TRACE("listening on %s\n", connection->listen_pipe); + + connection->pipe = CreateNamedPipeA(connection->listen_pipe, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, + PIPE_UNLIMITED_INSTANCES, + RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); + if (connection->pipe == INVALID_HANDLE_VALUE) + { + WARN("CreateNamedPipe failed with error %d\n", GetLastError()); + if (GetLastError() == ERROR_FILE_EXISTS) + return RPC_S_DUPLICATE_ENDPOINT; + else + return RPC_S_CANT_CREATE_ENDPOINT; + } + + return RPC_S_OK; } static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, BOOL wait) @@ -203,7 +204,6 @@ static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, const char *endpoint) { RPC_STATUS r; - LPSTR pname; RpcConnection *Connection; char generated_endpoint[22]; @@ -222,9 +222,8 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq if (r != RPC_S_OK) return r; - pname = ncalrpc_pipe_name(Connection->Endpoint); - r = rpcrt4_conn_create_pipe(Connection, pname); - I_RpcFree(pname); + ((RpcConnection_np*)Connection)->listen_pipe = ncalrpc_pipe_name(Connection->Endpoint); + r = rpcrt4_conn_create_pipe(Connection); EnterCriticalSection(&protseq->cs); list_add_head(&protseq->listeners, &Connection->protseq_entry); @@ -265,7 +264,6 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { RPC_STATUS r; - LPSTR pname; RpcConnection *Connection; char generated_endpoint[26]; @@ -284,9 +282,8 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse if (r != RPC_S_OK) return r; - pname = ncacn_pipe_name(Connection->Endpoint); - r = rpcrt4_conn_create_pipe(Connection, pname); - I_RpcFree(pname); + ((RpcConnection_np*)Connection)->listen_pipe = ncacn_pipe_name(Connection->Endpoint); + r = rpcrt4_conn_create_pipe(Connection); EnterCriticalSection(&protseq->cs); list_add_head(&protseq->listeners, &Connection->protseq_entry); @@ -310,13 +307,9 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection { DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; - LPSTR pname; rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - - pname = ncacn_pipe_name(old_conn->Endpoint); - status = rpcrt4_conn_create_pipe(old_conn, pname); - I_RpcFree(pname); + status = rpcrt4_conn_create_pipe(old_conn); /* Store the local computer name as the NetworkAddr for ncacn_np as long as * we don't support named pipes over the network. */ @@ -361,15 +354,11 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection { DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; - LPSTR pname; TRACE("%s\n", old_conn->Endpoint); rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - - pname = ncalrpc_pipe_name(old_conn->Endpoint); - status = rpcrt4_conn_create_pipe(old_conn, pname); - I_RpcFree(pname); + status = rpcrt4_conn_create_pipe(old_conn); /* Store the local computer name as the NetworkAddr for ncalrpc. */ new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len);

1 0

Jacek Caban : rpcrt4: Recreate listening pipe in rpcrt4_protseq_np_get_wait_array if needed.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 10a6b33a93cd4ea33032077b8e0753ef61ea88ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a6b33a93cd4ea33032077b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 17:30:29 2017 +0200 rpcrt4: Recreate listening pipe in rpcrt4_protseq_np_get_wait_array if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ca33c3e..367bf2c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -655,6 +655,8 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_np, common.protseq_entry) { + if (!conn->pipe && rpcrt4_conn_create_pipe(&conn->common) != RPC_S_OK) + continue; if (!conn->listen_event) { NTSTATUS status;

1 0

Jacek Caban : rpcrt4: Wait for all active connections to be released before quiting server thread.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: e98c7a59c26bdff7bad27e5864ee7f7ed8313a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98c7a59c26bdff7bad27e586… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 17:30:40 2017 +0200 rpcrt4: Wait for all active connections to be released before quiting server thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 3 +++ dlls/rpcrt4/rpc_server.c | 18 ++++++++++++++++++ dlls/rpcrt4/rpc_transport.c | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index affc060..a679b0e 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -63,6 +63,7 @@ typedef struct _RpcConnection { LONG ref; BOOL server; + HANDLE wait_release; LPSTR NetworkAddr; LPSTR Endpoint; LPWSTR NetworkOptions; @@ -176,6 +177,8 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) DECLSPEC_HIDDEN; +void rpcrt4_conn_release_and_wait(RpcConnection *connection) DECLSPEC_HIDDEN; + static inline const char *rpcrt4_conn_get_name(const RpcConnection *Connection) { return Connection->ops->name; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d8225f3..bd47de6 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -675,20 +675,38 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) set_ready_event = TRUE; } + TRACE("closing connections\n"); + EnterCriticalSection(&cps->cs); LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) RPCRT4_CloseConnection(conn); LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) + { + RPCRT4_GrabConnection(conn); rpcrt4_conn_close_read(conn); + } LeaveCriticalSection(&cps->cs); if (res == 0 && !std_listen) SetEvent(cps->server_ready_event); + TRACE("waiting for active connections to close\n"); + + EnterCriticalSection(&cps->cs); + while (!list_empty(&cps->connections)) + { + conn = LIST_ENTRY(list_head(&cps->connections), RpcConnection, protseq_entry); + LeaveCriticalSection(&cps->cs); + rpcrt4_conn_release_and_wait(conn); + EnterCriticalSection(&cps->cs); + } + LeaveCriticalSection(&cps->cs); + EnterCriticalSection(&listen_cs); CloseHandle(cps->server_thread); cps->server_thread = NULL; LeaveCriticalSection(&listen_cs); + TRACE("done\n"); return 0; } diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 367bf2c..0ae7125 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3357,6 +3357,22 @@ static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection) return connection; } +void rpcrt4_conn_release_and_wait(RpcConnection *connection) +{ + HANDLE event = NULL; + + if (connection->ref > 1) + event = connection->wait_release = CreateEventW(NULL, TRUE, FALSE, NULL); + + RPCRT4_ReleaseConnection(connection); + + if(event) + { + WaitForSingleObject(event, INFINITE); + CloseHandle(event); + } +} + RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) { InterlockedIncrement( &conn->ref ); @@ -3387,6 +3403,8 @@ RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) LeaveCriticalSection(&Connection->protseq->cs); } + if (Connection->wait_release) SetEvent(Connection->wait_release); + HeapFree(GetProcessHeap(), 0, Connection); return RPC_S_OK; }

1 0