wine-devel July 2019

65 participants
284 discussions

[PATCH vkd3d v4 3/5] vkd3d: Store vkd3d_format in {dsv,rtv}_desc.
by Józef Kucia 30 Jul '19

30 Jul '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 6 +++--- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index eeae9cf4efe2..30b4ae344df8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4456,7 +4456,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); - list->dsv_format = dsv_desc->format; + list->dsv_format = dsv_desc->format->vk_format; } else { @@ -4595,7 +4595,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra d3d12_command_list_track_resource_usage(list, dsv_desc->resource); attachment_desc.flags = 0; - attachment_desc.format = dsv_desc->format; + attachment_desc.format = dsv_desc->format->vk_format; attachment_desc.samples = dsv_desc->sample_count; if (flags & D3D12_CLEAR_FLAG_DEPTH) { @@ -4643,7 +4643,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra d3d12_command_list_track_resource_usage(list, rtv_desc->resource); attachment_desc.flags = 0; - attachment_desc.format = rtv_desc->format; + attachment_desc.format = rtv_desc->format->vk_format; attachment_desc.samples = rtv_desc->sample_count; attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e0e1aadf62ba..054ad3fe5039 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2827,8 +2827,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev return; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; - rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); + rtv_desc->format = vkd3d_desc.format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->layer_count = vkd3d_desc.layer_count; @@ -2910,8 +2910,8 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; - dsv_desc->format = vkd3d_desc.format->vk_format; dsv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); + dsv_desc->format = vkd3d_desc.format; dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->layer_count = vkd3d_desc.layer_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6e2dc2b2bb8e..fe939e548258 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -513,8 +513,8 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, struct d3d12_rtv_desc { uint32_t magic; - VkFormat format; VkSampleCountFlagBits sample_count; + const struct vkd3d_format *format; uint64_t width; unsigned int height; unsigned int layer_count; @@ -533,8 +533,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev struct d3d12_dsv_desc { uint32_t magic; - VkFormat format; VkSampleCountFlagBits sample_count; + const struct vkd3d_format *format; uint64_t width; unsigned int height; unsigned int layer_count; -- 2.21.0

2 1

[PATCH vkd3d v4 2/5] tests: Test ClearRenderTargetView() with R16G16B16A16 formats.
by Józef Kucia 30 Jul '19

30 Jul '19

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 4: Merge loops and get rid of test_clear_rtv_r16g16b16a16_2d_(). Version 3: Use llabs() and one table. --- tests/d3d12.c | 96 ++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 2 + 2 files changed, 98 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 69856b58c662..4ac6b5ef54f0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -89,6 +89,11 @@ static bool compare_uint16(uint16_t a, uint16_t b, unsigned int max_diff) return abs(a - b) <= max_diff; } +static bool compare_uint64(uint64_t a, uint64_t b, unsigned int max_diff) +{ + return llabs(a - b) <= max_diff; +} + static ULONG get_refcount(void *iface) { IUnknown *unk = iface; @@ -531,6 +536,47 @@ static void check_sub_resource_uint16_(unsigned int line, ID3D12Resource *textur release_resource_readback(&rb); } +#define check_readback_data_uint64(a, b, c, d) check_readback_data_uint64_(__LINE__, a, b, c, d) +static void check_readback_data_uint64_(unsigned int line, struct resource_readback *rb, + const RECT *rect, uint64_t expected, unsigned int max_diff) +{ + RECT r = {0, 0, rb->width, rb->height}; + unsigned int x = 0, y; + bool all_match = true; + uint64_t got = 0; + + if (rect) + r = *rect; + + for (y = r.top; y < r.bottom; ++y) + { + for (x = r.left; x < r.right; ++x) + { + got = get_readback_uint64(rb, x, y); + if (!compare_uint64(got, expected, max_diff)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + ok_(line)(all_match, "Got %#"PRIx64", expected %#"PRIx64" at (%u, %u).\n", got, expected, x, y); +} + +#define check_sub_resource_uint64(a, b, c, d, e, f) check_sub_resource_uint64_(__LINE__, a, b, c, d, e, f) +static void check_sub_resource_uint64_(unsigned int line, ID3D12Resource *texture, + unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + uint64_t expected, unsigned int max_diff) +{ + struct resource_readback rb; + + get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); + check_readback_data_uint64_(line, &rb, NULL, expected, max_diff); + release_resource_readback(&rb); +} + #define check_sub_resource_vec4(a, b, c, d, e, f) check_sub_resource_vec4_(__LINE__, a, b, c, d, e, f) static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, @@ -4334,6 +4380,24 @@ static void test_clear_render_target_view(void) {color, DXGI_FORMAT_R8G8B8A8_SINT, 0x00000000}, {negative_value, DXGI_FORMAT_R8G8B8A8_SINT, 0xfe00ff01}, }; + static const struct + { + const float *color; + DXGI_FORMAT format; + uint64_t result; + } + r16g16b16a16[] = + { + {green, DXGI_FORMAT_R16G16B16A16_UNORM, 0xffff0000ffff0000}, + + {green, DXGI_FORMAT_R16G16B16A16_UINT, 0x0001000000010000}, + {color, DXGI_FORMAT_R16G16B16A16_UINT, 0x0000000000000000}, + {negative_value, DXGI_FORMAT_R16G16B16A16_UINT, 0x0000000000000001}, + + {green, DXGI_FORMAT_R16G16B16A16_SINT, 0x0001000000010000}, + {color, DXGI_FORMAT_R16G16B16A16_SINT, 0x0000000000000000}, + {negative_value, DXGI_FORMAT_R16G16B16A16_SINT, 0xfffe0000ffff0001}, + }; STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors)); @@ -4400,11 +4464,43 @@ static void test_clear_render_target_view(void) } vkd3d_test_set_context(NULL); + /* R16G16B16A16 */ + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + reset_command_list(command_list, context.allocator); + ID3D12Resource_Release(resource); + resource_desc.Format = DXGI_FORMAT_R16G16B16A16_TYPELESS; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(r16g16b16a16); ++i) + { + vkd3d_test_set_context("Test %u", i); + + rtv_desc.Format = r16g16b16a16[i].format; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, r16g16b16a16[i].color, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo_if(rtv_desc.Format != DXGI_FORMAT_R16G16B16A16_UNORM) + check_sub_resource_uint64(resource, 0, queue, command_list, r16g16b16a16[i].result, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + vkd3d_test_set_context(NULL); + /* 2D array texture */ hr = ID3D12GraphicsCommandList_Close(command_list); ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); reset_command_list(command_list, context.allocator); ID3D12Resource_Release(resource); + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors); hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index da272da98d6b..ec6f839d8e8d 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -270,6 +270,8 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R32G32B32A32_UINT: case DXGI_FORMAT_R8G8_UNORM: return 16; + case DXGI_FORMAT_R16G16B16A16_TYPELESS: + return 8; case DXGI_FORMAT_R32_TYPELESS: case DXGI_FORMAT_D32_FLOAT: case DXGI_FORMAT_R32_FLOAT: -- 2.21.0

2 1

[PATCH vkd3d v4 1/5] tests: Test ClearRenderTargetView() with R8G8B8A8_{SINT, UINT} formats.
by Józef Kucia 30 Jul '19

30 Jul '19

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- v4: Reorganize array with tests, merge loops, and get rid of test_clear_rtv_r8g8b8a8_2d_(). v3: Use one table. --- tests/d3d12.c | 67 +++++++++++++++++++++++++--------------- tests/d3d12_test_utils.h | 4 +-- 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index bd055fb5d444..69856b58c662 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4292,6 +4292,7 @@ static void test_clear_render_target_view(void) {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f}, }; + static const float negative_value[] = {1.0f, -1.0f, -0.5f, -2.0f}; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; @@ -4312,6 +4313,28 @@ static void test_clear_render_target_view(void) D3D12_BOX box; HRESULT hr; + static const struct + { + const float *color; + DXGI_FORMAT format; + uint32_t result; + } + r8g8b8a8[] = + { + {color, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 0xbf95bc59}, + + {green, DXGI_FORMAT_R8G8B8A8_UNORM, 0xff00ff00}, + {color, DXGI_FORMAT_R8G8B8A8_UNORM, 0xbf4c7f19}, + + {green, DXGI_FORMAT_R8G8B8A8_UINT, 0x01000100}, + {color, DXGI_FORMAT_R8G8B8A8_UINT, 0x00000000}, + {negative_value, DXGI_FORMAT_R8G8B8A8_UINT, 0x00000001}, + + {green, DXGI_FORMAT_R8G8B8A8_SINT, 0x01000100}, + {color, DXGI_FORMAT_R8G8B8A8_SINT, 0x00000000}, + {negative_value, DXGI_FORMAT_R8G8B8A8_SINT, 0xfe00ff01}, + }; + STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors)); memset(&desc, 0, sizeof(desc)); @@ -4355,37 +4378,32 @@ static void test_clear_render_target_view(void) ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); memset(&rtv_desc, 0, sizeof(rtv_desc)); - rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D; - ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); - - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); - transition_resource_state(command_list, resource, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resource, 0, queue, command_list, 0xff00ff00, 0); - reset_command_list(command_list, context.allocator); - transition_resource_state(command_list, resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* R8G8B8A8 */ + for (i = 0; i < ARRAY_SIZE(r8g8b8a8); ++i) + { + vkd3d_test_set_context("Test %u", i); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); - transition_resource_state(command_list, resource, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resource, 0, queue, command_list, 0xbf4c7f19, 2); + rtv_desc.Format = r8g8b8a8[i].format; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); - /* sRGB view */ - reset_command_list(command_list, context.allocator); - transition_resource_state(command_list, resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); - rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, r8g8b8a8[i].color, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo_if(rtv_desc.Format == DXGI_FORMAT_R8G8B8A8_UINT || rtv_desc.Format == DXGI_FORMAT_R8G8B8A8_SINT) + check_sub_resource_uint(resource, 0, queue, command_list, r8g8b8a8[i].result, 2); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); - transition_resource_state(command_list, resource, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + vkd3d_test_set_context(NULL); /* 2D array texture */ + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + reset_command_list(command_list, context.allocator); ID3D12Resource_Release(resource); resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors); hr = ID3D12Device_CreateCommittedResource(device, @@ -4394,7 +4412,6 @@ static void test_clear_render_target_view(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); - reset_command_list(command_list, context.allocator); for (i = 0; i < ARRAY_SIZE(array_colors); ++i) { memset(&rtv_desc, 0, sizeof(rtv_desc)); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 027a1fd68e97..da272da98d6b 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -88,9 +88,9 @@ static inline void reset_command_list_(unsigned int line, HRESULT hr; hr = ID3D12CommandAllocator_Reset(allocator); - ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); - ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); } #define queue_signal(a, b, c) queue_signal_(__LINE__, a, b, c) -- 2.21.0

2 1

[PATCH] wined3d: Add some graphics cards.
by Kristján Gerhardsson 30 Jul '19

30 Jul '19

Signed-off-by: Kristjan Gerhardsson <kristjang at ccpgames.com> --- dlls/wined3d/directx.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5975766f16..461ea222ba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -396,7 +396,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_M395X, "AMD Radeon R9 M395X", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, @@ -477,8 +478,10 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, - {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2c81617b6..037434431d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2378,7 +2378,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_R9_M395X = 0x6920, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, - CARD_AMD_RADEON_RX_VEGA = 0x687f, + CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, + CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, @@ -2593,8 +2594,10 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_UHD617 = 0x87c0, CARD_INTEL_HD620 = 0x5916, - CARD_INTEL_HD630 = 0x5912, + CARD_INTEL_HD630_1 = 0x5912, + CARD_INTEL_HD630_2 = 0x591b, }; struct wined3d_fbo_ops -- 2.17.0

2 1

[PATCH] msvcrt: Add missing string declaration.
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msvcrt/string.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 0b36d2cd2c7..39a0296204a 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -60,6 +60,7 @@ char* __cdecl _strnset(char*,int,size_t); char* __cdecl _strrev(char*); char* __cdecl _strset(char*,int); char* __cdecl _strupr(char*); +errno_t __cdecl _strupr_s(char *, size_t); void* __cdecl memmove(void*,const void*,size_t); errno_t __cdecl memmove_s(void*,size_t,const void*,size_t); -- 2.17.1

1 0

[PATCH] include: Add Network Address Control defines
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/shellapi.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/shellapi.h b/include/shellapi.h index 0e7d64c7ba3..0f10690f7e0 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -496,6 +496,30 @@ HRESULT WINAPI SHQueryRecycleBinA(LPCSTR,LPSHQUERYRBINFO); HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR,LPSHQUERYRBINFO); #define SHQueryRecycleBin WINELIB_NAME_AW(SHQueryRecycleBin) +/****************************************** + * Network Address Control + */ +typedef struct tagNC_ADDRESS +{ + struct NET_ADDRESS_INFO_ *pAddrInfo; + USHORT PortNumber; + BYTE PrefixLength; +} NC_ADDRESS, *PNC_ADDRESS; + +#define NCM_GETADDRESS (WM_USER+1) +#define NCM_SETALLOWTYPE (WM_USER+2) +#define NCM_GETALLOWTYPE (WM_USER+3) +#define NCM_DISPLAYERRORTIP (WM_USER+4) + +#define NetAddr_GetAddress(hwnd,addr) \ + (HRESULT)SNDMSG(hwnd,NCM_GETADDRESS,0,(LPARAM)addr) +#define NetAddr_SetAllowType(hwnd, mask) \ + (HRESULT)SNDMSG(hwnd,NCM_SETALLOWTYPE,(WPARAM)mask,0) +#define NetAddr_GetAllowType(hwnd) \ + (DWORD)SNDMSG(hwnd,NCM_GETALLOWTYPE,0,0) +#define NetAddr_DisplayErrorTip(hwnd) \ + (HRESULT)SNDMSG(hwnd,NCM_DISPLAYERRORTIP,0,0) + /****************************************** * Misc */ -- 2.17.1

1 0

[PATCH] include: Add recovery defines
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winbase.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 3e75a4baf54..086a8b36459 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1053,6 +1053,16 @@ typedef DWORD (CALLBACK *LPPROGRESS_ROUTINE)(LARGE_INTEGER, LARGE_INTEGER, LARGE typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); +#define RECOVERY_DEFAULT_PING_INTERVAL 5000 +#define RECOVERY_MAX_PING_INTERVAL (5*60*1000) + +#define RESTART_MAX_CMD_LINE 1024 + +#define RESTART_NO_CRASH 1 +#define RESTART_NO_HANG 2 +#define RESTART_NO_PATCH 4 +#define RESTART_NO_REBOOT 8 + typedef enum _COPYFILE2_MESSAGE_TYPE { COPYFILE2_CALLBACK_NONE = 0, -- 2.17.1

1 0

[PATCH] include: Add IPreviewHandlerFrame interface declaration.
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/shobjidl.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index d459272a1dc..42ef264ed86 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3742,6 +3742,23 @@ interface IApplicationActivationManager : IUnknown [out] DWORD *processid); } +[ + object, + uuid(fec87aaf-35f9-447a-adb7-20234491401a), + pointer_default(unique) +] +interface IPreviewHandlerFrame : IUnknown +{ + typedef struct PREVIEWHANDLERFRAMEINFO + { + HACCEL haccel; + UINT cAccelEntries; + } PREVIEWHANDLERFRAMEINFO; + + HRESULT GetWindowContext([out] PREVIEWHANDLERFRAMEINFO *info); + HRESULT TranslateAccelerator([in] MSG *msg); +} + /***************************************************************************** * ShellObjects typelibrary */ -- 2.17.1

1 0

[PATCH] include: Add gesture defines
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winuser.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index abb6d5b5e9a..c4ca858a1cc 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3316,6 +3316,31 @@ typedef struct #define MSGFLT_ADD 1 #define MSGFLT_REMOVE 2 +/* Gesture */ +#define GC_PAN 0x00000001 +#define GC_PAN_WITH_SINGLE_FINGER_VERTICALLY 0x00000002 +#define GC_PAN_WITH_SINGLE_FINGER_HORIZONTALLY 0x00000004 +#define GC_PAN_WITH_GUTTER 0x00000008 +#define GC_PAN_WITH_INERTIA 0x00000010 + +#define GC_ALLGESTURES 0x00000001 +#define GC_PRESSANDTAP 0x00000001 +#define GC_ROLLOVER GC_PRESSANDTAP +#define GC_ROTATE 0x00000001 +#define GC_TWOFINGERTAP 0x00000001 +#define GC_ZOOM 0x00000001 + +#define GESTURECONFIGMAXCOUNT 256 + +#define GID_BEGIN 1 +#define GID_END 2 +#define GID_ZOOM 3 +#define GID_PAN 4 +#define GID_ROTATE 5 +#define GID_TWOFINGERTAP 6 +#define GID_PRESSANDTAP 7 +#define GID_ROLLOVER GID_PRESSANDTAP + /* ChangeWindowMessageFilterEx defines */ #define MSGFLTINFO_NONE 0 #define MSGFLTINFO_ALREADYALLOWED_FORWND 1 -- 2.17.1

1 0

[PATCH] include: Add UI_E_* defines
by Alistair Leslie-Hughes 29 Jul '19

29 Jul '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winerror.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 32680e097ce..6da5c2a7aa5 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3098,6 +3098,33 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) #define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) +#define UI_E_CREATE_FAILED _HRESULT_TYPEDEF_(0x802a0001) +#define UI_E_SHUTDOWN_CALLED _HRESULT_TYPEDEF_(0x802a0002) +#define UI_E_ILLEGAL_REENTRANCY _HRESULT_TYPEDEF_(0x802a0003) +#define UI_E_OBJECT_SEALED _HRESULT_TYPEDEF_(0x802a0004) +#define UI_E_OBJECT_SEALED _HRESULT_TYPEDEF_(0x802a0004) +#define UI_E_VALUE_NOT_SET _HRESULT_TYPEDEF_(0x802a0005) +#define UI_E_VALUE_NOT_DETERMINED _HRESULT_TYPEDEF_(0x802a0006) +#define UI_E_INVALID_OUTPUT _HRESULT_TYPEDEF_(0x802a0007) +#define UI_E_BOOLEAN_EXPECTED _HRESULT_TYPEDEF_(0x802a0008) +#define UI_E_DIFFERENT_OWNER _HRESULT_TYPEDEF_(0x802a0009) +#define UI_E_AMBIGUOUS_MATCH _HRESULT_TYPEDEF_(0x802a000a) +#define UI_E_FP_OVERFLOW _HRESULT_TYPEDEF_(0x802a000b) +#define UI_E_WRONG_THREAD _HRESULT_TYPEDEF_(0x802a000c) +#define UI_E_STORYBOARD_ACTIVE _HRESULT_TYPEDEF_(0x802a0101) +#define UI_E_STORYBOARD_NOT_PLAYING _HRESULT_TYPEDEF_(0x802a0102) +#define UI_E_START_KEYFRAME_AFTER_END _HRESULT_TYPEDEF_(0x802a0103) +#define UI_E_END_KEYFRAME_NOT_DETERMINED _HRESULT_TYPEDEF_(0x802a0104) +#define UI_E_LOOPS_OVERLAP _HRESULT_TYPEDEF_(0x802a0105) +#define UI_E_TRANSITION_ALREADY_USED _HRESULT_TYPEDEF_(0x802a0106) +#define UI_E_TRANSITION_NOT_IN_STORYBOARD _HRESULT_TYPEDEF_(0x802a0107) +#define UI_E_TRANSITION_ECLIPSED _HRESULT_TYPEDEF_(0x802a0108) +#define UI_E_TIME_BEFORE_LAST_UPDATE _HRESULT_TYPEDEF_(0x802a0109) +#define UI_E_TIMER_CLIENT_ALREADY_CONNECTED _HRESULT_TYPEDEF_(0x802a010a) +#define UI_E_INVALID_DIMENSION _HRESULT_TYPEDEF_(0x802a010b) +#define UI_E_PRIMITIVE_OUT_OF_BOUNDS _HRESULT_TYPEDEF_(0x802a010c) +#define UI_E_WINDOW_CLOSED _HRESULT_TYPEDEF_(0x802a0201) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.1

1 0

← Newer
1
2
3
4
5
6
7
8
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2019