April 2018 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS1 in CheckFeatureSupport().
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: 076f542dc5741991dd9b3fc555192e4d7c6ad598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=076f542dc5741991dd9b3fc5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 10 14:51:42 2018 +0430 d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS1 in CheckFeatureSupport(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8316105..ce7ef0b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3396,6 +3396,23 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * return S_OK; } + case D3D11_FEATURE_D3D11_OPTIONS1: + { + D3D11_FEATURE_DATA_D3D11_OPTIONS1 *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + FIXME("Returning fake Options1 support data.\n"); + options->TiledResourcesTier = D3D11_TILED_RESOURCES_NOT_SUPPORTED; + options->MinMaxFiltering = FALSE; + options->ClearViewAlsoSupportsDepthOnlyFormats = FALSE; + options->MapOnDefaultBuffers = FALSE; + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Alistair Leslie-Hughes : d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS in CheckFeatureSupport().
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: ad6b7a3af9f3b8ee7dc80e1af2ba880817873366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad6b7a3af9f3b8ee7dc80e1a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 10 14:51:43 2018 +0430 d3d11: Add support for D3D11_FEATURE_D3D11_OPTIONS in CheckFeatureSupport(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ce7ef0b..1fe6297 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3396,6 +3396,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * return S_OK; } + case D3D11_FEATURE_D3D11_OPTIONS: + { + D3D11_FEATURE_DATA_D3D11_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + FIXME("Returning fake Options support data.\n"); + options->OutputMergerLogicOp = FALSE; + options->UAVOnlyRenderingForcedSampleCount = FALSE; + options->DiscardAPIsSeenByDriver = FALSE; + options->FlagsForUpdateAndCopySeenByDriver = FALSE; + options->ClearView = FALSE; + options->CopyWithOverlap = FALSE; + options->ConstantBufferPartialUpdate = FALSE; + options->ConstantBufferOffsetting = FALSE; + options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; + options->MapNoOverwriteOnDynamicBufferSRV = FALSE; + options->MultisampleRTVWithForcedSampleCountOne = FALSE; + options->SAD4ShaderInstructions = FALSE; + options->ExtendedDoublesShaderInstructions = FALSE; + options->ExtendedResourceSharing = FALSE; + return S_OK; + } + case D3D11_FEATURE_D3D11_OPTIONS1: { D3D11_FEATURE_DATA_D3D11_OPTIONS1 *options = feature_support_data;

1 0

Nikolay Sivov : d3d11/tests: Add a test for setting multiple viewports.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: 1158cf05ae8428bf1b513b32ba171913ec4191fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1158cf05ae8428bf1b513b32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 10 09:30:30 2018 +0300 d3d11/tests: Add a test for setting multiple viewports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2f47124..d25ded8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25855,6 +25855,196 @@ static void test_unbound_multisample_texture(void) release_test_context(&test_context); } +static void test_multiple_viewports(void) +{ + struct + { + unsigned int draw_id; + unsigned int padding[3]; + } constant; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *texture; + ID3D11GeometryShader *gs; + ID3D11PixelShader *ps; + ID3D11Device *device; + ID3D11Buffer *cb; + HRESULT hr; + + static const DWORD gs_code[] = + { +#if 0 + struct gs_in + { + float4 pos : SV_Position; + }; + + struct gs_out + { + float4 pos : SV_Position; + uint viewport : SV_ViewportArrayIndex; + }; + + [maxvertexcount(6)] + void main(triangle gs_in vin[3], inout TriangleStream<gs_out> vout) + { + gs_out o; + for (uint instance_id = 0; instance_id < 2; ++instance_id) + { + o.viewport = instance_id; + for (uint i = 0; i < 3; ++i) + { + o.pos = vin[i].pos; + vout.Append(o); + } + vout.RestartStrip(); + } + } +#endif + 0x43425844, 0xabbb660f, 0x0729bf23, 0x14a9a104, 0x1b454917, 0x00000001, 0x0000021c, 0x00000003, + 0x0000002c, 0x00000060, 0x000000c4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, 0x00000001, 0x00000001, 0x00000e01, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, 0x4174726f, 0x79617272, 0x65646e49, + 0xabab0078, 0x52444853, 0x00000150, 0x00020040, 0x00000054, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, 0x00000005, 0x0200005e, 0x00000006, + 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100022, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x03040003, 0x0010001a, 0x00000000, + 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000003, 0x03040003, 0x0010002a, 0x00000000, + 0x07000036, 0x001020f2, 0x00000000, 0x00a01e46, 0x0010001a, 0x00000000, 0x00000000, 0x05000036, + 0x00102012, 0x00000001, 0x0010000a, 0x00000000, 0x01000013, 0x0700001e, 0x00100022, 0x00000000, + 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x01000009, 0x0700001e, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + uint draw_id; + + float4 main(in float4 pos : SV_Position, + in uint viewport : SV_ViewportArrayIndex) : SV_Target + { + return float4(viewport, draw_id, 0, 0); + } +#endif + 0x43425844, 0x77334c0f, 0x5df3ca7a, 0xc53c00db, 0x3e6e5750, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000090, 0x000000c4, 0x4e475349, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, + 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, + 0x4174726f, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x52444853, 0x00000084, 0x00000040, 0x00000021, 0x04000059, 0x00208e46, 0x00000000, + 0x00000001, 0x04000864, 0x00101012, 0x00000001, 0x00000005, 0x03000065, 0x001020f2, 0x00000000, + 0x05000056, 0x00102012, 0x00000000, 0x0010100a, 0x00000001, 0x06000056, 0x00102022, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct vec4 expected_values[] = + { + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + }; + static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + D3D11_VIEWPORT vp[2]; + RECT rect; + int width; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + hr = ID3D11Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), NULL, &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + width = texture_desc.Width / 2; + + vp[0].TopLeftX = 0.0f; + vp[0].TopLeftY = 0.0f; + vp[0].Width = width; + vp[0].Height = texture_desc.Height; + vp[0].MinDepth = 0.0f; + vp[0].MaxDepth = 1.0f; + + vp[1] = vp[0]; + vp[1].TopLeftX = width; + vp[1].Width = width; + ID3D11DeviceContext_RSSetViewports(context, 2, vp); + + constant.draw_id = 0; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + constant.draw_id = 1; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[0], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); +todo_wine + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[1], 1); + + /* One viewport. */ + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 1, vp); + constant.draw_id = 2; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[2], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[3], 1); + + /* Reset viewports. */ + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 0, NULL); + constant.draw_id = 3; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); +todo_wine + check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + + ID3D11Buffer_Release(cb); + ID3D11GeometryShader_Release(gs); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -25988,4 +26178,5 @@ START_TEST(d3d11) test_generate_mips(); test_alpha_to_coverage(); test_unbound_multisample_texture(); + test_multiple_viewports(); }

1 0

Józef Kucia : wined3d: Require BPTC compression for SM5.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: 13a53aa9698cb95c5a04490250f756bd191e6805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a53aa9698cb95c5a044902… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:19:38 2018 +0200 wined3d: Require BPTC compression for SM5. It's required for feature level 11_0. At some point, we probably would like to separate shader model checks from feature level checks. 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> --- dlls/wined3d/glsl_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0bc6aa0..121892d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10964,6 +10964,7 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] && gl_info->supported[ARB_TESSELLATION_SHADER] + && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) return 5;

1 0

Alistair Leslie-Hughes : msvcrtd: Forward operator_new_dbg to msvcrt.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: 6c42e742b3decb38733f0b42b7c072ac377a242b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c42e742b3decb38733f0b42… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 10 02:19:13 2018 +0000 msvcrtd: Forward operator_new_dbg to msvcrt. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrtd/debug.c | 39 --------------------------------------- dlls/msvcrtd/msvcrtd.spec | 4 ++-- dlls/msvcrtd/tests/debug.c | 13 ++++++++++++- 3 files changed, 14 insertions(+), 42 deletions(-) diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c index b849652..df7a892 100644 --- a/dlls/msvcrtd/debug.c +++ b/dlls/msvcrtd/debug.c @@ -25,8 +25,6 @@ #define _DEBUG #include "crtdbg.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); - int _crtAssertBusy = -1; int _crtBreakAlloc = -1; int _crtDbgFlag = 0; @@ -40,43 +38,6 @@ typedef unsigned long MSVCRT_size_t; extern int _callnewh(MSVCRT_size_t); /********************************************************************* - * ??2(a)YAPAXIHPBDH@Z (MSVCRTD.@) - */ -void * CDECL MSVCRTD_operator_new_dbg(MSVCRT_size_t nSize, int nBlockUse, - const char *szFileName, int nLine) -{ - void *retval = NULL; - - TRACE("(%lu, %d, '%s', %d)\n", nSize, nBlockUse, szFileName, nLine); - - switch(_BLOCK_TYPE(nBlockUse)) - { - case _NORMAL_BLOCK: - break; - case _CLIENT_BLOCK: - FIXME("Unimplemented case for nBlockUse = _CLIENT_BLOCK\n"); - return NULL; - case _FREE_BLOCK: - FIXME("Native code throws an exception here\n"); - return NULL; - case _CRT_BLOCK: - case _IGNORE_BLOCK: - ERR("Not allowed nBlockUse value: %d\n", _BLOCK_TYPE(nBlockUse)); - return NULL; - default: - ERR("Unknown nBlockUse value: %d\n", _BLOCK_TYPE(nBlockUse)); - return NULL; - } - - retval = HeapAlloc(GetProcessHeap(), 0, nSize); - - if (!retval) - _callnewh(nSize); - - return retval; -} - -/********************************************************************* * _CrtSetDumpClient (MSVCRTD.@) */ void * CDECL _CrtSetDumpClient(void *dumpClient) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 15066c3..33c6e99 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -31,8 +31,8 @@ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ @ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) msvcrt.??2(a)YAPAXI@Z @ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) msvcrt.??2(a)YAPEAX_K@Z -@ cdecl -arch=win32 ??2(a)YAPAXIHPBDH@Z(long long str long) MSVCRTD_operator_new_dbg -@ cdecl -arch=win64 ??2(a)YAPEAX_KHPEBDH@Z(long long str long) MSVCRTD_operator_new_dbg +@ cdecl -arch=win32 ??2(a)YAPAXIHPBDH@Z(long long str long) msvcrt.??2(a)YAPAXIHPBDH@Z +@ cdecl -arch=win64 ??2(a)YAPEAX_KHPEBDH@Z(long long str long) msvcrt.??2(a)YAPEAX_KHPEBDH@Z @ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) msvcrt.??3(a)YAXPAX@Z @ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) msvcrt.??3(a)YAXPEAX@Z @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index 9055db1..4af4c81 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -31,6 +31,7 @@ /**********************************************************************/ static void * (__cdecl *pMSVCRTD_operator_new_dbg)(size_t, int, const char *, int) = NULL; +static void * (__cdecl *pMSVCRTD_operator_delete)(void *) = NULL; /* Some exports are only available in later versions */ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y) @@ -46,9 +47,15 @@ static BOOL init_functions(void) } if (sizeof(void *) > sizeof(int)) /* 64-bit has a different mangled name */ + { SET(pMSVCRTD_operator_new_dbg, "??2(a)YAPEAX_KHPEBDH@Z"); + SET(pMSVCRTD_operator_delete, "??3(a)YAXPEAX@Z"); + } else + { SET(pMSVCRTD_operator_new_dbg, "??2(a)YAPAXIHPBDH@Z"); + SET(pMSVCRTD_operator_delete, "??3(a)YAXPAX@Z"); + } if (pMSVCRTD_operator_new_dbg == NULL) return FALSE; @@ -64,7 +71,11 @@ static void test_new(void) mem = pMSVCRTD_operator_new_dbg(42, _NORMAL_BLOCK, __FILE__, __LINE__); ok(mem != NULL, "memory not allocated\n"); - HeapFree(GetProcessHeap(), 0, mem); + pMSVCRTD_operator_delete(mem); + + mem = pMSVCRTD_operator_new_dbg(42, _CRT_BLOCK, __FILE__, __LINE__); + ok(mem != NULL, "memory not allocated\n"); + pMSVCRTD_operator_delete(mem); } /**********************************************************************/

1 0

Józef Kucia : wined3d: Do not allocate system memory for resources by default.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: 409f32ffa3abf5d6648c7535f61e03d8c5faf20f URL: https://source.winehq.org/git/wine.git/?a=commit;h=409f32ffa3abf5d6648c7535… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 10 12:29:55 2018 +0200 wined3d: Do not allocate system memory for resources by default. Avoids allocating system memory for depth/stencil and 3D textures. 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> --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/resource.c | 13 +++++-------- dlls/wined3d/texture.c | 17 ++++++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5b92470..3f4552f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -615,10 +615,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - { - ERR("Failed to allocate system memory.\n"); return FALSE; - } return TRUE; case WINED3D_LOCATION_BUFFER: @@ -1359,6 +1356,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->bind_flags = bind_flags; buffer->locations = WINED3D_LOCATION_SYSMEM; + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + return E_OUTOFMEMORY; + TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2a6fa6a..b5dcdf0 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -191,12 +191,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->parent_ops = parent_ops; resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - - if (!wined3d_resource_allocate_sysmem(resource)) - { - ERR("Failed to allocate system memory.\n"); - return E_OUTOFMEMORY; - } + resource->heap_memory = NULL; if (!(usage & WINED3DUSAGE_PRIVATE)) { @@ -205,8 +200,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * { if (size > wined3d_device_get_available_texture_mem(device)) { - ERR("Out of adapter memory\n"); - wined3d_resource_free_sysmem(resource); + ERR("Out of adapter memory.\n"); return WINED3DERR_OUTOFVIDEOMEMORY; } adapter_adjust_memory(device->adapter, size); @@ -383,7 +377,10 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) void *mem; if (!(mem = heap_alloc_zero(resource->size + align))) + { + ERR("Failed to allocate system memory.\n"); return FALSE; + } p = (void **)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)) - 1; *p = mem; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b56e6e4..b9b304e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1683,10 +1683,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; if (!wined3d_resource_allocate_sysmem(&texture->resource)) - { - ERR("Failed to allocate system memory.\n"); return FALSE; - } return TRUE; case WINED3D_LOCATION_USER_MEMORY: @@ -2674,11 +2671,17 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("x scale %.8e, y scale %.8e.\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); if (wined3d_texture_use_pbo(texture, gl_info)) - { - if (desc->resource_type == WINED3D_RTYPE_TEXTURE_3D - || (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) - wined3d_resource_free_sysmem(&texture->resource); texture->resource.map_binding = WINED3D_LOCATION_BUFFER; + + if ((desc->resource_type != WINED3D_RTYPE_TEXTURE_3D + && !(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + || !wined3d_texture_use_pbo(texture, gl_info)) + { + if (!wined3d_resource_allocate_sysmem(&texture->resource)) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } } sub_count = level_count * layer_count;

1 0

Józef Kucia : d3d11/tests: Add additional tests for shader input/output matching.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: e0b31cc0036071495e36fa18a1c0563db2c6aba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b31cc0036071495e36fa18… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 10 12:29:56 2018 +0200 d3d11/tests: Add additional tests for shader input/output matching. 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> --- dlls/d3d11/tests/d3d11.c | 81 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d25ded8..b3597ad 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14017,6 +14017,7 @@ static void test_shader_interstage_interface(void) ID3D11Device *device; UINT stride, offset; ID3D11Buffer *vb; + unsigned int i; HRESULT hr; static const DWORD vs_code[] = @@ -14089,6 +14090,56 @@ static void test_shader_interstage_interface(void) 0x0010000a, 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x001020c2, 0x00000000, 0x001012a6, 0x00000001, 0x0100003e, }; + static const DWORD ps_partial_input_code[] = + { +#if 0 + void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, + nointerpolation float t1 : TEXCOORD1, uint t2 : TEXCOORD2, + uint t3 : TEXCOORD3, out float4 o : SV_Target) + { + o.x = t0.y + t1; + o.y = t2 + t3; + o.z = 0.0f; + o.w = t0.x; + } +#endif + 0x43425844, 0x5b1db356, 0xaa5a5e9d, 0xb916a081, 0x61e6dcb1, 0x00000001, 0x000001cc, 0x00000003, + 0x0000002c, 0x000000cc, 0x00000100, 0x4e475349, 0x00000098, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000008c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x0000008c, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x0000008c, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000202, 0x0000008c, + 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000404, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x43584554, 0x44524f4f, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, + 0x52444853, 0x000000c4, 0x00000040, 0x00000031, 0x03001062, 0x00101032, 0x00000001, 0x03000862, + 0x00101012, 0x00000002, 0x03000862, 0x00101022, 0x00000002, 0x03000862, 0x00101042, 0x00000002, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0700001e, 0x00100012, 0x00000000, + 0x0010102a, 0x00000002, 0x0010101a, 0x00000002, 0x05000056, 0x00102022, 0x00000000, 0x0010000a, + 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, 0x00000002, + 0x05000036, 0x00102042, 0x00000000, 0x00004001, 0x00000000, 0x05000036, 0x00102082, 0x00000000, + 0x0010100a, 0x00000001, 0x0100003e, + }; + static const DWORD ps_single_input_code[] = + { +#if 0 + void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, out float4 o : SV_Target) + { + o.x = t0.x; + o.y = t0.y; + o.z = 1.0f; + o.w = 2.0f; + } +#endif + 0x43425844, 0x7cc601b6, 0xc65b8bdb, 0x54d0f606, 0x9cc74d3d, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000084, 0x000000b8, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, + 0x00000040, 0x00000016, 0x03001062, 0x00101032, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00101046, 0x00000001, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x40000000, 0x0100003e, + }; static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = { {"SV_POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, @@ -14115,7 +14166,18 @@ static void test_shader_interstage_interface(void) {{ 1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, }; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - static const struct vec4 expected_result = {10.0f, 8.0f, 7.0f, 3.0f}; + static const struct + { + const DWORD *ps_code; + size_t ps_size; + struct vec4 expected_result; + } + tests[] = + { + {ps_code, sizeof(ps_code), {10.0f, 8.0f, 7.0f, 3.0f}}, + {ps_partial_input_code, sizeof(ps_partial_input_code), {10.0f, 8.0f, 0.0f, 3.0f}}, + {ps_single_input_code, sizeof(ps_single_input_code), {3.0f, 5.0f, 1.0f, 2.0f}}, + }; if (!init_test_context(&test_context, NULL)) return; @@ -14125,8 +14187,6 @@ static void test_shader_interstage_interface(void) hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); - hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; @@ -14145,21 +14205,26 @@ static void test_shader_interstage_interface(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, white); ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); - - ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext_IASetInputLayout(context, input_layout); ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); offset = 0; stride = sizeof(*quad); ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); - ID3D11DeviceContext_Draw(context, 4, 0); - check_texture_vec4(render_target, &expected_result, 0); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = ID3D11Device_CreatePixelShader(device, tests[i].ps_code, tests[i].ps_size, NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_Draw(context, 4, 0); + check_texture_vec4(render_target, &tests[i].expected_result, 0); + ID3D11PixelShader_Release(ps); + } ID3D11InputLayout_Release(input_layout); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(render_target); - ID3D11PixelShader_Release(ps); ID3D11VertexShader_Release(vs); ID3D11Buffer_Release(vb); release_test_context(&test_context);

1 0

Józef Kucia : d3d10core/tests: Make it possible to run test with different swapchain size.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: bf398dfa4680371d7b288539c9cb8a1ff647752f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf398dfa4680371d7b288539… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 10 12:29:57 2018 +0200 d3d10core/tests: Make it possible to run test with different swapchain size. 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> --- dlls/d3d10core/tests/device.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8b05676..e9394db 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1003,12 +1003,14 @@ static BOOL is_d3d11_interface_available(ID3D10Device *device) struct swapchain_desc { BOOL windowed; - UINT buffer_count; + unsigned int buffer_count; + unsigned int width, height; DXGI_SWAP_EFFECT swap_effect; DWORD flags; }; -static IDXGISwapChain *create_swapchain(ID3D10Device *device, HWND window, const struct swapchain_desc *swapchain_desc) +static IDXGISwapChain *create_swapchain(ID3D10Device *device, HWND window, + const struct swapchain_desc *swapchain_desc) { IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC dxgi_desc; @@ -1047,6 +1049,10 @@ static IDXGISwapChain *create_swapchain(ID3D10Device *device, HWND window, const dxgi_desc.Windowed = swapchain_desc->windowed; dxgi_desc.SwapEffect = swapchain_desc->swap_effect; dxgi_desc.BufferCount = swapchain_desc->buffer_count; + if (swapchain_desc->width) + dxgi_desc.BufferDesc.Width = swapchain_desc->width; + if (swapchain_desc->height) + dxgi_desc.BufferDesc.Height = swapchain_desc->height; if (swapchain_desc->flags & SWAPCHAIN_FLAG_SHADER_INPUT) dxgi_desc.BufferUsage |= DXGI_USAGE_SHADER_INPUT; @@ -1075,9 +1081,12 @@ struct d3d10core_test_context ID3D10Buffer *ps_cb; }; -#define init_test_context(c) init_test_context_(__LINE__, c) -static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context *context) +#define init_test_context(a) init_test_context_(__LINE__, a, NULL) +#define init_test_context_ext(a, b) init_test_context_(__LINE__, a, b) +static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context *context, + const struct swapchain_desc *swapchain_desc) { + unsigned int rt_width, rt_height; D3D10_VIEWPORT vp; HRESULT hr; RECT rect; @@ -1089,11 +1098,14 @@ static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; } - SetRect(&rect, 0, 0, 640, 480); + + rt_width = swapchain_desc && swapchain_desc->width ? swapchain_desc->width : 640; + rt_height = swapchain_desc && swapchain_desc->height ? swapchain_desc->height : 480; + SetRect(&rect, 0, 0, rt_width, rt_height); AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); context->window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - context->swapchain = create_swapchain(context->device, context->window, NULL); + context->swapchain = create_swapchain(context->device, context->window, swapchain_desc); hr = IDXGISwapChain_GetBuffer(context->swapchain, 0, &IID_ID3D10Texture2D, (void **)&context->backbuffer); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); @@ -1105,8 +1117,8 @@ static BOOL init_test_context_(unsigned int line, struct d3d10core_test_context vp.TopLeftX = 0; vp.TopLeftY = 0; - vp.Width = 640; - vp.Height = 480; + vp.Width = rt_width; + vp.Height = rt_height; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; ID3D10Device_RSSetViewports(context->device, 1, &vp); @@ -9861,6 +9873,7 @@ static void test_swapchain_flip(void) window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); desc.buffer_count = 3; + desc.width = desc.height = 0; desc.swap_effect = DXGI_SWAP_EFFECT_SEQUENTIAL; desc.windowed = TRUE; desc.flags = SWAPCHAIN_FLAG_SHADER_INPUT;

1 0

Józef Kucia : d3d10core/tests: Add test for depth bias.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: 1df478b72b2c97947732208d3246f2aef7adb343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1df478b72b2c97947732208d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 10 12:29:58 2018 +0200 d3d10core/tests: Add test for depth bias. 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> --- dlls/d3d10core/tests/device.c | 433 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 383 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1df478b72b2c97947732…

1 0

Sergio Gómez Del Real : kernel32/ tests: Add tests for NormalizeString API function.
by Alexandre Julliard 10 Apr '18

10 Apr '18

Module: wine Branch: master Commit: d6a218d64db38e2508dd5a0e4a081a9a8c6cc0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a218d64db38e2508dd5a0e… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Mon Apr 9 13:38:00 2018 -0500 kernel32/tests: Add tests for NormalizeString API function. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 184 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a99763d..b9b36d8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -106,6 +106,7 @@ static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMT static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPINT, LPNLSVERSIONINFO, LPVOID, LPARAM); static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); +static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -141,6 +142,7 @@ static void InitFunctionPointers(void) X(FindNLSStringEx); X(SetThreadUILanguage); X(GetThreadUILanguage); + X(NormalizeString); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -5470,6 +5472,187 @@ static void test_SetThreadUILanguage(void) "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); } +static void test_NormalizeString(void) +{ + /* part 0: specific cases */ + /* LATIN CAPITAL LETTER D WITH DOT ABOVE */ + static const WCHAR part0_str1[] = {0x1e0a,0}; + static const WCHAR part0_nfd1[] = {0x0044,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str2[] = {0x0044,0x0323,0x0307,0}; + static const WCHAR part0_nfc2[] = {0x1e0c,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str3[] = {0x0044,0x031b,0x0323,0x0307,0}; + static const WCHAR part0_nfc3[] = {0x1e0c,0x031b,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str4[] = {0x0044,0x031b,0x0323,0x0307,0}; + static const WCHAR part0_nfc4[] = {0x1e0c,0x031b,0x0307,0}; + + /* + * HEBREW ACCENT SEGOL, HEBREW POINT PATAH, HEBREW POINT DAGESH OR MAPIQ, + * HEBREW ACCENT MERKHA, HEBREW POINT SHEVA, HEBREW PUNCTUATION PASEQ, + * HEBREW MARK UPPER DOT, HEBREW ACCENT DEHI + */ + static const WCHAR part0_str5[] = {0x0592,0x05B7,0x05BC,0x05A5,0x05B0,0x05C0,0x05C4,0x05AD,0}; + static const WCHAR part0_nfc5[] = {0x05B0,0x05B7,0x05BC,0x05A5,0x0592,0x05C0,0x05AD,0x05C4,0}; + + /* + * HEBREW POINT QAMATS, HEBREW POINT HOLAM, HEBREW POINT HATAF SEGOL, + * HEBREW ACCENT ETNAHTA, HEBREW PUNCTUATION SOF PASUQ, HEBREW POINT SHEVA, + * HEBREW ACCENT ILUY, HEBREW ACCENT QARNEY PARA + */ + static const WCHAR part0_str6[] = {0x05B8,0x05B9,0x05B1,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0}; + static const WCHAR part0_nfc6[] = {0x05B1,0x05B8,0x05B9,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0}; + + /* LATIN CAPITAL LETTER D WITH DOT BELOW */ + static const WCHAR part0_str8[] = {0x1E0C,0}; + static const WCHAR part0_nfd8[] = {0x0044,0x0323,0}; + + /* LATIN CAPITAL LETTER D WITH DOT ABOVE, COMBINING DOT BELOW */ + static const WCHAR part0_str9[] = {0x1E0A,0x0323,0}; + static const WCHAR part0_nfc9[] = {0x1E0C,0x0307,0}; + static const WCHAR part0_nfd9[] = {0x0044,0x0323,0x0307,0}; + + /* LATIN CAPITAL LETTER D WITH DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str10[] = {0x1E0C,0x0307,0}; + static const WCHAR part0_nfd10[] = {0x0044,0x0323,0x0307,0}; + + /* LATIN CAPITAL LETTER E WITH MACRON AND GRAVE, COMBINING MACRON */ + static const WCHAR part0_str11[] = {0x1E14,0x0304,0}; + static const WCHAR part0_nfd11[] = {0x0045,0x0304,0x0300,0x0304,0}; + + /* LATIN CAPITAL LETTER E WITH MACRON, COMBINING GRAVE ACCENT */ + static const WCHAR part0_str12[] = {0x0112,0x0300,0}; + static const WCHAR part0_nfc12[] = {0x1E14,0}; + static const WCHAR part0_nfd12[] = {0x0045,0x0304,0x0300,0}; + + /* part 1: character by character */ + /* DIAERESIS */ + static const WCHAR part1_str1[] = {0x00a8,0}; + static const WCHAR part1_nfkc1[] = {0x0020,0x0308,0}; + + /* VULGAR FRACTION ONE QUARTER */ + static const WCHAR part1_str2[] = {0x00bc,0}; + static const WCHAR part1_nfkc2[] = {0x0031,0x2044,0x0034,0}; + + /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ + static const WCHAR part1_str3[] = {0x00ca,0}; + static const WCHAR part1_nfd3[] = {0x0045,0x0302,0}; + + /* MODIFIER LETTER SMALL GAMMA */ + static const WCHAR part1_str4[] = {0x02e0,0}; + static const WCHAR part1_nfkc4[] = {0x0263,0}; + + /* CYRILLIC CAPITAL LETTER IE WITH GRAVE */ + static const WCHAR part1_str5[] = {0x0400,0}; + static const WCHAR part1_nfd5[] = {0x0415,0x0300,0}; + + /* CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */ + static const WCHAR part1_str6[] = {0x0476,0}; + static const WCHAR part1_nfd6[] = {0x0474,0x030F,0}; + + /* ARABIC LIGATURE HAH WITH JEEM INITIAL FORM */ + static const WCHAR part1_str7[] = {0xFCA9,0}; + static const WCHAR part1_nfkc7[] = {0x062D,0x062C,0}; + + /* GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA */ + static const WCHAR part1_str8[] = {0x1F42,0}; + static const WCHAR part1_nfd8[] = {0x03BF,0x0313,0x0300,0}; + + /* QUADRUPLE PRIME */ + static const WCHAR part1_str9[] = {0x2057,0}; + static const WCHAR part1_nfkc9[] = {0x2032,0x2032,0x2032,0x2032,0}; + + /* KATAKANA-HIRAGANA VOICED SOUND MARK */ + static const WCHAR part1_str10[] = {0x309B,0}; + static const WCHAR part1_nfkc10[] = {0x20,0x3099,0}; + + struct test_data_normal { + const WCHAR *str; + const WCHAR *expected[4]; + }; + static const struct test_data_normal test_arr[] = + { + { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 } }, + { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 } }, + { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 } }, + { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 } }, + { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 } }, + { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 } }, + { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 } }, + { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 } }, + { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 } }, + { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 } }, + { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 } }, + { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 } }, + { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 } }, + { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 } }, + { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 } }, + { 0 } + }; + const struct test_data_normal *ptest = test_arr; + const int norm_forms[] = { NormalizationC, NormalizationD, NormalizationKC, NormalizationKD }; + WCHAR dst[80]; + int dstlen; + + if (!pNormalizeString) + { + win_skip("NormalizeString is not available.\n"); + return; + } + + todo_wine { + dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER"); + } + + /* + * For each string, first test passing -1 as srclen to NormalizeString, + * thereby assuming a null-terminating string in src, and then test passing + * explicitly the string length. + * Do that for all 4 normalization forms. + */ + while (ptest->str) + { + int str_cmp, i; + + for (i = 0; i < 4; i++) + { + todo_wine { + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 ); + if (dstlen) + { + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); + ok(dstlen == strlenW( ptest->expected[i] )+1, "Copied length differed: was %d, should be %d\n", + dstlen, strlenW( ptest->expected[i] )+1); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); + ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); + } + + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); + if (dstlen) + { + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); + ok(dstlen == strlenW( ptest->expected[i] ), "Copied length differed: was %d, should be %d\n", + dstlen, strlenW( ptest->expected[i] )); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); + ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); + } + } + } + ptest++; + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -5518,6 +5701,7 @@ START_TEST(locale) test_GetUserPreferredUILanguages(); test_FindNLSStringEx(); test_SetThreadUILanguage(); + test_NormalizeString(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0