- Wine-Devel - list.winehq.org

[PATCH v2 2/3] msado15/tests: Add tests for IConnectionPoint::Advise/Unadvise.
by Aaro Altonen June 16, 2020

June 16, 2020

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 172 +++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 59c00948c8..3e3997ed41 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -837,10 +837,141 @@ static void test_Command(void) _Command_Release( command ); } +static HRESULT WINAPI conneventvt_QueryInterface( ConnectionEventsVt *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( &IID_ConnectionEventsVt, riid )) + { + *obj = iface; + return S_OK; + } + + ok( 0, "unexpected call\n" ); + return E_NOINTERFACE; +} + +static ULONG WINAPI conneventvt_AddRef( ConnectionEventsVt *iface ) +{ + return 2; +} + +static ULONG WINAPI conneventvt_Release( ConnectionEventsVt *iface ) +{ + return 1; +} + +static HRESULT WINAPI conneventvt_InfoMessage( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *Connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_BeginTransComplete( ConnectionEventsVt *iface, LONG TransactionLevel, + Error *error, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_CommitTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_RollbackTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillExecute( ConnectionEventsVt *iface, BSTR *source, + CursorTypeEnum *cursor_type, LockTypeEnum *lock_type, LONG *options, EventStatusEnum *status, + _Command *command, _Recordset *record_set, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ExecuteComplete( ConnectionEventsVt *iface, LONG records_affected, + Error *error, EventStatusEnum *status, _Command *command, _Recordset *record_set, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillConnect( ConnectionEventsVt *iface, BSTR *string, BSTR *userid, + BSTR *password, LONG *options, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ConnectComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_Disconnect( ConnectionEventsVt *iface, EventStatusEnum *status, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static const ConnectionEventsVtVtbl conneventvt_vtbl = { + conneventvt_QueryInterface, + conneventvt_AddRef, + conneventvt_Release, + conneventvt_InfoMessage, + conneventvt_BeginTransComplete, + conneventvt_CommitTransComplete, + conneventvt_RollbackTransComplete, + conneventvt_WillExecute, + conneventvt_ExecuteComplete, + conneventvt_WillConnect, + conneventvt_ConnectComplete, + conneventvt_Disconnect +}; + +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( &IID_ISupportErrorInfo, riid )) + { + *obj = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + return 2; +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + return 1; +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + return E_NOTIMPL; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + +static ConnectionEventsVt conn_event_sink = { &conneventvt_vtbl }; +static ISupportErrorInfo support_err_sink = { &support_error_vtbl }; + static void test_ConnectionPoint(void) { HRESULT hr; ULONG refs; + DWORD cookie; IConnectionPoint *point; IConnectionPointContainer *pointcontainer; @@ -856,6 +987,47 @@ static void test_ConnectionPoint(void) hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); ok( hr == S_OK, "got %08x\n", hr ); +todo_wine { + /* nothing advised yet */ + hr = IConnectionPoint_Unadvise( point, 3 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, NULL, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, (void*)&conn_event_sink, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, NULL, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); +} + ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); + +todo_wine { + /* unsupported sink */ + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); + ok( !cookie, "got %08x\n", cookie ); + + cookie = 0; + hr = IConnectionPoint_Advise( point, (void*)&conn_event_sink, &cookie ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cookie, "got %08x\n", cookie ); + + /* invalid cookie */ + hr = IConnectionPoint_Unadvise( point, 0 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + /* wrong cookie */ + hr = IConnectionPoint_Unadvise( point, cookie + 1 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( point, cookie ); + ok( hr == S_OK, "got %08x\n", hr ); +} + refs = IConnectionPoint_Release( point ); ok( refs == 1, "got %u", refs ); -- 2.27.0

1 0

[PATCH v2 1/3] include: Add ConnectionEventsVt definition.
by Aaro Altonen June 16, 2020

June 16, 2020

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- include/msado15_backcompat.idl | 65 ++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index 5ea9f51c1f..362f699b08 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -47,6 +47,7 @@ interface Property; interface Recordset15; interface Recordset20; interface Recordset21; +interface ConnectionEventsVt; dispinterface ConnectionEvents; dispinterface RecordsetEvents; @@ -1581,6 +1582,70 @@ interface _Command : Command25 [out, retval] VARIANT_BOOL *named_parameters); }; +[ + uuid(00000402-0000-0010-8000-00aa006d2ea4), + odl, + hidden +] +interface ConnectionEventsVt : IUnknown +{ + HRESULT InfoMessage( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *Connection); + + HRESULT BeginTransComplete( + [in] LONG TransactionLevel, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT CommitTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT RollbackTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT WillExecute( + [in, out] BSTR *source, + [in, out] CursorTypeEnum *cursor_type, + [in, out] LockTypeEnum *lock_type, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT ExecuteComplete( + [in] LONG records_affected, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT WillConnect( + [in, out] BSTR *string, + [in, out] BSTR *userid, + [in, out] BSTR *password, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT ConnectComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT Disconnect( + [in, out] EventStatusEnum *status, + [in] _Connection *connection); +}; + [ uuid(00000400-0000-0010-8000-00aa006d2ea4) ] -- 2.27.0

1 0

[PATCH] winhttp/tests: Add WebSocket tests.
by Hans Leidekker June 16, 2020

June 16, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Don't test crypt functions. Test all WebSocket headers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 215 +++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ab91940ebb..f08f50b9a9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -37,6 +37,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); + static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -2205,6 +2207,12 @@ static const char passportauth[] = "WWW-Authenticate: Passport1.4\r\n" "\r\n"; +static const char switchprotocols[] = +"HTTP/1.1 101 Switching Protocols\r\n" +"Server: winetest\r\n" +"Upgrade: websocket\r\n" +"Connection: Upgrade\r\n"; + static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; static const char auth_unseen[] = "Auth Unseen"; @@ -2217,6 +2225,31 @@ struct server_info #define BIG_BUFFER_LEN 0x2250 +static void create_websocket_accept(const char *key, char *buf, unsigned int buflen) +{ + HCRYPTPROV provider; + HCRYPTHASH hash; + BYTE sha1[20]; + char data[128]; + DWORD len; + + strcpy(data, key); + strcat(data, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"); + + CryptAcquireContextW(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + CryptCreateHash(provider, CALG_SHA1, 0, 0, &hash); + CryptHashData(hash, (BYTE *)data, strlen(data), 0); + + len = sizeof(sha1); + CryptGetHashParam(hash, HP_HASHVAL, sha1, &len, 0); + CryptDestroyHash(hash); + CryptReleaseContext(provider, 0); + + buf[0] = 0; + len = buflen; + CryptBinaryToStringA( (BYTE *)sha1, sizeof(sha1), CRYPT_STRING_BASE64, buf, &len); +} + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -2388,6 +2421,29 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, passportauth, sizeof(passportauth) - 1, 0); } + else if (strstr(buffer, "GET /websocket")) + { + char headers[256], key[32], accept[64]; + const char *pos = strstr(buffer, "Sec-WebSocket-Key: "); + if (pos && strstr(buffer, "Connection: Upgrade\r\n") && + (strstr(buffer, "Upgrade: websocket\r\n") || strstr(buffer, "Upgrade: Websocket\r\n")) && + strstr(buffer, "Host: ") && strstr(buffer, "Sec-WebSocket-Version: 13\r\n")) + { + memcpy(headers, switchprotocols, sizeof(switchprotocols)); + memcpy(key, pos + 19, 24); + key[24] = 0; + + create_websocket_accept(key, accept, sizeof(accept)); + + strcat(headers, "Sec-WebSocket-Accept: "); + strcat(headers, accept); + strcat(headers, "\r\n\r\n"); + + send(c, headers, strlen(headers), 0); + } + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + continue; + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3039,6 +3095,161 @@ static void test_head_request(int port) WinHttpCloseHandle(ses); } +static void test_websocket(int port) +{ + HINTERNET session, connection, request, socket; + DWORD size, len, count, status, index, error; + WCHAR header[32]; + char buf[128]; + BOOL ret; + + if (!pWinHttpWebSocketCompleteUpgrade) + { + win_skip("WinHttpWebSocketCompleteUpgrade not supported\n"); + return; + } + + session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); + ok(session != NULL, "got %u\n", GetLastError()); + + connection = WinHttpConnect(session, L"localhost", port, 0); + ok(connection != NULL, "got %u\n", GetLastError()); + + request = WinHttpOpenRequest(connection, L"GET", L"/websocket", NULL, NULL, NULL, 0); + ok(request != NULL, "got %u\n", GetLastError()); + + ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); + todo_wine ok(ret, "got %u\n", GetLastError()); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + index = 0; + size = sizeof(buf); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Key", buf, &size, &index); + error = GetLastError(); + ok(!ret, "success\n"); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + + index = 0; + size = sizeof(buf); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Version", buf, &size, &index); + error = GetLastError(); + ok(!ret, "success\n"); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + + ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); + ok(ret, "got %u\n", GetLastError()); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + index = 0; + buf[0] = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Key", buf, &size, &index); + todo_wine ok(ret, "got %u\n", GetLastError()); + + index = 0; + buf[0] = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Version", buf, &size, &index); + todo_wine ok(ret, "got %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(request, NULL); + todo_wine ok(ret, "got %u\n", GetLastError()); + + count = 0xdeadbeef; + ret = WinHttpQueryDataAvailable(request, &count); + ok(ret, "got %u\n", GetLastError()); + todo_wine ok(!count, "got %u\n", count); + + header[0] = 0; + size = sizeof(header); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); + todo_wine ok(ret, "got %u\n", GetLastError()); + todo_wine ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); + + header[0] = 0; + size = sizeof(header); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); + todo_wine ok(ret, "got %u\n", GetLastError()); + todo_wine ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, + &size, NULL); + ok(ret, "got %u\n", GetLastError()); + todo_wine ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + + len = 0xdeadbeef; + size = sizeof(len); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &len, + &size, 0); + ok(!ret, "success\n"); + + index = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); + todo_wine ok(ret, "got %u\n", GetLastError()); + + socket = pWinHttpWebSocketCompleteUpgrade(request, 0); + todo_wine ok(socket != NULL, "got %u\n", GetLastError()); + + header[0] = 0; + size = sizeof(header); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); + todo_wine ok(ret, "got %u\n", GetLastError()); + todo_wine ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); + + header[0] = 0; + size = sizeof(header); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); + todo_wine ok(ret, "got %u\n", GetLastError()); + todo_wine ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); + + index = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); + todo_wine ok(ret, "got %u\n", GetLastError()); + + /* Send/Receive on websock */ + + WinHttpCloseHandle(request); + WinHttpCloseHandle(socket); + WinHttpCloseHandle(connection); + WinHttpCloseHandle(session); +} + static void test_not_modified(int port) { BOOL ret; @@ -4710,6 +4921,9 @@ START_TEST (winhttp) struct server_info si; HANDLE thread; DWORD ret; + HMODULE mod = GetModuleHandleA("winhttp.dll"); + + pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); test_WinHttpOpenRequest(); test_WinHttpSendRequest(); @@ -4759,6 +4973,7 @@ START_TEST (winhttp) test_cookies(si.port); test_request_path_escapes(si.port); test_passport_auth(si.port); + test_websocket(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, L"/quit"); -- 2.20.1

1 0

[PATCH 3/3] msado15: Implement IConnectionPoint::Advise/Unadvise.
by Aaro Altonen June 16, 2020

June 16, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49388 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msado15/connection.c | 56 +++++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 4 --- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 35202d14aa..caca9cd298 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -40,6 +40,8 @@ struct connection_point IConnectionPoint IConnectionPoint_iface; struct connection *conn; const IID *riid; + IUnknown **sinks; + ULONG sinks_size; }; struct connection @@ -87,6 +89,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + heap_free( connection->cp_connev.sinks ); heap_free( connection->datasource ); heap_free( connection ); } @@ -548,15 +551,58 @@ static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_s DWORD *cookie ) { struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); - return E_NOTIMPL; + IUnknown *sink; + HRESULT hr; + DWORD i; + + TRACE( "%p, %p, %u\n", iface, unk_sink, cookie ); + + if (!unk_sink || !cookie) return E_FAIL; + + if (FAILED(hr = IUnknown_QueryInterface( unk_sink, &IID_ConnectionEventsVt, (void**)&sink ))) + { + *cookie = 0; + return E_FAIL; + } + + if (connpoint->sinks) + { + for (i = 0; i < connpoint->sinks_size; ++i) + { + if (!connpoint->sinks[i]) + break; + } + + if (i == connpoint->sinks_size) + { + connpoint->sinks_size *= 2; + connpoint->sinks = heap_realloc_zero( connpoint->sinks, + connpoint->sinks_size * sizeof(*connpoint->sinks) ); + } + } + else + { + connpoint->sinks_size = 1; + connpoint->sinks = heap_alloc_zero( sizeof(*connpoint->sinks) ); + i = 0; + } + + connpoint->sinks[i] = sink; + *cookie = i + 1; + return S_OK; } static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) { struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %d\n", connpoint, cookie ); - return E_NOTIMPL; + TRACE( "%p, %u\n", connpoint, cookie ); + + if (!cookie || cookie > connpoint->sinks_size || !connpoint->sinks || !connpoint->sinks[cookie - 1]) + return E_FAIL; + + IUnknown_Release( connpoint->sinks[cookie - 1] ); + connpoint->sinks[cookie - 1] = NULL; + return S_OK; } static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, @@ -595,6 +641,8 @@ HRESULT Connection_create( void **obj ) connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + connection->cp_connev.sinks = NULL; + connection->cp_connev.sinks_size = 0; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 3e3997ed41..5f43307af7 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -987,7 +987,6 @@ static void test_ConnectionPoint(void) hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); ok( hr == S_OK, "got %08x\n", hr ); -todo_wine { /* nothing advised yet */ hr = IConnectionPoint_Unadvise( point, 3 ); ok( hr == E_FAIL, "got %08x\n", hr ); @@ -1001,10 +1000,8 @@ todo_wine { cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, NULL, &cookie ); ok( hr == E_FAIL, "got %08x\n", hr ); -} ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); -todo_wine { /* unsupported sink */ cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); @@ -1026,7 +1023,6 @@ todo_wine { hr = IConnectionPoint_Unadvise( point, cookie ); ok( hr == S_OK, "got %08x\n", hr ); -} refs = IConnectionPoint_Release( point ); ok( refs == 1, "got %u", refs ); -- 2.27.0

2 1

[PATCH] wshom.ocx: Expand environment string before executing command through CreateProcessW
by Porot Mo June 16, 2020

June 16, 2020

Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- dlls/wshom.ocx/shell.c | 11 ++++++++++- dlls/wshom.ocx/tests/wshom.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)

1 0

[PATCH v2] d3dx9: Implement ID3DXSkinInfo_Clone.
by Gijs Vermeulen June 16, 2020

June 16, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48779 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- v2: fix leak on error, thanks Nikolay dlls/d3dx9_36/skin.c | 28 +++++++++++++++++-- dlls/d3dx9_36/tests/mesh.c | 55 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 2c10260e2a..99be6ca8e4 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -298,9 +298,33 @@ static D3DXMATRIX * WINAPI d3dx9_skin_info_GetBoneOffsetMatrix(ID3DXSkinInfo *if static HRESULT WINAPI d3dx9_skin_info_Clone(ID3DXSkinInfo *iface, ID3DXSkinInfo **skin_info) { - FIXME("iface %p, skin_info %p stub!\n", iface, skin_info); + struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); + HRESULT hr; + DWORD i; - return E_NOTIMPL; + TRACE("iface %p, skin_info %p.\n", iface, skin_info); + + if (FAILED(hr = D3DXCreateSkinInfo(skin->num_vertices, skin->vertex_declaration, skin->num_bones, skin_info))) + return hr; + + for (i = 0; i < skin->num_bones; ++i) + { + struct bone *current_bone = &skin->bones[i]; + + if (current_bone->name && FAILED(hr = (*skin_info)->lpVtbl->SetBoneName(*skin_info, i, current_bone->name))) + break; + if (&current_bone->transform + && FAILED(hr = (*skin_info)->lpVtbl->SetBoneOffsetMatrix(*skin_info, i, &current_bone->transform))) + break; + if (current_bone->vertices && current_bone->weights + && FAILED(hr = (*skin_info)->lpVtbl->SetBoneInfluence(*skin_info, i, current_bone->num_influences, + current_bone->vertices, current_bone->weights))) + break; + } + + if (FAILED(hr)) (*skin_info)->lpVtbl->Release(*skin_info); + + return D3D_OK; } static HRESULT WINAPI d3dx9_skin_info_Remap(ID3DXSkinInfo *iface, DWORD num_vertices, DWORD *vertex_remap) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 81f902291d..cc2f158888 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4990,6 +4990,7 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); if (skininfo) { + ID3DXSkinInfo *clone = NULL; DWORD dword_result; float flt_result; const char *string_result; @@ -5023,6 +5024,10 @@ static void test_create_skin_info(void) transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, -1); ok(transform == NULL, "Expected NULL, got %p\n", transform); + hr = skininfo->lpVtbl->Clone(skininfo, &clone); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + IUnknown_Release(clone); + { /* test [GS]etBoneOffsetMatrix */ hr = skininfo->lpVtbl->SetBoneOffsetMatrix(skininfo, 1, &identity_matrix); @@ -5139,6 +5144,9 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ok(vertices[0] == 0xdeadbeef, "expected vertex 0xdeadbeef, got %u\n", vertices[0]); ok(weights[0] == FLT_MAX, "expected weight %g, got %g\n", FLT_MAX, weights[0]); + + hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 0, num_influences, exp_vertices, exp_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); } { @@ -5182,6 +5190,53 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); compare_elements(declaration_out, declaration_in, __LINE__, 0); } + + { + /* test Clone */ + D3DVERTEXELEMENT9 got_declaration[MAX_FVF_DECL_SIZE]; + DWORD exp_vertices[2], got_vertices[2]; + FLOAT exp_weights[2], got_weights[2]; + const char *exp_string, *got_string; + DWORD exp_fvf, got_fvf; + int i; + + hr = skininfo->lpVtbl->Clone(skininfo, NULL); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + clone = NULL; + hr = skininfo->lpVtbl->Clone(skininfo, &clone); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + + hr = clone->lpVtbl->GetDeclaration(clone, got_declaration); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + compare_elements(got_declaration, declaration_out, __LINE__, 0); + + hr = D3DXFVFFromDeclarator(declaration_out, &exp_fvf); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + got_fvf = clone->lpVtbl->GetFVF(clone); + ok(got_fvf == exp_fvf, "Expected %#x, got %#x\n", exp_fvf, got_fvf); + + exp_string = skininfo->lpVtbl->GetBoneName(skininfo, 0); + got_string = clone->lpVtbl->GetBoneName(clone, 0); + ok(!strcmp(got_string, exp_string), "Expected '%s', got '%s'\n", exp_string, got_string); + + transform = clone->lpVtbl->GetBoneOffsetMatrix(clone, 0); + check_matrix(transform, &identity_matrix); + + hr = skininfo->lpVtbl->GetBoneInfluence(skininfo, 0, exp_vertices, exp_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + hr = clone->lpVtbl->GetBoneInfluence(clone, 0, got_vertices, got_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + + for (i = 0; i < 2; i++) { + ok(got_vertices[i] == exp_vertices[i], + "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], got_vertices[i]); + ok((isnan(got_weights[i]) && isnan(exp_weights[i])) || got_weights[i] == exp_weights[i], + "influence[%d]: expected weights %g, got %g\n", i, exp_weights[i], got_weights[i]); + } + + IUnknown_Release(clone); + } } if (skininfo) IUnknown_Release(skininfo); skininfo = NULL; -- 2.27.0

2 1

compiling wine (wow64) with opengl 1.3
by Alois Schlögl June 16, 2020

June 16, 2020

Hello, I'd like testing some cross-compile qt5 applications, in the past I was able to use wine for testing. However, recently this does not work anymore, the application runs on windows but crashes on wine (if you want, I can send details ). I suspect that recent versions of qt5 require opengl 1.3. Therefore, I'm trying to compile wine (actually wow64) from source with opengl 1.3 support, and was trying to follow the documentation [1,2]. I'm testing on debian 10 and did apt-get build-dep wine cd ../wine-source/dlls/opengl32 && ./make_opengl 1.3 cd ~/wine-dirs/build64 make distclean ../wine-source/configure --enable-win64 make Configuration complains about the following issues: configure: MinGW compiler not found, cross-compiling PE files won't be supported. configure: libhal 64-bit development files not found, no legacy dynamic device support. configure: libusb-1.0 64-bit development files not found (or too old), USB devices won't be supported. configure: OSS sound system found but too old (OSSv4 needed), OSS won't be supported. I believe these are not relevant. However, compilation fails, the log file is attached). What I'm missing here? What is your recommendation how to address this issue? Cheers, Alois [1] https://wiki.winehq.org/Building_Wine [2] https://wiki.winehq.org/Wine_Developer%27s_Guide/Wine_and_OpenGL

4 4

[PATCH 3/3] windowscodecs: Fix MIME types of DDS decoder.
by Ziqing Hui June 16, 2020

June 16, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/tests/info.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)

2 1

[PATCH 2/3] windowscodecs/tests: Add decoder info tests for DDS decoder.
by Ziqing Hui June 16, 2020

June 16, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/info.c | 7 +++++++ 1 file changed, 7 insertions(+)

2 1

[PATCH 1/4] quartz: Try to connect all source pins when autoplugging from the registry.
by Zebediah Figura June 16, 2020

June 16, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 41 +++++++++++++-------------------- dlls/quartz/tests/filtergraph.c | 22 +++++++++--------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fa20d98981b..cb212e4961b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1327,7 +1327,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, NULL) == S_OK) { VARIANT var; - IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; @@ -1390,35 +1389,27 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IEnumPins_Next(penumpins, 1, &ppinfilter, NULL); - IEnumPins_Release(penumpins); - - if (FAILED(hr)) { - WARN("Obtaining next pin: (%x)\n", hr); - goto error; - } - if (hr == S_FALSE) { - WARN("Cannot use this filter: no pins\n"); - goto error; - } - - hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinfilter, NULL); - if (FAILED(hr)) { - TRACE("Cannot connect to filter (%x), trying next one\n", hr); - goto error; - } - TRACE("Successfully connected to filter, follow chain...\n"); - - if (SUCCEEDED(hr = connect_output_pin(This, pfilter, ppinIn))) + while (IEnumPins_Next(penumpins, 1, &pin, NULL) == S_OK) { - IPin_Release(ppinfilter); - IBaseFilter_Release(pfilter); - break; + if (SUCCEEDED(IFilterGraph2_ConnectDirect(iface, ppinOut, pin, NULL))) + { + if (SUCCEEDED(hr = connect_output_pin(This, pfilter, ppinIn))) + { + IPin_Release(pin); + IEnumPins_Release(penumpins); + IBaseFilter_Release(pfilter); + IEnumMoniker_Release(pEnumMoniker); + goto out; + } + IFilterGraph2_Disconnect(iface, pin); + IFilterGraph2_Disconnect(iface, ppinOut); + } + IPin_Release(pin); } + IEnumPins_Release(penumpins); error: VariantClear(&var); - if (ppinfilter) IPin_Release(ppinfilter); if (pfilter) { IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4f4abeac9b9..d062ea39c61 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2136,9 +2136,9 @@ static void test_graph_builder_connect(void) testfilter_init(&parser1, parser1_pins, 3); parser1.pin_count = 2; - testsink_init(&parser2_pins[0]); - testsource_init(&parser2_pins[1], &sink_type, 1); - parser2_pins[1].request_mt = &sink_type; + testsource_init(&parser2_pins[0], &sink_type, 1); + testsink_init(&parser2_pins[1]); + parser2_pins[0].request_mt = &sink_type; testfilter_init(&parser2, parser2_pins, 2); testsink_init(&parser3_pins[0]); @@ -2215,8 +2215,8 @@ static void test_graph_builder_connect(void) sink_pin.accept_mt = &sink_type; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -2227,8 +2227,8 @@ static void test_graph_builder_connect(void) { hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x for Connect() hr %#x.\n", hr, source_pin.Connect_hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -2379,9 +2379,9 @@ todo_wine hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface - || source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + || source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface - || sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + || sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -2417,8 +2417,8 @@ todo_wine hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.27.0

2 5