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

Alistair Leslie-Hughes : dpnet: Share message handler between IDirectPlay8ThreadPool objects.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 072c58e322fddba772bd87bc79dcf9f7938a1c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072c58e322fddba772bd87bc7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 23 01:57:05 2017 +0000 dpnet: Share message handler between IDirectPlay8ThreadPool objects. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/dpnet_private.h | 4 ---- dlls/dpnet/tests/thread.c | 8 ++++---- dlls/dpnet/threadpool.c | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 7b6de4a..44ff289d 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -122,10 +122,6 @@ struct IDirectPlay8ThreadPoolImpl { IDirectPlay8ThreadPool IDirectPlay8ThreadPool_iface; LONG ref; - - PFNDPNMESSAGEHANDLER msghandler; - DWORD flags; - void *usercontext; }; /** diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index 99de2be..78515f8 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -70,7 +70,7 @@ static void create_threadpool(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Initialize(pool2, NULL, &DirectPlayThreadHandler, 0); - todo_wine ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -103,7 +103,7 @@ static void create_threadpool(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Close(pool2, 0); - todo_wine ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); IDirectPlay8ThreadPool_Release(pool1); IDirectPlay8ThreadPool_Release(pool2); @@ -226,13 +226,13 @@ static void test_singleton(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Initialize(pool2, NULL, &DirectPlayThreadHandler, 0); - todo_wine ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Close(pool1, 0); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Close(pool2, 0); - todo_wine ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); + ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); IDirectPlay8ThreadPool_Release(pool1); IDirectPlay8ThreadPool_Release(pool2); diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 37a05e2..7e84a5a 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -36,6 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); +static PFNDPNMESSAGEHANDLER threadpool_msghandler = NULL; +static DWORD threadpool_flags = 0; +static void *threadpool_usercontext = NULL; + static inline IDirectPlay8ThreadPoolImpl *impl_from_IDirectPlay8ThreadPool(IDirectPlay8ThreadPool *iface) { return CONTAINING_RECORD(iface, IDirectPlay8ThreadPoolImpl, IDirectPlay8ThreadPool_iface); @@ -89,12 +93,12 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Initialize(IDirectPlay8ThreadPo if(!pfn) return DPNERR_INVALIDPARAM; - if(This->msghandler) + if(threadpool_msghandler) return DPNERR_ALREADYINITIALIZED; - This->msghandler = pfn; - This->flags = dwFlags; - This->usercontext = pvUserContext; + threadpool_msghandler = pfn; + threadpool_flags = dwFlags; + threadpool_usercontext = pvUserContext; return DPN_OK; } @@ -106,7 +110,10 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Close(IDirectPlay8ThreadPool *i FIXME("(%p)->(%x)\n", This, dwFlags); - This->msghandler = NULL; + if(!threadpool_msghandler) + return DPNERR_UNINITIALIZED; + + threadpool_msghandler = NULL; return DPN_OK; }

1 0

Vitaly Lipatov : include: Add PERF_DATA_BLOCK struct definition.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 2884205db3a1d25d407b7c88e378520606f93578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2884205db3a1d25d407b7c88e… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Mar 22 14:03:45 2017 +0300 include: Add PERF_DATA_BLOCK struct definition. Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winperf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/winperf.h b/include/winperf.h index b62f24b..dce1a6d 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -67,4 +67,25 @@ #define PERF_DETAIL_EXPERT 300 #define PERF_DETAIL_WIZARD 400 +/* Performance data structure header + * returned in answer to HKEY_PERFORMANCE_DATA request + */ + +typedef struct _PERF_DATA_BLOCK { + WCHAR Signature[4]; + DWORD LittleEndian; + DWORD Version; + DWORD Revision; + DWORD TotalByteLength; + DWORD HeaderLength; + DWORD NumObjectTypes; + DWORD DefaultObject; + SYSTEMTIME SystemTime; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER PerfTime100nSec; + DWORD SystemNameLength; + DWORD SystemNameOffset; +} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK, *LPPERF_DATA_BLOCK; + #endif /* _WINPERF_ */

1 0

Vitaly Lipatov : advapi32/tests: Add test prototype for RegQueryValueEx HKEY_PERFORMANCE_DATA.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 7cbaf1f56f6d1932123e4275b5fe6f63e7083674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbaf1f56f6d1932123e4275b… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Mar 22 14:03:46 2017 +0300 advapi32/tests: Add test prototype for RegQueryValueEx HKEY_PERFORMANCE_DATA. Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index eb9ab67..4ea0f68 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winternl.h" #include "winreg.h" +#include "winperf.h" #include "winsvc.h" #include "winerror.h" #include "aclapi.h" @@ -3480,6 +3481,54 @@ static void test_RegNotifyChangeKeyValue(void) CloseHandle(event); } +static void test_RegQueryValueExPerformanceData(void) +{ + DWORD cbData, len; + BYTE *value; + DWORD dwret; + LONG limit = 6; + PERF_DATA_BLOCK *pdb; + + /* Test with data == NULL */ + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); + todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + + /* Test ERROR_MORE_DATA, start with small buffer */ + len = 10; + value = HeapAlloc(GetProcessHeap(), 0, len); + cbData = len; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + while( dwret == ERROR_MORE_DATA && limit) + { + len = len * 10; + value = HeapReAlloc( GetProcessHeap(), 0, value, len ); + cbData = len; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + limit--; + } + ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); + + todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); + + /* Check returned data */ + if (dwret == ERROR_SUCCESS) + { + todo_wine ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); + if (len >= sizeof(PERF_DATA_BLOCK)) { + pdb = (PERF_DATA_BLOCK*) value; + ok(pdb->Signature[0] == 'P', "expected Signature[0] = 'P', got 0x%x\n", pdb->Signature[0]); + ok(pdb->Signature[1] == 'E', "expected Signature[1] = 'E', got 0x%x\n", pdb->Signature[1]); + ok(pdb->Signature[2] == 'R', "expected Signature[2] = 'R', got 0x%x\n", pdb->Signature[2]); + ok(pdb->Signature[3] == 'F', "expected Signature[3] = 'F', got 0x%x\n", pdb->Signature[3]); + /* TODO: check other field */ + } + } + + HeapFree(GetProcessHeap(), 0, value); +} + + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3515,6 +3564,7 @@ START_TEST(registry) test_delete_key_value(); test_RegOpenCurrentUser(); test_RegNotifyChangeKeyValue(); + test_RegQueryValueExPerformanceData(); /* cleanup */ delete_key( hkey_main );

1 0

Hans Leidekker : webservices: No longer prefer native.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 5a88f52f3f29d55de78ccf4aed267234eb264122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a88f52f3f29d55de78ccf4ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:43 2017 +0200 webservices: No longer prefer native. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 - dlls/webservices/main.c | 44 -------------------------------------------- 2 files changed, 45 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index 8de4f6b..342ecc9 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -4,7 +4,6 @@ IMPORTS = winhttp rpcrt4 user32 C_SRCS = \ channel.c \ - main.c \ msg.c \ proxy.c \ reader.c \ diff --git a/dlls/webservices/main.c b/dlls/webservices/main.c deleted file mode 100644 index f99c5cd..0000000 --- a/dlls/webservices/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Web Services - * - * Copyright 2013 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "webservices.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(webservices); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Hans Leidekker : webservices: Use a table in get_header_name.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: bdbab7b63a46d1a1689ba447196ee09734cc3349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbab7b63a46d1a1689ba4471… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:44 2017 +0200 webservices: Use a table in get_header_name. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 5e425ee..d15ab85 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -457,24 +457,24 @@ static HRESULT get_addr_namespace( WS_ADDRESSING_VERSION ver, WS_XML_STRING *str static const WS_XML_STRING *get_header_name( WS_HEADER_TYPE type ) { - static const WS_XML_STRING action = {6, (BYTE *)"Action"}, to = {2, (BYTE *)"To"}; - static const WS_XML_STRING msgid = {9, (BYTE *)"MessageID"}, relto = {9, (BYTE *)"RelatesTo"}; - static const WS_XML_STRING from = {4, (BYTE *)"From"}, replyto = {7, (BYTE *)"ReplyTo"}; - static const WS_XML_STRING faultto = {7, (BYTE *)"FaultTo"}; + static const WS_XML_STRING headers[] = + { + {6, (BYTE *)"Action"}, + {2, (BYTE *)"To"}, + {9, (BYTE *)"MessageID"}, + {9, (BYTE *)"RelatesTo"}, + {4, (BYTE *)"From"}, + {7, (BYTE *)"ReplyTo"}, + {7, (BYTE *)"FaultTo"}, + }; - switch (type) + if (type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) { - case WS_ACTION_HEADER: return &action; - case WS_TO_HEADER: return &to; - case WS_MESSAGE_ID_HEADER: return &msgid; - case WS_RELATES_TO_HEADER: return &relto; - case WS_FROM_HEADER: return &from; - case WS_REPLY_TO_HEADER: return &replyto; - case WS_FAULT_TO_HEADER: return &faultto; - default: ERR( "unknown type %u\n", type ); return NULL; } + + return &headers[type - 1]; } static HRESULT write_headers( struct msg *msg, const WS_XML_STRING *ns_env, const WS_XML_STRING *ns_addr,

1 0

Hans Leidekker : webservices: Move error support to a separate file.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 55e60aab5c71ea7ba6036071622fd666565b850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e60aab5c71ea7ba60360716… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:45 2017 +0200 webservices: Move error support to a separate file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/error.c | 234 +++++++++++++++++++++++++++++++++++++++++++ dlls/webservices/reader.c | 204 ------------------------------------- 3 files changed, 235 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55e60aab5c71ea7ba6036…

1 0

Hans Leidekker : webservices: Move heap support to a separate file.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 7c94cf90aef43f07ea6204e43cfc1f3decaf2dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c94cf90aef43f07ea6204e43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:46 2017 +0200 webservices: Move heap support to a separate file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/heap.c | 356 +++++++++++++++++++++++++++++++++ dlls/webservices/reader.c | 285 -------------------------- dlls/webservices/webservices_private.h | 5 + dlls/webservices/writer.c | 41 ---- 5 files changed, 362 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c94cf90aef43f07ea620…

1 0

Hans Leidekker : webservices: Implement WS_CHANNEL_PROPERTY_CHANNEL_TYPE.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 9716776326df8ece5c810ff1d4fd5bff2d75e6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9716776326df8ece5c810ff1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:47 2017 +0200 webservices: Implement WS_CHANNEL_PROPERTY_CHANNEL_TYPE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 7e7c409..d44fcc0 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -232,7 +232,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID ULONG size, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr; + HRESULT hr = S_OK; TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -247,7 +247,16 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID return E_INVALIDARG; } - hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); + switch (id) + { + case WS_CHANNEL_PROPERTY_CHANNEL_TYPE: + if (!buf || size != sizeof(channel->type)) hr = E_INVALIDARG; + else *(WS_CHANNEL_TYPE *)buf = channel->type; + break; + + default: + hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); + } LeaveCriticalSection( &channel->cs ); return hr;

1 0

Hans Leidekker : webservices: Don' t allocate an XML buffer until it is needed.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 4f1c7dc19528708cdf5cc644b26f008397d338ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1c7dc19528708cdf5cc644b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:48 2017 +0200 webservices: Don't allocate an XML buffer until it is needed. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index d15ab85..ae021cc 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -171,11 +171,6 @@ static HRESULT create_msg( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSIO free_msg( msg ); return hr; } - if ((hr = WsCreateXmlBuffer( msg->heap, NULL, 0, &msg->buf, NULL )) != S_OK) - { - free_msg( msg ); - return hr; - } UuidCreate( &msg->id ); msg->version_env = env_version;

1 0

Hans Leidekker : webservices: Implement WsResetMessage.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 6f3afc1a1ca24edf51ed70dc1a7d1ec1586127d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3afc1a1ca24edf51ed70dc1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:49 2017 +0200 webservices: Implement WsResetMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 63 ++++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/msg.c | 38 +++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 99 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ae021cc..9e94d7c 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -123,15 +123,44 @@ static void free_header( struct header *header ) heap_free( header ); } -static void free_msg( struct msg *msg ) +static void reset_msg( struct msg *msg ) { ULONG i; - WsFreeWriter( msg->writer ); - WsFreeHeap( msg->heap ); + msg->state = WS_MESSAGE_STATE_EMPTY; + msg->init = 0; + UuidCreate( &msg->id ); + msg->is_addressed = FALSE; heap_free( msg->addr.chars ); + msg->addr.chars = NULL; + msg->addr.length = 0; + heap_free( msg->action.chars ); - for (i = 0; i < msg->header_count; i++) free_header( msg->header[i] ); + msg->action.chars = NULL; + msg->action.length = 0; + + WsResetHeap( msg->heap, NULL ); + msg->buf = NULL; /* allocated on msg->heap */ + msg->writer_body = NULL; /* owned by caller */ + msg->reader_body = NULL; /* owned by caller */ + + for (i = 0; i < msg->header_count; i++) + { + free_header( msg->header[i] ); + msg->header[i] = NULL; + } + msg->header_count = 0; + + memset( &msg->ctx_send, 0, sizeof(msg->ctx_send) ); + memset( &msg->ctx_receive, 0, sizeof(msg->ctx_receive) ); +} + +static void free_msg( struct msg *msg ) +{ + reset_msg( msg ); + + WsFreeWriter( msg->writer ); + WsFreeHeap( msg->heap ); heap_free( msg->header ); msg->cs.DebugInfo->Spare[0] = 0; @@ -246,6 +275,32 @@ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) } /************************************************************************** + * WsResetMessage [webservices.@] + */ +HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + reset_msg( msg ); + + LeaveCriticalSection( &msg->cs ); + return S_OK; +} + +/************************************************************************** * WsGetMessageProperty [webservices.@] */ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index b13a97e..f6a6ba1 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1105,6 +1105,43 @@ static void test_WsReadBody(void) WsFreeHeap( heap ); } +static void test_WsResetMessage(void) +{ + WS_MESSAGE *msg; + WS_MESSAGE_STATE state; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; + HRESULT hr; + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetMessage( msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_1, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_0_9, "got %u\n", addr_version ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -1123,4 +1160,5 @@ START_TEST(msg) test_WsReadEnvelopeStart(); test_WsReadEnvelopeEnd(); test_WsReadBody(); + test_WsResetMessage(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 074f612..fd4a831 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -137,7 +137,7 @@ @ stdcall WsResetError(ptr) @ stdcall WsResetHeap(ptr ptr) @ stub WsResetListener -@ stub WsResetMessage +@ stdcall WsResetMessage(ptr ptr) @ stub WsResetMetadata @ stub WsResetServiceHost @ stub WsResetServiceProxy diff --git a/include/webservices.h b/include/webservices.h index 3274082..532275b 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1488,6 +1488,7 @@ HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); +HRESULT WINAPI WsResetMessage(WS_MESSAGE*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); HRESULT WINAPI WsResetMessage(WS_MESSAGE*, WS_ERROR*);

1 0