wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Józef Kucia : vkd3d-shader: Use SPIR-V built-ins for hull shader inputs.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: vkd3d Branch: master Commit: 7fc98ade64e0fd55c956b0f86067e903f851f492 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7fc98ade64e0fd55c956b0f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 5 18:17:01 2019 +0100 vkd3d-shader: Use SPIR-V built-ins for hull shader inputs. I missed this case before because apps don't seem to use SV_Position for hull shader inputs. vkd3d_siv_from_sysval() needs to be restored for hull shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb74400..c8e0c37 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -129,6 +129,20 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } +static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) +{ + switch (sysval) + { + case VKD3D_SV_NONE: + return VKD3D_SIV_NONE; + case VKD3D_SV_POSITION: + return VKD3D_SIV_POSITION; + default: + FIXME("Unhandled sysval %#x.\n", sysval); + return VKD3D_SIV_NONE; + } +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -3590,6 +3604,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi return 0; } + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && !sysval && signature_element->sysval_semantic) + sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask);

1 0

Józef Kucia : vkd3d-shader: Take into account dst write mask for scalar stores.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: vkd3d Branch: master Commit: 67a160683d4129630760d231751772a3085b32aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=67a160683d4129630760d23… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 5 18:17:00 2019 +0100 vkd3d-shader: Take into account dst write mask for scalar stores. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index de4c683..bb74400 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2933,6 +2933,7 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); + component_idx -= vkd3d_write_mask_get_component_idx(dst_write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, dst_id, index, ARRAY_SIZE(index)); }

1 0

Józef Kucia : tests: Get rid of vk_driver_id static variable.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: vkd3d Branch: master Commit: 702cdccf53b564fe6e592173d4a2b0d98b6afe09 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=702cdccf53b564fe6e59217… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 5 18:16:59 2019 +0100 tests: Get rid of vk_driver_id static variable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 62 +++++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 082118f..ae49bf4 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -358,8 +358,8 @@ static inline bool is_radv_device(ID3D12Device *device) { return false; } + #else -static VkDriverIdKHR vk_driver_id; static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) { @@ -491,26 +491,20 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } -static void init_adapter_info(void) +static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceDriverPropertiesKHR *driver_properties) { PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; - VkPhysicalDeviceDriverPropertiesKHR driver_properties; VkPhysicalDeviceProperties2 device_properties2; VkPhysicalDevice vk_physical_device; - struct vkd3d_instance *instance; - ID3D12Device *device; - HRESULT hr; - - if (FAILED(hr = create_vkd3d_instance(&instance))) - return; - if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) - goto done; + memset(driver_properties, 0, sizeof(*driver_properties)); + driver_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; vk_physical_device = vkd3d_get_vk_physical_device(device); if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) { + struct vkd3d_instance *instance = vkd3d_instance_from_device(device); VkInstance vk_instance = vkd3d_instance_get_vk_instance(instance); pfn_vkGetPhysicalDeviceProperties2KHR @@ -519,19 +513,32 @@ static void init_adapter_info(void) memset(&device_properties2, 0, sizeof(device_properties2)); device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - device_properties2.pNext = &driver_properties; - memset(&driver_properties, 0, sizeof(driver_properties)); - driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + device_properties2.pNext = driver_properties; pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + return true; + } - trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + return false; +} - vk_driver_id = driver_properties.driverID; - } +static void init_adapter_info(void) +{ + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + struct vkd3d_instance *instance; + ID3D12Device *device; + HRESULT hr; + + if (FAILED(hr = create_vkd3d_instance(&instance))) + return; + + if (SUCCEEDED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + { + if (get_driver_properties(device, &driver_properties)) + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); - ID3D12Device_Release(device); + ID3D12Device_Release(device); + } -done: vkd3d_instance_decref(instance); } @@ -542,18 +549,27 @@ static inline bool is_amd_windows_device(ID3D12Device *device) static inline bool is_mesa_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR - || vk_driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR + || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } static inline bool is_nvidia_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; } static inline bool is_radv_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR; } #endif

1 0

Józef Kucia : tests: Implement --adapter option for Vulkan tests.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: vkd3d Branch: master Commit: 68222e458d20344bd52763fbe8de4a6078f0954f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68222e458d20344bd52763f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 5 18:16:58 2019 +0100 tests: Implement --adapter option for Vulkan tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 208 +++++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=68222e458d20344bd52…

1 0

Józef Kucia : vkd3d: Add feature level 11_1.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: vkd3d Branch: master Commit: f640602ce8c2bcc4d50bc8cfbda32115ccee6403 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f640602ce8c2bcc4d50bc8c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 5 18:16:57 2019 +0100 vkd3d: Add feature level 11_1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/device.c | 34 ++++++++++++++++++++++++++++------ libs/vkd3d/utils.c | 5 ----- libs/vkd3d/vkd3d_main.c | 6 ------ libs/vkd3d/vkd3d_private.h | 3 ++- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index a1f87b2..5387414 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -45,6 +45,7 @@ const UINT D3D12_DEFAULT_STENCIL_WRITE_MASK = 0xff; const UINT D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND = 0xffffffff; cpp_quote("#define D3D12_FLOAT32_MAX (3.402823466e+38f)") const UINT D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D12_UAV_SLOT_COUNT = 64; const UINT D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_MIP_LEVELS = 15; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 193a36c..fa59593 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -853,9 +853,11 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 } } -static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_info *vk_info, +static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, const VkPhysicalDeviceFeatures *features) { + bool have_11_0 = true; + #define CHECK_MIN_REQUIREMENT(name, value) \ if (vk_info->device_limits.name < value) \ WARN(#name " does not meet feature level 11_0 requirements.\n"); @@ -864,7 +866,10 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ WARN(#name " does not meet feature level 11_0 requirements.\n"); #define CHECK_FEATURE(name) \ if (!features->name) \ - WARN(#name " is not supported.\n"); + { \ + WARN(#name " is not supported.\n"); \ + have_11_0 = false; \ + } CHECK_MIN_REQUIREMENT(maxPushConstantsSize, D3D12_MAX_ROOT_COST * sizeof(uint32_t)); CHECK_MIN_REQUIREMENT(maxComputeSharedMemorySize, D3D12_CS_TGSM_REGISTER_COUNT * sizeof(uint32_t)); @@ -906,6 +911,17 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ #undef CHECK_MIN_REQUIREMENT #undef CHECK_MAX_REQUIREMENT #undef CHECK_FEATURE + + vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_0; + + if (have_11_0 + && features->logicOp + && features->vertexPipelineStoresAndAtomics + && vk_info->device_limits.maxPerStageDescriptorStorageBuffers >= D3D12_UAV_SLOT_COUNT + && vk_info->device_limits.maxPerStageDescriptorStorageImages >= D3D12_UAV_SLOT_COUNT) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_1; + + TRACE("Max feature level: %#x.\n", vk_info->max_feature_level); } static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, @@ -1030,12 +1046,17 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->vertex_attrib_zero_divisor = false; } - vkd3d_check_feature_level_11_requirements(vulkan_info, features); + vkd3d_free(vk_extensions); + + vkd3d_init_feature_level(vulkan_info, features); + if (vulkan_info->max_feature_level < create_info->minimum_feature_level) + { + WARN("Feature level %#x is not supported.\n", create_info->minimum_feature_level); + return E_INVALIDARG; + } features->shaderTessellationAndGeometryPointSize = VK_FALSE; - vkd3d_free(vk_extensions); - return S_OK; } @@ -1874,6 +1895,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * case D3D12_FEATURE_FEATURE_LEVELS: { + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; D3D12_FEATURE_DATA_FEATURE_LEVELS *data = feature_data; unsigned int i; @@ -1889,7 +1911,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * for (i = 0; i < data->NumFeatureLevels; ++i) { D3D_FEATURE_LEVEL fl = data->pFeatureLevelsRequested[i]; - if (data->MaxSupportedFeatureLevel < fl && check_feature_level_support(fl)) + if (data->MaxSupportedFeatureLevel < fl && fl <= vulkan_info->max_feature_level) data->MaxSupportedFeatureLevel = fl; } return S_OK; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 666319e..1c10450 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -245,11 +245,6 @@ bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) return false; } -bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) -{ - return feature_level <= D3D_FEATURE_LEVEL_11_0; -} - bool is_write_resource_state(D3D12_RESOURCE_STATES state) { return state & (D3D12_RESOURCE_STATE_RENDER_TARGET diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index c65a4ab..5e93a2a 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -55,12 +55,6 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, return E_INVALIDARG; } - if (!check_feature_level_support(create_info->minimum_feature_level)) - { - FIXME("Unsupported feature level %#x.\n", create_info->minimum_feature_level); - return E_INVALIDARG; - } - if ((instance = create_info->instance)) { vkd3d_instance_incref(instance); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fa2c460..3292e31 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -100,6 +100,8 @@ struct vkd3d_vulkan_info VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; + + D3D_FEATURE_LEVEL max_feature_level; }; struct vkd3d_instance @@ -994,7 +996,6 @@ VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *d VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; -bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN;

1 0

Józef Kucia : vkd3d: Rework Vulkan queues initialisation.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: vkd3d Branch: master Commit: 38e3c5d2d3d97d060e274041ee3c142a3af3f048 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=38e3c5d2d3d97d060e27404… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 5 18:16:56 2019 +0100 vkd3d: Rework Vulkan queues initialisation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 227 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 132 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=38e3c5d2d3d97d060e2…

1 0

Zebediah Figura : oleaut32: Unify the typelib and dispatch proxy/ stub factories.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: 968eda4b183ddde5401a2db5d52de7e6aceb5dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=968eda4b183ddde5401a2db5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 11:26:56 2019 -0600 oleaut32: Unify the typelib and dispatch proxy/stub factories. Both seem to be able to handle either kind of interface on Windows. f72f8e5c4 was not enough, since the IDispatch proxy/stub factory delegates to the typelib proxy/stub factory if the IID is not IDispatch. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 155 ++++++++++++++++++----------------------- dlls/oleaut32/tests/tmarshal.c | 35 +++++++++- 2 files changed, 102 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=968eda4b183ddde5401a…

1 0

Isira Seneviratne : kernel32/nls: Fix some values in Sinhala NLS file.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: a6ca2001eb36bcad8e09edffce4d18aa73914208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ca2001eb36bcad8e09edff… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Mon Mar 4 04:19:18 2019 +0530 kernel32/nls: Fix some values in Sinhala NLS file. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 8a96aa7..36dd281 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -43,11 +43,11 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "045B" - LOCALE_ILDATE "1" + LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" - LOCALE_INEGCURR "12" + LOCALE_INEGCURR "1" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" LOCALE_INEGSIGNPOSN "4"

1 0

Piotr Caban : kernel32/tests: Show that PAGE_WRITECOPY permission changes only on modified pages.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: 2ee8554a0ae53597234c2b5fa6a95124d2dedeab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee8554a0ae53597234c2b5f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 18:41:16 2019 +0100 kernel32/tests: Show that PAGE_WRITECOPY permission changes only on modified pages. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 78bc17a..4749556 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3945,7 +3945,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) for (i = 0; i < ARRAY_SIZE(page_prot); i++) { SetLastError(0xdeadbeef); - hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, 2*si.dwPageSize, NULL); if (readonly && (page_prot[i] == PAGE_READWRITE || page_prot[i] == PAGE_EXECUTE_READ || page_prot[i] == PAGE_EXECUTE_READWRITE || page_prot[i] == PAGE_EXECUTE_WRITECOPY)) @@ -4062,7 +4062,8 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); ok(info.BaseAddress == base, "%d: (%04x) got %p, expected %p\n", j, view[j].access, info.BaseAddress, base); - ok(info.RegionSize == si.dwPageSize, "%d: (%04x) got %#lx != expected %#x\n", j, view[j].access, info.RegionSize, si.dwPageSize); + ok(info.RegionSize == 2*si.dwPageSize || (info.RegionSize == si.dwPageSize && (sec_flags & SEC_IMAGE)), + "%d: (%04x) got %#lx != expected %#x\n", j, view[j].access, info.RegionSize, 2*si.dwPageSize); if (sec_flags & SEC_IMAGE) ok(info.Protect == PAGE_READONLY, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); @@ -4177,7 +4178,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) if (!anon_mapping && is_compatible_protection(alloc_prot, PAGE_WRITECOPY)) { - ret = VirtualProtect(base, si.dwPageSize, PAGE_WRITECOPY, &old_prot); + ret = VirtualProtect(base, sec_flags & SEC_IMAGE ? si.dwPageSize : 2*si.dwPageSize, PAGE_WRITECOPY, &old_prot); todo_wine_if(readonly && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x\n", GetLastError(), page_prot[i], view[j].prot); if (ret) *(DWORD*)base = 0xdeadbeef; @@ -4186,10 +4187,22 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) todo_wine ok(info.Protect == PAGE_READWRITE, "VirtualProtect wrong prot, map %#x, view %#x got %#x\n", page_prot[i], view[j].prot, info.Protect ); + todo_wine_if (!(sec_flags & SEC_IMAGE)) + ok(info.RegionSize == si.dwPageSize, "wrong region size %#lx after write, map %#x, view %#x got %#x\n", + info.RegionSize, page_prot[i], view[j].prot, info.Protect ); prev_prot = info.Protect; alloc_prot = info.AllocationProtect; + if (!(sec_flags & SEC_IMAGE)) + { + ret = VirtualQuery((char*)base + si.dwPageSize, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine_if(readonly && view[j].prot != PAGE_WRITECOPY) + ok(info.Protect == PAGE_WRITECOPY, "wrong prot, map %#x, view %#x got %#x\n", + page_prot[i], view[j].prot, info.Protect); + } + for (k = 0; k < ARRAY_SIZE(page_prot); k++) { DWORD actual_prot = (sec_flags & SEC_IMAGE) ? map_prot_no_write(page_prot[k]) : page_prot[k]; @@ -4244,7 +4257,7 @@ static void test_mappings(void) hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); - SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); + SetFilePointer(hfile, 2*si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); test_mapping( hfile, SEC_COMMIT, FALSE );

1 0

Zebediah Figura : quartz/tests: Add some tests for WAVE parser media types.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: 130c9b34455ac50811b80184b94124eaffc63139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=130c9b34455ac50811b80184… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 5 10:57:01 2019 -0600 quartz/tests: Add some tests for WAVE parser media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/waveparser.c | 120 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index f9d9fe5..7022131 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -432,6 +432,125 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const WAVEFORMATEX expect_wfx = {WAVE_FORMAT_PCM, 1, 44100, 44100, 1, 8, 0}; + + const WCHAR *filename = load_resource(wavefile); + IBaseFilter *filter = create_wave_parser(); + AM_MEDIA_TYPE mt = {{0}}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_WAVE; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_VideoInfo; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_WAVE; + + graph = connect_input(filter, filename); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_WAVE; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(waveparser) { CoInitialize(NULL); @@ -440,6 +559,7 @@ START_TEST(waveparser) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); CoUninitialize(); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019