December 2018 - Wine-commits

Zebediah Figura : setupapi: Get rid of the redundant cDevices parameter to struct device.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: ac1d89fa13013e7b1c867450370ade6a38af417c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1d89fa13013e7b1c867450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:15 2018 -0600 setupapi: Get rid of the redundant cDevices parameter to struct device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 47 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7638a8b..db0b72f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -104,7 +104,6 @@ struct DeviceInfoSet DWORD magic; /* if is equal to SETUP_DEVICE_INFO_SET_MAGIC struct is okay */ GUID ClassGuid; HWND hwndParent; - DWORD cDevices; struct list devices; }; @@ -670,7 +669,6 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); - set->cDevices++; SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, @@ -1289,7 +1287,6 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, memcpy(&list->ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, sizeof(list->ClassGuid)); - list->cDevices = 0; list_init(&list->devices); return list; @@ -1475,7 +1472,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const if ((flags & DICD_GENERATE_ID)) { static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','d',0}; - DWORD devId; + int instance_id, highest_id = -1; if (strchrW(name, '\\')) { @@ -1483,29 +1480,20 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const return FALSE; } - if (set->cDevices) + LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { - DWORD highestDevID = 0; - - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) - { - const WCHAR *devName = strrchrW(device->instanceId, '\\'); - DWORD id; - - if (devName) - devName++; - else - devName = device->instanceId; - id = SETUPDI_DevNameToDevID(devName); - if (id != 0xffffffff && id > highestDevID) - highestDevID = id; - } - devId = highestDevID + 1; + const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); + + if (instance_str) + instance_str++; + else + instance_str = device->instanceId; + instance_id = SETUPDI_DevNameToDevID(instance_str); + if (instance_id != 0xffffffff && instance_id > highest_id) + highest_id = instance_id; } - else - devId = 0; - if (snprintfW(id, ARRAY_SIZE(id), formatW, name, devId) == -1) + if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) { SetLastError(ERROR_INVALID_DEVINST_NAME); return FALSE; @@ -1646,22 +1634,17 @@ BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA return FALSE; } - if (index >= set->cDevices) - { - SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; - } - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { if (i++ == index) { copy_device_data(device_data, device); - break; + return TRUE; } } - return TRUE; + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; } /***********************************************************************

1 0

Zebediah Figura : setupapi: Implement SetupDiDeleteDeviceInfo().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 03e9ef38a7d16920f60b6c17d711588ac25e53ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9ef38a7d16920f60b6c17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:16 2018 -0600 setupapi: Implement SetupDiDeleteDeviceInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43211 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 17 ++++++++++++++ dlls/setupapi/stubs.c | 12 ---------- dlls/setupapi/tests/devinst.c | 52 +++++++++++++++++++++++++++++-------------- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index db0b72f..5685dc3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1575,6 +1575,23 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) } /*********************************************************************** + * SetupDiDeleteDeviceInfo (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + delete_device(device); + + return TRUE; +} + +/*********************************************************************** * SetupDiRemoveDeviceInterface (SETUPAPI.@) */ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 7c3413a..61ce005 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -612,18 +612,6 @@ BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DAT } /*********************************************************************** - * SetupDiDeleteDeviceInfo (SETUPAPI.@) - */ - -BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) - { - FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - -/*********************************************************************** * SetupDiDrawMiniIcon (SETUPAPI.@) */ INT WINAPI SetupDiDrawMiniIcon(HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index edb660e..55fe104 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -337,13 +337,21 @@ static void test_device_info(void) check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\0002"); check_device_info(set, 3, &guid, NULL); + ret = SetupDiEnumDeviceInfo(set, 0, &ret_device); + ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInfo(set, &ret_device); + ok(ret, "Failed to delete device, error %#x.\n", GetLastError()); + + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0002"); + check_device_info(set, 2, &guid, NULL); + ret = SetupDiRemoveDevice(set, &device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); - check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); - check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0001"); - ret = SetupDiEnumDeviceInfo(set, 2, &ret_device); + ret = SetupDiEnumDeviceInfo(set, 1, &ret_device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); ok(IsEqualGUID(&ret_device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&ret_device.ClassGuid)); @@ -353,7 +361,7 @@ static void test_device_info(void) ok(ret_device.DevInst == device.DevInst, "Expected device node %#x, got %#x.\n", device.DevInst, ret_device.DevInst); - check_device_info(set, 3, &guid, NULL); + check_device_info(set, 2, &guid, NULL); SetupDiDestroyDeviceInfoList(set); @@ -469,7 +477,7 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; - char id[30]; + int i = 0; SetLastError(0xdeadbeef); ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); @@ -497,30 +505,40 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); - ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0002", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInfo(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0003", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = SetupDiEnumDeviceInfo(set, 0, &device); - ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); - ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); - ok(ret, "Failed to get device id, error %#x.\n", GetLastError()); - ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\0000"), "Got unexpected id %s.\n", id); - - ret = SetupDiRemoveDevice(set, &device); - ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\0002"); + check_device_info(set, 2, &guid, NULL); - ret = SetupDiEnumDeviceInfo(set, 1, &device); - ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } SetupDiDestroyDeviceInfoList(set); }

1 0

Hans Leidekker : bcrypt: Support retrieving properties from key handles.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: dc97df72ff24b40a8d95dbf5bc94967ed5b783cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc97df72ff24b40a8d95dbf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 08:59:20 2018 +0100 bcrypt: Support retrieving properties from key handles. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 10 ++++ dlls/bcrypt/bcrypt_main.c | 130 +++++++++++++++++++++++++----------------- dlls/bcrypt/tests/bcrypt.c | 31 +++++++++- 3 files changed, 117 insertions(+), 54 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index a40f9d1..593e784 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -198,9 +198,19 @@ struct key } u; }; #else +struct key_symmetric +{ + enum mode_id mode; +}; + struct key { struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; }; #endif diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2b9ae0b..0c68a4f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -413,6 +413,63 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_AES; + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + const WCHAR *str; + switch (mode) + { + case MODE_ID_ECB: str = BCRYPT_CHAIN_MODE_ECB; break; + case MODE_ID_CBC: str = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: str = BCRYPT_CHAIN_MODE_GCM; break; + default: return STATUS_NOT_IMPLEMENTED; + } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, str, (strlenW(str) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 128; + key_lengths->dwMaxLength = 256; + key_lengths->dwIncrement = 64; + } + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) + { + BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; + if (mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; + *ret_size = sizeof(*tag_length); + if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (tag_length) + { + tag_length->dwMinLength = 12; + tag_length->dwMaxLength = 16; + tag_length->dwIncrement = 1; + } + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -424,59 +481,7 @@ NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR switch (alg->id) { case ALG_ID_AES: - if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) - { - *ret_size = sizeof(ULONG); - if (size < sizeof(ULONG)) - return STATUS_BUFFER_TOO_SMALL; - if (buf) - *(ULONG *)buf = BLOCK_LENGTH_AES; - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - const WCHAR *mode; - switch (alg->mode) - { - case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; - case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; - default: return STATUS_NOT_IMPLEMENTED; - } - - *ret_size = 64; - if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) ); - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) - { - BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; - *ret_size = sizeof(*key_lengths); - if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (key_lengths) - { - key_lengths->dwMinLength = 128; - key_lengths->dwMaxLength = 256; - key_lengths->dwIncrement = 64; - } - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) - { - BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; - if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; - *ret_size = sizeof(*tag_length); - if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (tag_length) - { - tag_length->dwMinLength = 12; - tag_length->dwMaxLength = 16; - tag_length->dwIncrement = 1; - } - return STATUS_SUCCESS; - } - break; + return get_aes_property( alg->mode, prop, buf, size, ret_size ); default: break; @@ -533,6 +538,20 @@ static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, U return status; } +static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + switch (key->alg_id) + { + case ALG_ID_AES: + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) return STATUS_NOT_SUPPORTED; + return get_aes_property( key->u.s.mode, prop, buf, size, ret_size ); + + default: + FIXME( "unsupported algorithm %u\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) { struct object *object = handle; @@ -549,6 +568,11 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu const struct algorithm *alg = (const struct algorithm *)object; return get_alg_property( alg, prop, buffer, count, res ); } + case MAGIC_KEY: + { + const struct key *key = (const struct key *)object; + return get_key_property( key, prop, buffer, count, res ); + } case MAGIC_HASH: { const struct hash *hash = (const struct hash *)object; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6865e87..c3f8f3d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -507,7 +507,8 @@ static void test_BCryptGenerateSymmetricKey(void) {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key, key2; - UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; + UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16], mode[64]; + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; @@ -608,6 +609,27 @@ static void test_BCryptGenerateSymmetricKey(void) ok(size == 16, "got %u\n", size); ok(!memcmp(plaintext, data, sizeof(data)), "wrong data\n"); + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "wrong mode\n"); + + len = 0; + size = 0; + ret = pBCryptGetProperty(key, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 16, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = pBCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); @@ -855,6 +877,9 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1; @@ -1108,6 +1133,7 @@ static void test_BCryptDecrypt(void) {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; + BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_lengths; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; UCHAR *buf, plaintext[48], ivbuf[16]; @@ -1242,6 +1268,9 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_lengths, sizeof(tag_lengths), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1;

1 0

Michael Müller : ntdll: Add stub for RtlGetUnloadEventTraceEx.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 33b566c3d5350aa1ec80207dcf17e78d6c06cc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=33b566c3d5350aa1ec80207d… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 4 01:15:59 2018 -0700 ntdll: Add stub for RtlGetUnloadEventTraceEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44897 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3741eb9..c2e2fb1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -681,6 +681,7 @@ # @ stub RtlGetSetBootStatusData @ stdcall RtlGetThreadErrorMode() @ stdcall RtlGetUnloadEventTrace() +@ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr) @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e80aa5e..393bd27 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1680,6 +1680,20 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) } /********************************************************************* + * RtlGetUnloadEventTraceEx [NTDLL.@] + */ +void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) +{ + static ULONG dummy_size, dummy_count; + + FIXME("(%p, %p, %p): stub!\n", size, count, trace); + + if (size) *size = &dummy_size; + if (count) *count = &dummy_count; + if (trace) *trace = NULL; +} + +/********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *fullname_size,

1 0

Józef Kucia : vkd3d: Add asserts for indirect draw arguments.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: c15ab6a51cf93d36884758a499a91acfd7578517 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c15ab6a51cf93d36884758a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:55 2018 +0100 vkd3d: Add asserts for indirect draw arguments. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 937c7e3..06823c8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4087,6 +4087,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandL FIXME("iface %p stub!\n", iface); } +STATIC_ASSERT(sizeof(VkDispatchIndirectCommand) == sizeof(D3D12_DISPATCH_ARGUMENTS)); +STATIC_ASSERT(sizeof(VkDrawIndexedIndirectCommand) == sizeof(D3D12_DRAW_INDEXED_ARGUMENTS)); +STATIC_ASSERT(sizeof(VkDrawIndirectCommand) == sizeof(D3D12_DRAW_ARGUMENTS)); + static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList *iface, ID3D12CommandSignature *command_signature, UINT max_command_count, ID3D12Resource *arg_buffer, UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset)

1 0

Józef Kucia : vkd3d: Get rid of asserts from d3d12_device_CopyDescriptors().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: 3e8d0e7a6a65953ee0a2de9e32b69d80fe72a510 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e8d0e7a6a65953ee0a2de9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:54 2018 +0100 vkd3d: Get rid of asserts from d3d12_device_CopyDescriptors(). Do not require that source range sizes match destination range sizes. It works on Windows even though D3D12 validation layers throw errors about size mismatches. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cf40e7a..9e36828 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1997,17 +1997,14 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; } - assert(dst_range_idx < dst_descriptor_range_count); - assert(dst_idx < dst_range_size); + if (dst_range_idx >= dst_descriptor_range_count) + break; d3d12_desc_copy(dst++, src++, device); ++dst_idx; } } - - assert(dst_idx == dst_range_size); - assert(dst_range_idx == dst_descriptor_range_count - 1); } static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device *iface,

1 0

Józef Kucia : vkd3d: Validate that command signature contains exactly one dispatch/ draw command.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: 9eaa64137673c8a049c4cdf2364c8eb67b1bbde9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9eaa64137673c8a049c4cdf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:56 2018 +0100 vkd3d: Validate that command signature contains exactly one dispatch/draw command. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 20 ++++++++++++++++++++ tests/d3d12.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 06823c8..a175091 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4850,6 +4850,26 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ struct d3d12_command_signature **signature) { struct d3d12_command_signature *object; + unsigned int i; + + for (i = 0; i < desc->NumArgumentDescs; ++i) + { + const D3D12_INDIRECT_ARGUMENT_DESC *argument_desc = &desc->pArgumentDescs[i]; + switch (argument_desc->Type) + { + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: + if (i != desc->NumArgumentDescs - 1) + { + WARN("Draw/dispatch must be the last element of a command signature.\n"); + return E_INVALIDARG; + } + break; + default: + break; + } + } if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/tests/d3d12.c b/tests/d3d12.c index 7ad0303..4344aa9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1685,6 +1685,56 @@ static void test_create_command_queue(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_command_signature(void) +{ + D3D12_INDIRECT_ARGUMENT_DESC argument_desc[3]; + D3D12_COMMAND_SIGNATURE_DESC signature_desc; + ID3D12CommandSignature *command_signature; + ID3D12Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + signature_desc.ByteStride = 1024; + signature_desc.NumArgumentDescs = ARRAY_SIZE(argument_desc); + signature_desc.pArgumentDescs = argument_desc; + signature_desc.NodeMask = 0; + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + argument_desc[0].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; + argument_desc[1].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + signature_desc.NumArgumentDescs = 2; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_committed_resource(void) { D3D12_GPU_VIRTUAL_ADDRESS gpu_address; @@ -22116,6 +22166,7 @@ START_TEST(d3d12) run_test(test_create_command_allocator); run_test(test_create_command_list); run_test(test_create_command_queue); + run_test(test_create_command_signature); run_test(test_create_committed_resource); run_test(test_create_heap); run_test(test_create_placed_resource);

1 0

Józef Kucia : tests: Add test for indirect indexed draw commands.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: 599ff571f9f9bb080ef70b3b3af0c8723e97e8da URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=599ff571f9f9bb080ef70b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:57 2018 +0100 tests: Add test for indirect indexed draw commands. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 143 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=599ff571f9f9bb080ef…

1 0

Józef Kucia : tests: Introduce common header for d3d12 crosstests.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: fa997de83d615793af3643494df15a604866ebd5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fa997de83d615793af36434… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:58 2018 +0100 tests: Introduce common header for d3d12 crosstests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 41 +------------------------------ tests/d3d12_crosstest.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 6 ++--- 3 files changed, 67 insertions(+), 43 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6f45ac9..8f9e2c6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16,46 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Hack for MinGW-w64 headers. - * - * We want to use WIDL C inline wrappers because some methods - * in D3D12 interfaces return aggregate objects. Unfortunately, - * WIDL C inline wrappers are broken when used with MinGW-w64 - * headers because FORCEINLINE expands to extern inline - * which leads to the "multiple storage classes in declaration - * specifiers" compiler error. - */ -#ifdef __MINGW32__ -# include <_mingw.h> -# ifdef __MINGW64_VERSION_MAJOR -# undef __forceinline -# define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) -# endif - -# define _HRESULT_DEFINED -typedef int HRESULT; -#endif - -#define COBJMACROS -#define INITGUID -#include "vkd3d_test.h" -#include "vkd3d_windows.h" -#define WIDL_C_INLINE_WRAPPERS -#include "vkd3d_d3d12.h" - -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - -#ifdef _WIN32 -# include "vkd3d_dxgi1_4.h" -#else -# include <pthread.h> -# include "vkd3d_utils.h" -#endif - -#include "d3d12_test_utils.h" +#include "d3d12_crosstest.h" struct vec2 { diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h new file mode 100644 index 0000000..daf156b --- /dev/null +++ b/tests/d3d12_crosstest.h @@ -0,0 +1,63 @@ +/* + * Copyright 2016-2018 Józef Kucia for CodeWeavers + * + * 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 + */ + +#ifndef __VKD3D_D3D12_CROSSTEST_H +#define __VKD3D_D3D12_CROSSTEST_H + +/* Hack for MinGW-w64 headers. + * + * We want to use WIDL C inline wrappers because some methods + * in D3D12 interfaces return aggregate objects. Unfortunately, + * WIDL C inline wrappers are broken when used with MinGW-w64 + * headers because FORCEINLINE expands to extern inline + * which leads to the "multiple storage classes in declaration + * specifiers" compiler error. + */ +#ifdef __MINGW32__ +# include <_mingw.h> +# ifdef __MINGW64_VERSION_MAJOR +# undef __forceinline +# define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) +# endif + +# define _HRESULT_DEFINED +typedef int HRESULT; +#endif + +#define COBJMACROS +#define INITGUID +#include "vkd3d_test.h" +#include "vkd3d_windows.h" +#define WIDL_C_INLINE_WRAPPERS +#include "vkd3d_d3d12.h" + +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + +#ifdef _WIN32 +# include "vkd3d_dxgi1_4.h" +#else +# include <pthread.h> +# include "vkd3d_utils.h" +#endif + +#include "d3d12_test_utils.h" + +#endif /* __VKD3D_D3D12_CROSSTEST_H */ diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index c2e7a3d..02c5a74 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __VKD3D_D3D12_TEST_H -#define __VKD3D_D3D12_TEST_H +#ifndef __VKD3D_D3D12_TEST_UTILS_H +#define __VKD3D_D3D12_TEST_UTILS_H #define wait_queue_idle(a, b) wait_queue_idle_(__LINE__, a, b) static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue); @@ -769,4 +769,4 @@ static inline D3D12_GPU_DESCRIPTOR_HANDLE get_gpu_sampler_handle(struct test_con return get_gpu_handle(context->device, heap, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, offset); } -#endif /* __VKD3D_D3D12_TEST_H */ +#endif /* __VKD3D_D3D12_TEST_UTILS_H */

1 0

Józef Kucia : tests: Move more helpers to d3d12_test_utils.h.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: vkd3d Branch: master Commit: 8477606e1c41e1766d2ef8482be222d51e6a0201 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8477606e1c41e1766d2ef84… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:59 2018 +0100 tests: Move more helpers to d3d12_test_utils.h. We should move the implementation to a C file. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 40 ---------------------------------------- tests/d3d12_test_utils.h | 46 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8f9e2c6..e48750b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -173,18 +173,6 @@ static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resourc ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); } -#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) -static void reset_command_list_(unsigned int line, - ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) -{ - HRESULT hr; - - hr = ID3D12CommandAllocator_Reset(allocator); - ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); - hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); - ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); -} - #ifdef _WIN32 static HANDLE create_event(void) { @@ -354,21 +342,6 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm ID3D12Fence_Release(fence); } -#define update_buffer_data(a, b, c, d) update_buffer_data_(__LINE__, a, b, c, d) -static void update_buffer_data_(unsigned int line, ID3D12Resource *buffer, - size_t offset, size_t size, const void *data) -{ - D3D12_RANGE range; - HRESULT hr; - void *ptr; - - range.Begin = range.End = 0; - hr = ID3D12Resource_Map(buffer, 0, &range, &ptr); - ok_(line)(SUCCEEDED(hr), "Failed to map buffer, hr %#x.\n", hr); - memcpy((BYTE *)ptr + offset, data, size); - ID3D12Resource_Unmap(buffer, 0, NULL); -} - #define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *device, size_t size, D3D12_RESOURCE_FLAGS resource_flags, D3D12_RESOURCE_STATES initial_resource_state) @@ -377,19 +350,6 @@ static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *d resource_flags, initial_resource_state); } -#define create_upload_buffer(a, b, c) create_upload_buffer_(__LINE__, a, b, c) -static ID3D12Resource *create_upload_buffer_(unsigned int line, ID3D12Device *device, - size_t size, const void *data) -{ - ID3D12Resource *buffer; - - buffer = create_buffer_(line, device, D3D12_HEAP_TYPE_UPLOAD, size, - D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_GENERIC_READ); - if (data) - update_buffer_data_(line, buffer, 0, size, data); - return buffer; -} - static void copy_sub_resource_data(const D3D12_MEMCPY_DEST *dst, const D3D12_SUBRESOURCE_DATA *src, unsigned int row_count, unsigned int slice_count, size_t row_size) { diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 02c5a74..d4265fc 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -81,6 +81,18 @@ static void exec_command_list(ID3D12CommandQueue *queue, ID3D12GraphicsCommandLi ID3D12CommandQueue_ExecuteCommandLists(queue, 1, lists); } +#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) +static inline void reset_command_list_(unsigned int line, + ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) +{ + HRESULT hr; + + hr = ID3D12CommandAllocator_Reset(allocator); + ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); + ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); +} + #define create_buffer(a, b, c, d, e) create_buffer_(__LINE__, a, b, c, d, e) static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, D3D12_HEAP_TYPE heap_type, size_t size, D3D12_RESOURCE_FLAGS resource_flags, @@ -121,6 +133,34 @@ static ID3D12Resource *create_readback_buffer_(unsigned int line, ID3D12Device * D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST); } +#define update_buffer_data(a, b, c, d) update_buffer_data_(__LINE__, a, b, c, d) +static inline void update_buffer_data_(unsigned int line, ID3D12Resource *buffer, + size_t offset, size_t size, const void *data) +{ + D3D12_RANGE range; + HRESULT hr; + void *ptr; + + range.Begin = range.End = 0; + hr = ID3D12Resource_Map(buffer, 0, &range, &ptr); + ok_(line)(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memcpy((BYTE *)ptr + offset, data, size); + ID3D12Resource_Unmap(buffer, 0, NULL); +} + +#define create_upload_buffer(a, b, c) create_upload_buffer_(__LINE__, a, b, c) +static inline ID3D12Resource *create_upload_buffer_(unsigned int line, ID3D12Device *device, + size_t size, const void *data) +{ + ID3D12Resource *buffer; + + buffer = create_buffer_(line, device, D3D12_HEAP_TYPE_UPLOAD, size, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_GENERIC_READ); + if (data) + update_buffer_data_(line, buffer, 0, size, data); + return buffer; +} + #define create_cpu_descriptor_heap(a, b, c) create_cpu_descriptor_heap_(__LINE__, a, b, c) static inline ID3D12DescriptorHeap *create_cpu_descriptor_heap_(unsigned int line, ID3D12Device *device, D3D12_DESCRIPTOR_HEAP_TYPE heap_type, unsigned int descriptor_count) @@ -377,7 +417,7 @@ static void check_readback_data_uint_(unsigned int line, struct resource_readbac } #define check_sub_resource_uint(a, b, c, d, e, f) check_sub_resource_uint_(__LINE__, a, b, c, d, e, f) -static void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, +static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, unsigned int expected, unsigned int max_diff) { @@ -617,7 +657,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex } #define init_test_context(context, desc) init_test_context_(__LINE__, context, desc) -static bool init_test_context_(unsigned int line, struct test_context *context, +static inline bool init_test_context_(unsigned int line, struct test_context *context, const struct test_context_desc *desc) { D3D12_COMMAND_QUEUE_DESC command_queue_desc; @@ -687,7 +727,7 @@ static bool init_test_context_(unsigned int line, struct test_context *context, } #define destroy_test_context(context) destroy_test_context_(__LINE__, context) -static void destroy_test_context_(unsigned int line, struct test_context *context) +static inline void destroy_test_context_(unsigned int line, struct test_context *context) { ULONG refcount;

1 0