May 2022 - Wine-commits - list.winehq.org

Dmitry Timoshkov : d2d1/tests: Add some tests for bitmap mapping.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 991eb2be4e62cb5c4fd94888793bf26910a90035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=991eb2be4e62cb5c4fd94888… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 27 12:22:57 2022 +0300 d2d1/tests: Add some tests for bitmap mapping. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5fa6f26e4d..0319b146ff2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11584,6 +11584,211 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + static const struct + { + unsigned int options; + } invalid_map_options[] = + { + { D2D1_BITMAP_OPTIONS_NONE }, + { D2D1_BITMAP_OPTIONS_TARGET }, + { D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_TARGET }, + { D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE }, + }; + static const struct + { + unsigned int options; + } valid_map_options[] = + { + { D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ }, + }; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + D3D11_TEXTURE2D_DESC texture_desc; + struct d2d1_test_context ctx; + D2D1_MAPPED_RECT mapped_rect; + ID3D11Device *d3d_device; + ID3D11Texture2D *texture; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_SIZE_U size; + unsigned int i; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + for (i = 0; i < ARRAY_SIZE(invalid_map_options); ++i) + { + winetest_push_context("Test %u", i); + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = invalid_map_options[i].options; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D11Texture2D_GetDesc(texture, &texture_desc); + ok(!texture_desc.CPUAccessFlags, "Unexpected CPU access flags %#x.\n", texture_desc.CPUAccessFlags); + ID3D11Texture2D_Release(texture); + IDXGISurface_Release(surface); + + ID2D1Bitmap1_Release(bitmap); + + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(valid_map_options); ++i) + { + winetest_push_context("Test %u", i); + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = valid_map_options[i].options; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + todo_wine + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Unmap(bitmap); + todo_wine + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D11Texture2D_GetDesc(texture, &texture_desc); + todo_wine + ok(texture_desc.Usage == D3D11_USAGE_STAGING, "Unexpected usage %u.\n", texture_desc.Usage); + ok(!texture_desc.BindFlags, "Unexpected bind flags %#x.\n", texture_desc.BindFlags); + todo_wine + ok(texture_desc.CPUAccessFlags == D3D11_CPU_ACCESS_READ, "Unexpected CPU access flags %#x.\n", + texture_desc.CPUAccessFlags); + ok(!texture_desc.MiscFlags, "Unexpected misc flags %#x.\n", texture_desc.MiscFlags); + ID3D11Texture2D_Release(texture); + IDXGISurface_Release(surface); + + ID2D1Bitmap1_Release(bitmap); + + winetest_pop_context(); + } + + hr = IDXGIDevice_QueryInterface(ctx.device, &IID_ID3D11Device, (void **)&d3d_device); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Unmap(bitmap); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Unmap(bitmap); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_READ, &mapped_rect); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Unmap(bitmap); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + ID3D11Texture2D_Release(texture); + IDXGISurface_Release(surface); + + ID3D11Device_Release(d3d_device); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11660,6 +11865,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); }

1 0

Nikolay Sivov : d2d1/tests: Add some tests for invalid bitmap options.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 9cdf2a6e90bab3888d548733645d20a2d61137b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cdf2a6e90bab3888d548733… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 13:09:36 2022 +0300 d2d1/tests: Add some tests for invalid bitmap options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0319b146ff2..e8f07976d54 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11789,6 +11789,50 @@ static void test_bitmap_map(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_create(BOOL d3d11) +{ + static const struct + { + unsigned int options; + } invalid_options[] = + { + { D2D1_BITMAP_OPTIONS_CANNOT_DRAW }, + { D2D1_BITMAP_OPTIONS_CPU_READ }, + { D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE }, + }; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d1_test_context ctx; + ID2D1Bitmap1 *bitmap; + D2D1_SIZE_U size; + unsigned int i; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + for (i = 0; i < ARRAY_SIZE(invalid_options); ++i) + { + winetest_push_context("Test %u", i); + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = invalid_options[i].options; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ID2D1Bitmap1_Release(bitmap); + + winetest_pop_context(); + } + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11866,6 +11910,7 @@ START_TEST(d2d1) queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map); + queue_test(test_bitmap_create); run_queued_tests(); }

1 0

Nikolay Sivov : d2d1: Create staging texture with read access for bitmaps with D2D1_BITMAP_OPTIONS_CPU_READ.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: a95ed154470649a3518ff6ce7f287205f503453f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a95ed154470649a3518ff6ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 13:17:22 2022 +0300 d2d1: Create staging texture with read access for bitmaps with D2D1_BITMAP_OPTIONS_CPU_READ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 4 ++++ dlls/d2d1/tests/d2d1.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 971e3c7ff6b..8386f703b46 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -374,12 +374,16 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; + if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_CPU_READ) + texture_desc.Usage = D3D11_USAGE_STAGING; texture_desc.BindFlags = 0; if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_TARGET) texture_desc.BindFlags |= D3D11_BIND_RENDER_TARGET; if (!(desc->bitmapOptions & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) texture_desc.BindFlags |= D3D11_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; + if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_CPU_READ) + texture_desc.CPUAccessFlags |= D3D11_CPU_ACCESS_READ; texture_desc.MiscFlags = 0; if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE) texture_desc.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e8f07976d54..0069cf746bb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11709,10 +11709,8 @@ static void test_bitmap_map(BOOL d3d11) hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11Texture2D_GetDesc(texture, &texture_desc); - todo_wine ok(texture_desc.Usage == D3D11_USAGE_STAGING, "Unexpected usage %u.\n", texture_desc.Usage); ok(!texture_desc.BindFlags, "Unexpected bind flags %#x.\n", texture_desc.BindFlags); - todo_wine ok(texture_desc.CPUAccessFlags == D3D11_CPU_ACCESS_READ, "Unexpected CPU access flags %#x.\n", texture_desc.CPUAccessFlags); ok(!texture_desc.MiscFlags, "Unexpected misc flags %#x.\n", texture_desc.MiscFlags); @@ -11822,7 +11820,7 @@ static void test_bitmap_create(BOOL d3d11) bitmap_desc.bitmapOptions = invalid_options[i].options; bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); - todo_wine + todo_wine_if(i != 1) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap);

1 0

Nikolay Sivov : d2d1: Explicitly validate bitmap options for CreateBitmap().
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: d5ddf3bd1250b218d69eca23bb8cb9a875e585bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ddf3bd1250b218d69eca23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 13:42:38 2022 +0300 d2d1: Explicitly validate bitmap options for CreateBitmap(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 20 ++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8386f703b46..904d44cc075 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -336,6 +336,23 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context } } +static BOOL check_bitmap_options(unsigned int options) +{ + switch (options) + { + case D2D1_BITMAP_OPTIONS_NONE: + case D2D1_BITMAP_OPTIONS_TARGET: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE: + case D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE: + case D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ: + return TRUE; + default: + WARN("Invalid bitmap options %#x.\n", options); + return FALSE; + } +} + HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { @@ -364,6 +381,9 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return E_INVALIDARG; } + if (!check_bitmap_options(desc->bitmapOptions)) + return E_INVALIDARG; + texture_desc.Width = size.width; texture_desc.Height = size.height; if (!texture_desc.Width || !texture_desc.Height) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0069cf746bb..6f22436c892 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11798,6 +11798,18 @@ static void test_bitmap_create(BOOL d3d11) { D2D1_BITMAP_OPTIONS_CPU_READ }, { D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE }, }; + static const struct + { + unsigned int options; + } valid_options[] = + { + { D2D1_BITMAP_OPTIONS_NONE }, + { D2D1_BITMAP_OPTIONS_TARGET }, + { D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW }, + { D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE }, + { D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE }, + { D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ }, + }; D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d1_test_context ctx; ID2D1Bitmap1 *bitmap; @@ -11820,10 +11832,25 @@ static void test_bitmap_create(BOOL d3d11) bitmap_desc.bitmapOptions = invalid_options[i].options; bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); - todo_wine_if(i != 1) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ID2D1Bitmap1_Release(bitmap); + + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(valid_options); ++i) + { + winetest_push_context("Test %u", i); + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = valid_options[i].options; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID2D1Bitmap1_Release(bitmap); winetest_pop_context(); }

1 0

Alexandre Julliard : kernelbase: Reimplement sortkey generation using the sortdefault.nls data.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 681489dbb68166b493ee1cae2f2ca4464a85c029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=681489dbb68166b493ee1cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 12:56:40 2022 +0200 kernelbase: Reimplement sortkey generation using the sortdefault.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 387 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 283 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=681489dbb68166b493ee…

1 0

Alexandre Julliard : kernelbase: Add support for character expansion in sortkeys.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 9605f5870ad70076f70d29c78091cb9f9ca6ac92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9605f5870ad70076f70d29c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 13:02:09 2022 +0200 kernelbase: Add support for character expansion in sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 08842cf2c08..8eaa5f5fb3c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -337,6 +337,11 @@ struct sortguid #define FLAG_DOUBLECOMPRESSION 0x20 #define FLAG_INVERSECASING 0x40 +struct sort_expansion +{ + WCHAR exp[2]; +}; + union char_weights { UINT val; @@ -388,11 +393,13 @@ static struct { UINT version; /* NLS version */ UINT guid_count; /* number of sort GUIDs */ + UINT exp_count; /* number of character expansions */ const UINT *keys; /* sortkey table, indexed by char */ const USHORT *casemap; /* casemap table, in l_intl.nls format */ const WORD *ctypes; /* CT_CTYPE1,2,3 values */ const BYTE *ctype_idx; /* index to map char to ctypes array entry */ const struct sortguid *guids; /* table of sort GUIDs */ + const struct sort_expansion *expansions; /* character expansions */ } sort; static CRITICAL_SECTION locale_section; @@ -475,6 +482,10 @@ static void load_sortdefault_nls(void) sort.guid_count = table[1]; sort.guids = (struct sortguid *)(table + 2); + table = (UINT *)(sort.guids + sort.guid_count); + sort.exp_count = table[0]; + sort.expansions = (struct sort_expansion *)(table + 1); + locale_sorts = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, locale_table->nb_lcnames * sizeof(*locale_sorts) ); } @@ -3207,6 +3218,23 @@ static void append_nonspace_weights( struct sortkey *key, union char_weights wei else append_sortkey( key, weights.diacritic ); } +static void append_expansion_weights( const struct sortguid *sortid, struct sortkey *key_primary, + struct sortkey *key_diacritic, struct sortkey *key_case, + union char_weights weights, DWORD flags, BOOL is_compare ) +{ + /* sortkey and comparison behave differently here */ + if (is_compare) + { + if (weights.script == SCRIPT_UNSORTABLE) return; + if (weights.script == SCRIPT_NONSPACE_MARK) + { + append_nonspace_weights( key_diacritic, weights, flags ); + return; + } + } + append_normal_weights( sortid, key_primary, key_diacritic, key_case, weights, flags ); +} + /* put one of the elements of a sortkey into the dst buffer */ static int put_sortkey( BYTE *dst, int dstlen, int pos, const struct sortkey *key, BYTE terminator ) { @@ -3290,6 +3318,7 @@ static int append_weights( const struct sortguid *sortid, DWORD flags, const WCHAR *compr_tables[8], struct sortkey_state *s, BOOL is_compare ) { union char_weights weights = get_char_weights( src[pos], except ); + WCHAR idx = (weights.val >> 16) & ~(CASE_COMPR_6 << 8); /* expansion index */ int ret = 1; weights._case &= case_mask; @@ -3303,6 +3332,21 @@ static int append_weights( const struct sortguid *sortid, DWORD flags, append_nonspace_weights( &s->key_diacritic, weights, flags ); break; + case SCRIPT_EXPANSION: + while (weights.script == SCRIPT_EXPANSION) + { + weights = get_char_weights( sort.expansions[idx].exp[0], except ); + weights._case &= case_mask; + append_expansion_weights( sortid, &s->key_primary, &s->key_diacritic, + &s->key_case, weights, flags, is_compare ); + weights = get_char_weights( sort.expansions[idx].exp[1], except ); + idx = weights.val >> 16; + weights._case &= case_mask; + } + append_expansion_weights( sortid, &s->key_primary, &s->key_diacritic, + &s->key_case, weights, flags, is_compare ); + break; + case SCRIPT_EXTENSION_A: append_sortkey( &s->key_primary, 0xfd ); append_sortkey( &s->key_primary, 0xff );

1 0

Alexandre Julliard : kernelbase: Add support for character compression in sortkeys.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 5c324cb8c96a1cf54a4a2e7a7326490b6b515410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c324cb8c96a1cf54a4a2e7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 13:06:26 2022 +0200 kernelbase: Add support for character compression in sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8eaa5f5fb3c..03b34bf99db 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -342,6 +342,15 @@ struct sort_expansion WCHAR exp[2]; }; +struct sort_compression +{ + UINT offset; + WCHAR minchar, maxchar; + WORD len[8]; +}; + +static inline int compression_size( int len ) { return 2 + len + (len & 1); } + union char_weights { UINT val; @@ -394,12 +403,15 @@ static struct UINT version; /* NLS version */ UINT guid_count; /* number of sort GUIDs */ UINT exp_count; /* number of character expansions */ + UINT compr_count; /* number of compression tables */ const UINT *keys; /* sortkey table, indexed by char */ const USHORT *casemap; /* casemap table, in l_intl.nls format */ const WORD *ctypes; /* CT_CTYPE1,2,3 values */ const BYTE *ctype_idx; /* index to map char to ctypes array entry */ const struct sortguid *guids; /* table of sort GUIDs */ const struct sort_expansion *expansions; /* character expansions */ + const struct sort_compression *compressions; /* character compression tables */ + const WCHAR *compr_data; /* data for individual compressions */ } sort; static CRITICAL_SECTION locale_section; @@ -486,6 +498,11 @@ static void load_sortdefault_nls(void) sort.exp_count = table[0]; sort.expansions = (struct sort_expansion *)(table + 1); + table = (UINT *)(sort.expansions + sort.exp_count); + sort.compr_count = table[0]; + sort.compressions = (struct sort_compression *)(table + 1); + sort.compr_data = (WCHAR *)(sort.compressions + sort.compr_count); + locale_sorts = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, locale_table->nb_lcnames * sizeof(*locale_sorts) ); } @@ -3235,6 +3252,53 @@ static void append_expansion_weights( const struct sortguid *sortid, struct sort append_normal_weights( sortid, key_primary, key_diacritic, key_case, weights, flags ); } +static const UINT *find_compression( const WCHAR *src, const WCHAR *table, int count, int len ) +{ + int elem_size = compression_size( len ), min = 0, max = count - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + int res = wcsncmp( src, table + pos * elem_size, len ); + if (!res) return (UINT *)(table + (pos + 1) * elem_size) - 1; + if (res > 0) min = pos + 1; + else max = pos - 1; + } + return NULL; +} + +/* find a compression for a char sequence */ +/* return the number of extra chars to skip */ +static int get_compression_weights( UINT compression, const WCHAR *compr_tables[8], + const WCHAR *src, int srclen, union char_weights *weights ) +{ + const struct sort_compression *compr = sort.compressions + compression; + const UINT *ret; + BYTE size = weights->_case & CASE_COMPR_6; + int i, maxlen = 1; + + if (compression >= sort.compr_count) return 0; + if (size == CASE_COMPR_6) maxlen = 8; + else if (size == CASE_COMPR_4) maxlen = 5; + else if (size == CASE_COMPR_2) maxlen = 3; + maxlen = min( maxlen, srclen ); + for (i = 0; i < maxlen; i++) if (src[i] < compr->minchar || src[i] > compr->maxchar) break; + maxlen = i; + if (!compr_tables[0]) + { + compr_tables[0] = sort.compr_data + compr->offset; + for (i = 1; i <= maxlen - 2; i++) + compr_tables[i] = compr_tables[i - 1] + compr->len[i - 1] * compression_size( i + 1 ); + } + for (i = maxlen - 2; i >= 0; i--) + { + if (!(ret = find_compression( src, compr_tables[i], compr->len[i], i + 2 ))) continue; + weights->val = *ret; + return i + 1; + } + return 0; +} + /* put one of the elements of a sortkey into the dst buffer */ static int put_sortkey( BYTE *dst, int dstlen, int pos, const struct sortkey *key, BYTE terminator ) { @@ -3321,6 +3385,9 @@ static int append_weights( const struct sortguid *sortid, DWORD flags, WCHAR idx = (weights.val >> 16) & ~(CASE_COMPR_6 << 8); /* expansion index */ int ret = 1; + if (weights._case & CASE_COMPR_6) + ret += get_compression_weights( sortid->compr, compr_tables, src + pos, srclen - pos, &weights ); + weights._case &= case_mask; switch (weights.script)

1 0

Alexandre Julliard : kernelbase: Add support for Hangul composition in sortkeys.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: abc93d0809cfcccff28511327af3f9eccee65d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abc93d0809cfcccff2851132… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 13:09:26 2022 +0200 kernelbase: Add support for Hangul composition in sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 03b34bf99db..d189cb004f0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -342,6 +342,16 @@ struct sort_expansion WCHAR exp[2]; }; +struct jamo_sort +{ + BYTE is_old; + BYTE leading; + BYTE vowel; + BYTE trailing; + BYTE weight; + BYTE pad[3]; +}; + struct sort_compression { UINT offset; @@ -412,6 +422,7 @@ static struct const struct sort_expansion *expansions; /* character expansions */ const struct sort_compression *compressions; /* character compression tables */ const WCHAR *compr_data; /* data for individual compressions */ + const struct jamo_sort *jamo; /* table for Jamo compositions */ } sort; static CRITICAL_SECTION locale_section; @@ -478,7 +489,9 @@ static void load_sortdefault_nls(void) const WORD *ctype; const UINT *table; + UINT i; SIZE_T size; + const struct sort_compression *last_compr; NtGetNlsSectionPtr( 9, 0, NULL, (void **)&header, &size ); @@ -503,6 +516,12 @@ static void load_sortdefault_nls(void) sort.compressions = (struct sort_compression *)(table + 1); sort.compr_data = (WCHAR *)(sort.compressions + sort.compr_count); + last_compr = sort.compressions + sort.compr_count - 1; + table = (UINT *)(sort.compr_data + last_compr->offset); + for (i = 0; i < 7; i++) table += last_compr->len[i] * ((i + 5) / 2); + table += 1 + table[0] / 2; /* skip multiple weights */ + sort.jamo = (struct jamo_sort *)(table + 1); + locale_sorts = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, locale_table->nb_lcnames * sizeof(*locale_sorts) ); } @@ -3299,6 +3318,75 @@ static int get_compression_weights( UINT compression, const WCHAR *compr_tables[ return 0; } + +#define HANGUL_SBASE 0xac00 +#define HANGUL_LCOUNT 19 +#define HANGUL_VCOUNT 21 +#define HANGUL_TCOUNT 28 + +static int append_hangul_weights( struct sortkey *key, const WCHAR *src, int srclen, UINT except ) +{ + int leading_idx = 0x115f - 0x1100; /* leading filler */ + int vowel_idx = 0x1160 - 0x1100; /* vowel filler */ + int trailing_idx = -1; + BYTE leading_off, vowel_off, trailing_off; + union char_weights weights; + WCHAR composed; + BYTE filler_mask = 0; + int pos = 0; + + /* leading */ + if (src[pos] >= 0x1100 && src[pos] <= 0x115f) leading_idx = src[pos++] - 0x1100; + else if (src[pos] >= 0xa960 && src[pos] <= 0xa97c) leading_idx = src[pos++] - (0xa960 - 0x100); + + /* vowel */ + if (srclen > pos) + { + if (src[pos] >= 0x1160 && src[pos] <= 0x11a7) vowel_idx = src[pos++] - 0x1100; + else if (src[pos] >= 0xd7b0 && src[pos] <= 0xd7c6) vowel_idx = src[pos++] - (0xd7b0 - 0x11d); + } + + /* trailing */ + if (srclen > pos) + { + if (src[pos] >= 0x11a8 && src[pos] <= 0x11ff) trailing_idx = src[pos++] - 0x1100; + else if (src[pos] >= 0xd7cb && src[pos] <= 0xd7fb) trailing_idx = src[pos++] - (0xd7cb - 0x134); + } + + if (!sort.jamo[leading_idx].is_old && !sort.jamo[vowel_idx].is_old && + (trailing_idx == -1 || !sort.jamo[trailing_idx].is_old)) + { + /* not old Hangul, only use leading char; vowel and trailing will be handled in the next pass */ + pos = 1; + vowel_idx = 0x1160 - 0x1100; + trailing_idx = -1; + } + + leading_off = max( sort.jamo[leading_idx].leading, sort.jamo[vowel_idx].leading ); + vowel_off = max( sort.jamo[leading_idx].vowel, sort.jamo[vowel_idx].vowel ); + trailing_off = max( sort.jamo[leading_idx].trailing, sort.jamo[vowel_idx].trailing ); + if (trailing_idx != -1) trailing_off = max( trailing_off, sort.jamo[trailing_idx].trailing ); + composed = HANGUL_SBASE + (leading_off * HANGUL_VCOUNT + vowel_off) * HANGUL_TCOUNT + trailing_off; + + if (leading_idx == 0x115f - 0x1100 || vowel_idx == 0x1160 - 0x1100) + { + filler_mask = 0x80; + composed--; + } + if (composed < HANGUL_SBASE) composed = 0x3260; + + weights = get_char_weights( composed, except ); + append_sortkey( key, weights.script ); + append_sortkey( key, weights.primary ); + append_sortkey( key, 0xff ); + append_sortkey( key, sort.jamo[leading_idx].weight | filler_mask ); + append_sortkey( key, 0xff ); + append_sortkey( key, sort.jamo[vowel_idx].weight ); + append_sortkey( key, 0xff ); + append_sortkey( key, trailing_idx != -1 ? sort.jamo[trailing_idx].weight : 2 ); + return pos - 1; +} + /* put one of the elements of a sortkey into the dst buffer */ static int put_sortkey( BYTE *dst, int dstlen, int pos, const struct sortkey *key, BYTE terminator ) { @@ -3414,6 +3502,12 @@ static int append_weights( const struct sortguid *sortid, DWORD flags, &s->key_case, weights, flags, is_compare ); break; + case SCRIPT_JAMO_SPECIAL: + ret += append_hangul_weights( &s->key_primary, src + pos, srclen - pos, except ); + append_sortkey( &s->key_diacritic, 2 ); + append_sortkey( &s->key_case, 2 ); + break; + case SCRIPT_EXTENSION_A: append_sortkey( &s->key_primary, 0xfd ); append_sortkey( &s->key_primary, 0xff );

1 0

Alexandre Julliard : kernelbase: Add support for Kana extra weights in sortkeys.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: b90f0be0e70d1e25e23c410f2e971dcff6638cc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90f0be0e70d1e25e23c410f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 13:11:41 2022 +0200 kernelbase: Add support for Kana extra weights in sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index d189cb004f0..179f0436578 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3318,6 +3318,48 @@ static int get_compression_weights( UINT compression, const WCHAR *compr_tables[ return 0; } +/* append the extra weights for kana prolonged sound / repeat marks */ +static int append_extra_kana_weights( struct sortkey keys[4], const WCHAR *src, int pos, UINT except, + BYTE case_mask, union char_weights *weights ) +{ + BYTE extra1 = 3, case_weight = weights->_case; + + if (weights->primary <= 1) + { + while (pos > 0) + { + union char_weights prev = get_char_weights( src[--pos], except ); + if (prev.script == SCRIPT_UNSORTABLE || prev.script == SCRIPT_NONSPACE_MARK) continue; + if (prev.script == SCRIPT_EXPANSION) return 0; + if (prev.script != SCRIPT_EASTASIA_SPECIAL) + { + *weights = prev; + return 1; + } + if (prev.primary <= 1) continue; + + case_weight = prev._case & case_mask; + if (weights->primary == 1) /* prolonged sound mark */ + { + prev.primary &= 0x87; + case_weight &= ~CASE_FULLWIDTH; + case_weight |= weights->_case & CASE_FULLWIDTH; + } + extra1 = 4 + weights->primary; + weights->primary = prev.primary; + goto done; + } + return 0; + } +done: + append_sortkey( &keys[0], 0xc4 | (case_weight & CASE_FULLSIZE) ); + append_sortkey( &keys[1], extra1 ); + append_sortkey( &keys[2], 0xc4 | (case_weight & CASE_KATAKANA) ); + append_sortkey( &keys[3], 0xc4 | (case_weight & CASE_FULLWIDTH) ); + weights->script = SCRIPT_KANA; + return 1; +} + #define HANGUL_SBASE 0xac00 #define HANGUL_LCOUNT 19 @@ -3405,6 +3447,7 @@ struct sortkey_state struct sortkey key_diacritic; struct sortkey key_case; struct sortkey key_special; + struct sortkey key_extra[4]; UINT primary_pos; BYTE buffer[3 * 128]; }; @@ -3438,15 +3481,18 @@ static void init_sortkey_state( struct sortkey_state *s, DWORD flags, UINT srcle s->key_primary.max = srclen * 8; s->key_case.max = srclen * 3; s->key_special.max = srclen * 4; + s->key_extra[2].max = s->key_extra[3].max = srclen; if (!(flags & NORM_IGNORENONSPACE)) { s->key_diacritic.max = srclen * 3; + s->key_extra[0].max = s->key_extra[1].max = srclen; } } -static void remove_unneeded_weights( const struct sortguid *sortid, struct sortkey_state *s ) +static BOOL remove_unneeded_weights( const struct sortguid *sortid, struct sortkey_state *s ) { - int i; + const BYTE ignore[4] = { 0xc4 | CASE_FULLSIZE, 0x03, 0xc4 | CASE_KATAKANA, 0xc4 | CASE_FULLWIDTH }; + int i, j; if (sortid->flags & FLAG_REVERSEDIACRITICS) reverse_sortkey( &s->key_diacritic ); @@ -3455,6 +3501,15 @@ static void remove_unneeded_weights( const struct sortguid *sortid, struct sortk for (i = s->key_case.len; i > 0; i--) if (s->key_case.buf[i - 1] > 2) break; s->key_case.len = i; + + if (!s->key_extra[2].len) return FALSE; + + for (i = 0; i < 4; i++) + { + for (j = s->key_extra[i].len; j > 0; j--) if (s->key_extra[i].buf[j - 1] != ignore[i]) break; + s->key_extra[i].len = j; + } + return TRUE; } static void free_sortkey_state( struct sortkey_state *s ) @@ -3463,6 +3518,10 @@ static void free_sortkey_state( struct sortkey_state *s ) RtlFreeHeap( GetProcessHeap(), 0, s->key_diacritic.new_buf ); RtlFreeHeap( GetProcessHeap(), 0, s->key_case.new_buf ); RtlFreeHeap( GetProcessHeap(), 0, s->key_special.new_buf ); + RtlFreeHeap( GetProcessHeap(), 0, s->key_extra[0].new_buf ); + RtlFreeHeap( GetProcessHeap(), 0, s->key_extra[1].new_buf ); + RtlFreeHeap( GetProcessHeap(), 0, s->key_extra[2].new_buf ); + RtlFreeHeap( GetProcessHeap(), 0, s->key_extra[3].new_buf ); } static int append_weights( const struct sortguid *sortid, DWORD flags, @@ -3502,6 +3561,17 @@ static int append_weights( const struct sortguid *sortid, DWORD flags, &s->key_case, weights, flags, is_compare ); break; + case SCRIPT_EASTASIA_SPECIAL: + if (!append_extra_kana_weights( s->key_extra, src, pos, except, case_mask, &weights )) + { + append_sortkey( &s->key_primary, 0xff ); + append_sortkey( &s->key_primary, 0xff ); + break; + } + weights._case = 2; + append_normal_weights( sortid, &s->key_primary, &s->key_diacritic, &s->key_case, weights, flags ); + break; + case SCRIPT_JAMO_SPECIAL: ret += append_hangul_weights( &s->key_primary, src + pos, srclen - pos, except ); append_sortkey( &s->key_diacritic, 2 ); @@ -3559,6 +3629,7 @@ static int get_sortkey( const struct sortguid *sortid, DWORD flags, struct sortkey_state s; BYTE primary_buf[256]; int ret = 0, pos = 0; + BOOL have_extra; BYTE case_mask = 0x3f; UINT except = sortid->except; const WCHAR *compr_tables[8]; @@ -3574,12 +3645,19 @@ static int get_sortkey( const struct sortguid *sortid, DWORD flags, while (pos < srclen) pos += append_weights( sortid, flags, src, srclen, pos, case_mask, except, compr_tables, &s, FALSE ); - remove_unneeded_weights( sortid, &s ); + have_extra = remove_unneeded_weights( sortid, &s ); ret = put_sortkey( dst, dstlen, ret, &s.key_primary, 0x01 ); ret = put_sortkey( dst, dstlen, ret, &s.key_diacritic, 0x01 ); ret = put_sortkey( dst, dstlen, ret, &s.key_case, 0x01 ); + if (have_extra) + { + ret = put_sortkey( dst, dstlen, ret, &s.key_extra[0], 0xff ); + ret = put_sortkey( dst, dstlen, ret, &s.key_extra[1], 0x02 ); + ret = put_sortkey( dst, dstlen, ret, &s.key_extra[2], 0xff ); + ret = put_sortkey( dst, dstlen, ret, &s.key_extra[3], 0xff ); + } if (dstlen > ret) dst[ret] = 0x01; ret++;

1 0

Alexandre Julliard : kernelbase: Add support for SORT_DIGITSASNUMBERS in sortkeys.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: bc440c9c6dcb819929d7fd3cee93531c3eafd852 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc440c9c6dcb819929d7fd3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 13:13:03 2022 +0200 kernelbase: Add support for SORT_DIGITSASNUMBERS in sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 179f0436578..ec6e7047be6 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3318,6 +3318,56 @@ static int get_compression_weights( UINT compression, const WCHAR *compr_tables[ return 0; } +/* get the zero digit for the digit character range that contains 'ch' */ +static WCHAR get_digit_zero_char( WCHAR ch ) +{ + static const WCHAR zeroes[] = + { + 0x0030, 0x0660, 0x06f0, 0x0966, 0x09e6, 0x0a66, 0x0ae6, 0x0b66, 0x0be6, 0x0c66, + 0x0ce6, 0x0d66, 0x0e50, 0x0ed0, 0x0f20, 0x1040, 0x1090, 0x17e0, 0x1810, 0x1946, + 0x1bb0, 0x1c40, 0x1c50, 0xa620, 0xa8d0, 0xa900, 0xaa50, 0xff10 + }; + int min = 0, max = ARRAY_SIZE( zeroes ) - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + if (zeroes[pos] <= ch && zeroes[pos] + 9 >= ch) return zeroes[pos]; + if (zeroes[pos] < ch) min = pos + 1; + else max = pos - 1; + } + return 0; +} + +/* append weights for digits when using SORT_DIGITSASNUMBERS */ +/* return the number of extra chars to skip */ +static int append_digit_weights( struct sortkey *key, const WCHAR *src, UINT srclen ) +{ + UINT i, zero, len, lzero; + BYTE val, values[19]; + + if (!(zero = get_digit_zero_char( *src ))) return -1; + + values[0] = *src - zero; + for (len = 1; len < ARRAY_SIZE(values) && len < srclen; len++) + { + if (src[len] < zero || src[len] > zero + 9) break; + values[len] = src[len] - zero; + } + for (lzero = 0; lzero < len; lzero++) if (values[lzero]) break; + + append_sortkey( key, SCRIPT_DIGIT ); + append_sortkey( key, 2 ); + append_sortkey( key, 2 + len - lzero ); + for (i = lzero, val = 2; i < len; i++) + { + if ((len - i) % 2) append_sortkey( key, (val << 4) + values[i] + 2 ); + else val = values[i] + 2; + } + append_sortkey( key, 0xfe - lzero ); + return len - 1; +} + /* append the extra weights for kana prolonged sound / repeat marks */ static int append_extra_kana_weights( struct sortkey keys[4], const WCHAR *src, int pos, UINT except, BYTE case_mask, union char_weights *weights ) @@ -3614,6 +3664,19 @@ static int append_weights( const struct sortguid *sortid, DWORD flags, append_sortkey( &s->key_case, weights._case ); break; + case SCRIPT_DIGIT: + if (flags & SORT_DIGITSASNUMBERS) + { + int len = append_digit_weights( &s->key_primary, src + pos, srclen - pos ); + if (len >= 0) + { + ret += len; + append_sortkey( &s->key_diacritic, weights.diacritic ); + append_sortkey( &s->key_case, weights._case ); + break; + } + } + /* fall through */ default: append_normal_weights( sortid, &s->key_primary, &s->key_diacritic, &s->key_case, weights, flags ); break;

1 0