January 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 08/10] vkd3d: Implement d3d12_fence_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1010b09..848b5cd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -435,9 +435,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const W { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, fence->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, fence->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, -- 2.20.1

1 0

[PATCH vkd3d 07/10] vkd3d: Implement d3d12_command_allocator_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f05b40c..1010b09 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1081,9 +1081,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAl { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, allocator->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, allocator->device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_vk_object_name(allocator->device, (uint64_t)allocator->vk_command_pool, + VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT, name);; } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetDevice(ID3D12CommandAllocator *iface, -- 2.20.1

1 0

[PATCH vkd3d 05/10] vkd3d: Implement d3d12_device_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4b5f522..fba73f9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1564,9 +1564,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device *iface, const { struct d3d12_device *device = impl_from_ID3D12Device(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_vk_object_name(device, (uint64_t)(uintptr_t)device->vk_device, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, name); } static UINT STDMETHODCALLTYPE d3d12_device_GetNodeCount(ID3D12Device *iface) -- 2.20.1

1 0

[PATCH vkd3d 04/10] vkd3d: Implement d3d12_command_signature_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index fa5f8fb..47c8854 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4975,9 +4975,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetName(ID3D12CommandSi { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, signature->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, signature->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetDevice(ID3D12CommandSignature *iface, -- 2.20.1

1 0

[PATCH vkd3d 03/10] vkd3d: Implement d3d12_root_signature_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c419997..75feacc 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -150,9 +150,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetName(ID3D12RootSignatur { struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, root_signature->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, root_signature->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_GetDevice(ID3D12RootSignature *iface, -- 2.20.1

1 0

[PATCH vkd3d 02/10] vkd3d: Implement d3d12_pipeline_state_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 08f2f3c..c419997 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1195,9 +1195,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineStat { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, state->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, state->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetDevice(ID3D12PipelineState *iface, -- 2.20.1

1 0

[PATCH vkd3d 01/10] vkd3d: Implement d3d12_descriptor_heap_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 157123~157127 libs/vkd3d/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ced232d..34f558d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2514,9 +2514,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetName(ID3D12DescriptorH { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetDevice(ID3D12DescriptorHeap *iface, -- 2.20.1

1 0

[PATCH 2/4] mfplat: Implement MFCreateFile().
by Jactry Zeng Jan. 31, 2019

Jan. 31, 2019

Superseded patch 157464. ChangeLog: v2: - Remove unused IMFByteStream_Release(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 21 +++++++----- dlls/mfplat/tests/mfplat.c | 66 ++++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 21 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 9497e304cd..a4fd7329e8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -850,7 +850,11 @@ typedef struct _mfbytestream mfattributes attributes; IMFByteStream IMFByteStream_iface; - IStream *stream; + union + { + IStream *stream; + HANDLE file; + } u; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -903,6 +907,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + CloseHandle(This->u.file); HeapFree(GetProcessHeap(), 0, This); } @@ -1081,7 +1086,7 @@ static ULONG WINAPI stream_mfbytestream_Release(IMFByteStream *iface) if(!ref) { - IStream_Release(This->stream); + IStream_Release(This->u.stream); heap_free(This); } @@ -1323,7 +1328,7 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &stream_mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; - hr = IStream_QueryInterface(stream, &IID_IStream, (void **)&object->stream); + hr = IStream_QueryInterface(stream, &IID_IStream, (void **)&object->u.stream); if(FAILED(hr)) { heap_free(object); @@ -1345,7 +1350,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open DWORD fileattributes = 0; HANDLE file; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { @@ -1383,23 +1388,23 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open if (flags & MF_FILEFLAGS_NOBUFFERING) fileattributes |= FILE_FLAG_NO_BUFFERING; - /* Open HANDLE to file */ file = CreateFileW(url, fileaccessmode, filesharemode, NULL, filecreation_disposition, fileattributes, 0); if(file == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); - /* Close the file again, since we don't do anything with it yet */ - CloseHandle(file); - object = heap_alloc( sizeof(*object) ); if(!object) + { + CloseHandle(file); return E_OUTOFMEMORY; + } init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->u.file = file; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 0ccc680aca..56575b9538 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -63,6 +63,28 @@ static void _check_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } +#define CHECK_BS_POS(obj,pos) _check_bs_pos(obj, pos, __LINE__) +static void _check_bs_pos(IMFByteStream* obj, QWORD pos, int line) +{ + QWORD position = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetCurrentPosition(obj, &position); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetCurrentPosition failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(position == pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(position)); +} + +#define CHECK_BS_LEN(obj,len) _check_bs_len(obj, len, __LINE__) +static void _check_bs_len(IMFByteStream* obj, QWORD len, int line) +{ + QWORD length = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetLength(obj, &length); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(length == len, "got wrong length: %s.\n", + wine_dbgstr_longlong(length)); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -520,7 +542,8 @@ static void test_MFCreateFile(void) IMFAttributes *attributes = NULL; HRESULT hr; WCHAR *filename; - + LONG file_size; + HANDLE handle; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; filename = load_resource(mp4file); @@ -545,13 +568,11 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -569,18 +590,15 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -591,10 +609,32 @@ static void test_MFCreateFile(void) /* Opening the file again fails even though MF_FILEFLAGS_ALLOW_WRITE_SHARING is set. */ hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); + + IMFByteStream_Release(bytestream); + + /* test MF_OPENMODE_APPEND_IF_EXIST */ + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + CloseHandle(handle); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, file_size); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + /* test MF_OPENMODE_RESET_IF_EXIST */ + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, 0); + todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok(file_size == 0, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); MFShutdown(); -- 2.20.1

1 1

[PATCH v2 2/2] mfreadwrite: Register MFReadWriteClassFactory interface
by Alistair Leslie-Hughes Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfreadwrite/Makefile.in | 2 ++ dlls/mfreadwrite/main.c | 13 +++++++++++++ dlls/mfreadwrite/mf_classes.idl | 25 +++++++++++++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 ++ 4 files changed, 42 insertions(+) create mode 100644 dlls/mfreadwrite/mf_classes.idl diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 4b8ee82506..445beaa62d 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -3,3 +3,5 @@ IMPORTLIB = mfreadwrite C_SRCS = \ main.c + +IDL_SRCS = mf_classes.idl diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 2a5e29a48e..b001e68354 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static HINSTANCE mfinstance; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -38,6 +40,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + mfinstance = instance; DisableThreadLibraryCalls(instance); break; } @@ -65,6 +68,16 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( mfinstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( mfinstance ); +} + typedef struct _srcreader { IMFSourceReader IMFSourceReader_iface; diff --git a/dlls/mfreadwrite/mf_classes.idl b/dlls/mfreadwrite/mf_classes.idl new file mode 100644 index 0000000000..99dbd80018 --- /dev/null +++ b/dlls/mfreadwrite/mf_classes.idl @@ -0,0 +1,25 @@ +/* + * + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma makedep register + +[ + threading(both), + uuid(48e2ed0f-98c2-4a37-bed5-166312ddd83f) +] +coclass MFReadWriteClassFactory { interface IMFReadWriteClassFactory; } diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index f46c5923e2..ad61646718 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -1,5 +1,7 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) -- 2.20.1

1 0

[PATCH 2/2] crypt32: Simplify the code.
by Dmitry Timoshkov Jan. 31, 2019

Jan. 31, 2019

cache can't be FALSE at this point. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a0fe5bb245..ef7b138c4c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -919,7 +919,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, if (pdwKeySpec) *pdwKeySpec = keyContext.dwKeySpec; if (pfCallerFreeProv) - *pfCallerFreeProv = !cache; + *pfCallerFreeProv = FALSE; } } if (!*phCryptProv) -- 2.20.1

1 0