wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Jacek Caban : rsaenh: Use bcrypt for MD4 hashes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 2b7fcef811dda082fb0f79aaa2986fa026f426bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7fcef811dda082fb0f79aaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:47:06 2017 +0100 rsaenh: Use bcrypt for MD4 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 18 ++---------------- dlls/rsaenh/implglue.h | 9 --------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index af87b43..c12a27c 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -33,10 +33,6 @@ #include <stdio.h> -/* Function prototypes copied from dlls/advapi32/crypt_md4.c */ -VOID WINAPI MD4Init( MD4_CTX *ctx ); -VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ); -VOID WINAPI MD4Final( MD4_CTX *ctx ); /* Function prototypes copied from dlls/advapi32/crypt_md5.c */ VOID WINAPI MD5Init( MD5_CTX *ctx ); VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); @@ -56,8 +52,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) break; case CALG_MD4: - MD4Init(&pHashContext->md4); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_MD4_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_MD5: MD5Init(&pHashContext->md5); @@ -95,10 +91,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb { switch (aiAlgid) { - case CALG_MD4: - MD4Update(&pHashContext->md4, pbData, dwDataLen); - break; - case CALG_MD5: MD5Update(&pHashContext->md5, pbData, dwDataLen); break; @@ -114,11 +106,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash { switch (aiAlgid) { - case CALG_MD4: - MD4Final(&pHashContext->md4); - memcpy(pbHashValue, pHashContext->md4.digest, 16); - break; - case CALG_MD5: MD5Final(&pHashContext->md5); memcpy(pbHashValue, pHashContext->md5.digest, 16); @@ -138,7 +125,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, { switch (aiAlgid) { - case CALG_MD4: case CALG_MD5: *pDestHashContext = *pSrcHashContext; return TRUE; diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 59e98c3..e874aaa 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,14 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -/* Next typedef copied from dlls/advapi32/crypt_md4.c */ -typedef struct tagMD4_CTX { - unsigned int buf[4]; - unsigned int i[2]; - unsigned char in[64]; - unsigned char digest[16]; -} MD4_CTX; - /* Next typedef copied from dlls/advapi32/crypt_md5.c */ typedef struct tagMD5_CTX { @@ -47,7 +39,6 @@ typedef struct tagMD5_CTX } MD5_CTX; typedef union tagHASH_CONTEXT { - MD4_CTX md4; MD5_CTX md5; BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT;

1 0

Jacek Caban : bcrypt: Added support for MD4 hashes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: e73d4e55a9f5337bf5673339aaf301b64afd060a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73d4e55a9f5337bf5673339a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:58 2017 +0100 bcrypt: Added support for MD4 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 11 +++++++++++ dlls/bcrypt/bcrypt_main.c | 17 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++++++ include/bcrypt.h | 1 + 4 files changed, 35 insertions(+) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index c58ede8..a75f92a 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -61,6 +61,17 @@ void md2_update(MD2_CTX *ctx, const unsigned char *buf, ULONG len) DECLSPEC_HIDD void md2_finalize(MD2_CTX *ctx, unsigned char *hash) DECLSPEC_HIDDEN; /* Definitions from advapi32 */ +typedef struct tagMD4_CTX { + unsigned int buf[4]; + unsigned int i[2]; + unsigned char in[64]; + unsigned char digest[16]; +} MD4_CTX; + +VOID WINAPI MD4Init(MD4_CTX *ctx); +VOID WINAPI MD4Update(MD4_CTX *ctx, const unsigned char *buf, unsigned int len); +VOID WINAPI MD4Final(MD4_CTX *ctx); + typedef struct { unsigned int i[2]; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b202184..931db2b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -146,6 +146,7 @@ enum alg_id { ALG_ID_AES, ALG_ID_MD2, + ALG_ID_MD4, ALG_ID_MD5, ALG_ID_RNG, ALG_ID_SHA1, @@ -165,6 +166,7 @@ static const struct { } alg_props[] = { /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM }, /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM }, + /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM }, @@ -238,6 +240,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR if (!strcmpW( id, BCRYPT_AES_ALGORITHM )) alg_id = ALG_ID_AES; else if (!strcmpW( id, BCRYPT_MD2_ALGORITHM )) alg_id = ALG_ID_MD2; + else if (!strcmpW( id, BCRYPT_MD4_ALGORITHM )) alg_id = ALG_ID_MD4; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; @@ -291,6 +294,7 @@ struct hash_impl union { MD2_CTX md2; + MD4_CTX md4; MD5_CTX md5; SHA_CTX sha1; SHA256_CTX sha256; @@ -306,6 +310,10 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) md2_init( &hash->u.md2 ); break; + case ALG_ID_MD4: + MD4Init( &hash->u.md4 ); + break; + case ALG_ID_MD5: MD5Init( &hash->u.md5 ); break; @@ -342,6 +350,10 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, md2_update( &hash->u.md2, input, size ); break; + case ALG_ID_MD4: + MD4Update( &hash->u.md4, input, size ); + break; + case ALG_ID_MD5: MD5Update( &hash->u.md5, input, size ); break; @@ -378,6 +390,11 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, md2_finalize( &hash->u.md2, output ); break; + case ALG_ID_MD4: + MD4Final( &hash->u.md4 ); + memcpy( output, hash->u.md4.digest, 16 ); + break; + case ALG_ID_MD5: MD5Final( &hash->u.md5 ); memcpy( output, hash->u.md5.digest, 16 ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index de04190..6fa04b0 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -329,6 +329,12 @@ static void test_hashes(void) "7f05b0638d77f4a27f3a9c4d353cd648" }, { + "MD4", + 16, + "74b5db93c0b41e36ca7074338fc0b637", + "bc2e8ac4d8248ed21b8d26227a30ea3a" + }, + { "MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", diff --git a/include/bcrypt.h b/include/bcrypt.h index 70928c5..7c3c8d0 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -65,6 +65,7 @@ typedef LONG NTSTATUS; #define BCRYPT_AES_ALGORITHM (const WCHAR []){'A','E','S',0} #define BCRYPT_MD2_ALGORITHM (const WCHAR []){'M','D','2',0} +#define BCRYPT_MD4_ALGORITHM (const WCHAR []){'M','D','4',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}

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA1 hashes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: b0329620ddf169063cda81768bad727ee26e802e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0329620ddf169063cda81768… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:41 2017 +0100 rsaenh: Use bcrypt for SHA1 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 17 ++--------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 58fd727..af87b43 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -41,10 +41,6 @@ VOID WINAPI MD4Final( MD4_CTX *ctx ); VOID WINAPI MD5Init( MD5_CTX *ctx ); VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); VOID WINAPI MD5Final( MD5_CTX *ctx ); -/* Function prototypes copied from dlls/advapi32/crypt_sha.c */ -VOID WINAPI A_SHAInit(PSHA_CTX Context); -VOID WINAPI A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize); -VOID WINAPI A_SHAFinal(PSHA_CTX Context, PULONG Result); /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); @@ -68,8 +64,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) return TRUE; case CALG_SHA: - A_SHAInit(&pHashContext->sha); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_SHA_256: status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); @@ -107,10 +103,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb MD5Update(&pHashContext->md5, pbData, dwDataLen); break; - case CALG_SHA: - A_SHAUpdate(&pHashContext->sha, pbData, dwDataLen); - break; - default: BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); } @@ -132,10 +124,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash memcpy(pbHashValue, pHashContext->md5.digest, 16); break; - case CALG_SHA: - A_SHAFinal(&pHashContext->sha, (PULONG)pbHashValue); - break; - default: BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); BCryptDestroyHash(pHashContext->bcrypt_hash); @@ -152,7 +140,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, { case CALG_MD4: case CALG_MD5: - case CALG_SHA: *pDestHashContext = *pSrcHashContext; return TRUE; default: diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 446f843..59e98c3 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -46,19 +46,9 @@ typedef struct tagMD5_CTX unsigned char digest[16]; } MD5_CTX; -/* Next typedef copied form dlls/advapi32/crypt_sha.c */ -typedef struct tagSHA_CTX -{ - ULONG Unknown[6]; - ULONG State[5]; - ULONG Count[2]; - UCHAR Buffer[64]; -} SHA_CTX, *PSHA_CTX; - typedef union tagHASH_CONTEXT { MD4_CTX md4; MD5_CTX md5; - SHA_CTX sha; BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT;

1 0

Jacek Caban : rsaenh: Use bcrypt for MD2 hashes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 8009091f111523dfc04c8acdb29787ce07ba5d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8009091f111523dfc04c8acdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:33 2017 +0100 rsaenh: Use bcrypt for MD2 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/implglue.c | 13 +---- dlls/rsaenh/implglue.h | 1 - dlls/rsaenh/md2.c | 151 ------------------------------------------------ dlls/rsaenh/tomcrypt.h | 9 --- 5 files changed, 2 insertions(+), 173 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index c9cb007..9997752 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ des.c \ handle.c \ implglue.c \ - md2.c \ mpi.c \ rc2.c \ rc4.c \ diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 1dfc896..58fd727 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -56,8 +56,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) switch (aiAlgid) { case CALG_MD2: - md2_init(&pHashContext->md2); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_MD2_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_MD4: MD4Init(&pHashContext->md4); @@ -99,10 +99,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb { switch (aiAlgid) { - case CALG_MD2: - md2_process(&pHashContext->md2, pbData, dwDataLen); - break; - case CALG_MD4: MD4Update(&pHashContext->md4, pbData, dwDataLen); break; @@ -126,10 +122,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash { switch (aiAlgid) { - case CALG_MD2: - md2_done(&pHashContext->md2, pbHashValue); - break; - case CALG_MD4: MD4Final(&pHashContext->md4); memcpy(pbHashValue, pHashContext->md4.digest, 16); @@ -158,7 +150,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, { switch (aiAlgid) { - case CALG_MD2: case CALG_MD4: case CALG_MD5: case CALG_SHA: diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 5353810a..446f843 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -56,7 +56,6 @@ typedef struct tagSHA_CTX } SHA_CTX, *PSHA_CTX; typedef union tagHASH_CONTEXT { - md2_state md2; MD4_CTX md4; MD5_CTX md5; SHA_CTX sha; diff --git a/dlls/rsaenh/md2.c b/dlls/rsaenh/md2.c deleted file mode 100644 index 187d114..0000000 --- a/dlls/rsaenh/md2.c +++ /dev/null @@ -1,151 +0,0 @@ -/* - * dlls/rsaenh/md2.c - * MD2 (RFC 1319) hash function implementation by Tom St Denis - * - * Copyright 2004 Michael Jung - * Based on public domain code by Tom St Denis (tomstdenis(a)iahu.ca) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* - * This file contains code from the LibTomCrypt cryptographic - * library written by Tom St Denis (tomstdenis(a)iahu.ca). LibTomCrypt - * is in the public domain. The code in this file is tailored to - * special requirements. Take a look at http://libtomcrypt.org for the - * original version. - */ - -#include "tomcrypt.h" - -static const unsigned char PI_SUBST[256] = { - 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, - 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, - 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, - 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, - 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, - 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, - 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, - 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, - 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, - 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, - 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, - 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, - 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, - 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, - 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, - 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, - 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, - 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 -}; - -/* adds 16 bytes to the checksum */ -static void md2_update_chksum(md2_state *md2) -{ - int j; - unsigned char L; - L = md2->chksum[15]; - for (j = 0; j < 16; j++) { - -/* caution, the RFC says its "C[j] = S[M[i*16+j] xor L]" but the reference source code [and test vectors] say - otherwise. -*/ - L = (md2->chksum[j] ^= PI_SUBST[(int)(md2->buf[j] ^ L)] & 255); - } -} - -static void md2_compress(md2_state *md2) -{ - int j, k; - unsigned char t; - - /* copy block */ - for (j = 0; j < 16; j++) { - md2->X[16+j] = md2->buf[j]; - md2->X[32+j] = md2->X[j] ^ md2->X[16+j]; - } - - t = 0; - - /* do 18 rounds */ - for (j = 0; j < 18; j++) { - for (k = 0; k < 48; k++) { - t = (md2->X[k] ^= PI_SUBST[(int)(t & 255)]); - } - t = (t + (unsigned char)j) & 255; - } -} - -int md2_init(md2_state *md2) -{ - /* MD2 uses a zero'ed state... */ - memset(md2->X, 0, sizeof(md2->X)); - memset(md2->chksum, 0, sizeof(md2->chksum)); - memset(md2->buf, 0, sizeof(md2->buf)); - md2->curlen = 0; - return CRYPT_OK; -} - -int md2_process(md2_state *md2, const unsigned char *buf, unsigned long len) -{ - unsigned long n; - - if (md2->curlen > sizeof(md2->buf)) { - return CRYPT_INVALID_ARG; - } - while (len > 0) { - n = MIN(len, (16 - md2->curlen)); - memcpy(md2->buf + md2->curlen, buf, (size_t)n); - md2->curlen += n; - buf += n; - len -= n; - - /* is 16 bytes full? */ - if (md2->curlen == 16) { - md2_compress(md2); - md2_update_chksum(md2); - md2->curlen = 0; - } - } - return CRYPT_OK; -} - -int md2_done(md2_state * md2, unsigned char *hash) -{ - unsigned long i, k; - - if (md2->curlen >= sizeof(md2->buf)) { - return CRYPT_INVALID_ARG; - } - - /* pad the message */ - k = 16 - md2->curlen; - for (i = md2->curlen; i < 16; i++) { - md2->buf[i] = (unsigned char)k; - } - - /* hash and update */ - md2_compress(md2); - md2_update_chksum(md2); - - /* hash checksum */ - memcpy(md2->buf, md2->chksum, 16); - md2_compress(md2); - - /* output is lower 16 bytes of X */ - memcpy(hash, md2->X, 16); - - return CRYPT_OK; -} diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index 49fb352..3e1db9a 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -150,15 +150,6 @@ int aes_setup(const unsigned char *key, int keylen, int rounds, aes_key *skey); void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_key *skey); void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_key *skey); -typedef struct tag_md2_state { - unsigned char chksum[16], X[48], buf[16]; - unsigned long curlen; -} md2_state; - -int md2_init(md2_state * md); -int md2_process(md2_state * md, const unsigned char *buf, unsigned long len); -int md2_done(md2_state * md, unsigned char *hash); - struct rc4_prng { int x, y; unsigned char buf[256];

1 0

Jacek Caban : bcrypt: Added MD2 hash support.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 85657376b31b61a3f49189b8c5892e602ee8c3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=85657376b31b61a3f49189b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:20 2017 +0100 bcrypt: Added MD2 hash support. By adopting rsaenh implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 9 +++ dlls/bcrypt/bcrypt_main.c | 16 +++++ dlls/bcrypt/md2.c | 144 ++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++ include/bcrypt.h | 1 + 6 files changed, 177 insertions(+) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 602d22d..3d081c8 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -5,6 +5,7 @@ EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ bcrypt_main.c \ + md2.c \ sha256.c \ sha512.c diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index b12450f..c58ede8 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -51,6 +51,15 @@ void sha384_init(SHA512_CTX *ctx) DECLSPEC_HIDDEN; #define sha384_update sha512_update void sha384_finalize(SHA512_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN; +typedef struct { + unsigned char chksum[16], X[48], buf[16]; + unsigned long curlen; +} MD2_CTX; + +void md2_init(MD2_CTX *ctx) DECLSPEC_HIDDEN; +void md2_update(MD2_CTX *ctx, const unsigned char *buf, ULONG len) DECLSPEC_HIDDEN; +void md2_finalize(MD2_CTX *ctx, unsigned char *hash) DECLSPEC_HIDDEN; + /* Definitions from advapi32 */ typedef struct { diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b631128..b202184 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -145,6 +145,7 @@ struct object enum alg_id { ALG_ID_AES, + ALG_ID_MD2, ALG_ID_MD5, ALG_ID_RNG, ALG_ID_SHA1, @@ -163,6 +164,7 @@ static const struct { const WCHAR *alg_name; } alg_props[] = { /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM }, + /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM }, @@ -235,6 +237,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR } if (!strcmpW( id, BCRYPT_AES_ALGORITHM )) alg_id = ALG_ID_AES; + else if (!strcmpW( id, BCRYPT_MD2_ALGORITHM )) alg_id = ALG_ID_MD2; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; @@ -287,6 +290,7 @@ struct hash_impl { union { + MD2_CTX md2; MD5_CTX md5; SHA_CTX sha1; SHA256_CTX sha256; @@ -298,6 +302,10 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) { switch (alg_id) { + case ALG_ID_MD2: + md2_init( &hash->u.md2 ); + break; + case ALG_ID_MD5: MD5Init( &hash->u.md5 ); break; @@ -330,6 +338,10 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, { switch (alg_id) { + case ALG_ID_MD2: + md2_update( &hash->u.md2, input, size ); + break; + case ALG_ID_MD5: MD5Update( &hash->u.md5, input, size ); break; @@ -362,6 +374,10 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, { switch (alg_id) { + case ALG_ID_MD2: + md2_finalize( &hash->u.md2, output ); + break; + case ALG_ID_MD5: MD5Final( &hash->u.md5 ); memcpy( output, hash->u.md5.digest, 16 ); diff --git a/dlls/bcrypt/md2.c b/dlls/bcrypt/md2.c new file mode 100644 index 0000000..3ff25da --- /dev/null +++ b/dlls/bcrypt/md2.c @@ -0,0 +1,144 @@ +/* + * MD2 (RFC 1319) hash function implementation by Tom St Denis + * + * Copyright 2004 Michael Jung + * Based on public domain code by Tom St Denis (tomstdenis(a)iahu.ca) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * This file contains code from the LibTomCrypt cryptographic + * library written by Tom St Denis (tomstdenis(a)iahu.ca). LibTomCrypt + * is in the public domain. The code in this file is tailored to + * special requirements. Take a look at http://libtomcrypt.org for the + * original version. + */ + +#include <assert.h> +#include "bcrypt_internal.h" + +static const unsigned char PI_SUBST[256] = { + 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, + 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, + 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, + 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, + 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, + 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, + 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, + 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, + 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, + 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, + 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, + 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, + 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, + 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, + 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, + 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, + 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, + 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 +}; + +/* adds 16 bytes to the checksum */ +static void md2_update_chksum(MD2_CTX *md2) +{ + int j; + unsigned char L; + L = md2->chksum[15]; + for (j = 0; j < 16; j++) { + +/* caution, the RFC says its "C[j] = S[M[i*16+j] xor L]" but the reference source code [and test vectors] say + otherwise. +*/ + L = (md2->chksum[j] ^= PI_SUBST[(int)(md2->buf[j] ^ L)] & 255); + } +} + +static void md2_compress(MD2_CTX *md2) +{ + int j, k; + unsigned char t; + + /* copy block */ + for (j = 0; j < 16; j++) { + md2->X[16+j] = md2->buf[j]; + md2->X[32+j] = md2->X[j] ^ md2->X[16+j]; + } + + t = 0; + + /* do 18 rounds */ + for (j = 0; j < 18; j++) { + for (k = 0; k < 48; k++) { + t = (md2->X[k] ^= PI_SUBST[(int)(t & 255)]); + } + t = (t + (unsigned char)j) & 255; + } +} + +void md2_init(MD2_CTX *md2) +{ + /* MD2 uses a zero'ed state... */ + memset(md2->X, 0, sizeof(md2->X)); + memset(md2->chksum, 0, sizeof(md2->chksum)); + memset(md2->buf, 0, sizeof(md2->buf)); + md2->curlen = 0; +} + +void md2_update(MD2_CTX *md2, const unsigned char *buf, ULONG len) +{ + unsigned long n; + + assert(md2->curlen <= sizeof(md2->buf)); + + while (len > 0) { + n = min(len, (16 - md2->curlen)); + memcpy(md2->buf + md2->curlen, buf, (size_t)n); + md2->curlen += n; + buf += n; + len -= n; + + /* is 16 bytes full? */ + if (md2->curlen == 16) { + md2_compress(md2); + md2_update_chksum(md2); + md2->curlen = 0; + } + } +} + +void md2_finalize(MD2_CTX * md2, unsigned char *hash) +{ + unsigned long i, k; + + assert(md2->curlen <= sizeof(md2->buf)); + + /* pad the message */ + k = 16 - md2->curlen; + for (i = md2->curlen; i < 16; i++) { + md2->buf[i] = (unsigned char)k; + } + + /* hash and update */ + md2_compress(md2); + md2_update_chksum(md2); + + /* hash checksum */ + memcpy(md2->buf, md2->chksum, 16); + md2_compress(md2); + + /* output is lower 16 bytes of X */ + memcpy(hash, md2->X, 16); +} diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 524bd08..de04190 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -323,6 +323,12 @@ static void test_hashes(void) "2eecf91373941f9315dd730a77937fa92444450fbece86f409d9cb5ec48c6513" }, { + "MD2", + 16, + "1bb33606ba908912a84221109d29cd7e", + "7f05b0638d77f4a27f3a9c4d353cd648" + }, + { "MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", diff --git a/include/bcrypt.h b/include/bcrypt.h index 2555bf0..70928c5 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -64,6 +64,7 @@ typedef LONG NTSTATUS; {'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_MD2_ALGORITHM (const WCHAR []){'M','D','2',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}

1 0

Jacek Caban : bcrypt/tests: Use common helper for testing different hash types.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 1d0d1197169514e17992f94dabeff55e5ddb121d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0d1197169514e17992f94da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:45:43 2017 +0100 bcrypt/tests: Use common helper for testing different hash types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 431 ++++++++------------------------------------- 1 file changed, 69 insertions(+), 362 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d0d1197169514e17992f…

1 0

Akihiro Sagawa : ntdll: Return correct time zone names for Asia/ Tokyo and Asia/Yakutsk.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 35d93e02d1a26586f4688d36895668cdeaa04feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d93e02d1a26586f4688d368… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 3 23:26:05 2017 +0900 ntdll: Return correct time zone names for Asia/Tokyo and Asia/Yakutsk. Without this change, for Japan, Wine returns "Korea Standard Time", not "Tokyo Standard Time" as seen in Bug 42719. Actually, this is a regression by d666143f880f9e19849f8f2b520dc059a11750d1. The new code relies on offsets from UTC and DST change timings. However, Northeast Asia regions don't use daylight saving time. Thus, Wine can't distinguish between these regions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 12dbdc3..e2cd770 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -53,6 +53,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +#define SHORT_TZ_NAME_MAX 8 +struct tz_name_map { + WCHAR key_name[128]; + char short_name[SHORT_TZ_NAME_MAX]; +}; + static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi); static RTL_CRITICAL_SECTION TIME_tz_section; @@ -571,6 +577,42 @@ static BOOL match_tz_info(const RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const RT return FALSE; } +static int compare_tz_key(const void *a, const void *b) +{ + const struct tz_name_map *map_a, *map_b; + map_a = (const struct tz_name_map *)a; + map_b = (const struct tz_name_map *)b; + return strcmpW(map_a->key_name, map_b->key_name); +} + +static BOOL match_tz_name(const char* tz_name, + const RTL_DYNAMIC_TIME_ZONE_INFORMATION *reg_tzi) +{ + static const struct tz_name_map mapping[] = { + { {'K','o','r','e','a',' ','S','t','a','n','d','a','r','d',' ','T','i', + 'm','e',0 }, + "KST" }, + { {'T','o','k','y','o',' ','S','t','a','n','d','a','r','d',' ','T','i', + 'm','e',0 }, + "JST" }, + { {'Y','a','k','u','t','s','k',' ','S','t','a','n','d','a','r','d',' ', + 'T','i','m','e',0 }, + "+09" }, /* YAKST was used until tzdata 2016f */ + }; + struct tz_name_map *match, key; + + if (reg_tzi->DaylightDate.wMonth) + return TRUE; + + strcpyW(key.key_name, reg_tzi->TimeZoneKeyName); + match = bsearch(&key, mapping, sizeof(mapping)/sizeof(mapping[0]), + sizeof(mapping[0]), compare_tz_key); + if (!match) + return TRUE; + + return !strcmp(match->short_name, tz_name); +} + static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWORD count) { UNICODE_STRING nameW; @@ -592,7 +634,7 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO return TRUE; } -static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) +static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* tz_name, int year) { static const WCHAR Time_ZonesW[] = { 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', @@ -714,7 +756,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) NtClose(hSubkey); - if (match_tz_info(tzi, &reg_tzi)) + if (match_tz_info(tzi, &reg_tzi) + && match_tz_name(tz_name, &reg_tzi)) { *tzi = reg_tzi; NtClose(hkey); @@ -729,8 +772,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) NtClose(hkey); FIXME("Can't find matching timezone information in the registry for " - "bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n", - tzi->Bias, + "%s, bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n", + tz_name, tzi->Bias, tzi->StandardDate.wDay, tzi->StandardDate.wMonth, tzi->StandardDate.wYear, tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, tzi->DaylightDate.wYear); } @@ -763,6 +806,7 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) static RTL_DYNAMIC_TIME_ZONE_INFORMATION cached_tzi; static int current_year = -1, current_bias = 65535; struct tm *tm; + char tz_name[SHORT_TZ_NAME_MAX]; time_t year_start, year_end, tmp, dlt = 0, std = 0; int is_dst, current_is_dst, bias; @@ -782,6 +826,10 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) } memset(tzi, 0, sizeof(*tzi)); + if (!strftime(tz_name, sizeof(tz_name), "%Z", tm)) { + /* not enough room or another error */ + tz_name[0] = '\0'; + } TRACE("tz data will be valid through year %d, bias %d\n", tm->tm_year + 1900, bias); current_year = tm->tm_year; @@ -864,7 +912,7 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) tzi->StandardBias); } - find_reg_tz_info(tzi, current_year + 1900); + find_reg_tz_info(tzi, tz_name, current_year + 1900); cached_tzi = *tzi; RtlLeaveCriticalSection( &TIME_tz_section );

1 0

Piotr Caban : msvcp: Disable relay for _Thrd_current function.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 87c3421ddbcfb97f7afb58bc1db7ead077fc0470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c3421ddbcfb97f7afb58bc1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 6 20:42:16 2017 +0100 msvcp: Disable relay for _Thrd_current function. Spotted by Stefan. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 001b9ad..9e3e070 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3857,7 +3857,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) -@ cdecl _Thrd_current() +@ cdecl -norelay _Thrd_current() @ cdecl _Thrd_detach(int64) @ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 729657c..e66e722 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) -@ cdecl _Thrd_current() +@ cdecl -norelay _Thrd_current() @ cdecl _Thrd_detach(int64) @ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 62668d2..7be1814 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create -@ cdecl _Thrd_current() msvcp120._Thrd_current +@ cdecl -norelay _Thrd_current() msvcp120._Thrd_current @ cdecl _Thrd_detach(int64) msvcp120._Thrd_detach @ cdecl _Thrd_equal(int64 int64) msvcp120._Thrd_equal @ stub _Thrd_exit diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5d55181..4fc8e3c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3721,7 +3721,7 @@ @ stub _Temp_get @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create -@ cdecl _Thrd_current() _Thrd_current +@ cdecl -norelay _Thrd_current() @ cdecl _Thrd_detach(int64) _Thrd_detach @ cdecl _Thrd_equal(int64 int64) _Thrd_equal @ stub _Thrd_exit

1 0

Henri Verbeet : wined3d: Raise the default max_gl_version for specific cases.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 62651d65f4f8e4dc6e1f4fb5d589526613d419aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=62651d65f4f8e4dc6e1f4fb5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 7 19:26:27 2017 +0330 wined3d: Raise the default max_gl_version for specific cases. Effectively, this will enable Direct3D 11 by default on AMD and Intel hardware. Yes, this patch is awful. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 22 ++++++++++++++++++++-- dlls/wined3d/wined3d_main.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cc8a78c..c145944 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6527,6 +6527,22 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } +static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD flags) +{ + const char *gl_vendor, *gl_renderer; + + if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER)) + return wined3d_settings.max_gl_version; + + gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); + gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); + if (!gl_vendor || !gl_renderer + || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) + return wined3d_settings.max_gl_version; + + return MAKEDWORD_VERSION(4, 4); +} + static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -6539,6 +6555,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; unsigned int i; DISPLAY_DEVICEW display_device; + DWORD max_gl_version; TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); @@ -6583,15 +6600,16 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return FALSE; } + max_gl_version = get_max_gl_version(gl_info, wined3d_creation_flags); for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) { - if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) + if (supported_gl_versions[i] <= max_gl_version) break; } if (i == ARRAY_SIZE(supported_gl_versions)) { ERR_(winediag)("Requested invalid GL version %u.%u.\n", - wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); + max_gl_version >> 16, max_gl_version & 0xffff); i = ARRAY_SIZE(supported_gl_versions) - 1; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 54ddc23..28a34a7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -73,6 +73,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, struct wined3d_settings wined3d_settings = { FALSE, /* No multithreaded CS by default. */ + FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ @@ -215,12 +216,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) { - if (tmpvalue != wined3d_settings.max_gl_version) - { - ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", - tmpvalue >> 16, tmpvalue & 0xffff); - wined3d_settings.max_gl_version = tmpvalue; - } + ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", + tmpvalue >> 16, tmpvalue & 0xffff); + wined3d_settings.explicit_gl_version = TRUE; + wined3d_settings.max_gl_version = tmpvalue; } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c6a347..ab24f12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -382,6 +382,7 @@ static inline void wined3d_pause(void) struct wined3d_settings { unsigned int cs_multithreaded; + BOOL explicit_gl_version; DWORD max_gl_version; BOOL glslRequested; int offscreen_rendering_mode;

1 0

Józef Kucia : wined3d: Do not call wined3d_from_cs() in shader_resource_view_generate_mipmaps().
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 0879b1730e584337fdedc38b3fb1b191e5af9c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0879b1730e584337fdedc38b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:39:56 2017 +0100 wined3d: Do not call wined3d_from_cs() in shader_resource_view_generate_mipmaps(). The context_acquire() function does that. 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/view.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4463fab..a8651ab 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -833,8 +833,6 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * TRACE("view %p.\n", view); - wined3d_from_cs(view->resource->device->cs); - context = context_acquire(view->resource->device, NULL, 0); gl_info = context->gl_info; layer_count = view->desc.u.texture.layer_count;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2017