August 2016 - Wine-commits - list.winehq.org

Iván Matellanes : msvcirt: Implement ios:: sync_with_stdio.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 9be41b5b6b702891beb0c383797428e6c89cf264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be41b5b6b702891beb0c3837… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 20:36:03 2016 +0100 msvcirt: Implement ios::sync_with_stdio. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 57 +++++++++++++++++--- dlls/msvcirt/msvcirt.spec | 2 +- dlls/msvcirt/tests/msvcirt.c | 120 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 5 files changed, 174 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9be41b5b6b702891beb0c…

1 0

Bruno Jesus : include: Add DIPROP_PRODUCTNAME and remove duplicate #defines from dinput.h.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: b5159c6a2d387c9829571b019eea79615f41c3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5159c6a2d387c9829571b019… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 02:03:25 2016 -0300 include: Add DIPROP_PRODUCTNAME and remove duplicate #defines from dinput.h. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index a714eeb..beb81a7 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -908,9 +908,8 @@ typedef const DIPROPSTRING *LPCDIPROPSTRING; #define DIPROP_GUIDANDPATH MAKEDIPROP(12) #define DIPROP_INSTANCENAME MAKEDIPROP(13) +#define DIPROP_PRODUCTNAME MAKEDIPROP(14) #define DIPROP_JOYSTICKID MAKEDIPROP(15) -#define DIPROP_KEYNAME MAKEDIPROP(20) -#define DIPROP_VIDPID MAKEDIPROP(24) #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_CPOINTS MAKEDIPROP(21)

1 0

Bruno Jesus : dinput: Use the correct index to remap the axis.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 299a6ce5bb1f607a6065eabd749ab68abf00da65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299a6ce5bb1f607a6065eabd7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 03:34:37 2016 -0300 dinput: Use the correct index to remap the axis. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index de76896..46ea316 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -291,6 +291,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { + + /* Many games poll the joystick immediately after setting the range + * for calibration purposes, so the old values need to be remapped + * to the new range before it does so */ + TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { @@ -324,8 +329,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF TRACE("proprange(%d,%d) obj=%d\n", pr->lMin, pr->lMax, obj); if (obj >= 0) { - /*ePSXe polls the joystick immediately after setting the range for calibration purposes, so the old values need to be remapped to the new range before it does so*/ - remap_props.lDevMin = This->props[obj].lMin; remap_props.lDevMax = This->props[obj].lMax; @@ -335,7 +338,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF remap_props.lMin = pr->lMin; remap_props.lMax = pr->lMax; - switch (ph->dwObj) { + switch (This->base.data_format.wine_df->rgodf[obj].dwOfs) { case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break; case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break; case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break;

1 0

Sebastian Lackner : services: WaitForSingleObject returns a DWORD result.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: b08ce1ae803a98b3ae4e876a794b36e1ade5363f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08ce1ae803a98b3ae4e876a7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:25:23 2016 +0200 services: WaitForSingleObject returns a DWORD result. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index eb8f4ff..64d5879 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1084,7 +1084,6 @@ DWORD __cdecl svcctl_ControlService( struct sc_service_handle *service; struct process_entry *process; DWORD result; - BOOL ret; WINE_TRACE("(%p, %d, %p)\n", hService, dwControl, lpServiceStatus); @@ -1164,8 +1163,8 @@ DWORD __cdecl svcctl_ControlService( if (!process) return ERROR_SERVICE_CANNOT_ACCEPT_CTRL; - ret = WaitForSingleObject(process->control_mutex, 30000); - if (ret != WAIT_OBJECT_0) + result = WaitForSingleObject(process->control_mutex, 30000); + if (result != WAIT_OBJECT_0) { release_process(process); return ERROR_SERVICE_REQUEST_TIMEOUT;

1 0

Sebastian Lackner : services: Track number of services per process.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 36ccc45db600f71b59c939988f06ee96427791c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ccc45db600f71b59c939988… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:27:58 2016 +0200 services: Track number of services per process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 9 +++++++-- programs/services/services.c | 5 ++++- programs/services/services.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 64d5879..977ddb6 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -761,7 +761,8 @@ DWORD __cdecl svcctl_SetServiceStatus( if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) { service->service_entry->process = NULL; - terminate_after_timeout(process, service_kill_timeout); + if (!--process->use_count) + terminate_after_timeout(process, service_kill_timeout); release_process(process); } else @@ -1135,7 +1136,11 @@ DWORD __cdecl svcctl_ControlService( { result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; if ((process = service->service_entry->process)) - process_terminate(process); + { + service->service_entry->process = NULL; + if (!--process->use_count) process_terminate(process); + release_process(process); + } } if (result != ERROR_SUCCESS) diff --git a/programs/services/services.c b/programs/services/services.c index 9be9bb8..177acf1 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -752,8 +752,9 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p service_unlock(service_entry); return ERROR_SERVICE_ALREADY_RUNNING; } - release_process(process); service_entry->process = NULL; + process->use_count--; + release_process(process); } service_entry->force_shutdown = FALSE; @@ -784,6 +785,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p service_entry->status.dwCurrentState = SERVICE_START_PENDING; scmdatabase_add_process(service_entry->db, process); service_entry->process = grab_process(process); + process->use_count++; service_unlock(service_entry); @@ -945,6 +947,7 @@ void process_terminate(struct process_entry *process) if (service->process != process) continue; service->status.dwCurrentState = SERVICE_STOPPED; service->process = NULL; + process->use_count--; release_process(process); } scmdatabase_unlock(db); diff --git a/programs/services/services.h b/programs/services/services.h index 59d8d00..a3ecdf2 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -37,6 +37,7 @@ struct process_entry struct list entry; struct scmdatabase *db; LONG ref_count; + LONG use_count; DWORD process_id; HANDLE process; HANDLE control_mutex;

1 0

Sebastian Lackner : services: Hold startup lock before calling service_start.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 4c01feb7146a47df41eedd1da0bb540a37d7d7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c01feb7146a47df41eedd1da… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:30:33 2016 +0200 services: Hold startup lock before calling service_start. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 9 ++++++--- programs/services/services.c | 15 ++++----------- programs/services/services.h | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 977ddb6..4cab79e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1071,8 +1071,12 @@ DWORD __cdecl svcctl_StartServiceW( if (service->service_entry->config.dwStartType == SERVICE_DISABLED) return ERROR_SERVICE_DISABLED; + if (!scmdatabase_lock_startup(service->service_entry->db)) + return ERROR_SERVICE_DATABASE_LOCKED; + err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors); + scmdatabase_unlock_startup(service->service_entry->db); return err; } @@ -1226,9 +1230,8 @@ DWORD __cdecl svcctl_LockServiceDatabase( if ((err = validate_scm_handle(hSCManager, SC_MANAGER_LOCK, &manager)) != ERROR_SUCCESS) return err; - err = scmdatabase_lock_startup(manager->db); - if (err != ERROR_SUCCESS) - return err; + if (!scmdatabase_lock_startup(manager->db)) + return ERROR_SERVICE_DATABASE_LOCKED; lock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); if (!lock) diff --git a/programs/services/services.c b/programs/services/services.c index 177acf1..9156dbc 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -352,6 +352,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) size = i; scmdatabase_unlock(db); + while (!scmdatabase_lock_startup(db)) Sleep(10); for (i = 0; i < size; i++) { @@ -364,6 +365,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) release_service(service); } + scmdatabase_unlock_startup(db); HeapFree(GetProcessHeap(), 0, services_list); } @@ -608,11 +610,9 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) return ERROR_SUCCESS; } -DWORD scmdatabase_lock_startup(struct scmdatabase *db) +BOOL scmdatabase_lock_startup(struct scmdatabase *db) { - if (InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE)) - return ERROR_SERVICE_DATABASE_LOCKED; - return ERROR_SUCCESS; + return !InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE); } void scmdatabase_unlock_startup(struct scmdatabase *db) @@ -904,10 +904,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * struct process_entry *process = NULL; DWORD err; - err = scmdatabase_lock_startup(service->db); - if (err != ERROR_SUCCESS) - return err; - err = service_start_process(service, &process); if (err == ERROR_SUCCESS) { @@ -928,10 +924,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * release_process(process); } - scmdatabase_unlock_startup(service->db); - WINE_TRACE("returning %d\n", err); - return err; } diff --git a/programs/services/services.h b/programs/services/services.h index a3ecdf2..fb1374e 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -72,7 +72,7 @@ struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR n struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name); DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry); -DWORD scmdatabase_lock_startup(struct scmdatabase *db); +BOOL scmdatabase_lock_startup(struct scmdatabase *db); void scmdatabase_unlock_startup(struct scmdatabase *db); void scmdatabase_lock(struct scmdatabase *db);

1 0

Sebastian Lackner : services: Sort autostart services by dwTagId config value.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 6fc42341ecdf71d80e3b7ac46961f29beb660c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc42341ecdf71d80e3b7ac46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:31:35 2016 +0200 services: Sort autostart services by dwTagId config value. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/services/services.c b/programs/services/services.c index 9156dbc..1092a25 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -318,6 +318,13 @@ static void scmdatabase_remove_service(struct scmdatabase *db, struct service_en service->entry.next = service->entry.prev = NULL; } +static int compare_tags(const void *a, const void *b) +{ + struct service_entry *service_a = *(struct service_entry **)a; + struct service_entry *service_b = *(struct service_entry **)b; + return service_a->config.dwTagId - service_b->config.dwTagId; +} + static void scmdatabase_autostart_services(struct scmdatabase *db) { struct service_entry **services_list; @@ -352,6 +359,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) size = i; scmdatabase_unlock(db); + qsort(services_list, size, sizeof(services_list[0]), compare_tags); while (!scmdatabase_lock_startup(db)) Sleep(10); for (i = 0; i < size; i++)

1 0

Hans Leidekker : webservices: Add support for writing GUID values.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: c06f2d4f5b03ab4866ebc7ceef05d9905a99bf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06f2d4f5b03ab4866ebc7cee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:23:59 2016 +0200 webservices: Add support for writing GUID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 16 ++++++++++++++++ dlls/webservices/writer.c | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 65828a4..58a4544 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -580,6 +580,7 @@ static void test_basic_type(void) HRESULT hr; WS_XML_WRITER *writer; WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + GUID guid; ULONG i; static const struct { @@ -671,6 +672,21 @@ static void test_basic_type(void) check_output( writer, tests[i].result2, __LINE__ ); } + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &guid, 0, sizeof(guid) ); + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &guid, sizeof(guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>00000000-0000-0000-0000-000000000000</t>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 452ee46..1fb5489 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1497,6 +1497,23 @@ static HRESULT write_type_uint64( struct writer *writer, WS_TYPE_MAPPING mapping return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_GUID_DESCRIPTION *desc, const GUID *value ) +{ + WS_XML_UTF8_TEXT utf8; + unsigned char buf[37]; /* "00000000-0000-0000-0000-000000000000" */ + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = buf; + utf8.value.length = format_guid( value, buf ); + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_WSZ_DESCRIPTION *desc, const WCHAR *value ) { @@ -1664,14 +1681,14 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY } case WS_INT8_TYPE: { - const INT8 *ptr = value; + const INT8 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int8( writer, mapping, desc, ptr ); } case WS_INT16_TYPE: { - const INT16 *ptr = value; + const INT16 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int16( writer, mapping, desc, ptr ); @@ -1685,39 +1702,46 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY } case WS_INT64_TYPE: { - const INT64 *ptr = value; + const INT64 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int64( writer, mapping, desc, ptr ); } case WS_UINT8_TYPE: { - const UINT8 *ptr = value; + const UINT8 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint8( writer, mapping, desc, ptr ); } case WS_UINT16_TYPE: { - const UINT16 *ptr = value; + const UINT16 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint16( writer, mapping, desc, ptr ); } case WS_UINT32_TYPE: { - const UINT32 *ptr = value; + const UINT32 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint32( writer, mapping, desc, ptr ); } case WS_UINT64_TYPE: { - const UINT64 *ptr = value; + const UINT64 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint64( writer, mapping, desc, ptr ); } + case WS_GUID_TYPE: + { + const GUID *ptr; + if (!option) option = WS_WRITE_REQUIRED_VALUE; + if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; + return write_type_guid( writer, mapping, desc, ptr ); + } case WS_WSZ_TYPE: { const WCHAR *ptr;

1 0

Hans Leidekker : webservices: Validate the handle in channel functions.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 41da198a6eef85d20477e4d77c7f989f172e0fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41da198a6eef85d20477e4d77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:00 2016 +0200 webservices: Validate the handle in channel functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 5 ++++- dlls/webservices/tests/channel.c | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index aba87c0..0277d51 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -188,6 +188,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (!handle) return E_INVALIDARG; return prop_get( channel->prop, channel->prop_count, id, buf, size ); } @@ -202,6 +203,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID TRACE( "%p %u %p %u\n", handle, id, value, size ); if (error) FIXME( "ignoring error parameter\n" ); + if (!handle) return E_INVALIDARG; return prop_set( channel->prop, channel->prop_count, id, value, size ); } @@ -223,7 +225,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - if (!endpoint) return E_INVALIDARG; + if (!handle || !endpoint) return E_INVALIDARG; if (channel->state != WS_CHANNEL_STATE_CREATED) return WS_E_INVALID_OPERATION; return open_channel( channel, endpoint ); @@ -246,5 +248,6 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); + if (!handle) return E_INVALIDARG; return close_channel( channel ); } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index d85a151..f053c15 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -28,11 +28,11 @@ static void test_WsCreateChannel(void) WS_CHANNEL_STATE state; ULONG size, value; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); channel = NULL; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( channel != NULL, "channel not set\n" ); @@ -64,14 +64,14 @@ static void test_WsOpenChannel(void) WS_CHANNEL *channel; WS_ENDPOINT_ADDRESS addr; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); WsFreeChannel( channel ); - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsOpenChannel( channel, NULL, NULL, NULL ); @@ -82,6 +82,9 @@ static void test_WsOpenChannel(void) addr.headers = NULL; addr.extensions = NULL; addr.identity = NULL; + hr = WsOpenChannel( NULL, &addr, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -93,6 +96,10 @@ static void test_WsOpenChannel(void) hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseChannel( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeChannel( channel ); }

1 0

Hans Leidekker : webservices: Implement WsAddMappedHeader.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: ecd1fa8f0f28a2d507bd35b380e61a3b123f625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd1fa8f0f28a2d507bd35b38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:01 2016 +0200 webservices: Implement WsAddMappedHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 96 +++++++++++++++++++++++++++++++++------ dlls/webservices/tests/msg.c | 35 ++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 117 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 9a19622..e55e861 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -51,6 +51,8 @@ static const struct prop_desc msg_props[] = struct header { WS_HEADER_TYPE type; + WS_XML_STRING name; + BOOL mapped; WS_XML_UTF8_TEXT text; }; @@ -94,19 +96,20 @@ static struct msg *alloc_msg(void) return ret; } -static void free_headers( struct header **header, ULONG count ) +static void free_header( struct header *header ) { - ULONG i; - for (i = 0; i < count; i++) heap_free( header[i] ); + heap_free( header->name.bytes ); + heap_free( header ); } static void free_msg( struct msg *msg ) { + ULONG i; if (!msg) return; WsFreeWriter( msg->writer ); WsFreeHeap( msg->heap ); heap_free( msg->addr.chars ); - free_headers( msg->header, msg->header_count ); + for (i = 0; i < msg->header_count; i++) free_header( msg->header[i] ); heap_free( msg->header ); heap_free( msg ); } @@ -429,7 +432,7 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) for (i = 0; i < msg->header_count; i++) { - if ((hr = write_header( writer, msg->header[i] )) != S_OK) return hr; + if (!msg->header[i]->mapped && (hr = write_header( writer, msg->header[i] )) != S_OK) return hr; } if (msg->version_addr == WS_ADDRESSING_VERSION_0_9) @@ -571,8 +574,8 @@ static inline void set_utf8_text( WS_XML_UTF8_TEXT *text, BYTE *bytes, ULONG len text->value.length = len; } -static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_OPTION option, - const void *value, ULONG size, struct header **ret ) +static HRESULT alloc_header( WS_HEADER_TYPE type, const WS_XML_STRING *name, BOOL mapped, WS_TYPE value_type, + WS_WRITE_OPTION option, const void *value, ULONG size, struct header **ret ) { struct header *header; @@ -587,7 +590,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O src = *(const WCHAR **)value; len = WideCharToMultiByte( CP_UTF8, 0, src, -1, NULL, 0, NULL, NULL ) - 1; - if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + len ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), len ); WideCharToMultiByte( CP_UTF8, 0, src, -1, (char *)header->text.value.bytes, len, NULL, NULL ); break; @@ -602,7 +605,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O return E_NOTIMPL; } if (size != sizeof(*str)) return E_INVALIDARG; - if (!(header = heap_alloc( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), str->length ); memcpy( header->text.value.bytes, str->bytes, str->length ); break; @@ -619,7 +622,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O } if (size != sizeof(*str)) return E_INVALIDARG; len = WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, NULL, 0, NULL, NULL ); - if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + len ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), len ); WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, (char *)header->text.value.bytes, len, NULL, NULL ); @@ -630,7 +633,19 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O return E_NOTIMPL; } - header->type = type; + if (name && name->length) + { + if (!(header->name.bytes = heap_alloc( name->length ))) + { + heap_free( header ); + return E_OUTOFMEMORY; + } + memcpy( header->name.bytes, name->bytes, name->length ); + header->name.length = name->length; + } + header->type = type; + header->mapped = mapped; + *ret = header; return S_OK; } @@ -662,8 +677,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val } } - if (found) heap_free( msg->header[i] ); - else + if (!found) { if (msg->header_count == msg->header_size) { @@ -676,7 +690,10 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val i = msg->header_count++; } - if ((hr = alloc_header( type, value_type, option, value, size, &header )) != S_OK) return hr; + if ((hr = alloc_header( type, NULL, FALSE, value_type, option, value, size, &header )) != S_OK) + return hr; + + if (found) free_header( msg->header[i] ); msg->header[i] = header; return write_envelope( msg ); } @@ -701,7 +718,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR { if (msg->header[i]->type == type) { - heap_free( msg->header[i] ); + free_header( msg->header[i] ); memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); msg->header_count--; removed = TRUE; @@ -712,3 +729,52 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR if (removed) return write_envelope( msg ); return S_OK; } + +/************************************************************************** + * WsAddMappedHeader [webservices.@] + */ +HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_TYPE type, + WS_WRITE_OPTION option, const void *value, ULONG size , WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + struct header *header; + BOOL found = FALSE; + HRESULT hr; + ULONG i; + + TRACE( "%p %s %u %08x %p %u %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !name) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || !msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + { + found = TRUE; + break; + } + } + + if (!found) + { + if (msg->header_count == msg->header_size) + { + struct header **tmp; + if (!(tmp = heap_realloc( msg->header, 2 * msg->header_size * sizeof(struct header *) ))) + return E_OUTOFMEMORY; + msg->header = tmp; + msg->header_size *= 2; + } + i = msg->header_count++; + } + + if ((hr = alloc_header( 0, name, TRUE, WS_XML_STRING_TYPE, option, value, size, &header )) != S_OK) + return hr; + + if (found) free_header( msg->header[i] ); + msg->header[i] = header; + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 5a0e8b2..1458488 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -669,6 +669,40 @@ static void test_WsRemoveHeader(void) WsFreeMessage( msg ); } +static void test_WsAddMappedHeader(void) +{ + static const WS_XML_STRING header = {6, (BYTE *)"Header"}, value = {5, (BYTE *)"value"}; + WS_MESSAGE *msg; + HRESULT hr; + + hr = WsAddMappedHeader( NULL, NULL, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, NULL, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, 0, 0, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* again */ + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -680,4 +714,5 @@ START_TEST(msg) test_WsWriteBody(); test_WsSetHeader(); test_WsRemoveHeader(); + test_WsAddMappedHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 59f9856..bdf6c3f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -7,7 +7,7 @@ @ stub WsAcceptChannel @ stub WsAddCustomHeader @ stub WsAddErrorString -@ stub WsAddMappedHeader +@ stdcall WsAddMappedHeader(ptr ptr long long ptr long ptr) @ stdcall WsAddressMessage(ptr ptr ptr) @ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute

1 0