wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Paul Gofman : d3dx9/tests: Add test for shared effect parameters.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: fcca13433365df6b15af12ff3b6d11dc47d6d75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcca13433365df6b15af12ff3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 20 14:26:43 2017 +0300 d3dx9/tests: Add test for shared effect parameters. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 368 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 368 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcca13433365df6b15af1…

1 0

Akihiro Sagawa : secur32/tests: Add tests with SECPKG_ATTR_KEY_INFO.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 8b2e3c67961c11531e041e5895025c0fb49bbe13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2e3c67961c11531e041e589… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 20 20:58:37 2017 +0900 secur32/tests: Add tests with SECPKG_ATTR_KEY_INFO. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b52510d..b12a739 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -684,6 +684,7 @@ static void test_communication(void) SecPkgCredentials_NamesA names; SecPkgContext_StreamSizes sizes; SecPkgContext_ConnectionInfo conn_info; + SecPkgContext_KeyInfoA key_info; CERT_CONTEXT *cert; SecBufferDesc buffers[2]; @@ -923,6 +924,18 @@ todo_wine ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_KEY_INFO, &key_info); + todo_wine ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_KEY_INFO) failed: %08x\n", status); + if(status == SEC_E_OK) { + ok(broken(key_info.SignatureAlgorithm == 0 /* WinXP,2003 */) || + key_info.SignatureAlgorithm == CALG_RSA_SIGN, + "key_info.SignatureAlgorithm = %04x\n", key_info.SignatureAlgorithm); + ok(broken(key_info.SignatureAlgorithm == 0 /* WinXP,2003 */) || + !strcmp(key_info.sSignatureAlgorithmName, "RSA"), + "key_info.sSignatureAlgorithmName = %s\n", key_info.sSignatureAlgorithmName); + ok(key_info.KeySize >= 128, "key_info.KeySize = %d\n", key_info.KeySize); + } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status);

1 0

Alexandre Julliard : libwine: Clear the %fs register we got from Android to force allocating a new one.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 5142e56aeec8edd85906af021b9d4c886cff02d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5142e56aeec8edd85906af021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 19:25:39 2017 +0200 libwine: Clear the %fs register we got from Android to force allocating a new one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index b5b32cc..89ae935 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -887,7 +887,16 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo java_object = (*env)->NewGlobalRef( env, obj ); +#ifdef __i386__ + { + unsigned short java_fs = wine_get_fs(); + wine_set_fs( 0 ); + wine_init( argc, argv, error, sizeof(error) ); + wine_set_fs( java_fs ); + } +#else wine_init( argc, argv, error, sizeof(error) ); +#endif return (*env)->NewStringUTF( env, error ); }

1 0

Alexandre Julliard : libwine: Set a non-null entry for the GDT selector to make sure it' s properly reserved.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 2b1b7a0a80951700e56231d1310e0853564c9c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1b7a0a80951700e56231d13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 18:55:17 2017 +0200 libwine: Set a non-null entry for the GDT selector to make sure it's properly reserved. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/ldt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 0946407..4ecd48a 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -384,8 +384,10 @@ unsigned short wine_ldt_alloc_fs(void) global_fs_sel = wine_get_fs(); if (global_fs_sel && is_gdt_sel(global_fs_sel)) return global_fs_sel; + memset( &ldt_info, 0, sizeof(ldt_info) ); ldt_info.entry_number = -1; - fill_modify_ldt_struct( &ldt_info, &null_entry ); + ldt_info.seg_32bit = 1; + ldt_info.usable = 1; if ((ret = set_thread_area( &ldt_info ) < 0)) { global_fs_sel = 0; /* don't try it again */

1 0

Huw Davies : user32: Fix a potential buffer overflow.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: e0843d234efc4d1b1636a9f8c077934bd8c87129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0843d234efc4d1b1636a9f8c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 21 15:07:31 2017 +0100 user32: Fix a potential buffer overflow. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 63c4ffe..67b052e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -548,7 +548,7 @@ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) if (RegQueryValueExW( base_key, entry->regval + 1, NULL, &type, data, &count )) count = 0; } /* make sure strings are null-terminated */ - if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count - 1] = 0; + if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count / sizeof(WCHAR) - 1] = 0; entry->loaded = TRUE; return count; }

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: e725d9e3c7c30cfa295bc9577a59c6e2d5f14942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e725d9e3c7c30cfa295bc9577… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 21 12:37:05 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/listener.c | 172 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index 9aaf330..929b197 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -240,10 +240,182 @@ static void test_WsResetListener(void) WsFreeListener( listener ); } +struct listener_info +{ + int port; + HANDLE wait; + WS_CHANNEL_BINDING binding; + WS_CHANNEL_TYPE type; +}; + +static DWORD CALLBACK listener_proc( void *arg ) +{ + static const WCHAR fmt_tcp[] = {'n','e','t','.','t','c','p',':','/','/','+',':','%','u',0}; + static const WCHAR fmt_udp[] = {'s','o','a','p','.','u','d','p',':','/','/','+',':','%','u',0}; + struct listener_info *info = arg; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc_resp; + const WS_MESSAGE_DESCRIPTION *desc[1]; + INT32 val = 0; + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WCHAR buf[64]; + WS_STRING url; + HRESULT hr; + + hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + url.length = wsprintfW( buf, fmt, info->port ); + url.chars = buf; + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + SetEvent( info->wait ); + + hr = WsAcceptChannel( listener, channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + desc_resp.action = &action; + desc_resp.bodyElementDescription = &body; + desc[0] = &desc_resp; + + hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == -1, "got %d\n", val ); + WsFreeMessage( msg ); + + SetEvent( info->wait ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeChannel( channel ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeListener( listener ); + + return 0; +} + +static void test_WsAcceptChannel( const struct listener_info *info ) +{ + static const WCHAR fmt_tcp[] = + {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + static const WCHAR fmt_udp[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; + WCHAR buf[64]; + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WS_ENDPOINT_ADDRESS addr; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc; + INT32 val = -1; + HRESULT hr; + DWORD err; + + hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAcceptChannel( listener, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAcceptChannel( listener, channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + WsFreeChannel( channel ); + WsFreeListener( listener ); + + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, fmt, info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + desc.action = &action; + desc.bodyElementDescription = &body; + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); + WsFreeChannel( channel ); +} + +static HANDLE start_listener( struct listener_info *info ) +{ + DWORD err; + HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); + ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "failed to start listener %u\n", err ); + return thread; +} + START_TEST(listener) { + struct listener_info info; + HANDLE thread; + test_WsCreateListener(); test_WsOpenListener(); test_WsCreateChannelForListener(); test_WsResetListener(); + + info.port = 7533; + info.wait = CreateEventW( NULL, 0, 0, NULL ); + info.type = WS_CHANNEL_TYPE_DUPLEX; + info.binding = WS_UDP_CHANNEL_BINDING; + + thread = start_listener( &info ); + test_WsAcceptChannel( &info ); + WaitForSingleObject( thread, 3000 ); + + info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; + info.binding = WS_TCP_CHANNEL_BINDING; + + thread = start_listener( &info ); + test_WsAcceptChannel( &info ); + WaitForSingleObject( thread, 3000 ); }

1 0

Hans Leidekker : webservices: Read message headers in read_envelope_start.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 31b0d5fab893130d85151aa0a0d8edce9f657ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b0d5fab893130d85151aa0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 21 12:37:04 2017 +0200 webservices: Read message headers in read_envelope_start. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 9e94d7c..ac955bd 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -758,12 +758,21 @@ static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *l static HRESULT read_envelope_start( WS_XML_READER *reader ) { static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, body = {4, (BYTE *)"Body"}; + static const WS_XML_STRING header = {6, (BYTE *)"Header"}; HRESULT hr; if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; if (!match_current_element( reader, &envelope )) return WS_E_INVALID_FORMAT; - /* FIXME: read headers */ if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if (match_current_element( reader, &header )) + { + for (;;) + { + /* FIXME: store headers */ + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if (match_current_element( reader, &body )) break; + } + } if (!match_current_element( reader, &body )) return WS_E_INVALID_FORMAT; return WsReadNode( reader, NULL ); }

1 0

Hans Leidekker : webservices: Add support for incoming UDP connections.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 0ab53b3f91a138b3d248e724adbdce8e9421259a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab53b3f91a138b3d248e724a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 21 12:37:03 2017 +0200 webservices: Add support for incoming UDP connections. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 29 +++++++++++++++++++++ dlls/webservices/listener.c | 63 +++++++++++++++++++++++++++++++++++++++++++-- dlls/webservices/sock.h | 1 + 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 3663fdf..d35da4e 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1067,3 +1067,32 @@ HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) LeaveCriticalSection( &channel->cs ); return S_OK; } + +static HRESULT sock_wait( SOCKET socket ) +{ + fd_set read; + + FD_ZERO( &read ); + FD_SET( socket, &read ); + if (select( socket + 1, &read, NULL, NULL, NULL ) < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); + return S_OK; +} + +HRESULT channel_accept_udp( SOCKET socket, WS_CHANNEL *handle ) +{ + struct channel *channel = (struct channel *)handle; + HRESULT hr; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + if ((hr = sock_wait( socket )) == S_OK) channel->u.udp.socket = socket; + + LeaveCriticalSection( &channel->cs ); + return hr; +} diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a82897e..7d49b73 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -81,6 +81,10 @@ struct listener { SOCKET socket; } tcp; + struct + { + SOCKET socket; + } udp; } u; ULONG prop_count; struct prop prop[sizeof(listener_props)/sizeof(listener_props[0])]; @@ -116,6 +120,11 @@ static void reset_listener( struct listener *listener ) listener->u.tcp.socket = -1; break; + case WS_UDP_CHANNEL_BINDING: + closesocket( listener->u.udp.socket ); + listener->u.udp.socket = -1; + break; + default: break; } } @@ -157,6 +166,10 @@ static HRESULT create_listener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding listener->u.tcp.socket = -1; break; + case WS_UDP_CHANNEL_BINDING: + listener->u.udp.socket = -1; + break; + default: break; } @@ -181,12 +194,12 @@ HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING bindin if (!handle) return E_INVALIDARG; - if (type != WS_CHANNEL_TYPE_DUPLEX_SESSION) + if (type != WS_CHANNEL_TYPE_DUPLEX_SESSION && type != WS_CHANNEL_TYPE_DUPLEX) { FIXME( "channel type %u not implemented\n", type ); return E_NOTIMPL; } - if (binding != WS_TCP_CHANNEL_BINDING) + if (binding != WS_TCP_CHANNEL_BINDING && binding != WS_UDP_CHANNEL_BINDING) { FIXME( "channel binding %u not implemented\n", binding ); return E_NOTIMPL; @@ -322,6 +335,43 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur return S_OK; } +static HRESULT open_listener_udp( struct listener *listener, const WS_STRING *url ) +{ + struct sockaddr_storage storage; + struct sockaddr *addr = (struct sockaddr *)&storage; + int addr_len; + WS_URL_SCHEME_TYPE scheme; + WCHAR *host; + USHORT port; + HRESULT hr; + + if ((hr = parse_url( url, &scheme, &host, &port )) != S_OK) return hr; + if (scheme != WS_URL_SOAPUDP_SCHEME_TYPE) + { + heap_free( host ); + return WS_E_INVALID_ENDPOINT_URL; + } + + winsock_init(); + + hr = resolve_hostname( host, port, addr, &addr_len ); + heap_free( host ); + if (hr != S_OK) return hr; + + if ((listener->u.udp.socket = socket( addr->sa_family, SOCK_DGRAM, 0 )) == -1) + return HRESULT_FROM_WIN32( WSAGetLastError() ); + + if (bind( listener->u.udp.socket, addr, addr_len ) < 0) + { + closesocket( listener->u.udp.socket ); + listener->u.udp.socket = -1; + return HRESULT_FROM_WIN32( WSAGetLastError() ); + } + + listener->state = WS_LISTENER_STATE_OPEN; + return S_OK; +} + static HRESULT open_listener( struct listener *listener, const WS_STRING *url ) { switch (listener->binding) @@ -329,6 +379,9 @@ static HRESULT open_listener( struct listener *listener, const WS_STRING *url ) case WS_TCP_CHANNEL_BINDING: return open_listener_tcp( listener, url ); + case WS_UDP_CHANNEL_BINDING: + return open_listener_udp( listener, url ); + default: ERR( "unhandled binding %u\n", listener->binding ); return E_NOTIMPL; @@ -544,6 +597,12 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, hr = channel_accept_tcp( listener->u.tcp.socket, channel_handle ); break; + case WS_UDP_CHANNEL_BINDING: + /* hand over socket on success */ + if ((hr = channel_accept_udp( listener->u.udp.socket, channel_handle )) == S_OK) + listener->u.udp.socket = -1; + break; + default: FIXME( "listener binding %u not supported\n", listener->binding ); hr = E_NOTIMPL; diff --git a/dlls/webservices/sock.h b/dlls/webservices/sock.h index f420b02..6b30f64 100644 --- a/dlls/webservices/sock.h +++ b/dlls/webservices/sock.h @@ -21,3 +21,4 @@ void winsock_init(void) DECLSPEC_HIDDEN; HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int * ) DECLSPEC_HIDDEN; HRESULT channel_accept_tcp( SOCKET, WS_CHANNEL * ) DECLSPEC_HIDDEN; +HRESULT channel_accept_udp( SOCKET, WS_CHANNEL * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Add support for incoming TCP connections.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 17a3dd17ce11f6d0ba51e4dbeab1882835e49499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a3dd17ce11f6d0ba51e4dbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 21 12:37:02 2017 +0200 webservices: Add support for incoming TCP connections. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 22 ++++++++ dlls/webservices/listener.c | 106 +++++++++++++++++++++++++++++++++----- dlls/webservices/sock.h | 1 + dlls/webservices/webservices.spec | 2 +- 4 files changed, 117 insertions(+), 14 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 6c4b3d0..3663fdf 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1045,3 +1045,25 @@ done: LeaveCriticalSection( &channel->cs ); return hr; } + +HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) +{ + struct channel *channel = (struct channel *)handle; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + if ((channel->u.tcp.socket = accept( socket, NULL, NULL )) == -1) + { + LeaveCriticalSection( &channel->cs ); + return HRESULT_FROM_WIN32( WSAGetLastError() ); + } + + LeaveCriticalSection( &channel->cs ); + return S_OK; +} diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 9d16ed1..a82897e 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -75,7 +75,13 @@ struct listener WS_CHANNEL_TYPE type; WS_CHANNEL_BINDING binding; WS_LISTENER_STATE state; - SOCKET socket; + union + { + struct + { + SOCKET socket; + } tcp; + } u; ULONG prop_count; struct prop prop[sizeof(listener_props)/sizeof(listener_props[0])]; }; @@ -101,9 +107,17 @@ static struct listener *alloc_listener(void) static void reset_listener( struct listener *listener ) { - closesocket( listener->socket ); - listener->socket = -1; - listener->state = WS_LISTENER_STATE_CREATED; + listener->state = WS_LISTENER_STATE_CREATED; + + switch (listener->binding) + { + case WS_TCP_CHANNEL_BINDING: + closesocket( listener->u.tcp.socket ); + listener->u.tcp.socket = -1; + break; + + default: break; + } } static void free_listener( struct listener *listener ) @@ -136,7 +150,15 @@ static HRESULT create_listener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding listener->type = type; listener->binding = binding; - listener->socket = -1; + + switch (listener->binding) + { + case WS_TCP_CHANNEL_BINDING: + listener->u.tcp.socket = -1; + break; + + default: break; + } *ret = listener; return S_OK; @@ -256,7 +278,7 @@ HRESULT parse_url( const WS_STRING *str, WS_URL_SCHEME_TYPE *scheme, WCHAR **hos return hr; } -static HRESULT open_listener( struct listener *listener, const WS_STRING *url ) +static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *url ) { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; @@ -279,20 +301,20 @@ static HRESULT open_listener( struct listener *listener, const WS_STRING *url ) heap_free( host ); if (hr != S_OK) return hr; - if ((listener->socket = socket( addr->sa_family, SOCK_STREAM, 0 )) == -1) + if ((listener->u.tcp.socket = socket( addr->sa_family, SOCK_STREAM, 0 )) == -1) return HRESULT_FROM_WIN32( WSAGetLastError() ); - if (bind( listener->socket, addr, addr_len ) < 0) + if (bind( listener->u.tcp.socket, addr, addr_len ) < 0) { - closesocket( listener->socket ); - listener->socket = -1; + closesocket( listener->u.tcp.socket ); + listener->u.tcp.socket = -1; return HRESULT_FROM_WIN32( WSAGetLastError() ); } - if (listen( listener->socket, 0 ) < 0) + if (listen( listener->u.tcp.socket, 0 ) < 0) { - closesocket( listener->socket ); - listener->socket = -1; + closesocket( listener->u.tcp.socket ); + listener->u.tcp.socket = -1; return HRESULT_FROM_WIN32( WSAGetLastError() ); } @@ -300,6 +322,19 @@ static HRESULT open_listener( struct listener *listener, const WS_STRING *url ) return S_OK; } +static HRESULT open_listener( struct listener *listener, const WS_STRING *url ) +{ + switch (listener->binding) + { + case WS_TCP_CHANNEL_BINDING: + return open_listener_tcp( listener, url ); + + default: + ERR( "unhandled binding %u\n", listener->binding ); + return E_NOTIMPL; + } +} + /************************************************************************** * WsOpenListener [webservices.@] */ @@ -473,3 +508,48 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ LeaveCriticalSection( &listener->cs ); return hr; } + +/************************************************************************** + * WsAcceptChannel [webservices.@] + */ +HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + HRESULT hr; + + TRACE( "%p %p %p %p\n", handle, channel_handle, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!listener || !channel_handle) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + if (listener->state != WS_LISTENER_STATE_OPEN) + { + LeaveCriticalSection( &listener->cs ); + return WS_E_INVALID_OPERATION; + } + + switch (listener->binding) + { + case WS_TCP_CHANNEL_BINDING: + hr = channel_accept_tcp( listener->u.tcp.socket, channel_handle ); + break; + + default: + FIXME( "listener binding %u not supported\n", listener->binding ); + hr = E_NOTIMPL; + break; + } + + LeaveCriticalSection( &listener->cs ); + return hr; +} diff --git a/dlls/webservices/sock.h b/dlls/webservices/sock.h index dd36a79..f420b02 100644 --- a/dlls/webservices/sock.h +++ b/dlls/webservices/sock.h @@ -20,3 +20,4 @@ void winsock_init(void) DECLSPEC_HIDDEN; HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int * ) DECLSPEC_HIDDEN; +HRESULT channel_accept_tcp( SOCKET, WS_CHANNEL * ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index f55bef8..c55e304 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -4,7 +4,7 @@ @ stub WsAbortListener @ stub WsAbortServiceHost @ stdcall WsAbortServiceProxy(ptr ptr) -@ stub WsAcceptChannel +@ stdcall WsAcceptChannel(ptr ptr ptr ptr) @ stdcall WsAddCustomHeader(ptr ptr long ptr long long ptr) @ stub WsAddErrorString @ stdcall WsAddMappedHeader(ptr ptr long long ptr long ptr)

1 0

Hans Leidekker : webservices: Add support for outgoing UDP connections.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: e64d8f1b0b3fa520ca1e9bb5994f255443222569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64d8f1b0b3fa520ca1e9bb59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 21 12:37:01 2017 +0200 webservices: Add support for outgoing UDP connections. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 162c634..6c4b3d0 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -108,6 +108,10 @@ struct channel { SOCKET socket; } tcp; + struct + { + SOCKET socket; + } udp; } u; char *read_buf; ULONG read_buflen; @@ -160,6 +164,11 @@ static void reset_channel( struct channel *channel ) channel->u.tcp.socket = -1; break; + case WS_UDP_CHANNEL_BINDING: + closesocket( channel->u.udp.socket ); + channel->u.udp.socket = -1; + break; + default: break; } } @@ -210,6 +219,10 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, channel->u.tcp.socket = -1; break; + case WS_UDP_CHANNEL_BINDING: + channel->u.udp.socket = -1; + break; + default: break; } @@ -240,7 +253,8 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding FIXME( "channel type %u not implemented\n", type ); return E_NOTIMPL; } - if (binding != WS_HTTP_CHANNEL_BINDING && binding != WS_TCP_CHANNEL_BINDING) + if (binding != WS_HTTP_CHANNEL_BINDING && binding != WS_TCP_CHANNEL_BINDING && + binding != WS_UDP_CHANNEL_BINDING) { FIXME( "channel binding %u not implemented\n", binding ); return E_NOTIMPL; @@ -640,6 +654,44 @@ static HRESULT connect_channel_tcp( struct channel *channel ) return S_OK; } +static HRESULT connect_channel_udp( struct channel *channel ) +{ + struct sockaddr_storage storage; + struct sockaddr *addr = (struct sockaddr *)&storage; + int addr_len; + WS_URL_SCHEME_TYPE scheme; + WCHAR *host; + USHORT port; + HRESULT hr; + + if (channel->u.udp.socket != -1) return S_OK; + + if ((hr = parse_url( &channel->addr.url, &scheme, &host, &port )) != S_OK) return hr; + if (scheme != WS_URL_SOAPUDP_SCHEME_TYPE) + { + heap_free( host ); + return WS_E_INVALID_ENDPOINT_URL; + } + + winsock_init(); + + hr = resolve_hostname( host, port, addr, &addr_len ); + heap_free( host ); + if (hr != S_OK) return hr; + + if ((channel->u.udp.socket = socket( addr->sa_family, SOCK_DGRAM, 0 )) == -1) + return HRESULT_FROM_WIN32( WSAGetLastError() ); + + if (connect( channel->u.udp.socket, addr, addr_len ) < 0) + { + closesocket( channel->u.udp.socket ); + channel->u.udp.socket = -1; + return HRESULT_FROM_WIN32( WSAGetLastError() ); + } + + return S_OK; +} + static HRESULT connect_channel( struct channel *channel ) { switch (channel->binding) @@ -650,6 +702,9 @@ static HRESULT connect_channel( struct channel *channel ) case WS_TCP_CHANNEL_BINDING: return connect_channel_tcp( channel ); + case WS_UDP_CHANNEL_BINDING: + return connect_channel_udp( channel ); + default: ERR( "unhandled binding %u\n", channel->binding ); return E_NOTIMPL; @@ -702,6 +757,9 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg ) case WS_TCP_CHANNEL_BINDING: return send_message_sock( channel->u.tcp.socket, buf.bytes, buf.length ); + case WS_UDP_CHANNEL_BINDING: + return send_message_sock( channel->u.udp.socket, buf.bytes, buf.length ); + default: ERR( "unhandled binding %u\n", channel->binding ); return E_NOTIMPL; @@ -885,6 +943,9 @@ static HRESULT receive_message( struct channel *channel ) case WS_TCP_CHANNEL_BINDING: return receive_message_sock( channel, channel->u.tcp.socket ); + case WS_UDP_CHANNEL_BINDING: + return receive_message_sock( channel, channel->u.udp.socket ); + default: ERR( "unhandled binding %u\n", channel->binding ); return E_NOTIMPL;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017