October 2019 - Wine-devel - list.winehq.org

[PATCH] kernel32/tests: Fix some codepage tests under Windows 10.
by Zebediah Figura 26 Oct '19

26 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 38f094fcc8..8b6584415c 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -271,7 +271,8 @@ static void test_other_invalid_parameters(void) SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + || broken(len == 12) /* Win10 1709+ */, "len=%d error=%x\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); @@ -286,7 +287,8 @@ static void test_other_invalid_parameters(void) SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + || broken(len == 12) /* Win10 1709+ */, "len=%d error=%x\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); @@ -304,7 +306,9 @@ static void test_other_invalid_parameters(void) /* CP_UTF8, unrecognized flag and used not NULL => ERROR_INVALID_PARAMETER */ SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0x100, w_string, w_string_len, c_string, c_string_len, NULL, &used); - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + ok(len == 0, "wrong ret %d\n", len); + ok(GetLastError() == ERROR_INVALID_PARAMETER + || GetLastError() == ERROR_INVALID_FLAGS /* Win10 1709+ */, "wrong error %u\n", GetLastError()); } static void test_overlapped_buffers(void) -- 2.20.1

1 0

[PATCH v3] comsvcs/tests: Increase the timeout in the implicit MTA test.
by Zebediah Figura 25 Oct '19

25 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/comsvcs/tests/dispenser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 98d2a91bf5..10bce8e849 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -186,7 +186,7 @@ static void create_dispenser(void) * actually initialize. */ Sleep(200); thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); - ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + ok(!WaitForSingleObject(thread, 20000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); -- 2.20.1

1 0

[PATCH v2] crypt32/tests: Clean up test_format_object().
by Zebediah Figura 25 Oct '19

25 Oct '19

Get rid of no longer needed workarounds, and handle a broken case in Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/crypt32/tests/main.c | 139 +++++++++++++++----------------------- 1 file changed, 56 insertions(+), 83 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 6a031527d8..09aea37022 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -393,119 +393,92 @@ static void test_CryptInstallOssGlobal(void) } } -static const BYTE encodedInt[] = { 0x02,0x01,0x01 }; -static const WCHAR encodedIntStr[] = { '0','2',' ','0','1',' ','0','1',0 }; -static const BYTE encodedBigInt[] = { 0x02,0x1f,0x01,0x02,0x03,0x04,0x05,0x06, - 0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15, - 0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f }; -static const WCHAR encodedBigIntStr[] = { '0','2',' ','1','f',' ','0','1',' ', - '0','2',' ','0','3',' ','0','4',' ','0','5',' ','0','6',' ','0','7',' ','0', - '8',' ','0','9',' ','0','a',' ','0','b',' ','0','c',' ','0','d',' ','0','e', - ' ','0','f',' ','1','0',' ','1','1',' ','1','2',' ','1','3',' ','1','4',' ', - '1','5',' ','1','6',' ','1','7',' ','1','8',' ','1','9',' ','1','a',' ','1', - 'b',' ','1','c',' ','1','d',' ','1','e',' ','1','f',0 }; - static void test_format_object(void) { - BOOL (WINAPI *pCryptFormatObject)(DWORD dwEncoding, DWORD dwFormatType, - DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, - const BYTE *pbEncoded, DWORD dwEncoded, void *pbFormat, - DWORD *pcbFormat); + static const BYTE encodedInt[] = {0x02,0x01,0x01}; + static const BYTE encodedBigInt[] = {0x02,0x1f,0x01,0x02,0x03,0x04,0x05, + 0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12, + 0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f}; + static const WCHAR encodedBigIntStr[] = L"02 1f 01 02 03 04 05 06 07 08 09 " + "0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f"; + BOOL ret; DWORD size; - LPWSTR str; + WCHAR str[100]; - pCryptFormatObject = (void *)GetProcAddress(hCrypt, "CryptFormatObject"); - if (!pCryptFormatObject) - { - skip("No CryptFormatObject\n"); - return; - } /* Crash */ if (0) { - pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); + CryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); } /* When called with any but the default encoding, it fails to find a * formatting function. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, - "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ret = CryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + /* When called with the default encoding type for any undefined struct type * (including none), it succeeds: the default encoding is a hex string * encoding. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - NULL, &size); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, NULL, &size); ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - if (size == 0 && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("CryptFormatObject has no default implementation\n"); - return; - } - ok(size == sizeof(WCHAR), "unexpected size %d\n", size); - str = HeapAlloc(GetProcessHeap(), 0, size); - SetLastError(0xdeadbeef); - size = 0; - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - str, &size); - ok(!ret && GetLastError() == ERROR_MORE_DATA, - "expected ERROR_MORE_DATA, got %d\n", GetLastError()); - size = sizeof(WCHAR); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!str[0], "expected empty string\n"); - HeapFree(GetProcessHeap(), 0, str); - } - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, - sizeof(encodedInt), NULL, &size); + ok(size == sizeof(WCHAR) || broken(!size) /* Win10 1709+ */, "wrong size %d\n", size); + + SetLastError(0xdeadbeef); + size = 0; + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, str, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_MORE_DATA, "wrong error %u\n", GetLastError()); + + size = sizeof(WCHAR); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, str, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(!str[0], "expected empty string\n"); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, + sizeof(encodedInt), NULL, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(size >= sizeof(L"02 01 01"), "wrong size %u\n", size); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, + sizeof(encodedInt), str, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(!wcscmp(str, L"02 01 01"), "wrong string %s\n", wine_dbgstr_w(str)); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedBigInt, + sizeof(encodedBigInt), NULL, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(size >= sizeof(encodedBigIntStr), "wrong size %u\n", size); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, + encodedBigInt, sizeof(encodedBigInt), str, &size); ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - str = HeapAlloc(GetProcessHeap(), 0, size); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedInt, sizeof(encodedInt), str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!lstrcmpW(str, encodedIntStr), "unexpected format string\n"); - HeapFree(GetProcessHeap(), 0, str); - } - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedBigInt, sizeof(encodedBigInt), NULL, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - str = HeapAlloc(GetProcessHeap(), 0, size); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedBigInt, sizeof(encodedBigInt), str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!lstrcmpiW(str, encodedBigIntStr), "unexpected format string\n"); - HeapFree(GetProcessHeap(), 0, str); - } + ok(!wcsicmp(str, encodedBigIntStr), "wrong string %s\n", wine_dbgstr_w(str)); + /* When called with the default encoding type for any undefined struct * type but CRYPT_FORMAT_STR_NO_HEX specified, it fails to find a * formatting function. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, - NULL, NULL, NULL, 0, NULL, &size); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, + NULL, NULL, NULL, 0, NULL, &size); ok(!ret, "CryptFormatObject succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == 0xdeadbeef, /* Vista, W2K8 */ - "expected ERROR_FILE_NOT_FOUND or no change, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND + || GetLastError() == 0xdeadbeef, /* Vista, W2K8 */ + "wrong error %u\n", GetLastError()); + /* When called to format an AUTHORITY_KEY_ID2_INFO, it fails when no * data are given. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, - szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %d\n", GetLastError()); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, + szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == E_INVALIDARG, "wrong error %u\n", GetLastError()); } START_TEST(main) -- 2.20.1

1 0

[PATCH] mstask/tests: Wait a bit longer for tasks to start and terminate.
by Sven Baars 25 Oct '19

25 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- In an attempt to fix all of the mastask:task test failures. dlls/mstask/tests/task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6195194d61..a9957117e9 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -626,7 +626,7 @@ static void test_Run(void) * This is how it's supposed to look like in the application * (the loop should be infinite): */ - for (i = 0; i < 3; i++) + for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "Activate error %#x\n", hr); @@ -661,7 +661,7 @@ static void test_Run(void) * This is how it's supposed to look like in the application * (the loop should be infinite): */ - for (i = 0; i < 3; i++) + for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "Activate error %#x\n", hr); -- 2.17.1

1 0

[PATCH] dmband: Simplify DllGetClassObject
by Alistair Leslie-Hughes 25 Oct '19

25 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- Remove IID_IClassFactory checks Cast to a IUnknown pointer. dlls/dmband/dmband_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index f72b41570b..0a5a5c066e 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -145,16 +145,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); - if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &Band_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBandTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &BandTrack_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } - + if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand)) + *ppv = &Band_CF; + else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBandTrack)) + *ppv = &BandTrack_CF; + + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + WARN("(%s, %s, %p): no interface found.\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } -- 2.17.1

3 2

[PATCH vkd3d] vkd3d: Do not report a root signature version higher than requested.
by Rémi Bernon 25 Oct '19

25 Oct '19

This fixes Shadow of the Tomb Raider crashing because of NULL root signatures being passed since c002aee119b638d30eeb7cdc91099449ccafeafc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- libs/vkd3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d30c447c..30cee112 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2512,7 +2512,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + TRACE("Root signature requested %#x.\n", data->HighestVersion); + data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_1); TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; -- 2.24.0.rc0

4 7

[PATCH v3 1/2] vkd3d: Add support for custom heap properties.
by Conor McCarthy 25 Oct '19

25 Oct '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v3: Add D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE to interface definition. --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/resource.c | 64 ++++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 8489f56..ec8b83d 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -309,6 +309,7 @@ typedef enum D3D12_HEAP_TYPE typedef enum D3D12_CPU_PAGE_PROPERTY { D3D12_CPU_PAGE_PROPERTY_UNKNOWN = 0, + D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE = 1, D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE = 2, D3D12_CPU_PAGE_PROPERTY_WRITE_BACK = 3, } D3D12_CPU_PAGE_PROPERTY; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 626772e..b63a578 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -34,8 +34,17 @@ static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *propertie return true; } -static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) +static bool is_numa_device(struct d3d12_device *device) +{ + unsigned int i; + for (i = 0; i < device->memory_properties.memoryTypeCount; ++i) + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) + return true; + return false; +} + +static HRESULT vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, unsigned int *type_index) { const VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; VkMemoryPropertyFlags flags[3]; @@ -58,16 +67,36 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 break; case D3D12_HEAP_TYPE_CUSTOM: - FIXME("Custom heaps not supported yet.\n"); - flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; - flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; - flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (heap_properties->MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN + || (heap_properties->MemoryPoolPreference == D3D12_MEMORY_POOL_L1 + && (is_cpu_accessible_heap(heap_properties) || !is_numa_device(device)))) + { + WARN("Invalid memory pool preference.\n"); + return E_INVALIDARG; + } + + switch (heap_properties->CPUPageProperty) + { + case D3D12_CPU_PAGE_PROPERTY_WRITE_BACK: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + /* Fall through. */ + case D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + /* Fall through. */ + case D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE: + flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + break; + case D3D12_CPU_PAGE_PROPERTY_UNKNOWN: + default: + WARN("Invalid CPU page property.\n"); + return E_INVALIDARG; + } break; default: WARN("Invalid heap type %#x.\n", heap_properties->Type); - return ~0u; + return E_INVALIDARG; } for (j = 0; j < count; ++j) @@ -79,11 +108,14 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 if (!(memory_type_mask & (1u << i))) continue; if ((memory_info->memoryTypes[i].propertyFlags & preferred_flags) == preferred_flags) - return i; + { + *type_index = i; + return S_OK; + } } } - return ~0u; + return E_FAIL; } static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, @@ -95,6 +127,7 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryAllocateInfo allocate_info; VkResult vr; + HRESULT hr; TRACE("Memory requirements: size %#"PRIx64", alignment %#"PRIx64".\n", memory_requirements->size, memory_requirements->alignment); @@ -102,14 +135,13 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; allocate_info.pNext = dedicated_allocate_info; allocate_info.allocationSize = memory_requirements->size; - allocate_info.memoryTypeIndex = vkd3d_select_memory_type(device, - memory_requirements->memoryTypeBits, heap_properties, heap_flags); - - if (allocate_info.memoryTypeIndex == ~0u) + if (FAILED(hr = vkd3d_select_memory_type(device, memory_requirements->memoryTypeBits, + heap_properties, heap_flags, &allocate_info.memoryTypeIndex))) { - FIXME("Failed to find suitable memory type (allowed types %#x).\n", memory_requirements->memoryTypeBits); + if (hr != E_INVALIDARG) + FIXME("Failed to find suitable memory type (allowed types %#x).\n", memory_requirements->memoryTypeBits); *vk_memory = VK_NULL_HANDLE; - return E_FAIL; + return hr; } TRACE("Allocating memory type %u.\n", allocate_info.memoryTypeIndex); -- 2.23.0

2 3

[PATCH vkd3d] vkd3d: Clamp buffer image copy size to subresource dimensions.
by Rémi Bernon 25 Oct '19

25 Oct '19

This fixes a vulkan validation error. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- libs/vkd3d/command.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 59ea4829..bb530093 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3076,17 +3076,24 @@ static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, copy->imageOffset.x = dst_x; copy->imageOffset.y = dst_y; copy->imageOffset.z = dst_z; + + vk_extent_3d_from_d3d12_miplevel(&copy->imageExtent, image_desc, + copy->imageSubresource.mipLevel); + copy->imageExtent.width -= copy->imageOffset.x; + copy->imageExtent.height -= copy->imageOffset.y; + copy->imageExtent.depth -= copy->imageOffset.z; + if (src_box) { - copy->imageExtent.width = src_box->right - src_box->left; - copy->imageExtent.height = src_box->bottom - src_box->top; - copy->imageExtent.depth = src_box->back - src_box->front; + copy->imageExtent.width = min(copy->imageExtent.width, src_box->right - src_box->left); + copy->imageExtent.height = min(copy->imageExtent.height, src_box->bottom - src_box->top); + copy->imageExtent.depth = min(copy->imageExtent.depth, src_box->back - src_box->front); } else { - copy->imageExtent.width = footprint->Footprint.Width; - copy->imageExtent.height = footprint->Footprint.Height; - copy->imageExtent.depth = footprint->Footprint.Depth; + copy->imageExtent.width = min(copy->imageExtent.width, footprint->Footprint.Width); + copy->imageExtent.height = min(copy->imageExtent.height, footprint->Footprint.Height); + copy->imageExtent.depth = min(copy->imageExtent.depth, footprint->Footprint.Depth); } } -- 2.24.0.rc0

2 1

[PATCH v2] vkd3d: Add support for multiplanar depth/stencil state transitions.
by Conor McCarthy 25 Oct '19

25 Oct '19

If separate transitions of the depth and stencil plane occur in the same array of barriers, they will be consolidated into one Vulkan layout transition. This can only be supported for combinations of depth read and depth write states, or identical states. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Fix unsafe sizeof(). --- libs/vkd3d/command.c | 118 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 106 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 59ea482..4338cd4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1872,7 +1872,7 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } } -static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, +static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, unsigned int stencil_state, const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { @@ -1911,7 +1911,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, } else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { - vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, + vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); return true; } @@ -1945,7 +1945,12 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, *stage_flags = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + { + if (!stencil_state || (stencil_state & D3D12_RESOURCE_STATE_DEPTH_WRITE)) + *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + else + *image_layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL; + } return true; case D3D12_RESOURCE_STATE_COPY_DEST: @@ -1975,7 +1980,17 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, *access_mask = 0; *stage_flags = 0; if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + { + if (stencil_state & D3D12_RESOURCE_STATE_DEPTH_WRITE) + { + *image_layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL; + *access_mask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + } + else + { + *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + } + } break; case D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE: @@ -2096,7 +2111,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 barrier.oldLayout = d3d12_resource_is_cpu_accessible(resource) ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; - if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, + if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, 0, resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); @@ -3710,6 +3725,44 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics list->state = state; } +static bool is_ds_multiplanar_resolvable(unsigned int first_state, unsigned int second_state) +{ + /* Only combinations of depth/stencil read/write are supported. */ + return first_state == second_state + || ((first_state & (D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_DEPTH_WRITE)) + && (second_state & (D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_DEPTH_WRITE))); +} + +static unsigned int d3d12_find_ds_multiplanar_transition(const D3D12_RESOURCE_BARRIER *barriers, + unsigned int i, unsigned int barrier_count, unsigned int sub_resource_count) +{ + unsigned int sub_resource_idx = barriers[i].u.Transition.Subresource; + unsigned int j; + + for (j = i + 1; j < barrier_count; ++j) + { + if (barriers[j].Type == D3D12_RESOURCE_BARRIER_TYPE_TRANSITION + && barriers[j].u.Transition.pResource == barriers[i].u.Transition.pResource + && sub_resource_idx % sub_resource_count == barriers[j].u.Transition.Subresource % sub_resource_count) + { + /* Second barrier must be for a different plane. */ + if (barriers[j].u.Transition.Subresource == sub_resource_idx) + return 0; + + /* Validate the second barrier and check if the combination of two states is supported. */ + if (!is_valid_resource_state(barriers[j].u.Transition.StateBefore) + || !is_ds_multiplanar_resolvable(barriers[i].u.Transition.StateBefore, barriers[j].u.Transition.StateBefore) + || !is_valid_resource_state(barriers[j].u.Transition.StateAfter) + || !is_ds_multiplanar_resolvable(barriers[i].u.Transition.StateAfter, barriers[j].u.Transition.StateAfter) + || barriers[j].u.Transition.Subresource >= sub_resource_count * 2u) + return 0; + + return j; + } + } + return 0; +} + static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList1 *iface, UINT barrier_count, const D3D12_RESOURCE_BARRIER *barriers) { @@ -3717,6 +3770,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC bool have_aliasing_barriers = false, have_split_barriers = false; const struct vkd3d_vk_device_procs *vk_procs; const struct vkd3d_vulkan_info *vk_info; + bool *multiplanar_handled = NULL; unsigned int i; TRACE("iface %p, barrier_count %u, barriers %p.\n", iface, barrier_count, barriers); @@ -3746,6 +3800,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC { case D3D12_RESOURCE_BARRIER_TYPE_TRANSITION: { + unsigned int state_before, state_after, stencil_state_before = 0, stencil_state_after = 0; const D3D12_RESOURCE_TRANSITION_BARRIER *transition = &current->u.Transition; if (!is_valid_resource_state(transition->StateBefore)) @@ -3767,18 +3822,55 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC continue; } + if (multiplanar_handled && multiplanar_handled[i]) + continue; + + state_before = transition->StateBefore; + state_after = transition->StateAfter; + sub_resource_idx = transition->Subresource; - if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, + if (sub_resource_idx != D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES + && (resource->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) + { + unsigned int sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + unsigned int j = d3d12_find_ds_multiplanar_transition(barriers, i, barrier_count, sub_resource_count); + if (j && (multiplanar_handled || (multiplanar_handled = vkd3d_calloc(barrier_count, sizeof(*multiplanar_handled))))) + { + multiplanar_handled[j] = true; + if (sub_resource_idx >= sub_resource_count) + { + sub_resource_idx -= sub_resource_count; + /* The stencil barrier is at i, depth at j. */ + state_before = barriers[j].u.Transition.StateBefore; + state_after = barriers[j].u.Transition.StateAfter; + stencil_state_before = transition->StateBefore; + stencil_state_after = transition->StateAfter; + } + else + { + /* Depth at i, stencil at j. */ + stencil_state_before = barriers[j].u.Transition.StateBefore; + stencil_state_after = barriers[j].u.Transition.StateAfter; + } + } + else if (sub_resource_idx >= sub_resource_count) + { + FIXME_ONCE("Unhandled sub-resource idx %u.\n", sub_resource_idx); + continue; + } + } + + if (!vk_barrier_parameters_from_d3d12_resource_state(state_before, stencil_state_before, resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before)) { - FIXME("Unhandled state %#x.\n", transition->StateBefore); + FIXME("Unhandled state %#x.\n", state_before); continue; } - if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, + if (!vk_barrier_parameters_from_d3d12_resource_state(state_after, stencil_state_after, resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after)) { - FIXME("Unhandled state %#x.\n", transition->StateAfter); + FIXME("Unhandled state %#x.\n", state_after); continue; } @@ -3795,7 +3887,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC VkAccessFlags access_mask; resource = unsafe_impl_from_ID3D12Resource(uav->pResource); - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; @@ -3894,6 +3986,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } } + vkd3d_free(multiplanar_handled); + if (have_aliasing_barriers) FIXME_ONCE("Aliasing barriers not implemented yet.\n"); @@ -4737,7 +4831,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID buffer_barrier.offset = cpu_descriptor->uav.buffer.offset; buffer_barrier.size = cpu_descriptor->uav.buffer.size; - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, resource_impl, list->vk_queue_flags, vk_info, &buffer_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, @@ -4770,7 +4864,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID image_barrier.image = resource_impl->u.vk_image; image_barrier.subresourceRange = range; - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, resource_impl, list->vk_queue_flags, vk_info, &image_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, -- 2.23.0

2 1

[PATCH] crypt32: Clean up test_format_object().
by Zebediah Figura 25 Oct '19

25 Oct '19

Get rid of no longer needed workarounds, and handle a broken case in Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/crypt32/tests/main.c | 139 +++++++++++++++----------------------- 1 file changed, 56 insertions(+), 83 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 6a031527d8..0a27863275 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -393,119 +393,92 @@ static void test_CryptInstallOssGlobal(void) } } -static const BYTE encodedInt[] = { 0x02,0x01,0x01 }; -static const WCHAR encodedIntStr[] = { '0','2',' ','0','1',' ','0','1',0 }; -static const BYTE encodedBigInt[] = { 0x02,0x1f,0x01,0x02,0x03,0x04,0x05,0x06, - 0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15, - 0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f }; -static const WCHAR encodedBigIntStr[] = { '0','2',' ','1','f',' ','0','1',' ', - '0','2',' ','0','3',' ','0','4',' ','0','5',' ','0','6',' ','0','7',' ','0', - '8',' ','0','9',' ','0','a',' ','0','b',' ','0','c',' ','0','d',' ','0','e', - ' ','0','f',' ','1','0',' ','1','1',' ','1','2',' ','1','3',' ','1','4',' ', - '1','5',' ','1','6',' ','1','7',' ','1','8',' ','1','9',' ','1','a',' ','1', - 'b',' ','1','c',' ','1','d',' ','1','e',' ','1','f',0 }; - static void test_format_object(void) { - BOOL (WINAPI *pCryptFormatObject)(DWORD dwEncoding, DWORD dwFormatType, - DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, - const BYTE *pbEncoded, DWORD dwEncoded, void *pbFormat, - DWORD *pcbFormat); + static const BYTE encodedInt[] = {0x02,0x01,0x01}; + static const BYTE encodedBigInt[] = {0x02,0x1f,0x01,0x02,0x03,0x04,0x05, + 0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12, + 0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f}; + static const WCHAR encodedBigIntStr[] = L"02 1f 01 02 03 04 05 06 07 08 09 " + "0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f"; + BOOL ret; DWORD size; - LPWSTR str; + WCHAR str[100]; - pCryptFormatObject = (void *)GetProcAddress(hCrypt, "CryptFormatObject"); - if (!pCryptFormatObject) - { - skip("No CryptFormatObject\n"); - return; - } /* Crash */ if (0) { - pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); + CryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); } /* When called with any but the default encoding, it fails to find a * formatting function. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, - "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ret = CryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + /* When called with the default encoding type for any undefined struct type * (including none), it succeeds: the default encoding is a hex string * encoding. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - NULL, &size); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, NULL, &size); ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - if (size == 0 && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("CryptFormatObject has no default implementation\n"); - return; - } - ok(size == sizeof(WCHAR), "unexpected size %d\n", size); - str = HeapAlloc(GetProcessHeap(), 0, size); - SetLastError(0xdeadbeef); - size = 0; - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - str, &size); - ok(!ret && GetLastError() == ERROR_MORE_DATA, - "expected ERROR_MORE_DATA, got %d\n", GetLastError()); - size = sizeof(WCHAR); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!str[0], "expected empty string\n"); - HeapFree(GetProcessHeap(), 0, str); - } - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, - sizeof(encodedInt), NULL, &size); + ok(size == sizeof(WCHAR) || broken(!size) /* Win10 1709+ */, "wrong size %d\n", size); + + SetLastError(0xdeadbeef); + size = 0; + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, str, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_MORE_DATA, "wrong error %u\n", GetLastError()); + + size = sizeof(WCHAR); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, str, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(!str[0], "expected empty string\n"); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, + sizeof(encodedInt), NULL, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(size == sizeof(L"02 01 01"), "wrong size %u\n", size); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, + sizeof(encodedInt), str, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(!wcscmp(str, L"02 01 01"), "wrong string %s\n", wine_dbgstr_w(str)); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedBigInt, + sizeof(encodedBigInt), NULL, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(size == sizeof(encodedBigIntStr), "wrong size %u\n", size); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, + encodedBigInt, sizeof(encodedBigInt), str, &size); ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - str = HeapAlloc(GetProcessHeap(), 0, size); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedInt, sizeof(encodedInt), str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!lstrcmpW(str, encodedIntStr), "unexpected format string\n"); - HeapFree(GetProcessHeap(), 0, str); - } - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedBigInt, sizeof(encodedBigInt), NULL, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - str = HeapAlloc(GetProcessHeap(), 0, size); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedBigInt, sizeof(encodedBigInt), str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!lstrcmpiW(str, encodedBigIntStr), "unexpected format string\n"); - HeapFree(GetProcessHeap(), 0, str); - } + ok(!wcsicmp(str, encodedBigIntStr), "wrong string %s\n", wine_dbgstr_w(str)); + /* When called with the default encoding type for any undefined struct * type but CRYPT_FORMAT_STR_NO_HEX specified, it fails to find a * formatting function. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, - NULL, NULL, NULL, 0, NULL, &size); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, + NULL, NULL, NULL, 0, NULL, &size); ok(!ret, "CryptFormatObject succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == 0xdeadbeef, /* Vista, W2K8 */ - "expected ERROR_FILE_NOT_FOUND or no change, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND + || GetLastError() == 0xdeadbeef, /* Vista, W2K8 */ + "wrong error %u\n", GetLastError()); + /* When called to format an AUTHORITY_KEY_ID2_INFO, it fails when no * data are given. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, - szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %d\n", GetLastError()); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, + szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == E_INVALIDARG, "wrong error %u\n", GetLastError()); } START_TEST(main) -- 2.20.1

2 1