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

Dmitry Timoshkov : dllhost: Implement IMarshal::MarshalInterface().
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 4d011e16f6a681769544c9f55af762ea3bc4055a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d011e16f6a681769544c9f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 9 10:45:50 2022 +0300 dllhost: Implement IMarshal::MarshalInterface(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dllhost/dllhost.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index bfe1d4cbbd6..241b79d13a0 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -147,9 +147,11 @@ static ULONG WINAPI marshal_Release(IMarshal *iface) static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx,%p): stub\n", iface, wine_dbgstr_guid(iid), pv, + TRACE("(%p,%s,%p,%08lx,%p,%08lx,%p)\n", iface, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags, clsid); - return E_NOTIMPL; + + *clsid = CLSID_StdMarshal; + return S_OK; } static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *pv, @@ -163,8 +165,19 @@ static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, voi static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx): stub\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); - return E_NOTIMPL; + struct factory *factory = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("(%p,%s,%p,%08lx,%p,%08lx)\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); + + hr = CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, (void **)&object); + if (hr == S_OK) + { + hr = CoMarshalInterface(stream, iid, object, dwDestContext, pvDestContext, mshlflags); + IUnknown_Release(object); + } + return hr; } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream,

1 0

Dmitry Timoshkov : dllhost: Periodically call CoFreeUnusedLibraries().
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: eaf72619448833d856f183349122b7707c02445d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaf72619448833d856f18334… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 9 10:45:53 2022 +0300 dllhost: Periodically call CoFreeUnusedLibraries(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dllhost/dllhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 241b79d13a0..dc89c978510 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -352,7 +352,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - WaitForSingleObject(surrogate.event, INFINITE); + while (WaitForSingleObject(surrogate.event, 30000) != WAIT_OBJECT_0) + CoFreeUnusedLibraries(); } cleanup:

1 0

Dmitry Timoshkov : combase: Start surrogate local server when required.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: f9cd4c915f1929db439aa527dc922cbfd9953327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9cd4c915f1929db439aa527… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 9 10:45:56 2022 +0300 combase: Start surrogate local server when required. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20296 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/rpc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 0a86183030a..40f900175dd 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -522,6 +522,52 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return S_OK; } +static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) +{ + static const WCHAR processidW[] = L" /PROCESSID:"; + HKEY key; + HRESULT hr; + WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID]; + DWORD size; + STARTUPINFOW sinfo; + PROCESS_INFORMATION pinfo; + LONG ret; + + TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); + if (FAILED(hr)) + return hr; + + size = (MAX_PATH + 1) * sizeof(WCHAR); + ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); + RegCloseKey(key); + if (ret || !size || !command[0]) + { + TRACE("No value for DllSurrogate key\n"); + wcscpy(command, L"dllhost.exe"); + } + + /* Surrogate EXE servers are started with the /PROCESSID:{GUID} switch. */ + wcscat(command, processidW); + StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); + + memset(&sinfo, 0, sizeof(sinfo)); + sinfo.cb = sizeof(sinfo); + + TRACE("Activating surrogate local server %s\n", debugstr_w(command)); + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + return HRESULT_FROM_WIN32(GetLastError()); + } + *process = pinfo.hProcess; + CloseHandle(pinfo.hThread); + + return S_OK; +} + HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) { PMInterfacePointer objref = NULL; @@ -546,7 +592,8 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) if (tries == 1) { - if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) ) + if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) && + (hr = create_surrogate_server(rclsid, &process)) ) return hr; }

1 0

Zebediah Figura : wined3d: Do not print a d3d_perf warning in adapter_vk_alloc_bo() for unmapped BOs.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 1eabd774223092af1a8e945c066dfc68fcf11581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eabd774223092af1a8e945c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 9 18:46:06 2022 -0600 wined3d: Do not print a d3d_perf warning in adapter_vk_alloc_bo() for unmapped BOs. BOs will always be unmapped here. This is a relic from an older form of the code where mapping was done in wined3d_context_vk_create_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 088e1afa3bc..506c7167f31 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -21,7 +21,6 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static const struct wined3d_state_entry_template misc_state_template_vk[] = { @@ -1287,9 +1286,6 @@ static bool adapter_vk_alloc_bo(struct wined3d_device *device, struct wined3d_re if (!bo_vk->b.map_ptr) { - WARN_(d3d_perf)("BO %p (chunk %p, slab %p) is not mapped.\n", - bo_vk, bo_vk->memory ? bo_vk->memory->chunk : NULL, bo_vk->slab); - if (!wined3d_bo_vk_map(bo_vk, context_vk)) ERR("Failed to map bo.\n"); }

1 0

Zebediah Figura : d3d11: Do not print a FIXME for dynamic linking in shader retrieval functions.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 6a08d902cca38b7abf614bb3f60570dcf91eea94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a08d902cca38b7abf614bb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 9 18:46:34 2022 -0600 d3d11: Do not print a FIXME for dynamic linking in shader retrieval functions. Many applications call GetShader functions with non-NULL class instance pointers despite never using dynamic linking, in an apparent attempt to save all device state. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 92d4533b105..0a44a7c4f8e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1734,8 +1734,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_PSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -1792,8 +1790,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_VSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -1926,8 +1922,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_GSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2393,8 +2387,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_HSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2487,8 +2479,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_DSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2607,8 +2597,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_CSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0;

1 0

Zebediah Figura : d3d11: Do not print a FIXME for dynamic linking when zero class instances are passed.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: eea57f4ec05db1c575ce750cf4c68964a766e52c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea57f4ec05db1c575ce750c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 9 18:46:35 2022 -0600 d3d11: Do not print a FIXME for dynamic linking when zero class instances are passed. Many applications pass a non-NULL array pointer but a count of zero. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0a44a7c4f8e..cda1a97f974 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -730,7 +730,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_PSSetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); - if (class_instances) + if (class_instance_count) FIXME("Dynamic linking is not implemented yet.\n"); wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_PIXEL, @@ -755,7 +755,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_VSSetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); - if (class_instances) + if (class_instance_count) FIXME("Dynamic linking is not implemented yet.\n"); wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_VERTEX, @@ -941,7 +941,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_GSSetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); - if (class_instances) + if (class_instance_count) FIXME("Dynamic linking is not implemented yet.\n"); wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY, @@ -1544,7 +1544,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_HSSetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); - if (class_instances) + if (class_instance_count) FIXME("Dynamic linking is not implemented yet.\n"); wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_HULL, @@ -1588,7 +1588,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_DSSetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); - if (class_instances) + if (class_instance_count) FIXME("Dynamic linking is not implemented yet.\n"); wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_DOMAIN, @@ -1659,7 +1659,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_CSSetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); - if (class_instances) + if (class_instance_count) FIXME("Dynamic linking is not implemented yet.\n"); wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_COMPUTE,

1 0

Santino Mazza : ncrypt: Implement NCryptCreatePersistedKey.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 545ec32d28d1a0674a031aaf34aefe1127089b27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=545ec32d28d1a0674a031aaf… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Thu Mar 10 11:05:05 2022 +0100 ncrypt: Implement NCryptCreatePersistedKey. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 253 ++++++++++++++++++++++++++---------------- dlls/ncrypt/ncrypt_internal.h | 11 ++ dlls/ncrypt/tests/ncrypt.c | 8 +- 3 files changed, 177 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=545ec32d28d1a0674a03…

1 0

Hans Leidekker : bcrypt: Return an error when BCryptFinalizeKeyPair() is called twice.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 9ff16aa1cb3e7fd0e8c2ff0a0389875eeaf993ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ff16aa1cb3e7fd0e8c2ff0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 10 11:05:06 2022 +0100 bcrypt: Return an error when BCryptFinalizeKeyPair() is called twice. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 1 + dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e1b32be32a4..6862c5cdcf2 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -846,6 +846,7 @@ static NTSTATUS key_asymmetric_generate( void *args ) int ret; if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + if (key_data(key)->privkey) return STATUS_INVALID_HANDLE; switch (key->alg_id) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 8982e0ae90b..efb5843fa4e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2157,6 +2157,9 @@ static void test_RSA(void) ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); + size = 0; buf = HeapAlloc(GetProcessHeap(), 0, sizeof(rsaPrivateBlob)); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf, sizeof(rsaPrivateBlob), &size, 0); @@ -2565,6 +2568,9 @@ static void test_BCryptSignHash(void) ret = BCryptFinalizeKeyPair(key, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); + len = 0; memset(sig, 0, sizeof(sig));

1 0

Santino Mazza : ncrypt: Implement NCryptFinalizeKey.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: bd55fe145eb96bd4ff9b31d98b0c2f9302c8ae84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd55fe145eb96bd4ff9b31d9… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Thu Mar 10 11:05:07 2022 +0100 ncrypt: Implement NCryptFinalizeKey. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 43 ++++++++++++++++++++++++++++++++++++++++--- dlls/ncrypt/tests/ncrypt.c | 25 +++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f76d5885476..f7af49e6610 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "ncrypt.h" @@ -30,6 +32,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); +static SECURITY_STATUS map_ntstatus(NTSTATUS status) +{ + switch (status) + { + case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + default: + FIXME("unhandled status %#lx\n", status); + return NTE_INTERNAL_ERROR; + } +} + static struct object *allocate_object(enum object_type type) { struct object *ret; @@ -227,10 +240,34 @@ SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR * return NTE_NOT_SUPPORTED; } -SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) +SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE handle, DWORD flags) { - FIXME("(%#Ix, %#lx): stub\n", key, flags); - return NTE_NOT_SUPPORTED; + struct object *object = (struct object *)handle; + DWORD key_length; + struct object_property *prop; + NTSTATUS status; + + TRACE("(%#Ix, %#lx)\n", handle, flags); + + if (!object || object->type != KEY) return NTE_INVALID_HANDLE; + + if (!(prop = get_object_property(object, NCRYPT_LENGTH_PROPERTY))) return NTE_INVALID_HANDLE; + key_length = *(DWORD *)prop->value; + status = BCryptSetProperty(object->key.bcrypt_key, BCRYPT_KEY_LENGTH, (UCHAR *)&key_length, sizeof(key_length), 0); + if (status != STATUS_SUCCESS) + { + ERR("Error setting key length property\n"); + return map_ntstatus(status); + } + + status = BCryptFinalizeKeyPair(object->key.bcrypt_key, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error finalizing key pair\n"); + return map_ntstatus(status); + } + + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index ec69b236ac9..fc951fef80a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -306,6 +306,30 @@ static void test_create_persisted_key(void) NCryptFreeObject(prov); } +static void test_finalize_key(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(key, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(key, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(0, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + NCryptFreeObject(key); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -313,4 +337,5 @@ START_TEST(ncrypt) test_get_property(); test_set_property(); test_create_persisted_key(); + test_finalize_key(); }

1 0

Hans Leidekker : ncrypt: Always map bcrypt return values.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 0f5f8f980ffcb7b54e47674cd6d1f710bc41533c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f5f8f980ffcb7b54e47674c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 10 11:05:08 2022 +0100 ncrypt: Always map bcrypt return values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f7af49e6610..d7a79faecce 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -37,6 +37,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) switch (status) { case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); return NTE_INTERNAL_ERROR; @@ -123,7 +124,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) { struct object *object; - NTSTATUS ret; + NTSTATUS status; if (!(object = allocate_object(KEY))) { @@ -135,10 +136,10 @@ static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE pro { case RSA: { - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + status = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (status != STATUS_SUCCESS) { - ERR("Error opening algorithm provider\n"); + ERR("Error opening algorithm provider %#lx\n", status); free(object); return NULL; } @@ -174,7 +175,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) { - NTSTATUS ret; + NTSTATUS status; DWORD default_bitlen = 1024; if (!(object = create_key_object(RSA, provider))) @@ -183,13 +184,13 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR return NTE_NO_MEMORY; } - ret = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); - if (ret != ERROR_SUCCESS) + status = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); + if (status != STATUS_SUCCESS) { - ERR("Error generating key pair\n"); + ERR("Error generating key pair %#lx\n", status); BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); - return NTE_INTERNAL_ERROR; + return map_ntstatus(status); } set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlen, sizeof(default_bitlen)); @@ -278,15 +279,16 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) static SECURITY_STATUS free_key_object(struct key *key) { - NTSTATUS ret = BCryptDestroyKey(key->bcrypt_key); - if (BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0)) return NTE_INVALID_HANDLE; - return ret ? NTE_INVALID_HANDLE : ERROR_SUCCESS; + NTSTATUS status, status2; + status = BCryptDestroyKey(key->bcrypt_key); + if ((status2 = BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0))) return map_ntstatus(status2); + return status ? map_ntstatus(status) : ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) { struct object *object = (struct object *)handle; - SECURITY_STATUS ret = ERROR_SUCCESS; + SECURITY_STATUS ret = STATUS_SUCCESS; unsigned int i; TRACE("(%#Ix)\n", handle); @@ -378,7 +380,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H case BCRYPT_RSAPRIVATE_MAGIC: case BCRYPT_RSAPUBLIC_MAGIC: { - NTSTATUS ret; + NTSTATUS status; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; if (!(object = create_key_object(RSA, provider))) @@ -387,13 +389,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_NO_MEMORY; } - ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); - if (ret != ERROR_SUCCESS) + status = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); + if (status != STATUS_SUCCESS) { - WARN("Error importing key pair with bcrypt %#lx\n", ret); + WARN("Error importing key pair %#lx\n", status); BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); - return NTE_BAD_DATA; + return map_ntstatus(status); } set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength));

1 0