wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

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

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

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

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: 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: Break lines exceeding 120 characters.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 08fa2f0f73c923ecc8f6c4d98bc223ef009188b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08fa2f0f73c923ecc8f6c4d98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 9 03:19:11 2015 +0200 d3d11: Break lines exceeding 120 characters. 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/device.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 20027a7..8a3a2e8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1215,14 +1215,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, FIXME("Ignoring AlphaToCoverageEnable %#x.\n", desc->AlphaToCoverageEnable); /* glEnableIndexedEXT(GL_BLEND, ...) */ FIXME("Per-rendertarget blend not implemented.\n"); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->RenderTarget[0].BlendEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, + desc->RenderTarget[0].BlendEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, desc->RenderTarget[0].SrcBlend); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, desc->RenderTarget[0].DestBlend); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, desc->RenderTarget[0].BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, desc->RenderTarget[0].SrcBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, desc->RenderTarget[0].DestBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, desc->RenderTarget[0].BlendOpAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, + desc->RenderTarget[0].SrcBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, + desc->RenderTarget[0].DestBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, + desc->RenderTarget[0].BlendOpAlpha); FIXME("Color mask > 3 not implemented.\n"); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask);

1 0

Józef Kucia : d3d10core/tests: Use full name of structure field in ok() messages.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 5f2e825b5358faa6b7e5082f9a7c57a09f9cfc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2e825b5358faa6b7e5082f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 9 03:19:10 2015 +0200 d3d10core/tests: Use full name of structure field in ok() messages. 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/d3d10core/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1bff1eb..2e0e9e5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1341,7 +1341,7 @@ static void test_create_blend_state(void) ID3D11BlendState_GetDesc(d3d11_blend_state, &d3d11_blend_desc); ok(d3d11_blend_desc.AlphaToCoverageEnable == blend_desc.AlphaToCoverageEnable, - "Got unexpected alpha to coverage %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); + "Got unexpected alpha to coverage enable %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); ok(d3d11_blend_desc.IndependentBlendEnable == FALSE, "Got unexpected independent blend enable %#x.\n", d3d11_blend_desc.IndependentBlendEnable); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) @@ -1404,7 +1404,7 @@ static void test_create_blend_state(void) ID3D11BlendState_GetDesc(d3d11_blend_state, &d3d11_blend_desc); ok(d3d11_blend_desc.AlphaToCoverageEnable == blend_desc.AlphaToCoverageEnable, - "Got unexpected alpha to coverage %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); + "Got unexpected alpha to coverage enable %#x.\n", d3d11_blend_desc.AlphaToCoverageEnable); ok(d3d11_blend_desc.IndependentBlendEnable == TRUE, "Got unexpected independent blend enable %#x.\n", d3d11_blend_desc.IndependentBlendEnable); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)

1 0

Sebastian Lackner : wininet/tests: Add test for using NULL as proxy server.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: e609b398180f09db95576f7d69a8d730f9939b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e609b398180f09db95576f7d6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 01:30:11 2015 +0200 wininet/tests: Add test for using NULL as proxy server. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 2efde07..5636d4b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1349,6 +1349,35 @@ static void test_Option_PerConnectionOptionA(void) HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); + /* test with NULL as proxy server */ + list.dwOptionCount = 1; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONA)); + list.pOptions[0].dwOption = INTERNET_PER_CONN_PROXY_SERVER; + list.pOptions[0].Value.pszValue = NULL; + + ret = InternetSetOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + ret = InternetSetOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + HeapFree(GetProcessHeap(), 0, list.pOptions); + + /* get & verify the proxy server */ + list.dwOptionCount = 1; + list.dwOptionError = 0; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONA)); + list.pOptions[0].dwOption = INTERNET_PER_CONN_PROXY_SERVER; + + ret = InternetQueryOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); + ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + ok(!list.pOptions[0].Value.pszValue, + "Retrieved proxy server should've been NULL, was: \"%s\"\n", + list.pOptions[0].Value.pszValue); + + HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + HeapFree(GetProcessHeap(), 0, list.pOptions); + /* restore original settings */ list.dwOptionCount = 2; list.pOptions = orig_settings;

1 0

Michael Müller : wininet: Disabling proxy should return success when no proxy was enabled.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 54a390b4ac31e2fac4a476976db6d67055971bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a390b4ac31e2fac4a476976… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 9 01:29:53 2015 +0200 wininet: Disabling proxy should return success when no proxy was enabled. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c64816e..9045b03 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -359,7 +359,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } else { - if ((ret = RegDeleteValueW( key, szProxyServer ))) + if ((ret = RegDeleteValueW( key, szProxyServer )) && ret != ERROR_FILE_NOT_FOUND) { RegCloseKey( key ); return ret;

1 0

Huw Davies : ole32: Implement OleCreateFromFileEx.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 09cd89c0cc667789611a5edbd35d47379f14527d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cd89c0cc667789611a5edbd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:25 2015 +0100 ole32: Implement OleCreateFromFileEx. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2impl.c | 76 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 71b0145..cdc54be 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -97,7 +97,7 @@ static inline void init_fmtetc(FORMATETC *fmt, CLIPFORMAT cf, TYMED tymed) * * FIXME: CF_FILENAME. */ -static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) +static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL other_fmts) { static const UINT fmt_id[] = { CF_METAFILEPICT, CF_BITMAP, CF_DIB }; UINT i; @@ -107,7 +107,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) IPersistStorage *persist; CLSID clsid; - *src_cf = 0; + if (src_cf) *src_cf = 0; /* CF_EMBEDEDOBJECT */ init_fmtetc(&fmt, embedded_object_clipboard_format, TYMED_ISTORAGE); @@ -116,7 +116,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { - *src_cf = embedded_object_clipboard_format; + if (src_cf) *src_cf = embedded_object_clipboard_format; return hr; } @@ -127,18 +127,21 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { - *src_cf = embed_source_clipboard_format; + if (src_cf) *src_cf = embed_source_clipboard_format; return hr; } - for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) + if (other_fmts) { - init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); - hr = IDataObject_QueryGetData(data, &fmt); - if(SUCCEEDED(hr)) + for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) { - *src_cf = fmt_id[i]; - return hr; + init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); + hr = IDataObject_QueryGetData(data, &fmt); + if (SUCCEEDED(hr)) + { + if (src_cf) *src_cf = fmt_id[i]; + return hr; + } } } @@ -181,7 +184,7 @@ HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, data, debugstr_guid(iid), flags, renderopt, num_cache_fmts, adv_flags, cache_fmts, sink, conns, client_site, stg, obj); - hr = get_storage(data, stg, &src_cf); + hr = get_storage(data, stg, &src_cf, TRUE); if(FAILED(hr)) return hr; hr = OleLoad(stg, iid, client_site, obj); @@ -239,16 +242,63 @@ HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFI DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, IAdviseSink *sink, DWORD *conns, IOleClientSite *client_site, IStorage *stg, void **obj) { + HRESULT hr; + IMoniker *mon; + IDataObject *data; + IUnknown *unk = NULL; + IOleCache *cache = NULL; ULONG i; - FIXME("%s: stub!\n", debugstr_w(filename)); TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid), debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts); TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj); for (i = 0; i < num_fmts; i++) TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); - return E_NOTIMPL; + hr = CreateFileMoniker( filename, &mon ); + if (FAILED(hr)) return hr; + + hr = BindMoniker( mon, 0, &IID_IDataObject, (void**)&data ); + IMoniker_Release( mon ); + if (FAILED(hr)) return hr; + + hr = get_storage( data, stg, NULL, FALSE ); + if (FAILED(hr)) goto end; + + hr = OleLoad( stg, &IID_IUnknown, client_site, (void**)&unk ); + if (FAILED(hr)) goto end; + + if (renderopt == OLERENDER_FORMAT) + { + hr = IUnknown_QueryInterface( unk, &IID_IOleCache, (void**)&cache ); + if (FAILED(hr)) goto end; + + for (i = 0; i < num_fmts; i++) + { + STGMEDIUM med; + DWORD dummy_conn; + + memset( &med, 0, sizeof(med) ); + hr = IDataObject_GetData( data, fmts + i, &med ); + if (FAILED(hr)) goto end; + hr = IOleCache_Cache( cache, fmts + i, adv_flags[i], &dummy_conn ); + if (SUCCEEDED(hr)) + hr = IOleCache_SetData( cache, fmts + i, &med, TRUE ); + if (FAILED(hr)) + { + ReleaseStgMedium( &med ); + goto end; + } + } + } + + hr = IUnknown_QueryInterface( unk, iid, obj ); + +end: + if (cache) IOleCache_Release( cache ); + if (unk) IUnknown_Release( unk ); + IDataObject_Release( data ); + return hr; } /******************************************************************************

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015