December 2016 - Wine-Commits

Hans Leidekker : bcrypt/tests: Add BCryptGenerateSymmetricKey tests.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 63852e6ac48ccd712acdc9deeefa62e06b654911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63852e6ac48ccd712acdc9dee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 2 18:36:42 2016 -0200 bcrypt/tests: Add BCryptGenerateSymmetricKey tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++- include/bcrypt.h | 9 ++++ 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2de1bb3..ae7432e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -29,13 +29,22 @@ static NTSTATUS (WINAPI *pBCryptOpenAlgorithmProvider)(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); static NTSTATUS (WINAPI *pBCryptCloseAlgorithmProvider)(BCRYPT_ALG_HANDLE, ULONG); static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *); -static NTSTATUS (WINAPI *pBCryptCreateHash)(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptCreateHash)(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, + ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptHash)(BCRYPT_ALG_HANDLE, UCHAR *, ULONG, UCHAR *, ULONG, UCHAR *, ULONG); static NTSTATUS (WINAPI *pBCryptHashData)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDestroyHash)(BCRYPT_HASH_HANDLE); static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptGetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptSetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptGenerateSymmetricKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, + PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, + ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptDecrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, + ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); static void test_BCryptGenRandom(void) { @@ -821,6 +830,92 @@ todo_wine { } } +static void test_BCryptGenerateSymmetricKey(void) +{ + static UCHAR secret[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR iv[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR data[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR expected[] = + {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; + BCRYPT_ALG_HANDLE aes; + BCRYPT_KEY_HANDLE key; + UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; + ULONG size, len, i; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); + if (ret != STATUS_SUCCESS) /* remove whole IF when Wine is fixed */ + { + todo_wine ok(0, "AES provider not available\n"); + return; + } + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + key = NULL; + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); + + ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, + sizeof(BCRYPT_CHAIN_MODE_CBC), 0); + todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + size = 0xdeadbeef; + ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!size, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + + size = 0xdeadbeef; + ret = pBCryptDecrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!size, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 16, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext, 16, NULL, ivbuf, 16, plaintext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(plaintext, data, sizeof(data)), "wrong data\n"); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -842,6 +937,11 @@ START_TEST(bcrypt) pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash"); pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom"); pBCryptGetProperty = (void *)GetProcAddress(module, "BCryptGetProperty"); + pBCryptSetProperty = (void *)GetProcAddress(module, "BCryptSetProperty"); + pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey"); + pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); + pBCryptDecrypt = (void *)GetProcAddress(module, "BCryptDecrypt"); + pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); @@ -852,6 +952,7 @@ START_TEST(bcrypt) test_md5(); test_rng(); test_aes(); + test_BCryptGenerateSymmetricKey(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); diff --git a/include/bcrypt.h b/include/bcrypt.h index e7c6280..e327a65 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -83,23 +83,32 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER } BCRYPT_ALGORITHM_IDENTIFIER; typedef PVOID BCRYPT_ALG_HANDLE; +typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE; typedef PVOID BCRYPT_HASH_HANDLE; +/* Flags for BCryptGenRandom */ #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002 + +/* Flags for BCryptOpenAlgorithmProvider */ #define BCRYPT_ALG_HANDLE_HMAC_FLAG 0x00000008 NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); +NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE); +NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *); NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCHAR, ULONG); NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); +NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); #endif /* __WINE_BCRYPT_H */

1 0

Hans Leidekker : bcrypt/tests: Add AES provider tests.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 9fcdc5ec7538dd92598291520fe5b8ea19b8b100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fcdc5ec7538dd92598291520… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 2 18:36:41 2016 -0200 bcrypt/tests: Add AES provider tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 5 ++++ 2 files changed, 62 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 42a20be..2de1bb3 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -765,6 +765,62 @@ static void test_rng(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_aes(void) +{ + BCRYPT_ALG_HANDLE alg; + ULONG size, len; + UCHAR mode[64]; + NTSTATUS ret; +todo_wine { + alg = NULL; + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_AES_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + if (sizeof(void *) == 4) + { + ok(len == 618 /* >= Win 8 */ + || broken(len == 610) /* Win 7 */ + || broken(len == 582) /* < Win 7 */, + "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + } + else + { + ok(len == 654 /* >= Win 8 */ + || broken(len == 622) /* Win 7 */ + || broken(len == 598) /* < Win 7 */, + "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + } + + len = size = 0; + ret = pBCryptGetProperty(alg, 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; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + ret = pBCryptGetProperty(alg, 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), "got %s\n", mode); + ok(size == 64, "got %u\n", size); + + test_alg_name(alg, "AES"); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} +} + START_TEST(bcrypt) { HMODULE module; @@ -795,6 +851,7 @@ START_TEST(bcrypt) test_sha512(); test_md5(); test_rng(); + test_aes(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); diff --git a/include/bcrypt.h b/include/bcrypt.h index c521bcc..e7c6280 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -63,6 +63,7 @@ typedef LONG NTSTATUS; #define MS_PLATFORM_CRYPTO_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} +#define BCRYPT_AES_ALGORITHM (const WCHAR []){'A','E','S',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} @@ -70,6 +71,10 @@ typedef LONG NTSTATUS; #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} #define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_CHAIN_MODE_NA (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','N','/','A',0} +#define BCRYPT_CHAIN_MODE_CBC (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','B','C',0} +#define BCRYPT_CHAIN_MODE_ECB (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','E','C','B',0} + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName;

1 0

Bruno Jesus : bcrypt/tests: Normalize all tests to use function pointers.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 8d8936cbb6fea3cac862e059e814527f5361f48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8936cbb6fea3cac862e059e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 2 18:36:40 2016 -0200 bcrypt/tests: Normalize all tests to use function pointers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 267 ++++++++++++++++++++++++--------------------- 1 file changed, 145 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d8936cbb6fea3cac862e…

1 0

Bruno Jesus : bcrypt/tests: Workaround RegGetValueW not being present in XP.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: b5e5be13d20adff5d7b784e71c7a48fb95fde2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e5be13d20adff5d7b784e71… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 2 18:36:39 2016 -0200 bcrypt/tests: Workaround RegGetValueW not being present in XP. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5cdb065..4466179 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -75,18 +75,19 @@ static void test_BCryptGetFipsAlgorithmMode(void) 'L','s','a',0}; static const WCHAR policyValueXPW[] = { 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; + HKEY hkey = NULL; BOOLEAN expected; BOOLEAN enabled; DWORD value, count[2] = {sizeof(value), sizeof(value)}; NTSTATUS ret; - if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyVistaW, policyValueVistaW, - RRF_RT_REG_DWORD, NULL, &value, &count[0])) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, policyValueVistaW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } - else if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyXPW, policyValueXPW, - RRF_RT_REG_DWORD, NULL, &value, &count[1])) + else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, policyValueXPW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } @@ -96,6 +97,7 @@ static void test_BCryptGetFipsAlgorithmMode(void) todo_wine ok(0, "Neither XP or Vista key is present\n"); } + RegCloseKey(hkey); ret = BCryptGetFipsAlgorithmMode(&enabled); ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret);

1 0

VRan Liu : shell32/tests: Simple test for KF_FLAG_DEFAULT_PATH.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: c64cdc1fe608faf01ca21708787839df849c0a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64cdc1fe608faf01ca217087… Author: VRan Liu <gliuwr(a)gmail.com> Date: Sun Dec 4 23:33:09 2016 +0300 shell32/tests: Simple test for KF_FLAG_DEFAULT_PATH. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index fa391c2..3c757ec 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -860,6 +860,12 @@ if (0) { /* crashes */ ok(path == NULL, "got %p\n", path); path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, KF_FLAG_DEFAULT_PATH, NULL, &path); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "expected path != NULL\n"); + CoTaskMemFree(path); + + path = NULL; hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); ok(path != NULL, "expected path != NULL\n");

1 0

Hugh McMaster : regedit/tests: Move existing comment tests to a separate function.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: ced6d4618be73182b5df5c54ee803283666662d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced6d4618be73182b5df5c54e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 6 12:07:29 2016 +0000 regedit/tests: Move existing comment tests to a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 23ea4f9..54558b1 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -278,14 +278,6 @@ static void test_basic_import(void) verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "#comment\\\n" - "\"Wine8\"=\"Line 1\"\n" - ";comment \\\n" - "\"Wine9\"=\"Line 2\"\n\n"); - verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); - verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -344,6 +336,30 @@ static void test_invalid_import(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } +static void test_comments(void) +{ + LONG lr; + HKEY hkey; + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine1\"=\"Line 1\"\n" + ";comment\\\n" + "\"Wine2\"=\"Line 2\"\n\n"); + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0); + verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0); + + RegCloseKey(hkey); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); +} + START_TEST(regedit) { WCHAR wchar_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -359,4 +375,5 @@ START_TEST(regedit) test_basic_import(); test_invalid_import(); + test_comments(); }

1 0

Alex Henrie : user32: Tell MENU_SuspendPopup which message to remove.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 68ca28a8bc3197a09cd3b82d90969f44f844dc2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ca28a8bc3197a09cd3b82d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 21:28:50 2016 -0700 user32: Tell MENU_SuspendPopup which message to remove. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 45ce7f5..59fcd9c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2806,7 +2806,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk, UINT wFlags ) * The idea is not to show the popup if the next input message is * going to hide it anyway. */ -static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg ) +static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT uMsg ) { MSG msg; @@ -2878,7 +2878,7 @@ static BOOL MENU_KeyEscape(MTRACKER* pmt, UINT wFlags) * * Handle a VK_LEFT key event in a menu. */ -static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) +static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags, UINT msg ) { POPUPMENU *menu; HMENU hmenutmp, hmenuprev; @@ -2918,7 +2918,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) /* A sublevel menu was displayed - display the next one * unless there is another displacement coming up */ - if( !MENU_SuspendPopup( pmt, WM_KEYDOWN ) ) + if( !MENU_SuspendPopup( pmt, msg ) ) pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, pmt->hTopMenu, TRUE, wFlags); } @@ -2931,7 +2931,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) * * Handle a VK_RIGHT key event in a menu. */ -static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags ) +static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags, UINT msg ) { HMENU hmenutmp; POPUPMENU *menu = MENU_GetMenu( pmt->hTopMenu ); @@ -2975,7 +2975,7 @@ static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags ) MENU_MoveSelection( pmt->hOwnerWnd, pmt->hTopMenu, ITEM_NEXT ); if( hmenutmp || pmt->trackFlags & TF_SUSPENDPOPUP ) - if( !MENU_SuspendPopup(pmt, WM_KEYDOWN) ) + if( !MENU_SuspendPopup( pmt, msg ) ) pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, pmt->hTopMenu, TRUE, wFlags); } @@ -3178,11 +3178,11 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, break; case VK_LEFT: - MENU_KeyLeft( &mt, wFlags ); + MENU_KeyLeft( &mt, wFlags, msg.message ); break; case VK_RIGHT: - MENU_KeyRight( &mt, wFlags ); + MENU_KeyRight( &mt, wFlags, msg.message ); break; case VK_ESCAPE:

1 0

Lauri Kenttä : cmd: Compare handles to INVALID_HANDLE_VALUE, not NULL.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 048a80ffe48a26b21f5d5a4333683a3beb6baa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048a80ffe48a26b21f5d5a433… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 5 19:07:07 2016 +0200 cmd: Compare handles to INVALID_HANDLE_VALUE, not NULL. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a29a502..f82f15a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -444,7 +444,7 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) h = CreateFileW(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h == NULL) { + if (h == INVALID_HANDLE_VALUE) { WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); return FALSE; } else { @@ -478,7 +478,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app in = CreateFileW(srcname, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (in == NULL) { + if (in == INVALID_HANDLE_VALUE) { WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(srcname), GetLastError()); return FALSE; } @@ -486,7 +486,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app /* Open the output file, overwriting if not appending */ out = CreateFileW(dstname, GENERIC_WRITE, 0, NULL, append?OPEN_EXISTING:CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (out == NULL) { + if (out == INVALID_HANDLE_VALUE) { WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(dstname), GetLastError()); CloseHandle(in); return FALSE;

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_umin opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 7d9513974748e0185311955bfc209de0348b9ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9513974748e0185311955bf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:38 2016 +0100 wined3d: Recognize SM5 atomic_umin opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 098eb99..3976c19 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5207,6 +5207,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_ATOMIC_UMIN */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 81a66a3..b446659 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8870,6 +8870,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_ATOMIC_UMIN */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6bb7c9a..e070d69 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -48,6 +48,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", + /* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin", /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d4d3173..6d8a0db 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -257,6 +257,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, + WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, @@ -912,6 +913,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, + {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c1ff71..4610a7c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -574,6 +574,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_UMAX, + WINED3DSIH_ATOMIC_UMIN, WINED3DSIH_ATOMIC_XOR, WINED3DSIH_BEM, WINED3DSIH_BFI,

1 0

Nikolay Sivov : shell32: Move retrieving folder path logic to SHGetKnownFolderPath().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: a0c259cf562b32268df86053a5e0785b1ad78cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c259cf562b32268df86053a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 23:33:08 2016 +0300 shell32: Move retrieving folder path logic to SHGetKnownFolderPath(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 137 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 113 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index aa2742d..1fa5f23 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4704,45 +4704,134 @@ static int csidl_from_id( const KNOWNFOLDERID *id ) /************************************************************************* * SHGetKnownFolderPath [SHELL32.@] */ -HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PWSTR *path) +HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, WCHAR **ret_path) { - HRESULT hr; - WCHAR folder[MAX_PATH]; - int index = csidl_from_id( rfid ); + WCHAR pathW[MAX_PATH], tempW[MAX_PATH]; + HRESULT hr; + CSIDL_Type type; + int ret; + int folder = csidl_from_id(rfid), shgfp_flags; - TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, path); + TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, ret_path); - *path = NULL; + *ret_path = NULL; - if (index < 0) + if (folder < 0) return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); - if (flags & KF_FLAG_CREATE) - index |= CSIDL_FLAG_CREATE; + if (flags & ~(KF_FLAG_CREATE|KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS| + KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) + { + FIXME("flags 0x%08x not supported\n", flags); + return E_INVALIDARG; + } + + shgfp_flags = flags & KF_FLAG_DEFAULT_PATH ? SHGFP_TYPE_DEFAULT : SHGFP_TYPE_CURRENT; + + type = CSIDL_Data[folder].type; + switch (type) + { + case CSIDL_Type_Disallowed: + hr = E_INVALIDARG; + break; + case CSIDL_Type_NonExistent: + hr = S_FALSE; + break; + case CSIDL_Type_WindowsPath: + GetWindowsDirectoryW(tempW, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(tempW); + strcatW(tempW, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; + case CSIDL_Type_SystemPath: + GetSystemDirectoryW(tempW, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(tempW); + strcatW(tempW, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; + case CSIDL_Type_SystemX86Path: + if (!GetSystemWow64DirectoryW(tempW, MAX_PATH)) GetSystemDirectoryW(tempW, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(tempW); + strcatW(tempW, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; + case CSIDL_Type_CurrVer: + hr = _SHGetCurrentVersionPath(shgfp_flags, folder, tempW); + break; + case CSIDL_Type_User: + hr = _SHGetUserProfilePath(token, shgfp_flags, folder, tempW); + break; + case CSIDL_Type_AllUsers: + hr = _SHGetAllUsersProfilePath(shgfp_flags, folder, tempW); + break; + default: + FIXME("bogus type %d, please fix\n", type); + hr = E_INVALIDARG; + break; + } + + /* Expand environment strings if necessary */ + if (*tempW == '%') + hr = _SHExpandEnvironmentStrings(tempW, pathW); + else + strcpyW(pathW, tempW); - if (flags & KF_FLAG_DONT_VERIFY) - index |= CSIDL_FLAG_DONT_VERIFY; + if (FAILED(hr)) + goto failed; - if (flags & KF_FLAG_NO_ALIAS) - index |= CSIDL_FLAG_NO_ALIAS; + /* if we don't care about existing directories we are ready */ + if (flags & KF_FLAG_DONT_VERIFY) goto done; - if (flags & KF_FLAG_INIT) - index |= CSIDL_FLAG_PER_USER_INIT; + if (PathFileExistsW(pathW)) goto done; - if (flags & ~(KF_FLAG_CREATE|KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT)) + /* Does not exist but we are not allowed to create it. The return value + * is verified against shell32 version 6.0. + */ + if (!(flags & KF_FLAG_CREATE)) { - FIXME("flags 0x%08x not supported\n", flags); - return E_INVALIDARG; + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + goto done; } - hr = SHGetFolderPathW( NULL, index, token, 0, folder ); - if (SUCCEEDED(hr)) + /* create directory/directories */ + ret = SHCreateDirectoryExW(NULL, pathW, NULL); + if (ret && ret != ERROR_ALREADY_EXISTS) { - *path = CoTaskMemAlloc( (strlenW( folder ) + 1) * sizeof(WCHAR) ); - if (!*path) - return E_OUTOFMEMORY; - strcpyW( *path, folder ); + ERR("Failed to create directory %s.\n", debugstr_w(pathW)); + hr = E_FAIL; + goto failed; } + + TRACE("Created missing system directory %s\n", debugstr_w(pathW)); + +done: + TRACE("Final path is %s, %#x\n", debugstr_w(pathW), hr); + + *ret_path = CoTaskMemAlloc((strlenW(pathW) + 1) * sizeof(WCHAR)); + if (!*ret_path) + return E_OUTOFMEMORY; + strcpyW(*ret_path, pathW); + + return hr; + +failed: + TRACE("Failed to get folder path, %#x.\n", hr); + return hr; }

1 0

Lauri Kenttä : cmd: Fix copying when the dest is one of the sources.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 064508c0dd7bb331d581de77bebec62db2025e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064508c0dd7bb331d581de77b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 5 18:53:23 2016 +0200 cmd: Fix copying when the dest is one of the sources. "COPY a+b a" appends b to a. "COPY a+b b" skips b from the sources. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 44 ++++++++++++++++++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 16 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f82f15a..cd319f8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -460,6 +460,36 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) } /**************************************************************************** + * WCMD_IsSameFile + * + * Checks if the two paths reference to the same file + */ +static BOOL WCMD_IsSameFile(const WCHAR *name1, const WCHAR *name2) +{ + BOOL ret = FALSE; + HANDLE file1 = INVALID_HANDLE_VALUE, file2 = INVALID_HANDLE_VALUE; + BY_HANDLE_FILE_INFORMATION info1, info2; + + file1 = CreateFileW(name1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0); + if (file1 == INVALID_HANDLE_VALUE || !GetFileInformationByHandle(file1, &info1)) + goto end; + + file2 = CreateFileW(name2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0); + if (file2 == INVALID_HANDLE_VALUE || !GetFileInformationByHandle(file2, &info2)) + goto end; + + ret = info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber + && info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow; +end: + if (file1 != INVALID_HANDLE_VALUE) + CloseHandle(file1); + if (file2 != INVALID_HANDLE_VALUE) + CloseHandle(file2); + return ret; +} + +/**************************************************************************** * WCMD_ManualCopy * * Copies from a file @@ -922,6 +952,7 @@ void WCMD_copy(WCHAR * args) { do { WCHAR outname[MAX_PATH]; BOOL overwrite; + BOOL appendtofirstfile = FALSE; /* Skip . and .., and directories */ if (!srcisdevice && fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -946,8 +977,14 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Flags: srcbinary(%d), dstbinary(%d), over(%d), prompt(%d)\n", thiscopy->binarycopy, destination->binarycopy, overwrite, prompt); + if (!writtenoneconcat) { + appendtofirstfile = anyconcats && WCMD_IsSameFile(srcpath, outname); + } + /* Prompt before overwriting */ - if (!overwrite) { + if (appendtofirstfile) { + overwrite = TRUE; + } else if (!overwrite) { DWORD attributes = GetFileAttributesW(outname); if (attributes != INVALID_FILE_ATTRIBUTES) { WCHAR* question; @@ -969,7 +1006,10 @@ void WCMD_copy(WCHAR * args) { /* Do the copy as appropriate */ if (overwrite) { - if (anyconcats && writtenoneconcat) { + if (anyconcats && WCMD_IsSameFile(srcpath, outname)) { + /* Silently skip if the destination file is also a source file */ + status = TRUE; + } else if (anyconcats && writtenoneconcat) { if (thiscopy->binarycopy) { status = WCMD_ManualCopy(srcpath, outname, FALSE, TRUE); } else { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b49f90a..02d9750 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2584,6 +2584,22 @@ rem Concat 2 files, default mode - (one EOF on the end 5+8+1) copy ..\file1+..\file2 file12_eof2 >nul 2>&1 call :CheckFileSize file12_eof2 14 +rem Test copying when destination is one of the sources. +rem Concat file1+file2+file3 into file1, should produce file1+file2+file3 = 24 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file1 >nul 2>&1 +call :CheckFileSize file1 24 + +rem Concat file1+file2+file3 into file2, should produce file1+file3 = 16 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file2 >nul 2>&1 +call :CheckFileSize file2 16 + +rem Concat file1+file2+file3 into file3, should produce file1+file2 = 13 +copy /y ..\file? .\ >nul 2>&1 +copy /y /b file1+file2+file3 file3 >nul 2>&1 +call :CheckFileSize file3 13 + rem -------------------------------------------------------------- rem Show ascii source copy stops at first EOF, binary does the lot rem -------------------------------------------------------------- diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e81fbcb..796550e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1462,6 +1462,9 @@ Passed: file size check on file3_plus_eof [12]@or_broken(a)Skipping file size chec Passed: file size check on file12_plus_eof [14]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file12_no_eof [13]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file12_eof2 [14]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file1 [24]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file2 [16]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file3 [13]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_binary_srccopy [6]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_ascii_srccopy [5]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file123_default_copy [25]@or_broken(a)Skipping file size check on NT4

1 0

Andrew Eikum : msacm32: Support conversion from 24-bit PCM.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 6cc673477dd4a0749a292a6d6f604749d548fb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc673477dd4a0749a292a6d6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 5 11:28:25 2016 -0600 msacm32: Support conversion from 24-bit PCM. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 320 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 299 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cc673477dd4a0749a292…

1 0

Huw Davies : kernel32: Implement Process thread attribute lists.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 4c146152ddd60829195fb9735eca5cf99d35383b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c146152ddd60829195fb9735… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 5 11:41:51 2016 +0000 kernel32: Implement Process thread attribute lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 6 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 6 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 6 +- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/process.c | 120 ++++++++++++++++++++ dlls/kernel32/tests/process.c | 123 +++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 6 +- include/winbase.h | 41 +++++++ 8 files changed, 299 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c146152ddd60829195fb…

1 0

Huw Davies : comctl32: Recompute the text width if necessary.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: c7c8994f3579e624c1b0ceb353ab6c0208881e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c8994f3579e624c1b0ceb35… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 6 10:25:27 2016 +0000 comctl32: Recompute the text width if necessary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0a155bb..74206bd 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3703,6 +3703,9 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) return NULL; } + if (!item->textWidth) + TREEVIEW_ComputeTextWidth(infoPtr, item, 0); + if (x >= item->textOffset + item->textWidth) { lpht->flags = TVHT_ONITEMRIGHT;

1 0

Huw Davies : comctl32: Set the text and bkgnd colours to the default before the item pre-paint notification.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3ed6ba579e6267cf8f0561f6de5f30e33bf3b222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed6ba579e6267cf8f0561f6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 6 10:25:26 2016 +0000 comctl32: Set the text and bkgnd colours to the default before the item pre-paint notification. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 17 ++++++++++++++--- dlls/comctl32/treeview.c | 8 +++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 388124a..9031a83 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; static HFONT g_customdraw_font; +static BOOL g_v6; #define NUM_MSG_SEQUENCES 3 #define TREEVIEW_SEQ_INDEX 0 @@ -1261,6 +1262,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, { NMTVCUSTOMDRAW *nmcd = (NMTVCUSTOMDRAW*)lParam; COLORREF c0ffee = RGB(0xc0,0xff,0xee), cafe = RGB(0xca,0xfe,0x00); + COLORREF text = GetTextColor(nmcd->nmcd.hdc), bkgnd = GetBkColor(nmcd->nmcd.hdc); msg.flags |= custdraw; msg.stage = nmcd->nmcd.dwDrawStage; @@ -1271,15 +1273,23 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, case CDDS_PREPAINT: return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYITEMERASE|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT: - nmcd->clrTextBk = c0ffee; + ok(text == nmcd->clrText || (g_v6 && nmcd->clrText == 0xffffffff), + "got %08x vs %08x\n", text, nmcd->clrText); + ok(bkgnd == nmcd->clrTextBk || (g_v6 && nmcd->clrTextBk == 0xffffffff), + "got %08x vs %08x\n", bkgnd, nmcd->clrTextBk); nmcd->clrText = cafe; + nmcd->clrTextBk = c0ffee; + SetTextColor(nmcd->nmcd.hdc, c0ffee); + SetBkColor(nmcd->nmcd.hdc, cafe); if (g_customdraw_font) SelectObject(nmcd->nmcd.hdc, g_customdraw_font); return CDRF_NOTIFYPOSTPAINT|CDRF_NEWFONT; case CDDS_ITEMPOSTPAINT: /* at the point of post paint notification colors are already restored */ - ok(GetTextColor(nmcd->nmcd.hdc) != cafe, "got 0%x\n", GetTextColor(nmcd->nmcd.hdc)); - ok(GetBkColor(nmcd->nmcd.hdc) != c0ffee, "got 0%x\n", GetBkColor(nmcd->nmcd.hdc)); + ok(nmcd->clrText == cafe, "got 0%x\n", nmcd->clrText); + ok(nmcd->clrTextBk == c0ffee, "got 0%x\n", nmcd->clrTextBk); + ok(text != cafe, "got 0%x\n", text); + ok(bkgnd != c0ffee, "got 0%x\n", bkgnd); if (g_customdraw_font) ok(GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT) != g_customdraw_font, "got %p\n", GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT)); @@ -2471,6 +2481,7 @@ START_TEST(treeview) } /* comctl32 version 6 tests start here */ + g_v6 = TRUE; test_expandedimage(); test_htreeitem_layout(); test_WM_GETDLGCODE(); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 70d6362..0a155bb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2552,6 +2552,8 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) } hOldFont = SelectObject(hdc, TREEVIEW_FontForItem(infoPtr, item)); + oldTextColor = SetTextColor(hdc, nmcdhdr.clrText); + oldTextBkColor = SetBkColor(hdc, nmcdhdr.clrTextBk); /* The custom draw handler can query the text rectangle, * so get ready. */ @@ -2586,9 +2588,9 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) TREEVIEW_DrawItemLines(infoPtr, hdc, item); - /* Set colors. Custom draw handler can change these so we do this after it. */ - oldTextColor = SetTextColor(hdc, nmcdhdr.clrText); - oldTextBkColor = SetBkColor(hdc, nmcdhdr.clrTextBk); + /* reset colors. Custom draw handler can change them */ + SetTextColor(hdc, nmcdhdr.clrText); + SetBkColor(hdc, nmcdhdr.clrTextBk); centery = (item->rect.top + item->rect.bottom) / 2;

1 0

Hans Leidekker : rpcrt4/tests: Register an exception with the firewall to avoid a dialog.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 462d348e8d14a49a291c1a95d1950743310f8871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462d348e8d14a49a291c1a95d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 6 09:35:35 2016 +0100 rpcrt4/tests: Register an exception with the firewall to avoid a dialog. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 2 +- dlls/rpcrt4/tests/server.c | 145 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 5229d07..2a72b57 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = rpcrt4.dll -IMPORTS = ole32 rpcrt4 secur32 advapi32 +IMPORTS = oleaut32 ole32 rpcrt4 secur32 advapi32 EXTRAIDLFLAGS = --prefix-server=s_ C_SRCS = \ diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 89dc27a..c196c79 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -18,10 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <windows.h> #include <ole2.h> +#include <oleauto.h> #include <secext.h> #include <rpcdce.h> +#include <initguid.h> +#include <netfw.h> #include "wine/test.h" #include "server.h" #include "server_defines.h" @@ -1755,14 +1759,142 @@ server(void) } } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'r','p','c','r','t','4','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(server) { ULONG size = 0; int argc; char **argv; + BOOL firewall_enabled = is_firewall_enabled(); InitFunctionPointers(); + if (firewall_enabled && !is_process_elevated()) + { + trace("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + ok(!GetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); ok(GetUserNameExA(NameSamCompatible, domain_and_user, &size), "GetUserNameExA\n"); @@ -1783,7 +1915,20 @@ START_TEST(server) RpcEndExcept } else + { + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + HeapFree(GetProcessHeap(), 0, domain_and_user); + return; + } + } server(); + if (firewall_enabled) set_firewall(APP_REMOVE); + } HeapFree(GetProcessHeap(), 0, domain_and_user); }

1 0

Józef Kucia : wined3d: Use single structure for view description.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 5ee3f54438934a2f41b4797f1b8b9a4e7674bddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee3f54438934a2f41b4797f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:41 2016 +0100 wined3d: Use single structure for view description. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 29 ++++++++++++++++++++--------- dlls/wined3d/device.c | 10 ++++++++-- dlls/wined3d/surface.c | 8 ++++++-- dlls/wined3d/swapchain.c | 4 +++- dlls/wined3d/view.c | 20 ++++++++++++-------- include/wine/wined3d.h | 47 ++++------------------------------------------- 6 files changed, 53 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ee3f54438934a2f41b47…

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_umin opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 663dee140fdb5bbe940c0082d423848699331f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663dee140fdb5bbe940c0082d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:40 2016 +0100 wined3d: Recognize SM5 imm_atomic_umin opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 508f927..4b04490 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5310,6 +5310,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45c53b6..434444a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8973,6 +8973,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bb2a213..a34694b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -151,6 +151,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", + /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 11b17a6..d0497ce 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -266,6 +266,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, + WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -923,6 +924,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ece139..0e6dcb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -677,6 +677,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, + WINED3DSIH_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL, WINED3DSIH_INE,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_umax opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 0bbbe4c53e25ec6552dc25b5b7dc89345a68c3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbbe4c53e25ec6552dc25b5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:39 2016 +0100 wined3d: Recognize SM5 imm_atomic_umax opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3976c19..508f927 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5309,6 +5309,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b446659..45c53b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8972,6 +8972,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e070d69..bb2a213 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", + /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6d8a0db..11b17a6 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -265,6 +265,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, + WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -921,6 +922,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4610a7c..3ece139 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -676,6 +676,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_OR, + WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL, WINED3DSIH_INE,

1 0

Hugh McMaster : regedit/tests: Add more tests for parsing comments.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: eb3c4f43f66b62d17f44b21952ba0d707cac0603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3c4f43f66b62d17f44b2195… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 6 12:07:42 2016 +0000 regedit/tests: Add more tests for parsing comments. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 54558b1..e09d188 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -340,6 +340,7 @@ static void test_comments(void) { LONG lr; HKEY hkey; + DWORD dword; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -354,6 +355,78 @@ static void test_comments(void) verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0); verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine3\"=\"Value 1\"#comment\n" + "\"Wine4\"=\"Value 2\";comment\n" + "\"Wine5\"=dword:01020304 #comment\n" + "\"Wine6\"=dword:02040608 ;comment\n\n"); + verify_reg_nonexist(hkey, "Wine3"); + todo_wine verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine5"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine7\"=hex(7):4c,69,6e,65,20,\\\n" + " #comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine8\"=\"A valid line\"\n" + "\"Wine9\"=hex(7):4c,69,6e,65,20,\\\n" + " ;comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine10\"=\"Another valid line\"\n\n"); + verify_reg_nonexist(hkey, "Wine7"); + verify_reg(hkey, "Wine8", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine9", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine10", REG_SZ, "Another valid line", 19, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine11\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine12\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n"); + verify_reg_nonexist(hkey, "Comment1"); + verify_reg_nonexist(hkey, "Comment2"); + verify_reg_nonexist(hkey, "Comment3"); + verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine11"); + verify_reg_nonexist(hkey, "Comment5"); + verify_reg(hkey, "Wine12", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg_nonexist(hkey, "Comment6"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine13\"=#\"Value 8\"\n" + "\"Wine14\"=;\"Value 9\"\n" + "\"Wine15\"=\"#comment1\"\n" + "\"Wine16\"=\";comment2\"\n" + "\"Wine17\"=\"Value#comment3\"\n" + "\"Wine18\"=\"Value;comment4\"\n" + "\"Wine19\"=\"Value #comment5\"\n" + "\"Wine20\"=\"Value ;comment6\"\n" + "\"Wine21\"=#dword:00000001\n" + "\"Wine22\"=;dword:00000002\n" + "\"Wine23\"=dword:00000003#comment\n" + "\"Wine24\"=dword:00000004;comment\n\n"); + verify_reg_nonexist(hkey, "Wine13"); + verify_reg_nonexist(hkey, "Wine14"); + verify_reg(hkey, "Wine15", REG_SZ, "#comment1", 10, 0); + verify_reg(hkey, "Wine16", REG_SZ, ";comment2", 10, 0); + verify_reg(hkey, "Wine17", REG_SZ, "Value#comment3", 15, 0); + verify_reg(hkey, "Wine18", REG_SZ, "Value;comment4", 15, 0); + verify_reg(hkey, "Wine19", REG_SZ, "Value #comment5", 16, 0); + verify_reg(hkey, "Wine20", REG_SZ, "Value ;comment6", 16, 0); + verify_reg_nonexist(hkey, "Wine21"); + verify_reg_nonexist(hkey, "Wine22"); + verify_reg_nonexist(hkey, "Wine23"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Lauri Kenttä : winemac.drv: Compare handle to INVALID_HANDLE_VALUE, not NULL.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: f447b644a50a3fda7749865696e48c52c6bdbc55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f447b644a50a3fda774986569… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 5 19:32:24 2016 +0200 winemac.drv: Compare handle to INVALID_HANDLE_VALUE, not NULL. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index d6a8c1f..3f06ed9 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1934,7 +1934,7 @@ void CDECL macdrv_UpdateClipboard(void) if (!(pipe_name = get_pipe_name())) return; pipe = CreateFileW(pipe_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL); - if (!pipe) + if (pipe == INVALID_HANDLE_VALUE) { WARN("failed to open pipe to clipboard manager: %d\n", GetLastError()); return;

1 0

Huw Davies : comctl32/tests: Use more than one item for the custom draw tests.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3f0002020ae401d3ee740443257b512061d4d9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0002020ae401d3ee7404432… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 6 10:25:25 2016 +0000 comctl32/tests: Use more than one item for the custom draw tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index e2fb443..388124a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -328,6 +328,8 @@ static const struct message parent_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, { 0 } }; @@ -2317,20 +2319,12 @@ static void test_WM_GETDLGCODE(void) static void test_customdraw(void) { - static const char *rootA = "root"; - TVINSERTSTRUCTA ins; - HTREEITEM hRoot; LOGFONTA lf; HWND hwnd; hwnd = create_treeview_control(0); - - ins.hParent = TVI_ROOT; - ins.hInsertAfter = TVI_ROOT; - U(ins).item.mask = TVIF_TEXT; - U(ins).item.pszText = (char*)rootA; - hRoot = TreeView_InsertItemA(hwnd, &ins); - ok(hRoot != NULL, "got %p\n", hRoot); + fill_tree(hwnd); + SendMessageA(hwnd, TVM_EXPAND, TVE_EXPAND, (WPARAM)hRoot); /* create additional font, custom draw handler will select it */ SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0);

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_exch opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 1ff716d83f7255b55fbdc701a101abd13985285a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff716d83f7255b55fbdc701a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:34 2016 +0100 wined3d: Recognize SM5 imm_atomic_exch opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4989752..3ceff11 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5303,6 +5303,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7daa67b..de23acb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8966,6 +8966,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6dd5e6b..8105e26 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -144,6 +144,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", /* WINED3DSIH_IMM_ATOMIC_AND */ "imm_atomic_and", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", + /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ed0c8f1..9b85b46 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -260,6 +260,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, + WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -911,6 +912,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5557c9..024ee0d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -670,6 +670,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_CONSUME, + WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL,

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_or opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3dbd5d0f97455f078a096d70f7d08527ddd1806d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbd5d0f97455f078a096d70f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:30 2016 +0100 wined3d: Recognize SM5 atomic_or opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5ddbc3f..20377bd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5203,6 +5203,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, + /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index aab1916..b66c17f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8866,6 +8866,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 48393d6..58202b5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", + /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4c58e61..5e8e78e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, + WINED3D_SM5_OP_ATOMIC_OR = 0xaa, WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, @@ -898,6 +899,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, + {WINED3D_SM5_OP_ATOMIC_OR, WINED3DSIH_ATOMIC_OR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 46a93bd..d38a64e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ADD, WINED3DSIH_AND, WINED3DSIH_ATOMIC_IADD, + WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_XOR, WINED3DSIH_BEM, WINED3DSIH_BFI,

1 0

Józef Kucia : wined3d: Set default sampler minification filter to GL_NEAREST.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: bf4e1c442d397ddc3b5a6de2634104de64f9d08b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4e1c442d397ddc3b5a6de26… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:25 2016 +0100 wined3d: Set default sampler minification filter to GL_NEAREST. This seems to be required for reading stencil values. The GL spec says "When sampling the stencil index only NEAREST filtering is supported.". The GL spec is inconsistent about this, but Mesa refuses to sample stencil index values with the GL_NEAREST_MIPMAP_NEAREST filter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5b64978..72fb5b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -811,7 +811,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 */ GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); - GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST)); + GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST)); checkGLcall("Create default sampler"); /* In D3D10+, a NULL sampler maps to the default sampler state. */

1 0

Józef Kucia : d3d11/tests: Add more tests for bind flags.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 6579bd619faecd02773f36718f82a1a9df26b181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6579bd619faecd02773f36718… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:24 2016 +0100 d3d11/tests: Add more tests for bind flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 43f6161..bad38d3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1639,9 +1639,16 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 0, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_DEPTH_STENCIL, 0, + TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_RENDER_TARGET | D3D11_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_UNORDERED_ACCESS, 0, + FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1662,8 +1669,13 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, }; if (!(device = create_device(NULL))) @@ -1787,7 +1799,8 @@ static void test_create_texture2d(void) hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, (ID3D11Texture2D **)&texture); todo_wine_if(todo) - ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x (format %#x).\n", + i, hr, desc.Format); if (SUCCEEDED(hr)) ID3D11Texture2D_Release(texture);

1 0

Jacek Caban : wscript/tests: Use case insensitive comparition for paths.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 92f3e2d90dac013924eaf1f6cae6c02609e8e0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f3e2d90dac013924eaf1f6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 14:40:19 2016 +0100 wscript/tests: Use case insensitive comparition for paths. Fixes tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/tests/run.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index db0d6f9..5a5539b 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -28,8 +28,8 @@ ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); -ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript.FullName); -ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); +ok(WScript.FullName.toUpperCase() === winetest.wscriptFullName.toUpperCase(), "WScript.FullName = " + WScript.FullName); +ok(WScript.Path.toUpperCase() === winetest.wscriptPath.toUpperCase(), "WScript.Path = " + WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); ok(WScript.ScriptFullName === winetest.wscriptScriptFullName, "WScript.ScriptFullName = " + WScript.ScriptFullName); ok(typeof(WScript.Arguments) === "object", "typeof(WScript.Arguments) = " + typeof(WScript.Arguments));

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_cmp_store opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: ff8c5c2264cf0b2bd36c97e1839d373ccaa334fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8c5c2264cf0b2bd36c97e18… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:36 2016 +0100 wined3d: Recognize SM5 atomic_cmp_store opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 16d5f17..603fb12 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5203,6 +5203,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_ATOMIC_AND */ NULL, + /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c052e15..f1678f4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8866,6 +8866,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_ATOMIC_AND */ NULL, + /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4aa9c74..9844eee 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", /* WINED3DSIH_ATOMIC_AND */ "atomic_and", + /* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index edb4ae5..c51d7a9 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -254,6 +254,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_AND = 0xa9, WINED3D_SM5_OP_ATOMIC_OR = 0xaa, WINED3D_SM5_OP_ATOMIC_XOR = 0xab, + WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, @@ -907,6 +908,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_AND, WINED3DSIH_ATOMIC_AND, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_OR, WINED3DSIH_ATOMIC_OR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, + {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 44eb5f5..9e484c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ADD, WINED3DSIH_AND, WINED3DSIH_ATOMIC_AND, + WINED3DSIH_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_XOR,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_cmp_exch opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 7c933e61b14d7a290437e0c3cf37c0d3cca1bbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c933e61b14d7a290437e0c3c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:35 2016 +0100 wined3d: Recognize SM5 imm_atomic_cmp_exch opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3ceff11..16d5f17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5302,6 +5302,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, + /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index de23acb..c052e15 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8965,6 +8965,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, + /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8105e26..4aa9c74 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -143,6 +143,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", /* WINED3DSIH_IMM_ATOMIC_AND */ "imm_atomic_and", + /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ "imm_atomic_cmp_exch", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9b85b46..edb4ae5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -261,6 +261,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, + WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -913,6 +914,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 024ee0d..44eb5f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -669,6 +669,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMIN, WINED3DSIH_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_AND, + WINED3DSIH_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_OR,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_or opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 1cc5d9168c56492b5c9410020bb404d84c6f7ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc5d9168c56492b5c9410020… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:31 2016 +0100 wined3d: Recognize SM5 imm_atomic_or opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e58425a..d89fdf3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5302,6 +5302,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 455756c..672d6dd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8965,6 +8965,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ae996c0..0f89513 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -143,6 +143,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", + /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b056118..9a36e83 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -257,6 +257,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -906,6 +907,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6804103..b63569f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -669,6 +669,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMIN, WINED3DSIH_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_CONSUME, + WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL, WINED3DSIH_INE,

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_and opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: d9b8bd891fe3f8e6a805fd7077aa0068501595a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b8bd891fe3f8e6a805fd707… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:32 2016 +0100 wined3d: Recognize SM5 atomic_and opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 20377bd..e58425a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5202,6 +5202,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ABS */ shader_hw_map2gl, /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, + /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b66c17f..455756c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8865,6 +8865,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ABS */ shader_glsl_map2gl, /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, + /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 58202b5..ae996c0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -43,6 +43,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ABS */ "abs", /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", + /* WINED3DSIH_ATOMIC_AND */ "atomic_and", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5e8e78e..b056118 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, + WINED3D_SM5_OP_ATOMIC_AND = 0xa9, WINED3D_SM5_OP_ATOMIC_OR = 0xaa, WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, @@ -899,6 +900,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, + {WINED3D_SM5_OP_ATOMIC_AND, WINED3DSIH_ATOMIC_AND, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_OR, WINED3DSIH_ATOMIC_OR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d38a64e..6804103 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -569,6 +569,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ABS, WINED3DSIH_ADD, WINED3DSIH_AND, + WINED3DSIH_ATOMIC_AND, WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_XOR,

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_xor opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 51b14bb503c75def94a8a527aba018d282d3b784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b14bb503c75def94a8a527a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:28 2016 +0100 wined3d: Recognize SM5 atomic_xor opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7048021..8c8d0fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5203,6 +5203,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, + /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BFREV */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1f615d..f2610f5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8866,6 +8866,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BFREV */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bf4b421..553328a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", + /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", /* WINED3DSIH_BFREV */ "bfrev", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 02e121c..55eb625 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, + WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, @@ -896,6 +897,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, + {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cc3dd58..e29dd62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ADD, WINED3DSIH_AND, WINED3DSIH_ATOMIC_IADD, + WINED3DSIH_ATOMIC_XOR, WINED3DSIH_BEM, WINED3DSIH_BFI, WINED3DSIH_BFREV,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_and opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: f87094fe1131dce22ea396d0e2460f082cf2de65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87094fe1131dce22ea396d0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:33 2016 +0100 wined3d: Recognize SM5 imm_atomic_and opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d89fdf3..4989752 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5301,6 +5301,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, + /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 672d6dd..7daa67b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8964,6 +8964,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, + /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0f89513..6dd5e6b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -142,6 +142,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", + /* WINED3DSIH_IMM_ATOMIC_AND */ "imm_atomic_and", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9a36e83..ed0c8f1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -257,6 +257,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_SYNC = 0xbe, @@ -907,6 +908,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b63569f..b5557c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -668,6 +668,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMAX, WINED3DSIH_IMIN, WINED3DSIH_IMM_ATOMIC_ALLOC, + WINED3DSIH_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_XOR,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_xor opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: bde5cc79fb6d415d7adb9ff407d08b3682c9077a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde5cc79fb6d415d7adb9ff40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:29 2016 +0100 wined3d: Recognize SM5 imm_atomic_xor opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8c8d0fd..5ddbc3f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5300,6 +5300,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, /* WINED3DSIH_INEG */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f2610f5..aab1916 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8963,6 +8963,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INEG */ shader_glsl_unary_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 553328a..48393d6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -141,6 +141,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", + /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_INEG */ "ineg", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 55eb625..4c58e61 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -255,6 +255,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -901,6 +902,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e29dd62..46a93bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -667,6 +667,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMIN, WINED3DSIH_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_CONSUME, + WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL, WINED3DSIH_INE, WINED3DSIH_INEG,

1 0

Nikolay Sivov : advapi32: Handle empty kSecCreationDateItemAttr attribute.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 8997944a5604aeb2c14e7fc0651ccf261952ab46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8997944a5604aeb2c14e7fc06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 5 15:28:53 2016 +0300 advapi32: Handle empty kSecCreationDateItemAttr attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/cred.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 7fa1a0b..df41421 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -357,6 +357,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require case kSecCreationDateItemAttr: TRACE("kSecCreationDateItemAttr: %.*s\n", (int)attr_list->attr[i].length, (char *)attr_list->attr[i].data); + if (!attr_list->attr[i].data) continue; if (buffer) { LARGE_INTEGER win_time;

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_umax opcode.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: b24900572bc81f0471584702e081a2f4670a8343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24900572bc81f0471584702e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:37 2016 +0100 wined3d: Recognize SM5 atomic_umax opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 603fb12..098eb99 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5206,6 +5206,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, + /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1678f4..81a66a3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8869,6 +8869,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_OR */ NULL, + /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9844eee..6bb7c9a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -47,6 +47,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", + /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c51d7a9..d4d3173 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -256,6 +256,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, + WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, @@ -910,6 +911,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, + {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e484c9..0c1ff71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -573,6 +573,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_OR, + WINED3DSIH_ATOMIC_UMAX, WINED3DSIH_ATOMIC_XOR, WINED3DSIH_BEM, WINED3DSIH_BFI,

1 0

Henri Verbeet : d2d1: Properly test which side of a bezier curve is the inside.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: e9fc8c7c52db5fb1bf48420e5d6ee433661fd7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fc8c7c52db5fb1bf48420e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:06 2016 +0100 d2d1: Properly test which side of a bezier curve is the inside. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 230 ++++++++++++++++++++++++++++++++----------------- dlls/d2d1/tests/d2d1.c | 110 ++++++++++++++++++----- 2 files changed, 238 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9fc8c7c52db5fb1bf484…

1 0

Henri Verbeet : d2d1/tests: Make the window client rect match the DXGI swapchain dimensions.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 70e68e12342953b8a8c279906b9070378b71cc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e68e12342953b8a8c279906… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:03 2016 +0100 d2d1/tests: Make the window client rect match the DXGI swapchain dimensions. Similar to e.g. commit 65f20ffc50d6f346628338da40b375790bfca217. There's no compelling reason for the tests themselves, but it does simplify debugging them a little. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 52 +++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a8f24f9..1653e68 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -463,6 +463,16 @@ static ID3D10Device1 *create_device(void) return NULL; } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; @@ -562,8 +572,7 @@ static void test_clip(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -714,8 +723,7 @@ static void test_state_block(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -910,8 +918,7 @@ static void test_color_brush(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -1045,8 +1052,7 @@ static void test_bitmap_brush(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -1333,8 +1339,7 @@ static void test_path_geometry(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -1942,8 +1947,7 @@ static void test_bitmap_formats(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2012,8 +2016,7 @@ static void test_alpha_mode(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2234,10 +2237,8 @@ static void test_shared_bitmap(void) return; } - window1 = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - window2 = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window1 = create_window(); + window2 = create_window(); swapchain1 = create_swapchain(device1, window1, TRUE); swapchain2 = create_swapchain(device1, window2, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain1, 0, &IID_IDXGISurface, (void **)&surface1); @@ -2436,8 +2437,7 @@ static void test_bitmap_updates(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2545,8 +2545,7 @@ static void test_opacity_brush(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2724,8 +2723,7 @@ static void test_create_target(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -2797,8 +2795,7 @@ static void test_draw_text_layout(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -3494,8 +3491,7 @@ static void test_gradient(void) skip("Failed to create device, skipping tests.\n"); return; } - window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); swapchain = create_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr);

1 0

Akihiro Sagawa : quartz: Keep This/iface order in TRACEs for consistency.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 478feea23cb0c7ca122d72f12933d1b01f6dc0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478feea23cb0c7ca122d72f12… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 5 00:37:18 2016 +0900 quartz: Keep This/iface order in TRACEs for consistency. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index faf6e51..97c049d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -766,7 +766,7 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) HRESULT hr = S_OK; int i; - TRACE("(%p/%p)->() live sources not handled properly!\n", iface, This); + TRACE("(%p/%p)->() live sources not handled properly!\n", This, iface); EnterCriticalSection(&This->cs); @@ -5318,7 +5318,7 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC HRESULT hr = S_OK; int i; - TRACE("(%p/%p)->(%p)\n", iface, This, pClock); + TRACE("(%p/%p)->(%p)\n", This, iface, pClock); EnterCriticalSection(&This->cs); { @@ -5366,7 +5366,7 @@ static HRESULT WINAPI MediaFilter_GetSyncSource(IMediaFilter *iface, IReferenceC { IFilterGraphImpl *This = impl_from_IMediaFilter(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, ppClock); + TRACE("(%p/%p)->(%p)\n", This, iface, ppClock); if (!ppClock) return E_POINTER;

1 0

Nikolay Sivov : dwrite: Fix lfItalic flag as returned by ConvertFontToLOGFONT().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: a7fd13c244f4ef234d7e0b1bbebfde66321db468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7fd13c244f4ef234d7e0b1bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:13 2016 +0300 dwrite: Fix lfItalic flag as returned by ConvertFontToLOGFONT(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 20 ++++++ dlls/dwrite/gdiinterop.c | 7 +- dlls/dwrite/opentype.c | 9 ++- dlls/dwrite/tests/font.c | 157 ++++++++++++++++++++++++++++++++++--------- 5 files changed, 155 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7fd13c244f4ef234d7e0…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: f6de3806a759a69d89b0220c9847f82f4b609ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6de3806a759a69d89b0220c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 5 00:37:12 2016 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/po/ja.po b/po/ja.po index 670b46d..d5b26a9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-08-20 14:33+0900\n" +"PO-Revision-Date: 2016-12-04 21:37+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -8028,10 +8028,8 @@ msgid "Wine was brought to you by:" msgstr "Wine の提供:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "実行(&R)..." +msgstr "実行" #: shell32.rc:338 msgid "" @@ -10502,10 +10500,8 @@ msgid "IPv6 address" msgstr "IPv6 アドレス" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "システム設定" +msgstr "システム情報" #: net.rc:30 msgid "" @@ -14497,10 +14493,8 @@ msgid "Error: Invalid query\n" msgstr "エラー: クエリが無効です\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: 無効な構文です。" +msgstr "エラー: PATH の構文が無効です\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -14575,36 +14569,32 @@ msgid "F&ormat" msgstr "書式(&O)" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "一覧(&L)" +msgstr "箇条書きと段落番号(&L)" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "箇条書き(&B)" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL ナンバー" +msgstr "段落番号" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "アルファベット - 小文字" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "アルファベット - 大文字" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "ローマ数字 - 小文字" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "ローマ数字 - 大文字" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Henri Verbeet : d2d1/tests: Introduce a helper function to add quadratic bezier curves to a geometry sink.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3d51a7164bde6604a11ccc53181e30cd7cf4a9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d51a7164bde6604a11ccc531… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:05 2016 +0100 d2d1/tests: Introduce a helper function to add quadratic bezier curves to a geometry sink. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3635131..f271103 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -138,6 +138,14 @@ static void line_to(ID2D1GeometrySink *sink, float x, float y) ID2D1GeometrySink_AddLine(sink, point); } +static void quadratic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, float y2) +{ + D2D1_QUADRATIC_BEZIER_SEGMENT quadratic; + + set_quadratic(&quadratic, x1, y1, x2, y2); + ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -1255,31 +1263,22 @@ static void fill_geometry_sink(ID2D1GeometrySink *sink) static void fill_geometry_sink_bezier(ID2D1GeometrySink *sink) { - D2D1_QUADRATIC_BEZIER_SEGMENT quadratic; D2D1_POINT_2F point; set_point(&point, 5.0f, 160.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_quadratic(&quadratic, 40.0f, 160.0f, 40.0f, 20.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 75.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 40.0f, 300.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 5.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); + quadratic_to(sink, 40.0f, 160.0f, 40.0f, 20.0f); + quadratic_to(sink, 40.0f, 160.0f, 75.0f, 160.0f); + quadratic_to(sink, 40.0f, 160.0f, 40.0f, 300.0f); + quadratic_to(sink, 40.0f, 160.0f, 5.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 20.0f, 160.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_quadratic(&quadratic, 20.0f, 80.0f, 40.0f, 80.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 60.0f, 80.0f, 60.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 60.0f, 240.0f, 40.0f, 240.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 20.0f, 240.0f, 20.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); + quadratic_to(sink, 20.0f, 80.0f, 40.0f, 80.0f); + quadratic_to(sink, 60.0f, 80.0f, 60.0f, 160.0f); + quadratic_to(sink, 60.0f, 240.0f, 40.0f, 240.0f); + quadratic_to(sink, 20.0f, 240.0f, 20.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); }

1 0

Jacek Caban : server: Use async object to transfer IRP result to client.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: d055d3d121efd9cab4d6356ca375f8122267007c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d055d3d121efd9cab4d6356ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 4 21:22:05 2016 +0100 server: Use async object to transfer IRP result to client. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 3 +-- include/wine/server_protocol.h | 40 +++++++++++++++---------------- server/async.c | 32 +++++++++++++++++++++++++ server/device.c | 53 +++--------------------------------------- server/protocol.def | 19 +++++++-------- server/request.h | 13 +++++------ server/trace.c | 29 +++++++++++------------ 7 files changed, 85 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d055d3d121efd9cab4d63…

1 0

Jacek Caban : server: Store iosb in async object.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 64dc8f5c48e7bffb17d3e0853d5f758d6ee3f9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dc8f5c48e7bffb17d3e0853… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 4 21:21:46 2016 +0100 server: Store iosb in async object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 9 ++++++++- server/change.c | 2 +- server/device.c | 2 +- server/fd.c | 6 +++--- server/file.h | 4 ++-- server/mailslot.c | 2 +- server/named_pipe.c | 6 +++--- server/serial.c | 2 +- server/sock.c | 4 ++-- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/server/async.c b/server/async.c index 568b440..562fcd0 100644 --- a/server/async.c +++ b/server/async.c @@ -47,6 +47,7 @@ struct async int signaled; struct event *event; async_data_t data; /* data for async I/O call */ + struct iosb *iosb; /* I/O status block */ }; static void async_dump( struct object *obj, int verbose ); @@ -141,6 +142,7 @@ static void async_destroy( struct object *obj ) if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); + if (async->iosb) release_object( async->iosb ); release_object( async->queue ); release_object( async->thread ); } @@ -172,6 +174,7 @@ void async_terminate( struct async *async, unsigned int status ) } async->status = status; + if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; if (async->data.callback) { @@ -225,7 +228,8 @@ void free_async_queue( struct async_queue *queue ) } /* create an async on a given queue of a fd */ -struct async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data ) +struct async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data, + struct iosb *iosb ) { struct event *event = NULL; struct async *async; @@ -247,6 +251,9 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->queue = (struct async_queue *)grab_object( queue ); async->signaled = 0; + if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); + else async->iosb = NULL; + list_add_tail( &queue->queue, &async->queue_entry ); list_add_tail( &thread->process->asyncs, &async->process_entry ); grab_object( async ); diff --git a/server/change.c b/server/change.c index ee30b98..d7ebf3b 100644 --- a/server/change.c +++ b/server/change.c @@ -1246,7 +1246,7 @@ DECL_HANDLER(read_directory_changes) return; /* requests don't timeout */ - if (!(async = fd_queue_async( dir->fd, &req->async, ASYNC_TYPE_WAIT ))) goto end; + if (!(async = fd_queue_async( dir->fd, &req->async, NULL, ASYNC_TYPE_WAIT ))) goto end; /* assign it once */ if (!dir->filter) diff --git a/server/device.c b/server/device.c index 99d5204..60a15e2 100644 --- a/server/device.c +++ b/server/device.c @@ -488,7 +488,7 @@ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, if (blocking && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; - if (!(irp->async = fd_queue_async( file->fd, async_data, ASYNC_TYPE_WAIT ))) + if (!(irp->async = fd_queue_async( file->fd, async_data, irp->iosb, ASYNC_TYPE_WAIT ))) { if (handle) close_handle( current->process, handle ); return 0; diff --git a/server/fd.c b/server/fd.c index faf27bc..3ccd0f8 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2030,7 +2030,7 @@ void default_poll_event( struct fd *fd, int event ) else if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); } -struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ) +struct async *fd_queue_async( struct fd *fd, const async_data_t *data, struct iosb *iosb, int type ) { struct async_queue *queue; struct async *async; @@ -2054,7 +2054,7 @@ struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type assert(0); } - if ((async = create_async( current, queue, data )) && type != ASYNC_TYPE_WAIT) + if ((async = create_async( current, queue, data, iosb )) && type != ASYNC_TYPE_WAIT) { if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); @@ -2096,7 +2096,7 @@ void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, { struct async *async; - if ((async = fd_queue_async( fd, data, type ))) + if ((async = fd_queue_async( fd, data, NULL, type ))) { release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/file.h b/server/file.h index 0a144ee..94322c7 100644 --- a/server/file.h +++ b/server/file.h @@ -97,7 +97,7 @@ extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *ent extern unsigned int default_fd_map_access( struct object *obj, unsigned int access ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); -extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ); +extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, struct iosb *iosb, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t no_fd_read( struct fd *fd, const async_data_t *async, int blocking, file_pos_t pos ); @@ -177,7 +177,7 @@ extern struct object *create_serial( struct fd *fd ); extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, struct async_queue *queue, - const async_data_t *data ); + const async_data_t *data, struct iosb *iosb ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total, client_ptr_t apc, client_ptr_t apc_arg ); diff --git a/server/mailslot.c b/server/mailslot.c index 3ddfab5..783b28b 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -332,7 +332,7 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t assert(mailslot->obj.ops == &mailslot_ops); - if ((async = fd_queue_async( fd, data, type ))) + if ((async = fd_queue_async( fd, data, NULL, type ))) { async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, STATUS_IO_TIMEOUT ); diff --git a/server/named_pipe.c b/server/named_pipe.c index d93c40f..3245688 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -555,7 +555,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_ if (!pipe_data_remaining( server )) return 0; - if ((async = fd_queue_async( server->fd, async_data, ASYNC_TYPE_WAIT ))) + if ((async = fd_queue_async( server->fd, async_data, NULL, ASYNC_TYPE_WAIT ))) { /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ if (!server->flush_poll) @@ -602,7 +602,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if ((async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT ))) + if ((async = fd_queue_async( server->ioctl_fd, async_data, NULL, ASYNC_TYPE_WAIT ))) { if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); set_server_state( server, ps_wait_open ); @@ -855,7 +855,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; - if ((async = create_async( current, pipe->waiters, async_data ))) + if ((async = create_async( current, pipe->waiters, async_data, NULL ))) { timeout_t when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout; async_set_timeout( async, when, STATUS_IO_TIMEOUT ); diff --git a/server/serial.c b/server/serial.c index df462ea..6f9cc24 100644 --- a/server/serial.c +++ b/server/serial.c @@ -201,7 +201,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ break; } - if ((async = fd_queue_async( fd, data, type ))) + if ((async = fd_queue_async( fd, data, NULL, type ))) { if (timeout) async_set_timeout( async, timeout * -10000, STATUS_TIMEOUT ); release_object( async ); diff --git a/server/sock.c b/server/sock.c index a3c88a0..f70a85d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -552,7 +552,7 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a return 0; } if (!(ifchange_q = sock_get_ifchange_q( sock ))) return 0; - if (!(async = create_async( current, ifchange_q, async_data ))) return 0; + if (!(async = create_async( current, ifchange_q, async_data, NULL ))) return 0; if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); release_object( async ); set_error( STATUS_PENDING ); @@ -593,7 +593,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, return; } - if (!(async = create_async( current, queue, data ))) return; + if (!(async = create_async( current, queue, data, NULL ))) return; release_object( async ); sock_reselect( sock );

1 0

Jacek Caban : server: Introduced iosb struct for server-side IO_STATUS_BLOCK representation and use it in irp_call.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: d2b3c6c3f9e42cdb49225fbabc4db7e61f3c119b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b3c6c3f9e42cdb49225fbab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 4 21:21:25 2016 +0100 server: Introduced iosb struct for server-side IO_STATUS_BLOCK representation and use it in irp_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ server/device.c | 58 +++++++++++++++++++++++------------------------------ server/file.h | 13 ++++++++++++ 3 files changed, 100 insertions(+), 33 deletions(-) diff --git a/server/async.c b/server/async.c index 70ebf95..568b440 100644 --- a/server/async.c +++ b/server/async.c @@ -389,6 +389,68 @@ void async_wake_up( struct async_queue *queue, unsigned int status ) } } +static void iosb_dump( struct object *obj, int verbose ); +static void iosb_destroy( struct object *obj ); + +static const struct object_ops iosb_ops = +{ + sizeof(struct iosb), /* size */ + iosb_dump, /* dump */ + no_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_close_handle, /* close_handle */ + iosb_destroy /* destroy */ +}; + +static void iosb_dump( struct object *obj, int verbose ) +{ + assert( obj->ops == &iosb_ops ); + fprintf( stderr, "I/O status block\n" ); +} + +static void iosb_destroy( struct object *obj ) +{ + struct iosb *iosb = (struct iosb *)obj; + + free( iosb->in_data ); + free( iosb->out_data ); +} + +/* allocate iosb struct */ +struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ) +{ + struct iosb *iosb; + + if (!(iosb = alloc_object( &iosb_ops ))) return NULL; + + iosb->status = STATUS_PENDING; + iosb->result = 0; + iosb->in_size = in_size; + iosb->in_data = NULL; + iosb->out_size = out_size; + iosb->out_data = NULL; + + if (in_size && !(iosb->in_data = memdup( in_data, in_size ))) + { + release_object( iosb ); + iosb = NULL; + } + + return iosb; +} + /* cancels all async I/O */ DECL_HANDLER(cancel_async) { diff --git a/server/device.c b/server/device.c index 2a34cfb..99d5204 100644 --- a/server/device.c +++ b/server/device.c @@ -50,13 +50,8 @@ struct irp_call struct thread *thread; /* thread that queued the irp */ client_ptr_t user_arg; /* user arg used to identify the request */ struct async *async; /* pending async op */ - unsigned int status; /* resulting status (or STATUS_PENDING) */ irp_params_t params; /* irp parameters */ - data_size_t result; /* size of result (input or output depending on the type) */ - data_size_t in_size; /* size of input data */ - void *in_data; /* input data */ - data_size_t out_size; /* size of output data */ - void *out_data; /* output data */ + struct iosb *iosb; /* I/O status block */ }; static void irp_call_dump( struct object *obj, int verbose ); @@ -241,13 +236,12 @@ static void irp_call_destroy( struct object *obj ) { struct irp_call *irp = (struct irp_call *)obj; - free( irp->in_data ); - free( irp->out_data ); if (irp->async) { async_terminate( irp->async, STATUS_CANCELLED ); release_object( irp->async ); } + if (irp->iosb) release_object( irp->iosb ); if (irp->file) release_object( irp->file ); if (irp->thread) release_object( irp->thread ); } @@ -269,14 +263,8 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t irp->thread = NULL; irp->async = NULL; irp->params = *params; - irp->status = STATUS_PENDING; - irp->result = 0; - irp->in_size = in_size; - irp->in_data = NULL; - irp->out_size = out_size; - irp->out_data = NULL; - - if (irp->in_size && !(irp->in_data = memdup( in_data, in_size ))) + + if (!(irp->iosb = create_iosb( in_data, in_size, out_size ))) { release_object( irp ); irp = NULL; @@ -289,15 +277,16 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, const void *out_data, data_size_t out_size, data_size_t result ) { struct device_file *file = irp->file; + struct iosb *iosb = irp->iosb; if (!file) return; /* already finished */ /* FIXME: handle the STATUS_PENDING case */ - irp->status = status; - irp->result = result; - irp->out_size = min( irp->out_size, out_size ); - if (irp->out_size && !(irp->out_data = memdup( out_data, irp->out_size ))) - irp->out_size = 0; + iosb->status = status; + iosb->result = result; + iosb->out_size = min( iosb->out_size, out_size ); + if (iosb->out_size && !(iosb->out_data = memdup( out_data, iosb->out_size ))) + iosb->out_size = 0; irp->file = NULL; if (irp->async) { @@ -761,6 +750,7 @@ DECL_HANDLER(get_next_device_request) struct irp_call *irp; struct device_manager *manager; struct list *ptr; + struct iosb *iosb; reply->params.major = IRP_MJ_MAXIMUM_FUNCTION + 1; @@ -788,14 +778,15 @@ DECL_HANDLER(get_next_device_request) reply->client_tid = get_thread_id( irp->thread ); } reply->params = irp->params; - reply->in_size = irp->in_size; - reply->out_size = irp->out_size; - if (irp->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); + iosb = irp->iosb; + reply->in_size = iosb->in_size; + reply->out_size = iosb->out_size; + if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if ((reply->next = alloc_handle( current->process, irp, 0, 0 ))) { - set_reply_data_ptr( irp->in_data, irp->in_size ); - irp->in_data = NULL; - irp->in_size = 0; + set_reply_data_ptr( iosb->in_data, iosb->in_size ); + iosb->in_data = NULL; + iosb->in_size = 0; list_remove( &irp->mgr_entry ); list_init( &irp->mgr_entry ); } @@ -833,17 +824,18 @@ DECL_HANDLER(get_irp_result) if ((irp = find_irp_call( file, current, req->user_arg ))) { - if (irp->out_data) + struct iosb *iosb = irp->iosb; + if (iosb->out_data) { - data_size_t size = min( irp->out_size, get_reply_max_size() ); + data_size_t size = min( iosb->out_size, get_reply_max_size() ); if (size) { - set_reply_data_ptr( irp->out_data, size ); - irp->out_data = NULL; + set_reply_data_ptr( iosb->out_data, size ); + iosb->out_data = NULL; } } - reply->size = irp->result; - set_error( irp->status ); + reply->size = iosb->result; + set_error( iosb->status ); list_remove( &irp->dev_entry ); release_object( irp ); /* no longer on the device queue */ } diff --git a/server/file.h b/server/file.h index fb2e905..0a144ee 100644 --- a/server/file.h +++ b/server/file.h @@ -53,6 +53,18 @@ struct fd_ops void (*reselect_async)( struct fd *, struct async_queue *queue ); }; +/* server-side representation of I/O status block */ +struct iosb +{ + struct object obj; /* object header */ + unsigned int status; /* resulting status (or STATUS_PENDING) */ + data_size_t result; /* size of result (input or output depending on the type) */ + data_size_t in_size; /* size of input data */ + void *in_data; /* input data */ + data_size_t out_size; /* size of output data */ + void *out_data; /* output data */ +}; + /* file descriptor functions */ extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, @@ -175,6 +187,7 @@ extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); extern void fd_copy_completion( struct fd *src, struct fd *dst ); +extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); extern void cancel_process_asyncs( struct process *process ); /* access rights that require Unix read permission */

1 0

Nikolay Sivov : dwrite: Improve face name returned by ConvertFontToLOGFONT ().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 17586e308251fe96ce6304f1798142f1797c99ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=17586e308251fe96ce6304f17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:16 2016 +0300 dwrite: Improve face name returned by ConvertFontToLOGFONT(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/gdiinterop.c | 14 -------------- dlls/dwrite/opentype.c | 26 ++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 29 ++++++++++++++++++++++++++++- 5 files changed, 54 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 77b6c4a..1e46498 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -224,7 +224,7 @@ extern void opentype_get_font_properties(struct file_stream_desc*,struct dwrite_ extern void opentype_get_font_metrics(struct file_stream_desc*,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_facename(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_facename(struct file_stream_desc*,WCHAR*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 47ebd11..17bea89 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3247,7 +3247,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, IDWriteLocalized stream_desc.face_index = desc->index; opentype_get_font_properties(&stream_desc, &props); opentype_get_font_metrics(&stream_desc, &data->metrics, NULL); - opentype_get_font_facename(&stream_desc, &data->names); + opentype_get_font_facename(&stream_desc, props.lf.lfFaceName, &data->names); /* get family name from font file */ hr = opentype_get_font_familyname(&stream_desc, family_name); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 5034ad7..3675875 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -623,12 +623,8 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteFontCollection *collection; - IDWriteLocalizedStrings *name; IDWriteFontFamily *family; - UINT32 index; - BOOL exists; HRESULT hr; TRACE("(%p)->(%p %p %p)\n", This, font, logfont, is_systemfont); @@ -655,17 +651,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, get_logfont_from_font(font, logfont); logfont->lfCharSet = DEFAULT_CHARSET; logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; - logfont->lfFaceName[0] = 0; - - exists = FALSE; - hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &name, &exists); - if (FAILED(hr) || !exists) - return hr; - hr = IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists); - if (hr == S_OK) - hr = IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); - IDWriteLocalizedStrings_Release(name); return hr; } diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7f6ccd1..4a6d62c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1612,10 +1612,11 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri /* FaceName locating order is WWS Face Name -> Preferred Face Name -> Face Name. If font claims to have 'Preferred Face Name' in WWS format, then WWS name is not used. */ -HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names) +HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR *lfname, IDWriteLocalizedStrings **names) { - const TT_OS2_V2 *tt_os2; + IDWriteLocalizedStrings *lfnames; void *os2_context, *name_context; + const TT_OS2_V2 *tt_os2; const void *name_table; HRESULT hr; @@ -1635,6 +1636,27 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, IDWrite if (FAILED(hr)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_SUBFAMILY_NAME, names); + /* User locale is preferred, with fallback to en-us. */ + *lfname = 0; + if (SUCCEEDED(opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, &lfnames))) { + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; + UINT32 index; + BOOL exists; + + exists = FALSE; + if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); + + if (!exists) + IDWriteLocalizedStrings_FindLocaleName(lfnames, enusW, &index, &exists); + + if (exists) + IDWriteLocalizedStrings_GetString(lfnames, index, lfname, LF_FACESIZE); + + IDWriteLocalizedStrings_Release(lfnames); + } + if (tt_os2) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); if (name_context) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ca35324..987eac9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3459,6 +3459,7 @@ static void test_TryGetFontTable(void) static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) { void *os2_context, *head_context; + IDWriteLocalizedStrings *names; DWRITE_FONT_SIMULATIONS sim; IDWriteFontFace *fontface; const TT_OS2_V2 *tt_os2; @@ -3531,6 +3532,31 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) } } + /* lfFaceName */ + exists = FALSE; + logfont->lfFaceName[0] = 0; + hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &names, &exists); + if (SUCCEEDED(hr)) { + if (exists) { + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; + UINT32 index; + + /* Fallback to en-us if there's no string for user locale. */ + exists = FALSE; + if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists); + + if (!exists) + IDWriteLocalizedStrings_FindLocaleName(names, enusW, &index, &exists); + + if (exists) + IDWriteLocalizedStrings_GetString(names, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); + } + + IDWriteLocalizedStrings_Release(names); + } + if (tt_os2) IDWriteFontFace_ReleaseFontTable(fontface, os2_context); if (tt_head) @@ -3631,6 +3657,8 @@ if (0) { /* crashes on native */ sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); + ok(!lstrcmpW(logfont.lfFaceName, lf.lfFaceName), "%s: unexpected facename %s, expected %s\n", + wine_dbgstr_w(nameW), wine_dbgstr_w(logfont.lfFaceName), wine_dbgstr_w(lf.lfFaceName)); ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "%s: unexpected output precision %d\n", wine_dbgstr_w(nameW), logfont.lfOutPrecision); @@ -3639,7 +3667,6 @@ if (0) { /* crashes on native */ ok(logfont.lfQuality == DEFAULT_QUALITY, "%s: unexpected quality %d\n", wine_dbgstr_w(nameW), logfont.lfQuality); ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "%s: unexpected pitch %d\n", wine_dbgstr_w(nameW), logfont.lfPitchAndFamily); - ok(logfont.lfFaceName[0] != 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteFont_Release(font); }

1 0

Nikolay Sivov : dwrite/tests: Use defined symbols when testing LOGFONT fields values.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3ffa9ee08284d7b4a43e5757001233bd967f9b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ffa9ee08284d7b4a43e57570… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:15 2016 +0300 dwrite/tests: Use defined symbols when testing LOGFONT fields values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 738d100..ca35324 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3632,10 +3632,13 @@ if (0) { /* crashes on native */ ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); - ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "got %d\n", logfont.lfOutPrecision); - ok(logfont.lfClipPrecision == 0, "got %d\n", logfont.lfClipPrecision); - ok(logfont.lfQuality == 0, "got %d\n", logfont.lfQuality); - ok(logfont.lfPitchAndFamily == 0, "got %d\n", logfont.lfPitchAndFamily); + ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "%s: unexpected output precision %d\n", wine_dbgstr_w(nameW), + logfont.lfOutPrecision); + ok(logfont.lfClipPrecision == CLIP_DEFAULT_PRECIS, "%s: unexpected clipping precision %d\n", wine_dbgstr_w(nameW), + logfont.lfClipPrecision); + ok(logfont.lfQuality == DEFAULT_QUALITY, "%s: unexpected quality %d\n", wine_dbgstr_w(nameW), logfont.lfQuality); + ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "%s: unexpected pitch %d\n", wine_dbgstr_w(nameW), + logfont.lfPitchAndFamily); ok(logfont.lfFaceName[0] != 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteFont_Release(font);

1 0

Nikolay Sivov : dwrite: Improve lfWeight values returned by ConvertFontToLOGFONT().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: da11bee6c77729974520eca4fa1886997a41ec14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da11bee6c77729974520eca4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:14 2016 +0300 dwrite: Improve lfWeight values returned by ConvertFontToLOGFONT(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + dlls/dwrite/gdiinterop.c | 1 - dlls/dwrite/opentype.c | 12 +++---- dlls/dwrite/tests/font.c | 81 ++++++++++++++++++++++++++++++++---------------- 4 files changed, 62 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 356000c..47ebd11 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3401,6 +3401,7 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa if (init_font_data_from_font(family->fonts[heaviest], DWRITE_FONT_SIMULATIONS_BOLD, facenameW, &boldface) == S_OK) { boldface->bold_sim_tested = 1; + boldface->lf.lfWeight += (FW_BOLD - FW_REGULAR) / 2 + 1; fontfamily_add_font(family, boldface); } } diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index e4ef835..5034ad7 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -654,7 +654,6 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, get_logfont_from_font(font, logfont); logfont->lfCharSet = DEFAULT_CHARSET; - logfont->lfWeight = IDWriteFont_GetWeight(font); logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; logfont->lfFaceName[0] = 0; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e16bf76..7f6ccd1 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1307,10 +1307,9 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (version >= 4 && (fsSelection & OS2_FSSELECTION_OBLIQUE)) props->style = DWRITE_FONT_STYLE_OBLIQUE; - else if (fsSelection & OS2_FSSELECTION_ITALIC) { + else if (fsSelection & OS2_FSSELECTION_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; - props->lf.lfItalic = 1; - } + memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); } else if (tt_head) { @@ -1324,12 +1323,13 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (macStyle & TT_HEAD_MACSTYLE_BOLD) props->weight = DWRITE_FONT_WEIGHT_BOLD; - if (macStyle & TT_HEAD_MACSTYLE_ITALIC) { + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; - props->lf.lfItalic = 1; - } } + props->lf.lfWeight = props->weight; + props->lf.lfItalic = props->style == DWRITE_FONT_STYLE_ITALIC; + TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); if (tt_os2) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d3c9d42..738d100 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3458,7 +3458,16 @@ static void test_TryGetFontTable(void) static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) { + void *os2_context, *head_context; + DWRITE_FONT_SIMULATIONS sim; + IDWriteFontFace *fontface; + const TT_OS2_V2 *tt_os2; DWRITE_FONT_STYLE style; + const TT_HEAD *tt_head; + LONG weight; + UINT32 size; + BOOL exists; + HRESULT hr; /* These are rendering time properties. */ logfont->lfHeight = 0; @@ -3468,32 +3477,50 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) logfont->lfUnderline = 0; logfont->lfStrikeOut = 0; + logfont->lfWeight = 0; logfont->lfItalic = 0; - if (IDWriteFont_GetSimulations(font) & DWRITE_FONT_SIMULATIONS_OBLIQUE) - logfont->lfItalic = 1; + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create font face, %#x\n", hr); - style = IDWriteFont_GetStyle(font); - if (!logfont->lfItalic && ((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE))) { - void *os2_context, *head_context; - IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; - const TT_HEAD *tt_head; - UINT32 size; - BOOL exists; - HRESULT hr; + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, + &os2_context, &exists); + ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "Failed to create font face, %#x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void **)&tt_head, &size, + &head_context, &exists); + ok(hr == S_OK, "Failed to get head table, %#x\n", hr); + + sim = IDWriteFont_GetSimulations(font); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, - &os2_context, &exists); - ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); + /* lfWeight */ + weight = FW_REGULAR; + if (tt_os2) { + USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void **)&tt_head, &size, - &head_context, &exists); - ok(hr == S_OK, "Failed to get head table, %#x\n", hr); + if (usWeightClass >= 1 && usWeightClass <= 9) + usWeightClass *= 100; + if (usWeightClass > DWRITE_FONT_WEIGHT_ULTRA_BLACK) + weight = DWRITE_FONT_WEIGHT_ULTRA_BLACK; + else if (usWeightClass > 0) + weight = usWeightClass; + } + else if (tt_head) { + USHORT macStyle = GET_BE_WORD(tt_head->macStyle); + if (macStyle & TT_HEAD_MACSTYLE_BOLD) + weight = DWRITE_FONT_WEIGHT_BOLD; + } + if (sim & DWRITE_FONT_SIMULATIONS_BOLD) + weight += (FW_BOLD - FW_REGULAR) / 2 + 1; + logfont->lfWeight = weight; + + /* lfItalic */ + if (IDWriteFont_GetSimulations(font) & DWRITE_FONT_SIMULATIONS_OBLIQUE) + logfont->lfItalic = 1; + + style = IDWriteFont_GetStyle(font); + if (!logfont->lfItalic && ((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE))) { if (tt_os2) { USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); logfont->lfItalic = !!(fsSelection & OS2_FSSELECTION_ITALIC); @@ -3502,13 +3529,13 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) USHORT macStyle = GET_BE_WORD(tt_head->macStyle); logfont->lfItalic = !!(macStyle & TT_HEAD_MACSTYLE_ITALIC); } - - if (tt_os2) - IDWriteFontFace_ReleaseFontTable(fontface, os2_context); - if (tt_head) - IDWriteFontFace_ReleaseFontTable(fontface, head_context); - IDWriteFontFace_Release(fontface); } + + if (tt_os2) + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + if (tt_head) + IDWriteFontFace_ReleaseFontTable(fontface, head_context); + IDWriteFontFace_Release(fontface); } static void test_ConvertFontToLOGFONT(void) @@ -3599,10 +3626,12 @@ if (0) { /* crashes on native */ sim = IDWriteFont_GetSimulations(font); get_logfont_from_font(font, &lf); + ok(logfont.lfWeight == lf.lfWeight, "%s: unexpected lfWeight %d, expected lfWeight %d, font weight %d, " + "bold simulation %s\n", wine_dbgstr_w(nameW), logfont.lfWeight, lf.lfWeight, IDWriteFont_GetWeight(font), + sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); - ok(logfont.lfWeight > 0, "got %d\n", logfont.lfWeight); ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "got %d\n", logfont.lfOutPrecision); ok(logfont.lfClipPrecision == 0, "got %d\n", logfont.lfClipPrecision); ok(logfont.lfQuality == 0, "got %d\n", logfont.lfQuality);

1 0

Nikolay Sivov : dwrite: Return zeroed fsCsb for OS/2 table of version 0.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3316f90418dd87c6d5c13f6658ce56e41039448c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3316f90418dd87c6d5c13f665… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:12 2016 +0300 dwrite: Return zeroed fsCsb for OS/2 table of version 0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 10 ++++++++-- dlls/dwrite/tests/font.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 3205b7f..3fe4690 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1923,8 +1923,14 @@ HRESULT opentype_get_font_signature(struct file_stream_desc *stream_desc, FONTSI fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); - fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + if (GET_BE_WORD(tt_os2->version) == 0) { + fontsig->fsCsb[0] = 0; + fontsig->fsCsb[1] = 0; + } + else { + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + } IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 12327a5..8df6f44 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6267,8 +6267,14 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); - fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + if (GET_BE_WORD(tt_os2->version) == 0) { + fontsig->fsCsb[0] = 0; + fontsig->fsCsb[1] = 0; + } + else { + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + } IDWriteFontFace_ReleaseFontTable(fontface, os2_context); }

1 0

Henri Verbeet : d2d1: Properly set an error state when adding the vertex fails in d2d_geometry_sink_BeginFigure ().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: e37ba63d2f0bc5b7383d6c751901a7a6b53453bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37ba63d2f0bc5b7383d6c751… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:02 2016 +0100 d2d1: Properly set an error state when adding the vertex fails in d2d_geometry_sink_BeginFigure(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index afbf339..cb6fab8 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1777,7 +1777,11 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i } if (!d2d_figure_add_vertex(&geometry->u.path.figures[geometry->u.path.figure_count - 1], start_point)) + { ERR("Failed to add vertex.\n"); + geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; + return; + } geometry->u.path.state = D2D_GEOMETRY_STATE_FIGURE; ++geometry->u.path.segment_count;

1 0