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

Jan Beich : ntdll: Prefer a portable function to get thread id.
by Alexandre Julliard 17 Aug '12

17 Aug '12

Module: wine Branch: master Commit: fa4e97f4547d7478f42cf5702cca1da85fd76b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4e97f4547d7478f42cf5702… Author: Jan Beich <jbeich(a)tormail.org> Date: Thu Aug 16 19:04:51 2012 +0000 ntdll: Prefer a portable function to get thread id. --- configure | 1 + configure.ac | 1 + dlls/ntdll/server.c | 7 ++++++- include/config.h.in | 3 +++ 4 files changed, 11 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 86c9698..12c99e8 100755 --- a/configure +++ b/configure @@ -10611,6 +10611,7 @@ LIBS="$LIBS $LIBPTHREAD" for ac_func in \ pthread_attr_get_np \ pthread_getattr_np \ + pthread_getthreadid_np \ pthread_get_stackaddr_np \ pthread_get_stacksize_np do : diff --git a/configure.ac b/configure.ac index c80fd8a..c9e81fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1471,6 +1471,7 @@ dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ pthread_attr_get_np \ pthread_getattr_np \ + pthread_getthreadid_np \ pthread_get_stackaddr_np \ pthread_get_stacksize_np, [$LIBPTHREAD]) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 392668d..cc49bad 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -28,6 +28,9 @@ #endif #include <errno.h> #include <fcntl.h> +#ifdef HAVE_PTHREAD_NP_H +# include <pthread_np.h> +#endif #include <signal.h> #include <stdarg.h> #include <stdio.h> @@ -944,7 +947,9 @@ static void send_server_task_port(void) static int get_unix_tid(void) { int ret = -1; -#ifdef linux +#ifdef HAVE_PTHREAD_GETTHREADID_NP + ret = pthread_getthreadid_np(); +#elif defined(linux) ret = syscall( SYS_gettid ); #elif defined(__sun) ret = pthread_self(); diff --git a/include/config.h.in b/include/config.h.in index 844600c..e9416a4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -632,6 +632,9 @@ /* Define to 1 if you have the `pthread_getattr_np' function. */ #undef HAVE_PTHREAD_GETATTR_NP +/* Define to 1 if you have the `pthread_getthreadid_np' function. */ +#undef HAVE_PTHREAD_GETTHREADID_NP + /* Define to 1 if you have the `pthread_get_stackaddr_np' function. */ #undef HAVE_PTHREAD_GET_STACKADDR_NP

1 0

Jan Beich : ntdll: Fetch thread id on NetBSD.
by Alexandre Julliard 17 Aug '12

17 Aug '12

Module: wine Branch: master Commit: 83bac4113cdd29a204c62b90233d88dc12b02a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bac4113cdd29a204c62b902… Author: Jan Beich <jbeich(a)tormail.org> Date: Thu Aug 16 19:14:30 2012 +0000 ntdll: Fetch thread id on NetBSD. --- configure | 1 + configure.ac | 1 + dlls/ntdll/server.c | 5 +++++ include/config.h.in | 3 +++ 4 files changed, 10 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 12c99e8..a495f79 100755 --- a/configure +++ b/configure @@ -5857,6 +5857,7 @@ for ac_header in \ linux/serial.h \ linux/types.h \ linux/ucdrom.h \ + lwp.h \ mach-o/nlist.h \ mach-o/loader.h \ mach/mach.h \ diff --git a/configure.ac b/configure.ac index c9e81fe..15ada86 100644 --- a/configure.ac +++ b/configure.ac @@ -452,6 +452,7 @@ AC_CHECK_HEADERS(\ linux/serial.h \ linux/types.h \ linux/ucdrom.h \ + lwp.h \ mach-o/nlist.h \ mach-o/loader.h \ mach/mach.h \ diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index cc49bad..218c6eb 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -28,6 +28,9 @@ #endif #include <errno.h> #include <fcntl.h> +#ifdef HAVE_LWP_H +#include <lwp.h> +#endif #ifdef HAVE_PTHREAD_NP_H # include <pthread_np.h> #endif @@ -956,6 +959,8 @@ static int get_unix_tid(void) #elif defined(__APPLE__) ret = mach_thread_self(); mach_port_deallocate(mach_task_self(), ret); +#elif defined(__NetBSD__) + ret = _lwp_self(); #elif defined(__FreeBSD__) long lwpid; thr_self( &lwpid ); diff --git a/include/config.h.in b/include/config.h.in index e9416a4..a00fc1c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -440,6 +440,9 @@ /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT +/* Define to 1 if you have the <lwp.h> header file. */ +#undef HAVE_LWP_H + /* Define to 1 if you have the <machine/cpu.h> header file. */ #undef HAVE_MACHINE_CPU_H

1 0

Marek Chmiel : dssenh/tests: Added encryption tests for the DSSENH cryptographic service provider.
by Alexandre Julliard 17 Aug '12

17 Aug '12

Module: wine Branch: master Commit: b1a5291e314a7dbe3eca6f65baf5a967bea7fa00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a5291e314a7dbe3eca6f65b… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Mon Aug 13 18:46:55 2012 -0500 dssenh/tests: Added encryption tests for the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 162 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 3a5bdef..b5faef8 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -479,9 +479,171 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result, "Expected release of the DSS Enhanced provider.\n"); } +struct encrypt_test { + ALG_ID algid; + DWORD keyLength; + const char *plain; + DWORD plainLen; + const BYTE *decrypted; + const BYTE *encrypted; +}; + +static const char dataToEncrypt1[] = "Great performance with Wine."; +static const char dataToEncrypt2[] = "Wine implements Windows API"; +static const char dataToEncrypt3[] = ""; + +static const BYTE encrypted3DES_1[] = { +0x6c,0x60,0x19,0x41,0x27,0xc1,0x16,0x69, 0x6f,0x96,0x0c,0x2e,0xa4,0x5f,0xf5,0x6a, +0xed,0x4b,0xec,0xd4,0x92,0x0c,0xe2,0x34, 0xe1,0x4a,0xb5,0xe2,0x05,0x43,0xfe,0x17 +}; +static const BYTE encrypted3DES_2[] = { +0x17,0xeb,0x80,0xde,0xac,0x4d,0x9e,0xd0, 0xa9,0xae,0x74,0xb5,0x86,0x1a,0xea,0xb4, +0x96,0x27,0x5d,0x75,0x4f,0xdd,0x87,0x60, 0xfc,0xaf,0xa1,0x82,0x83,0x09,0xf1,0xca +}; +static const BYTE encrypted3DES_3[] = {0xaf, 0x36, 0xc0, 0x3d, 0x78, 0x64, 0xc4, 0x4a}; + +static const BYTE encrypted3DES112_1[] = { +0xb3,0xf8,0x4b,0x08,0xd6,0x23,0xcb,0xca, 0x43,0x26,0xd9,0x9f,0x6b,0x99,0x09,0xe9, +0x8c,0x4c,0x7d,0xef,0x49,0xda,0x0b,0x44, 0xcc,0x8d,0x06,0x6b,0xed,0xb7,0xf1,0x67 +}; +static const BYTE encrypted3DES112_2[] = { +0xdc,0xcf,0x93,0x11,0x7a,0xe4,0xcd,0x3f, 0x11,0xd8,0xe0,0x1e,0xe0,0x8d,0x9c,0xba, +0x97,0x5d,0x74,0x4d,0x83,0x03,0x5c,0xf2, 0x01,0xaf,0xed,0x7a,0x87,0x8f,0x88,0x8b +}; +static const BYTE encrypted3DES112_3[] = {0x04, 0xb3, 0x9c, 0x59, 0x48, 0xc7, 0x2f, 0xd1}; + +static const BYTE encryptedDES_1[] = { +0x3d,0xdc,0x54,0xaf,0x66,0x72,0x4e,0xef, 0x9d,0x35,0x02,0xc2,0x1a,0xf4,0x1f,0x01, +0xb1,0xaf,0x13,0xd9,0xbe,0x7b,0xd4,0xf3, 0xf5,0x9d,0x2a,0xd8,0x32,0x90,0xe9,0x0b +}; +static const BYTE encryptedDES_2[] = { +0xa8,0x05,0xd7,0xe9,0x61,0xf4,0x6c,0xce, 0x95,0x2b,0x52,0x08,0x25,0x03,0x30,0xac, +0xd7,0xe7,0xd3,0x07,0xb2,0x68,0x63,0x7b, 0xe3,0xab,0x26,0x1e,0x5c,0xec,0x42,0x4f +}; +static const BYTE encryptedDES_3[] = {0x35, 0x02, 0xbb, 0x7c, 0x43, 0x5b, 0xf5, 0x59}; + +static const BYTE encryptedRC2_1[] = { +0x9e,0xcb,0xa2,0x27,0xc2,0xec,0x10,0xe0, 0x94,0xb3,0xc3,0x9d,0x7d,0xe2,0x12,0xe4, +0xb0,0xde,0xd9,0x46,0xca,0x1f,0xa6,0xfa, 0xa4,0x79,0x08,0x59,0xa6,0x00,0x62,0x16 +}; +static const BYTE encryptedRC2_2[] = { +0x29,0x06,0xfd,0xa1,0xe0,0x88,0x89,0xb0, 0x4d,0x7f,0x96,0x9d,0x2c,0x44,0xa1,0xd2, +0xbe,0xc6,0xaf,0x10,0xb8,0x86,0x68,0x1b, 0x1d,0x9f,0x3c,0xc4,0x12,0x02,0xbc,0x73 +}; +static const BYTE encryptedRC2_3[] = {0x26,0x40,0x73,0xfe,0x13,0xbb,0x32,0xa8}; + +static const BYTE encryptedRC4_1[] = { +0x5a,0x48,0xeb,0x16,0x96,0x23,0x16,0xb7, 0xbb,0x36,0xe8,0x43,0x88,0x74,0xb1,0x9d, +0x96,0xf0,0x84,0x0f,0x5a,0x56,0xf9,0x62, 0xae,0xb5,0x4a,0xce,0x52 +}; +static const BYTE encryptedRC4_2[] = { +0x4a,0x53,0xe0,0x12,0xc2,0x6a,0x0b,0xa2, 0xa5,0x35,0xea,0x54,0x8b,0x61,0xac,0xde, +0xa4,0xb9,0x9d,0x02,0x41,0x49,0xaa,0x15, 0x86,0x8b,0x66,0xe0 +}; +static const BYTE encryptedRC4_3[] = {0x1d}; + +static const struct encrypt_test encrypt_data[] = { + {CALG_3DES, 168 << 16, dataToEncrypt1, sizeof(dataToEncrypt1), (BYTE *)dataToEncrypt1, + encrypted3DES_1}, + {CALG_3DES, 168 << 16, dataToEncrypt2, sizeof(dataToEncrypt2), (BYTE *)dataToEncrypt2, + encrypted3DES_2}, + {CALG_3DES, 168 << 16, dataToEncrypt3, sizeof(dataToEncrypt3), (BYTE *)dataToEncrypt3, + encrypted3DES_3}, + {CALG_3DES_112, 112 << 16, dataToEncrypt1, sizeof(dataToEncrypt1), (BYTE *)dataToEncrypt1, + encrypted3DES112_1}, + {CALG_3DES_112, 112 << 16, dataToEncrypt2, sizeof(dataToEncrypt2), (BYTE *)dataToEncrypt2, + encrypted3DES112_2}, + {CALG_3DES_112, 112 << 16, dataToEncrypt3, sizeof(dataToEncrypt3), (BYTE *)dataToEncrypt3, + encrypted3DES112_3}, + {CALG_DES, 56 << 16, dataToEncrypt1, sizeof(dataToEncrypt1), (BYTE *)dataToEncrypt1, + encryptedDES_1}, + {CALG_DES, 56 << 16, dataToEncrypt2, sizeof(dataToEncrypt2), (BYTE *)dataToEncrypt2, + encryptedDES_2}, + {CALG_DES, 56 << 16, dataToEncrypt3, sizeof(dataToEncrypt3), (BYTE *)dataToEncrypt3, + encryptedDES_3}, + /* CALG_RC2 key unexpected results under Win2K when default key length is used, here we use + minimum length because Win2K's DSSENH provider has a differnt default key length compared + to the younger operating systems, though there is no default key len issue with CALG_RC4 */ + {CALG_RC2, 40 << 16, dataToEncrypt1, sizeof(dataToEncrypt1), (BYTE *)dataToEncrypt1, + encryptedRC2_1}, + {CALG_RC2, 40 << 16, dataToEncrypt2, sizeof(dataToEncrypt2), (BYTE *)dataToEncrypt2, + encryptedRC2_2}, + {CALG_RC2, 40 << 16, dataToEncrypt3, sizeof(dataToEncrypt3), (BYTE *)dataToEncrypt3, + encryptedRC2_3}, + {CALG_RC4, 40 << 16, dataToEncrypt1, sizeof(dataToEncrypt1), (BYTE *)dataToEncrypt1, + encryptedRC4_1}, + {CALG_RC4, 40 << 16, dataToEncrypt2, sizeof(dataToEncrypt2), (BYTE *)dataToEncrypt2, + encryptedRC4_2}, + {CALG_RC4, 40 << 16, dataToEncrypt3, sizeof(dataToEncrypt3), (BYTE *)dataToEncrypt3, + encryptedRC4_3} +}; + +static void test_data_encryption(const struct encrypt_test *tests, int testLen) +{ /* Here we test the same encryption ciphers as the RSAENH cryptographic service provider */ + HCRYPTPROV hProv = 0; + HCRYPTKEY pKey = 0; + HCRYPTHASH hHash; + const char dataToHash[] = "I love working with Wine"; + unsigned char pbData[36]; + DWORD dataLen; + BOOL result; + int i; + + /* acquire dss enhanced provider */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + { + skip("DSSENH is currently not available, skipping encryption tests.\n"); + return; + } + ok(result, "Expected no errors.\n"); + + /* testing various encryption algorithms */ + for(i = 0; i < testLen; i++) + { + memcpy(pbData, tests[i].plain, tests[i].plainLen); + dataLen = tests[i].plainLen; + + SetLastError(0xdeadbeef); + result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive key */ + result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); + ok(result, "Expected a derived key.\n"); + + result = CryptDestroyHash(hHash); + ok(result, "Expected destruction of hash after deriving key.\n"); + + /* testing CryptEncrypt with ALGID from array */ + result = CryptEncrypt(pKey, 0, TRUE, 0, pbData, &dataLen, 36); + ok(result, "Expected data encryption.\n"); + + /* Verify we have received expected encrypted data */ + ok(!memcmp(pbData, tests[i].encrypted, dataLen), "Incorrect encrypted data.\n"); + + result = CryptDecrypt(pKey, 0, TRUE, 0, pbData, &dataLen); + ok(result, "Expected data decryption.\n"); + + /* Verify we have received expected decrypted data */ + ok(!memcmp(pbData, tests[i].decrypted, dataLen), "Incorrect decrypted data.\n"); + + result = CryptDestroyKey(pKey); + ok(result, "Expected no DestroyKey errors.\n"); + } + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider\n"); +} + START_TEST(dssenh) { test_acquire_context(); test_keylength(); test_hash(hash_data, TESTLEN(hash_data)); + test_data_encryption(encrypt_data, TESTLEN(encrypt_data)); }

1 0

Marek Chmiel : dssenh/tests: Added block cipher mode tests for the DSSENH cryptographic service provider .
by Alexandre Julliard 17 Aug '12

17 Aug '12

Module: wine Branch: master Commit: cb082b90798e0c855ce6083669781a26110ee1b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb082b90798e0c855ce608366… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Thu Aug 16 14:28:08 2012 -0500 dssenh/tests: Added block cipher mode tests for the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b5faef8..c3bea3b 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -640,10 +640,114 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) ok(result, "Expected release of the provider\n"); } +struct ciphermode_test { + DWORD cipherMode; + BOOL expectedResult; + DWORD expectedError; + const BYTE *encrypted; +}; + +static const BYTE encryptedCFB[] = { +0x51,0x15,0x77,0xab,0x62,0x1f,0x7d,0xcb, 0x35,0x1e,0xd8,0xd3,0x2a,0x00,0xf0,0x94, +0x7c,0xa5,0x28,0xda,0xb8,0x81,0x15,0x99, 0xd1,0xd5,0x06,0x18,0xb8,0x85,0xfc,0xc9 +}; +static const BYTE encryptedCBC[] = { +0x8f,0x7b,0x56,0xeb,0xad,0x4d,0x76,0xc2, 0xd5,0x1d,0xf0,0x60,0x9d,0xde,0x96,0xe8, +0xb7,0x7b,0xeb,0x4b,0xee,0x3f,0xae,0x05, 0xdd,0x3b,0x62,0x47,0x7f,0x6f,0x79,0x6c +}; +static const BYTE encryptedECB[] = { +0x8f,0x7b,0x56,0xeb,0xad,0x4d,0x76,0xc2, 0x8b,0xe0,0x4e,0xe4,0x98,0x4f,0xb8,0x3b, +0xf3,0xeb,0x6f,0x0a,0x57,0x91,0xdd,0xc7, 0x64,0x8b,0xb9,0x50,0xe6,0x5e,0x76,0x72 +}; + +static const struct ciphermode_test ciphermode_data[] = { + {CRYPT_MODE_CFB, TRUE, 0xdeadbeef, encryptedCFB}, /* Testing cipher block chaining */ + {CRYPT_MODE_CBC, TRUE, 0xdeadbeef, encryptedCBC}, /* Testing cipher feedback */ + {CRYPT_MODE_ECB, TRUE, 0xdeadbeef, encryptedECB}, /* Testing electronic codebook */ + {CRYPT_MODE_OFB, FALSE, NTE_BAD_DATA}/* DSSENH does not support Output Feedback cipher mode */ +}; + +static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) +{ + HCRYPTPROV hProv = 0; + HCRYPTKEY pKey = 0; + HCRYPTHASH hHash; + const char plainText[] = "Testing block cipher modes."; + const char dataToHash[] = "GSOC is awesome!"; + unsigned char pbData[36]; + int plainLen = sizeof(plainText), i; + DWORD mode, dataLen; + BOOL result; + + /* acquire dss enhanced provider */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + { + skip("DSSENH is currently not available, skipping block cipher mode tests.\n"); + return; + } + ok(result, "Expected no errors.\n"); + + SetLastError(0xdeadbeef); + result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive a CALG_RC2 key, but could be any other encryption cipher */ + result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); + ok(result, "Expected a derived key.\n"); + + result = CryptDestroyHash(hHash); + ok(result, "Expected destruction of hash after deriving key.\n"); + + /* test block cipher modes */ + for(i = 0; i < testLen; i++) + { + SetLastError(0xdeadbeef); + dataLen = plainLen; + mode = tests[i].cipherMode; + memcpy(pbData, plainText, plainLen); + + result = CryptSetKeyParam(pKey, KP_MODE, (BYTE*)&mode, 0); + if(tests[i].expectedResult) + { + ok(result, "Expected setting of KP_MODE, got %x.\n", GetLastError()); + + result = CryptEncrypt(pKey, 0, TRUE, 0, pbData, &dataLen, 36); + ok(result, "Expected data encryption, got %x.\n", GetLastError()); + + /* Verify we have the correct encrypted data */ + ok(!memcmp(pbData, tests[i].encrypted, dataLen), "Incorrect encrypted data.\n"); + + result = CryptDecrypt(pKey, 0, TRUE, 0, pbData, &dataLen); + ok(result, "Expected data decryption, got %x.\n", GetLastError()); + + /* Verify we have the correct decrypted data */ + ok(!memcmp(pbData, (BYTE *)plainText, dataLen), "Incorrect decrypted data.\n"); + } + else + { /* Expected error */ + ok(!result && GetLastError() == tests[i].expectedError, "Expected %d, got %x.\n", + tests[i].expectedError, GetLastError()); + } + } + result = CryptDestroyKey(pKey); + ok(result, "Expected no DestroyKey errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); +} + + START_TEST(dssenh) { test_acquire_context(); test_keylength(); test_hash(hash_data, TESTLEN(hash_data)); test_data_encryption(encrypt_data, TESTLEN(encrypt_data)); + test_cipher_modes(ciphermode_data, TESTLEN(ciphermode_data)); }

1 0

Qian Hong : riched20: Added support for UTF8 BOM stream.
by Alexandre Julliard 17 Aug '12

17 Aug '12

Module: wine Branch: master Commit: cb8c500ee67a64c4e5f08434d5ae0634bf82e375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8c500ee67a64c4e5f08434d… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Aug 17 03:05:56 2012 +0800 riched20: Added support for UTF8 BOM stream. --- dlls/riched20/editor.c | 22 +++++++++++++++++++--- dlls/riched20/tests/editor.c | 4 ++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6e0fb3c..18cd159 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -283,9 +283,10 @@ static ME_TextBuffer *ME_MakeText(void) { static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { - WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; WCHAR *pText; LRESULT total_bytes_read = 0; + BOOL is_read = FALSE; + static const char bom_utf8[] = {0xEF, 0xBB, 0xBF}; TRACE("%08x %p\n", dwFormat, stream); @@ -304,8 +305,23 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea if (!(dwFormat & SF_UNICODE)) { - /* FIXME? this is doomed to fail on true MBCS like UTF-8, luckily they're unlikely to be used as CP_ACP */ - nWideChars = MultiByteToWideChar(CP_ACP, 0, stream->buffer, stream->dwSize, wszText, STREAMIN_BUFFER_SIZE); + WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; + char * buf = stream->buffer; + DWORD size = stream->dwSize; + DWORD cp = CP_ACP; + + if (!is_read) + { + is_read = TRUE; + if (stream->dwSize >= 3 && !memcmp(stream->buffer, bom_utf8, 3)) + { + cp = CP_UTF8; + buf += 3; + size -= 3; + } + } + + nWideChars = MultiByteToWideChar(cp, 0, buf, size, wszText, STREAMIN_BUFFER_SIZE); pText = wszText; } else diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 27f4fee..fa80def 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5120,10 +5120,10 @@ static void test_EM_STREAMIN(void) ok(result == 18, "got %ld, expected %d\n", result, 18); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine ok(result == 15, + ok(result == 15, "EM_STREAMIN: Test UTF8WithBOM returned %ld, expected 15\n", result); result = strcmp (buffer,"TestUTF8WithBOM"); - todo_wine ok(result == 0, + ok(result == 0, "EM_STREAMIN: Test UTF8WithBOM set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8WithBOM set error %d, expected %d\n", es.dwError, 0);

1 0

Dan Kegel : msvcrt: memmove_s shouldn't zero its output buffer on error.
by Alexandre Julliard 17 Aug '12

17 Aug '12

Module: wine Branch: master Commit: 49560458426cf25b6a36bbf9bad35aa75c9f7aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49560458426cf25b6a36bbf9b… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jul 28 09:43:43 2012 -0700 msvcrt: memmove_s shouldn't zero its output buffer on error. --- dlls/msvcrt/heap.c | 33 +++++++--- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/misc.c | 54 ---------------- dlls/msvcrt/tests/string.c | 148 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49560458426cf25b6a36b…

1 0

Sergey Guralnik : comctl32/tests: Add test for MCN_SELECT/ MCN_SELCHANGE notifications.
by Alexandre Julliard 17 Aug '12

17 Aug '12

Module: wine Branch: master Commit: c7abff0a2736c6c11260ed77a48fd7269fdcea30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7abff0a2736c6c11260ed77a… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Fri Aug 17 10:17:02 2012 +0400 comctl32/tests: Add test for MCN_SELECT/MCN_SELCHANGE notifications. --- dlls/comctl32/tests/monthcal.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 1fe2e61..7bba895 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -41,6 +41,8 @@ #define PARENT_SEQ_INDEX 0 #define MONTHCAL_SEQ_INDEX 1 +#define SEL_NOTIFY_TEST_ID 100 + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND parent_wnd; @@ -485,6 +487,40 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP return TRUE; } + case MCN_SELECT: + case MCN_SELCHANGE: + { + NMSELCHANGE *nmchg = (NMSELCHANGE*)lParam; + SYSTEMTIME st[2]; + BOOL is_multisel = GetWindowLongPtr(nmchg->nmhdr.hwndFrom, GWL_STYLE) & + MCS_MULTISELECT; + + if(GetWindowLongPtr(nmchg->nmhdr.hwndFrom, GWLP_ID) != SEL_NOTIFY_TEST_ID) + break; + SendMessage(nmchg->nmhdr.hwndFrom, is_multisel ? MCM_GETSELRANGE : + MCM_GETCURSEL, 0, (LPARAM)st); + + expect(st[0].wYear, nmchg->stSelStart.wYear); + expect(st[0].wMonth, nmchg->stSelStart.wMonth); + todo_wine expect(0, nmchg->stSelStart.wDayOfWeek); + expect(st[0].wDay, nmchg->stSelStart.wDay); + + if(is_multisel) + { + expect(st[1].wYear, nmchg->stSelEnd.wYear); + expect(st[1].wMonth, nmchg->stSelEnd.wMonth); + todo_wine expect(0, nmchg->stSelEnd.wDayOfWeek); + expect(st[1].wDay, nmchg->stSelEnd.wDay); + } + else + todo_wine + ok(!(nmchg->stSelEnd.wYear | nmchg->stSelEnd.wMonth | + nmchg->stSelEnd.wDayOfWeek | nmchg->stSelEnd.wDay | + nmchg->stSelEnd.wHour | nmchg->stSelEnd.wMinute | + nmchg->stSelEnd.wSecond | nmchg->stSelEnd.wMilliseconds), + "Non-zero member in stSelEnd\n"); + return TRUE; + } default: break; } @@ -1919,6 +1955,51 @@ static void test_daystate(void) DestroyWindow(hwnd); } +static void test_sel_notify(void) +{ + typedef struct + { + DWORD val; + const char* name; + } Monthcal_style; + + HWND hwnd; + RECT rc; + MCHITTESTINFO mchit = {sizeof(MCHITTESTINFO)}; + SYSTEMTIME st; + Monthcal_style styles[] = { + {MCS_NOTODAY, "MCS_NOTODAY"}, + {MCS_NOTODAY | MCS_MULTISELECT, "MCS_NOTODAY | MCS_MULTISELECT"}, + {MCS_DAYSTATE, "MCS_DAYSTATE"}, + {MCS_DAYSTATE | MCS_MULTISELECT, "MCS_DAYSTATE | MCS_MULTISELECT"} + }; + int i; + + for(i = 0; i < sizeof styles / sizeof styles[0]; i++) + { + trace("%s\n", styles[i].name); + hwnd = create_monthcal_control(styles[i].val); + SetWindowLongPtr(hwnd, GWLP_ID, SEL_NOTIFY_TEST_ID); + assert(hwnd); + SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&rc); + MoveWindow(hwnd, 0, 0, rc.right, rc.bottom, FALSE); + /* Simulate mouse click on some unselected day to generate + MCN_SELECT and MCN_SELCHANGE notifications */ + mchit.pt.x = rc.right / 2; + mchit.pt.y = rc.bottom / 2; + SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st); + while(st.wDay == mchit.st.wDay) /* Ensure that mchit.pt points to unselected day */ + { + mchit.pt.y++; + SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + } + SendMessage(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + SendMessage(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + DestroyWindow(hwnd); + } +} + START_TEST(monthcal) { BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -1962,6 +2043,7 @@ START_TEST(monthcal) test_selrange(); test_killfocus(); test_daystate(); + test_sel_notify(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Józef Kucia : d3dx9/tests: Add tests for setting matrix shader constants.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 6fff4b9e872a486a9e4ba44782e31eb1ae16788f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fff4b9e872a486a9e4ba4478… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:19 2012 +0200 d3dx9/tests: Add tests for setting matrix shader constants. --- dlls/d3dx9_36/tests/shader.c | 174 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fff4b9e872a486a9e4ba…

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetValue.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: c2c9959bb820fdf9c27dfb50773dd81a62084455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c9959bb820fdf9c27dfb507… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:20 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetValue. --- dlls/d3dx9_36/shader.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 800622c..4dee641 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -905,6 +905,135 @@ static HRESULT set_scalar_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3D_OK; } +static HRESULT set_vector_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, + UINT count, D3DXPARAMETER_TYPE type) +{ + struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT i, j, desc_count = 1; + float vec[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < min(count, desc.RegisterCount); i++) + { + switch (type) + { + case D3DXPT_FLOAT: + memcpy(vec, ((float *)data) + i * desc.Columns, desc.Columns * sizeof(float)); + break; + case D3DXPT_INT: + for (j = 0; j < desc.Columns; j++) + vec[j] = (float)((int *)data)[i * desc.Columns + j]; + break; + case D3DXPT_BOOL: + for (j = 0; j < desc.Columns; j++) + vec[j] = ((BOOL *)data)[i * desc.Columns + j] ? 1.0f : 0.0f; + break; + default: + FIXME("Unhandled type %#x\n", type); + return D3DERR_INVALIDCALL; + } + + set_float_shader_constant(This, device, desc.RegisterIndex + i, vec, 1); + } + break; + default: + FIXME("Unhandled register set %#x\n", desc.RegisterSet); + return E_NOTIMPL; + } + + return D3D_OK; +} + +static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, + UINT count, D3DXPARAMETER_TYPE type, UINT rows, UINT columns) +{ + struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT registers_per_matrix; + UINT i, j, k, desc_count = 1; + UINT row_offset, column_offset; + FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + return D3DERR_INVALIDCALL; + } + + if (desc.Class == D3DXPC_MATRIX_COLUMNS) + { + column_offset = 4; + row_offset = 1; + registers_per_matrix = desc.Columns; + } + else if (desc.Class == D3DXPC_MATRIX_ROWS) + { + column_offset = 1; + row_offset = 4; + registers_per_matrix = desc.Rows; + } + else + { + FIXME("Unhandled variable class %#x\n", desc.Class); + return D3D_OK; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < count; i++) + { + if (registers_per_matrix * (i + 1) > desc.RegisterCount) + break; + + switch (type) + { + case D3DXPT_FLOAT: + for (j = 0; j < min(desc.Rows, rows); j++) + { + for (k = 0; k < min(desc.Columns, columns); k++) + matrix[j * row_offset + k * column_offset] = ((float *)data)[i * rows * columns + j * columns + k]; + } + break; + case D3DXPT_INT: + for (j = 0; j < min(desc.Rows, rows); j++) + { + for (k = 0; k < min(desc.Columns, columns); k++) + matrix[j * row_offset + k * column_offset] = (float)((int *)data)[i * rows * columns + j * columns + k]; + } + break; + default: + FIXME("Unhandled type %#x", type); + return D3DERR_INVALIDCALL; + } + + set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + } + break; + default: + FIXME("Unhandled register set %#x\n", desc.RegisterSet); + return E_NOTIMPL; + } + + return D3D_OK; +} + static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -932,10 +1061,35 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCVOID data, UINT bytes) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + HRESULT hr; + UINT elements; + UINT count = 1; + D3DXCONSTANT_DESC desc; - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, data, bytes); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, data, bytes); - return E_NOTIMPL; + if (!device || !constant || !data) + return D3DERR_INVALIDCALL; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &count); + if (FAILED(hr)) + return hr; + + elements = bytes / (desc.Bytes / desc.Elements); + + switch (desc.Class) + { + case D3DXPC_SCALAR: + return set_scalar_array(iface, device, constant, data, elements, desc.Type); + case D3DXPC_VECTOR: + return set_vector_array(iface, device, constant, data,elements, desc.Type); + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + return set_matrix_array(iface, device, constant, data, elements, desc.Type, desc.Rows, desc.Columns); + default: + FIXME("Unhandled parameter class %#x", desc.Class); + return D3DERR_INVALIDCALL; + } } static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXConstantTable::SetValue.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 5fd7d9826c4f7bfe4e1b484374ec7bac7363dcbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd7d9826c4f7bfe4e1b48437… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:21 2012 +0200 d3dx9/tests: Add tests for ID3DXConstantTable::SetValue. --- dlls/d3dx9_36/tests/shader.c | 175 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fd7d9826c4f7bfe4e1b4…

1 0