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

Jacek Caban : rpcrt4: Renamed connections list to listeners.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 13d529a749b061a81209589e1d6a4ab077b0f8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d529a749b061a81209589e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 17:39:14 2017 +0200 rpcrt4: Renamed connections list to listeners. To preserve the name for actual connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 10 +++++----- dlls/rpcrt4/rpc_server.h | 2 +- dlls/rpcrt4/rpc_transport.c | 20 +++++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 8c3aa0f..1327171 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -670,7 +670,7 @@ 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->connections, RpcConnection, protseq_entry) + LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) RPCRT4_CloseConnection(conn); LeaveCriticalSection(&cps->cs); @@ -804,7 +804,7 @@ static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, con RpcConnection *conn; BOOL registered = FALSE; EnterCriticalSection(&protseq->cs); - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection, protseq_entry) { + LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection, protseq_entry) { if (!endpoint || !strcmp(endpoint, conn->Endpoint)) { registered = TRUE; break; @@ -860,7 +860,7 @@ RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) count = 0; LIST_FOR_EACH_ENTRY(ps, &protseqs, RpcServerProtseq, entry) { EnterCriticalSection(&ps->cs); - LIST_FOR_EACH_ENTRY(conn, &ps->connections, RpcConnection, protseq_entry) + LIST_FOR_EACH_ENTRY(conn, &ps->listeners, RpcConnection, protseq_entry) count++; LeaveCriticalSection(&ps->cs); } @@ -873,7 +873,7 @@ RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) count = 0; LIST_FOR_EACH_ENTRY(ps, &protseqs, RpcServerProtseq, entry) { EnterCriticalSection(&ps->cs); - LIST_FOR_EACH_ENTRY(conn, &ps->connections, RpcConnection, protseq_entry) { + LIST_FOR_EACH_ENTRY(conn, &ps->listeners, RpcConnection, protseq_entry) { RPCRT4_MakeBinding((RpcBinding**)&(*BindingVector)->BindingH[count], conn); count++; @@ -945,7 +945,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->Protseq = RPCRT4_strdupA(Protseq); (*ps)->ops = ops; (*ps)->MaxCalls = 0; - list_init(&(*ps)->connections); + list_init(&(*ps)->listeners); InitializeCriticalSection(&(*ps)->cs); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); (*ps)->is_listening = FALSE; diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index 3068f0a..a3c476e 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -33,7 +33,7 @@ typedef struct _RpcServerProtseq LPSTR Protseq; /* RO */ UINT MaxCalls; /* RO */ /* list of listening connections */ - struct list connections; /* CS cs */ + struct list listeners; /* CS cs */ CRITICAL_SECTION cs; /* is the server currently listening? */ diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 37a0f6f..4a3e0c7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -226,7 +226,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq I_RpcFree(pname); EnterCriticalSection(&protseq->cs); - list_add_head(&protseq->connections, &Connection->protseq_entry); + list_add_head(&protseq->listeners, &Connection->protseq_entry); LeaveCriticalSection(&protseq->cs); return r; @@ -287,7 +287,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse I_RpcFree(pname); EnterCriticalSection(&protseq->cs); - list_add_head(&protseq->connections, &Connection->protseq_entry); + list_add_head(&protseq->listeners, &Connection->protseq_entry); LeaveCriticalSection(&protseq->cs); return r; @@ -644,7 +644,8 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p /* open and count connections */ *count = 1; - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { + LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_np, common.protseq_entry) + { if (!conn->listen_event) { NTSTATUS status; @@ -688,7 +689,8 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p objs[0] = npps->mgr_event; *count = 1; - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { + LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_np, common.protseq_entry) + { if (conn->listen_event) objs[(*count)++] = conn->listen_event; } @@ -733,7 +735,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, b_handle = objs[res - WAIT_OBJECT_0]; /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) + LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_np, common.protseq_entry) { if (b_handle == conn->listen_event) { @@ -1320,7 +1322,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr } EnterCriticalSection(&protseq->cs); - list_add_tail(&protseq->connections, &tcpc->common.protseq_entry); + list_add_tail(&protseq->listeners, &tcpc->common.protseq_entry); LeaveCriticalSection(&protseq->cs); freeaddrinfo(ai); @@ -1511,7 +1513,7 @@ static void *rpcrt4_protseq_sock_get_wait_array(RpcServerProtseq *protseq, void /* open and count connections */ *count = 1; - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_tcp, common.protseq_entry) + LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_tcp, common.protseq_entry) { if (conn->sock != -1) (*count)++; @@ -1531,7 +1533,7 @@ static void *rpcrt4_protseq_sock_get_wait_array(RpcServerProtseq *protseq, void objs[0] = sockps->mgr_event; *count = 1; - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_tcp, common.protseq_entry) + LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_tcp, common.protseq_entry) { if (conn->sock != -1) { @@ -1586,7 +1588,7 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_tcp, common.protseq_entry) + LIST_FOR_EACH_ENTRY(conn, &protseq->listeners, RpcConnection_tcp, common.protseq_entry) { if (b_handle == conn->sock_event) {

1 0

Jacek Caban : rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcConnection objects.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 812897c8ade9f62b93d98d52785bd62ed9683849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=812897c8ade9f62b93d98d527… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 17:39:20 2017 +0200 rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcConnection objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4a3e0c7..f7d4f78 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1098,7 +1098,7 @@ static BOOL rpcrt4_sock_wait_for_send(RpcConnection_tcp *tcpc) static RpcConnection *rpcrt4_conn_tcp_alloc(void) { RpcConnection_tcp *tcpc; - tcpc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_tcp)); + tcpc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_tcp)); if (tcpc == NULL) return NULL; tcpc->sock = -1; @@ -1738,7 +1738,6 @@ static RpcConnection *rpcrt4_ncacn_http_alloc(void) httpc->cancel_event = CreateEventW(NULL, FALSE, FALSE, NULL); httpc->async_data->refs = 1; httpc->async_data->inet_buffers.dwStructSize = sizeof(INTERNET_BUFFERSW); - httpc->async_data->inet_buffers.lpvBuffer = NULL; InitializeCriticalSection(&httpc->async_data->cs); httpc->async_data->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcHttpAsyncData.cs"); return &httpc->common; @@ -3284,7 +3283,6 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, NewConnection = ops->alloc(); NewConnection->ref = 1; - NewConnection->server_binding = NULL; NewConnection->server = server; NewConnection->ops = ops; NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr); @@ -3292,23 +3290,17 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, NewConnection->NetworkOptions = RPCRT4_strdupW(NetworkOptions); NewConnection->CookieAuth = RPCRT4_strdupW(CookieAuth); NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; - memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface)); NewConnection->NextCallId = 1; SecInvalidateHandle(&NewConnection->ctx); - memset(&NewConnection->exp, 0, sizeof(NewConnection->exp)); - NewConnection->attr = 0; if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); NewConnection->AuthInfo = AuthInfo; NewConnection->auth_context_id = InterlockedIncrement( &next_id ); - NewConnection->encryption_auth_len = 0; - NewConnection->signature_auth_len = 0; if (QOS) RpcQualityOfService_AddRef(QOS); NewConnection->QOS = QOS; list_init(&NewConnection->conn_pool_entry); list_init(&NewConnection->protseq_entry); - NewConnection->async_state = NULL; TRACE("connection: %p\n", NewConnection); *Connection = NewConnection;

1 0

Jacek Caban : rpcrt4: Remove connection from list in RPCRT4_ReleaseConnection.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: dae30652e61e62ce999a357ff1ea2a428d09b229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae30652e61e62ce999a357ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 17:39:30 2017 +0200 rpcrt4: Remove connection from list in RPCRT4_ReleaseConnection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 1 + dlls/rpcrt4/rpc_transport.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 4a24692..ff14bbd 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -91,6 +91,7 @@ typedef struct _RpcConnection RPC_SYNTAX_IDENTIFIER ActiveInterface; USHORT NextCallId; struct list protseq_entry; + struct _RpcServerProtseq *protseq; struct _RpcBinding *server_binding; } RpcConnection; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index f7d4f78..6b308c8 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -227,6 +227,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq EnterCriticalSection(&protseq->cs); list_add_head(&protseq->listeners, &Connection->protseq_entry); + Connection->protseq = protseq; LeaveCriticalSection(&protseq->cs); return r; @@ -288,6 +289,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse EnterCriticalSection(&protseq->cs); list_add_head(&protseq->listeners, &Connection->protseq_entry); + Connection->protseq = protseq; LeaveCriticalSection(&protseq->cs); return r; @@ -1323,6 +1325,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr EnterCriticalSection(&protseq->cs); list_add_tail(&protseq->listeners, &tcpc->common.protseq_entry); + tcpc->common.protseq = protseq; LeaveCriticalSection(&protseq->cs); freeaddrinfo(ai); @@ -3343,6 +3346,13 @@ RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) /* server-only */ if (Connection->server_binding) RPCRT4_ReleaseBinding(Connection->server_binding); + if (Connection->protseq) + { + EnterCriticalSection(&Connection->protseq->cs); + list_remove(&Connection->protseq_entry); + LeaveCriticalSection(&Connection->protseq->cs); + } + HeapFree(GetProcessHeap(), 0, Connection); return RPC_S_OK; }

1 0

Jacek Caban : rpcrt4: Store all active connections in RpcServerProtseq.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: ef267f115f76a3041e0da4a0f0dbd7ffb4a022e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef267f115f76a3041e0da4a0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 17:39:39 2017 +0200 rpcrt4: Store all active connections 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 | 1 + dlls/rpcrt4/rpc_server.h | 1 + dlls/rpcrt4/rpc_transport.c | 32 +++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 1327171..b76185b 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -946,6 +946,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->ops = ops; (*ps)->MaxCalls = 0; list_init(&(*ps)->listeners); + list_init(&(*ps)->connections); InitializeCriticalSection(&(*ps)->cs); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); (*ps)->is_listening = FALSE; diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index a3c476e..130dde7 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -34,6 +34,7 @@ typedef struct _RpcServerProtseq UINT MaxCalls; /* RO */ /* list of listening connections */ struct list listeners; /* CS cs */ + struct list connections; /* CS cs */ CRITICAL_SECTION cs; /* is the server currently listening? */ diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6b308c8..b88eeb7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); -static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); +static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection); /**** ncacn_np support ****/ @@ -744,7 +744,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, release_np_event(conn, conn->listen_event); conn->listen_event = NULL; if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) - RPCRT4_SpawnConnection(&cconn, &conn->common); + cconn = rpcrt4_spawn_connection(&conn->common); else ERR("listen failed %x\n", conn->io_status.Status); break; @@ -1595,7 +1595,7 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq { if (b_handle == conn->sock_event) { - RPCRT4_SpawnConnection(&cconn, &conn->common); + cconn = rpcrt4_spawn_connection(&conn->common); break; } } @@ -3311,16 +3311,26 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, return RPC_S_OK; } -static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection) +static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection) { - RPC_STATUS err; + RpcConnection *connection; + RPC_STATUS err; - err = RPCRT4_CreateConnection(Connection, OldConnection->server, rpcrt4_conn_get_name(OldConnection), - OldConnection->NetworkAddr, OldConnection->Endpoint, NULL, - OldConnection->AuthInfo, OldConnection->QOS, OldConnection->CookieAuth); - if (err == RPC_S_OK) - rpcrt4_conn_handoff(OldConnection, *Connection); - return err; + err = RPCRT4_CreateConnection(&connection, old_connection->server, rpcrt4_conn_get_name(old_connection), + old_connection->NetworkAddr, old_connection->Endpoint, NULL, + old_connection->AuthInfo, old_connection->QOS, old_connection->CookieAuth); + if (err != RPC_S_OK) + return NULL; + + rpcrt4_conn_handoff(old_connection, connection); + if (old_connection->protseq) + { + EnterCriticalSection(&old_connection->protseq->cs); + connection->protseq = old_connection->protseq; + list_add_tail(&old_connection->protseq->connections, &connection->protseq_entry); + LeaveCriticalSection(&old_connection->protseq->cs); + } + return connection; } RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn )

1 0

Huw Davies : ole32: OleUninitialize() does not release the reference to the clipboard's source dataobject.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 8fc1a4cd863aad02761f015bf5a5f67f94934aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc1a4cd863aad02761f015bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 09:33:02 2017 +0100 ole32: OleUninitialize() does not release the reference to the clipboard's source dataobject. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 64 ++++++++++++++++++++++++-------------------- dlls/ole32/tests/clipboard.c | 14 +++++++++- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b3c7665..919d9e3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1786,35 +1786,6 @@ void OLEClipbrd_Initialize(void) } } -/*********************************************************************** - * OLEClipbrd_UnInitialize() - * Un-Initializes the OLE clipboard - */ -void OLEClipbrd_UnInitialize(void) -{ - ole_clipbrd *clipbrd = theOleClipboard; - - TRACE("()\n"); - - if ( clipbrd ) - { - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); - - if ( clipbrd->window ) - { - DestroyWindow(clipbrd->window); - UnregisterClassW( clipbrd_wndclass, hinst ); - } - - IStream_Release(clipbrd->marshal_data); - if (clipbrd->src_data) IDataObject_Release(clipbrd->src_data); - HeapFree(GetProcessHeap(), 0, clipbrd->cached_enum); - HeapFree(GetProcessHeap(), 0, clipbrd); - theOleClipboard = NULL; - } -} - /********************************************************************* * set_clipboard_formats * @@ -2015,6 +1986,41 @@ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) } /*********************************************************************** + * OLEClipbrd_UnInitialize() + * Un-Initializes the OLE clipboard + */ +void OLEClipbrd_UnInitialize(void) +{ + ole_clipbrd *clipbrd = theOleClipboard; + + TRACE("()\n"); + + if ( clipbrd ) + { + static const WCHAR ole32W[] = {'o','l','e','3','2',0}; + HINSTANCE hinst = GetModuleHandleW(ole32W); + + /* OleUninitialize() does not release the reference to the dataobject, so + take an additional reference here. This reference is then leaked. */ + if (clipbrd->src_data) + { + IDataObject_AddRef(clipbrd->src_data); + set_src_dataobject(clipbrd, NULL); + } + + if ( clipbrd->window ) + { + DestroyWindow(clipbrd->window); + UnregisterClassW( clipbrd_wndclass, hinst ); + } + + IStream_Release(clipbrd->marshal_data); + HeapFree(GetProcessHeap(), 0, clipbrd); + theOleClipboard = NULL; + } +} + +/*********************************************************************** * clipbrd_wndproc */ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1c8923e..4890782 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1187,9 +1187,21 @@ static void test_consumer_refs(void) IDataObject_Release(get1); IDataObject_Release(src2); - IDataObject_Release(src); + + /* Show that OleUninitialize() doesn't release the + dataobject's ref, and thus the object is leaked. */ + old_refs = count_refs(src); + ok(old_refs == 1, "%d\n", old_refs); + + OleSetClipboard(src); + refs = count_refs(src); + ok(refs > old_refs, "%d %d\n", refs, old_refs); OleUninitialize(); + refs = count_refs(src); + ok(refs == 2, "%d\n", refs); + + IDataObject_Release(src); } static void test_flushed_getdata(void)

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 75087023417f5e64e63e4d5fbd563f7a264c6f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75087023417f5e64e63e4d5fb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:49 2017 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index c5aa3ec..fc259c1 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -211,16 +211,46 @@ typedef enum { WS_CHARSET_UTF16BE } WS_CHARSET; +typedef struct _WS_XML_DICTIONARY { + GUID guid; + struct _WS_XML_STRING *strings; + ULONG stringCount; + BOOL isConst; +} WS_XML_DICTIONARY; + +typedef struct _WS_XML_STRING { + ULONG length; + BYTE *bytes; + WS_XML_DICTIONARY *dictionary; + ULONG id; +} WS_XML_STRING; + typedef struct _WS_XML_READER_TEXT_ENCODING { WS_XML_READER_ENCODING encoding; WS_CHARSET charSet; } WS_XML_READER_TEXT_ENCODING; +typedef struct _WS_XML_READER_BINARY_ENCODING { + WS_XML_READER_ENCODING encoding; + WS_XML_DICTIONARY *staticDictionary; + WS_XML_DICTIONARY *dynamicDictionary; +} WS_XML_READER_BINARY_ENCODING; + typedef struct _WS_XML_WRITER_TEXT_ENCODING { WS_XML_WRITER_ENCODING encoding; WS_CHARSET charSet; } WS_XML_WRITER_TEXT_ENCODING; +typedef HRESULT (CALLBACK *WS_DYNAMIC_STRING_CALLBACK) + (void*, const WS_XML_STRING*, BOOL*, ULONG*, WS_ERROR*); + +typedef struct _WS_XML_WRITER_BINARY_ENCODING { + WS_XML_WRITER_ENCODING encoding; + WS_XML_DICTIONARY *staticDictionary; + WS_DYNAMIC_STRING_CALLBACK dynamicStringCallback; + void *dynamicStringCallbackState; +} WS_XML_WRITER_BINARY_ENCODING; + typedef enum { WS_XML_READER_INPUT_TYPE_BUFFER = 1, WS_XML_READER_INPUT_TYPE_STREAM = 2 @@ -274,20 +304,6 @@ typedef struct _WS_XML_READER_STREAM_INPUT { void *readCallbackState; } WS_XML_READER_STREAM_INPUT; -typedef struct _WS_XML_DICTIONARY { - GUID guid; - struct _WS_XML_STRING *strings; - ULONG stringCount; - BOOL isConst; -} WS_XML_DICTIONARY; - -typedef struct _WS_XML_STRING { - ULONG length; - BYTE *bytes; - WS_XML_DICTIONARY *dictionary; - ULONG id; -} WS_XML_STRING; - typedef enum { WS_ELEMENT_TYPE_MAPPING = 1, WS_ATTRIBUTE_TYPE_MAPPING = 2, @@ -1568,6 +1584,7 @@ void WINAPI WsFreeReader(WS_XML_READER*); void WINAPI WsFreeServiceProxy(WS_SERVICE_PROXY*); void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetDictionary(WS_ENCODING, WS_XML_DICTIONARY**, WS_ERROR*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsSkipNode.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: da030566e7de8b5c8cd99985598c04f72a54f646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da030566e7de8b5c8cd999855… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:50 2017 +0200 webservices: Implement WsSkipNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 46 ++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1d85f00..befe8db 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1739,6 +1739,52 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error ) return hr; } +static HRESULT skip_node( struct reader *reader ) +{ + const struct node *parent; + HRESULT hr; + + if (node_type( reader->current ) == WS_XML_NODE_TYPE_EOF) return WS_E_INVALID_OPERATION; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_ELEMENT) parent = reader->current; + else parent = NULL; + + for (;;) + { + if ((hr = read_node( reader ) != S_OK) || !parent) break; + if (node_type( reader->current ) != WS_XML_NODE_TYPE_END_ELEMENT) continue; + if (reader->current->parent == parent) return read_node( reader ); + } + + return hr; +} + +/************************************************************************** + * WsSkipNode [webservices.@] + */ +HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + EnterCriticalSection( &reader->cs ); + + if (reader->magic != READER_MAGIC) + { + LeaveCriticalSection( &reader->cs ); + return E_INVALIDARG; + } + + hr = skip_node( reader ); + + LeaveCriticalSection( &reader->cs ); + return hr; +} + /************************************************************************** * WsReadStartElement [webservices.@] */ diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1598cb2..93b7ed5 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4403,6 +4403,65 @@ static void test_WsReadAttribute(void) WsFreeReader( reader ); } +static void test_WsSkipNode(void) +{ + const WS_XML_NODE *node; + WS_XML_READER *reader; + HRESULT hr; + + hr = WsSkipNode( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSkipNode( reader, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t><u></u></t>", sizeof("<t><u></u></t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + /* BOF */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + /* element */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + /* EOF */ + hr = WsSkipNode( reader, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* non-element */ + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", node->nodeType ); + + hr = WsSkipNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -4444,4 +4503,5 @@ START_TEST(reader) test_WsReadCharsUtf8(); test_WsReadQualifiedName(); test_WsReadAttribute(); + test_WsSkipNode(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a6b8452..1f98aa3 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -159,7 +159,7 @@ @ stdcall WsSetReaderPosition(ptr ptr ptr) @ stdcall WsSetWriterPosition(ptr ptr ptr) @ stub WsShutdownSessionChannel -@ stub WsSkipNode +@ stdcall WsSkipNode(ptr ptr) @ stub WsStartReaderCanonicalization @ stub WsStartWriterCanonicalization @ stub WsTrimXmlWhitespace

1 0

Hans Leidekker : webservices: Add initial support for binary XML in the writer.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 24d39bc3c4b511c398b5b8b2c047ded299d12c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d39bc3c4b511c398b5b8b2c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:51 2017 +0200 webservices: Add initial support for binary XML in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 46 ++++++++ dlls/webservices/webservices_private.h | 188 +++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 182 ++++++++++++++++++++++++++++--- 3 files changed, 399 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24d39bc3c4b511c398b5b…

1 0

Hans Leidekker : webservices: Add support for writing namespace attributes in binary mode.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 4331bb7861af20580698736139a8af816daa0b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4331bb7861af2058069873613… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:52 2017 +0200 webservices: Add support for writing namespace attributes in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 7 +- dlls/webservices/writer.c | 214 +++++++++++++++++++++++++--------------- 2 files changed, 139 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4331bb7861af205806987…

1 0

Hans Leidekker : webservices: Set namespace attributes for prefixes introduced by attributes.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: e091c1ec1afa2323919eabd1324e4bcbbf49a3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e091c1ec1afa2323919eabd13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:53 2017 +0200 webservices: Set namespace attributes for prefixes introduced by attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 27 ++++++++++++++++++++++ dlls/webservices/writer.c | 51 ++++++++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 7fd2d44..7ee0325 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3470,6 +3470,32 @@ static void test_binary_encoding(void) WsFreeWriter( writer ); } +static void test_namespaces(void) +{ + WS_XML_STRING prefix = {1, (BYTE *)"p"}, prefix2 = {1, (BYTE *)"q"}; + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}; + WS_XML_STRING ns = {1, (BYTE *)"n"}, ns2 = {1, (BYTE *)"o"}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartAttribute( writer, &prefix2, &localname2, &ns2, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:t q:a=\"\" xmlns:p=\"n\" xmlns:q=\"o\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3508,4 +3534,5 @@ START_TEST(writer) test_WsWriteChars(); test_WsWriteCharsUtf8(); test_binary_encoding(); + test_namespaces(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index a2b0763..e1b8c9e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -615,15 +615,6 @@ HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STR return hr; } -static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) -{ - WS_XML_STRING *str; - if (!(str = alloc_xml_string( ns->bytes, ns->length ))) return E_OUTOFMEMORY; - heap_free( writer->current_ns ); - writer->current_ns = str; - return S_OK; -} - static HRESULT write_namespace_attribute_text( struct writer *writer, const WS_XML_ATTRIBUTE *attr ) { unsigned char quote = attr->singleQuote ? '\'' : '"'; @@ -747,8 +738,8 @@ static HRESULT write_namespace_attribute( struct writer *writer, const WS_XML_AT } } -static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XML_STRING *prefix, - const WS_XML_STRING *ns, BOOL single ) +static HRESULT add_namespace_attribute( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *ns, BOOL single ) { WS_XML_ATTRIBUTE *attr; WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; @@ -803,17 +794,35 @@ static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_ST return FALSE; } -static HRESULT write_set_element_namespace( struct writer *writer ) +static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) +{ + WS_XML_STRING *str; + if (!(str = alloc_xml_string( ns->bytes, ns->length ))) return E_OUTOFMEMORY; + heap_free( writer->current_ns ); + writer->current_ns = str; + return S_OK; +} + +static HRESULT set_namespaces( struct writer *writer ) { WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; HRESULT hr; + ULONG i; - if (!elem->ns->length || namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; + if (elem->ns->length && !namespace_in_scope( elem, elem->prefix, elem->ns )) + { + if ((hr = add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) return hr; + if ((hr = set_current_namespace( writer, elem->ns )) != S_OK) return hr; + } - if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) - return hr; + for (i = 0; i < elem->attributeCount; i++) + { + const WS_XML_ATTRIBUTE *attr = elem->attributes[i]; + if (!attr->ns->length || namespace_in_scope( elem, attr->prefix, attr->ns )) continue; + if ((hr = add_namespace_attribute( writer, attr->prefix, attr->ns, FALSE )) != S_OK) return hr; + } - return set_current_namespace( writer, elem->ns ); + return S_OK; } /************************************************************************** @@ -1026,7 +1035,7 @@ static HRESULT write_endelement_node( struct writer *writer ) if (!(node = write_find_startelement( writer ))) return WS_E_INVALID_FORMAT; if (writer->state == WRITER_STATE_STARTELEMENT) { - if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; + if ((hr = set_namespaces( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; } if ((hr = write_close_element( writer, node )) != S_OK) return hr; @@ -1109,7 +1118,7 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) return WS_E_INVALID_OPERATION; } - if ((hr = write_set_element_namespace( writer )) != S_OK) goto done; + if ((hr = set_namespaces( writer )) != S_OK) goto done; if ((hr = write_startelement( writer )) != S_OK) goto done; if ((hr = write_endstartelement( writer )) != S_OK) goto done; writer->state = WRITER_STATE_ENDSTARTELEMENT; @@ -1198,7 +1207,7 @@ static HRESULT write_flush( struct writer *writer ) if (writer->state == WRITER_STATE_STARTELEMENT) { HRESULT hr; - if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; + if ((hr = set_namespaces( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; if ((hr = write_endstartelement( writer )) != S_OK) return hr; writer->state = WRITER_STATE_ENDSTARTELEMENT; @@ -2086,7 +2095,7 @@ static HRESULT write_add_nil_attribute( struct writer *writer ) if ((hr = write_add_attribute( writer, &prefix, &localname, &ns, FALSE )) != S_OK) return hr; if ((hr = write_set_attribute_value( writer, &value.text )) != S_OK) return hr; - return write_add_namespace_attribute( writer, &prefix, &ns, FALSE ); + return add_namespace_attribute( writer, &prefix, &ns, FALSE ); } static HRESULT get_value_ptr( WS_WRITE_OPTION option, const void *value, ULONG size, ULONG expected_size, @@ -3124,7 +3133,7 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING } if (!namespace_in_scope( &writer->current->hdr, prefix, ns )) - hr = write_add_namespace_attribute( writer, prefix, ns, single ); + hr = add_namespace_attribute( writer, prefix, ns, single ); LeaveCriticalSection( &writer->cs ); return hr;

1 0