December 2018 - Wine-Devel - list.winehq.org

[PATCH] wineserver: fix debug registers on NetBSD
by Frédéric Fauberteau Dec. 4, 2018

Dec. 4, 2018

Add a #ifdef to deal with NetBSD specific debug register structure. Debug register structure on NetBSD for x86 (/usr/include/<arch>/reg.h) is: struct dbreg { int dr[<nb>]; } with nb=8 on i386 and nb=16 on amd64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46229 Signed-off-by: Frédéric Fauberteau <triaxx(a)NetBSD.org> --- server/ptrace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 4eda8ebec3..808328ecbc 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -720,6 +720,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int context->debug.i386_regs.dr3 = DBREG_DRX((&dbregs), 3); context->debug.i386_regs.dr6 = DBREG_DRX((&dbregs), 6); context->debug.i386_regs.dr7 = DBREG_DRX((&dbregs), 7); +#elif defined(__NetBSD__) + context->debug.i386_regs.dr0 = dbregs.dr[0]; + context->debug.i386_regs.dr1 = dbregs.dr[1]; + context->debug.i386_regs.dr2 = dbregs.dr[2]; + context->debug.i386_regs.dr3 = dbregs.dr[3]; + context->debug.i386_regs.dr6 = dbregs.dr[6]; + context->debug.i386_regs.dr7 = dbregs.dr[7]; #else context->debug.i386_regs.dr0 = dbregs.dr0; context->debug.i386_regs.dr1 = dbregs.dr1; @@ -754,6 +761,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign DBREG_DRX((&dbregs), 5) = 0; DBREG_DRX((&dbregs), 6) = context->debug.i386_regs.dr6; DBREG_DRX((&dbregs), 7) = context->debug.i386_regs.dr7; +#elif defined(__NetBSD__) + dbregs.dr[0] = context->debug.i386_regs.dr0; + dbregs.dr[1] = context->debug.i386_regs.dr1; + dbregs.dr[2] = context->debug.i386_regs.dr2; + dbregs.dr[3] = context->debug.i386_regs.dr3; + dbregs.dr[4] = 0; + dbregs.dr[5] = 0; + dbregs.dr[6] = context->debug.i386_regs.dr6; + dbregs.dr[7] = context->debug.i386_regs.dr7; #else dbregs.dr0 = context->debug.i386_regs.dr0; dbregs.dr1 = context->debug.i386_regs.dr1; -- 2.19.2

2 1

[PATCH v2] bcrypt: Support retrieving properties from key handles.
by Hans Leidekker Dec. 4, 2018

Dec. 4, 2018

v2: Fix the build without GnuTLS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 a40f9d1a4b..593e78416e 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 2b9ae0b766..0c68a4f3e6 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 6865e87ca8..c3f8f3d78a 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; -- 2.11.0

1 0

[PATCH v2 1/3] setupapi: Implement SetupDiDeleteDeviceInterfaceData().
by Zebediah Figura Dec. 4, 2018

Dec. 4, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++------ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 25 ++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 82a45b4470..7638a8bd5b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -576,6 +576,16 @@ static void remove_device_iface(struct device_iface *iface) iface->flags |= SPINT_REMOVED; } +static void delete_device_iface(struct device_iface *iface) +{ + list_remove(&iface->entry); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); + heap_free(iface->refstr); + heap_free(iface->symlink); + heap_free(iface); +} + static void remove_device(struct device *device) { WCHAR id[MAX_DEVICE_ID_LEN], *p; @@ -622,12 +632,7 @@ static void delete_device(struct device *device) LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) { - list_remove(&iface->entry); - RegCloseKey(iface->refstr_key); - RegCloseKey(iface->class_key); - heap_free(iface->refstr); - heap_free(iface->symlink); - heap_free(iface); + delete_device_iface(iface); } free_devnode(device->devnode); list_remove(&device->entry); @@ -1598,6 +1603,23 @@ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_D return TRUE; } +/*********************************************************************** + * SetupDiDeleteDeviceInterfaceData (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) +{ + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + delete_device_iface(iface); + + return TRUE; +} + /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 99509e1bbf..0b44e184fc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -302,7 +302,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr wstr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(ptr ptr) -@ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceData(ptr ptr) @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 29f12c3f53..edb660e106 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -650,6 +650,15 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); check_device_iface(set, &device, &guid2, 1, 0, NULL); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + + check_device_iface(set, &device, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } @@ -862,14 +871,28 @@ static void test_register_device_iface(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "removed", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "deleted", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 1, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 2, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + set2 = SetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); ok(set2 != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_iface(set2, NULL, &guid, 0, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"); - check_device_iface(set2, NULL, &guid, 1, 0, NULL); + check_device_iface(set2, NULL, &guid, 1, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\deleted"); + check_device_iface(set2, NULL, &guid, 2, 0, NULL); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); -- 2.14.1

1 2

[PATCH 1/5] shlwapi: Forward SHDeleteEmptyKey() to shcore.
by Nikolay Sivov Dec. 4, 2018

Dec. 4, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/shcore.spec | 4 +-- dlls/shlwapi/reg.c | 68 --------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +-- 3 files changed, 4 insertions(+), 72 deletions(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6ad1297989..4c2717948d 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -40,8 +40,8 @@ @ stdcall SHCreateThread(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) @ stub SHCreateThreadWithHandle -@ stdcall SHDeleteEmptyKeyA(long ptr) -@ stdcall SHDeleteEmptyKeyW(long ptr) +@ stdcall SHDeleteEmptyKeyA(long str) +@ stdcall SHDeleteEmptyKeyW(long wstr) @ stdcall SHDeleteKeyA(long str) @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteValueA(long str str) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 163351995c..370161df12 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1590,74 +1590,6 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) return dwRet; } -/************************************************************************* - * SHDeleteEmptyKeyA [SHLWAPI.@] - * - * Delete a registry key with no sub keys. - * - * PARAMS - * hKey [I] Handle to registry key - * lpszSubKey [I] Name of sub key to delete - * - * RETURNS - * Success: ERROR_SUCCESS. The key is deleted. - * Failure: If the key is not empty, returns ERROR_KEY_HAS_CHILDREN. Otherwise - * returns an error code from RegOpenKeyExA(), RegQueryInfoKeyA() or - * RegDeleteKeyA(). - */ -DWORD WINAPI SHDeleteEmptyKeyA(HKEY hKey, LPCSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s)\n", hKey, debugstr_a(lpszSubKey)); - - dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - dwRet = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, &dwKeyCount, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - RegCloseKey(hSubKey); - if(!dwRet) - { - if (!dwKeyCount) - dwRet = RegDeleteKeyA(hKey, lpszSubKey); - else - dwRet = ERROR_KEY_HAS_CHILDREN; - } - } - return dwRet; -} - -/************************************************************************* - * SHDeleteEmptyKeyW [SHLWAPI.@] - * - * See SHDeleteEmptyKeyA. - */ -DWORD WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p, %s)\n", hKey, debugstr_w(lpszSubKey)); - - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - RegCloseKey(hSubKey); - if(!dwRet) - { - if (!dwKeyCount) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - else - dwRet = ERROR_KEY_HAS_CHILDREN; - } - } - return dwRet; -} - /************************************************************************* * SHDeleteOrphanKeyA [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 30c34cb988..a51088dba8 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -688,8 +688,8 @@ @ stdcall SHCreateStreamOnFileW(wstr long ptr) shcore.SHCreateStreamOnFileW @ stdcall SHCreateStreamWrapper(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef -@ stdcall SHDeleteEmptyKeyA(long ptr) -@ stdcall SHDeleteEmptyKeyW(long ptr) +@ stdcall SHDeleteEmptyKeyA(long str) shcore.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long wstr) shcore.SHDeleteEmptyKeyW @ stdcall SHDeleteKeyA(long str) @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteOrphanKeyA(long str) -- 2.19.2

1 4

[PATCH 1/3] setupapi: Implement SetupDiDeleteDeviceInterfaceData().
by Zebediah Figura Dec. 4, 2018

Dec. 4, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++------ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 25 ++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 82a45b4470..7638a8bd5b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -576,6 +576,16 @@ static void remove_device_iface(struct device_iface *iface) iface->flags |= SPINT_REMOVED; } +static void delete_device_iface(struct device_iface *iface) +{ + list_remove(&iface->entry); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); + heap_free(iface->refstr); + heap_free(iface->symlink); + heap_free(iface); +} + static void remove_device(struct device *device) { WCHAR id[MAX_DEVICE_ID_LEN], *p; @@ -622,12 +632,7 @@ static void delete_device(struct device *device) LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) { - list_remove(&iface->entry); - RegCloseKey(iface->refstr_key); - RegCloseKey(iface->class_key); - heap_free(iface->refstr); - heap_free(iface->symlink); - heap_free(iface); + delete_device_iface(iface); } free_devnode(device->devnode); list_remove(&device->entry); @@ -1598,6 +1603,23 @@ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_D return TRUE; } +/*********************************************************************** + * SetupDiDeleteDeviceInterfaceData (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) +{ + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + delete_device_iface(iface); + + return TRUE; +} + /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 99509e1bbf..0b44e184fc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -302,7 +302,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr wstr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(ptr ptr) -@ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceData(ptr ptr) @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 29f12c3f53..edb660e106 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -650,6 +650,15 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); check_device_iface(set, &device, &guid2, 1, 0, NULL); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + + check_device_iface(set, &device, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } @@ -862,14 +871,28 @@ static void test_register_device_iface(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "removed", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "deleted", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 1, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 2, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + set2 = SetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); ok(set2 != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_iface(set2, NULL, &guid, 0, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"); - check_device_iface(set2, NULL, &guid, 1, 0, NULL); + check_device_iface(set2, NULL, &guid, 1, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\deleted"); + check_device_iface(set2, NULL, &guid, 2, 0, NULL); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); -- 2.14.1

2 3

[PATCH] avrt: Add AVRT_PRIORITY_VERYLOW to avrt.h
by Kai Krakow Dec. 4, 2018

Dec. 4, 2018

According to current Windows 10 headers, this priority is supported now. Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- include/avrt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/avrt.h b/include/avrt.h index 2d0ab096bf4..9d12c1b5b1b 100644 --- a/include/avrt.h +++ b/include/avrt.h @@ -28,7 +28,8 @@ extern "C" { typedef enum _AVRT_PRIORITY { - AVRT_PRIORITY_LOW = -1, + AVRT_PRIORITY_VERYLOW = -2, + AVRT_PRIORITY_LOW, AVRT_PRIORITY_NORMAL, AVRT_PRIORITY_HIGH, AVRT_PRIORITY_CRITICAL -- 2.19.2

1 0

[PATCH] shell32/tests: Remove redundant NULL check before CoTaskMemFree()
by Michael Stefaniuc Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 33a5e6427a..0da164b464 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -490,7 +490,7 @@ static void check_dropdown_(const char *file, UINT line, IAutoCompleteDropDown * else ok_(file, line)(str == NULL, "Expected (null), got %s\n", wine_dbgstr_w(str)); } - if (str) CoTaskMemFree(str); + CoTaskMemFree(str); } } -- 2.14.5

1 0

Re: [PATCH v2] amstream: Simulate IDirectDrawStreamSampleImpl_Update return values.
by symeonidis＠csd.auth.gr Dec. 3, 2018

Dec. 3, 2018

I've already started working towards a proper implementation of the IDirectDraw* interfaces. However that will probably have to wait until the next release cycle (also my Windows installation is currently broken and I have to fix that first). But before that I have a few questions: 1. Is someone else working on implementing any of these functions? 2. Are there any media test files that I can use for the tests? 3. What is the best way to call a method of an interface from inside a method of an interface?

2 1

[PATCH] testbot: Add support for Locale::Codes.
by Francois Gouget Dec. 3, 2018

Dec. 3, 2018

Locale::Country and Locale::Language are deprecated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 78 ++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6783c5177b..e28a34b89c 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,8 +33,6 @@ our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); use Fcntl; -use Locale::Language; -use Locale::Country; use WineTestBot::Config; @@ -106,6 +104,68 @@ sub BuildEMailRecipient($$) return $Recipient; } +my $_LCLang; +my $_LocaleLang; +sub GetLanguageName($) +{ + my ($Code) = @_; + local $@; + + return "Konkani" if ($Code eq "kok"); + + if (!defined $_LCLang) + { + eval + { + require Locale::Codes; + $_LCLang = new Locale::Codes 'language'; + $_LCLang->show_errors(0); + }; + if (!$_LCLang) + { + $_LCLang = 0; + $_LocaleLang = eval { require Locale::Language }; + } + } + my $Name = $_LCLang ? ($_LCLang->code2name($Code) || $Code) : + $_LocaleLang ? eval { Locale::Language::code2language($Code) || $Code } : + $Code; + $Name =~ s/ \(.*$//; + return $Name; +} + +my $_LCCountry; +my $_LocaleCountry; +sub GetCountryName($) +{ + my ($Code) = @_; + local $@; + + return "USA" if ($Code eq "US"); + return "Great Britain" if ($Code eq "GB"); + + if (!defined $_LCCountry) + { + eval + { + require Locale::Codes; + $_LCCountry = new Locale::Codes 'country'; + $_LCCountry->show_errors(0); + }; + if (!$_LCCountry) + { + $_LCCountry = 0; + $_LocaleCountry = eval { require Locale::Country }; + } + } + my $Name = $_LCCountry ? ($_LCCountry->code2name($Code) || $Code) : + $_LocaleCountry ? eval { Locale::Country::code2country($Code) || $Code } : + $Code; + $Name =~ s/(?:, | \().*$//; + return $Name; +} + + sub LocaleName($) { my ($Locale) = @_; @@ -114,18 +174,8 @@ sub LocaleName($) if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.[A-Z0-9-]+)?(?:@([a-z]+))?$/) { my ($Lang, $Country, $Modifier) = ($1, $2, $3); - my $Name = $Lang eq "kok" ? "Konkani" : - (code2language($Lang) || $Lang); - $Name =~ s/ \(.*$//; - - if (uc($Lang) ne $Country) - { - my $CountryName = $Country eq "US" ? "USA" : - $Country eq "GB" ? "Great Britain" : - (code2country($Country) || $Country); - $CountryName =~ s/(?:, | \().*$//; - $Name .= ":$CountryName"; - } + my $Name = GetLanguageName($Lang); + $Name .= ":". GetCountryName($Country) if (uc($Lang) ne $Country); $Name .= " ($Modifier)" if ($Modifier); return $Name; -- 2.19.2

1 0

[PATCH] testbot/web: Allow web pages to override the collection headers.
by Francois Gouget Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 17 +++++++++++++++-- .../ObjectModel/CGI/CollectionBlockForPage.pm | 7 +++++++ testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f675e6b260..105280e30e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -238,14 +238,27 @@ sub GenerateHeaderRow($$$) { if ($self->CallDisplayProperty($PropertyDescriptor)) { - print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), - "</th>\n"; + $self->CallGenerateHeaderCell($PropertyDescriptor); } } print "</tr>\n"; } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->GenerateHeaderCell($PropertyDescriptor); +} + +sub GenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), + "</th>\n"; +} + sub CallGenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index ff8247ec92..03a45082f0 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -45,6 +45,13 @@ sub CallGenerateFormEnd($) $self->{EnclosingPage}->GenerateFormEnd($self); } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); +} + sub CallGenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 194379f406..5c48954c68 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -94,6 +94,13 @@ sub GenerateFormEnd($$) $CollectionBlock->GenerateFormEnd(); } +sub GenerateHeaderCell($$$) +{ + my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + + $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); +} + sub GenerateHeaderRow($$$$) { my ($self, $CollectionBlock, $PropertyDescriptors, $Actions) = @_; -- 2.19.2

1 0

[PATCH] testbot: Add a dir option to specify the directory on Wine missions.
by Francois Gouget Dec. 3, 2018

Dec. 3, 2018

This allows running the tests in a regular directory, in the root of a drive or on a non-c: drive. By default the tests are now run in the root of the wineprefix's c: drive. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/bin/build/WineTest.pl | 20 +++++++++++--------- testbot/lib/Build/Utils.pm | 29 +++++++++++++++++++++++------ testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index f61ee65e7e..c903ae3695 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -47,6 +47,7 @@ use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; use WineTestBot::Missions; +use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -346,7 +347,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " git pull &&\n". - " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". + " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 19e3e8f3eb..5ce1448eb0 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -439,7 +439,7 @@ $Script .= " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { my $BaseTag = BuildTag($VM->Name); - $Script .= "--winetest ". $Task->Missions ." $BaseTag "; + $Script .= "--winetest ". ShQuote($Task->Missions) ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -455,11 +455,11 @@ if ($Step->Type eq "suite") } elsif ($Step->FileType eq "patch") { - $Script .= "--testpatch ". $Task->Missions ." patch.diff"; + $Script .= "--testpatch ". ShQuote($Task->Missions) ." patch.diff"; } else { - $Script .= join(" ", "--testexe", $Task->Missions, $FileName, $Task->CmdLineArg); + $Script .= join(" ", "--testexe", ShQuote($Task->Missions), $FileName, $Task->CmdLineArg); } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b7389ba25e..b47a6bf0fc 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,9 +99,9 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); - if (!-f "$BaseName.report") + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -109,8 +109,8 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -s '../$BaseName.report'")) + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue @@ -168,10 +168,10 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t do.not.submit ". + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$BaseName.report") + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -197,7 +197,9 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "./TestLauncher.exe.so", "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'../$BaseName.report'"); + RunWine($Mission, "TestLauncher.exe.so", + "-t 120 ". ShArgv2Cmd($FileName, @$Args) + ." >'$DataDir/$BaseName.report'"); return 1; } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index c53f6099c5..b204386827 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -348,10 +348,26 @@ sub RunWine($$$) { my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; - my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". - "time $Wine $Cmd $CmdArgs"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + $Cmd = "$WineDir/$Cmd" if ($Cmd =~ /\.exe\.so$/); + + my $CurDir = "$ENV{WINEPREFIX}/dosdevices"; + if (!-d $CurDir) + { + $CurDir = "."; + } + else + { + my $Dir = $Mission->{dir} || ""; + # We cannot put colons in missions so restore the drive letter + $Dir = "$CurDir/c:/$Dir" if ($Dir !~ s~^([a-z])/~$CurDir/$1:/~); + $CurDir = -d $Dir ? $Dir : "$ENV{WINEPREFIX}/dosdevices/c:"; + } + + my $Magic = `file '$Cmd'`; + my $Wine = ($Magic =~ /ELF 64/ ? "$WineDir/wine64" : "$WineDir/wine"); + return system("set -x && cd '$CurDir' && ". + "time '$Wine' '$Cmd' $CmdArgs"); } @@ -367,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; } @@ -376,7 +392,8 @@ sub CreateWinePrefix($;$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + system("'$WineDir/server/wineserver' -w"); } return undef; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 4dd9e2501a..095de3a1eb 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -80,6 +80,7 @@ sub GenerateFooter($) print "On Wine VMs: \n"; print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; print "The lang option can be set to run the tests in the specified \$LANG locale. The default is en_US (.UTF-8 can be omitted). \n"; + print "The dir option can be set to specify the directory in which to run the tests. A path starting with a single letter followed by a slash specifies the drive, for instance 'c/' for 'c:' (the default). \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n"; -- 2.19.2

1 0

[PATCH 2/2] include: Add ntddvdeo.h.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/ntddvdeo.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 include/ntddvdeo.h diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h new file mode 100644 index 000000000000..d79670c4566a --- /dev/null +++ b/include/ntddvdeo.h @@ -0,0 +1,24 @@ +/* + * Copyright 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 __WINE_NTDDVDEO_H +#define __WINE_NTDDVDEO_H + +DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); + +#endif -- 2.18.1

1 0

[PATCH vkd3d 6/6] vkd3d: Implement D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 59 +++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2e6357ac3c3f..937c7e37fc49 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2251,6 +2251,34 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return true; } +static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics = &list->state->u.graphics; + + /* In Vulkan, the strip cut value is derived from the index buffer format. */ + switch (graphics->index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + { + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + { + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + default: + break; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList *iface, UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) @@ -2287,27 +2315,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap iface, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location); - vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; } - switch (list->state->u.graphics.index_buffer_strip_cut_value) - { - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) - FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) - FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - default: - break; - } + vk_procs = &list->device->vk_procs; + + d3d12_command_list_check_index_buffer_strip_cut_value(list); VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); @@ -4113,6 +4129,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC arg_buffer_offset, max_command_count, signature_desc->ByteStride)); break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + if (!d3d12_command_list_begin_render_pass(list)) + { + WARN("Failed to begin render pass, ignoring draw.\n"); + break; + } + + d3d12_command_list_check_index_buffer_strip_cut_value(list); + + VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: if (max_command_count != 1) FIXME("Ignoring command count %u.\n", max_command_count); -- 2.18.1

2 1

[PATCH vkd3d 5/6] vkd3d: Add FIXME() for unsupported strip cut values.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> In Vulkan, the strip cut value is derived from the current index buffer format. We could recompile the pipeline to handle more cases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 18 ++++++++++++++++++ libs/vkd3d/state.c | 6 ++---- libs/vkd3d/vkd3d_private.h | 4 +++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d5e898b4adb..2e6357ac3c3f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1703,6 +1703,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + list->index_buffer_format = DXGI_FORMAT_UNKNOWN; + memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; list->fb_height = 0; @@ -2293,6 +2295,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap return; } + switch (list->state->u.graphics.index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + default: + break; + } + VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); } @@ -3475,6 +3491,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics return; } + list->index_buffer_format = view->Format; + resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, view->BufferLocation); VK_CALL(vkCmdBindIndexBuffer(list->vk_command_buffer, resource->u.vk_buffer, view->BufferLocation - resource->gpu_address, index_type)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 03d8ef35ffd2..64c21588a825 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2236,11 +2236,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (desc->IBStripCutValue) { case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: - graphics->primitive_restart_enable = VK_FALSE; - break; case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - graphics->primitive_restart_enable = VK_TRUE; + graphics->index_buffer_strip_cut_value = desc->IBStripCutValue; break; default: WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); @@ -2506,7 +2504,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; + ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f97755925888..7e04dc31a0c8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,7 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; - VkBool32 primitive_restart_enable; + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; @@ -696,6 +696,8 @@ struct d3d12_command_list uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; VkPrimitiveTopology primitive_topology; + DXGI_FORMAT index_buffer_format; + VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; unsigned int fb_height; -- 2.18.1

2 1

[PATCH vkd3d 4/6] tests: Add test for primitive restart.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 172 +++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 173 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e9dbbaa8c3ba..7ad0303985be 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21914,6 +21914,177 @@ static void test_multisample_rendering(void) destroy_test_context(&context); } +static void test_primitive_restart(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + D3D12_INDEX_BUFFER_VIEW ibv; + struct resource_readback rb; + ID3D12CommandQueue *queue; + unsigned int index_count; + ID3D12Resource *ib, *vb; + size_t buffer_size; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + void *ptr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main(int4 p : POSITION) : SV_Position + { + return p; + } +#endif + 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const struct + { + int8_t x, y; + } + quad[] = + { + {-1, -1}, + {-1, 1}, + { 1, -1}, + { 1, 1}, + }; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"position", 0, DXGI_FORMAT_R8G8_SINT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const uint16_t indices16[] = {0, 1, 2, 3}; + static const uint32_t indices[] = {0, 1, 2, 3}; + static const uint16_t indices16_max[] = {0, 1, 2, 0xffff}; + static const uint32_t indices_max16[] = {0, 1, 2, 0xffff}; + static const uint16_t indices16_restart[] = {0, 1, 2, 0xffff, 2, 1, 3}; + static const uint32_t indices_restart[] = {0, 1, 2, 0xffffffff, 2, 1, 3}; + static const struct + { + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value; + DXGI_FORMAT ib_format; + const void *indices; + size_t indices_size; + unsigned int last_index; + bool full_quad; + bool is_todo; + } + tests[] = + { + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, false}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_restart, sizeof(indices16_restart), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, false, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_restart, sizeof(indices_restart), 0x0003, true}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + buffer_size = (tests[i].last_index + 1) * sizeof(*quad); + + vb = create_upload_buffer(context.device, buffer_size, NULL); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = buffer_size; + + pso_desc.IBStripCutValue = tests[i].strip_cut_value; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + ibv.Format = tests[i].ib_format; + ib = create_upload_buffer(context.device, tests[i].indices_size, tests[i].indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = tests[i].indices_size; + index_count = tests[i].indices_size / format_size(ibv.Format); + + hr = ID3D12Resource_Map(vb, 0, NULL, &ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memcpy(ptr, quad, (ARRAY_SIZE(quad) - 1) * sizeof(*quad)); + memcpy((BYTE *)ptr + tests[i].last_index * sizeof(*quad), &quad[ARRAY_SIZE(quad) - 1], sizeof(*quad)); + ID3D12Resource_Unmap(vb, 0, NULL); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, index_count, 1, 0, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + if (tests[i].full_quad) + { + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + } + else + { + set_box(&box, 16, 0, 0, 32, 10, 1); + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, &box, 0xffffffff, 0); + set_box(&box, 0, 16, 0, 16, 32, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + } + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12Resource_Release(ib); + ID3D12Resource_Release(vb); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + } + + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -22047,4 +22218,5 @@ START_TEST(d3d12) run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); run_test(test_multisample_rendering); + run_test(test_primitive_restart); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index fc07af78ffb4..c2e7a3d50458 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -203,6 +203,7 @@ static unsigned int format_size(DXGI_FORMAT format) return 4; case DXGI_FORMAT_R16_FLOAT: case DXGI_FORMAT_R16_UNORM: + case DXGI_FORMAT_R16_UINT: return 2; case DXGI_FORMAT_BC1_UNORM: case DXGI_FORMAT_BC1_UNORM_SRGB: -- 2.18.1

2 1

[PATCH vkd3d v2 1/6] tests: Print adapter info on Windows.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Fix formatting. * Merge #ifdef blocks. --- include/vkd3d_dxgi.idl | 26 +++++++++++++++++++++++++- tests/d3d12.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_dxgi.idl b/include/vkd3d_dxgi.idl index 5b80e1f6c3f4..7e07a78dd365 100644 --- a/include/vkd3d_dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -38,7 +38,6 @@ typedef enum DXGI_MODE_ROTATION DXGI_MODE_ROTATION_ROTATE270 = 0x4, } DXGI_MODE_ROTATION; -interface IDXGIAdapter; interface IDXGIAdapter1; interface IDXGIOutput; typedef struct DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC; @@ -54,6 +53,19 @@ const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x00000100ul; const DXGI_USAGE DXGI_USAGE_DISCARD_ON_PRESENT = 0x00000200ul; const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x00000400ul; +typedef struct DXGI_ADAPTER_DESC +{ + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + [ local, object, @@ -79,6 +91,18 @@ interface IDXGIDeviceSubObject : IDXGIObject HRESULT GetDevice(REFIID riid, void **device); } +[ + object, + local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs(UINT output_idx, IDXGIOutput **output); + HRESULT GetDesc(DXGI_ADAPTER_DESC *desc); + HRESULT CheckInterfaceSupport(REFGUID guid, void *umd_version); +} + [ local, object, diff --git a/tests/d3d12.c b/tests/d3d12.c index e5a6249afff8..3956fbaa3b56 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -890,18 +890,41 @@ static IUnknown *create_adapter(void) return adapter; } - if (use_adapter_idx) - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get adapter, hr %#x.\n", hr); return adapter; } + +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} #else static IUnknown *create_adapter(void) { return NULL; } + +static void print_adapter_info(void) {} #endif static ID3D12Device *create_device(void) @@ -21923,6 +21946,8 @@ START_TEST(d3d12) ID3D12Debug_Release(debug); } + print_adapter_info(); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support); -- 2.18.1

2 1

[PATCH vkd3d 2/6] tests: Add more flexible todo() implementation.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Based on wine/test.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 75 +++++++++++++++++++++++------------- tests/d3d12.c | 56 +++++++++++---------------- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index fd3ed1572da6..a2649dd64f76 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -32,12 +32,15 @@ static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; static const char *vkd3d_test_platform = "other"; +static void vkd3d_test_start_todo(bool is_todo); +static int vkd3d_test_loop_todo(void); +static void vkd3d_test_end_todo(void); + #define START_TEST(name) \ static const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) #define ok ok_(__LINE__) -#define todo todo_(__LINE__) #define skip skip_(__LINE__) #define trace trace_(__LINE__) @@ -73,6 +76,11 @@ static const char *vkd3d_test_platform = "other"; #define VKD3D_TEST_TRACE(args...) \ vkd3d_test_trace(vkd3d_line, args); } while (0) +#define todo_if(is_todo) \ + for (vkd3d_test_start_todo(is_todo); vkd3d_test_loop_todo(); vkd3d_test_end_todo()) + +#define todo todo_if(true) + static struct { LONG success_count; @@ -82,6 +90,9 @@ static struct LONG todo_success_count; unsigned int debug_level; + + unsigned int todo_level; + bool todo_do_loop; } vkd3d_test_state; static bool @@ -99,7 +110,24 @@ broken(bool condition) static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { - if (result) + bool is_todo = vkd3d_test_state.todo_level && !vkd3d_test_platform_is_windows(); + + if (is_todo) + { + if (result) + { + printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + vprintf(fmt, args); + InterlockedIncrement(&vkd3d_test_state.todo_success_count); + } + else + { + printf("%s:%d: Todo: ", vkd3d_test_name, line); + vprintf(fmt, args); + InterlockedIncrement(&vkd3d_test_state.todo_count); + } + } + else if (result) { if (vkd3d_test_state.debug_level > 1) printf("%s:%d: Test succeeded.\n", vkd3d_test_name, line); @@ -123,31 +151,6 @@ vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) va_end(args); } -static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED -vkd3d_test_todo(unsigned int line, bool result, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - if (vkd3d_test_platform_is_windows()) - { - vkd3d_test_check_ok(line, result, fmt, args); - } - else if (result) - { - printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); - vprintf(fmt, args); - InterlockedIncrement(&vkd3d_test_state.todo_success_count); - } - else - { - printf("%s:%d: Todo: ", vkd3d_test_name, line); - vprintf(fmt, args); - InterlockedIncrement(&vkd3d_test_state.todo_count); - } - va_end(args); -} - static void VKD3D_PRINTF_FUNC(2, 3) VKD3D_UNUSED vkd3d_test_skip(unsigned int line, const char *fmt, ...) { @@ -283,6 +286,24 @@ static inline void vkd3d_run_test(const char *name, vkd3d_test_pfn test_pfn) test_pfn(); } +static inline void vkd3d_test_start_todo(bool is_todo) +{ + vkd3d_test_state.todo_level = (vkd3d_test_state.todo_level << 1) | is_todo; + vkd3d_test_state.todo_do_loop = true; +} + +static inline int vkd3d_test_loop_todo(void) +{ + bool do_loop = vkd3d_test_state.todo_do_loop; + vkd3d_test_state.todo_do_loop = false; + return do_loop; +} + +static inline void vkd3d_test_end_todo(void) +{ + vkd3d_test_state.todo_level >>= 1; +} + #define run_test(test_pfn) \ vkd3d_run_test(#test_pfn, test_pfn) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3956fbaa3b56..e9dbbaa8c3ba 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1412,8 +1412,8 @@ static void test_format_support(void) memset(&format_support, 0, sizeof(format_support)); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, &format_support, sizeof(format_support)); - todo(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER, + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo ok(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER, "Got unexpected support1 %#x.\n", format_support.Support1); ok(!format_support.Support2 || format_support.Support2 == D3D12_FORMAT_SUPPORT2_TILED, "Got unexpected support2 %#x.\n", format_support.Support2); @@ -1792,7 +1792,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12Resource_Release(resource); @@ -1835,7 +1835,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12Resource_Release(resource); @@ -2487,7 +2487,7 @@ static void test_create_root_signature(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; @@ -2522,7 +2522,7 @@ static void test_create_root_signature(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; @@ -5472,7 +5472,7 @@ static void test_invalid_texture_resource_barriers(void) transition_resource_state(command_list, readback_buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON); hr = ID3D12GraphicsCommandList_Close(command_list); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12CommandAllocator_Reset(command_allocator); ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); @@ -5485,7 +5485,7 @@ static void test_invalid_texture_resource_barriers(void) transition_resource_state(command_list, upload_buffer, D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_COMMON); hr = ID3D12GraphicsCommandList_Close(command_list); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D12CommandAllocator_Release(command_allocator); ID3D12CommandQueue_Release(queue); @@ -5540,7 +5540,7 @@ static void test_device_removed_reason(void) hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&tmp_queue); - todo(hr == DXGI_ERROR_DEVICE_REMOVED, "Got unexpected hr %#x.\n", hr); + todo ok(hr == DXGI_ERROR_DEVICE_REMOVED, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12CommandQueue_Release(tmp_queue); @@ -9484,7 +9484,7 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c (unsigned int)blob_buffer[0], (unsigned int)code[0]); for (i = 1; i < 5; ++i) { - todo_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", + todo ok_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", (unsigned int)blob_buffer[i], (unsigned int)code[i], i - 1); } for (; i < code_size / sizeof(DWORD); ++i) @@ -12880,7 +12880,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); value = get_readback_uint(&rb, 0, 0, 0); - todo(value == 0xff00ff00, "Got unexpected value %#x.\n", value); + todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_heap); @@ -17604,17 +17604,12 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - if (test->i.x < 0 + todo_if(test->i.x < 0 && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin"))) - todo(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); - else - ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -17629,16 +17624,11 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - if (test->i.x < 0 && todo_instruction) - todo(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, imm_instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); - else - ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, imm_instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + todo_if(test->i.x < 0 && todo_instruction) + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, imm_instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -18008,7 +17998,7 @@ static void test_create_query_heap(void) heap_desc.NodeMask = 0; hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); - todo(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); + todo ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); if (hr == S_OK) ID3D12QueryHeap_Release(query_heap); @@ -18516,7 +18506,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) reset_command_list(command_lists[0], context.allocator); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_lists[0]); result = get_readback_uint64(&rb, 0, 0); - todo(result == context.render_target_desc.Width * context.render_target_desc.Height, + todo ok(result == context.render_target_desc.Width * context.render_target_desc.Height, "Got unexpected result %"PRIu64".\n", result); release_resource_readback(&rb); -- 2.18.1

2 1

[PATCH vkd3d 3/6] vkd3d: Implement primitive restart.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 17 ++++++++++++++++- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1fefb6149cff..03d8ef35ffd2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2233,6 +2233,21 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = j; vkd3d_shader_free_shader_signature(&input_signature); + switch (desc->IBStripCutValue) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: + graphics->primitive_restart_enable = VK_FALSE; + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + graphics->primitive_restart_enable = VK_TRUE; + break; + default: + WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); + hr = E_INVALIDARG; + goto fail; + } + sub_pass_desc.flags = 0; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.inputAttachmentCount = 0; @@ -2491,7 +2506,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = VK_FALSE; + ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2fc31da08a96..f97755925888 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,6 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; + VkBool32 primitive_restart_enable; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; -- 2.18.1

2 1

[PATCH 1/2] loader: Move some code in preparation for adding the Mac preloader.
by Ken Thomases Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- This is a no-op. It justs makes the next patch simpler. loader/preloader.c | 288 +++++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 140 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 644244b..de15130 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -93,6 +93,14 @@ #include "main.h" +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ); + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ); + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ); + +static void preload_reserve( const char *str ); + /* ELF definitions */ #define ELF_PREFERRED_ADDRESS(loader, maplength, mapstartpref) (mapstartpref) #define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0) @@ -559,85 +567,6 @@ static inline void *wld_memset( void *dest, int val, size_t len ) return dest; } -/* - * wld_printf - just the basics - * - * %x prints a hex number - * %s prints a string - * %p prints a pointer - */ -static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) -{ - static const char hex_chars[16] = "0123456789abcdef"; - const char *p = fmt; - char *str = buffer; - int i; - - while( *p ) - { - if( *p == '%' ) - { - p++; - if( *p == 'x' ) - { - unsigned int x = va_arg( args, unsigned int ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if (p[0] == 'l' && p[1] == 'x') - { - unsigned long x = va_arg( args, unsigned long ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - p++; - } - else if( *p == 'p' ) - { - unsigned long x = (unsigned long)va_arg( args, void * ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if( *p == 's' ) - { - char *s = va_arg( args, char * ); - while(*s) - *str++ = *s++; - } - else if( *p == 0 ) - break; - p++; - } - *str++ = *p++; - } - *str = 0; - return str - buffer; -} - -static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); -} - -static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); - wld_exit(1); -} - #ifdef DUMP_AUX_INFO /* * Dump interesting bits of the ELF auxv_t structure that is passed @@ -1120,67 +1049,6 @@ found: return (void *)(symtab[idx].st_value + map->l_addr); } -/* - * preload_reserve - * - * Reserve a range specified in string format - */ -static void preload_reserve( const char *str ) -{ - const char *p; - unsigned long result = 0; - void *start = NULL, *end = NULL; - int i, first = 1; - - for (p = str; *p; p++) - { - if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; - else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; - else if (*p == '-') - { - if (!first) goto error; - start = (void *)(result & ~page_mask); - result = 0; - first = 0; - } - else goto error; - } - if (!first) end = (void *)((result + page_mask) & ~page_mask); - else if (result) goto error; /* single value '0' is allowed */ - - /* sanity checks */ - if (end <= start) start = end = NULL; - else if ((char *)end > preloader_start && - (char *)start <= preloader_end) - { - wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", - start, end, preloader_start, preloader_end ); - start = end = NULL; - } - - /* check for overlap with low memory areas */ - for (i = 0; preload_info[i].size; i++) - { - if ((char *)preload_info[i].addr > (char *)0x00110000) break; - if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) - { - start = end = NULL; - break; - } - if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) - start = (char *)preload_info[i].addr + preload_info[i].size; - } - - while (preload_info[i].size) i++; - preload_info[i].addr = start; - preload_info[i].size = (char *)end - (char *)start; - return; - -error: - fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); -} - /* check if address is in one of the reserved ranges */ static int is_addr_reserved( const void *addr ) { @@ -1374,3 +1242,143 @@ void* wld_start( void **stack ) return (void *)ld_so_map.l_entry; } + +/* + * wld_printf - just the basics + * + * %x prints a hex number + * %s prints a string + * %p prints a pointer + */ +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) +{ + static const char hex_chars[16] = "0123456789abcdef"; + const char *p = fmt; + char *str = buffer; + int i; + + while( *p ) + { + if( *p == '%' ) + { + p++; + if( *p == 'x' ) + { + unsigned int x = va_arg( args, unsigned int ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if (p[0] == 'l' && p[1] == 'x') + { + unsigned long x = va_arg( args, unsigned long ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + p++; + } + else if( *p == 'p' ) + { + unsigned long x = (unsigned long)va_arg( args, void * ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if( *p == 's' ) + { + char *s = va_arg( args, char * ); + while(*s) + *str++ = *s++; + } + else if( *p == 0 ) + break; + p++; + } + *str++ = *p++; + } + *str = 0; + return str - buffer; +} + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); +} + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); + wld_exit(1); +} + +/* + * preload_reserve + * + * Reserve a range specified in string format + */ +static void preload_reserve( const char *str ) +{ + const char *p; + unsigned long result = 0; + void *start = NULL, *end = NULL; + int i, first = 1; + + for (p = str; *p; p++) + { + if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; + else if (*p == '-') + { + if (!first) goto error; + start = (void *)(result & ~page_mask); + result = 0; + first = 0; + } + else goto error; + } + if (!first) end = (void *)((result + page_mask) & ~page_mask); + else if (result) goto error; /* single value '0' is allowed */ + + /* sanity checks */ + if (end <= start) start = end = NULL; + else if ((char *)end > preloader_start && + (char *)start <= preloader_end) + { + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", + start, end, preloader_start, preloader_end ); + start = end = NULL; + } + + /* check for overlap with low memory areas */ + for (i = 0; preload_info[i].size; i++) + { + if ((char *)preload_info[i].addr > (char *)0x00110000) break; + if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) + { + start = end = NULL; + break; + } + if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) + start = (char *)preload_info[i].addr + preload_info[i].size; + } + + while (preload_info[i].size) i++; + preload_info[i].addr = start; + preload_info[i].size = (char *)end - (char *)start; + return; + +error: + fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); +} -- 2.10.2

1 1

[PATCH 3/5] d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 385c70d67166..d97882705b58 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -132,15 +132,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + } return hr; } -- 2.18.1

3 2

[PATCH 4/5] d3d9: Do not touch output parameter when d3d9_GetAdapterLUID() fails.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/directx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 242e36d15de5..4fbf5e9a07ee 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -542,9 +542,8 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.description_size = 0; adapter_id.device_name_size = 0; - hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id); - - *luid = adapter_id.adapter_luid; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id))) + *luid = adapter_id.adapter_luid; return hr; } -- 2.18.1

3 2

[PATCH 5/5] d3d9: Do not touch output parameter when d3d9_GetAdapterIdentifier() fails.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 4fbf5e9a07ee..3f9c188f3e7f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -137,15 +137,16 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName); - hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + } return hr; } -- 2.18.1

3 2

[PATCH 2/5] wined3d: Lock wined3d mutex in wined3d_get_adapter_identifier().
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/directx.c | 2 -- dlls/d3d9/directx.c | 6 +----- dlls/dxgi/adapter.c | 12 ++---------- dlls/wined3d/directx.c | 16 +++++++++++----- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index df5e7d612141..385c70d67166 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -132,9 +132,7 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id); - wined3d_mutex_unlock(); identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index dd6e0bd8eb81..242e36d15de5 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -137,9 +137,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName); - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id); - wined3d_mutex_unlock(); identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; @@ -544,11 +542,9 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.description_size = 0; adapter_id.device_name_size = 0; - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id); - wined3d_mutex_unlock(); - memcpy(luid, &adapter_id.adapter_luid, sizeof(*luid)); + *luid = adapter_id.adapter_luid; return hr; } diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 4371ae74f7e1..31baae6f49ff 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -158,11 +158,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) @@ -311,11 +307,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap adapter_id.description_size = 0; adapter_id.device_name_size = 0; - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; switch (segment_group) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9aa9fa44003..544c76ed5c19 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1155,8 +1155,6 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, return WINED3D_OK; } -/* NOTE: due to structure differences between dx8 and dx9 D3DADAPTER_IDENTIFIER, - and fields being inserted in the middle, a new structure is used in place */ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) { @@ -1166,8 +1164,10 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, TRACE("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n", wined3d, adapter_idx, flags, identifier); + wined3d_mutex_lock(); + if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; + goto fail; adapter = &wined3d->adapters[adapter_idx]; @@ -1194,7 +1194,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->device_name_size, NULL, NULL)) { ERR("Failed to convert device name, last error %#x.\n", GetLastError()); - return WINED3DERR_INVALIDCALL; + goto fail; } } @@ -1206,11 +1206,17 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->revision = 0; memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; - memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); + identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); + wined3d_mutex_unlock(); + return WINED3D_OK; + +fail: + wined3d_mutex_unlock(); + return WINED3DERR_INVALIDCALL; } HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, -- 2.18.1

3 2

[PATCH 1/5] wined3d: Lock wined3d mutex in wined3d_swapchain_present().
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/swapchain.c | 7 +------ dlls/d3d9/swapchain.c | 7 +------ dlls/dxgi/swapchain.c | 7 +------ dlls/wined3d/swapchain.c | 5 +++++ 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 6e8b98e3b6de..c9abfffffda3 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -88,7 +88,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChai { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); struct d3d8_device *device = impl_from_IDirect3DDevice8(swapchain->parent_device); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); @@ -99,12 +98,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChai if (dirty_region) FIXME("Ignoring dirty_region %p.\n", dirty_region); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + return wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, 0); - wined3d_mutex_unlock(); - - return hr; } static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 1279663dd52b..00ead0fc3e3e 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -140,7 +140,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), @@ -152,12 +151,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai if (dirty_region) FIXME("Ignoring dirty_region %p.\n", dirty_region); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + return wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, flags); - wined3d_mutex_unlock(); - - return hr; } static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9Ex *iface, IDirect3DSurface9 *surface) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4dfa06873351..5aa2525c06e3 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -602,7 +602,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface UINT sync_interval, UINT flags, const DXGI_PRESENT_PARAMETERS *present_parameters) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); @@ -624,11 +623,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); - wined3d_mutex_unlock(); - - return hr; + return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } static BOOL STDMETHODCALLTYPE d3d11_swapchain_IsTemporaryMonoSupported(IDXGISwapChain1 *iface) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 344a1867a8cf..3a7039da4489 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -164,9 +164,12 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, if (flags) FIXME("Ignoring flags %#x.\n", flags); + wined3d_mutex_lock(); + if (!swapchain->back_buffers) { WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL.\n"); + wined3d_mutex_unlock(); return WINED3DERR_INVALIDCALL; } @@ -186,6 +189,8 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, dst_rect, dst_window_override, swap_interval, flags); + wined3d_mutex_unlock(); + return WINED3D_OK; } -- 2.18.1

3 2

[PATCH] wined3d: Use wined3d_state_get_light() in wined3d_state_record_lights().
by Zebediah Figura Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d7d936ea50..9c8c4e9859 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -674,6 +674,8 @@ void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3 static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { + const struct wined3d_light_info *src; + struct wined3d_light_info *dst; UINT i; /* Lights... For a recorded state block, we just had a chain of actions @@ -681,48 +683,36 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s * differ. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) { - struct list *e, *f; - LIST_FOR_EACH(e, &dst_state->light_map[i]) + LIST_FOR_EACH_ENTRY(dst, &dst_state->light_map[i], struct wined3d_light_info, entry) { - BOOL updated = FALSE; - struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; - - /* Look up the light in the destination */ - LIST_FOR_EACH(f, &src_state->light_map[i]) + if ((src = wined3d_state_get_light(src_state, dst->OriginalIndex))) { - realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); - if (realLight->OriginalIndex == src->OriginalIndex) + dst->OriginalParms = src->OriginalParms; + + if (src->glIndex == -1 && dst->glIndex != -1) { - src->OriginalParms = realLight->OriginalParms; - - if (realLight->glIndex == -1 && src->glIndex != -1) - { - /* Light disabled */ - dst_state->lights[src->glIndex] = NULL; - } - else if (realLight->glIndex != -1 && src->glIndex == -1) - { - /* Light enabled */ - dst_state->lights[realLight->glIndex] = src; - } - src->glIndex = realLight->glIndex; - updated = TRUE; - break; + /* Light disabled. */ + dst_state->lights[dst->glIndex] = NULL; } + else if (src->glIndex != -1 && dst->glIndex == -1) + { + /* Light enabled. */ + dst_state->lights[src->glIndex] = dst; + } + dst->glIndex = src->glIndex; } - - if (!updated) + else { /* This can happen if the light was originally created as a * default light for SetLightEnable() while recording. */ WARN("Light %u in dst_state %p does not exist in src_state %p.\n", - src->OriginalIndex, dst_state, src_state); + dst->OriginalIndex, dst_state, src_state); - src->OriginalParms = WINED3D_default_light; - if (src->glIndex != -1) + dst->OriginalParms = WINED3D_default_light; + if (dst->glIndex != -1) { - dst_state->lights[src->glIndex] = NULL; - src->glIndex = -1; + dst_state->lights[dst->glIndex] = NULL; + dst->glIndex = -1; } } } -- 2.14.1

2 1

[PATCH 2/2] explorer: send WM_NCDESTROY message to delete hwnd-related global atom
by Daniel Wendt Dec. 3, 2018

Dec. 3, 2018

2 1

[PATCH 1/2] user32: delete global atom on message WM_NCDESTROY
by Daniel Wendt Dec. 3, 2018

Dec. 3, 2018

2 1

[PATCH] bcrypt: Support retrieving properties from key handles.
by Hans Leidekker Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 130 +++++++++++++++++++++++++++------------------ dlls/bcrypt/tests/bcrypt.c | 31 ++++++++++- 2 files changed, 107 insertions(+), 54 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2b9ae0b766..0c68a4f3e6 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 6865e87ca8..c3f8f3d78a 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; -- 2.11.0

2 1

[PATCH 2/2] crypt32: Pass type and flags in correct order to the find() helper.
by Dmitry Timoshkov Dec. 3, 2018

Dec. 3, 2018

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 2d7ef42d3c..e591c4dd45 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1811,7 +1811,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, } if (find) - ret = find(hCertStore, dwFlags, dwType, pvPara, pPrevCertContext); + ret = find(hCertStore, dwType, dwFlags, pvPara, pPrevCertContext); else if (compare) ret = cert_compare_certs_in_store(hCertStore, pPrevCertContext, compare, dwType, dwFlags, pvPara); -- 2.17.1

1 0

[PATCH 1/2] crypt32: Use sizeof(WCHAR) instead of 2.
by Dmitry Timoshkov Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 06d456a474..e70940aa7d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1550,7 +1550,7 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, case ASN_UTF8STRING: valueType = CERT_RDN_UTF8_STRING; bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, - (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * sizeof(WCHAR); break; default: SetLastError(CRYPT_E_ASN1_BADTAG); -- 2.17.1

1 0

[PATCH] winegcc: Pass -static-libstdc++ to the linker
by Andrew Eikum Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- tools/winegcc/winegcc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3365..b5fa881c30 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -71,8 +71,9 @@ * * Linker Options * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol --image-base + * -nostdlib -s -static -static-libgcc -static-libstdc++ + * -shared -shared-libgcc -symbolic -Wl,option + * -Xlinker option -u symbol --image-base * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1288,8 +1289,9 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" + "-nostdlib", "-s", "-static", "-static-libgcc", "-static-libstdc++", + "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", + "-fprofile-generate", "-fprofile-use" }; unsigned int j; -- 2.19.2

1 0

[PATCH] vbscript: Make constant 'html_delimiterW' static
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e8ecf4d1fd..020109998e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -969,7 +969,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { - const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + static const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); -- 2.19.2

2 1

[PATCH] shdocvw: Make constants 'wszCLSID' and 'wszInitPropertyBag' static
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shdocvw/shlinstobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 9c3232c65e..6f6786bdb5 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -361,8 +361,8 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, WCHAR wszInstanceKey[] = { 'C','L','S','I','D','\\','{','0','0','0','0','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0', '0','0','0','0','}','\\','I','n','s','t','a','n','c','e', 0 }; - const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - const WCHAR wszInitPropertyBag[] = + static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; + static const WCHAR wszInitPropertyBag[] = { 'I','n','i','t','P','r','o','p','e','r','t','y','B','a','g',0 }; WCHAR wszCLSIDInstance[CHARS_IN_GUID]; CLSID clsidInstance; -- 2.19.2

2 1

[PATCH 1/5] user32/listbox: Use a helper function to check the selection state of an item.
by Nikolay Sivov Dec. 3, 2018

Dec. 3, 2018

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 286a33b1c1..3eee691086 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -120,6 +120,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) +{ + return descr->items[index].selected; +} + /********************************************************************* * listbox class descriptor */ @@ -2866,7 +2871,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; - return descr->items[wParam].selected; + return is_item_selected(descr, wParam); case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); -- 2.19.2

2 7

[PATCH] rpcrt4: Fix 'Routeines' typos.
by Serge Gautherie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0dc6789..79c9645 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -519,9 +519,9 @@ @ stub long_from_ndr @ stub long_from_ndr_temp @ stub pfnFreeRoutines # wxp -@ stub pfnMarshallRouteines # wxp +@ stub pfnMarshallRoutines # wxp @ stub pfnSizeRoutines # wxp -@ stub pfnUnmarshallRouteines # wxp +@ stub pfnUnmarshallRoutines # wxp @ stub short_array_from_ndr @ stub short_from_ndr @ stub short_from_ndr_temp -- 2.10.0.windows.1

2 1

[PATCH] oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation.
by Dmitry Timoshkov Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/tmarshal.c | 39 +++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 3 ++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 756cca844d..0b6776b40a 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2861,7 +2861,7 @@ static void test_typelibmarshal(void) ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - /* call DoSomething */ + /* call DoSomething without optional arguments */ VariantInit(&vararg[0]); VariantInit(&vararg[1]); V_VT(&vararg[1]) = VT_R8; @@ -2876,6 +2876,43 @@ static void test_typelibmarshal(void) ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); VariantClear(&varresult); + /* call DoSomething with optional argument set to VT_EMPTY */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_R8; + V_R8(&vararg[2]) = 3.141; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 3; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + + /* call DoSomething with optional arguments set to VT_ERROR/DISP_E_PARAMNOTFOUND */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + VariantInit(&vararg[3]); + V_VT(&vararg[3]) = VT_R8; + V_R8(&vararg[3]) = 3.141; + V_VT(&vararg[1]) = VT_ERROR; + V_ERROR(&vararg[1]) = DISP_E_PARAMNOTFOUND; + V_VT(&vararg[0]) = VT_ERROR; + V_ERROR(&vararg[0]) = DISP_E_PARAMNOTFOUND; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 4; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + /* call get_State */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f32bed35f4..f17a9267b7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7217,7 +7217,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else if (src_arg) + else if (src_arg && !((wParamFlags & PARAMFLAG_FOPT) && + V_VT(src_arg) == VT_ERROR && V_ERROR(src_arg) == DISP_E_PARAMNOTFOUND)) { TRACE("%s\n", debugstr_variant(src_arg)); -- 2.17.1

2 1

[PATCH] advapi32: Turn several string variables into static constants
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 16512d094c..70e2da40e7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -440,10 +440,10 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) { - WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; - WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; - WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; - WCHAR usersW[] = {'U','S','E','R','S',0}; + static const WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; + static const WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; + static const WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; + static const WCHAR usersW[] = {'U','S','E','R','S',0}; LPWSTR p = strchrW(full_key_name, '\\'); int len = p-full_key_name; HKEY hParent; @@ -4997,9 +4997,9 @@ static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) { + static const WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; + static const WCHAR subauthfmt[] = { '-','%','u',0 }; DWORD i; - WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - WCHAR subauthfmt[] = { '-','%','u',0 }; WCHAR buf[26]; SID *pisid = psid; -- 2.19.2

8 34

[PATCH] winspool.drv: Make constant 'fmtW' static
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb268a047f..e91138dbec 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8208,8 +8208,8 @@ end: */ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { + static const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; WCHAR *cmd; - const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; BOOL r; cmd = HeapAlloc(GetProcessHeap(), 0, strlenW(printer_name) * sizeof(WCHAR) + sizeof(fmtW)); -- 2.19.2

2 1

[PATCH] gdi32: Fix function prototype when building without freetype.
by Nikolay Sivov Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Change missing from 03ccce70b540379bf4de86232d375f3e64cf465c. dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f50c163f89..fb58a6a7e9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -9168,7 +9168,7 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD unknown, UINT64 offset, vo /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed) +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed) { *needed = 0; return FALSE; -- 2.19.2

2 1

[PATCH 1/5] shlwapi: Forward SHCreateMemStream() to shcore.
by Nikolay Sivov Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/regstream.c | 40 --------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 63615d3d9c..47e9317208 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -632,46 +632,6 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, return iStream ? iStream : &rsDummyRegStream.IStream_iface; } -/************************************************************************* - * @ [SHLWAPI.12] - * - * Create an IStream object on a block of memory. - * - * PARAMS - * lpbData [I] Memory block to create the IStream object on - * dwDataLen [I] Length of data block - * - * RETURNS - * Success: A pointer to the IStream object. - * Failure: NULL, if any parameters are invalid or an error occurs. - * - * NOTES - * A copy of the memory pointed to by lpbData is made, and is freed - * when the stream is released. - */ -IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) -{ - ISHRegStream *strm = NULL; - LPBYTE lpbDup; - - TRACE("(%p,%d)\n", lpbData, dwDataLen); - - if (!lpbData) - dwDataLen = 0; - - lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - strm = IStream_Create(NULL, lpbDup, dwDataLen); - - if (!strm) - HeapFree(GetProcessHeap(), 0, lpbDup); - } - return &strm->IStream_iface; -} - /************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 62ebb85f46..ddc76ec0ac 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -9,7 +9,7 @@ 9 stdcall -ordinal SHUnlockShared(ptr) 10 stdcall -ordinal SHFreeShared(long long) 11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -ordinal SHCreateMemStream(ptr long) +12 stdcall -ordinal SHCreateMemStream(ptr long) shcore.SHCreateMemStream 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr) -- 2.19.2

1 4

[PATCH v2 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42255 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/attachment.cgi?id=59935 with minor changes. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_arm64.c | 12 ++++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 4 files changed, 35 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f53f..1f3aeaa0bc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,6 +434,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index da0c8fb71e..72087a2c4c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4d2d127711..22a861da60 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -977,6 +977,18 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7228adb3ab..3f886a785c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3506,6 +3506,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) semi-stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return RtlAddFunctionTable(functions, count, base); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.19.2

2 2

[PATCH] wininet: Always check if context can be deleted when freeing netconn.
by Daniel Lehman Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: supersedes https://source.winehq.org/patches/data/155145 fixes a memory leak where netcon_secure_connect_setup fails in the call to netconn_verify_cert resulting in netconn->secure being FALSE, so it doesn't get freed in free_netconn --- dlls/wininet/netconnection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad22177ee..615a43c2be 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -392,9 +392,9 @@ void free_netconn(netconn_t *netconn) heap_free(netconn->extra_buf); netconn->extra_buf = NULL; netconn->extra_len = 0; - if (SecIsValidHandle(&netconn->ssl_ctx)) - DeleteSecurityContext(&netconn->ssl_ctx); } + if (SecIsValidHandle(&netconn->ssl_ctx)) + DeleteSecurityContext(&netconn->ssl_ctx); close_netconn(netconn); heap_free(netconn); -- 2.17.1

2 2

Re: [PATCH 2/2] ntdll: Add RtlGrowFunctionTable stub
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

On Sun, Dec 2, 2018 at 5:40 PM Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > > Hi Alex, > > How about stealing the ones from staging, they have been improved more than the ones you sent in. > https://github.com/wine-staging/wine-staging/tree/master/patches/ntdll-RtlA… The main difference in the staging patches is that they add the functions to winnt.h too. Since Alexandre doesn't like adding functions to the header files before they have a proper implementation, I think the patches that I sent today are more likely to be accepted. My new patches also have the advantage of making RtlAddGrowableFunctionTable on x64 call RtlAddFunctionTable (which has an x64 implementation already) instead of just doing nothing. -Alex

2 2

[PATCH 0/3] ntdll: processor info parsing improvements/fixes
by Roderick Colenbrander Dec. 3, 2018

Dec. 3, 2018

Hi, This patch series was motivated by a bug exposed by earlier logical core parsing I added this summer (bug 45453). The fix was simple, but I added a new helper function as more parts of the code use similar code. While adding the fix, I noticed how our Linux CPU parsing logic will really fail on high core count (>32 or >64). These core counts are becoming more and more common. Consumer AMD Threadripper now has 64 logical cores (maybe >64 next year) and in the server space you can already easily go above on dual socket systems. Supporting high core count, doesn't look trivial to me. The CPU parsing logic is quite fragile as it is. We need to break info better down into multiple groups (hard coded to 1, right now) based on NUMA nodes. Wineserver changes likely needed as well for thread affinity. Many others like needed e.g. the classic GetLogicalProcessorInformation supposedly reports info just for the "group" the thread is currently assigned to as it can't handle >32 / >64 cores. All in all some fun improvements, which warrant a FIXME. For users who currently go above the limit, we are probably reaching undefined behavior right now... Thanks, Roderick Roderick Colenbrander (3): ntdll: parse sysfs cpu_shared_map using helper function. ntdll: Fix parsing thread_siblings bitmaps on high core count systems. ntdll: print FIXME on systems supporting more CPU cores than supported. dlls/ntdll/nt.c | 103 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 86 insertions(+), 17 deletions(-) -- 2.19.1

1 3

[PATCH] po\pt_BR: Revision on inconsistencies and spelling errors.
by Roberto Pungartnik Dec. 3, 2018

Dec. 3, 2018

1 0

[PATCH 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie Dec. 2, 2018

Dec. 2, 2018

From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42255 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/attachment.cgi?id=59935 with minor changes. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f53f..1f3aeaa0bc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,6 +434,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index da0c8fb71e..72087a2c4c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7228adb3ab..3f886a785c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3506,6 +3506,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) semi-stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return RtlAddFunctionTable(functions, count, base); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.19.2

1 1

[PATCH 1/2] winex11.drv: Make several constants static
by Alex Henrie Dec. 2, 2018

Dec. 2, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 7a9a3a7b1c..61730ce6db 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -485,9 +485,9 @@ static void disable_system_cursors(void) */ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { - const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; - const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; - const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; + static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; + static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; + static const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; -- 2.19.2

1 1

[PATCH] wsdapi: Turn a constant and several variables into static constants
by Alex Henrie Dec. 2, 2018

Dec. 2, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wsdapi/soap.c | 6 +++--- dlls/wsdapi/xml.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index e1233986cc..2ecc01313f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -364,7 +364,7 @@ HRESULT register_namespaces(IWSDXMLContext *xml_context) static BOOL create_guid(LPWSTR buffer) { - const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; + static const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; WCHAR* uuidString = NULL; UUID uuid; @@ -401,7 +401,7 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value) { - WCHAR formatString[] = { '%','I','6','4','u', 0 }; + static const WCHAR formatString[] = { '%','I','6','4','u', 0 }; LPWSTR ret; ret = WSDAllocateLinkedMemory(parent, MAX_ULONGLONG_STRING_SIZE * sizeof(WCHAR)); @@ -560,7 +560,7 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAME_LIST *list, struct list *namespaces) { - WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; + static const WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; LPWSTR current_buf_pos = buffer; size_t memory_needed = 0; const WSD_NAME_LIST *cur = list; diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 98bdec6b0d..727d83af60 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -380,7 +380,7 @@ static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) static LPWSTR generate_namespace_prefix(IWSDXMLContextImpl *impl, void *parentMemoryBlock, LPCWSTR uri) { - WCHAR formatString[] = { 'u','n','%','d', 0 }; + static const WCHAR formatString[] = { 'u','n','%','d', 0 }; WCHAR suggestedPrefix[7]; /* Find a unique prefix */ -- 2.19.2

1 0

[PATCH] windowscodecs: Make constant 'valuename_format' static
by Alex Henrie Dec. 2, 2018

Dec. 2, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/windowscodecs/regsvr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b011d71645..3f53591552 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1032,10 +1032,10 @@ static HRESULT register_pixelformats(struct regsvr_pixelformat const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->channelmasks) { + static const WCHAR valuename_format[] = {'%','d',0}; HKEY masks_key; UINT i, mask_size; WCHAR mask_valuename[11]; - const WCHAR valuename_format[] = {'%','d',0}; mask_size = (list->bitsperpixel + 7)/8; -- 2.19.2

1 0

[PATCH] shlwapi: Turn several constants and variables into static constants
by Alex Henrie Dec. 2, 2018

Dec. 2, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shlwapi/url.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 8313b98fb2..fb3892013e 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -746,26 +746,24 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, * the last leaf starting from the '#'. Otherwise the '#' is not * meaningful and just start looking from the end. */ if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { - const WCHAR htmlW[] = {'.','h','t','m','l',0}; - const int len_htmlW = 5; - const WCHAR htmW[] = {'.','h','t','m',0}; - const int len_htmW = 4; + static const WCHAR htmlW[] = {'.','h','t','m','l'}; + static const WCHAR htmW[] = {'.','h','t','m'}; if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; - else if (work - base.pszSuffix > len_htmW) { - work -= len_htmW; - if (strncmpiW(work, htmW, len_htmW) == 0) + else if (work - base.pszSuffix > ARRAY_SIZE(htmW)) { + work -= ARRAY_SIZE(htmW); + if (strncmpiW(work, htmW, ARRAY_SIZE(htmW)) == 0) manual_search = TRUE; - work += len_htmW; + work += ARRAY_SIZE(htmW); } if (!manual_search && - work - base.pszSuffix > len_htmlW) { - work -= len_htmlW; - if (strncmpiW(work, htmlW, len_htmlW) == 0) + work - base.pszSuffix > ARRAY_SIZE(htmlW)) { + work -= ARRAY_SIZE(htmlW); + if (strncmpiW(work, htmlW, ARRAY_SIZE(htmlW)) == 0) manual_search = TRUE; - work += len_htmlW; + work += ARRAY_SIZE(htmlW); } } @@ -1734,11 +1732,11 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) static HRESULT URL_CreateFromPath(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUrl) { + static const WCHAR file_colonW[] = {'f','i','l','e',':',0}; + static const WCHAR three_slashesW[] = {'/','/','/',0}; DWORD needed; HRESULT ret = S_OK; WCHAR *pszNewUrl; - WCHAR file_colonW[] = {'f','i','l','e',':',0}; - WCHAR three_slashesW[] = {'/','/','/',0}; PARSEDURLW parsed_url; parsed_url.cbSize = sizeof(parsed_url); -- 2.19.2

1 0