August 2018 - Wine-commits - list.winehq.org

Józef Kucia : vkd3d: Validate D3D12_BLEND_DESC.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: bdc848b27a255cc3e55179f1b0259f6e7786ae88 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bdc848b27a255cc3e55179f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:07 2018 +0200 vkd3d: Validate D3D12_BLEND_DESC. 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> --- libs/vkd3d/command.c | 1 - libs/vkd3d/state.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3c254c0..7aa1695 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1786,7 +1786,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; - /* FIXME: Logic ops are per-target in D3D. */ blend_desc.logicOpEnable = VK_FALSE; blend_desc.logicOp = VK_LOGIC_OP_COPY; blend_desc.attachmentCount = state->attachment_count - state->rt_idx; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 43b1c15..5e401fd 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1876,6 +1876,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; state->uav_counter_mask = 0; + graphics->stage_count = 0; + + memset(&input_signature, 0, sizeof(input_signature)); if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { @@ -1943,7 +1946,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < rt_count; ++i) { - unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; + const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) @@ -1953,6 +1956,20 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + rt_desc = &desc->BlendState.RenderTarget[desc->BlendState.IndependentBlendEnable ? i : 0]; + if (desc->BlendState.IndependentBlendEnable && rt_desc->LogicOpEnable) + { + WARN("IndependentBlendEnable must be FALSE when logic operations are enabled.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (rt_desc->BlendEnable && rt_desc->LogicOpEnable) + { + WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE."); + hr = E_INVALIDARG; + goto fail; + } + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); graphics->attachments[idx].flags = 0; @@ -1968,7 +1985,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[idx].attachment = idx; graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); + blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; @@ -1983,8 +2000,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; - memset(&input_signature, 0, sizeof(input_signature)); - for (i = 0, graphics->stage_count = 0; i < ARRAY_SIZE(shader_stages); ++i) + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength};

1 0

Józef Kucia : tests: Use single ResolveQueryData() call for multiple queries.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: 98b3487b3c932e33bca958920a52d8005ce71ead URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98b3487b3c932e33bca9589… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:08 2018 +0200 tests: Use single ResolveQueryData() call for multiple queries. 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> --- tests/d3d12.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index eefef3b..ca83680 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15777,19 +15777,19 @@ static void test_create_query_heap(void) static void test_query_timestamp(void) { + UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; ID3D12GraphicsCommandList *command_list; - struct test_context_desc desc; - struct test_context context; - ID3D12CommandQueue *queue; - ID3D12Device *device; D3D12_QUERY_HEAP_DESC heap_desc; + struct test_context_desc desc; ID3D12QueryHeap *query_heap; - ID3D12Resource *resource; struct resource_readback rb; - UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; + struct test_context context; time_t time_start, time_end; + ID3D12CommandQueue *queue; + ID3D12Resource *resource; + ID3D12Device *device; + unsigned int i; HRESULT hr; - int i; time_start = time(NULL); @@ -15813,11 +15813,12 @@ static void test_query_timestamp(void) resource = create_readback_buffer(device, sizeof(timestamps)); for (i = 0; i < ARRAY_SIZE(timestamps); ++i) - { ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i); - ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i, 1, - resource, i * sizeof(UINT64)); - } + + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 0, 1, resource, 0); + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(UINT64)); get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -15827,14 +15828,16 @@ static void test_query_timestamp(void) timestamps[i] = get_readback_uint64(&rb, i, 0); for (i = 0; i < ARRAY_SIZE(timestamps) - 1; ++i) + { ok(timestamps[i] <= timestamps[i + 1], "Expected timestamps to monotonically increase, " "but got %"PRIu64" > %"PRIu64".\n", timestamps[i], timestamps[i + 1]); + } time_diff = (UINT64)difftime(time_end, time_start) * timestamp_frequency; timestamp_diff = timestamps[ARRAY_SIZE(timestamps) - 1] - timestamps[0]; ok(timestamp_diff <= time_diff, "Expected timestamp difference to be bounded by CPU time difference, " - "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); + "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); release_resource_readback(&rb); ID3D12QueryHeap_Release(query_heap);

1 0

Alexandre Julliard : wineandroid: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: c268c283f760363339976e5e8b645baba27792fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c268c283f760363339976e5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:43:01 2018 +0200 wineandroid: Use fallback implementation for screen dimensions in GetDeviceCaps(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index da8fba3..2182137 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -195,10 +195,6 @@ static INT ANDROID_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case HORZRES: return screen_width; - case VERTRES: return screen_height; - case DESKTOPHORZRES: return virtual_screen_rect.right - virtual_screen_rect.left; - case DESKTOPVERTRES: return virtual_screen_rect.bottom - virtual_screen_rect.top; case BITSPIXEL: return screen_bpp; default: dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps );

1 0

Alexandre Julliard : wineandroid: Remove no longer needed GetDeviceCaps() driver entry point.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 3cfe3684aa40bc6e76f9560b512f0270267936e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cfe3684aa40bc6e76f9560b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 13:09:34 2018 +0200 wineandroid: Remove no longer needed GetDeviceCaps() driver entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 2182137..c0e3823 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -189,21 +189,6 @@ static BOOL ANDROID_DeleteDC( PHYSDEV dev ) /*********************************************************************** - * ANDROID_GetDeviceCaps - */ -static INT ANDROID_GetDeviceCaps( PHYSDEV dev, INT cap ) -{ - switch(cap) - { - case BITSPIXEL: return screen_bpp; - default: - dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); - return dev->funcs->pGetDeviceCaps( dev, cap ); - } -} - - -/*********************************************************************** * ANDROID_ChangeDisplaySettingsEx */ LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, @@ -359,7 +344,7 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ - ANDROID_GetDeviceCaps, /* pGetDeviceCaps */ + NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontRealizationInfo */

1 0

Alexandre Julliard : wineandroid: Simplify the EnumDisplayMonitors driver entry point.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 1283d9873cd384f21c61e1a12220b33bab9f3bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1283d9873cd384f21c61e1a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 13:09:48 2018 +0200 wineandroid: Simplify the EnumDisplayMonitors driver entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index c0e3823..d199696 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -223,30 +223,7 @@ BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) */ BOOL CDECL ANDROID_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - if (hdc) - { - POINT origin; - RECT limit, monrect; - - if (!GetDCOrgEx( hdc, &origin )) return FALSE; - if (GetClipBox( hdc, &limit ) == ERROR) return FALSE; - - if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE; - - monrect = default_monitor.rcMonitor; - OffsetRect( &monrect, -origin.x, -origin.y ); - if (IntersectRect( &monrect, &monrect, &limit )) - if (!proc( (HMONITOR)1, hdc, &monrect, lp )) - return FALSE; - } - else - { - RECT unused; - if (!rect || IntersectRect( &unused, &default_monitor.rcMonitor, rect )) - if (!proc( (HMONITOR)1, 0, &default_monitor.rcMonitor, lp )) - return FALSE; - } - return TRUE; + return proc( (HMONITOR)1, 0, &default_monitor.rcMonitor, lp ); }

1 0

Zebediah Figura : ddraw: Avoid leaking references to the wined3d device.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 2689f3e68b624631e1762aa284d3968617ef3c2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2689f3e68b624631e1762aa2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 21 15:01:40 2018 -0500 ddraw: Avoid leaking references to the wined3d device. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cb837b1..cf09f9c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -527,7 +527,16 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; if (!surf->is_complex_root) + { + struct ddraw_texture *texture = wined3d_texture_get_parent(surf->wined3d_texture); + struct wined3d_device *wined3d_device = texture->wined3d_device; + struct ddraw_surface *root = texture->root; + ddraw_surface_cleanup(surf); + + if (surf == root) + wined3d_device_decref(wined3d_device); + } } if (surface->device1)

1 0

Nikolay Sivov : d2d1/tests: Add some tests for context target handling.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: 17df6aa5a3f89e822e09858f673f988300369b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=17df6aa5a3f89e822e09858f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 22 13:29:33 2018 +0300 d2d1/tests: Add some tests for context target handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 199 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f6846c0..20478e5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6638,16 +6638,16 @@ static void test_bitmap_surface(void) { D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; D2D1_RENDER_TARGET_PROPERTIES rt_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1DeviceContext *device_context; ID3D10Device1 *d3d_device; IDXGISwapChain *swapchain; IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; IDXGISurface *surface; - ID2D1Device *device; - ID2D1DeviceContext *device_context; - D2D1_BITMAP_PROPERTIES1 bitmap_desc; ID2D1Bitmap1 *bitmap; + ID2D1Device *device; HWND window; HRESULT hr; @@ -6760,6 +6760,201 @@ if (SUCCEEDED(hr)) ID3D10Device1_Release(d3d_device); } +static void test_device_context(void) +{ + D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; + D2D1_RENDER_TARGET_PROPERTIES rt_desc; + ID2D1DeviceContext *device_context; + IDXGISurface *surface, *surface2; + ID2D1Device *device, *device2; + ID2D1DCRenderTarget *dc_rt; + ID3D10Device1 *d3d_device; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + D2D1_UNIT_MODE unit_mode; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + ID2D1Bitmap1 *bitmap; + ID2D1Image *target; + HWND window; + HRESULT hr; + RECT rect; + HDC hdc; + + IWICBitmap *wic_bitmap; + IWICImagingFactory *wic_factory; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); +todo_wine + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + ID2D1DeviceContext_GetDevice(device_context, &device2); + ok(device2 == device, "Unexpected device instance.\n"); + ID2D1Device_Release(device2); + + target = (void *)0xdeadbeef; + ID2D1DeviceContext_GetTarget(device_context, &target); + ok(target == NULL, "Unexpected target instance %p.\n", target); + + unit_mode = ID2D1DeviceContext_GetUnitMode(device_context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Unexpected unit mode %d.\n", unit_mode); + + ID2D1DeviceContext_Release(device_context); + + /* DXGI target */ + window = create_window(); + swapchain = create_swapchain(d3d_device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2); + ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok(surface2 == surface, "Unexpected surface instance.\n"); + IDXGISurface_Release(surface2); + + ID2D1DeviceContext_BeginDraw(device_context); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2); + ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok(surface2 == surface, "Unexpected surface instance.\n"); + IDXGISurface_Release(surface2); + ID2D1DeviceContext_EndDraw(device_context, NULL, NULL); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + DestroyWindow(window); + + /* WIC target */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + rt_desc.dpiX = 96.0f; + rt_desc.dpiY = 96.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1RenderTarget_Release(rt); + + CoUninitialize(); + + /* HWND target */ + hwnd_rt_desc.hwnd = NULL; + hwnd_rt_desc.pixelSize.width = 64; + hwnd_rt_desc.pixelSize.height = 64; + hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE; + hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n"); + + hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1RenderTarget_Release(rt); + DestroyWindow(hwnd_rt_desc.hwnd); + + /* DC target */ + hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, &dc_rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + hr = ID2D1DCRenderTarget_QueryInterface(dc_rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected bitmap instance.\n"); + + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc, 16, 16); + + SetRect(&rect, 0, 0, 16, 16); + hr = ID2D1DCRenderTarget_BindDC(dc_rt, hdc, &rect); + ok(SUCCEEDED(hr), "BindDC() failed, hr %#x.\n", hr); + + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ID2D1Bitmap1_Release(bitmap); + + ID2D1DeviceContext_SetTarget(device_context, NULL); + ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + ok(bitmap == NULL, "Unexpected target instance.\n"); + + ID2D1DeviceContext_Release(device_context); + ID2D1DCRenderTarget_Release(dc_rt); + DeleteDC(hdc); +} + ID2D1Device_Release(device); + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -6800,6 +6995,7 @@ START_TEST(d2d1) queue_test(test_bezier_intersect); queue_test(test_create_device); queue_test(test_bitmap_surface); + queue_test(test_device_context); run_queued_tests(); }

1 0

Nikolay Sivov : user32/listbox: Fix multicolumn navigation on VK_RIGHT.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: c9b6dd83a372c87c99594ecc5c111e1ae669a13c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b6dd83a372c87c99594ecc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 22 16:50:18 2018 +0300 user32/listbox: Fix multicolumn navigation on VK_RIGHT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3f1396d..05fcc44 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2354,8 +2354,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) if (descr->style & LBS_MULTICOLUMN) { bForceSelection = FALSE; - if (descr->focus_item + descr->page_size < descr->nb_items) - caret = descr->focus_item + descr->page_size; + caret = min(descr->focus_item + descr->page_size, descr->nb_items - 1); break; } /* fall through */

1 0

Nikolay Sivov : comctl32/listbox: Fix multicolumn navigation on VK_RIGHT.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: da75153eae8f76727e518b81f17609838b982070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da75153eae8f76727e518b81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 22 16:50:19 2018 +0300 comctl32/listbox: Fix multicolumn navigation on VK_RIGHT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 5235ffd..4d389b1 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2349,8 +2349,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) if (descr->style & LBS_MULTICOLUMN) { bForceSelection = FALSE; - if (descr->focus_item + descr->page_size < descr->nb_items) - caret = descr->focus_item + descr->page_size; + caret = min(descr->focus_item + descr->page_size, descr->nb_items - 1); break; } /* fall through */

1 0

Alex Henrie : shell32: Add eject icon.
by Alexandre Julliard 22 Aug '18

22 Aug '18

Module: wine Branch: master Commit: f9c7dbd55e265cab4ed0b207b1d8bac0f973b825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c7dbd55e265cab4ed0b207… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:43 2018 -0600 shell32: Add eject icon. Adapted from media-eject in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/eject.ico | Bin 0 -> 41496 bytes dlls/shell32/resources/eject.svg | 596 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 601 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c7dbd55e265cab4ed0…

1 0