April 2019 - Wine-devel - list.winehq.org

[PATCH 3/4] d3d11/tests: Introduce and use check_readback_data_u16.
by Henri Verbeet 02 Apr '19

02 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 101 +++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4a02b3f51f6..6f438482fc3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -936,11 +936,16 @@ static void *get_readback_data(struct resource_readback *rb, return (BYTE *)rb->map_desc.pData + z * rb->map_desc.DepthPitch + y * rb->map_desc.RowPitch + x * byte_width; } -static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +static BYTE get_readback_u8(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(BYTE *)get_readback_data(rb, x, y, z, sizeof(BYTE)); } +static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return *(WORD *)get_readback_data(rb, x, y, z, sizeof(WORD)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) { return *(DWORD *)get_readback_data(rb, x, y, z, sizeof(DWORD)); @@ -980,12 +985,12 @@ static DWORD get_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigne return color; } -#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) -static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, +#define check_readback_data_u8(a, b, c, d) check_readback_data_u8_(__LINE__, a, b, c, d) +static void check_readback_data_u8_(unsigned int line, struct resource_readback *rb, const RECT *rect, BYTE expected_value, BYTE max_diff) { unsigned int x = 0, y = 0, z = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; BYTE value = 0; @@ -1001,30 +1006,61 @@ static void check_readback_data_byte_(unsigned int line, struct resource_readbac { for (x = rect->left; x < rect->right; ++x) { - value = get_readback_byte(rb, x, y, z); - if (!compare_color(value, expected_value, max_diff)) - { - all_match = FALSE; - break; - } + value = get_readback_u8(rb, x, y, z); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; } - if (!all_match) - break; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u, %u), sub-resource %u.\n", value, expected_value, x, y, z, rb->sub_resource_idx); } +#define check_readback_data_u16(a, b, c, d) check_readback_data_u16_(__LINE__, a, b, c, d) +static void check_readback_data_u16_(unsigned int line, struct resource_readback *rb, + const RECT *rect, WORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0, z = 0; + BOOL all_match = FALSE; + RECT default_rect; + WORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (z = 0; z < rb->depth; ++z) + { + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u16(rb, x, y, z); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%04x, expected 0x%04x at (%u, %u, %u), sub-resource %u.\n", + value, expected_value, x, y, z, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) { unsigned int x = 0, y = 0, z = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; DWORD color = 0; @@ -1042,17 +1078,13 @@ static void check_readback_data_color_(unsigned int line, struct resource_readba { color = get_readback_color(rb, x, y, z); if (!compare_color(color, expected_color, max_diff)) - { - all_match = FALSE; - break; - } + goto done; } - if (!all_match) - break; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u, %u), sub-resource %u.\n", color, expected_color, x, y, z, rb->sub_resource_idx); @@ -25514,14 +25546,7 @@ static void test_depth_bias(void) break; case DXGI_FORMAT_D16_UNORM: get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); - ok(*u16 == 0xffff, "Got unexpected value %#x.\n", *u16); - } - } + check_readback_data_u16(&rb, NULL, 0xffffu, 0); release_resource_readback(&rb); break; default: @@ -25586,17 +25611,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - } - } + check_readback_data_u16(&rb, NULL, depth * 65535.0f + 0.5f, 1); release_resource_readback(&rb); break; default: @@ -29007,7 +29022,7 @@ static void test_render_a8(void) ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); draw_quad(&test_context); get_texture_readback(texture, 0, &rb); - check_readback_data_byte(&rb, NULL, 0xff, 0); + check_readback_data_u8(&rb, NULL, 0xff, 0); release_resource_readback(&rb); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, black); -- 2.11.0

2 1

[PATCH 2/4] d3d10core/tests: Introduce and use check_readback_data_u24.
by Henri Verbeet 02 Apr '19

02 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This partially supersedes patch 162055. dlls/d3d10core/tests/d3d10core.c | 55 +++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7d76cc28d63..00bd16ba0d6 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -738,11 +738,16 @@ static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsig return *(WORD *)get_readback_data(rb, x, y, sizeof(WORD)); } -static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) +static DWORD get_readback_u32(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); } +static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return get_readback_u32(rb, x, y); +} + static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(float *)get_readback_data(rb, x, y, sizeof(float)); @@ -854,6 +859,38 @@ done: value, expected_value, x, y, rb->sub_resource_idx); } +#define check_readback_data_u24(a, b, c, d, e) check_readback_data_u24_(__LINE__, a, b, c, d, e) +static void check_readback_data_u24_(unsigned int line, struct resource_readback *rb, + const RECT *rect, unsigned int shift, DWORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = FALSE; + RECT default_rect; + DWORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u32(rb, x, y) >> shift; + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%06x, expected 0x%06x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) @@ -15524,10 +15561,10 @@ static void test_depth_bias(void) struct resource_readback rb; ID3D10DepthStencilView *dsv; unsigned int expected_value; - unsigned int x, y, i, j, k; ID3D10RasterizerState *rs; ID3D10Texture2D *texture; unsigned int format_idx; + unsigned int y, i, j, k; unsigned int shift = 0; ID3D10Device *device; float *depth_values; @@ -15667,19 +15704,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 16777215.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u32 = get_readback_data(&rb, x, y, sizeof(*u32)); - u32_value = *u32 >> shift; - ok(abs(u32_value - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); - } - } + check_readback_data_u24(&rb, NULL, shift, depth * 16777215.0f + 0.5f, 1); release_resource_readback(&rb); break; case DXGI_FORMAT_D16_UNORM: -- 2.11.0

2 1

[PATCH v2] ddraw/tests: add test for HWTRANSFORMANDLIGHT flags
by Vijay Kiran Kamuju 02 Apr '19

02 Apr '19

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c199994d52..d695e968c9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -346,6 +346,19 @@ static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 return DDENUMRET_OK; } +static HRESULT WINAPI enum_devtype_software_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) +{ + BOOL *software_ok = ctx; + if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DRGBDevice)) + { + todo_wine ok(!(desc->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT), + "RGB emulation device shouldn't have HWTRANSFORMANDLIGHT flag\n"); + *software_ok = TRUE; + return DDENUMRET_CANCEL; + } + return DDENUMRET_OK; +} + static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) { IDirectDrawSurface7 *surface, *ds; @@ -356,6 +369,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) IDirect3D7 *d3d7; HRESULT hr; BOOL hal_ok = FALSE; + BOOL software_ok = FALSE; const GUID *devtype = &IID_IDirect3DHALDevice; if (!(ddraw = create_ddraw())) @@ -399,6 +413,10 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_software_cb , &software_ok); + ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + if (!software_ok) win_skip("RGB device not found, unable to check flags\n"); + memset(&z_fmt, 0, sizeof(z_fmt)); hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt); if (FAILED(hr) || !z_fmt.dwSize) -- 2.21.0

3 3

[PATCH 1/3] wined3d: Initialise Vulkan for adapters.
by Józef Kucia 02 Apr '19

02 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- We always build Vulkan backend even when libvulkan is not found. We do the same for winevulkan. We may want to change that. --- dlls/wined3d/adapter_vk.c | 82 ++++++++++++++- dlls/wined3d/wined3d_private.h | 3 + dlls/wined3d/wined3d_vk.h | 186 +++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 5 deletions(-) create mode 100644 dlls/wined3d/wined3d_vk.h diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e2c940dae9d9..e63e89361b0b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -20,12 +20,18 @@ #include "wine/port.h" #include "wined3d_private.h" +#include "wine/vulkan_driver.h" + WINE_DEFAULT_DEBUG_CHANNEL(d3d); static void adapter_vk_destroy(struct wined3d_adapter *adapter) { - wined3d_adapter_cleanup(adapter); - heap_free(adapter); + struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(adapter); + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + + VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_adapter_cleanup(&adapter_vk->a); + heap_free(adapter_vk); } static BOOL adapter_vk_create_context(struct wined3d_context *context, @@ -53,9 +59,63 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_check_format, }; +static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + const struct vulkan_funcs *vk_funcs; + VkInstanceCreateInfo instance_info; + VkInstance instance; + VkResult vr; + HDC dc; + + dc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(dc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, dc); + + if (!vk_funcs) + return FALSE; + + vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; + + if (!(vk_ops->vkCreateInstance = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkCreateInstance")))) + { + ERR("Could not get 'vkCreateInstance'.\n"); + return FALSE; + } + + memset(&instance_info, 0, sizeof(instance_info)); + instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) + { + WARN("Failed to create Vulkan instance, vr %d.\n", vr); + return FALSE; + } + + TRACE("Created Vulkan instance %p.\n", instance); + +#define LOAD_INSTANCE_PFN(name) \ + if (!(vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)))) \ + { \ + WARN("Could not get instance proc addr for '" #name "'.\n"); \ + vk_funcs->p_vkDestroyInstance(instance, NULL); \ + return FALSE; \ + } +#define VK_INSTANCE_PFN LOAD_INSTANCE_PFN +#define VK_DEVICE_PFN LOAD_INSTANCE_PFN + VK_INSTANCE_FUNCS() + VK_DEVICE_FUNCS() +#undef VK_INSTANCE_PFN +#undef VK_DEVICE_PFN + + vk_info->instance = instance; + + return TRUE; +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; const struct wined3d_gpu_description *gpu_description; struct wined3d_adapter *adapter = &adapter_vk->a; @@ -63,17 +123,23 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter_vk, ordinal, wined3d_creation_flags); if (!wined3d_adapter_init(adapter, ordinal)) - return FALSE; + goto fail; + + if (!wined3d_init_vulkan(vk_info)) + { + WARN("Failed to initialize Vulkan.\n"); + goto fail; + } if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) { ERR("Failed to get GPU description.\n"); - return FALSE; + goto fail; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); if (!wined3d_adapter_vk_init_format_info(adapter)) - return FALSE; + goto fail; adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; @@ -83,6 +149,12 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; return TRUE; + +fail: + if (vk_info->vk_ops.vkDestroyInstance) + VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_adapter_cleanup(adapter); + return FALSE; } struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a455edb0c2f..012c90f5d345 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -54,6 +54,7 @@ #include "objbase.h" #include "wine/wined3d.h" #include "wined3d_gl.h" +#include "wined3d_vk.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/wgl_driver.h" @@ -2752,6 +2753,8 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_adapter_vk { struct wined3d_adapter a; + + struct wined3d_vk_info vk_info; }; static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h new file mode 100644 index 000000000000..ac59a2dcd1ab --- /dev/null +++ b/dlls/wined3d/wined3d_vk.h @@ -0,0 +1,186 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINED3D_VK_H +#define __WINE_WINED3D_VK_H + +#define VK_NO_PROTOTYPES +#define WINE_VK_HOST +#include "wine/vulkan.h" + +#define VK_INSTANCE_FUNCS() \ + VK_INSTANCE_PFN(vkCreateDevice) \ + VK_INSTANCE_PFN(vkDestroyInstance) \ + VK_INSTANCE_PFN(vkEnumerateDeviceExtensionProperties) \ + VK_INSTANCE_PFN(vkEnumerateDeviceLayerProperties) \ + VK_INSTANCE_PFN(vkEnumeratePhysicalDevices) \ + VK_INSTANCE_PFN(vkGetDeviceProcAddr) \ + VK_INSTANCE_PFN(vkGetPhysicalDeviceFeatures) \ + VK_INSTANCE_PFN(vkGetPhysicalDeviceFormatProperties) \ + VK_INSTANCE_PFN(vkGetPhysicalDeviceImageFormatProperties) \ + VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) \ + VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) \ + VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) \ + VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) + +#define VK_DEVICE_FUNCS() \ + VK_DEVICE_PFN(vkAllocateCommandBuffers) \ + VK_DEVICE_PFN(vkAllocateDescriptorSets) \ + VK_DEVICE_PFN(vkAllocateMemory) \ + VK_DEVICE_PFN(vkBeginCommandBuffer) \ + VK_DEVICE_PFN(vkBindBufferMemory) \ + VK_DEVICE_PFN(vkBindImageMemory) \ + VK_DEVICE_PFN(vkCmdBeginQuery) \ + VK_DEVICE_PFN(vkCmdBeginRenderPass) \ + VK_DEVICE_PFN(vkCmdBindDescriptorSets) \ + VK_DEVICE_PFN(vkCmdBindIndexBuffer) \ + VK_DEVICE_PFN(vkCmdBindPipeline) \ + VK_DEVICE_PFN(vkCmdBindVertexBuffers) \ + VK_DEVICE_PFN(vkCmdBlitImage) \ + VK_DEVICE_PFN(vkCmdClearAttachments) \ + VK_DEVICE_PFN(vkCmdClearColorImage) \ + VK_DEVICE_PFN(vkCmdClearDepthStencilImage) \ + VK_DEVICE_PFN(vkCmdCopyBuffer) \ + VK_DEVICE_PFN(vkCmdCopyBufferToImage) \ + VK_DEVICE_PFN(vkCmdCopyImage) \ + VK_DEVICE_PFN(vkCmdCopyImageToBuffer) \ + VK_DEVICE_PFN(vkCmdCopyQueryPoolResults) \ + VK_DEVICE_PFN(vkCmdDispatch) \ + VK_DEVICE_PFN(vkCmdDispatchIndirect) \ + VK_DEVICE_PFN(vkCmdDraw) \ + VK_DEVICE_PFN(vkCmdDrawIndexed) \ + VK_DEVICE_PFN(vkCmdDrawIndexedIndirect) \ + VK_DEVICE_PFN(vkCmdDrawIndirect) \ + VK_DEVICE_PFN(vkCmdEndQuery) \ + VK_DEVICE_PFN(vkCmdEndRenderPass) \ + VK_DEVICE_PFN(vkCmdExecuteCommands) \ + VK_DEVICE_PFN(vkCmdFillBuffer) \ + VK_DEVICE_PFN(vkCmdNextSubpass) \ + VK_DEVICE_PFN(vkCmdPipelineBarrier) \ + VK_DEVICE_PFN(vkCmdPushConstants) \ + VK_DEVICE_PFN(vkCmdResetEvent) \ + VK_DEVICE_PFN(vkCmdResetQueryPool) \ + VK_DEVICE_PFN(vkCmdResolveImage) \ + VK_DEVICE_PFN(vkCmdSetBlendConstants) \ + VK_DEVICE_PFN(vkCmdSetDepthBias) \ + VK_DEVICE_PFN(vkCmdSetDepthBounds) \ + VK_DEVICE_PFN(vkCmdSetEvent) \ + VK_DEVICE_PFN(vkCmdSetLineWidth) \ + VK_DEVICE_PFN(vkCmdSetScissor) \ + VK_DEVICE_PFN(vkCmdSetStencilCompareMask) \ + VK_DEVICE_PFN(vkCmdSetStencilReference) \ + VK_DEVICE_PFN(vkCmdSetStencilWriteMask) \ + VK_DEVICE_PFN(vkCmdSetViewport) \ + VK_DEVICE_PFN(vkCmdUpdateBuffer) \ + VK_DEVICE_PFN(vkCmdWaitEvents) \ + VK_DEVICE_PFN(vkCmdWriteTimestamp) \ + VK_DEVICE_PFN(vkCreateBuffer) \ + VK_DEVICE_PFN(vkCreateBufferView) \ + VK_DEVICE_PFN(vkCreateCommandPool) \ + VK_DEVICE_PFN(vkCreateComputePipelines) \ + VK_DEVICE_PFN(vkCreateDescriptorPool) \ + VK_DEVICE_PFN(vkCreateDescriptorSetLayout) \ + VK_DEVICE_PFN(vkCreateEvent) \ + VK_DEVICE_PFN(vkCreateFence) \ + VK_DEVICE_PFN(vkCreateFramebuffer) \ + VK_DEVICE_PFN(vkCreateGraphicsPipelines) \ + VK_DEVICE_PFN(vkCreateImage) \ + VK_DEVICE_PFN(vkCreateImageView) \ + VK_DEVICE_PFN(vkCreatePipelineCache) \ + VK_DEVICE_PFN(vkCreatePipelineLayout) \ + VK_DEVICE_PFN(vkCreateQueryPool) \ + VK_DEVICE_PFN(vkCreateRenderPass) \ + VK_DEVICE_PFN(vkCreateSampler) \ + VK_DEVICE_PFN(vkCreateSemaphore) \ + VK_DEVICE_PFN(vkCreateShaderModule) \ + VK_DEVICE_PFN(vkDestroyBuffer) \ + VK_DEVICE_PFN(vkDestroyBufferView) \ + VK_DEVICE_PFN(vkDestroyCommandPool) \ + VK_DEVICE_PFN(vkDestroyDescriptorPool) \ + VK_DEVICE_PFN(vkDestroyDescriptorSetLayout) \ + VK_DEVICE_PFN(vkDestroyDevice) \ + VK_DEVICE_PFN(vkDestroyEvent) \ + VK_DEVICE_PFN(vkDestroyFence) \ + VK_DEVICE_PFN(vkDestroyFramebuffer) \ + VK_DEVICE_PFN(vkDestroyImage) \ + VK_DEVICE_PFN(vkDestroyImageView) \ + VK_DEVICE_PFN(vkDestroyPipeline) \ + VK_DEVICE_PFN(vkDestroyPipelineCache) \ + VK_DEVICE_PFN(vkDestroyPipelineLayout) \ + VK_DEVICE_PFN(vkDestroyQueryPool) \ + VK_DEVICE_PFN(vkDestroyRenderPass) \ + VK_DEVICE_PFN(vkDestroySampler) \ + VK_DEVICE_PFN(vkDestroySemaphore) \ + VK_DEVICE_PFN(vkDestroyShaderModule) \ + VK_DEVICE_PFN(vkDeviceWaitIdle) \ + VK_DEVICE_PFN(vkEndCommandBuffer) \ + VK_DEVICE_PFN(vkFlushMappedMemoryRanges) \ + VK_DEVICE_PFN(vkFreeCommandBuffers) \ + VK_DEVICE_PFN(vkFreeDescriptorSets) \ + VK_DEVICE_PFN(vkFreeMemory) \ + VK_DEVICE_PFN(vkGetBufferMemoryRequirements) \ + VK_DEVICE_PFN(vkGetDeviceMemoryCommitment) \ + VK_DEVICE_PFN(vkGetDeviceQueue) \ + VK_DEVICE_PFN(vkGetEventStatus) \ + VK_DEVICE_PFN(vkGetFenceStatus) \ + VK_DEVICE_PFN(vkGetImageMemoryRequirements) \ + VK_DEVICE_PFN(vkGetImageSparseMemoryRequirements) \ + VK_DEVICE_PFN(vkGetImageSubresourceLayout) \ + VK_DEVICE_PFN(vkGetPipelineCacheData) \ + VK_DEVICE_PFN(vkGetQueryPoolResults) \ + VK_DEVICE_PFN(vkGetRenderAreaGranularity) \ + VK_DEVICE_PFN(vkInvalidateMappedMemoryRanges) \ + VK_DEVICE_PFN(vkMapMemory) \ + VK_DEVICE_PFN(vkMergePipelineCaches) \ + VK_DEVICE_PFN(vkQueueBindSparse) \ + VK_DEVICE_PFN(vkQueueSubmit) \ + VK_DEVICE_PFN(vkQueueWaitIdle) \ + VK_DEVICE_PFN(vkResetCommandBuffer) \ + VK_DEVICE_PFN(vkResetCommandPool) \ + VK_DEVICE_PFN(vkResetDescriptorPool) \ + VK_DEVICE_PFN(vkResetEvent) \ + VK_DEVICE_PFN(vkResetFences) \ + VK_DEVICE_PFN(vkSetEvent) \ + VK_DEVICE_PFN(vkUnmapMemory) \ + VK_DEVICE_PFN(vkUpdateDescriptorSets) \ + VK_DEVICE_PFN(vkWaitForFences) + +#define DECLARE_VK_PFN(name) PFN_##name name; + +struct vulkan_ops +{ +#define VK_INSTANCE_PFN DECLARE_VK_PFN +#define VK_DEVICE_PFN DECLARE_VK_PFN + VK_DEVICE_FUNCS() + VK_INSTANCE_FUNCS() +#undef VK_INSTANCE_PFN +#undef VK_DEVICE_PFN + + PFN_vkCreateInstance vkCreateInstance; + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; +}; + +struct wined3d_vk_info +{ + VkInstance instance; + struct vulkan_ops vk_ops; +}; + +#define VK_CALL(f) (vk_info->vk_ops.f) + +#endif /* __WINE_WINED3D_VK */ -- 2.19.2

2 1

[PATCH 1/4] d3d10core/tests: Introduce and use check_readback_data_u16.
by Henri Verbeet 02 Apr '19

02 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This partially supersedes patch 162055. dlls/d3d10core/tests/d3d10core.c | 94 +++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b9b83f4060d..7d76cc28d63 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -728,11 +728,16 @@ static void *get_readback_data(struct resource_readback *rb, unsigned int x, uns return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; } -static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y) +static BYTE get_readback_u8(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(BYTE *)get_readback_data(rb, x, y, sizeof(BYTE)); } +static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return *(WORD *)get_readback_data(rb, x, y, sizeof(WORD)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); @@ -785,12 +790,12 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } -#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) -static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, +#define check_readback_data_u8(a, b, c, d) check_readback_data_u8_(__LINE__, a, b, c, d) +static void check_readback_data_u8_(unsigned int line, struct resource_readback *rb, const RECT *rect, BYTE expected_value, BYTE max_diff) { unsigned int x = 0, y = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; BYTE value = 0; @@ -804,27 +809,57 @@ static void check_readback_data_byte_(unsigned int line, struct resource_readbac { for (x = rect->left; x < rect->right; ++x) { - value = get_readback_byte(rb, x, y); - if (!compare_color(value, expected_value, max_diff)) - { - all_match = FALSE; - break; - } + value = get_readback_u8(rb, x, y); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u), sub-resource %u.\n", value, expected_value, x, y, rb->sub_resource_idx); } +#define check_readback_data_u16(a, b, c, d) check_readback_data_u16_(__LINE__, a, b, c, d) +static void check_readback_data_u16_(unsigned int line, struct resource_readback *rb, + const RECT *rect, WORD expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = FALSE; + RECT default_rect; + WORD value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_u16(rb, x, y); + if (abs((int)value - (int)expected_value) > max_diff) + goto done; + } + } + all_match = TRUE; + +done: + ok_(__FILE__, line)(all_match, + "Got 0x%04x, expected 0x%04x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) { unsigned int x = 0, y = 0; - BOOL all_match = TRUE; + BOOL all_match = FALSE; RECT default_rect; DWORD color = 0; @@ -840,14 +875,12 @@ static void check_readback_data_color_(unsigned int line, struct resource_readba { color = get_readback_color(rb, x, y); if (!compare_color(color, expected_color, max_diff)) - { - all_match = FALSE; - break; - } + goto done; } - if (!all_match) - break; } + all_match = TRUE; + +done: ok_(__FILE__, line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u), sub-resource %u.\n", color, expected_color, x, y, rb->sub_resource_idx); @@ -15590,14 +15623,7 @@ static void test_depth_bias(void) break; case DXGI_FORMAT_D16_UNORM: get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, sizeof(*u16)); - ok(*u16 == 0xffff, "Got unexpected value %#x.\n", *u16); - } - } + check_readback_data_u16(&rb, NULL, 0xffffu, 0); release_resource_readback(&rb); break; default: @@ -15662,17 +15688,7 @@ static void test_depth_bias(void) depth = min(max(0.0f, quads[i].z + bias), 1.0f); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) - { - u16 = get_readback_data(&rb, x, y, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - } - } + check_readback_data_u16(&rb, NULL, depth * 65535.0f + 0.5f, 1); release_resource_readback(&rb); break; default: @@ -17864,7 +17880,7 @@ static void test_render_a8(void) ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); draw_quad(&test_context); get_texture_readback(texture, 0, &rb); - check_readback_data_byte(&rb, NULL, 0xff, 0); + check_readback_data_u8(&rb, NULL, 0xff, 0); release_resource_readback(&rb); ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black); -- 2.11.0

2 1

[PATCH] kernel32: Add DECLSPEC_HOTPATCH to SizeofResource().
by Gijs Vermeulen 02 Apr '19

02 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernel32/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index a04fe621aa..5c9383d419 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -617,7 +617,7 @@ BOOL WINAPI FreeResource( HGLOBAL handle ) /********************************************************************** * SizeofResource (KERNEL32.@) */ -DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) +DWORD WINAPI DECLSPEC_HOTPATCH SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) { if (!hRsrc) return 0; return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size; -- 2.21.0

1 0

[PATCH] urlmon/tests: Minor spelling tweak in a comment.
by Francois Gouget 02 Apr '19

02 Apr '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 0f2b14edc4b..1aef981b830 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2972,7 +2972,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(protocol == FTP_TEST) { - /* FTP url dont have any escape characters, so convert the url to what is expected */ + /* FTP urls don't have any escape characters so convert the url to what is expected */ DWORD size = 0; UrlUnescapeW(current_url, NULL, &size, URL_UNESCAPE_INPLACE); } -- 2.20.1

3 2

[PATCH 5/8] mshtml: Don't use strncasecmp.
by Piotr Caban 02 Apr '19

02 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/mshtml/nsio.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

2 1

[PATCH] shell32: Correct indentation in shfileop.c.
by Vijay Kiran Kamuju 02 Apr '19

02 Apr '19

From: Michael Müller <michael(a)fds-team.de> Remove tabs and replace whitespaces From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shell32/shlfileop.c | 794 +++++++++++++++++++-------------------- 1 file changed, 396 insertions(+), 398 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index c7bd54d200b..d2252fb1420 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -207,108 +207,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H /* confirmation dialogs content */ typedef struct { - HINSTANCE hIconInstance; - UINT icon_resource_id; - UINT caption_resource_id, text_resource_id; + HINSTANCE hIconInstance; + UINT icon_resource_id; + UINT caption_resource_id, text_resource_id; } SHELL_ConfirmIDstruc; static BOOL SHELL_ConfirmIDs(int nKindOfDialog, SHELL_ConfirmIDstruc *ids) { - ids->hIconInstance = shell32_hInstance; - switch (nKindOfDialog) { - case ASK_DELETE_FILE: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - case ASK_DELETE_FOLDER: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_DELETEITEM_TEXT; - return TRUE; - case ASK_DELETE_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; - return TRUE; - case ASK_TRASH_FILE: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHITEM_TEXT; - return TRUE; - case ASK_TRASH_FOLDER: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; - ids->text_resource_id = IDS_TRASHFOLDER_TEXT; - return TRUE; - case ASK_TRASH_MULTIPLE_ITEM: - ids->icon_resource_id = IDI_SHELL_TRASH_FILE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; - return TRUE; - case ASK_CANT_TRASH_ITEM: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; - ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_CANTTRASH_TEXT; - return TRUE; - case ASK_DELETE_SELECTED: - ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->hIconInstance = shell32_hInstance; + switch (nKindOfDialog) { + case ASK_DELETE_FILE: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ids->caption_resource_id = IDS_DELETEITEM_CAPTION; - ids->text_resource_id = IDS_DELETESELECTED_TEXT; + ids->text_resource_id = IDS_DELETEITEM_TEXT; return TRUE; - case ASK_OVERWRITE_FILE: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_WARNING; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; + case ASK_DELETE_FOLDER: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; + ids->text_resource_id = IDS_DELETEITEM_TEXT; return TRUE; - case ASK_OVERWRITE_FOLDER: - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_WARNING; - ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; - ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; + case ASK_DELETE_MULTIPLE_ITEM: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; return TRUE; - default: - FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); - } - return FALSE; + case ASK_TRASH_FILE: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_TRASHITEM_TEXT; + return TRUE; + case ASK_TRASH_FOLDER: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; + ids->text_resource_id = IDS_TRASHFOLDER_TEXT; + return TRUE; + case ASK_TRASH_MULTIPLE_ITEM: + ids->icon_resource_id = IDI_SHELL_TRASH_FILE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT; + return TRUE; + case ASK_CANT_TRASH_ITEM: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_CANTTRASH_TEXT; + return TRUE; + case ASK_DELETE_SELECTED: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETESELECTED_TEXT; + return TRUE; + case ASK_OVERWRITE_FILE: + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_WARNING; + ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; + ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; + return TRUE; + case ASK_OVERWRITE_FOLDER: + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_WARNING; + ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; + ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT; + return TRUE; + default: + FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog); + } + return FALSE; } static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FILE_OPERATION *op) { - WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; - SHELL_ConfirmIDstruc ids; - DWORD_PTR args[1]; - HICON hIcon; - int ret; - - assert(nKindOfDialog >= 0 && nKindOfDialog < 32); - if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) - return TRUE; - - if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; - - LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, ARRAY_SIZE(szCaption)); - LoadStringW(shell32_hInstance, ids.text_resource_id, szText, ARRAY_SIZE(szText)); - - args[0] = (DWORD_PTR)szDir; - FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args); - - hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); + WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; + SHELL_ConfirmIDstruc ids; + DWORD_PTR args[1]; + HICON hIcon; + int ret; - ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); - if (op) { - if (ret == IDD_YESTOALL) { - op->dwYesToAllMask |= (1 << nKindOfDialog); - ret = IDYES; - } - if (ret == IDCANCEL) - op->bCancelled = TRUE; - if (ret != IDYES) - op->req->fAnyOperationsAborted = TRUE; - } - return ret == IDYES; + assert(nKindOfDialog >= 0 && nKindOfDialog < 32); + if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) + return TRUE; + + if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; + + LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, ARRAY_SIZE(szCaption)); + LoadStringW(shell32_hInstance, ids.text_resource_id, szText, ARRAY_SIZE(szText)); + + args[0] = (DWORD_PTR)szDir; + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (__ms_va_list*)args); + hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); + + ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); + if (op) { + if (ret == IDD_YESTOALL) { + op->dwYesToAllMask |= (1 << nKindOfDialog); + ret = IDYES; + } + if (ret == IDCANCEL) + op->bCancelled = TRUE; + if (ret != IDYES) + op->req->fAnyOperationsAborted = TRUE; + } + return ret == IDYES; } BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) @@ -318,18 +317,18 @@ BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars) { - DWORD len = MultiByteToWideChar(CP_ACP, 0, aPath, -1, NULL, 0); - - if (len < minChars) - len = minChars; - - *wPath = heap_alloc(len * sizeof(WCHAR)); - if (*wPath) - { - MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len); - return NO_ERROR; - } - return E_OUTOFMEMORY; + DWORD len = MultiByteToWideChar(CP_ACP, 0, aPath, -1, NULL, 0); + + if (len < minChars) + len = minChars; + + *wPath = heap_alloc(len * sizeof(WCHAR)); + if (*wPath) + { + MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len); + return NO_ERROR; + } + return E_OUTOFMEMORY; } HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) @@ -372,8 +371,8 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) ret = SHNotifyRemoveDirectoryW(pszDir); return ret == ERROR_PATH_NOT_FOUND ? - 0x7C: /* DE_INVALIDFILES (legacy Windows error) */ - ret; + 0x7C: /* DE_INVALIDFILES (legacy Windows error) */ + ret; } /************************************************************************** @@ -393,41 +392,41 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) */ static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec) { - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s, %p)\n", debugstr_a(path), sec); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHNotifyCreateDirectoryW(wPath, sec); - heap_free(wPath); - } - return retCode; + LPWSTR wPath; + DWORD retCode; + + TRACE("(%s, %p)\n", debugstr_a(path), sec); + + retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); + if (!retCode) + { + retCode = SHNotifyCreateDirectoryW(wPath, sec); + heap_free(wPath); + } + return retCode; } /**********************************************************************/ static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { - TRACE("(%s, %p)\n", debugstr_w(path), sec); - - if (CreateDirectoryW(path, sec)) - { - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, path, NULL); - return ERROR_SUCCESS; - } - return GetLastError(); + TRACE("(%s, %p)\n", debugstr_w(path), sec); + + if (CreateDirectoryW(path, sec)) + { + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, path, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); } /**********************************************************************/ BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec) { - if (SHELL_OsIsUnicode()) - return (SHNotifyCreateDirectoryW(path, sec) == ERROR_SUCCESS); - return (SHNotifyCreateDirectoryA(path, sec) == ERROR_SUCCESS); + if (SHELL_OsIsUnicode()) + return (SHNotifyCreateDirectoryW(path, sec) == ERROR_SUCCESS); + return (SHNotifyCreateDirectoryA(path, sec) == ERROR_SUCCESS); } /************************************************************************ @@ -447,51 +446,51 @@ BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec) */ static DWORD SHNotifyRemoveDirectoryA(LPCSTR path) { - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s)\n", debugstr_a(path)); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHNotifyRemoveDirectoryW(wPath); - heap_free(wPath); - } - return retCode; + LPWSTR wPath; + DWORD retCode; + + TRACE("(%s)\n", debugstr_a(path)); + + retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); + if (!retCode) + { + retCode = SHNotifyRemoveDirectoryW(wPath); + heap_free(wPath); + } + return retCode; } /***********************************************************************/ static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path) { - BOOL ret; - TRACE("(%s)\n", debugstr_w(path)); - - ret = RemoveDirectoryW(path); - if (!ret) - { - /* Directory may be write protected */ - DWORD dwAttr = GetFileAttributesW(path); - if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY)) - if (SetFileAttributesW(path, dwAttr & ~FILE_ATTRIBUTE_READONLY)) - ret = RemoveDirectoryW(path); - } - if (ret) - { - SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW, path, NULL); - return ERROR_SUCCESS; - } - return GetLastError(); + BOOL ret; + TRACE("(%s)\n", debugstr_w(path)); + + ret = RemoveDirectoryW(path); + if (!ret) + { + /* Directory may be write protected */ + DWORD dwAttr = GetFileAttributesW(path); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY)) + if (SetFileAttributesW(path, dwAttr & ~FILE_ATTRIBUTE_READONLY)) + ret = RemoveDirectoryW(path); + } + if (ret) + { + SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW, path, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); } /***********************************************************************/ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) { - if (SHELL_OsIsUnicode()) - return (SHNotifyRemoveDirectoryW(path) == ERROR_SUCCESS); - return (SHNotifyRemoveDirectoryA(path) == ERROR_SUCCESS); + if (SHELL_OsIsUnicode()) + return (SHNotifyRemoveDirectoryW(path) == ERROR_SUCCESS); + return (SHNotifyRemoveDirectoryA(path) == ERROR_SUCCESS); } /************************************************************************ @@ -511,52 +510,52 @@ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) */ static DWORD SHNotifyDeleteFileA(LPCSTR path) { - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s)\n", debugstr_a(path)); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHNotifyDeleteFileW(wPath); - heap_free(wPath); - } - return retCode; + LPWSTR wPath; + DWORD retCode; + + TRACE("(%s)\n", debugstr_a(path)); + + retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); + if (!retCode) + { + retCode = SHNotifyDeleteFileW(wPath); + heap_free(wPath); + } + return retCode; } /***********************************************************************/ static DWORD SHNotifyDeleteFileW(LPCWSTR path) { - BOOL ret; - - TRACE("(%s)\n", debugstr_w(path)); - - ret = DeleteFileW(path); - if (!ret) - { - /* File may be write protected or a system file */ - DWORD dwAttr = GetFileAttributesW(path); - if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) - if (SetFileAttributesW(path, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) - ret = DeleteFileW(path); - } - if (ret) - { - SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL); - return ERROR_SUCCESS; - } - return GetLastError(); + BOOL ret; + + TRACE("(%s)\n", debugstr_w(path)); + + ret = DeleteFileW(path); + if (!ret) + { + /* File may be write protected or a system file */ + DWORD dwAttr = GetFileAttributesW(path); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) + if (SetFileAttributesW(path, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) + ret = DeleteFileW(path); + } + if (ret) + { + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL); + return ERROR_SUCCESS; + } + return GetLastError(); } /***********************************************************************/ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) { - if (SHELL_OsIsUnicode()) - return (SHNotifyDeleteFileW(path) == ERROR_SUCCESS); - return (SHNotifyDeleteFileA(path) == ERROR_SUCCESS); + if (SHELL_OsIsUnicode()) + return (SHNotifyDeleteFileW(path) == ERROR_SUCCESS); + return (SHNotifyDeleteFileA(path) == ERROR_SUCCESS); } /************************************************************************ @@ -573,36 +572,36 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) */ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) { - BOOL ret; - - TRACE("(%s %s)\n", debugstr_w(src), debugstr_w(dest)); - - ret = MoveFileExW(src, dest, MOVEFILE_REPLACE_EXISTING); - - /* MOVEFILE_REPLACE_EXISTING fails with dirs, so try MoveFile */ - if (!ret) - ret = MoveFileW(src, dest); - - if (!ret) - { - DWORD dwAttr; - - dwAttr = SHFindAttrW(dest, FALSE); - if (INVALID_FILE_ATTRIBUTES == dwAttr) - { - /* Source file may be write protected or a system file */ - dwAttr = GetFileAttributesW(src); - if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) - if (SetFileAttributesW(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) - ret = MoveFileW(src, dest); - } - } - if (ret) - { - SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest); - return ERROR_SUCCESS; - } - return GetLastError(); + BOOL ret; + + TRACE("(%s %s)\n", debugstr_w(src), debugstr_w(dest)); + + ret = MoveFileExW(src, dest, MOVEFILE_REPLACE_EXISTING); + + /* MOVEFILE_REPLACE_EXISTING fails with dirs, so try MoveFile */ + if (!ret) + ret = MoveFileW(src, dest); + + if (!ret) + { + DWORD dwAttr; + + dwAttr = SHFindAttrW(dest, FALSE); + if (INVALID_FILE_ATTRIBUTES == dwAttr) + { + /* Source file may be write protected or a system file */ + dwAttr = GetFileAttributesW(src); + if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) + if (SetFileAttributesW(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))) + ret = MoveFileW(src, dest); + } + } + if (ret) + { + SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest); + return ERROR_SUCCESS; + } + return GetLastError(); } /************************************************************************ @@ -621,24 +620,24 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) */ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) { - BOOL ret; - DWORD attribs; + BOOL ret; + DWORD attribs; - TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); + TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); - /* Destination file may already exist with read only attribute */ - attribs = GetFileAttributesW(dest); - if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY)) - SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); + /* Destination file may already exist with read only attribute */ + attribs = GetFileAttributesW(dest); + if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY)) + SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); - ret = CopyFileW(src, dest, bFailIfExists); - if (ret) - { - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL); - return ERROR_SUCCESS; - } + ret = CopyFileW(src, dest, bFailIfExists); + if (ret) + { + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL); + return ERROR_SUCCESS; + } - return GetLastError(); + return GetLastError(); } /************************************************************************* @@ -668,9 +667,9 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) */ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) { - if (SHELL_OsIsUnicode()) - return SHCreateDirectoryExW(hWnd, path, NULL); - return SHCreateDirectoryExA(hWnd, path, NULL); + if (SHELL_OsIsUnicode()) + return SHCreateDirectoryExW(hWnd, path, NULL); + return SHCreateDirectoryExA(hWnd, path, NULL); } /************************************************************************* @@ -707,18 +706,18 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) */ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec) { - LPWSTR wPath; - DWORD retCode; - - TRACE("(%s, %p)\n", debugstr_a(path), sec); - - retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); - if (!retCode) - { - retCode = SHCreateDirectoryExW(hWnd, wPath, sec); - heap_free(wPath); - } - return retCode; + LPWSTR wPath; + DWORD retCode; + + TRACE("(%s, %p)\n", debugstr_a(path), sec); + + retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); + if (!retCode) + { + retCode = SHCreateDirectoryExW(hWnd, wPath, sec); + heap_free(wPath); + } + return retCode; } /************************************************************************* @@ -728,49 +727,49 @@ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES se */ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { - int ret = ERROR_BAD_PATHNAME; - TRACE("(%p, %s, %p)\n", hWnd, debugstr_w(path), sec); - - if (PathIsRelativeW(path)) - { - SetLastError(ret); - } - else - { - ret = SHNotifyCreateDirectoryW(path, sec); - /* Refuse to work on certain error codes before trying to create directories recursively */ - if (ret != ERROR_SUCCESS && - ret != ERROR_FILE_EXISTS && - ret != ERROR_ALREADY_EXISTS && - ret != ERROR_FILENAME_EXCED_RANGE) - { - WCHAR *pEnd, *pSlash, szTemp[MAX_PATH + 1]; /* extra for PathAddBackslash() */ - - lstrcpynW(szTemp, path, MAX_PATH); - pEnd = PathAddBackslashW(szTemp); - pSlash = szTemp + 3; - - while (*pSlash) - { - while (*pSlash && *pSlash != '\\') pSlash++; - if (*pSlash) - { - *pSlash = 0; /* terminate path at separator */ - - ret = SHNotifyCreateDirectoryW(szTemp, pSlash + 1 == pEnd ? sec : NULL); - } - *pSlash++ = '\\'; /* put the separator back */ - } - } - - if (ret && hWnd && (ERROR_CANCELLED != ret)) - { - /* We failed and should show a dialog box */ - FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); - ret = ERROR_CANCELLED; /* Error has been already presented to user (not really yet!) */ - } - } - return ret; + int ret = ERROR_BAD_PATHNAME; + TRACE("(%p, %s, %p)\n", hWnd, debugstr_w(path), sec); + + if (PathIsRelativeW(path)) + { + SetLastError(ret); + } + else + { + ret = SHNotifyCreateDirectoryW(path, sec); + /* Refuse to work on certain error codes before trying to create directories recursively */ + if (ret != ERROR_SUCCESS && + ret != ERROR_FILE_EXISTS && + ret != ERROR_ALREADY_EXISTS && + ret != ERROR_FILENAME_EXCED_RANGE) + { + WCHAR *pEnd, *pSlash, szTemp[MAX_PATH + 1]; /* extra for PathAddBackslash() */ + + lstrcpynW(szTemp, path, MAX_PATH); + pEnd = PathAddBackslashW(szTemp); + pSlash = szTemp + 3; + + while (*pSlash) + { + while (*pSlash && *pSlash != '\\') pSlash++; + if (*pSlash) + { + *pSlash = 0; /* terminate path at separator */ + + ret = SHNotifyCreateDirectoryW(szTemp, pSlash + 1 == pEnd ? sec : NULL); + } + *pSlash++ = '\\'; /* put the separator back */ + } + } + + if (ret && hWnd && (ERROR_CANCELLED != ret)) + { + /* We failed and should show a dialog box */ + FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); + ret = ERROR_CANCELLED; /* Error has been already presented to user (not really yet!) */ + } + } + return ret; } /************************************************************************* @@ -790,25 +789,25 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s */ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) { - WIN32_FIND_DATAW wfd; - BOOL b_FileMask = fileOnly && (NULL != StrPBrkW(pName, wWildcardChars)); - DWORD dwAttr = INVALID_FILE_ATTRIBUTES; - HANDLE hFind = FindFirstFileW(pName, &wfd); - - TRACE("%s %d\n", debugstr_w(pName), fileOnly); - if (INVALID_HANDLE_VALUE != hFind) - { - do - { - if (b_FileMask && IsAttribDir(wfd.dwFileAttributes)) - continue; - dwAttr = wfd.dwFileAttributes; - break; - } - while (FindNextFileW(hFind, &wfd)); - FindClose(hFind); - } - return dwAttr; + WIN32_FIND_DATAW wfd; + BOOL b_FileMask = fileOnly && (NULL != StrPBrkW(pName, wWildcardChars)); + DWORD dwAttr = INVALID_FILE_ATTRIBUTES; + HANDLE hFind = FindFirstFileW(pName, &wfd); + + TRACE("%s %d\n", debugstr_w(pName), fileOnly); + if (INVALID_HANDLE_VALUE != hFind) + { + do + { + if (b_FileMask && IsAttribDir(wfd.dwFileAttributes)) + continue; + dwAttr = wfd.dwFileAttributes; + break; + } + while (FindNextFileW(hFind, &wfd)); + FindClose(hFind); + } + return dwAttr; } /************************************************************************* @@ -822,27 +821,27 @@ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) */ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) { - DWORD size = 0, aSize = 0; - LPCSTR aString = (LPCSTR)*pWToFrom; - - if (aString) - { - do - { - size = lstrlenA(aString) + 1; - aSize += size; - aString += size; - } while ((size != 1) && more); - /* The two sizes might be different in the case of multibyte chars */ - size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0); - if (*wString) /* only in the second loop */ - { - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size); - *pWToFrom = *wString; - *wString += size; - } - } - return size; + DWORD size = 0, aSize = 0; + LPCSTR aString = (LPCSTR)*pWToFrom; + + if (aString) + { + do + { + size = lstrlenA(aString) + 1; + aSize += size; + aString += size; + } while ((size != 1) && more); + /* The two sizes might be different in the case of multibyte chars */ + size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0); + if (*wString) /* only in the second loop */ + { + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size); + *pWToFrom = *wString; + *wString += size; + } + } + return size; } /************************************************************************* * SHFileOperationA [SHELL32.@] @@ -862,46 +861,45 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) */ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) { - SHFILEOPSTRUCTW nFileOp = *((LPSHFILEOPSTRUCTW)lpFileOp); - int retCode = 0; - DWORD size; - LPWSTR ForFree = NULL, /* we change wString in SHNameTranslate and can't use it for freeing */ - wString = NULL; /* we change this in SHNameTranslate */ - - TRACE("\n"); - if (FO_DELETE == (nFileOp.wFunc & FO_MASK)) - nFileOp.pTo = NULL; /* we need a NULL or a valid pointer for translation */ - if (!(nFileOp.fFlags & FOF_SIMPLEPROGRESS)) - nFileOp.lpszProgressTitle = NULL; /* we need a NULL or a valid pointer for translation */ - while (1) /* every loop calculate size, second translate also, if we have storage for this */ - { - size = SHNameTranslate(&wString, &nFileOp.lpszProgressTitle, FALSE); /* no loop */ - size += SHNameTranslate(&wString, &nFileOp.pFrom, TRUE); /* internal loop */ - size += SHNameTranslate(&wString, &nFileOp.pTo, TRUE); /* internal loop */ - - if (ForFree) - { - retCode = SHFileOperationW(&nFileOp); - /* Windows 95/98 returns S_OK for this case. */ - if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000)) - retCode = S_OK; - - heap_free(ForFree); /* we cannot use wString, it was changed */ - break; - } - else - { - wString = ForFree = heap_alloc(size * sizeof(WCHAR)); - if (ForFree) continue; - retCode = ERROR_OUTOFMEMORY; - nFileOp.fAnyOperationsAborted = TRUE; - return retCode; - } - } - - lpFileOp->hNameMappings = nFileOp.hNameMappings; - lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted; - return retCode; + SHFILEOPSTRUCTW nFileOp = *((LPSHFILEOPSTRUCTW)lpFileOp); + int retCode = 0; + DWORD size; + LPWSTR ForFree = NULL, /* we change wString in SHNameTranslate and can't use it for freeing */ + wString = NULL; /* we change this in SHNameTranslate */ + + TRACE("\n"); + if (FO_DELETE == (nFileOp.wFunc & FO_MASK)) + nFileOp.pTo = NULL; /* we need a NULL or a valid pointer for translation */ + if (!(nFileOp.fFlags & FOF_SIMPLEPROGRESS)) + nFileOp.lpszProgressTitle = NULL; /* we need a NULL or a valid pointer for translation */ + while (1) /* every loop calculate size, second translate also, if we have storage for this */ + { + size = SHNameTranslate(&wString, &nFileOp.lpszProgressTitle, FALSE); /* no loop */ + size += SHNameTranslate(&wString, &nFileOp.pFrom, TRUE); /* internal loop */ + size += SHNameTranslate(&wString, &nFileOp.pTo, TRUE); /* internal loop */ + + if (ForFree) + { + retCode = SHFileOperationW(&nFileOp); + /* Windows 95/98 returns S_OK for this case. */ + if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000)) + retCode = S_OK; + heap_free(ForFree); /* we cannot use wString, it was changed */ + break; + } + else + { + wString = ForFree = heap_alloc(size * sizeof(WCHAR)); + if (ForFree) continue; + retCode = ERROR_OUTOFMEMORY; + nFileOp.fAnyOperationsAborted = TRUE; + return retCode; + } + } + + lpFileOp->hNameMappings = nFileOp.hNameMappings; + lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted; + return retCode; } #define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 @@ -931,7 +929,7 @@ typedef struct static inline void grow_list(FILE_LIST *list) { FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles, - list->num_alloc * 2 * sizeof(*new) ); + list->num_alloc * 2 * sizeof(*new) ); list->feFiles = new; list->num_alloc *= 2; } @@ -1024,7 +1022,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) /* empty list */ if (!szFiles[0]) return ERROR_ACCESS_DENIED; - + flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY)); while (*ptr) @@ -1129,7 +1127,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST /* Don't ask the user about overwriting files when he accepted to overwrite the folder. FIXME: this is not exactly what Windows does - e.g. there would be an additional confirmation for a nested folder */ - fileOp.fFlags |= FOF_NOCONFIRMATION; + fileOp.fFlags |= FOF_NOCONFIRMATION; SHFileOperationW(&fileOp); } @@ -1342,7 +1340,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) /* Windows also checks only the first item */ bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO) - && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); + && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING)) if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom)) @@ -1377,11 +1375,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) break; } } - + /* delete the file or directory */ if (IsAttribFile(fileEntry->attributes)) ret = DeleteFileW(fileEntry->szFullPath) ? - ERROR_SUCCESS : GetLastError(); + ERROR_SUCCESS : GetLastError(); else ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); @@ -1502,8 +1500,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con static void check_flags(FILEOP_FLAGS fFlags) { WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS | - FOF_NOCOPYSECURITYATTRIBS | FOF_NORECURSEREPARSE | - FOF_RENAMEONCOLLISION | FOF_WANTMAPPINGHANDLE; + FOF_NOCOPYSECURITYATTRIBS | FOF_NORECURSEREPARSE | + FOF_RENAMEONCOLLISION | FOF_WANTMAPPINGHANDLE; if (fFlags & wUnsupportedFlags) FIXME("Unsupported flags: %04x\n", fFlags); @@ -1586,19 +1584,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) */ void WINAPI SHFreeNameMappings(HANDLE hNameMapping) { - if (hNameMapping) - { - int i = SHDSA_GetItemCount((HDSA)hNameMapping) - 1; + if (hNameMapping) + { + int i = SHDSA_GetItemCount((HDSA)hNameMapping) - 1; - for (; i>= 0; i--) - { + for (; i>= 0; i--) + { LPSHNAMEMAPPINGW lp = DSA_GetItemPtr(hNameMapping, i); - SHFree(lp->pszOldPath); - SHFree(lp->pszNewPath); - } - DSA_Destroy(hNameMapping); - } + SHFree(lp->pszOldPath); + SHFree(lp->pszNewPath); + } + DSA_Destroy(hNameMapping); + } } /************************************************************************* @@ -1704,14 +1702,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path) } /************************************************************************* - * IsNetDrive [SHELL32.66] + * IsNetDrive [SHELL32.66] */ int WINAPI IsNetDrive(int drive) { - char root[4]; - strcpy(root, "A:\\"); - root[0] += (char)drive; - return (GetDriveTypeA(root) == DRIVE_REMOTE); + char root[4]; + strcpy(root, "A:\\"); + root[0] += (char)drive; + return (GetDriveTypeA(root) == DRIVE_REMOTE); } -- 2.17.0

1 0

[PATCH 3/3] wined3d: Pass application info to Vulkan.
by Józef Kucia 02 Apr '19

02 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 26 +++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 42 +++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index bb465b68135a..e8162856afea 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -106,10 +106,27 @@ static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} #endif +static unsigned int wined3d_get_wine_vk_version(void) +{ + const char *ptr = PACKAGE_VERSION; + int major, minor; + + major = atoi(ptr); + + while (isdigit(*ptr) || *ptr == '.') + ++ptr; + + minor = atoi(ptr); + + return VK_MAKE_VERSION(major, minor, 0); +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstanceCreateInfo instance_info; + VkApplicationInfo app_info; + char app_name[MAX_PATH]; VkInstance instance; VkResult vr; @@ -122,8 +139,17 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + memset(&app_info, 0, sizeof(app_info)); + app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) + app_info.pApplicationName = app_name; + app_info.pEngineName = "Damavand"; + app_info.engineVersion = wined3d_get_wine_vk_version(); + app_info.apiVersion = VK_API_VERSION_1_0; + memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_info.pApplicationInfo = &app_info; if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index d2e4978ee79b..0a0121d909e4 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -142,6 +142,30 @@ success: return 0; } +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) +{ + char buffer[MAX_PATH]; + unsigned int len; + char *p, *name; + + len = GetModuleFileNameA(0, buffer, ARRAY_SIZE(buffer)); + if (!(len && len < MAX_PATH)) + return FALSE; + + name = buffer; + if ((p = strrchr(name, '/' ))) + name = p + 1; + if ((p = strrchr(name, '\\'))) + name = p + 1; + + len = strlen(name) + 1; + if (app_name_size < len) + return FALSE; + + memcpy(app_name, name, len); + return TRUE; +} + static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; @@ -149,7 +173,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DWORD size = sizeof(buffer); HKEY hkey = 0; HKEY appkey = 0; - DWORD len, tmpvalue; + DWORD tmpvalue; WNDCLASSA wc; wined3d_context_tls_idx = TlsAlloc(); @@ -191,20 +215,16 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; - len = GetModuleFileNameA( 0, buffer, MAX_PATH ); - if (len && len < MAX_PATH) + if (wined3d_get_app_name(buffer, ARRAY_SIZE(buffer))) { HKEY tmpkey; /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Direct3D */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) { - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\Direct3D" ); - TRACE("appname = [%s]\n", appname); - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; - RegCloseKey( tmpkey ); + strcat(buffer, "\\Direct3D"); + TRACE("Application name %s.\n", buffer); + if (RegOpenKeyA(tmpkey, buffer, &appkey)) appkey = 0; + RegCloseKey(tmpkey); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 012c90f5d345..c2fbf1dae519 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2919,6 +2919,8 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; + struct wined3d_blend_state { LONG refcount; -- 2.19.2

1 0