March 2018 - Wine-Commits - list.winehq.org

Józef Kucia : winex11: Properly indent LOAD_FUNCPTR() for Vulkan functions.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: 73f9ceddabc7e845bbcfbc6552d0900ef6cbee53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73f9ceddabc7e845bbcfbc65… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 23 14:46:19 2018 +0100 winex11: Properly indent LOAD_FUNCPTR() for Vulkan functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 68fb339..8db61f1 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -133,24 +133,24 @@ static BOOL wine_vk_init(void) if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) return FALSE; -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; -LOAD_FUNCPTR(vkAcquireNextImageKHR) -LOAD_FUNCPTR(vkCreateInstance) -LOAD_FUNCPTR(vkCreateSwapchainKHR) -LOAD_FUNCPTR(vkCreateXlibSurfaceKHR) -LOAD_FUNCPTR(vkDestroyInstance) -LOAD_FUNCPTR(vkDestroySurfaceKHR) -LOAD_FUNCPTR(vkDestroySwapchainKHR) -LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties) -LOAD_FUNCPTR(vkGetDeviceProcAddr) -LOAD_FUNCPTR(vkGetInstanceProcAddr) -LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) -LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR) -LOAD_FUNCPTR(vkGetPhysicalDeviceSurfacePresentModesKHR) -LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR) -LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR) -LOAD_FUNCPTR(vkGetSwapchainImagesKHR) -LOAD_FUNCPTR(vkQueuePresentKHR) +#define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; + LOAD_FUNCPTR(vkAcquireNextImageKHR) + LOAD_FUNCPTR(vkCreateInstance) + LOAD_FUNCPTR(vkCreateSwapchainKHR) + LOAD_FUNCPTR(vkCreateXlibSurfaceKHR) + LOAD_FUNCPTR(vkDestroyInstance) + LOAD_FUNCPTR(vkDestroySurfaceKHR) + LOAD_FUNCPTR(vkDestroySwapchainKHR) + LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties) + LOAD_FUNCPTR(vkGetDeviceProcAddr) + LOAD_FUNCPTR(vkGetInstanceProcAddr) + LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_FUNCPTR(vkGetPhysicalDeviceSurfacePresentModesKHR) + LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR) + LOAD_FUNCPTR(vkGetSwapchainImagesKHR) + LOAD_FUNCPTR(vkQueuePresentKHR) #undef LOAD_FUNCPTR wine_vk_load_instance_extensions();

1 0

Matteo Bruni : d3d8: Forbid setting a viewport larger than the render target.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: aa5fa7080631d9135dff10fdf96e21487e21e4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa5fa7080631d9135dff10fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:09 2018 +0100 d3d8: Forbid setting a viewport larger than the render target. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 26c2116..6548087 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1619,10 +1619,30 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3DVIEWPORT8 *viewport) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_sub_resource_desc rt_desc; + struct wined3d_rendertarget_view *rtv; + struct d3d8_surface *surface; struct wined3d_viewport vp; TRACE("iface %p, viewport %p.\n", iface, viewport); + wined3d_mutex_lock(); + if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + { + wined3d_mutex_unlock(); + return D3DERR_NOTFOUND; + } + surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); + + if (viewport->X > rt_desc.width || viewport->Width > rt_desc.width - viewport->X + || viewport->Y > rt_desc.height || viewport->Height > rt_desc.height - viewport->Y) + { + WARN("Invalid viewport, returning D3DERR_INVALIDCALL.\n"); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + vp.x = viewport->X; vp.y = viewport->Y; vp.width = viewport->Width; @@ -1630,7 +1650,6 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D vp.min_z = viewport->MinZ; vp.max_z = viewport->MaxZ; - wined3d_mutex_lock(); wined3d_device_set_viewport(device->wined3d_device, &vp); wined3d_mutex_unlock();

1 0

Józef Kucia : wined3d: Avoid superfluous wglSwapIntervalEXT() calls.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: 82ffc5b78d9085143477c6de2d9666daafcd7d0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ffc5b78d9085143477c6de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 23 13:44:35 2018 +0100 wined3d: Avoid superfluous wglSwapIntervalEXT() calls. 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/wined3d/cs.c | 4 +--- dlls/wined3d/swapchain.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 24fd72c..8edb74f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -453,9 +453,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); - - if (swapchain->swap_interval != op->swap_interval) - wined3d_swapchain_set_swap_interval(swapchain, op->swap_interval); + wined3d_swapchain_set_swap_interval(swapchain, op->swap_interval); swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 464a6c0..2aec612 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -679,12 +679,15 @@ void wined3d_swapchain_set_swap_interval(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(swapchain->device, swapchain->front_buffer, 0); - gl_info = context->gl_info; - swap_interval = swap_interval <= 4 ? swap_interval : 1; + if (swapchain->swap_interval == swap_interval) + return; + swapchain->swap_interval = swap_interval; + context = context_acquire(swapchain->device, swapchain->front_buffer, 0); + gl_info = context->gl_info; + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) { if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) @@ -735,8 +738,6 @@ static void wined3d_swapchain_cs_init(void *object) FIXME("Add OpenGL context recreation support.\n"); context_release(swapchain->context[0]); - - wined3d_swapchain_set_swap_interval(swapchain, WINED3D_SWAP_INTERVAL_DEFAULT); } static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, @@ -747,9 +748,9 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 BOOL displaymode_set = FALSE; DWORD texture_flags = 0; RECT client_rect; + unsigned int i; HWND window; HRESULT hr; - UINT i; if (desc->backbuffer_count > 1) { @@ -775,6 +776,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 swapchain->ref = 1; swapchain->win_handle = window; swapchain->device_window = window; + swapchain->swap_interval = WINED3D_SWAP_INTERVAL_DEFAULT; if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, adapter->ordinal, &swapchain->original_mode, NULL)))

1 0

Henri Verbeet : usp10: Use heap_calloc() in usp10_language_add_feature_list().
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: e9f6a94b94c2cb77398a102718998ce09dc5f743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f6a94b94c2cb77398a1027… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 23 15:32:33 2018 +0430 usp10: Use heap_calloc() in usp10_language_add_feature_list(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index b627aa2..5363271 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2837,7 +2837,7 @@ static void usp10_language_add_feature_list(LoadedLanguage *language, char table loaded_feature->tableType = table_type; loaded_feature->feature = feature; loaded_feature->lookup_count = GET_BE_WORD(feature->LookupCount); - loaded_feature->lookups = heap_alloc(loaded_feature->lookup_count * sizeof(*loaded_feature->lookups)); + loaded_feature->lookups = heap_calloc(loaded_feature->lookup_count, sizeof(*loaded_feature->lookups)); for (j = 0; j < loaded_feature->lookup_count; ++j) loaded_feature->lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); }

1 0

Henri Verbeet : wined3d: Get rid of the dst_arg enum.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: 4aaf9ebe82b284d12440d030fdf998d40e4ab510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaf9ebe82b284d12440d030… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 23 15:32:31 2018 +0430 wined3d: Get rid of the dst_arg enum. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++++----------- dlls/wined3d/ati_fragment_shader.c | 19 +++++++++++-------- dlls/wined3d/glsl_shader.c | 17 +++++++---------- dlls/wined3d/utils.c | 8 ++------ dlls/wined3d/wined3d_private.h | 8 +------- 5 files changed, 34 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4aaf9ebe82b284d12440…

1 0

Henri Verbeet : wined3d: Get rid of ARB_vertex_blend support.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: 1251fe692165077f9ee38992ac33a999bf26b69d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1251fe692165077f9ee38992… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 23 15:32:32 2018 +0430 wined3d: Get rid of ARB_vertex_blend support. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 --- dlls/wined3d/directx.c | 19 ------ dlls/wined3d/state.c | 152 ++--------------------------------------- dlls/wined3d/wined3d_gl.h | 1 - dlls/wined3d/wined3d_private.h | 4 +- 5 files changed, 8 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1251fe692165077f9ee3…

1 0

Matteo Bruni : d3d8/tests: Port test_viewport() to d3d8.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: 5f479bacd24faea50248c1662f8d0b190a81fa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f479bacd24faea50248c166… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:10 2018 +0100 d3d8/tests: Port test_viewport() to d3d8. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b64f08c..c2a4abf 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -196,6 +196,45 @@ static D3DCOLOR get_surface_color(IDirect3DSurface8 *surface, UINT x, UINT y) return color; } +static void check_rect(struct surface_readback *rb, RECT r, const char *message) +{ + LONG x_coords[2][2] = + { + {r.left - 1, r.left + 1}, + {r.right + 1, r.right - 1}, + }; + LONG y_coords[2][2] = + { + {r.top - 1, r.top + 1}, + {r.bottom + 1, r.bottom - 1} + }; + unsigned int i, j, x_side, y_side; + DWORD color; + LONG x, y; + + for (i = 0; i < 2; ++i) + { + for (j = 0; j < 2; ++j) + { + for (x_side = 0; x_side < 2; ++x_side) + { + for (y_side = 0; y_side < 2; ++y_side) + { + DWORD expected = (x_side == 1 && y_side == 1) ? 0xffffffff : 0xff000000; + + x = x_coords[i][x_side]; + y = y_coords[j][y_side]; + if (x < 0 || x >= 640 || y < 0 || y >= 480) + continue; + color = get_readback_color(rb, x, y); + ok(color == expected, "%s: Pixel (%d, %d) has color %08x, expected %08x.\n", + message, x, y, color, expected); + } + } + } + } +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -10132,6 +10171,122 @@ done: DestroyWindow(window); } +static void test_viewport(void) +{ + static const struct + { + D3DVIEWPORT8 vp; + RECT expected_rect; + const char *message; + } + tests[] = + { + {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, + {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, + {{ 0, 0, 1280, 960}, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, + {{ 0, 0, 2000, 1600}, {-10, -10, -10, -10}, "Viewport (0, 0) - (2000, 1600)"}, + {{100, 100, 640, 480}, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"}, + {{ 0, 0, 8192, 8192}, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"}, + }; + static const struct vec3 quad[] = + { + {-1.5f, -0.5f, 0.1f}, + {-1.5f, 0.5f, 0.1f}, + { 0.5f, -0.5f, 0.1f}, + { 0.5f, 0.5f, 0.1f}, + }; + static const struct vec2 rt_sizes[] = + { + {640, 480}, {1280, 960}, {320, 240}, {800, 600}, + }; + struct surface_readback rb; + IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; + unsigned int i, j; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable depth test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + /* This crashes on Windows. */ + /* hr = IDirect3DDevice8_SetViewport(device, NULL); */ + + for (i = 0; i < sizeof(rt_sizes) / sizeof(rt_sizes[0]); ++i) + { + if (i) + { + hr = IDirect3DDevice8_CreateRenderTarget(device, rt_sizes[i].x, rt_sizes[i].y, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, TRUE, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x (i %u).\n", hr, i); + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x (i %u).\n", hr, i); + } + else + { + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &rt); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + } + + for (j = 0; j < sizeof(tests) / sizeof(tests[0]); ++j) + { + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x (i %u, j %u).\n", hr, i, j); + + hr = IDirect3DDevice8_SetViewport(device, &tests[j].vp); + if (tests[j].vp.X + tests[j].vp.Width > rt_sizes[i].x + || tests[j].vp.Y + tests[j].vp.Height > rt_sizes[i].y) + { + ok(hr == D3DERR_INVALIDCALL, + "Setting the viewport returned unexpected hr %#x (i %u, j %u).\n", hr, i, j); + continue; + } + else + { + ok(SUCCEEDED(hr), "Failed to set the viewport, hr %#x (i %u, j %u).\n", hr, i, j); + } + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x (i %u, j %u).\n", hr, i, j); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x (i %u, j %u).\n", hr, i, j); + + get_rt_readback(rt, &rb); + check_rect(&rb, tests[j].expected_rect, tests[j].message); + release_surface_readback(&rb); + } + + IDirect3DSurface8_Release(rt); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -10204,4 +10359,5 @@ START_TEST(visual) test_backbuffer_resize(); test_drawindexedprimitiveup(); test_map_synchronisation(); + test_viewport(); }

1 0

Roderick Colenbrander : winevulkan: Add helper function for VkDeviceCreateInfo conversion.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: 0d8b9ad2f18cd32875c956ac5159a47c5a1daade URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d8b9ad2f18cd32875c956ac… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 23 14:46:14 2018 +0100 winevulkan: Add helper function for VkDeviceCreateInfo conversion. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 62 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a5b8a96..d294b0a 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -98,6 +98,52 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } +/* Helper function to convert win32 VkDeviceCreateInfo to host compatible. */ +static void wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, + VkDeviceCreateInfo *dst) +{ + unsigned int i; + + *dst = *src; + + /* Application and loader can pass in a chain of extensions through pNext. + * We can't blindly pass these through as often these contain callbacks or + * they can even be pass structures for loader / ICD internal use. For now + * we ignore everything in pNext chain, but we print FIXMEs. + */ + if (src->pNext) + { + const struct wine_vk_structure_header *header; + + for (header = src->pNext; header; header = header->pNext) + { + switch (header->sType) + { + case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: + /* Used for loader to ICD communication. Ignore to not confuse + * host loader. + */ + break; + + default: + FIXME("Application requested a linked structure of type %#x.\n", header->sType); + } + } + } + /* For now don't support anything. */ + dst->pNext = NULL; + + /* Should be filtered out by loader as ICDs don't support layers. */ + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + + TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); + for (i = 0; i < dst->enabledExtensionCount; i++) + { + TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + } +} + /* Helper function used for freeing a device structure. This function supports full * and partial object cleanups and can thus be used for vkCreateDevice failures. */ @@ -469,8 +515,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkDevice *device) { - struct VkDevice_T *object = NULL; + VkDeviceCreateInfo create_info_host; uint32_t max_queue_families; + struct VkDevice_T *object; VkResult res; unsigned int i; @@ -485,11 +532,10 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - /* At least for now we can directly pass create_info through. All extensions we report - * should be compatible. In addition the loader is supposed to sanitize values e.g. layers. - */ + wine_vk_device_convert_create_info(create_info, &create_info_host); + res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, - create_info, NULL /* allocator */, &object->device); + &create_info_host, NULL /* allocator */, &object->device); if (res != VK_SUCCESS) { ERR("Failed to create device\n"); @@ -524,10 +570,10 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, goto err; } - for (i = 0; i < create_info->queueCreateInfoCount; i++) + for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { - uint32_t family_index = create_info->pQueueCreateInfos[i].queueFamilyIndex; - uint32_t queue_count = create_info->pQueueCreateInfos[i].queueCount; + uint32_t family_index = create_info_host.pQueueCreateInfos[i].queueFamilyIndex; + uint32_t queue_count = create_info_host.pQueueCreateInfos[i].queueCount; TRACE("queueFamilyIndex %u, queueCount %u\n", family_index, queue_count);

1 0

Alexandre Julliard : kernel32/tests: Add tests for QueryActCtxSettingsW.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: 678c5544c15352411dfdb5c717834724f21d8c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=678c5544c15352411dfdb5c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:14:21 2018 +0100 kernel32/tests: Add tests for QueryActCtxSettingsW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9aa081f..b63abac 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWS static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); +static BOOL (WINAPI *pQueryActCtxSettingsW)(DWORD,HANDLE,LPCWSTR,LPCWSTR,LPWSTR,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); static BOOL (WINAPI *pZombifyActCtx)(HANDLE); @@ -457,6 +458,16 @@ static const char compat_manifest_other_guid[] = " </compatibility>" "</assembly>"; +static const char settings_manifest[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <application xmlns=\"urn:schemas-microsoft-com:asm.v3\">" +" <windowsSettings>" +" <dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true</dpiAware>" +" </windowsSettings>" +" </application>" +"</assembly>"; + DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); DEFINE_GUID(WIN8_COMPAT_GUID, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); @@ -2695,6 +2706,7 @@ static BOOL init_funcs(void) X(ReleaseActCtx); X(FindActCtxSectionGuid); X(ZombifyActCtx); + pQueryActCtxSettingsW = (void *)GetProcAddress( hLibrary, "QueryActCtxSettingsW" ); hLibrary = GetModuleHandleA("ntdll.dll"); X(RtlFindActivationContextSectionString); @@ -2949,6 +2961,81 @@ static void test_compatibility(void) } } +static void test_settings(void) +{ + static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR namespaceW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','0','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; + WCHAR buffer[80]; + SIZE_T size; + HANDLE handle; + BOOL ret; + + if (!pQueryActCtxSettingsW) + { + win_skip( "QueryActCtxSettingsW is missing\n" ); + return; + } + create_manifest_file( "manifest_settings.manifest", settings_manifest, -1, NULL, NULL ); + handle = test_create("manifest_settings.manifest"); + ok( handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError() ); + DeleteFileA( "manifest_settings.manifest" ); + + SetLastError( 0xdeadbeef ); + ret = pQueryActCtxSettingsW( 1, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pQueryActCtxSettingsW( 0, handle, dummyW, dpiAwareW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == lstrlenW( buffer ) + 1, "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dummyW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, 80, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, lstrlenW(trueW) + 1, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW), &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW) - 1, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + pReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -2975,4 +3062,5 @@ START_TEST(actctx) test_ZombifyActCtx(); run_child_process(); test_compatibility(); + test_settings(); }

1 0

Alexandre Julliard : kernel32: Implement QueryActCtxSettingsW.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: wine Branch: master Commit: ff8471eb070179a093a9c57ecff9ee2c184206ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8471eb070179a093a9c57e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:14:12 2018 +0100 kernel32: Implement QueryActCtxSettingsW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/actctx.c | 17 +++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/winbase.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 2eb1c2a..17067ed 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -309,3 +309,20 @@ BOOL WINAPI QueryActCtxW(DWORD dwFlags, HANDLE hActCtx, PVOID pvSubInst, } return TRUE; } + +/*********************************************************************** + * QueryActCtxSettingsW (KERNEL32.@) + */ +BOOL WINAPI QueryActCtxSettingsW( DWORD flags, HANDLE ctx, const WCHAR *ns, const WCHAR *settings, + WCHAR *buffer, SIZE_T size, SIZE_T *written ) +{ + NTSTATUS status; + + if ((status = RtlQueryActivationContextApplicationSettings( flags, ctx, ns, settings, + buffer, size, written ))) + { + SetLastError( RtlNtStatusToDosError( status )); + return FALSE; + } + return TRUE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index aae22eb..445b84f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1155,7 +1155,7 @@ @ stdcall PulseEvent(long) @ stdcall PurgeComm(long long) @ stdcall -i386 -private -norelay QT_Thunk() krnl386.exe16.QT_Thunk -# @ stub QueryActCtxSettingsW +@ stdcall QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr) @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) diff --git a/include/winbase.h b/include/winbase.h index c99993a..e31ebca 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2475,6 +2475,7 @@ WINADVAPI BOOL WINAPI PrivilegedServiceAuditAlarmW(LPCWSTR,LPCWSTR,HANDL #define PrivilegedServiceAuditAlarm WINELIB_NAME_AW(PrivilegedServiceAuditAlarm) WINBASEAPI BOOL WINAPI PulseEvent(HANDLE); WINBASEAPI BOOL WINAPI PurgeComm(HANDLE,DWORD); +WINBASEAPI BOOL WINAPI QueryActCtxSettingsW(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); WINBASEAPI BOOL WINAPI QueryActCtxW(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T *); WINBASEAPI USHORT WINAPI QueryDepthSList(PSLIST_HEADER); WINBASEAPI DWORD WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD);

1 0