wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Hugh McMaster : regedit: Use shared code to add favourite key items to the 'Remove' listbox.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 75fed2d5a1360d7769f42122b95c8d4087cd0889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fed2d5a1360d7769f42122b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 6 08:01:07 2017 +0000 regedit: Use shared code to add favourite key items to the 'Remove' listbox. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 46 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 9853810..0503dc8 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -215,15 +215,15 @@ static void add_remove_modify_menu_items(HMENU hMenu) } } -static void add_favourite_key_menu_items(HMENU hMenu) +static int add_favourite_key_items(HMENU hMenu, HWND hList) { HKEY hkey; LONG rc; - DWORD num_values, max_value_len, value_len, type, i; + DWORD num_values, max_value_len, value_len, type, i = 0; WCHAR *value_name; rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey); - if (rc != ERROR_SUCCESS) return; + if (rc != ERROR_SUCCESS) return 0; rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values, &max_value_len, NULL, NULL, NULL); @@ -239,19 +239,25 @@ static void add_favourite_key_menu_items(HMENU hMenu) value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(value_name); - AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); + if (hMenu) AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); for (i = 0; i < num_values; i++) { value_len = max_value_len; rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL); if (rc == ERROR_SUCCESS && type == REG_SZ) - AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + { + if (hMenu) + AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + else if (hList) + SendMessageW(hList, LB_ADDSTRING, 0, (LPARAM)value_name); + } } HeapFree(GetProcessHeap(), 0, value_name); exit: RegCloseKey(hkey); + return i; } static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) @@ -263,7 +269,7 @@ static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) while (GetMenuItemCount(hMenu) > 2) DeleteMenu(hMenu, 2, MF_BYPOSITION); - add_favourite_key_menu_items(hMenu); + add_favourite_key_items(hMenu, NULL); } UpdateMenuItems(hMenu); @@ -710,35 +716,11 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w HWND hwndList = GetDlgItem(hwndDlg, IDC_NAME_LIST); switch(uMsg) { - case WM_INITDIALOG: { - HKEY hKey; - int i = 0; - EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, - 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - WCHAR namebuf[KEY_MAX_LEN]; - BYTE valuebuf[4096]; - DWORD ksize, vsize, type; - LONG error; - do { - ksize = KEY_MAX_LEN; - vsize = sizeof(valuebuf); - error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); - if (error != ERROR_SUCCESS) - break; - if (type == REG_SZ) { - SendMessageW(hwndList, LB_ADDSTRING, 0, (LPARAM)namebuf); - } - i++; - } while(error == ERROR_SUCCESS); - RegCloseKey(hKey); - } - else + case WM_INITDIALOG: + if (!add_favourite_key_items(NULL, hwndList)) return FALSE; - EnableWindow(GetDlgItem(hwndDlg, IDOK), i != 0); SendMessageW(hwndList, LB_SETCURSEL, 0, 0); return TRUE; - } case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_NAME_LIST:

1 0

Hans Leidekker : webservices: Pass AI_PASSIVE when resolving the hostname for a listener socket.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 1fb0e25cfb32438aa0b1439a410e195af0e2fde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb0e25cfb32438aa0b1439a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:56:01 2017 +0200 webservices: Pass AI_PASSIVE when resolving the hostname for a listener socket. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 4 ++-- dlls/webservices/listener.c | 14 +++++++++----- dlls/webservices/sock.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9fb1944..1fa96a9 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -637,7 +637,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, 0 ); heap_free( host ); if (hr != S_OK) return hr; @@ -675,7 +675,7 @@ static HRESULT connect_channel_udp( struct channel *channel ) winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, 0 ); heap_free( host ); if (hr != S_OK) return hr; diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 764e002..a658ee7 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -256,16 +256,20 @@ void WINAPI WsFreeListener( WS_LISTENER *handle ) free_listener( listener ); } -HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len ) +HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len, int flags ) { static const WCHAR fmtW[] = {'%','u',0}; WCHAR service[6]; - ADDRINFOW *res, *info; + ADDRINFOW hints, *res, *info; HRESULT hr = WS_E_ADDRESS_NOT_AVAILABLE; + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = flags; + hints.ai_family = AF_INET; + *addr_len = 0; sprintfW( service, fmtW, port ); - if (GetAddrInfoW( host, service, NULL, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (GetAddrInfoW( host, service, &hints, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); info = res; while (info && info->ai_family != AF_INET) info = info->ai_next; @@ -330,7 +334,7 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE ); heap_free( host ); if (hr != S_OK) return hr; @@ -381,7 +385,7 @@ static HRESULT open_listener_udp( struct listener *listener, const WS_STRING *ur winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE ); heap_free( host ); if (hr != S_OK) return hr; diff --git a/dlls/webservices/sock.h b/dlls/webservices/sock.h index e03b91e..282a777 100644 --- a/dlls/webservices/sock.h +++ b/dlls/webservices/sock.h @@ -19,6 +19,6 @@ #include "ws2tcpip.h" void winsock_init(void) DECLSPEC_HIDDEN; -HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int * ) DECLSPEC_HIDDEN; +HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int *, int ) DECLSPEC_HIDDEN; HRESULT channel_accept_tcp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN; HRESULT channel_accept_udp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Restrict connections to IPv4 for now.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: b45879986379c39c3f8d382e01347d0151304540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45879986379c39c3f8d382e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:56:00 2017 +0200 webservices: Restrict connections to IPv4 for now. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index af39783..764e002 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -268,7 +268,7 @@ HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, if (GetAddrInfoW( host, service, NULL, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); info = res; - while (info && info->ai_family != AF_INET && info->ai_family != AF_INET6) info = info->ai_next; + while (info && info->ai_family != AF_INET) info = info->ai_next; if (info) { memcpy( addr, info->ai_addr, info->ai_addrlen );

1 0

Hans Leidekker : webservices: Set SO_REUSEADDR on listener sockets.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: cb1882f72e8c6e2cfab123e48c5ae2a05bcbd0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1882f72e8c6e2cfab123e48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:59 2017 +0200 webservices: Set SO_REUSEADDR on listener sockets. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 5d6d1a8..af39783 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -315,7 +315,7 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; - int addr_len; + int addr_len, on = 1; WS_URL_SCHEME_TYPE scheme; WCHAR *host; USHORT port; @@ -337,6 +337,13 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur if ((listener->u.tcp.socket = socket( addr->sa_family, SOCK_STREAM, 0 )) == -1) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (setsockopt( listener->u.tcp.socket, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on) ) < 0) + { + closesocket( listener->u.tcp.socket ); + listener->u.tcp.socket = -1; + return HRESULT_FROM_WIN32( WSAGetLastError() ); + } + if (bind( listener->u.tcp.socket, addr, addr_len ) < 0) { closesocket( listener->u.tcp.socket );

1 0

Hans Leidekker : webservices: Support more text record types in the reader.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 06f6346df329babf3bf9d3defefdec6fb6e047ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f6346df329babf3bf9d3def… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:58 2017 +0200 webservices: Support more text record types in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 131 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 107 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7c0a2eb..d781023 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1477,6 +1477,8 @@ static HRESULT read_dict_string( struct reader *reader, WS_XML_STRING **str ) static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE *attr ) { + static const unsigned char zero[] = {'0'}, one[] = {'1'}; + static const unsigned char false[] = {'f','a','l','s','e'}, true[] = {'t','r','u','e'}; WS_XML_UTF8_TEXT *utf8 = NULL; unsigned char type; HRESULT hr; @@ -1487,6 +1489,22 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE switch (type) { + case RECORD_ZERO_TEXT: + if (!(utf8 = alloc_utf8_text( zero, sizeof(zero) ))) return E_OUTOFMEMORY; + break; + + case RECORD_ONE_TEXT: + if (!(utf8 = alloc_utf8_text( one, sizeof(one) ))) return E_OUTOFMEMORY; + break; + + case RECORD_FALSE_TEXT: + if (!(utf8 = alloc_utf8_text( false, sizeof(false) ))) return E_OUTOFMEMORY; + break; + + case RECORD_TRUE_TEXT: + if (!(utf8 = alloc_utf8_text( true, sizeof(true) ))) return E_OUTOFMEMORY; + break; + case RECORD_CHARS8_TEXT: { unsigned char len8; @@ -1494,17 +1512,34 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE len = len8; break; } + case RECORD_EMPTY_TEXT: + len = 0; + break; + + case RECORD_DICTIONARY_TEXT: + { + ULONG id; + if ((hr = read_int31( reader, &id )) != S_OK) return hr; + if (!reader->dict || (id >>= 1) >= reader->dict->stringCount) return WS_E_INVALID_FORMAT; + if (!(utf8 = alloc_utf8_text( reader->dict->strings[id].bytes, reader->dict->strings[id].length ))) + return E_OUTOFMEMORY; + break; + } + default: ERR( "unhandled record type %02x\n", type ); return WS_E_NOT_SUPPORTED; } - if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; - if (!len) utf8->value.bytes = (BYTE *)(utf8 + 1); /* quirk */ - if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + if (!utf8) { - heap_free( utf8 ); - return hr; + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if (!len) utf8->value.bytes = (BYTE *)(utf8 + 1); /* quirk */ + if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + { + heap_free( utf8 ); + return hr; + } } attr->value = &utf8->text; @@ -1967,20 +2002,59 @@ static HRESULT read_text_text( struct reader *reader ) return S_OK; } -static HRESULT read_text_bin( struct reader *reader ) +static struct node *alloc_text_node( const unsigned char *data, ULONG len, unsigned char **ptr ) { - unsigned char type; - struct node *node, *parent; - WS_XML_TEXT_NODE *text; + struct node *node; WS_XML_UTF8_TEXT *utf8; + WS_XML_TEXT_NODE *text; + + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return NULL; + text = (WS_XML_TEXT_NODE *)node; + if (!(utf8 = alloc_utf8_text( data, len ))) + { + heap_free( node ); + return NULL; + } + text->text = &utf8->text; + if (ptr) *ptr = utf8->value.bytes; + return node; +} + +static HRESULT read_text_bin( struct reader *reader ) +{ + static const unsigned char zero[] = {'0'}, one[] = {'1'}; + static const unsigned char false[] = {'f','a','l','s','e'}, true[] = {'t','r','u','e'}; + unsigned char type, *ptr; + struct node *node = NULL, *parent; ULONG len; HRESULT hr; if ((hr = read_byte( reader, &type )) != S_OK) return hr; - if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; switch (type) { + case RECORD_ZERO_TEXT: + case RECORD_ZERO_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( zero, sizeof(zero), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_ONE_TEXT: + case RECORD_ONE_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( one, sizeof(one), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_FALSE_TEXT: + case RECORD_FALSE_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( false, sizeof(false), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_TRUE_TEXT: + case RECORD_TRUE_TEXT_WITH_ENDELEMENT: + if (!(node = alloc_text_node( true, sizeof(true), NULL ))) return E_OUTOFMEMORY; + break; + + case RECORD_CHARS8_TEXT: case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: { unsigned char len8; @@ -1988,27 +2062,36 @@ static HRESULT read_text_bin( struct reader *reader ) len = len8; break; } + + case RECORD_EMPTY_TEXT: + case RECORD_EMPTY_TEXT_WITH_ENDELEMENT: + len = 0; + break; + + case RECORD_DICTIONARY_TEXT: + case RECORD_DICTIONARY_TEXT_WITH_ENDELEMENT: + { + ULONG id; + if ((hr = read_int31( reader, &id )) != S_OK) return hr; + if (!reader->dict || (id >>= 1) >= reader->dict->stringCount) return WS_E_INVALID_FORMAT; + if (!(node = alloc_text_node( reader->dict->strings[id].bytes, reader->dict->strings[id].length, NULL ))) + return E_OUTOFMEMORY; + break; + } default: ERR( "unhandled record type %02x\n", type ); return WS_E_NOT_SUPPORTED; } - if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; - - if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; - text = (WS_XML_TEXT_NODE *)node; - if (!(utf8 = alloc_utf8_text( NULL, len ))) - { - heap_free( node ); - return E_OUTOFMEMORY; - } - if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + if (!node) { - heap_free( utf8 ); - heap_free( node ); - return hr; + if (!(node = alloc_text_node( NULL, len, &ptr ))) return E_OUTOFMEMORY; + if ((hr = read_bytes( reader, ptr, len )) != S_OK) + { + free_node( node ); + return hr; + } } - text->text = &utf8->text; read_insert_node( reader, parent, node ); reader->state = READER_STATE_TEXT;

1 0

Hans Leidekker : webservices: Implement WsGetCustomHeader.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 03a63781fa47d50a05e29c907d32817aba5e40df URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a63781fa47d50a05e29c907… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:57 2017 +0200 webservices: Implement WsGetCustomHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 91 ++++++++++++++++++++++++++++++++++----- dlls/webservices/tests/msg.c | 68 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 149 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 6d61aa0..74c6fd1 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1081,23 +1081,16 @@ done: return hr; } -static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYPE value_type, - WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) +static HRESULT find_header( WS_XML_READER *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - const WS_XML_STRING *localname = get_header_name( type ); - const WS_XML_STRING *ns = get_addr_namespace( msg->version_addr ); - const WS_XML_ELEMENT_NODE *elem; const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; HRESULT hr; - if (!heap) heap = msg->heap; - if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; - if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; - for (;;) { - if ((hr = WsReadNode( msg->reader, NULL )) != S_OK) return hr; - if ((hr = WsGetReaderNode( msg->reader, &node, NULL )) != S_OK) return hr; + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if ((hr = WsGetReaderNode( reader, &node, NULL )) != S_OK) return hr; if (node->nodeType == WS_XML_NODE_TYPE_EOF) return WS_E_INVALID_FORMAT; if (node->nodeType != WS_XML_NODE_TYPE_ELEMENT) continue; @@ -1106,6 +1099,21 @@ static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYP WsXmlStringEquals( elem->ns, ns, NULL ) == S_OK) break; } + return S_OK; +} + +static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYPE value_type, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) +{ + const WS_XML_STRING *localname = get_header_name( type ); + const WS_XML_STRING *ns = get_addr_namespace( msg->version_addr ); + HRESULT hr; + + if (!heap) heap = msg->heap; + if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; + if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + + if ((hr = find_header( msg->reader, localname, ns )) != S_OK) return hr; return read_header( msg->reader, localname, ns, value_type, NULL, option, heap, value, size ); } @@ -1463,6 +1471,67 @@ done: return hr; } +static HRESULT get_custom_header( struct msg *msg, const WS_ELEMENT_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size ) +{ + HRESULT hr; + if (!heap) heap = msg->heap; + if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; + if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + + if ((hr = find_header( msg->reader, desc->elementLocalName, desc->elementNs )) != S_OK) return hr; + return read_header( msg->reader, desc->elementLocalName, desc->elementNs, desc->type, desc->typeDescription, + option, heap, value, size ); +} + +/************************************************************************** + * WsGetCustomHeader [webservices.@] + */ +HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *desc, + WS_REPEATING_HEADER_OPTION repeat_option, ULONG index, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size, ULONG *attrs, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %p %08x %u %08x %p %p %u %p %p\n", handle, desc, repeat_option, index, option, heap, value, + size, attrs, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!msg || !desc || repeat_option < WS_REPEATING_HEADER || repeat_option > WS_SINGLETON_HEADER || + (repeat_option == WS_SINGLETON_HEADER && index)) return E_INVALIDARG; + + if (repeat_option == WS_REPEATING_HEADER) + { + FIXME( "repeating header not supported\n" ); + return E_NOTIMPL; + } + if (attrs) + { + FIXME( "attributes not supported\n" ); + return E_NOTIMPL; + } + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) + { + LeaveCriticalSection( &msg->cs ); + return WS_E_INVALID_OPERATION; + } + + hr = get_custom_header( msg, desc, option, heap, value, size ); + + LeaveCriticalSection( &msg->cs ); + return hr; +} + /************************************************************************** * WsRemoveCustomHeader [webservices.@] */ diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 4b33b55..d26293b 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1268,6 +1268,73 @@ static void test_WsGetHeader(void) WsFreeMessage( msg ); } +static void test_WsGetCustomHeader(void) +{ + static char expected[] = + "<Envelope><Header><Custom xmlns=\"ns\">value</Custom></Header><Body/></Envelope>"; + static WS_XML_STRING custom = {6, (BYTE *)"Custom"}, ns = {2, (BYTE *)"ns"}; + static WCHAR valueW[] = {'v','a','l','u','e',0}; + WS_ELEMENT_DESCRIPTION desc; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_MESSAGE *msg; + HRESULT hr; + struct header + { + const WCHAR *value; + } test; + + hr = WsGetCustomHeader( NULL, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct header); + s.alignment = TYPE_ALIGNMENT(struct header); + s.fields = fields; + s.fieldCount = 1; + + desc.elementLocalName = &custom; + desc.elementNs = &ns; + desc.type = WS_STRUCT_TYPE; + desc.typeDescription = &s; + + test.value = valueW; + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, 0, 0, __LINE__ ); + + hr = WsGetCustomHeader( msg, &desc, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 1, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + memset( &test, 0, sizeof(test) ); + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, &test, sizeof(test), + NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test.value != NULL, "value not set\n" ); + ok( !memcmp( test.value, valueW, sizeof(valueW) ), "wrong value\n" ); + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -1288,4 +1355,5 @@ START_TEST(msg) test_WsReadBody(); test_WsResetMessage(); test_WsGetHeader(); + test_WsGetCustomHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index b6f246c..3e77436 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -60,7 +60,7 @@ @ stdcall WsFreeServiceProxy(ptr) @ stdcall WsFreeWriter(ptr) @ stdcall WsGetChannelProperty(ptr long ptr long ptr) -@ stub WsGetCustomHeader +@ stdcall WsGetCustomHeader(ptr ptr long long long ptr ptr long ptr ptr) @ stdcall WsGetDictionary(long ptr ptr) @ stdcall WsGetErrorProperty(ptr long ptr long) @ stdcall WsGetErrorString(ptr long ptr)

1 0

Hans Leidekker : webservices: Implement WsGetHeader.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 64d029a8110c750523dc67e341d14dff655c0181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d029a8110c750523dc67e34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:56 2017 +0200 webservices: Implement WsGetHeader. 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/reader.c | 22 +++++++ dlls/webservices/tests/msg.c | 105 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + 5 files changed, 193 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64d029a8110c750523dc6…

1 0

Hans Leidekker : webservices: Write correct envelope headers for WS_ENVELOPE_VERSION_NONE.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: cd83b80acca5d635de8877242a4c3262d0f67188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd83b80acca5d635de8877242… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:55 2017 +0200 webservices: Write correct envelope headers for WS_ENVELOPE_VERSION_NONE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 175 ++++++++++++++++++++----------------------- dlls/webservices/tests/msg.c | 23 ++++++ 2 files changed, 105 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd83b80acca5d635de887…

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: be0f451e4e584551d388da2c3243719aac327c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0f451e4e584551d388da2c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:54 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index fc259c1..aa5fdf4 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1041,6 +1041,11 @@ typedef enum { } WS_HEADER_TYPE; typedef enum { + WS_REPEATING_HEADER = 1, + WS_SINGLETON_HEADER = 2 +} WS_REPEATING_HEADER_OPTION; + +typedef enum { WS_DNS_ENDPOINT_IDENTITY_TYPE = 1, WS_UPN_ENDPOINT_IDENTITY_TYPE = 2, WS_SPN_ENDPOINT_IDENTITY_TYPE = 3, @@ -1584,11 +1589,17 @@ 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 WsGetCustomHeader(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_REPEATING_HEADER_OPTION, + ULONG, WS_READ_OPTION, WS_HEAP*, void*, ULONG, 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 WsGetHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_TYPE, WS_READ_OPTION, WS_HEAP*, void*, + ULONG, WS_ERROR*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetListenerProperty(WS_LISTENER*, WS_LISTENER_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_REPEATING_HEADER_OPTION, + ULONG, WS_TYPE, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetMessageProperty(WS_MESSAGE*, WS_MESSAGE_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetNamespaceFromPrefix(WS_XML_READER*, const WS_XML_STRING*, BOOL, const WS_XML_STRING**, WS_ERROR*);

1 0

Hans Leidekker : msiexec: Fix parsing of command lines where quoted strings and properties are not separated by whitespace.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: d73c38fe9ab18900eb7f1e1a30570a3139501466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73c38fe9ab18900eb7f1e1a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:20:16 2017 +0200 msiexec: Fix parsing of command lines where quoted strings and properties are not separated by whitespace. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.c | 169 +++++++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 82 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index b7999d1..8dcd216 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -216,14 +216,6 @@ static DWORD msi_atou(LPCWSTR str) return ret; } -static LPWSTR msi_strdup(LPCWSTR str) -{ - DWORD len = lstrlenW(str)+1; - LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); - lstrcpyW(ret, str); - return ret; -} - /* str1 is the same as str2, ignoring case */ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) { @@ -413,90 +405,103 @@ static INT DoEmbedding( LPWSTR key ) enum chomp_state { - cs_whitespace, - cs_token, - cs_quote + CS_WHITESPACE, + CS_TOKEN, + CS_QUOTE }; -static int chomp( WCHAR *str ) +static int chomp( const WCHAR *in, WCHAR *out ) { - enum chomp_state state = cs_token; - WCHAR *p, *out; - int count = 1; - BOOL ignore; - - for( p = str, out = str; *p; p++ ) - { - ignore = TRUE; - switch( state ) - { - case cs_whitespace: - switch( *p ) - { - case ' ': - break; - case '"': - state = cs_quote; - count++; - break; - default: - count++; - ignore = FALSE; - state = cs_token; - } - break; - - case cs_token: - switch( *p ) - { - case '"': - state = cs_quote; - break; - case ' ': - state = cs_whitespace; - *out++ = 0; - break; - default: - ignore = FALSE; - } - break; - - case cs_quote: - switch( *p ) - { - case '"': - state = cs_token; - break; - default: - ignore = FALSE; - } - break; - } - if( !ignore ) - *out++ = *p; - } - - *out = 0; + enum chomp_state state = CS_TOKEN; + const WCHAR *p; + int count = 1; + BOOL ignore; - return count; + for (p = in; *p; p++) + { + ignore = TRUE; + switch (state) + { + case CS_WHITESPACE: + switch (*p) + { + case ' ': + break; + case '"': + state = CS_QUOTE; + count++; + break; + default: + count++; + ignore = FALSE; + state = CS_TOKEN; + } + break; + + case CS_TOKEN: + switch (*p) + { + case '"': + state = CS_QUOTE; + break; + case ' ': + state = CS_WHITESPACE; + if (out) *out++ = 0; + break; + default: + if (p > in && p[-1] == '"') + { + if (out) *out++ = 0; + count++; + } + ignore = FALSE; + } + break; + + case CS_QUOTE: + switch (*p) + { + case '"': + state = CS_TOKEN; + break; + default: + ignore = FALSE; + } + break; + } + if (!ignore && out) *out++ = *p; + } + if (out) *out = 0; + return count; } static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) { - WCHAR **argv, *p = msi_strdup(cmdline); - int i, n; + WCHAR **argv, *p; + int i, count; - n = chomp( p ); - argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); - for( i=0; i<n; i++ ) - { - argv[i] = p; - p += lstrlenW(p) + 1; - } - argv[i] = NULL; + *pargc = 0; + *pargv = NULL; + + count = chomp( cmdline, NULL ); + if (!(p = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(cmdline) + count + 1) * sizeof(WCHAR) ))) + return; + + count = chomp( cmdline, p ); + if (!(argv = HeapAlloc( GetProcessHeap(), 0, (count + 1) * sizeof(WCHAR *) ))) + { + HeapFree( GetProcessHeap(), 0, p ); + return; + } + for (i = 0; i < count; i++) + { + argv[i] = p; + p += lstrlenW( p ) + 1; + } + argv[i] = NULL; - *pargc = n; - *pargv = argv; + *pargc = count; + *pargv = argv; } static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***pargv )

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
60
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 June 2017