September 2016 - Wine-Commits

Hans Leidekker : webservices: Implement WsWriteArray.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 9c6c813daa68323e340c5f33a737e4ef5cf6926a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6c813daa68323e340c5f33a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 13 14:31:34 2016 +0200 webservices: Implement WsWriteArray. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- dlls/webservices/tests/writer.c | 87 ++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 35 ++++++++++++++ include/webservices.h | 2 + 6 files changed, 127 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a05d98e..b562c00 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3561,7 +3561,7 @@ static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_ return WS_E_INVALID_FORMAT; } -static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) +ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) { switch (type) { diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index ebe72fe..80b9f43 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2223,6 +2223,92 @@ static void test_WsWriteText(void) WsFreeWriter( writer ); } +static void test_WsWriteArray(void) +{ + static const WS_XML_STRING localname = {4, (BYTE *)"item"}, localname2 = {5, (BYTE *)"array"}; + static const WS_XML_STRING ns = {0, NULL}; + WS_XML_WRITER *writer; + BOOL array_bool[2]; + HRESULT hr; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteArray( writer, NULL, NULL, 0, NULL, 0, 0, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteArray( writer, NULL, NULL, 0, NULL, 0, 0, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteArray( writer, &localname, NULL, 0, NULL, 0, 0, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteArray( writer, &localname, &ns, 0, NULL, 0, 0, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteArray( writer, &localname, &ns, ~0u, NULL, 0, 0, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, NULL, 0, 0, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + array_bool[0] = FALSE; + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, 0, 0, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, NULL, sizeof(array_bool), 0, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, NULL, sizeof(array_bool), 0, 1, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<item>false</item>", __LINE__ ); + + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool) - 1, 0, 2, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 3, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + array_bool[1] = TRUE; + hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<array><item>false</item><item>true</item></array>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -2251,4 +2337,5 @@ START_TEST(writer) test_double(); test_field_flags(); test_WsWriteText(); + test_WsWriteArray(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index cda787d..819686c 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -164,7 +164,7 @@ @ stub WsStartWriterCanonicalization @ stub WsTrimXmlWhitespace @ stub WsVerifyXmlNCName -@ stub WsWriteArray +@ stdcall WsWriteArray(ptr ptr ptr long ptr long long long ptr) @ stdcall WsWriteAttribute(ptr ptr long ptr long ptr) @ stdcall WsWriteBody(ptr ptr long ptr long ptr) @ stub WsWriteBytes diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index fee0015..a4d08f4 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -35,6 +35,7 @@ void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; BOOL set_fp_rounding( unsigned short * ) DECLSPEC_HIDDEN; void restore_fp_rounding( unsigned short ) DECLSPEC_HIDDEN; +ULONG get_type_size( WS_TYPE, const WS_STRUCT_DESCRIPTION * ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 7f732f0..8fe764e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1997,6 +1997,41 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co } /************************************************************************** + * WsWriteArray [webservices.@] + */ +HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localname, const WS_XML_STRING *ns, + WS_VALUE_TYPE value_type, const void *array, ULONG size, ULONG offset, + ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_TYPE type; + ULONG type_size, i; + HRESULT hr; + + TRACE( "%p %s %s %u %p %u %u %u %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns), + value_type, array, size, offset, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + if (!writer->output_type) return WS_E_INVALID_OPERATION; + if (!localname || !ns || (type = map_value_type( value_type )) == ~0u) return E_INVALIDARG; + + type_size = get_type_size( type, NULL ); + if (size % type_size || (offset + count) * type_size > size || (count && !array)) return E_INVALIDARG; + + for (i = offset; i < count; i++) + { + const char *ptr = (const char *)array + (offset + i) * type_size; + if ((hr = write_element_node( writer, NULL, localname, ns )) != S_OK) return hr; + if ((hr = write_type( writer, WS_ELEMENT_TYPE_MAPPING, type, NULL, WS_WRITE_REQUIRED_POINTER, + &ptr, sizeof(ptr) )) != S_OK) return hr; + if ((hr = write_endelement_node( writer )) != S_OK) return hr; + } + + return S_OK; +} + +/************************************************************************** * WsWriteXmlBuffer [webservices.@] */ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, WS_ERROR *error ) diff --git a/include/webservices.h b/include/webservices.h index 5decf68..0a58641 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1493,6 +1493,8 @@ HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_ HRESULT WINAPI WsSetReaderPosition(WS_XML_READER*, const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsSetWriterPosition(WS_XML_WRITER*, const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsSkipNode(WS_XML_READER*, WS_ERROR*); +HRESULT WINAPI WsWriteArray(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, WS_VALUE_TYPE, + const void*, ULONG, ULONG, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*,

1 0

Bruno Jesus : ws2_32/tests: Add more SIO_ADDRESS_LIST_CHANGE tests.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 77b391125ffc0d91d24e645177e16fb02844275e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b391125ffc0d91d24e64517… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 9 00:28:52 2016 -0300 ws2_32/tests: Add more SIO_ADDRESS_LIST_CHANGE tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 110 ++++++++++++++++++++++++++++++++++------------- include/winsock2.h | 9 ++++ 2 files changed, 90 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index be98691..d216542 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8349,8 +8349,9 @@ static void test_sioAddressListChange(void) struct in_addr net_address; WSAOVERLAPPED overlapped; struct hostent *h; - DWORD num_bytes, error; - SOCKET sock; + DWORD num_bytes, error, tick; + SOCKET sock, sock2, sock3; + WSAEVENT event2, event3; int acount; int ret; @@ -8397,9 +8398,6 @@ todo_wine sock = socket(AF_INET, 0, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "socket() failed\n"); - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = net_address.s_addr; SetLastError(0xdeadbeef); ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok (!ret, "bind() failed with error %d\n", GetLastError()); @@ -8419,9 +8417,6 @@ todo_wine sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); ok(sock != INVALID_SOCKET, "socket() failed\n"); - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = net_address.s_addr; SetLastError(0xdeadbeef); ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok (!ret, "bind() failed with error %d\n", GetLastError()); @@ -8442,9 +8437,6 @@ todo_wine sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); ok(sock != INVALID_SOCKET, "socket() failed\n"); - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = net_address.s_addr; SetLastError(0xdeadbeef); ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok (!ret, "bind() failed with error %d\n", GetLastError()); @@ -8461,6 +8453,40 @@ todo_wine CloseHandle(overlapped.hEvent); closesocket(sock); + /* When the socket is overlapped non-blocking and the list change is requested without + * an overlapped structure the error will be different. */ + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + SetLastError(0xdeadbeef); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok (!ret, "bind() failed with error %d\n", GetLastError()); + set_blocking(sock, FALSE); + + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, NULL, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); + ok (error == WSAEWOULDBLOCK, "expected 10035, got %d\n", error); + + closesocket(sock); + + /* Misuse of the API by using a blocking socket and not using an overlapped structure, + * this leads to a hang forever. */ + if (0) + { + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + + SetLastError(0xdeadbeef); + bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + + set_blocking(sock, TRUE); + WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, NULL, NULL); + /* hang */ + + closesocket(sock); + } + if (!winetest_interactive) { skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); @@ -8470,35 +8496,61 @@ todo_wine /* Bind an overlapped socket to the first found network interface */ sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); - if (sock == INVALID_SOCKET) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, socket creation failed with %u\n", - WSAGetLastError()); - return; - } - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = net_address.s_addr; + sock2 = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock2 != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + sock3 = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock3 != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (ret != 0) - { - skip("Cannot test SIO_ADDRESS_LIST_CHANGE, failed to bind, error %u\n", WSAGetLastError()); - goto end; - } + ok(!ret, "bind failed unexpectedly\n"); + ret = bind(sock2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(!ret, "bind failed unexpectedly\n"); + ret = bind(sock3, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(!ret, "bind failed unexpectedly\n"); + + set_blocking(sock2, FALSE); + set_blocking(sock3, FALSE); /* Wait for address changes, request that the user connects/disconnects an interface */ memset(&overlapped, 0, sizeof(overlapped)); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ok(WSAGetLastError() == WSA_IO_PENDING, "Expected pending last error %d\n", WSAGetLastError()); + ok(WSAGetLastError() == WSA_IO_PENDING, "Expected pending last error, got %d\n", WSAGetLastError()); + + ret = WSAIoctl(sock2, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "Expected would block last error, got %d\n", WSAGetLastError()); + + event2 = WSACreateEvent(); + event3 = WSACreateEvent(); + ret = WSAEventSelect (sock2, event2, FD_ADDRESS_LIST_CHANGE); + ok(!ret, "WSAEventSelect failed with %d\n", WSAGetLastError()); + /* sock3 did not request SIO_ADDRESS_LIST_CHANGE but it is trying to wait anyway */ + ret = WSAEventSelect (sock3, event3, FD_ADDRESS_LIST_CHANGE); + ok(!ret, "WSAEventSelect failed with %d\n", WSAGetLastError()); + trace("Testing socket-based ipv4 address list change notification. Please connect/disconnect or" - " change the ipv4 address of any of the local network interfaces (10 second timeout).\n"); - ret = WaitForSingleObject(overlapped.hEvent, 10000); + " change the ipv4 address of any of the local network interfaces (15 second timeout).\n"); + tick = GetTickCount(); + ret = WaitForSingleObject(overlapped.hEvent, 15000); ok(ret == WAIT_OBJECT_0, "failed to get overlapped event %u\n", ret); -end: + ret = WaitForSingleObject(event2, 500); +todo_wine + ok(ret == WAIT_OBJECT_0, "failed to get change event %u\n", ret); + + ret = WaitForSingleObject(event3, 500); + ok(ret == WAIT_TIMEOUT, "unexpected change event\n"); + + trace("Spent %d ms waiting.\n", GetTickCount() - tick); + + WSACloseEvent(event2); + WSACloseEvent(event3); + closesocket(sock); + closesocket(sock2); + closesocket(sock3); } static void test_synchronous_WSAIoctl(void) diff --git a/include/winsock2.h b/include/winsock2.h index 24f0ea3..a2563f4 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -101,6 +101,15 @@ extern "C" { #define FD_ACCEPT_BIT 3 #define FD_CONNECT_BIT 4 #define FD_CLOSE_BIT 5 +#define FD_QOS_BIT 6 +#define FD_GROUP_QOS_BIT 7 +#define FD_ROUTING_INTERFACE_CHANGE_BIT 8 +#define FD_ADDRESS_LIST_CHANGE_BIT 9 + +#define FD_QOS 0x00000040 +#define FD_GROUP_QOS 0x00000080 +#define FD_ROUTING_INTERFACE_CHANGE 0x00000100 +#define FD_ADDRESS_LIST_CHANGE 0x00000200 /* Constants for LPCONDITIONPROC */ #define CF_ACCEPT 0x0000

1 0

Aric Stewart : winebus.sys: Implement udev device enumeration.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 637738f472885dc378545534469e4ba64892d40c URL: http://source.winehq.org/git/wine.git/?a=commit;h=637738f472885dc3785455344… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 13 11:13:26 2016 +0200 winebus.sys: Implement udev device enumeration. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 + dlls/winebus.sys/bus_udev.c | 113 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 99ff4d2..b24416b 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,5 +1,7 @@ MODULE = winebus.sys IMPORTS = ntoskrnl +EXTRALIBS = $(UDEV_LIBS) +EXTRAINCL = $(UDEV_CFLAGS) EXTRADLLFLAGS = -Wb,--subsystem,native C_SRCS = \ diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f040e60..d47a556 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -19,7 +19,16 @@ */ #include "config.h" +#include <errno.h> +#include <fcntl.h> #include <stdarg.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifdef HAVE_LIBUDEV_H +# include <libudev.h> +#endif #define NONAMELESSUNION @@ -27,6 +36,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winternl.h" #include "ddk/wdm.h" #include "wine/debug.h" @@ -37,15 +47,118 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef HAVE_UDEV +static struct udev *udev_context = NULL; static DRIVER_OBJECT *udev_driver_obj = NULL; +static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) +{ + const char *attr = udev_device_get_sysattr_value(dev, sysattr); + if (!attr) + { + WARN("Could not get %s from device\n", sysattr); + return 0; + } + return strtol(attr, NULL, base); +} + +static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) +{ + const char *attr = udev_device_get_sysattr_value(dev, sysattr); + WCHAR *dst; + DWORD len; + if (!attr) + { + WARN("Could not get %s from device\n", sysattr); + return NULL; + } + len = MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, NULL, 0); + if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, dst, len); + return dst; +} + +static void try_add_device(struct udev_device *dev) +{ + DWORD vid = 0, pid = 0, version = 0; + struct udev_device *usbdev; + const char *devnode; + WCHAR *serial = NULL; + int fd; + + if (!(devnode = udev_device_get_devnode(dev))) + return; + + if ((fd = open(devnode, O_RDWR)) == -1) + { + WARN("Unable to open udev device %s: %s\n", debugstr_a(devnode), strerror(errno)); + return; + } + close(fd); + + usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"); + if (usbdev) + { + vid = get_sysattr_dword(usbdev, "idVendor", 16); + pid = get_sysattr_dword(usbdev, "idProduct", 16); + version = get_sysattr_dword(usbdev, "version", 10); + serial = get_sysattr_string(usbdev, "serial"); + } + + TRACE("Found udev device %s (vid %04x, pid %04x, version %u, serial %s)\n", + debugstr_a(devnode), vid, pid, version, debugstr_w(serial)); + + HeapFree(GetProcessHeap(), 0, serial); +} + +static void build_initial_deviceset(void) +{ + struct udev_enumerate *enumerate; + struct udev_list_entry *devices, *dev_list_entry; + + enumerate = udev_enumerate_new(udev_context); + if (!enumerate) + { + WARN("Unable to create udev enumeration object\n"); + return; + } + + if (udev_enumerate_add_match_subsystem(enumerate, "hidraw") < 0) + WARN("Failed to add subsystem 'hidraw' to enumeration\n"); + + if (udev_enumerate_scan_devices(enumerate) < 0) + WARN("Enumeration scan failed\n"); + + devices = udev_enumerate_get_list_entry(enumerate); + udev_list_entry_foreach(dev_list_entry, devices) + { + struct udev_device *dev; + const char *path; + + path = udev_list_entry_get_name(dev_list_entry); + if ((dev = udev_device_new_from_syspath(udev_context, path))) + { + try_add_device(dev); + udev_device_unref(dev); + } + } + + udev_enumerate_unref(enumerate); +} + NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); + if (!(udev_context = udev_new())) + { + ERR("Can't create udev object\n"); + return STATUS_UNSUCCESSFUL; + } + udev_driver_obj = driver; driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; + build_initial_deviceset(); return STATUS_SUCCESS; }

1 0

Austin English : msinfo32: Add stub program.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 091fa899b2152d6ee044ab1b0afb7bc851b10e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=091fa899b2152d6ee044ab1b0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 13 03:14:51 2016 -0500 msinfo32: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/msinfo32/Makefile.in | 5 +++++ programs/msinfo32/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 7acd339..b8133ae 100755 --- a/configure +++ b/configure @@ -1501,6 +1501,7 @@ enable_lodctr enable_mofcomp enable_mshta enable_msiexec +enable_msinfo32 enable_net enable_netsh enable_netstat @@ -18405,6 +18406,7 @@ wine_fn_config_program lodctr enable_lodctr install wine_fn_config_program mofcomp enable_mofcomp install wine_fn_config_program mshta enable_mshta install wine_fn_config_program msiexec enable_msiexec install,installbin,manpage +wine_fn_config_program msinfo32 enable_msinfo32 install wine_fn_config_program net enable_net clean,install wine_fn_config_program netsh enable_netsh install wine_fn_config_program netstat enable_netstat clean,install diff --git a/configure.ac b/configure.ac index 4944d23..ac75845 100644 --- a/configure.ac +++ b/configure.ac @@ -3523,6 +3523,7 @@ WINE_CONFIG_PROGRAM(lodctr,,[install]) WINE_CONFIG_PROGRAM(mofcomp,,[install]) WINE_CONFIG_PROGRAM(mshta,,[install]) WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) +WINE_CONFIG_PROGRAM(msinfo32,,[install]) WINE_CONFIG_PROGRAM(net,,[clean,install]) WINE_CONFIG_PROGRAM(netsh,,[install]) WINE_CONFIG_PROGRAM(netstat,,[clean,install]) diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in new file mode 100644 index 0000000..e958c27 --- /dev/null +++ b/programs/msinfo32/Makefile.in @@ -0,0 +1,5 @@ +MODULE = msinfo32.exe +APPMODE = -mwindows -municode + +C_SRCS = \ + main.c diff --git a/programs/msinfo32/main.c b/programs/msinfo32/main.c new file mode 100644 index 0000000..77bb927 --- /dev/null +++ b/programs/msinfo32/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msinfo); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Daniel Lehman : msvcp140: Add _Thrd_id.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 532999462d95af8d69afcb91ef8540928f11bd58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532999462d95af8d69afcb91e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 31 09:48:39 2016 -0700 msvcp140: Add _Thrd_id. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/Makefile.in | 5 ++++ dlls/msvcp140/tests/msvcp140.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 6 +++++ 6 files changed, 69 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0bda5d3..2e2186b 100755 --- a/configure +++ b/configure @@ -18016,6 +18016,7 @@ wine_fn_config_dll msvcp120 enable_msvcp120 wine_fn_config_test dlls/msvcp120/tests msvcp120_test wine_fn_config_dll msvcp120_app enable_msvcp120_app wine_fn_config_dll msvcp140 enable_msvcp140 +wine_fn_config_test dlls/msvcp140/tests msvcp140_test wine_fn_config_dll msvcp60 enable_msvcp60 wine_fn_config_test dlls/msvcp60/tests msvcp60_test wine_fn_config_dll msvcp70 enable_msvcp70 diff --git a/configure.ac b/configure.ac index 15c8469..db9c6e4 100644 --- a/configure.ac +++ b/configure.ac @@ -3135,6 +3135,7 @@ WINE_CONFIG_DLL(msvcp120) WINE_CONFIG_TEST(dlls/msvcp120/tests) WINE_CONFIG_DLL(msvcp120_app) WINE_CONFIG_DLL(msvcp140) +WINE_CONFIG_TEST(dlls/msvcp140/tests) WINE_CONFIG_DLL(msvcp60) WINE_CONFIG_TEST(dlls/msvcp60/tests) WINE_CONFIG_DLL(msvcp70) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index f5a0838..e8f7e94 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3726,7 +3726,7 @@ @ cdecl _Thrd_equal(ptr ptr) _Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency -@ stub _Thrd_id +@ cdecl _Thrd_id() _Thrd_id @ cdecl _Thrd_join(ptr long) _Thrd_join @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) msvcp110._Thrd_start diff --git a/dlls/msvcp140/tests/Makefile.in b/dlls/msvcp140/tests/Makefile.in new file mode 100644 index 0000000..fde164b --- /dev/null +++ b/dlls/msvcp140/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msvcp140.dll +APPMODE = -mno-cygwin + +C_SRCS = \ + msvcp140.c diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c new file mode 100644 index 0000000..d54ced3 --- /dev/null +++ b/dlls/msvcp140/tests/msvcp140.c @@ -0,0 +1,55 @@ +/* + * Copyright 2016 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "wine/test.h" +#include "winbase.h" + +static unsigned int (__cdecl *p__Thrd_id)(void); + +static HMODULE msvcp; +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + msvcp = LoadLibraryA("msvcp140.dll"); + if(!msvcp) + { + win_skip("msvcp140.dll not installed\n"); + return FALSE; + } + + SET(p__Thrd_id, "_Thrd_id"); + + return TRUE; +} + +static void test_thrd(void) +{ + ok(p__Thrd_id() == GetCurrentThreadId(), + "expected same id, got _Thrd_id %u GetCurrentThreadId %u\n", + p__Thrd_id(), GetCurrentThreadId()); +} + +START_TEST(msvcp140) +{ + if(!init()) return; + test_thrd(); + FreeLibrary(msvcp); +} diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7418fd2..96339e2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -988,6 +988,12 @@ unsigned int __cdecl _Thrd_hardware_concurrency(void) return val; } +unsigned int __cdecl _Thrd_id(void) +{ + TRACE("()\n"); + return GetCurrentThreadId(); +} + /* ??0_Pad(a)std@@QAE(a)XZ */ /* ??0_Pad(a)std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Pad_ctor, 4)

1 0

Jacek Caban : mshtml: Use rb tree instead of list to map nsIDOMWindowProxy to HTMLOuterWindow.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 9679755a068e04375b6c369da6f1d939f05dcbdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9679755a068e04375b6c369da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 13:44:31 2016 +0200 mshtml: Use rb tree instead of list to map nsIDOMWindowProxy to HTMLOuterWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 40 +++++++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 3 ++- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 407de0c..14246a6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -44,7 +44,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static struct list window_list = LIST_INIT(window_list); +static int window_map_compare(const void *key, const struct wine_rb_entry *entry) +{ + HTMLOuterWindow *window = WINE_RB_ENTRY_VALUE(entry, HTMLOuterWindow, entry); + + if(window->window_proxy == key) + return 0; + return (void*)window->window_proxy > key ? -1 : 1; +} + +static struct wine_rb_tree window_map = { window_map_compare }; + +HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) +{ + struct wine_rb_entry *entry = wine_rb_get(&window_map, mozwindow); + return entry ? WINE_RB_ENTRY_VALUE(entry, HTMLOuterWindow, entry) : NULL; +} static inline BOOL is_outer_window(HTMLWindow *window) { @@ -220,7 +235,7 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->window_proxy) mozIDOMWindowProxy_Release(This->window_proxy); - list_remove(&This->entry); + wine_rb_remove(&window_map, &This->entry); heap_free(This); } @@ -3052,6 +3067,10 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO; window->readystate = READYSTATE_UNINITIALIZED; + window->task_magic = get_task_target_magic(); + + list_init(&window->children); + wine_rb_put(&window_map, window->window_proxy, &window->entry); hres = create_pending_window(window, NULL); if(SUCCEEDED(hres)) @@ -3067,11 +3086,6 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, return hres; } - window->task_magic = get_task_target_magic(); - - list_init(&window->children); - list_add_head(&window_list, &window->entry); - if(parent) { IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); @@ -3174,15 +3188,3 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return hres; } - -HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) -{ - HTMLOuterWindow *iter; - - LIST_FOR_EACH_ENTRY(iter, &window_list, HTMLOuterWindow, entry) { - if(iter->window_proxy == mozwindow) - return iter; - } - - return NULL; -} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 875d95a..1d4dcc5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -31,6 +31,7 @@ #include "shdeprecated.h" #include "wine/list.h" +#include "wine/rbtree.h" #include "wine/unicode.h" #ifdef INIT_GUID @@ -466,7 +467,7 @@ struct HTMLOuterWindow { struct list children; struct list sibling_entry; - struct list entry; + struct wine_rb_entry entry; }; struct HTMLInnerWindow {

1 0

Jacek Caban : rbtree.h: Take wine_rb_entry as wine_rb_remove argument type and add new wine_rb_remove_key helper using key.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: d29e59a145c5d0b6138e7de297ab697e97810199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29e59a145c5d0b6138e7de29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 13:44:09 2016 +0200 rbtree.h: Take wine_rb_entry as wine_rb_remove argument type and add new wine_rb_remove_key helper using key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 8 ++++---- dlls/d3dcompiler_43/utils.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- include/wine/rbtree.h | 12 ++++++++---- programs/winedevice/device.c | 4 ++-- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d702d98..1aa9af5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -78,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface { struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); - wine_rb_remove(&device->blend_states, &state->desc); + wine_rb_remove_key(&device->blend_states, &state->desc); ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); @@ -379,7 +379,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc { struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); - wine_rb_remove(&device->depthstencil_states, &state->desc); + wine_rb_remove_key(&device->depthstencil_states, &state->desc); ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); @@ -663,7 +663,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt { struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); - wine_rb_remove(&device->rasterizer_states, &state->desc); + wine_rb_remove_key(&device->rasterizer_states, &state->desc); wined3d_rasterizer_state_decref(state->wined3d_state); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); @@ -963,7 +963,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); - wine_rb_remove(&device->sampler_states, &state->desc); + wine_rb_remove_key(&device->sampler_states, &state->desc); ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 54f359e..79f3be8 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2483,7 +2483,7 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu d3dcompiler_free(name); return; } - wine_rb_remove(&func->overloads, decl->parameters); + wine_rb_remove(&func->overloads, old_entry); free_function_decl(old_decl); } wine_rb_put(&func->overloads, decl->parameters, &decl->entry); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 91e08d9..d5236e6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -933,7 +933,7 @@ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) TRACE( "(%p)\n", driver_object ); EnterCriticalSection( &drivers_cs ); - wine_rb_remove( &wine_drivers, &driver_object->DriverName ); + wine_rb_remove_key( &wine_drivers, &driver_object->DriverName ); LeaveCriticalSection( &drivers_cs ); RtlFreeUnicodeString( &driver_object->DriverName ); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 863f17f..e605cb9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5389,7 +5389,7 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc key.vs_id = entry->vs.id; key.gs_id = entry->gs.id; key.ps_id = entry->ps.id; - wine_rb_remove(&priv->program_lookup, &key); + wine_rb_remove_key(&priv->program_lookup, &key); GL_EXTCALL(glDeleteProgram(entry->id)); if (entry->vs.id) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index bdf1a85..634893d 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -226,13 +226,11 @@ static inline int wine_rb_put(struct wine_rb_tree *tree, const void *key, struct return 0; } -static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) +static inline void wine_rb_remove(struct wine_rb_tree *tree, struct wine_rb_entry *entry) { - struct wine_rb_entry *entry, *iter, *child, *parent, *w; + struct wine_rb_entry *iter, *child, *parent, *w; int need_fixup; - if (!(entry = wine_rb_get(tree, key))) return; - if (entry->right && entry->left) for(iter = entry->right; iter->left; iter = iter->left); else @@ -337,4 +335,10 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) if (tree->root) tree->root->flags &= ~WINE_RB_FLAG_RED; } +static inline void wine_rb_remove_key(struct wine_rb_tree *tree, const void *key) +{ + struct wine_rb_entry *entry = wine_rb_get(tree, key); + if (entry) wine_rb_remove(tree, entry); +} + #endif /* __WINE_WINE_RBTREE_H */ diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index b261a4a..44aa1a0 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -350,7 +350,7 @@ static NTSTATUS unload_driver( struct wine_rb_entry *entry, BOOL destroy ) return STATUS_SUCCESS; } - wine_rb_remove( &wine_drivers, driver->name ); + wine_rb_remove( &wine_drivers, &driver->entry ); memset( &environment, 0, sizeof(environment) ); environment.Version = 1; @@ -405,7 +405,7 @@ static void WINAPI async_create_driver( PTP_CALLBACK_INSTANCE instance, void *co error: EnterCriticalSection( &drivers_cs ); - wine_rb_remove( &wine_drivers, driver->name ); + wine_rb_remove( &wine_drivers, &driver->entry ); LeaveCriticalSection( &drivers_cs ); set_service_status( driver->handle, SERVICE_STOPPED, 0 );

1 0

Hans Leidekker : webservices/tests: Add another repeating element test.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 2bc231e020c2dc2c75c26c4690cfea241182ef74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc231e020c2dc2c75c26c469… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 13 14:31:36 2016 +0200 webservices/tests: Add another repeating element test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index e8ac6b8..4a1f8de 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2831,6 +2831,11 @@ static void test_repeating_element(void) struct service3 *service; ULONG service_count; } *test3; + struct services4 + { + struct service **service; + ULONG service_count; + } *test4; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2880,8 +2885,24 @@ static void test_repeating_element(void) ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); + /* array of pointers */ + prepare_struct_type_test( reader, data12 ); + f.options = WS_FIELD_POINTER; + test4 = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test4, sizeof(test4), NULL ); + ok( hr == S_OK || broken(hr == E_INVALIDARG) /* win7 */, "got %08x\n", hr ); + if (test4) + { + ok( test4->service != NULL, "service not set\n" ); + ok( test4->service_count == 2, "got %u\n", test4->service_count ); + ok( test4->service[0]->id == 1, "got %u\n", test4->service[0]->id ); + ok( test4->service[1]->id == 2, "got %u\n", test4->service[1]->id ); + } + /* item range */ prepare_struct_type_test( reader, data13 ); + f.options = 0; range.minItemCount = 0; range.maxItemCount = 1; f.itemRange = &range;

1 0

Hans Leidekker : webservices: Add support for optional and nillable fields in the reader.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 66899dd6db78e047b419f155f9dfafc4fc3f56ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=66899dd6db78e047b419f155f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 13 14:31:35 2016 +0200 webservices: Add support for optional and nillable fields 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 | 144 +++++++++++++++--------- dlls/webservices/tests/reader.c | 197 +++++++++++++++++++++++++-------- dlls/webservices/webservices_private.h | 7 ++ dlls/webservices/writer.c | 7 -- 4 files changed, 251 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66899dd6db78e047b419f…

1 0

Sebastian Lackner : advapi32: Use variable of correct type to store LSTATUS result.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: a388cc1ff9e7cad36b65e595a40bb0e4ce38b6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a388cc1ff9e7cad36b65e595a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 09:02:07 2016 +0200 advapi32: Use variable of correct type to store LSTATUS result. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4b3d852..11be690 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1019,7 +1019,7 @@ LSTATUS WINAPI RegQueryMultipleValuesA( HKEY hkey, PVALENTA val_list, DWORD num_ { unsigned int i; DWORD maxBytes = *ldwTotsize; - HRESULT status; + LSTATUS status; LPSTR bufptr = lpValueBuf; *ldwTotsize = 0; @@ -1065,7 +1065,7 @@ LSTATUS WINAPI RegQueryMultipleValuesW( HKEY hkey, PVALENTW val_list, DWORD num_ { unsigned int i; DWORD maxBytes = *ldwTotsize; - HRESULT status; + LSTATUS status; LPSTR bufptr = (LPSTR)lpValueBuf; *ldwTotsize = 0;

1 0