March 2022 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d: Use Vulkan timeline semaphores for D3D12 fences.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: vkd3d Branch: master Commit: 22d86653003aeec7b919d0b58b2c0bb76438936e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22d86653003aeec7b919d0b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 15:56:00 2022 +0100 vkd3d: Use Vulkan timeline semaphores for D3D12 fences. D3D12 supports signalling a fence to a lower value, while Vulkan timeline semaphores do not. On the GPU side this is handled by simply submitting the signal anyway, if a test for this passes on device creation, because working around this is impractical. For CPU signals the Vulkan semaphore is replaced with a new one at the lower value only if no waits and/or signals are pending on the GPU. Otherwise, a fixme is emitted. Partly based on a vkd3d-proton patch by Hans-Kristian Arntzen (not including the handling of lower fence values). The old implementation is used if KHR_timeline_semaphore is not available or GPU signals do not work for a lower value. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 571 ++++++++++++++++++++++++++++++++++++++++++--- libs/vkd3d/device.c | 87 +++++++ libs/vkd3d/vkd3d_private.h | 30 +++ libs/vkd3d/vulkan_procs.h | 5 + tests/d3d12.c | 11 +- 5 files changed, 663 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=22d86653003aeec7b91…

1 0

Conor McCarthy : tests: Test signalling a fence to a lower value after a GPU wait.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: vkd3d Branch: master Commit: 889e5af5dd48e5c76747abe33dfe402d40182e40 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=889e5af5dd48e5c76747abe… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 15:56:01 2022 +0100 tests: Test signalling a fence to a lower value after a GPU wait. Ensures the new fence implementation using timeline semaphores handles this correctly. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2059b182..486c0093 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33373,6 +33373,12 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); + /* signal to a lower value after a GPU wait was used (test timeline semaphore replacement) */ + hr = ID3D12Fence_Signal(fence, 0); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == 0, "Got unexpected value %"PRIu64".\n", value); + hr = ID3D12Fence_Signal(fence, 6); ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); update_buffer_data(cb, 0, sizeof(green), &green);

1 0

Conor McCarthy : vkd3d: Use Vulkan null descriptors if EXT_robustness2 is available.
by Alexandre Julliard March 24, 2022

March 24, 2022

Module: vkd3d Branch: master Commit: 06274621927a624ab1f8c88d159ac054ee625efe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=06274621927a624ab1f8c88… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 14:36:09 2022 +1000 vkd3d: Use Vulkan null descriptors if EXT_robustness2 is available. This implements all remaining unsupported image view dimensions and saves a small amount of resources because null buffers and images are no longer needed. It matches the D3D12 requirement that all reads return zero, which is not strictly true of the existing implementation using resources of small but non-zero size. Warnings on null view creation are silenced because there should no longer be a difference from D3D12 behaviour. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 +- configure.ac | 2 +- libs/vkd3d/device.c | 8 +++++ libs/vkd3d/resource.c | 76 ++++++++++++++++++++++++++++++---------------- libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 61 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=06274621927a624ab1f…

1 0

Henri Verbeet : dxgi/tests: Accept DXGI_STATUS_OCCLUDED as result when creating fullscreen swapchains.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: f2afa424769de3517cf5ea3e171de36d06a5dc68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2afa424769de3517cf5ea3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:27:37 2022 +0100 dxgi/tests: Accept DXGI_STATUS_OCCLUDED as result when creating fullscreen swapchains. These can legitimately occur in some circumstances, and shouldn't otherwise affect these tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 89e32367231..a199ba486ba 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2125,7 +2125,7 @@ static void test_create_swapchain(void) /* Fullscreen */ creation_desc.Windowed = FALSE; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || hr == DXGI_STATUS_OCCLUDED, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); @@ -3573,7 +3573,7 @@ static void test_inexact_modes(void) capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || hr == DXGI_STATUS_OCCLUDED, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);

1 0

Jacek Caban : win32u: Move ScreenToClient implementation from user32.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: b133b756de4d4a731ce9e160d37a182808d3689f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b133b756de4d4a731ce9e160… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 14:02:18 2022 +0100 win32u: Move ScreenToClient implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 16 ++-------------- dlls/win32u/window.c | 20 ++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index fa074e9f7c8..5ab43089a91 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -432,21 +432,9 @@ BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) /******************************************************************* * ScreenToClient (USER32.@) */ -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) +BOOL WINAPI ScreenToClient( HWND hwnd, POINT *pt ) { - POINT offset; - BOOL mirrored; - - if (!hwnd) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - if (!WINPOS_GetWinOffset( 0, hwnd, &mirrored, &offset )) return FALSE; - lppnt->x += offset.x; - lppnt->y += offset.y; - if (mirrored) lppnt->x = -lppnt->x; - return TRUE; + return NtUserCallHwndParam( hwnd, (UINT_PTR)pt, NtUserScreenToClient ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f51c7e760ce..59761b8185c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2587,6 +2587,24 @@ other_process: /* one of the parents may belong to another process, do it the h return ret; } +/* see ScreenToClient */ +static BOOL screen_to_client( HWND hwnd, POINT *pt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!get_windows_offset( 0, hwnd, get_thread_dpi(), &mirrored, &offset )) return FALSE; + pt->x += offset.x; + pt->y += offset.y; + if (mirrored) pt->x = -pt->x; + return TRUE; +} + /* map coordinates of a window region */ void map_window_region( HWND from, HWND to, HRGN hrgn ) { @@ -5019,6 +5037,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return kill_system_timer( hwnd, param ); case NtUserMonitorFromWindow: return HandleToUlong( monitor_from_window( hwnd, param, NtUserMonitorFromWindow )); + case NtUserScreenToClient: + return screen_to_client( hwnd, (POINT *)param ); case NtUserSetCaptureWindow: return set_capture_window( hwnd, param, NULL ); case NtUserSetForegroundWindow: diff --git a/include/ntuser.h b/include/ntuser.h index 5b7cc0be597..da0a8974004 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -212,6 +212,7 @@ enum NtUserIsChild, NtUserKillSystemTimer, NtUserMonitorFromWindow, + NtUserScreenToClient, NtUserSetCaptureWindow, NtUserSetForegroundWindow, NtUserSetWindowPixelFormat,

1 0

Paul Gofman : d3dcompiler: Allow cs5.1 shaders on earlier d3dcompiler versions.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: af454773929dd01844326c8756cdce438ead2df9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af454773929dd01844326c87… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 13:58:16 2022 +0100 d3dcompiler: Allow cs5.1 shaders on earlier d3dcompiler versions. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 4 ++-- dlls/d3dcompiler_43/tests/reflection.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 787d0388f93..096efc91bd4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1507,9 +1507,9 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Target: %#x.\n", r->target); target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK; - #if D3D_COMPILER_VERSION < 47 - if (target_version >= 0x501) + if (target_version >= 0x501 && (!D3D_COMPILER_VERSION || ((r->target & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) + >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT) != 0x4353 /* CS */)) { WARN("Target version %#x is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); return E_INVALIDARG; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index e4261ad0d79..bfd79d04618 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1231,7 +1231,6 @@ static void test_reflection_cs(void) HRESULT hr; hr = call_reflect(test_blob, test_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - todo_wine_if(D3D_COMPILER_VERSION < 47) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (FAILED(hr)) return;

1 0

Alexandre Julliard : kernel32/tests: Fix codepage test for UTF-8 default codepage.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 273ab6c774ee41908b38eb6b2ca03f686eb44085 URL: https://source.winehq.org/git/wine.git/?a=commit;h=273ab6c774ee41908b38eb6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 18:31:12 2022 +0100 kernel32/tests: Fix codepage test for UTF-8 default codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 33eeebcc617..b0dbd812346 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1152,7 +1152,8 @@ static void test_threadcp(void) ret = GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); ok(ret, "GetCPInfoExA failed for lcid %04lx, error %ld\n", lcids[i].lcid, GetLastError()); if (lcids[i].threadcp) - ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04lx, should be %u\n", + ok(cpi.CodePage == lcids[i].threadcp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */, + "wrong codepage %u for lcid %04lx, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); else ok(cpi.CodePage == acp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */, @@ -1185,8 +1186,10 @@ static void test_threadcp(void) { SetThreadLocale(isleads[i].lcid); + GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads[i].testchar); - ok(islead == isleads[i].islead, "wrong islead %i for test char %x in lcid %04lx. should be %i\n", + ok(islead == isleads[i].islead || (cpi.CodePage == CP_UTF8 && !islead), + "wrong islead %i for test char %x in lcid %04lx. should be %i\n", islead, isleads[i].testchar, isleads[i].lcid, isleads[i].islead); }

1 0

Andrew Eikum : windows.media.speech: Add ISpeechSynthesizer2 stub.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 4efd4338e4d14bcbf163ce35da09cb9dc45fffbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4efd4338e4d14bcbf163ce35… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 23 11:21:59 2022 -0500 windows.media.speech: Add ISpeechSynthesizer2 stub. A recent update for Microsoft Flight Simulator requires this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/synthesizer.c | 33 +++++++++++++++++++++++++++++++ dlls/windows.media.speech/tests/speech.c | 12 +++++++++++ include/windows.media.speechsynthesis.idl | 32 ++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 3863e468d36..179229b4bb4 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -151,6 +151,7 @@ static struct voice_information_vector all_voices = struct speech_synthesizer { ISpeechSynthesizer ISpeechSynthesizer_iface; + ISpeechSynthesizer2 ISpeechSynthesizer2_iface; IClosable IClosable_iface; LONG ref; }; @@ -181,6 +182,13 @@ static HRESULT STDMETHODCALLTYPE speech_synthesizer_QueryInterface( return S_OK; } + if (IsEqualGUID(iid, &IID_ISpeechSynthesizer2)) + { + IUnknown_AddRef(iface); + *out = &impl->ISpeechSynthesizer2_iface; + return S_OK; + } + if (IsEqualGUID(iid, &IID_IClosable)) { IUnknown_AddRef(iface); @@ -289,6 +297,30 @@ static const struct ISpeechSynthesizerVtbl speech_synthesizer_vtbl = speech_synthesizer_get_Voice, }; + +DEFINE_IINSPECTABLE(speech_synthesizer2, ISpeechSynthesizer2, struct speech_synthesizer, ISpeechSynthesizer_iface) + +static HRESULT STDMETHODCALLTYPE speech_synthesizer2_get_Options(ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value) +{ + FIXME("iface %p, value %p stub.\n", iface, value); + + return E_NOTIMPL; +} + +static const struct ISpeechSynthesizer2Vtbl speech_synthesizer2_vtbl = +{ + /* IUnknown methods */ + speech_synthesizer2_QueryInterface, + speech_synthesizer2_AddRef, + speech_synthesizer2_Release, + /* IInspectable methods */ + speech_synthesizer2_GetIids, + speech_synthesizer2_GetRuntimeClassName, + speech_synthesizer2_GetTrustLevel, + /* ISpeechSynthesizer2 methods */ + speech_synthesizer2_get_Options, +}; + static HRESULT STDMETHODCALLTYPE closable_QueryInterface( IClosable *iface, REFIID iid, void **out) { @@ -467,6 +499,7 @@ static HRESULT STDMETHODCALLTYPE factory_ActivateInstance( } obj->ISpeechSynthesizer_iface.lpVtbl = &speech_synthesizer_vtbl; + obj->ISpeechSynthesizer2_iface.lpVtbl = &speech_synthesizer2_vtbl; obj->IClosable_iface.lpVtbl = &closable_vtbl; obj->ref = 1; *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index fc0a8d762c1..e88cfc25d54 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -557,6 +557,7 @@ static void test_SpeechSynthesizer(void) IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; ISpeechSynthesizer *synthesizer; + ISpeechSynthesizer2 *synthesizer2; IClosable *closable; HMODULE hdll; HSTRING str, str2; @@ -673,6 +674,17 @@ static void test_SpeechSynthesizer(void) hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer2, (void **)&synthesizer2); + ok(hr == S_OK || + broken(hr == E_NOINTERFACE), /* requires newer Windows */ + "Got unexpected hr %#lx.\n", hr); + + if (hr == S_OK) + { + ref = ISpeechSynthesizer2_Release(synthesizer2); + ok(ref == 3, "Got unexpected ref %lu.\n", ref); + } + ref = IClosable_Release(closable); ok(ref == 2, "Got unexpected ref %lu.\n", ref); diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index 29dca510dee..b2c86f37137 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -39,6 +39,7 @@ namespace Windows { interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesizerOptions; runtimeclass SpeechSynthesisStream; } } @@ -112,6 +113,16 @@ namespace Windows { [propget] HRESULT Voice([out] [retval] VoiceInformation **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(a7c5ecb2-4339-4d6a-bbf8-c7a4f1544c2e) + ] + interface ISpeechSynthesizer2 : IInspectable + { + [propget] HRESULT Options([out, retval] SpeechSynthesizerOptions **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -126,6 +137,19 @@ namespace Windows { [propget] HRESULT Gender([out] [retval] VoiceGender* value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions), + uuid(a0e23871-cc3d-43c9-91b1-ee185324d83d) + ] + interface ISpeechSynthesizerOptions : IInspectable + { + [propget] HRESULT IncludeWordBoundaryMetadata([out, retval] boolean *value); + [propput] HRESULT IncludeWordBoundaryMetadata([in] boolean value); + [propget] HRESULT IncludeSentenceBoundaryMetadata([out, retval] boolean *value); + [propput] HRESULT IncludeSentenceBoundaryMetadata([in] boolean value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), @@ -146,6 +170,14 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechSynthesizerOptions + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions; + } [contract(Windows.Foundation.UniversalApiContract, 1.0)] [marshaling_behavior(agile)]

1 0

Francois Gouget : ntdll: Return the UI language id in uppercase.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: a83eea9b44f8c6a8658101189e339169facefe7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a83eea9b44f8c6a865810118… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 23 16:54:22 2022 +0100 ntdll: Return the UI language id in uppercase. This fixes a failure in kernel32:locale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 74c395cbd85..b6cf2ec0739 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -627,7 +627,7 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); - if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lx", lang ); + if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lX", lang ); else { UNICODE_STRING str;

1 0

Paul Gofman : bcrypt: Fix ECC public key export.
by Alexandre Julliard March 23, 2022

March 23, 2022

Module: wine Branch: master Commit: 00dfa1bd04ae7f93ee7dd4235dd2439697efd318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00dfa1bd04ae7f93ee7dd423… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 16:46:10 2022 +0300 bcrypt: Fix ECC public key export. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 20 +++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 884f4b1d37e..9de126c2bfe 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -91,6 +91,8 @@ static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t, const void *, size_t); static gnutls_sign_algorithm_t (*pgnutls_pk_to_sign)(gnutls_pk_algorithm_t, gnutls_digest_algorithm_t); static int (*pgnutls_pubkey_import_ecc_raw)(gnutls_pubkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *); +static int (*pgnutls_pubkey_export_ecc_raw)(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y); static int (*pgnutls_privkey_import_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t, gnutls_sign_algorithm_t, unsigned int, @@ -158,6 +160,12 @@ static int compat_gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_c return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_pubkey_export_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static int compat_gnutls_privkey_export_rsa_raw(gnutls_privkey_t key, gnutls_datum_t *m, gnutls_datum_t *e, gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t *q, gnutls_datum_t *u, gnutls_datum_t *e1, gnutls_datum_t *e2) @@ -292,6 +300,7 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR_OPT(gnutls_cipher_tag) LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) @@ -673,7 +682,14 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ))) + if (key_data(key)->a.pubkey) + ret = pgnutls_pubkey_export_ecc_raw( key_data(key)->a.pubkey, &curve, &x, &y ); + else if (key_data(key)->a.privkey) + ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ); + else + return STATUS_INVALID_PARAMETER; + + if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -910,6 +926,8 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r return STATUS_NOT_IMPLEMENTED; } + if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER; + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index efb5843fa4e..5d8e81cc522 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1860,6 +1860,16 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset(buffer, 0xcc, sizeof(buffer)); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "Got unexpected magic %#lx.\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPubkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, sizeof(buffer), &size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx\n", status); + status = BCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %#lx\n", status); @@ -1885,6 +1895,14 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset( buffer, 0xcc, sizeof(buffer) ); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "got %#lx\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPrivkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); memset( buffer, 0, sizeof(buffer) ); status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status);

1 0