October 2015 - Wine-commits

Józef Kucia : d3d11: Rename d3d10_null_wined3d_parent_ops to d3d_null_wined3d_parent_ops.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: a865b14aedb01def345c09732717c3c5f2eb6dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a865b14aedb01def345c09732… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 9 03:19:12 2015 +0200 d3d11: Rename d3d10_null_wined3d_parent_ops to d3d_null_wined3d_parent_ops. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 10 +++++----- dlls/d3d11/view.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 64568ce..2725a7c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -54,7 +54,7 @@ struct d3d_shader_info struct wined3d_shader_signature *output_signature; }; -extern const struct wined3d_parent_ops d3d10_null_wined3d_parent_ops DECLSPEC_HIDDEN; +extern const struct wined3d_parent_ops d3d_null_wined3d_parent_ops DECLSPEC_HIDDEN; /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8a3a2e8..0e06eeb 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -25,11 +25,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static void STDMETHODCALLTYPE d3d10_null_wined3d_object_destroyed(void *parent) {} +static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {} -const struct wined3d_parent_ops d3d10_null_wined3d_parent_ops = +const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = { - d3d10_null_wined3d_object_destroyed, + d3d_null_wined3d_object_destroyed, }; /* ID3D11Device methods */ @@ -3018,7 +3018,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent device_parent, container_parent, surface, parent, parent_ops); *parent = NULL; - *parent_ops = &d3d10_null_wined3d_parent_ops; + *parent_ops = &d3d_null_wined3d_parent_ops; return S_OK; } @@ -3031,7 +3031,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); *parent = NULL; - *parent_ops = &d3d10_null_wined3d_parent_ops; + *parent_ops = &d3d_null_wined3d_parent_ops; return S_OK; } diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 4b39cc8..ce33749 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -718,7 +718,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_depth_stencil_view_desc_from_d3d11(&wined3d_desc, &view->desc); if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, - view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); @@ -1130,7 +1130,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_rendertarget_view_desc_from_d3d11(&wined3d_desc, &view->desc); if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, - view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); @@ -1477,7 +1477,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi } if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource, - view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) { WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr); return hr;

1 0

Józef Kucia : d3d11: Add ID3D11DeviceContext stub interface.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 1d10c79af0153fdd51f39fdbaf1b64333c249919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d10c79af0153fdd51f39fdba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 9 03:19:13 2015 +0200 d3d11: Add ID3D11DeviceContext stub interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 10 + dlls/d3d11/device.c | 989 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/tests/d3d11.c | 25 +- 3 files changed, 1008 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d10c79af0153fdd51f39…

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11Device: :GetImmediateContext().
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: cf18ba1dc4e76172839965a7e85aba757cd72d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf18ba1dc4e76172839965a7e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 9 03:19:14 2015 +0200 d3d11/tests: Add test for ID3D11Device::GetImmediateContext(). Signed-off-by: Józef Kucia <jkucia(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 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bcd370d..2fb1381 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -292,6 +292,43 @@ static void test_device_interfaces(void) } } +static void test_get_immediate_context(void) +{ + ID3D11DeviceContext *immediate_context, *previous_immediate_context; + ULONG expected_refcount, refcount; + ID3D11Device *device; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + expected_refcount = get_refcount((IUnknown *)device) + 1; + ID3D11Device_GetImmediateContext(device, &immediate_context); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u.\n", refcount); + previous_immediate_context = immediate_context; + + ID3D11Device_GetImmediateContext(device, &immediate_context); + ok(immediate_context == previous_immediate_context, "Got different immediate device context objects.\n"); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D11DeviceContext_Release(previous_immediate_context); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D11DeviceContext_Release(immediate_context); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + ID3D11Device_GetImmediateContext(device, &immediate_context); + ok(immediate_context == previous_immediate_context, "Got different immediate device context objects.\n"); + refcount = ID3D11DeviceContext_Release(immediate_context); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -2125,6 +2162,7 @@ START_TEST(d3d11) { test_create_device(); test_device_interfaces(); + test_get_immediate_context(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d();

1 0

Sebastian Lackner : ntdll/tests: Add Sleep to make threadpool wait tests more reliable.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: e37cdbbc2c3f772ea9d8cac4031f7d5b8bb28814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37cdbbc2c3f772ea9d8cac40… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 06:36:39 2015 +0200 ntdll/tests: Add Sleep to make threadpool wait tests more reliable. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index ec0a29c..d4e13bd 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -215,9 +215,9 @@ static void test_RtlRegisterWait(void) ok(info.userdata == 2, "expected info.userdata = 2, got %u\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status || broken(status == STATUS_PENDING) /* >= Win 8 */, - "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); /* repeat test with WT_EXECUTEONLYONCE */ info.userdata = 0; @@ -233,6 +233,7 @@ static void test_RtlRegisterWait(void) ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + Sleep(50); status = RtlDeregisterWait(wait1); ok(!status, "RtlDeregisterWait failed with status %x\n", status); @@ -248,9 +249,9 @@ static void test_RtlRegisterWait(void) ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status || broken(status == STATUS_PENDING) /* >= Win 8 */, - "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); /* finite timeout, with event */ info.userdata = 0; @@ -265,9 +266,9 @@ static void test_RtlRegisterWait(void) ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); result = WaitForSingleObject(semaphores[1], 0); ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + Sleep(50); status = RtlDeregisterWait(wait1); - ok(!status || broken(status == STATUS_PENDING) /* >= Win 8 */, - "RtlDeregisterWait failed with status %x\n", status); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); /* test RtlDeregisterWaitEx before wait expired */ info.userdata = 0;

1 0

Sebastian Lackner : ntdll: Wait_thread_proc should not terminate on user APC.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 381c034be3698231e71d20062985a5005c3b32a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=381c034be3698231e71d20062… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 06:37:57 2015 +0200 ntdll: Wait_thread_proc should not terminate on user APC. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 68 +++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/threadpool.c | 2 +- 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index d4e13bd..304fe91 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -148,6 +148,7 @@ struct rtl_wait_info HANDLE semaphore1; HANDLE semaphore2; DWORD wait_result; + DWORD threadid; LONG userdata; }; @@ -162,6 +163,7 @@ static void CALLBACK rtl_wait_cb(void *userdata, BOOLEAN timeout) InterlockedIncrement(&info->userdata); else InterlockedExchangeAdd(&info->userdata, 0x10000); + info->threadid = GetCurrentThreadId(); ReleaseSemaphore(info->semaphore1, 1, NULL); if (info->semaphore2) @@ -172,14 +174,22 @@ static void CALLBACK rtl_wait_cb(void *userdata, BOOLEAN timeout) } } +static HANDLE rtl_wait_apc_semaphore; + +static void CALLBACK rtl_wait_apc_cb(ULONG_PTR userdata) +{ + trace("Running rtl_wait_apc callback\n"); + if (rtl_wait_apc_semaphore) + ReleaseSemaphore(rtl_wait_apc_semaphore, 1, NULL); +} + static void test_RtlRegisterWait(void) { + HANDLE wait1, event, thread; struct rtl_wait_info info; HANDLE semaphores[2]; NTSTATUS status; DWORD result; - HANDLE wait1; - HANDLE event; semaphores[0] = CreateSemaphoreW(NULL, 0, 2, NULL); ok(semaphores[0] != NULL, "failed to create semaphore\n"); @@ -270,6 +280,60 @@ static void test_RtlRegisterWait(void) status = RtlDeregisterWait(wait1); ok(!status, "RtlDeregisterWait failed with status %x\n", status); + /* test for IO threads */ + info.userdata = 0; + info.threadid = 0; + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEINIOTHREAD); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 100); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(info.threadid != 0, "expected info.threadid != 0, got %u\n", info.threadid); + thread = OpenThread(THREAD_SET_CONTEXT, FALSE, info.threadid); + ok(thread != NULL, "OpenThread failed with %u\n", GetLastError()); + rtl_wait_apc_semaphore = semaphores[0]; + result = QueueUserAPC(rtl_wait_apc_cb, thread, 0); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + result = WaitForSingleObject(semaphores[0], 200); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + rtl_wait_apc_semaphore = 0; + CloseHandle(thread); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 100); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 2, "expected info.userdata = 2, got %u\n", info.userdata); + Sleep(50); + status = RtlDeregisterWait(wait1); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); + + info.userdata = 0; + info.threadid = 0; + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 100); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(info.threadid != 0, "expected info.threadid != 0, got %u\n", info.threadid); + thread = OpenThread(THREAD_SET_CONTEXT, FALSE, info.threadid); + ok(thread != NULL, "OpenThread failed with %u\n", GetLastError()); + rtl_wait_apc_semaphore = semaphores[0]; + result = QueueUserAPC(rtl_wait_apc_cb, thread, 0); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + result = WaitForSingleObject(semaphores[0], 200); + ok(result == WAIT_TIMEOUT || broken(result == WAIT_OBJECT_0) /* >= Win Vista */, + "WaitForSingleObject returned %u\n", result); + rtl_wait_apc_semaphore = 0; + CloseHandle(thread); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 100); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 2, "expected info.userdata = 2, got %u\n", info.userdata); + Sleep(50); + status = RtlDeregisterWait(wait1); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); + /* test RtlDeregisterWaitEx before wait expired */ info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEDEFAULT); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 0ed0851..9c98040 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -537,7 +537,7 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) if (wait_work_item->Flags & WT_EXECUTEONLYONCE) break; } - else + else if (status != STATUS_USER_APC) break; }

1 0

Alistair Leslie-Hughes : oledberr.h: Add more defines.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: c94a16cfe1ac8879d979dd0ac2b6922fdeda6a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94a16cfe1ac8879d979dd0ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 8 20:06:17 2015 +1100 oledberr.h: Add more defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledberr.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 96adcae..8af38ef 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -23,6 +23,11 @@ #define DB_E_BADBINDINFO 0x80040e08 +#define DB_E_ERRORSINCOMMAND 0x80040e14 +#define DB_E_CANTCANCEL 0x80040e15 +#define DB_E_DIALECTNOTSUPPORTED 0x80040e16 +#define DB_E_DUPLICATEDATASOURCE 0x80040e17 +#define DB_E_CANNOTRESTART 0x80040e18 #define DB_E_NOTFOUND 0x80040e19 #define DB_E_UNSUPPORTEDCONVERSION 0x80040e1d

1 0

Alexandre Julliard : xaudio2_7: Fix a typo.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: d548639d977dee847350b408aec9522d68aef813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d548639d977dee847350b408a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 23:23:17 2015 +0900 xaudio2_7: Fix a typo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index feab321..76d9503 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2489,7 +2489,7 @@ static IClassFactory *make_xaudio2_factory(DWORD version) static IClassFactory *make_xapo_factory(REFCLSID clsid, DWORD version) { struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); - ret->IClassFactory_iface.lpVtbl = &XAudio2CF_Vtbl; + ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; ret->version = version; ret->class = clsid; ret->ref = 0;

1 0

Andrew Eikum : xaudio2_0: Fix registered XAudio20 CLSID.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: a3c340979664a2e8a27d37e8e5297efc980c50ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c340979664a2e8a27d37e8e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 8 10:35:20 2015 -0500 xaudio2_0: Fix registered XAudio20 CLSID. Thanks to Andrey Gusev for noticing during a bug retest. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_0/xaudio_classes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_0/xaudio_classes.idl b/dlls/xaudio2_0/xaudio_classes.idl index 4a81eb1..08693fc 100644 --- a/dlls/xaudio2_0/xaudio_classes.idl +++ b/dlls/xaudio2_0/xaudio_classes.idl @@ -23,7 +23,7 @@ [ helpstring("XAudio2.0 Class"), threading(both), - uuid(e21a7345-eb21-468e-be50-804db97cf708) + uuid(fac23f48-31f5-45a8-b49b-5225d61401aa) ] coclass XAudio20 { interface IXAudio20; }

1 0

Henri Verbeet : d2d1: Properly check if a face is real in d2d_path_geometry_add_face().
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: c575f04b6841fc107e8703a59516ad3da0463553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c575f04b6841fc107e8703a59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 8 20:07:43 2015 +0200 d2d1: Properly check if a face is real in d2d_path_geometry_add_face(). In particular, the existing test may fail if the convex hull has only three vertices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 3 +-- dlls/d2d1/tests/d2d1.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 80d004b..3919080 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1234,8 +1234,7 @@ static BOOL d2d_path_geometry_add_face(struct d2d_geometry *geometry, const stru probe.x += cdt->vertices[d2d_cdt_edge_origin(cdt, &tmp)].x * 0.50f; probe.y += cdt->vertices[d2d_cdt_edge_origin(cdt, &tmp)].y * 0.50f; - d2d_cdt_edge_next_left(cdt, &tmp, &tmp); - if (tmp.idx == base_edge->idx && d2d_path_geometry_point_inside(geometry, &probe)) + if (d2d_cdt_leftof(cdt, face->v[2], base_edge) && d2d_path_geometry_point_inside(geometry, &probe)) ++geometry->face_count; return TRUE; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index dfc560f..67901b6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1630,6 +1630,46 @@ static void test_path_geometry(void) ID2D1TransformedGeometry_Release(transformed_geometry); ID2D1PathGeometry_Release(geometry); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + + set_point(&point, 40.0f, 20.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + set_point(&point, 75.0f, 300.0f); + ID2D1GeometrySink_AddLine(sink, point); + set_point(&point, 5.0f, 300.0f); + ID2D1GeometrySink_AddLine(sink, point); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + set_point(&point, 40.0f, 290.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + set_point(&point, 55.0f, 160.0f); + ID2D1GeometrySink_AddLine(sink, point); + set_point(&point, 25.0f, 160.0f); + ID2D1GeometrySink_AddLine(sink, point); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(count == 2, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 6, "Got unexpected segment count %u.\n", count); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "a875e68e0cb9c055927b1b50b879f90b24e38470"); + ok(match, "Surface does not match.\n"); + ID2D1PathGeometry_Release(geometry); + ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt); refcount = ID2D1Factory_Release(factory);

1 0

Nikolay Sivov : wiaservc: Added a stub for IEnumWIA_DEV_INFO.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 9cb1981e304bc54e9378ae52a5367d9db576872a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb1981e304bc54e9378ae52a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 21:09:11 2015 +0300 wiaservc: Added a stub for IEnumWIA_DEV_INFO. Based on original patch by Mikael Ståldal <mikael(a)staldal.nu>. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/tests/wia.c | 4 +- dlls/wiaservc/wiadevmgr.c | 127 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index e3f4edb..c7c2fd9 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -40,21 +40,19 @@ static void test_EnumDeviceInfo(void) ok(FAILED(hr), "got 0x%08x\n", hr); hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); ok(FAILED(hr), "got 0x%08x\n", hr); count = 1000; hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count != 1000, "got %u\n", count); IEnumWIA_DEV_INFO_Release(devenum); } -} START_TEST(wia) { diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index 6eb82aa..58720ef 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -29,11 +29,119 @@ WINE_DEFAULT_DEBUG_CHANNEL(wia); +typedef struct +{ + IEnumWIA_DEV_INFO IEnumWIA_DEV_INFO_iface; + LONG ref; +} enumwiadevinfo; + static inline wiadevmgr *impl_from_IWiaDevMgr(IWiaDevMgr *iface) { return CONTAINING_RECORD(iface, wiadevmgr, IWiaDevMgr_iface); } +static inline enumwiadevinfo *impl_from_IEnumWIA_DEV_INFO(IEnumWIA_DEV_INFO *iface) +{ + return CONTAINING_RECORD(iface, enumwiadevinfo, IEnumWIA_DEV_INFO_iface); +} + +static HRESULT WINAPI enumwiadevinfo_QueryInterface(IEnumWIA_DEV_INFO *iface, REFIID riid, void **obj) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumWIA_DEV_INFO)) + *obj = iface; + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI enumwiadevinfo_AddRef(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI enumwiadevinfo_Release(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + return ref; +} + +static HRESULT WINAPI enumwiadevinfo_Next(IEnumWIA_DEV_INFO *iface, ULONG count, IWiaPropertyStorage **elem, ULONG *fetched) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %d, %p, %p): stub\n", This, count, elem, fetched); + + *fetched = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Skip(IEnumWIA_DEV_INFO *iface, ULONG count) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %u): stub\n", This, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Reset(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Clone(IEnumWIA_DEV_INFO *iface, IEnumWIA_DEV_INFO **ret) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %p): stub\n", This, ret); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_GetCount(IEnumWIA_DEV_INFO *iface, ULONG *count) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %p): stub\n", This, count); + + *count = 0; + return E_NOTIMPL; +} + +static const IEnumWIA_DEV_INFOVtbl EnumWIA_DEV_INFOVtbl = +{ + enumwiadevinfo_QueryInterface, + enumwiadevinfo_AddRef, + enumwiadevinfo_Release, + enumwiadevinfo_Next, + enumwiadevinfo_Skip, + enumwiadevinfo_Reset, + enumwiadevinfo_Clone, + enumwiadevinfo_GetCount +}; + static HRESULT WINAPI wiadevmgr_QueryInterface(IWiaDevMgr *iface, REFIID riid, void **ppvObject) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); @@ -69,11 +177,24 @@ static ULONG WINAPI wiadevmgr_Release(IWiaDevMgr *iface) return ref; } -static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG lFlag, IEnumWIA_DEV_INFO **ppIEnum) +static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG flag, IEnumWIA_DEV_INFO **ret) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %d, %p): stub\n", This, lFlag, ppIEnum); - return E_NOTIMPL; + enumwiadevinfo *enuminfo; + + TRACE("(%p)->(%x, %p)\n", This, flag, ret); + + *ret = NULL; + + enuminfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*enuminfo)); + if (!enuminfo) + return E_OUTOFMEMORY; + + enuminfo->IEnumWIA_DEV_INFO_iface.lpVtbl = &EnumWIA_DEV_INFOVtbl; + enuminfo->ref = 1; + + *ret = &enuminfo->IEnumWIA_DEV_INFO_iface; + return S_OK; } static HRESULT WINAPI wiadevmgr_CreateDevice(IWiaDevMgr *iface, BSTR bstrDeviceID, IWiaItem **ppWiaItemRoot)

1 0