August 2014 - Wine-commits - list.winehq.org

Bruno Jesus : rsaenh/tests: Add SHA-256 tests.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: edb5e2b7d520baa0cb4158463c71f29be26a30e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb5e2b7d520baa0cb4158463… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 5 00:14:01 2014 -0300 rsaenh/tests: Add SHA-256 tests. --- dlls/rsaenh/tests/rsaenh.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 46d0451..aa37cb0 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -3555,6 +3555,79 @@ static void test_key_derivation(const char *prov) "\xE1\x6C\xA8\x54\x0E\x24\x67\x6D\xCA\xA2\xFE\x84\xF0\x9B\x78\x66", /* 47 */ }, + /* ================================================================== */ + { CALG_DES, CALG_SHA_256, 8, 32, CRYPT_MODE_CBC, 0, + "\x20\x34\xf7\xbb\x7a\x3a\x79\xf0\xb9\x65\x18\x11\xaa\xfd\x26\x6b" + "\x60\x5c\x6d\x4c\x81\x7c\x3f\xc4\xce\x94\xe3\x67\xdf\xf2\x16\xd8", + "\x86\x0d\x8c\xf4\xc0\x22\x4a\xdd", + /* 48 */ + }, + { CALG_3DES_112, CALG_SHA_256, 8, 32, CRYPT_MODE_CBC, 0, + "\x09\x6e\x7f\xd5\xf2\x72\x4e\x18\x70\x09\xc1\x35\xf4\xd1\x3a\xe8" + "\xe6\x1f\x91\xae\x2f\xfd\xa8\x8c\xce\x47\x0f\x7a\xf5\xef\xfd\xbe", + "\x2d\xe7\x63\xf6\x58\x4d\x9a\xa6", + /* 49 */ + }, + { CALG_3DES, CALG_SHA_256, 8, 32, CRYPT_MODE_CBC, 0, + "\x54\x7f\x84\x7f\xfe\x83\xc6\x50\xbc\xd9\x92\x78\x32\x67\x50\x7d" + "\xdf\x44\x55\x7d\x87\x74\xd2\x56\xff\xd9\x74\x44\xd5\x07\x9e\xdc", + "\x20\xaa\x66\xd0\xac\x83\x9d\x99", + /* 50 */ + }, + { CALG_RC2, CALG_SHA_256, 8, 32, CRYPT_MODE_CBC, 0, + "\xc6\x22\x46\x15\xa1\x27\x38\x23\x91\xf2\x29\xda\x15\xc9\x5d\x92" + "\x7c\x34\x4a\x1f\xb0\x8a\x81\xd6\x17\x09\xda\x52\x1f\xb9\x64\x60", + "\x8c\x01\x19\x47\x7e\xd2\x10\x2c", + /* 51 */ + }, + { CALG_RC4, CALG_SHA_256, 4, 32, 0, 0, + "\xcd\x53\x95\xa6\xb6\x6e\x25\x92\x78\xac\xe6\x7e\xfc\xd3\x8d\xaa" + "\xc3\x15\x83\xb5\xe6\xaf\xf9\x32\x4c\x17\xb8\x82\xdf\xc0\x45\x9e", + "\xfa\x54\x13\x9c", + /* 52 */ + }, + { CALG_RC5, CALG_SHA_256, 0, 32, 0, NTE_BAD_ALGID, + "\x2a\x3b\x08\xe1\xec\xa7\x04\xf9\xc9\x42\x74\x9a\x82\xad\x99\xd2" + "\x10\x51\xe3\x51\x6c\x67\xa4\xf2\xca\x99\x21\x43\xdf\xa0\xfc\xa1", + NULL, + /* 53 */ + }, + { CALG_RSA_SIGN, CALG_SHA_256, 0, 32, 0, NTE_BAD_ALGID, + "\x10\x1d\x36\xc7\x38\x73\xc3\x80\xf0\x7a\x4e\x25\x52\x8a\x5c\x3f" + "\xfc\x41\xa7\xe5\x20\xed\xd5\x1d\x00\x6e\x77\xf4\xa7\x71\x81\x6b", + NULL, + /* 54 */ + }, + { CALG_RSA_KEYX, CALG_SHA_256, 0, 32, CRYPT_MODE_CBC, NTE_BAD_ALGID, + "\x0a\x74\xde\x4f\x07\xce\x73\xd6\xd9\xa3\xba\xbb\x7c\x98\xe1\x94" + "\x13\x93\xb1\xfd\x26\x31\x4b\xfc\x61\x27\xef\x4d\xd0\x48\x76\x67", + NULL, + /* 55 */ + }, + { CALG_AES, CALG_SHA_256, 0, 32, 0, NTE_BAD_ALGID, + "\xf0\x13\xbc\x25\x2a\x2f\xba\xf1\x39\xe5\x7d\xb8\x5f\xaa\xd0\x19" + "\xbd\x1c\xd8\x7b\x39\x5a\xb3\x85\x84\x80\xbd\xe0\x4a\x65\x03\xdd", + NULL, + /* 56 */ + }, + { CALG_AES_128, CALG_SHA_256, 16, 32, CRYPT_MODE_CBC, NTE_BAD_ALGID, + "\xc8\xc2\x6f\xe2\xbe\xa7\x38\x87\x04\xc7\x39\xcb\x9f\x57\xfc\xde" + "\x14\x81\x46\xa4\xbb\xa7\x0f\x01\x1d\xc2\x6d\x7a\x43\x5f\x38\xc3", + "\xf8\x75\xc6\x71\x8b\xb6\x54\xd3\xdc\xff\x0e\x84\x8a\x3f\x19\x46", + /* 57 */ + }, + { CALG_AES_192, CALG_SHA_256, 16, 32, CRYPT_MODE_CBC, NTE_BAD_ALGID, + "\xb7\x3a\x43\x0f\xea\x90\x4f\x0f\xb9\x82\xf6\x1e\x07\xc4\x25\x4e" + "\xdb\xe7\xf7\x1d\x7c\xd0\xe5\x51\xd8\x1b\x97\xc8\xc2\x46\xb9\xfe", + "\x35\xf2\x20\xc7\x6c\xb2\x8e\x51\x3e\xc7\x6b\x3e\x64\xa5\x05\xdf", + /* 58 */ + }, + { CALG_AES_256, CALG_SHA_256, 16, 32, CRYPT_MODE_CBC, NTE_BAD_ALGID, + "\xbd\xcc\x0c\x59\x99\x29\xa7\x24\xf3\xdc\x20\x40\x4e\xe8\xe5\x48" + "\xdd\x27\x0e\xdf\x7e\x50\x65\x17\x34\x50\x47\x78\x9a\x23\x1b\x40", + "\x8c\xeb\x1f\xd3\x78\x77\xf5\xbf\x7a\xde\x8d\x2c\xa5\x16\xcc\xe9", + /* 59 */ + }, }; /* Due to differences between encryption from <= 2000 and >= XP some tests need to be skipped */ int old_broken[sizeof(tests)/sizeof(tests[0])];

1 0

Bruno Jesus : rsaenh/tests: Update some tests.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: aa1b5b65c90d3db20f38c0ddb1026bc7394fa805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1b5b65c90d3db20f38c0ddb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 5 00:14:33 2014 -0300 rsaenh/tests: Update some tests. Some function results and out parameters were not being tested. --- dlls/rsaenh/tests/rsaenh.c | 69 +++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index aa37cb0..64fc6a5 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -928,6 +928,7 @@ static void test_des(void) dwLen = sizeof(DWORD); result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); ok(result, "%08x\n", GetLastError()); + ok(dwMode == CRYPT_MODE_ECB, "Expected CRYPT_MODE_ECB, got %d\n", dwMode); for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; @@ -1358,8 +1359,7 @@ static void test_rc2(void) HCRYPTKEY hKey; BOOL result; DWORD dwLen, dwKeyLen, dwDataLen, dwMode, dwModeBits; - BYTE *pbTemp; - unsigned char pbData[2000], pbHashValue[16]; + unsigned char pbData[2000], pbHashValue[16], pszBuffer[256]; int i; for (i=0; i<2000; i++) pbData[i] = (unsigned char)i; @@ -1417,26 +1417,30 @@ static void test_rc2(void) dwLen = sizeof(DWORD); result = CryptGetKeyParam(hKey, KP_BLOCKLEN, (BYTE*)&dwModeBits, &dwLen, 0); ok(result, "%08x\n", GetLastError()); + ok(dwLen == 4, "Expected 4, got %d\n", dwLen); + dwLen = 0; result = CryptGetKeyParam(hKey, KP_IV, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - pbTemp = HeapAlloc(GetProcessHeap(), 0, dwLen); - CryptGetKeyParam(hKey, KP_IV, pbTemp, &dwLen, 0); - HeapFree(GetProcessHeap(), 0, pbTemp); + result = CryptGetKeyParam(hKey, KP_IV, pszBuffer, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwLen == 8, "Expected 8, got %d\n", dwLen); + dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); /* The default salt length is always 11... */ ok(dwLen == 11, "unexpected salt length %d\n", dwLen); /* and the default salt is always empty. */ - pbTemp = HeapAlloc(GetProcessHeap(), 0, dwLen); - CryptGetKeyParam(hKey, KP_SALT, pbTemp, &dwLen, 0); + result = CryptGetKeyParam(hKey, KP_SALT, pszBuffer, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); for (i=0; i<dwLen; i++) - ok(!pbTemp[i], "unexpected salt value %02x @ %d\n", pbTemp[i], i); - HeapFree(GetProcessHeap(), 0, pbTemp); + ok(!pszBuffer[i], "unexpected salt value %02x @ %d\n", pszBuffer[i], i); dwLen = sizeof(DWORD); - CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); + result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwMode == CRYPT_MODE_CBC, "Expected CRYPT_MODE_CBC, got %d\n", dwMode); result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError()); @@ -1447,11 +1451,11 @@ static void test_rc2(void) ok(!memcmp(pbData, rc2_40_encrypted, 16), "RC2 encryption failed!\n"); + dwLen = 0; result = CryptGetKeyParam(hKey, KP_IV, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - pbTemp = HeapAlloc(GetProcessHeap(), 0, dwLen); - CryptGetKeyParam(hKey, KP_IV, pbTemp, &dwLen, 0); - HeapFree(GetProcessHeap(), 0, pbTemp); + result = CryptGetKeyParam(hKey, KP_IV, pszBuffer, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); ok(result, "%08x\n", GetLastError()); @@ -1519,22 +1523,30 @@ static void test_rc2(void) ok(!result, "CryptSetKeyParam failed: %08x\n", GetLastError()); dwLen = sizeof(dwKeyLen); - CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + ok(result, "%08x", GetLastError()); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); - CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + ok(result, "%08x", GetLastError()); ok(dwKeyLen == 56 || broken(dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError()); dwKeyLen = 128; + SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); if (!BASE_PROV) ok(result, "expected success, got error 0x%08X\n", GetLastError()); else + { ok(!result, "expected error\n"); + ok(GetLastError() == NTE_BAD_DATA, "Expected 0x80009005, got 0x%08X\n", GetLastError()); + } dwLen = sizeof(dwKeyLen); - CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + ok(result, "%08x", GetLastError()); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); - CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + ok(result, "%08x", GetLastError()); /* Remove IF when fixed */ if(BASE_PROV) { @@ -1587,7 +1599,7 @@ static void test_rc4(void) HCRYPTHASH hHash; HCRYPTKEY hKey; DWORD dwDataLen = 5, dwKeyLen, dwLen = sizeof(DWORD), dwMode; - unsigned char pbData[2000], *pbTemp; + unsigned char pbData[2000]; unsigned char pszBuffer[256]; int i; @@ -1614,25 +1626,29 @@ static void test_rc4(void) dwLen = sizeof(DWORD); result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE*)&dwKeyLen, &dwLen, 0); ok(result, "%08x\n", GetLastError()); + ok(dwKeyLen == 56, "Expected 56, got %d\n", dwKeyLen); dwLen = sizeof(DWORD); result = CryptGetKeyParam(hKey, KP_BLOCKLEN, (BYTE*)&dwKeyLen, &dwLen, 0); ok(result, "%08x\n", GetLastError()); + ok(dwKeyLen == 0, "Expected 0, got %d\n", dwKeyLen); + dwLen = 0; result = CryptGetKeyParam(hKey, KP_IV, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - pbTemp = HeapAlloc(GetProcessHeap(), 0, dwLen); - CryptGetKeyParam(hKey, KP_IV, pbTemp, &dwLen, 0); - HeapFree(GetProcessHeap(), 0, pbTemp); + result = CryptGetKeyParam(hKey, KP_IV, pszBuffer, &dwLen, 0); + dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - pbTemp = HeapAlloc(GetProcessHeap(), 0, dwLen); - CryptGetKeyParam(hKey, KP_SALT, pbTemp, &dwLen, 0); - HeapFree(GetProcessHeap(), 0, pbTemp); + result = CryptGetKeyParam(hKey, KP_SALT, pszBuffer, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); dwLen = sizeof(DWORD); - CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); + result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwMode == 0 || broken(dwMode == CRYPT_MODE_CBC) /* <= 2000 */, + "Expected 0, got %d\n", dwMode); result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError()); @@ -3697,7 +3713,7 @@ START_TEST(rsaenh) for (iProv = 0; iProv < sizeof(szProviders) / sizeof(szProviders[0]); iProv++) { if (!init_base_environment(szProviders[iProv], 0)) - return; + continue; trace("Testing '%s'\n", szProviders[iProv]); test_prov(); test_gen_random(); @@ -3725,6 +3741,7 @@ START_TEST(rsaenh) if(!BASE_PROV) test_key_derivation(STRONG_PROV ? "STRONG" : "ENH"); clean_up_base_environment(); } + if (!init_base_environment(MS_ENHANCED_PROV_A, 0)) test_key_permissions(); test_key_initialization(); test_schannel_provider();

1 0

Bruno Jesus : rsaenh: Handle the failure to set Base provider effective key length properly.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: fb58e7eca6ddd946658f763a89d96d61e26e18bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb58e7eca6ddd946658f763a8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 5 00:15:31 2014 -0300 rsaenh: Handle the failure to set Base provider effective key length properly. --- dlls/rsaenh/rsaenh.c | 25 ++++++++++++++++++------- dlls/rsaenh/tests/rsaenh.c | 30 +++++++++--------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index dc9e70f..32646eb 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3496,7 +3496,8 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam switch (pCryptKey->aiAlgid) { case CALG_RC2: { - DWORD keylen; + DWORD keylen, deflen; + BOOL ret = TRUE; KEYCONTAINER *pKeyContainer = get_key_container(pCryptKey->hProv); if (!pbData) @@ -3505,18 +3506,28 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam return FALSE; } keylen = *(DWORD *)pbData; - if (!keylen || keylen > 1024 || (keylen != 40 && - pKeyContainer->dwPersonality == RSAENH_PERSONALITY_BASE)) + if (!keylen || keylen > 1024) { SetLastError(NTE_BAD_DATA); return FALSE; } - else + + /* + * The Base provider will force the key length to default + * and set an error state if a key length different from + * the default is tried. + */ + deflen = aProvEnumAlgsEx[pKeyContainer->dwPersonality]->dwDefaultLen; + if (pKeyContainer->dwPersonality == RSAENH_PERSONALITY_BASE + && keylen != deflen) { - pCryptKey->dwEffectiveKeyLen = keylen; - setup_key(pCryptKey); + keylen = deflen; + SetLastError(NTE_BAD_DATA); + ret = FALSE; } - break; + pCryptKey->dwEffectiveKeyLen = keylen; + setup_key(pCryptKey); + return ret; } default: SetLastError(NTE_BAD_TYPE); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 64fc6a5..fe1e293 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1534,11 +1534,20 @@ static void test_rc2(void) SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); if (!BASE_PROV) + { + dwKeyLen = 12345; ok(result, "expected success, got error 0x%08X\n", GetLastError()); + result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + ok(result, "%08x", GetLastError()); + ok(dwKeyLen == 128, "Expected 128, got %d\n", dwKeyLen); + } else { ok(!result, "expected error\n"); ok(GetLastError() == NTE_BAD_DATA, "Expected 0x80009005, got 0x%08X\n", GetLastError()); + result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); + ok(result, "%08x", GetLastError()); + ok(dwKeyLen == 40, "Expected 40, got %d\n", dwKeyLen); } dwLen = sizeof(dwKeyLen); @@ -1547,18 +1556,8 @@ static void test_rc2(void) ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); ok(result, "%08x", GetLastError()); - /* Remove IF when fixed */ - if(BASE_PROV) - { - todo_wine - ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), - "%d (%08x)\n", dwKeyLen, GetLastError()); - } - else - { ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError()); - } result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError()); @@ -1566,19 +1565,8 @@ static void test_rc2(void) dwDataLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); - - /* Remove IF when fixed */ - if(BASE_PROV) - { - todo_wine ok(!memcmp(pbData, !BASE_PROV ? rc2_128_encrypted : rc2_40def_encrypted, sizeof(rc2_128_encrypted)), "RC2 encryption failed!\n"); - } - else - { - ok(!memcmp(pbData, !BASE_PROV ? rc2_128_encrypted : rc2_40def_encrypted, - sizeof(rc2_128_encrypted)), "RC2 encryption failed!\n"); - } /* Oddly enough this succeeds, though it should have no effect */ dwKeyLen = 40;

1 0

Bruno Jesus : rsaenh: Use the remaining hash data as salt if requested.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: d7aae7d728a03780c3a741e3d0c5bbc82b390e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7aae7d728a03780c3a741e3d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 5 00:15:47 2014 -0300 rsaenh: Use the remaining hash data as salt if requested. --- dlls/rsaenh/rsaenh.c | 17 ++++-- dlls/rsaenh/tests/rsaenh.c | 132 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 32646eb..aa415e7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3947,7 +3947,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD { case ALG_CLASS_DATA_ENCRYPT: { - int need_padding; + int need_padding, copy_len; *phKey = new_key(hProv, Algid, dwFlags, &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; @@ -3977,7 +3977,9 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD need_padding = dwLen < pCryptKey->dwKeyLen; } - if (need_padding) { + copy_len = pCryptKey->dwKeyLen; + if (need_padding) + { BYTE pad1[RSAENH_HMAC_DEF_PAD_LEN], pad2[RSAENH_HMAC_DEF_PAD_LEN]; BYTE old_hashval[RSAENH_MAX_HASH_SIZE]; DWORD i; @@ -4002,9 +4004,18 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD memcpy(pCryptHash->abHashValue, old_hashval, RSAENH_MAX_HASH_SIZE); } + /* + * Padding was not required, we have more hash than needed. + * Do we need to use the remaining hash as salt? + */ + else if((dwFlags & CRYPT_CREATE_SALT) && + (Algid == CALG_RC2 || Algid == CALG_RC4)) + { + copy_len += pCryptKey->dwSaltLen; + } memcpy(pCryptKey->abKeyValue, abHashValue, - RSAENH_MIN(pCryptKey->dwKeyLen, sizeof(pCryptKey->abKeyValue))); + RSAENH_MIN(copy_len, sizeof(pCryptKey->abKeyValue))); break; } case ALG_CLASS_MSG_ENCRYPT: diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index fe1e293..bf105de 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1355,10 +1355,22 @@ static void test_rc2(void) static const BYTE rc2_40def_encrypted[] = { 0x23,0xc8,0x70,0x13,0x42,0x2e,0xa8,0x98, 0x5c,0xdf,0x7a,0x9b,0xea,0xdb,0x96,0x1b }; + static const BYTE rc2_40_salt_enh[24] = { + 0xA3, 0xD7, 0x41, 0x87, 0x7A, 0xD0, 0x18, 0xDB, + 0xD4, 0x6A, 0x4F, 0xEE, 0xF3, 0xCA, 0xCD, 0x34, + 0xB3, 0x15, 0x9A, 0x2A, 0x88, 0x5F, 0x43, 0xA5 }; + static const BYTE rc2_40_salt_base[24] = { + 0x8C, 0x4E, 0xA6, 0x00, 0x9B, 0x15, 0xEF, 0x9E, + 0x88, 0x81, 0xD0, 0x65, 0xD6, 0x53, 0x57, 0x08, + 0x0A, 0x77, 0x80, 0xFA, 0x7E, 0x89, 0x14, 0x55 }; + static const BYTE rc2_40_salt_strong[24] = { + 0xB9, 0x33, 0xB6, 0x7A, 0x35, 0xC3, 0x06, 0x88, + 0xBF, 0xD5, 0xCC, 0xAF, 0x14, 0xAE, 0xE2, 0x31, + 0xC6, 0x9A, 0xAA, 0x3F, 0x05, 0x2F, 0x22, 0xDA }; HCRYPTHASH hHash; HCRYPTKEY hKey; BOOL result; - DWORD dwLen, dwKeyLen, dwDataLen, dwMode, dwModeBits; + DWORD dwLen, dwKeyLen, dwDataLen, dwMode, dwModeBits, error; unsigned char pbData[2000], pbHashValue[16], pszBuffer[256]; int i; @@ -1575,6 +1587,67 @@ static void test_rc2(void) result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); + + /* Test a 40 bit key with salt */ + result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + ok(result, "%08x\n", GetLastError()); + + result = CryptDeriveKey(hProv, CALG_RC2, hHash, (40<<16)|CRYPT_CREATE_SALT, &hKey); + ok(result, "%08x\n", GetLastError()); + + dwDataLen = 16; + memset(pbData, 0xAF, dwDataLen); + SetLastError(0xdeadbeef); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); + if(result) + { + /* Remove IF when fixed */ + if(ENHANCED_PROV) + { + todo_wine + ok((ENHANCED_PROV && !memcmp(pbData, rc2_40_salt_enh, dwDataLen)) || + (STRONG_PROV && !memcmp(pbData, rc2_40_salt_strong, dwDataLen)) || + (BASE_PROV && !memcmp(pbData, rc2_40_salt_base, dwDataLen)), + "RC2 encryption failed!\n"); + } + else + { + ok((ENHANCED_PROV && !memcmp(pbData, rc2_40_salt_enh, dwDataLen)) || + (STRONG_PROV && !memcmp(pbData, rc2_40_salt_strong, dwDataLen)) || + (BASE_PROV && !memcmp(pbData, rc2_40_salt_base, dwDataLen)), + "RC2 encryption failed!\n"); + } + } + else /* <= XP */ + { + error = GetLastError(); + ok(error == NTE_BAD_DATA || broken(error == NTE_DOUBLE_ENCRYPT), + "Expected 0x80009005, got 0x%08X\n", error); + } + dwLen = sizeof(DWORD); + dwKeyLen = 12345; + result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE*)&dwKeyLen, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwKeyLen == 40, "Expected 40, got %d\n", dwKeyLen); + + dwLen = sizeof(pszBuffer); + memset(pszBuffer, 0xAF, dwLen); + result = CryptGetKeyParam(hKey, KP_SALT, pszBuffer, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + if (!ENHANCED_PROV) + ok(dwLen == 11, "Expected 11, got %d\n", dwLen); + else + todo_wine + ok(dwLen == 0, "Expected 0, got %d\n", dwLen); + + result = CryptDestroyKey(hKey); + ok(result, "%08x\n", GetLastError()); + + result = CryptDestroyHash(hHash); + ok(result, "%08x\n", GetLastError()); } } @@ -1583,6 +1656,12 @@ static void test_rc4(void) static const BYTE rc4[16] = { 0x17, 0x0c, 0x44, 0x8e, 0xae, 0x90, 0xcd, 0xb0, 0x7f, 0x87, 0xf5, 0x7a, 0xec, 0xb2, 0x2e, 0x35 }; + static const BYTE rc4_40_salt[16] = { + 0x41, 0xE6, 0x33, 0xC9, 0x50, 0xA1, 0xBF, 0x88, + 0x12, 0x4D, 0xD3, 0xE3, 0x47, 0x88, 0x6D, 0xA5 }; + static const BYTE rc4_40_salt_base[16] = { + 0x2F, 0xAC, 0xEA, 0xEA, 0xFF, 0x68, 0x7E, 0x77, + 0xF4, 0xB9, 0x48, 0x7C, 0x4E, 0x79, 0xA6, 0xB5 }; BOOL result; HCRYPTHASH hHash; HCRYPTKEY hKey; @@ -1684,6 +1763,57 @@ static void test_rc4(void) result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); + + /* Test a 40 bit key with salt */ + result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + ok(result, "%08x\n", GetLastError()); + + result = CryptDeriveKey(hProv, CALG_RC4, hHash, (40<<16)|CRYPT_CREATE_SALT, &hKey); + ok(result, "%08x\n", GetLastError()); + dwDataLen = 16; + memset(pbData, 0xAF, dwDataLen); + SetLastError(0xdeadbeef); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); + ok(result, "%08x\n", GetLastError()); + /* Remove IF when fixed */ + if (ENHANCED_PROV) + { + todo_wine + ok((ENHANCED_PROV && !memcmp(pbData, rc4_40_salt, dwDataLen)) || + (!ENHANCED_PROV && !memcmp(pbData, rc4_40_salt_base, dwDataLen)), + "RC4 encryption failed!\n"); + } + else + { + ok((ENHANCED_PROV && !memcmp(pbData, rc4_40_salt, dwDataLen)) || + (!ENHANCED_PROV && !memcmp(pbData, rc4_40_salt_base, dwDataLen)), + "RC4 encryption failed!\n"); + } + + dwLen = sizeof(DWORD); + dwKeyLen = 12345; + result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE*)&dwKeyLen, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwKeyLen == 40, "Expected 40, got %d\n", dwKeyLen); + + dwLen = sizeof(pszBuffer); + memset(pszBuffer, 0xAF, dwLen); + result = CryptGetKeyParam(hKey, KP_SALT, pszBuffer, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + if (!ENHANCED_PROV) + ok(dwLen == 11, "Expected 11, got %d\n", dwLen); + else + todo_wine + ok(dwLen == 0, "Expected 0, got %d\n", dwLen); + + result = CryptDestroyKey(hKey); + ok(result, "%08x\n", GetLastError()); + + result = CryptDestroyHash(hHash); + ok(result, "%08x\n", GetLastError()); } }

1 0

Bruno Jesus : rsaenh: A 40 bit key on Enhanced provider will not have salt even if asked for.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: d59011a9fbb86a3e2ed5858609515d932408c645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59011a9fbb86a3e2ed585860… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 5 00:16:05 2014 -0300 rsaenh: A 40 bit key on Enhanced provider will not have salt even if asked for. --- dlls/rsaenh/rsaenh.c | 12 +++++++++++- dlls/rsaenh/tests/rsaenh.c | 25 ------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index aa415e7..fa9071d 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -873,6 +873,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK destroy_key, (OBJECTHDR**)&pCryptKey); if (hCryptKey != (HCRYPTKEY)INVALID_HANDLE_VALUE) { + KEYCONTAINER *pKeyContainer = get_key_container(hProv); pCryptKey->aiAlgid = aiAlgid; pCryptKey->hProv = hProv; pCryptKey->dwModeBits = 0; @@ -882,7 +883,16 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwPermissions |= CRYPT_EXPORT; pCryptKey->dwKeyLen = dwKeyLen >> 3; pCryptKey->dwEffectiveKeyLen = 0; - if ((dwFlags & CRYPT_CREATE_SALT) || (dwKeyLen == 40 && !(dwFlags & CRYPT_NO_SALT))) + + /* + * For compatibility reasons a 40 bit key on the Enhanced + * provider will not have salt + */ + if (pKeyContainer->dwPersonality == RSAENH_PERSONALITY_ENHANCED + && (aiAlgid == CALG_RC2 || aiAlgid == CALG_RC4) + && (dwFlags & CRYPT_CREATE_SALT) && dwKeyLen == 40) + pCryptKey->dwSaltLen = 0; + else if ((dwFlags & CRYPT_CREATE_SALT) || (dwKeyLen == 40 && !(dwFlags & CRYPT_NO_SALT))) pCryptKey->dwSaltLen = 16 /*FIXME*/ - pCryptKey->dwKeyLen; else pCryptKey->dwSaltLen = 0; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index bf105de..41b51c1 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1604,22 +1604,10 @@ static void test_rc2(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); if(result) { - /* Remove IF when fixed */ - if(ENHANCED_PROV) - { - todo_wine ok((ENHANCED_PROV && !memcmp(pbData, rc2_40_salt_enh, dwDataLen)) || (STRONG_PROV && !memcmp(pbData, rc2_40_salt_strong, dwDataLen)) || (BASE_PROV && !memcmp(pbData, rc2_40_salt_base, dwDataLen)), "RC2 encryption failed!\n"); - } - else - { - ok((ENHANCED_PROV && !memcmp(pbData, rc2_40_salt_enh, dwDataLen)) || - (STRONG_PROV && !memcmp(pbData, rc2_40_salt_strong, dwDataLen)) || - (BASE_PROV && !memcmp(pbData, rc2_40_salt_base, dwDataLen)), - "RC2 encryption failed!\n"); - } } else /* <= XP */ { @@ -1640,7 +1628,6 @@ static void test_rc2(void) if (!ENHANCED_PROV) ok(dwLen == 11, "Expected 11, got %d\n", dwLen); else - todo_wine ok(dwLen == 0, "Expected 0, got %d\n", dwLen); result = CryptDestroyKey(hKey); @@ -1778,20 +1765,9 @@ static void test_rc4(void) SetLastError(0xdeadbeef); result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); - /* Remove IF when fixed */ - if (ENHANCED_PROV) - { - todo_wine - ok((ENHANCED_PROV && !memcmp(pbData, rc4_40_salt, dwDataLen)) || - (!ENHANCED_PROV && !memcmp(pbData, rc4_40_salt_base, dwDataLen)), - "RC4 encryption failed!\n"); - } - else - { ok((ENHANCED_PROV && !memcmp(pbData, rc4_40_salt, dwDataLen)) || (!ENHANCED_PROV && !memcmp(pbData, rc4_40_salt_base, dwDataLen)), "RC4 encryption failed!\n"); - } dwLen = sizeof(DWORD); dwKeyLen = 12345; @@ -1806,7 +1782,6 @@ static void test_rc4(void) if (!ENHANCED_PROV) ok(dwLen == 11, "Expected 11, got %d\n", dwLen); else - todo_wine ok(dwLen == 0, "Expected 0, got %d\n", dwLen); result = CryptDestroyKey(hKey);

1 0

Nikolay Sivov : dwrite: Added GetCurrentTransform() for a render target.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: 1eb2913ad6aed783fe18b765859821e7590bbb32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb2913ad6aed783fe18b7658… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 1 23:11:10 2014 +0400 dwrite: Added GetCurrentTransform() for a render target. --- dlls/dwrite/gdiinterop.c | 12 ++++++++++-- dlls/dwrite/tests/font.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 4b26197..73da1d2 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -36,6 +36,7 @@ struct rendertarget { IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; LONG ref; + DWRITE_MATRIX m; SIZE size; HDC hdc; }; @@ -144,8 +145,11 @@ static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget *if static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX *transform) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p)->(%p): stub\n", This, transform); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, transform); + + *transform = This->m; + return S_OK; } static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX const *transform) @@ -213,6 +217,10 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite return hr; } + target->m.m11 = target->m.m22 = 1.0; + target->m.m12 = target->m.m21 = 0.0; + target->m.dx = target->m.dy = 0.0; + *ret = &target->IDWriteBitmapRenderTarget_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8460f12..50b01a8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -199,6 +199,7 @@ static void test_CreateBitmapRenderTarget(void) IDWriteBitmapRenderTarget *target, *target2; IDWriteGdiInterop *interop; HBITMAP hbm, hbm2; + DWRITE_MATRIX m; DIBSECTION ds; HRESULT hr; SIZE size; @@ -321,6 +322,16 @@ if (0) /* crashes on native */ ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel); ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits); + /* transform tests */ +if (0) /* crashes on native */ + hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, NULL); + + memset(&m, 0xcc, sizeof(m)); + hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); + ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + IDWriteBitmapRenderTarget_Release(target); IDWriteGdiInterop_Release(interop); }

1 0

Nikolay Sivov : dwrite/tests: Some tests for drawing sequence for a layout.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: e6cb2dbaca34c5830922ff104507e5fdbd03abac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cb2dbaca34c5830922ff104… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 5 11:46:47 2014 +0400 dwrite/tests: Some tests for drawing sequence for a layout. --- dlls/dwrite/tests/analyzer.c | 1 + dlls/dwrite/tests/layout.c | 340 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 341 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6cb2dbaca34c5830922f…

1 0

David Hedberg : shell32: Implement IEnumShellItems for IShellItemArray.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: d016dc40046faaa2f26d92293159fbcbb2f3718e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d016dc40046faaa2f26d92293… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Jul 31 11:53:18 2014 +0200 shell32: Implement IEnumShellItems for IShellItemArray. --- dlls/shell32/shellitem.c | 174 ++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 155 ++++++++++++++++++++++++++++++++++++ 2 files changed, 327 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d016dc40046faaa2f26d9…

1 0

David Hedberg : comdlg32: Support browsing for folders.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: 3cf2fb3a9c83a1326e4c5a623f2d85e0aad76876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf2fb3a9c83a1326e4c5a623… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:26 2014 +0200 comdlg32: Support browsing for folders. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/comdlg32.rc | 2 + dlls/comdlg32/filedlgbrowser.h | 1 + dlls/comdlg32/itemdlg.c | 46 ++++- po/ar.po | 378 ++++++++++++++++++++-------------------- po/bg.po | 381 +++++++++++++++++++++-------------------- po/ca.po | 378 ++++++++++++++++++++-------------------- po/cs.po | 378 ++++++++++++++++++++-------------------- po/da.po | 378 ++++++++++++++++++++-------------------- po/de.po | 378 ++++++++++++++++++++-------------------- po/el.po | 377 ++++++++++++++++++++-------------------- po/en.po | 376 ++++++++++++++++++++-------------------- po/en_US.po | 376 ++++++++++++++++++++-------------------- po/eo.po | 378 ++++++++++++++++++++-------------------- po/es.po | 378 ++++++++++++++++++++-------------------- po/fa.po | 377 ++++++++++++++++++++-------------------- po/fi.po | 378 ++++++++++++++++++++-------------------- po/fr.po | 378 ++++++++++++++++++++-------------------- po/he.po | 378 ++++++++++++++++++++-------------------- po/hi.po | 376 ++++++++++++++++++++-------------------- po/hr.po | 378 ++++++++++++++++++++-------------------- po/hu.po | 378 ++++++++++++++++++++-------------------- po/it.po | 378 ++++++++++++++++++++-------------------- po/ja.po | 378 ++++++++++++++++++++-------------------- po/ko.po | 378 ++++++++++++++++++++-------------------- po/lt.po | 378 ++++++++++++++++++++-------------------- po/ml.po | 376 ++++++++++++++++++++-------------------- po/nb_NO.po | 378 ++++++++++++++++++++-------------------- po/nl.po | 378 ++++++++++++++++++++-------------------- po/or.po | 376 ++++++++++++++++++++-------------------- po/pa.po | 376 ++++++++++++++++++++-------------------- po/pl.po | 378 ++++++++++++++++++++-------------------- po/pt_BR.po | 378 ++++++++++++++++++++-------------------- po/pt_PT.po | 378 ++++++++++++++++++++-------------------- po/rm.po | 376 ++++++++++++++++++++-------------------- po/ro.po | 378 ++++++++++++++++++++-------------------- po/ru.po | 378 ++++++++++++++++++++-------------------- po/sk.po | 378 ++++++++++++++++++++-------------------- po/sl.po | 378 ++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 378 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 378 ++++++++++++++++++++-------------------- po/sv.po | 378 ++++++++++++++++++++-------------------- po/te.po | 376 ++++++++++++++++++++-------------------- po/th.po | 377 ++++++++++++++++++++-------------------- po/tr.po | 378 ++++++++++++++++++++-------------------- po/uk.po | 378 ++++++++++++++++++++-------------------- po/wa.po | 378 ++++++++++++++++++++-------------------- po/wine.pot | 376 ++++++++++++++++++++-------------------- po/zh_CN.po | 378 ++++++++++++++++++++-------------------- po/zh_TW.po | 378 ++++++++++++++++++++-------------------- 50 files changed, 8952 insertions(+), 8468 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cf2fb3a9c83a1326e4c5…

1 0

Piotr Caban : msvcrt: Only check for flag presence in isatty function.
by Alexandre Julliard 04 Aug '14

04 Aug '14

Module: wine Branch: master Commit: d3a48ee3427fa458de2d3830d567c8f6ee0c682c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a48ee3427fa458de2d3830d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 31 09:51:52 2014 -0500 msvcrt: Only check for flag presence in isatty function. --- dlls/msvcrt/file.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0e5deba..7ce8b59 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -65,7 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_PIPE 0x08 #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 -#define WX_NOSEEK 0x40 +#define WX_TTY 0x40 #define WX_TEXT 0x80 /* values for exflag - it's used differently in msvcr90.dll*/ @@ -376,7 +376,7 @@ static int msvcrt_set_fd(HANDLE hand, int flag, int fd) } fdinfo->handle = hand; - fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_NOSEEK)); + fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_TTY)); fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; @@ -550,7 +550,7 @@ void msvcrt_init_io(void) HANDLE h = GetStdHandle(STD_INPUT_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDIN_FILENO); } @@ -559,7 +559,7 @@ void msvcrt_init_io(void) HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDOUT_FILENO); } @@ -568,7 +568,7 @@ void msvcrt_init_io(void) HANDLE h = GetStdHandle(STD_ERROR_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDERR_FILENO); } @@ -607,13 +607,9 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) */ int CDECL MSVCRT__isatty(int fd) { - HANDLE hand = msvcrt_fdtoh(fd); + TRACE(":fd (%d)\n",fd); - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return 0; - - return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; + return msvcrt_get_ioinfo(fd)->wxflag & WX_TTY; } /* INTERNAL: Allocate stdio file buffer */ @@ -2006,7 +2002,7 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int { DWORD access = 0, creation = 0, attrib; SECURITY_ATTRIBUTES sa; - DWORD sharing; + DWORD sharing, type; int wxflag; HANDLE hand; @@ -2139,6 +2135,12 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int oflags = check_bom(hand, oflags, TRUE); } + type = GetFileType(hand); + if (type == FILE_TYPE_CHAR) + wxflag |= WX_TTY; + else if (type == FILE_TYPE_PIPE) + wxflag |= WX_PIPE; + *fd = msvcrt_alloc_fd(hand, wxflag); if (*fd == -1) return *MSVCRT__errno(); @@ -2300,7 +2302,7 @@ int CDECL MSVCRT__open_osfhandle(MSVCRT_intptr_t handle, int oflags) } if (flags == FILE_TYPE_CHAR) - flags = WX_NOSEEK; + flags = WX_TTY; else if (flags == FILE_TYPE_PIPE) flags = WX_PIPE; else @@ -2424,7 +2426,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) buf[0] = '\n'; else { buf[0] = '\r'; - if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) + if(fdinfo->wxflag & (WX_PIPE | WX_TTY)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2472,7 +2474,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(char_len+i <= pos) i += char_len; - if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { + if(fdinfo->wxflag & (WX_PIPE | WX_TTY)) { if(i < pos) fdinfo->lookahead[0] = readbuf[i]; if(i+1 < pos) @@ -2500,7 +2502,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(lookahead != '\n') readbuf[j++] = '\r'; - if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) + if(fdinfo->wxflag & (WX_PIPE | WX_TTY)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2634,7 +2636,7 @@ static int read_i(int fd, void *buf, unsigned int count) if(utf16) bufstart[j++] = 0; } - if (fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) + if (fdinfo->wxflag & (WX_PIPE | WX_TTY)) { if (lookahead[0]=='\n' && (!utf16 || !lookahead[1])) {

1 0