September 2015 - Wine-Commits

Aric Stewart : hidclass.sys: Implement a report ring buffer.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 7e2ca70f799c12418178ef08d95ff10445b410b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2ca70f799c12418178ef08d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 11 10:45:54 2015 -0500 hidclass.sys: Implement a report ring buffer. --- dlls/hidclass.sys/Makefile.in | 1 + dlls/hidclass.sys/buffer.c | 81 +++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/device.c | 2 ++ dlls/hidclass.sys/hid.h | 7 ++++ dlls/hidclass.sys/pnp.c | 2 ++ 5 files changed, 93 insertions(+) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index c5c9eb7..8ed51e6 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = ntoskrnl.exe DELAYIMPORTS = setupapi hid C_SRCS = \ + buffer.c \ device.c \ main.c \ pnp.c diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c new file mode 100644 index 0000000..6fbcc0d --- /dev/null +++ b/dlls/hidclass.sys/buffer.c @@ -0,0 +1,81 @@ +/* Implementation of a ring buffer for reports + * + * Copyright 2015 CodeWeavers, 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 "config.h" +#include <stdarg.h> +#define NONAMELESSUNION +#include "hid.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hid); + +#define BASE_BUFFER_SIZE 32 + +struct ReportRingBuffer +{ + UINT start, end, size; + + int *pointers; + UINT pointer_alloc; + UINT buffer_size; + + CRITICAL_SECTION lock; + + BYTE *buffer; +}; + +struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) +{ + struct ReportRingBuffer *ring; + TRACE("Create Ring Buffer with buffer size %i\n",buffer_size); + ring = HeapAlloc(GetProcessHeap(), 0, sizeof(*ring)); + if (!ring) + return NULL; + ring->start = ring->end = 0; + ring->size = BASE_BUFFER_SIZE; + ring->buffer_size = buffer_size; + ring->pointer_alloc = 2; + ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(int) * ring->pointer_alloc); + if (!ring->pointers) + { + HeapFree(GetProcessHeap(), 0, ring); + return NULL; + } + memset(ring->pointers, 0xff, sizeof(int) * ring->pointer_alloc); + ring->buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size * ring->size); + if (!ring->buffer) + { + HeapFree(GetProcessHeap(), 0, ring->pointers); + HeapFree(GetProcessHeap(), 0, ring); + return NULL; + } + InitializeCriticalSection(&ring->lock); + ring->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RingBuffer.lock"); + return ring; +} + +void RingBuffer_Destroy(struct ReportRingBuffer *ring) +{ + HeapFree(GetProcessHeap(), 0, ring->buffer); + HeapFree(GetProcessHeap(), 0, ring->pointers); + ring->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&ring->lock); + HeapFree(GetProcessHeap(), 0, ring); +} diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 384bc8f..e8deb95 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -178,6 +178,8 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device CloseHandle(ext->halt_event); HeapFree(GetProcessHeap(), 0, ext->preparseData); + if (ext->ring_buffer) + RingBuffer_Destroy(ext->ring_buffer); entry = RemoveHeadList(&ext->irp_queue); while(entry != &ext->irp_queue) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index efa4712..538942b 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -35,6 +35,9 @@ typedef NTSTATUS (WINAPI *pAddDevice)(DRIVER_OBJECT *DriverObject, DEVICE_OBJECT *PhysicalDeviceObject); +/* Ring buffer functions */ +struct ReportRingBuffer; + typedef struct _BASE_DEVICE_EXTENSTION { HID_DEVICE_EXTENSION deviceExtension; @@ -44,6 +47,7 @@ typedef struct _BASE_DEVICE_EXTENSTION { ULONG poll_interval; WCHAR *device_name; WCHAR *link_name; + struct ReportRingBuffer *ring_buffer; HANDLE halt_event; HANDLE thread; @@ -52,6 +56,9 @@ typedef struct _BASE_DEVICE_EXTENSTION { /* Minidriver Specific stuff will end up here */ } BASE_DEVICE_EXTENSION; +void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; +struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; + typedef struct _minidriver { struct list entry; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 0fb06a2..43bc449 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -126,6 +126,8 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->poll_interval = DEFAULT_POLL_INTERVAL; InitializeListHead(&ext->irp_queue); + ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength); + return STATUS_SUCCESS; }

1 0

Piotr Caban : msvcp60: Fix basic_string::operator[size_t] implementation.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 874c3f96f7559893a48bdc8ff1e9684a2a4c359d URL: http://source.winehq.org/git/wine.git/?a=commit;h=874c3f96f7559893a48bdc8ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 12 16:05:40 2015 +0200 msvcp60: Fix basic_string::operator[size_t] implementation. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp60/string.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 4ba1584..0aa3f1b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -1535,12 +1535,12 @@ @ cdecl -arch=win64 ??9std@@YA_NPEBGAEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal_cstr_str @ thiscall -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z(ptr long) MSVCP_basic_string_char_operator_at @ cdecl -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z(ptr long) MSVCP_basic_string_char_operator_at -@ thiscall -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z(ptr long) MSVCP_basic_string_char_operator_at -@ cdecl -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z(ptr long) MSVCP_basic_string_char_operator_at +@ thiscall -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z(ptr long) MSVCP_basic_string_char_operator_at_const +@ cdecl -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z(ptr long) MSVCP_basic_string_char_operator_at_const @ thiscall -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGI(a)Z(ptr long) MSVCP_basic_string_wchar_operator_at @ cdecl -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAG_K(a)Z(ptr long) MSVCP_basic_string_wchar_operator_at -@ thiscall -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGI(a)Z(ptr long) MSVCP_basic_string_wchar_operator_at -@ cdecl -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z(ptr long) MSVCP_basic_string_wchar_operator_at +@ thiscall -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGI(a)Z(ptr long) MSVCP_basic_string_wchar_operator_at_const +@ cdecl -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z(ptr long) MSVCP_basic_string_wchar_operator_at_const @ thiscall -arch=win32 ??Bid(a)locale@std@@QAEIXZ(ptr) locale_id_operator_size_t @ cdecl -arch=win64 ??Bid(a)locale@std@@QEAA_KXZ(ptr) locale_id_operator_size_t @ thiscall -arch=win32 ??Bios_base(a)std@@QBEPAXXZ(ptr) ios_base_op_fail diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 76a0e02..09f9854 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -22,7 +22,6 @@ #include "msvcp.h" #include "stdio.h" -#include "assert.h" #include "windef.h" #include "winbase.h" @@ -1412,15 +1411,29 @@ basic_string_char* __cdecl MSVCP_basic_string_char_concatenate_cstr_bstr(basic_s /* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z */ /* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z */ -/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ -/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_operator_at, 8) char* __thiscall MSVCP_basic_string_char_operator_at( basic_string_char *this, MSVCP_size_t pos) { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); + if(!this->ptr || pos>this->size) + return (char*)basic_string_char__Nullstr(); + + basic_string_char__Freeze(this); + return this->ptr+pos; +} + +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_operator_at_const, 8) +const char* __thiscall MSVCP_basic_string_char_operator_at_const( + const basic_string_char *this, MSVCP_size_t pos) +{ + TRACE("%p %lu\n", this, pos); + + if(!this->ptr) + return basic_string_char__Nullstr(); return this->ptr+pos; } @@ -2935,15 +2948,29 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_cstr_bstr(basic /* ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGI(a)Z */ /* ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAG_K(a)Z */ -/* ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGI(a)Z */ -/* ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_operator_at, 8) wchar_t* __thiscall MSVCP_basic_string_wchar_operator_at( basic_string_wchar *this, MSVCP_size_t pos) { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); + if(!this->ptr || pos>this->size) + return (wchar_t*)basic_string_wchar__Nullstr(); + + basic_string_wchar__Freeze(this); + return this->ptr+pos; +} + +/* ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGI(a)Z */ +/* ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_operator_at_const, 8) +const wchar_t* __thiscall MSVCP_basic_string_wchar_operator_at_const( + const basic_string_wchar *this, MSVCP_size_t pos) +{ + TRACE("%p %lu\n", this, pos); + + if(!this->ptr) + return basic_string_wchar__Nullstr(); return this->ptr+pos; }

1 0

Józef Kucia : d3d10core/tests: Port test_depthstencil_view_interfaces() from d3d11.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: fbf7b84d10175798cac19fe9e5f980593671f163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf7b84d10175798cac19fe9e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:31 2015 +0200 d3d10core/tests: Port test_depthstencil_view_interfaces() from d3d11. --- dlls/d3d10core/tests/device.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ebe50cc..e24cc94 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -704,6 +704,74 @@ static void test_create_depthstencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_depthstencil_view_interfaces(void) +{ + D3D11_DEPTH_STENCIL_VIEW_DESC d3d11_dsv_desc; + D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; + ID3D11DepthStencilView *d3d11_dsview; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsview; + ID3D10Texture2D *texture; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + dsv_desc.Format = texture_desc.Format; + dsv_desc.ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2D; + U(dsv_desc).Texture2D.MipSlice = 0; + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + + hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&d3d11_dsview); + ID3D10DepthStencilView_Release(dsview); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Depth stencil view should implement ID3D11DepthStencilView.\n"); + + if (SUCCEEDED(hr)) + { + ID3D11DepthStencilView_GetDesc(d3d11_dsview, &d3d11_dsv_desc); + ok(d3d11_dsv_desc.Format == dsv_desc.Format, "Got unexpected format %#x.\n", d3d11_dsv_desc.Format); + ok(d3d11_dsv_desc.ViewDimension == (D3D11_DSV_DIMENSION)dsv_desc.ViewDimension, + "Got unexpected view dimension %u.\n", d3d11_dsv_desc.ViewDimension); + ok(!d3d11_dsv_desc.Flags, "Got unexpected flags %#x.\n", d3d11_dsv_desc.Flags); + ok(U(d3d11_dsv_desc).Texture2D.MipSlice == U(dsv_desc).Texture2D.MipSlice, + "Got unexpected mip slice %u.\n", U(d3d11_dsv_desc).Texture2D.MipSlice); + + ID3D11DepthStencilView_Release(d3d11_dsview); + } + else + { + win_skip("D3D11 is not available.\n"); + } + + ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3738,6 +3806,7 @@ START_TEST(device) test_create_texture3d(); test_buffer_interfaces(); test_create_depthstencil_view(); + test_depthstencil_view_interfaces(); test_create_rendertarget_view(); test_create_shader_resource_view(); test_create_shader();

1 0

Józef Kucia : d3d11/tests: Port test_create_depthstencil_view() from d3d10core.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: e0bd44583ccb3493f395f98e4a7a72d9114bc825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bd44583ccb3493f395f98e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:34 2015 +0200 d3d11/tests: Port test_create_depthstencil_view() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8bf31dc..44e1550 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -815,6 +815,64 @@ static void test_buffer_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_depthstencil_view(void) +{ + D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + ID3D11DepthStencilView *dsview; + ID3D11Device *device, *tmp; + ID3D11Texture2D *texture; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11DepthStencilView_GetDevice(dsview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); + ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_depthstencil_view_interfaces(void) { D3D10_DEPTH_STENCIL_VIEW_DESC d3d10_dsv_desc; @@ -1094,6 +1152,7 @@ START_TEST(d3d11) test_create_texture3d(); test_texture3d_interfaces(); test_buffer_interfaces(); + test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); test_create_shader_resource_view();

1 0

Józef Kucia : dxgi/tests: Check that DXGI surface implements ID3D11Texture2D.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: cee4d0bb9151fc5361d36e36094c7d08c577af7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee4d0bb9151fc5361d36e360… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:38 2015 +0200 dxgi/tests: Check that DXGI surface implements ID3D11Texture2D. --- dlls/dxgi/tests/device.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d6db790..fe2c453 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -172,10 +172,10 @@ done: static void test_create_surface(void) { - ID3D10Texture2D *texture; - IDXGISurface *surface; DXGI_SURFACE_DESC desc; + IDXGISurface *surface; IDXGIDevice *device; + IUnknown *texture; ULONG refcount; HRESULT hr; @@ -196,7 +196,12 @@ static void test_create_surface(void) hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); - if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture); + IUnknown_Release(texture); + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Surface should implement ID3D11Texture2D.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(texture); IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device);

1 0

Andrew Eikum : xaudio2: Quiet down some noisy stubs.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 031af2ca9aa82ac4cd2c9222b4d37e7c1a137973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031af2ca9aa82ac4cd2c9222b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 11 10:55:55 2015 -0500 xaudio2: Quiet down some noisy stubs. --- dlls/xaudio2_7/xaudio_dll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index ce7a15b..e68f1b6 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1964,7 +1964,7 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(0x%x): stub!\n", This, operationSet); + TRACE("(%p)->(0x%x): stub!\n", This, operationSet); return E_NOTIMPL; } @@ -1974,7 +1974,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(%p): stub!\n", This, pPerfData); + TRACE("(%p)->(%p): stub!\n", This, pPerfData); memset(pPerfData, 0, sizeof(*pPerfData)); }

1 0

Piotr Caban : msi/tests: Fix MsiProvideQualifiedComponent test failure.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: f326e372d113332cb238584350b11702ec0b28a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f326e372d113332cb23858435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 11 16:33:33 2015 +0200 msi/tests: Fix MsiProvideQualifiedComponent test failure. --- dlls/msi/tests/action.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 2aa5b0b..05e3b1e 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5902,9 +5902,8 @@ static void test_publish_components(void) res = RegDeleteKeyA(HKEY_CURRENT_USER, keypath); ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); - res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath2, &key); - ok(res == ERROR_SUCCESS, "RegCreateKey failed %d\n", res); - + res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, REG_OPTION_NON_VOLATILE, + MAXIMUM_ALLOWED | KEY_WOW64_64KEY, NULL, &key, NULL ); res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); RegCloseKey(key); @@ -5914,7 +5913,10 @@ static void test_publish_components(void) "english.txt", INSTALLMODE_DEFAULT, NULL, &size); ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); - res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2); + if (pRegDeleteKeyExA) + res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0); + else + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2); ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &key);

1 0

Alexandre Julliard : include: Avoid some type redefinitions.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: b30517defd743f4295eaada3a7eabe98f31a395a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30517defd743f4295eaada3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 16:19:14 2015 +0900 include: Avoid some type redefinitions. --- include/webservices.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index 744bee4..0a8b206 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -25,10 +25,11 @@ extern "C" { typedef struct _WS_ERROR WS_ERROR; typedef struct _WS_HEAP WS_HEAP; -typedef struct _WS_STRUCT_DESCRIPTION WS_STRUCT_DESCRIPTION; typedef struct _WS_XML_BUFFER WS_XML_BUFFER; typedef struct _WS_XML_READER WS_XML_READER; -typedef struct _WS_XML_STRING WS_XML_STRING; + +struct _WS_STRUCT_DESCRIPTION; +struct _WS_XML_STRING; typedef enum { WS_ERROR_PROPERTY_STRING_COUNT, @@ -140,10 +141,10 @@ typedef struct _WS_XML_READER_STREAM_INPUT { } WS_XML_READER_STREAM_INPUT; typedef struct _WS_XML_DICTIONARY { - GUID guid; - WS_XML_STRING *strings; - ULONG stringCount; - BOOL isConst; + GUID guid; + struct _WS_XML_STRING *strings; + ULONG stringCount; + BOOL isConst; } WS_XML_DICTIONARY; typedef struct _WS_XML_STRING { @@ -254,8 +255,8 @@ typedef struct _WS_STRUCT_DESCRIPTION { ULONG fieldCount; WS_XML_STRING *typeLocalName; WS_XML_STRING *typeNs; - WS_STRUCT_DESCRIPTION *parentType; - WS_STRUCT_DESCRIPTION **subTypes; + struct _WS_STRUCT_DESCRIPTION *parentType; + struct _WS_STRUCT_DESCRIPTION **subTypes; ULONG subTypeCount; ULONG structOptions; } WS_STRUCT_DESCRIPTION;

1 0

Andrew Eikum : xaudio2: Don' t keep running after master voice is destroyed.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 4c8ed8d104bcdb6cb71bc9a73d1d7dd6e9a2f6bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8ed8d104bcdb6cb71bc9a73… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 11 10:55:50 2015 -0500 xaudio2: Don't keep running after master voice is destroyed. --- dlls/xaudio2_7/xaudio_dll.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 739c919..ce7a15b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1188,6 +1188,8 @@ static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) return; } + This->running = FALSE; + IAudioRenderClient_Release(This->render); This->render = NULL; @@ -3068,11 +3070,13 @@ static DWORD WINAPI engine_threadproc(void *arg) if(This->stop_engine) break; - if(!This->running) - continue; - EnterCriticalSection(&This->lock); + if(!This->running || !This->aclient){ + LeaveCriticalSection(&This->lock); + continue; + } + do_engine_tick(This); LeaveCriticalSection(&This->lock);

1 0

Francois Gouget : dissect: Raise the new platforms' failed tests limit so they get a chance to improve.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: tools Branch: master Commit: f108c92f2cf6c03737f42d955cb7deea49f529ad URL: http://source.winehq.org/git/tools.git/?a=commit;h=f108c92f2cf6c03737f42d95… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 13 15:56:28 2015 +0200 dissect: Raise the new platforms' failed tests limit so they get a chance to improve. New platforms typically have so many test failures that their results are ignored. But developers cannot fix test failures they are not aware of, resulting in slow progress. So temporarily cut some slack to the new platforms. --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 7a40234..067fa7b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -216,6 +216,8 @@ if ($plid==1 && $major==4) { } elsif ($plid==3) { #$version = "ce$major$minor"; } +# Give a little slack to the new platforms. +$maxfailedtests += 20 if ($version eq "win8" || $version eq "win10"); if ($prediluvian and not $acceptprediluvianwin) { mydie "platform $version not accepted\n"; }

1 0