October 2016 - Wine-Commits

Jacek Caban : server: Create ifchange async queue on socket fd.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: 60f8ddbf9d372948674733169fcafc04c3d4827d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f8ddbf9d372948674733169… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:11:50 2016 +0200 server: Create ifchange async queue on socket fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 30 +++++++++++++++++++++++++++++- server/sock.c | 18 ++++++------------ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7aaea3..a144bd3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8345,12 +8345,15 @@ static void test_sioAddressListChange(void) { struct sockaddr_in bindAddress; struct in_addr net_address; - WSAOVERLAPPED overlapped; + WSAOVERLAPPED overlapped, *olp; struct hostent *h; DWORD num_bytes, error, tick; SOCKET sock, sock2, sock3; WSAEVENT event2, event3; + HANDLE io_port; + ULONG_PTR key; int acount; + BOOL bret; int ret; /* Use gethostbyname to find the list of local network interfaces */ @@ -8465,8 +8468,33 @@ static void test_sioAddressListChange(void) ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); ok (error == WSAEWOULDBLOCK, "expected 10035, got %d\n", error); + io_port = CreateIoCompletionPort( (HANDLE)sock, NULL, 0, 0 ); + ok (io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + set_blocking(sock, FALSE); + memset(&overlapped, 0, sizeof(overlapped)); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %u\n", error); + ok (error == ERROR_IO_PENDING, "expected ERROR_IO_PENDING got %u\n", error); + + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 0 ); + ok(!bret, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(!olp, "Overlapped structure is at %p\n", olp); + closesocket(sock); + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 0 ); + ok(!bret, "failed to get completion status %u\n", bret); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %u\n", GetLastError()); + ok(olp == &overlapped, "Overlapped structure is at %p\n", olp); + + CloseHandle(io_port); + /* Misuse of the API by using a blocking socket and not using an overlapped structure, * this leads to a hang forever. */ if (0) diff --git a/server/sock.c b/server/sock.c index d7349fc..0de6f68 100644 --- a/server/sock.c +++ b/server/sock.c @@ -606,7 +606,9 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) { struct sock *sock = get_fd_user( fd ); - sock_reselect( sock ); + /* ignore reselect on ifchange queue */ + if (sock->ifchange_q != queue) + sock_reselect( sock ); } static int sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) @@ -640,6 +642,7 @@ static void sock_destroy( struct object *obj ) free_async_queue( sock->read_q ); free_async_queue( sock->write_q ); + async_wake_up( sock->ifchange_q, STATUS_CANCELLED ); sock_destroy_ifchange_q( sock ); if (sock->event) release_object( sock->event ); if (sock->fd) @@ -973,7 +976,6 @@ static void ifchange_destroy( struct object *obj ); static int ifchange_get_poll_events( struct fd *fd ); static void ifchange_poll_event( struct fd *fd, int event ); -static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ); struct ifchange { @@ -1014,7 +1016,7 @@ static const struct fd_ops ifchange_fd_ops = no_fd_flush, /* flush */ no_fd_ioctl, /* ioctl */ NULL, /* queue_async */ - ifchange_reselect_async, /* reselect_async */ + NULL, /* reselect_async */ NULL /* cancel_async */ }; @@ -1096,11 +1098,6 @@ static void ifchange_poll_event( struct fd *fd, int event ) if (status != STATUS_PENDING) ifchange_wake_up( ifchange, status ); } -static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ) -{ - /* do nothing, this object is about to disappear */ -} - #endif /* we only need one of these interface notification objects, all of the sockets dependent upon @@ -1174,7 +1171,6 @@ static void ifchange_add_sock( struct object *obj, struct sock *sock ) static struct async_queue *sock_get_ifchange_q( struct sock *sock ) { struct object *ifchange; - struct fd *fd; if (sock->ifchange_q) /* reuse existing ifchange_q for this socket */ return sock->ifchange_q; @@ -1183,9 +1179,7 @@ static struct async_queue *sock_get_ifchange_q( struct sock *sock ) return NULL; /* create the ifchange notification queue */ - fd = get_obj_fd( ifchange ); - sock->ifchange_q = create_async_queue( fd ); - release_object( fd ); + sock->ifchange_q = create_async_queue( sock->fd ); if (!sock->ifchange_q) { release_object( ifchange );

1 0

Jacek Caban : ws2_32: Pass completion routing to NtDeviceIoControlFile in server_ioctl_sock only if caller provided completion routine.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: 93863d25fc32a6229590e3b97a9d12e1a94676d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93863d25fc32a6229590e3b97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:11:34 2016 +0200 ws2_32: Pass completion routing to NtDeviceIoControlFile in server_ioctl_sock only if caller provided completion routine. Otherwise we're always doing non-blocking calls, preventing server from doing the right thing (and in actually doing the opposite in WS_SIO_ADDRESS_LIST_CHANGE case). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 27 ++++++++++++++++++--------- dlls/ws2_32/tests/sock.c | 2 -- server/sock.c | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e3c7507..e8c5130 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4520,18 +4520,27 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s { HANDLE event = overlapped ? overlapped->hEvent : 0; HANDLE handle = SOCKET2HANDLE( s ); - struct ws2_async *wsa; + struct ws2_async *wsa = NULL; + IO_STATUS_BLOCK *io = (PIO_STATUS_BLOCK)overlapped, iosb; + void *cvalue = NULL; NTSTATUS status; - PIO_STATUS_BLOCK io; - if (!(wsa = (struct ws2_async *)alloc_async_io( sizeof(*wsa) ))) - return WSA_NOT_ENOUGH_MEMORY; - wsa->hSocket = handle; - wsa->user_overlapped = overlapped; - wsa->completion_func = completion; - io = (overlapped ? (PIO_STATUS_BLOCK)overlapped : &wsa->local_iosb); + if (completion) + { + if (!(wsa = (struct ws2_async *)alloc_async_io( sizeof(*wsa) ))) + return WSA_NOT_ENOUGH_MEMORY; + wsa->hSocket = handle; + wsa->user_overlapped = overlapped; + wsa->completion_func = completion; + if (!io) io = &wsa->local_iosb; + cvalue = wsa; + } + else if (!io) + io = &iosb; + else if (!((ULONG_PTR)overlapped->hEvent & 1)) + cvalue = overlapped; - status = NtDeviceIoControlFile( handle, event, ws2_async_apc, wsa, io, code, + status = NtDeviceIoControlFile( handle, event, wsa ? ws2_async_apc : NULL, cvalue, io, code, in_buff, in_size, out_buff, out_size ); if (status == STATUS_NOT_SUPPORTED) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 320f820..b7aaea3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8387,7 +8387,6 @@ static void test_sioAddressListChange(void) ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); error = GetLastError(); ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); -todo_wine ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); CloseHandle(overlapped.hEvent); @@ -8426,7 +8425,6 @@ todo_wine ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); error = GetLastError(); ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); -todo_wine ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); CloseHandle(overlapped.hEvent); diff --git a/server/sock.c b/server/sock.c index 89049e0..d7349fc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -548,7 +548,7 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && !blocking) + if ((sock->state & FD_WINE_NONBLOCKING) && blocking) { set_error( STATUS_CANT_WAIT ); return 0;

1 0

Alex Henrie : msinfo32: Display an About dialog when the program is run.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

1 0

Alistair Leslie-Hughes : dpnet: Correct GetComponentByName to return the correct buffer size.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: 7c609f07b4e1e9a5f0c0ef38329c461e1a9b3ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c609f07b4e1e9a5f0c0ef383… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 13 10:07:08 2016 +0000 dpnet: Correct GetComponentByName to return the correct buffer size. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 4 ++-- dlls/dpnet/tests/address.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d87d4e7..6305fe7 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -377,9 +377,9 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add struct component *entry; DWORD i; - TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType); + TRACE("(%p)->(%s %p %p %p)\n", This, debugstr_w(pwszName), pvBuffer, pdwBufferSize, pdwDataType); - if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize)) + if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && *pdwBufferSize)) return E_POINTER; for(i=0; i < This->comp_count; i++) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index cb226f9..dd0ef23 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -123,6 +123,15 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)+2, DPNA_DATATYPE_STRING); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + size = 0; + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, NULL, &size, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(size == sizeof(localhost), "Invalid string length: %d\n", size); + + size = 1; + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, NULL, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + size = sizeof(buffer); hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Matteo Bruni : d3d10core/tests: Add a test for ddy.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: e8bc4627fd21e6071a93c84e9781542964bb0f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8bc4627fd21e6071a93c84e9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:09 2016 +0200 d3d10core/tests: Add a test for ddy. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 163 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 886a950..9f98850 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9532,6 +9532,168 @@ static void test_required_format_support(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_ddy(void) +{ + static const struct + { + struct vec4 position; + unsigned int color; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, 0x00ff0000}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, 0x0000ff00}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 0x00ff0000}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, 0x0000ff00}, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; +#if 0 +struct vs_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +void main(in struct vs_data vs_input, out struct vs_data vs_output) +{ + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; +} +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; +#if 0 +struct ps_data +{ + float4 pos : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(struct ps_data ps_input) : SV_Target +{ + return ddy(ps_input.color) * 240.0 + 0.5; +} +#endif + static const DWORD ps_code[] = + { + 0x43425844, 0x423712f6, 0x786c59c2, 0xa6023c60, 0xb79faad2, 0x00000001, 0x00000138, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000007c, 0x00000040, + 0x0000001f, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0500000c, 0x001000f2, 0x00000000, 0x00101e46, 0x00000001, 0x0f000032, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x43700000, 0x43700000, 0x43700000, 0x43700000, + 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10InputLayout *input_layout; + unsigned int stride, offset; + struct resource_readback rb; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *vb; + DWORD color; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + ID3D10Device_ClearRenderTargetView(device, rtv, red); + ID3D10Device_Draw(device, 4, 0); + + get_texture_readback(texture, 0, &rb); + color = get_readback_color(&rb, 320, 190); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 255, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 385, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 290); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + ID3D10Device_Draw(device, 4, 0); + + get_texture_readback(test_context.backbuffer, 0, &rb); + color = get_readback_color(&rb, 320, 190); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 255, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 385, 240); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 320, 290); + ok(compare_color(color, 0x7fff007f, 1), "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10Buffer_Release(vb); + ID3D10InputLayout_Release(input_layout); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -9586,4 +9748,5 @@ START_TEST(device) test_face_culling(); test_line_antialiasing_blending(); test_required_format_support(); + test_ddy(); }

1 0

Sebastian Lackner : ntoskrnl.exe: Fix management of input/ output buffers in dispatch handlers.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: a0d04a641ddfcd33d156471cdd3b87f3a5454aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d04a641ddfcd33d156471cd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 13 00:51:48 2016 +0200 ntoskrnl.exe: Fix management of input/output buffers in dispatch handlers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 47 ++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f3b6913..974f946 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -202,7 +202,11 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, irp->Tail.Overlay.OriginalFileObject = NULL; } - HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); + if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) + { + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); + irp->UserBuffer = NULL; + } return STATUS_SUCCESS; } @@ -260,6 +264,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -298,6 +303,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -336,8 +342,10 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irpsp->Parameters.Read.Key = params->read.key; irp->Flags |= IRP_READ_OPERATION; + irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -370,6 +378,7 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irpsp->Parameters.Write.Key = params->write.key; irp->Flags |= IRP_WRITE_OPERATION; + irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -398,6 +407,7 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -425,6 +435,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG if ((params->ioctl.code & 3) == METHOD_BUFFERED) { memcpy( out_buff, in_buff, in_size ); + HeapFree( GetProcessHeap(), 0, in_buff ); in_buff = out_buff; } } @@ -439,7 +450,9 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; + irp->AssociatedIrp.SystemBuffer = in_buff; + irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -490,23 +503,23 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) HANDLE irp = 0; NTSTATUS status = STATUS_SUCCESS; irp_params_t irp_params; - void *in_buff; ULONG in_size = 4096, out_size = 0; + void *in_buff = NULL; HANDLE handles[2]; request_thread = GetCurrentThreadId(); - if (!(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) - { - ERR( "failed to allocate buffer\n" ); - return STATUS_NO_MEMORY; - } - handles[0] = stop_event; handles[1] = manager; for (;;) { + if (!in_buff && !(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) + { + ERR( "failed to allocate buffer\n" ); + return STATUS_NO_MEMORY; + } + SERVER_START_REQ( get_next_device_request ) { req->manager = wine_server_obj_handle( manager ); @@ -525,13 +538,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) else { irp = 0; /* no previous irp */ - out_size = 0; - in_size = reply->in_size; + if (status == STATUS_BUFFER_OVERFLOW) + in_size = reply->in_size; } } SERVER_END_REQ; - switch(status) + switch (status) { case STATUS_SUCCESS: if (irp_params.major > IRP_MJ_MAXIMUM_FUNCTION || !dispatch_funcs[irp_params.major]) @@ -541,11 +554,16 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) break; } status = dispatch_funcs[irp_params.major]( &irp_params, in_buff, in_size, out_size, irp ); - if (status == STATUS_SUCCESS) irp = 0; /* status reported by IoCompleteRequest */ + if (status == STATUS_SUCCESS) + { + irp = 0; /* status reported by IoCompleteRequest */ + in_size = 4096; + in_buff = NULL; + } break; case STATUS_BUFFER_OVERFLOW: HeapFree( GetProcessHeap(), 0, in_buff ); - in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ); + in_buff = NULL; /* restart with larger buffer */ break; case STATUS_PENDING: @@ -1451,6 +1469,9 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) } } + if (irp->Flags & IRP_DEALLOCATE_BUFFER) + HeapFree( GetProcessHeap(), 0, irp->AssociatedIrp.SystemBuffer ); + IoFreeIrp( irp ); }

1 0

Sebastian Lackner : ntoskrnl.exe: Add support for async close processing.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: e20259bb6e5c7b5f6800e308b9d1eaf7294d7937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e20259bb6e5c7b5f6800e308b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 13 00:46:34 2016 +0200 ntoskrnl.exe: Add support for async close processing. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5d423e0..f3b6913 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -196,6 +196,12 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; + if (irp->Flags & IRP_CLOSE_OPERATION) + { + HeapFree( GetProcessHeap(), 0, file ); + irp->Tail.Overlay.OriginalFileObject = NULL; + } + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); return STATUS_SUCCESS; } @@ -292,7 +298,6 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, irp_handle ); - HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ return STATUS_SUCCESS; }

1 0

Aric Stewart : winehid.sys: Add HID minidriver.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: 769cc264e02ea58a8cb35b88632ba204df118dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=769cc264e02ea58a8cb35b886… Author: Aric Stewart <aricstewart(a)gmail.com> Date: Wed Oct 12 17:46:13 2016 +0200 winehid.sys: Add HID minidriver. 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> --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/winehid.sys/Makefile.in | 5 +++++ dlls/winehid.sys/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winehid.sys/winehid.sys.spec | 1 + loader/wine.inf.in | 14 ++++++++++++++ 7 files changed, 62 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4a7191c..55a7834 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -122,6 +122,7 @@ HID support M: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ +F: dlls/winehid.sys/ HTML rendering (Gecko) M: Jacek Caban <jacek(a)codeweavers.com> diff --git a/configure b/configure index bd0a1b9..99793b0 100755 --- a/configure +++ b/configure @@ -1424,6 +1424,7 @@ enable_winebus_sys enable_winecoreaudio_drv enable_wined3d enable_winegstreamer +enable_winehid_sys enable_winejoystick_drv enable_winemac_drv enable_winemapi @@ -18333,6 +18334,7 @@ wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib wine_fn_config_dll winegstreamer enable_winegstreamer +wine_fn_config_dll winehid.sys enable_winehid_sys wine_fn_config_dll winejoystick.drv enable_winejoystick_drv wine_fn_config_dll winemac.drv enable_winemac_drv clean wine_fn_config_dll winemapi enable_winemapi diff --git a/configure.ac b/configure.ac index eb328a0..ba8fd0f 100644 --- a/configure.ac +++ b/configure.ac @@ -3423,6 +3423,7 @@ WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) +WINE_CONFIG_DLL(winehid.sys) WINE_CONFIG_DLL(winejoystick.drv) WINE_CONFIG_DLL(winemac.drv,,[clean]) WINE_CONFIG_DLL(winemapi) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in new file mode 100644 index 0000000..d4ca3dd --- /dev/null +++ b/dlls/winehid.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = winehid.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/winehid.sys/main.c b/dlls/winehid.sys/main.c new file mode 100644 index 0000000..7ab9267 --- /dev/null +++ b/dlls/winehid.sys/main.c @@ -0,0 +1,38 @@ +/* + * WINE Hid minidriver + * + * Copyright 2016 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hid); + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); + + return STATUS_SUCCESS; +} diff --git a/dlls/winehid.sys/winehid.sys.spec b/dlls/winehid.sys/winehid.sys.spec new file mode 100644 index 0000000..76421d7 --- /dev/null +++ b/dlls/winehid.sys/winehid.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a92a9fe..fcf9c4a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -131,6 +131,7 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService +AddService=WineHID,0,WineHIDService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -146,6 +147,7 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService +AddService=WineHID,0,WineHIDService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -161,6 +163,7 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService +AddService=WineHID,0,WineHIDService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2530,6 +2533,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ndis.sys,- 12,,tdi.sys,- 12,,winebus.sys,- +12,,winehid.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2573,6 +2577,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ndis.sys 12,,tdi.sys 12,,winebus.sys +12,,winehid.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -3198,6 +3203,15 @@ ServiceType=1 StartType=3 ErrorControl=1 +[WineHIDService] +Description="Wine HID Minidriver" +DisplayName="Wine HID" +ServiceBinary="%12%\winehid.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 + [SpoolerService] Description="Loads files to memory for later printing" DisplayName="Print Spooler"

1 0

Matteo Bruni : wined3d: Cleanup user clip distances defines and fields a bit.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: a599109247bfd2e3efd5807ffb31a236ab29718d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a599109247bfd2e3efd5807ff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:10 2016 +0200 wined3d: Cleanup user clip distances defines and fields a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 13 ++++++++----- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/glsl_shader.c | 22 +++++++++++----------- dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 10 +++++----- 6 files changed, 35 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a599109247bfd2e3efd58…

1 0

Matteo Bruni : d3d11/tests: Add a test for derivative shader instructions.
by Alexandre Julliard Oct. 13, 2016

Oct. 13, 2016

Module: wine Branch: master Commit: c061b3e2ece1c8c1df1a5006cc105acc4d6e0a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c061b3e2ece1c8c1df1a5006c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:07 2016 +0200 d3d11/tests: Add a test for derivative shader instructions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 241 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c061b3e2ece1c8c1df1a5…

1 0