June 2019 - Wine-Commits - list.winehq.org

Józef Kucia : vkd3d: Use sparse resources for emulating NULL UAVs.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: vkd3d Branch: master Commit: 9f49174f408d42ac73616a4aef9e78f4ff52b140 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9f49174f408d42ac73616a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 5 13:02:23 2019 +0200 vkd3d: Use sparse resources for emulating NULL UAVs. If residencyNonResidentStrict is supported. 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 | 7 ++++ libs/vkd3d/resource.c | 112 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 79 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9f49174f408d42ac736…

1 0

Józef Kucia : vkd3d: Add initial checks for feature levels 12_0+.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: vkd3d Branch: master Commit: 068851b159db40209b78e78bbebbde93ec6596af URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=068851b159db40209b78e78… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 5 13:02:24 2019 +0200 vkd3d: Add initial checks for feature levels 12_0+. 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 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 06b5821..a9610ff 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1090,7 +1090,8 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 } static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, - const VkPhysicalDeviceFeatures *features) + const VkPhysicalDeviceFeatures *features, + const D3D12_FEATURE_DATA_D3D12_OPTIONS *d3d12_options) { bool have_11_0 = true; @@ -1158,12 +1159,24 @@ static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_0; if (have_11_0 - && features->logicOp + && d3d12_options->OutputMergerLogicOp && 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; + /* TODO: MinMaxFiltering */ + if (vk_info->max_feature_level >= D3D_FEATURE_LEVEL_11_1 + && d3d12_options->TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_2 + && d3d12_options->ResourceBindingTier >= D3D12_RESOURCE_BINDING_TIER_2 + && d3d12_options->TypedUAVLoadAdditionalFormats) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_12_0; + + if (vk_info->max_feature_level >= D3D_FEATURE_LEVEL_12_0 + && d3d12_options->ROVsSupported + && d3d12_options->ConservativeRasterizationTier >= D3D12_CONSERVATIVE_RASTERIZATION_TIER_1) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_12_1; + TRACE("Max feature level: %#x.\n", vk_info->max_feature_level); } @@ -1333,7 +1346,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_free(vk_extensions); - vkd3d_init_feature_level(vulkan_info, features); + vkd3d_init_feature_level(vulkan_info, features, &device->feature_options); if (vulkan_info->max_feature_level < create_info->minimum_feature_level) { WARN("Feature level %#x is not supported.\n", create_info->minimum_feature_level);

1 0

Józef Kucia : vkd3d: Implement d3d12_device_CreateReservedResource().
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: vkd3d Branch: master Commit: 71ad8836723052bf0c124488bd3a23c8a79d35aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=71ad8836723052bf0c12448… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 5 13:02:21 2019 +0200 vkd3d: Implement d3d12_device_CreateReservedResource(). 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 | 18 ++++--- libs/vkd3d/resource.c | 129 ++++++++++++++++++++++++++++++++++++--------- libs/vkd3d/vkd3d_private.h | 3 ++ 3 files changed, 119 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=71ad8836723052bf0c1…

1 0

Józef Kucia : tests: Add test for creating reserved resources.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: vkd3d Branch: master Commit: 80b749e703aff534f042559d0d4d74cbd5cf46be URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=80b749e703aff534f042559… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 5 13:02:22 2019 +0200 tests: Add test for creating reserved resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d6cd4e0..04ee7be 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -616,6 +616,36 @@ static bool is_min_max_filtering_supported(ID3D12Device *device) return options.TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_2; } +static D3D12_TILED_RESOURCES_TIER get_tiled_resources_tier(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED; + } + + return options.TiledResourcesTier; +} + +static bool is_standard_swizzle_64kb_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.StandardSwizzle64KBSupported; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -2126,6 +2156,138 @@ static void test_create_placed_resource(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_reserved_resource(void) +{ + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + D3D12_CLEAR_VALUE clear_value; + D3D12_HEAP_FLAGS heap_flags; + ID3D12Resource *resource; + bool standard_swizzle; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + if (get_tiled_resources_tier(device) == D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED) + { + skip("Tiled resources are not supported.\n"); + goto done; + } + + standard_swizzle = is_standard_swizzle_64kb_supported(device); + trace("Standard swizzle 64KB: %#x.\n", standard_swizzle); + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = 0; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr); + + check_interface(resource, &IID_ID3D12Object, TRUE); + check_interface(resource, &IID_ID3D12DeviceChild, TRUE); + check_interface(resource, &IID_ID3D12Pageable, TRUE); + check_interface(resource, &IID_ID3D12Resource, TRUE); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); + ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + + heap_flags = 0xdeadbeef; + hr = ID3D12Resource_GetHeapProperties(resource, &heap_properties, &heap_flags); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(heap_flags == 0xdeadbeef, "Got unexpected heap flags %#x.\n", heap_flags); + + refcount = ID3D12Resource_Release(resource); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + + /* The clear value must be NULL for buffers. */ + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* D3D12_TEXTURE_LAYOUT_ROW_MAJOR must be used for buffers. */ + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE must be used for textures. */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 64; + resource_desc.Height = 64; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 4; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; + resource_desc.Flags = 0; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr); + refcount = ID3D12Resource_Release(resource); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.MipLevels = 1; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == (standard_swizzle ? S_OK : E_INVALIDARG) || broken(use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + +done: + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_descriptor_heap(void) { D3D12_DESCRIPTOR_HEAP_DESC heap_desc; @@ -29603,6 +29765,7 @@ START_TEST(d3d12) run_test(test_create_committed_resource); run_test(test_create_heap); run_test(test_create_placed_resource); + run_test(test_create_reserved_resource); run_test(test_create_descriptor_heap); run_test(test_create_sampler); run_test(test_create_unordered_access_view);

1 0

Stefan Dösinger : include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 7d77d330a5b60be918dbf17d9d9ca357d93bff29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d77d330a5b60be918dbf17d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 4 16:27:28 2019 +0200 include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL. Fixes building this .idl file with midl.exe. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d12.idl b/include/d3d12.idl index 307a4fd..201e01f 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -1300,8 +1300,8 @@ typedef enum D3D12_COLOR_WRITE_ENABLE D3D12_COLOR_WRITE_ENABLE_GREEN = 0x2, D3D12_COLOR_WRITE_ENABLE_BLUE = 0x4, D3D12_COLOR_WRITE_ENABLE_ALPHA = 0x8, - D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED\ - | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE\ + D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED + | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE | D3D12_COLOR_WRITE_ENABLE_ALPHA), } D3D12_COLOR_WRITE_ENABLE;

1 0

Piotr Caban : msvcp: Add _Strxfrm implementation.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 1ad48d1b3c94e41fe24dd0d82bd252f5e6b3d380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ad48d1b3c94e41fe24dd0d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 21:51:57 2019 +0200 msvcp: Add _Strxfrm implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 39 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 23 ++++++++++++++++++++++ 12 files changed, 72 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 2ae4e4c..d650ff8 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2958,7 +2958,7 @@ @ cdecl -ret64 _Stoullx(ptr ptr long ptr) @ cdecl _Stoulx(ptr ptr long ptr) @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Towlower(long ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 5f2b664..128ec68 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3854,7 +3854,7 @@ @ cdecl _Stoulx(ptr ptr long ptr) @ stub _Stoxflt @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index c2a2d7e..c8a6b91 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3801,7 +3801,7 @@ @ cdecl _Stoulx(ptr ptr long ptr) @ stub _Stoxflt @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index cece375..99c7a57 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3801,7 +3801,7 @@ @ cdecl _Stoulx(ptr ptr long ptr) msvcp120._Stoulx @ stub _Stoxflt @ cdecl _Strcoll(ptr ptr ptr ptr ptr) msvcp120._Strcoll -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) msvcp120._Strxfrm @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl -norelay _Thrd_current() msvcp120._Thrd_current diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 8d2f43b..f83e440 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3715,7 +3715,7 @@ @ cdecl -ret64 _Stoullx(ptr ptr long ptr) _Stoullx @ cdecl _Stoulx(ptr ptr long ptr) _Stoulx @ cdecl _Strcoll(ptr ptr ptr ptr ptr) _Strcoll -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get @ cdecl _Temp_get(ptr) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 196ac6a..5561297 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4302,7 +4302,7 @@ @ cdecl _Stof(ptr ptr long) @ cdecl _Stold(ptr ptr long) _Stod @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index b7c97a3..f07c622 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5090,7 +5090,7 @@ @ cdecl _Stof(ptr ptr long) @ cdecl _Stold(ptr ptr long) _Stod @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Wcrtomb(ptr long ptr ptr) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index ff6de62..4229023 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5146,7 +5146,7 @@ @ cdecl _Stof(ptr ptr long) @ cdecl _Stold(ptr ptr long) _Stod @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Towlower(long ptr) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 43e179e..83b927a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5772,7 +5772,7 @@ @ cdecl _Stoulx(ptr ptr long ptr) @ stub _Stoxflt @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Towlower(long ptr) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ee14640..7b84874 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -32,6 +32,7 @@ #include "winbase.h" #include "winnls.h" #include "msvcp90.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" @@ -12664,6 +12665,44 @@ int __cdecl _To_wide(const char *src, wchar_t *dst) return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); } +MSVCP_size_t __cdecl _Strxfrm(char *dest, char *dest_end, const char *src, const char *src_end, _Collvec *coll) +{ + MSVCP_size_t dest_len = dest_end - dest; + MSVCP_size_t src_len = src_end - src; + _Collvec cv; + WCHAR *buf; + LCID lcid; + int len; + + TRACE("(%p %p %p %p %p)\n", dest, dest_end, src, src_end, coll); + + if (coll) cv = *coll; + else getcoll(&cv); + +#if _MSVCP_VER < 110 + lcid = cv.handle; +#else + lcid = LocaleNameToLCID(cv.lc_name, 0); +#endif + + if (!lcid && !cv.page) + { + if (src_len > dest_len) return src_len; + memcpy(dest, src, src_len); + return src_len; + } + + len = MultiByteToWideChar(cv.page, MB_ERR_INVALID_CHARS, src, src_len, NULL, 0); + if (!len) return 0; + buf = heap_alloc(len * sizeof(WCHAR)); + if (!buf) return 0; + MultiByteToWideChar(cv.page, MB_ERR_INVALID_CHARS, src, src_len, buf, len); + + len = LCMapStringW(lcid, LCMAP_SORTKEY, buf, len, (WCHAR*)dest, dest_len); + heap_free(buf); + return len; +} + DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@") diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2c1c0d7..e437c50 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6547,7 +6547,7 @@ @ cdecl -ret64 _Stoullx(ptr ptr long ptr) @ cdecl _Stoulx(ptr ptr long ptr) @ cdecl _Strcoll(ptr ptr ptr ptr ptr) -@ stub _Strxfrm +@ cdecl _Strxfrm(ptr ptr ptr ptr ptr) @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Towlower(long ptr) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 34a533a..d700b6d 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -105,6 +105,7 @@ static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); +static size_t (__cdecl *p__Strxfrm)(char*, char*, const char*, const char*, const MSVCP__Collvec*); #undef __thiscall #ifdef __i386__ @@ -248,6 +249,7 @@ static BOOL init(void) SET(p__Getcoll, "_Getcoll"); SET(p_wctrans, "wctrans"); SET(p_towctrans, "towctrans"); + SET(p__Strxfrm, "_Strxfrm"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"); SET(p_std_Ctraits_float__Isnan, "?_Isnan@?$_Ctraits(a)M@std@@SA_NM(a)Z"); @@ -1088,6 +1090,26 @@ static void test_raise_handler(void) *p_Raise_handler = NULL; } +static void test__Strxfrm(void) +{ + const char in[] = "abc"; + + MSVCP__Collvec coll; + char out[64]; + size_t ret; + + memset(&coll, 0, sizeof(coll)); + + out[0] = 'z'; + ret = p__Strxfrm(out, out + 1, in, in + 2, &coll); + ok(ret == 2, "ret = %d\n", (int)ret); + ok(out[0] == 'z', "out[0] = %x\n", out[0]); + + ret = p__Strxfrm(out, out + sizeof(out), in, in + 4, &coll); + ok(ret == 4, "ret = %d\n", (int)ret); + ok(!strcmp(in, out), "out = %s\n", out); +} + START_TEST(misc) { if(!init()) @@ -1108,6 +1130,7 @@ START_TEST(misc) test_vbtable_size_exports(); test_locale__Locimp__Locimp_Addfac(); test_raise_handler(); + test__Strxfrm(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Michael Stefaniuc : dbghelp: Fix the spelling of a parameter.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 594a5878d0ac3b5a3aa31c27b0651b7f4bd175e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594a5878d0ac3b5a3aa31c27… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 4 20:28:21 2019 +0200 dbghelp: Fix the spelling of a parameter. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cfbb586..d9d8417 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -334,16 +334,15 @@ static struct module* module_get_container(const struct process* pcs, * module_get_containee * */ -struct module* module_get_containee(const struct process* pcs, - const struct module* outter) +struct module* module_get_containee(const struct process* pcs, const struct module* outer) { struct module* module; - + for (module = pcs->lmodules; module; module = module->next) { - if (module != outter && - outter->module.BaseOfImage <= module->module.BaseOfImage && - outter->module.BaseOfImage + outter->module.ImageSize >= + if (module != outer && + outer->module.BaseOfImage <= module->module.BaseOfImage && + outer->module.BaseOfImage + outer->module.ImageSize >= module->module.BaseOfImage + module->module.ImageSize) return module; }

1 0

Michael Stefaniuc : mshtml: Print the debug strings and not the pointers to them.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: f38c066561efb4995f47cbcf615488930140a92f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38c066561efb4995f47cbcf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 4 20:28:20 2019 +0200 mshtml: Print the debug strings and not the pointers to them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 87147df..ba29b56 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -1176,7 +1176,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjec HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); RECT r; - TRACE("(%p)->(%p %p)\n", This, wine_dbgstr_rect(pos), wine_dbgstr_rect(clip)); + TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_rect(pos), wine_dbgstr_rect(clip)); if(clip && !EqualRect(clip, pos)) FIXME("Ignoring clip rect %s\n", wine_dbgstr_rect(clip));

1 0

Michael Stefaniuc : winedbg: Fix the spelling of a comment.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: 12e085d7e60370b5284c2040150480ec296e8653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12e085d7e60370b5284c2040… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 4 20:28:23 2019 +0200 winedbg: Fix the spelling of a comment. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index f3585f2..053ace9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -491,7 +491,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) WideCharToMultiByte(CP_ACP, 0, ptr, -1, tmp, sizeof(tmp), NULL, NULL); HeapFree(GetProcessHeap(), 0, ptr); dbg_printf("%s", tmp); - count = 0; /* so that we'll get away from outter loop */ + count = 0; /* so that we'll get away from outer loop */ break; } }

1 0

Zebediah Figura : winebus.sys: Just report the bus ID when enumerating compatible IDs.
by Alexandre Julliard June 4, 2019

June 4, 2019

Module: wine Branch: master Commit: e83fd91d5ff08045697398ecf131e0abe6d6f3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e83fd91d5ff08045697398ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 12:45:22 2019 -0500 winebus.sys: Just report the bus ID when enumerating compatible IDs. It's the only one we actually match against. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 291ec74..7207e14 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -195,33 +195,14 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - WCHAR *iid, *did, *dst, *ptr; - DWORD len; - - if (!(iid = get_instance_id(device))) - return NULL; - - if (!(did = get_device_id(device))) - { - HeapFree(GetProcessHeap(), 0, iid); - return NULL; - } + WCHAR *dst; - len = strlenW(iid) + strlenW(did) + strlenW(ext->busid) + 4; - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) { - ptr = dst; - strcpyW(ptr, iid); - ptr += strlenW(iid) + 1; - strcpyW(ptr, did); - ptr += strlenW(did) + 1; - strcpyW(ptr, ext->busid); - ptr += strlenW(ext->busid) + 1; - *ptr = 0; + strcpyW(dst, ext->busid); + dst[strlenW(dst) + 1] = 0; } - HeapFree(GetProcessHeap(), 0, iid); - HeapFree(GetProcessHeap(), 0, did); return dst; }

1 0