wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Sebastian Lackner : bcrypt/tests: Add basic tests for BCryptDuplicateHash.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: bc20b546ef6f8fe9a77450195df9f86202f45072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc20b546ef6f8fe9a77450195… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:36:11 2017 +0100 bcrypt/tests: Add basic tests for BCryptDuplicateHash. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f526fc6..42312b4 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -33,6 +33,7 @@ static NTSTATUS (WINAPI *pBCryptCreateHash)(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDL ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptHash)(BCRYPT_ALG_HANDLE, UCHAR *, ULONG, UCHAR *, ULONG, UCHAR *, ULONG); static NTSTATUS (WINAPI *pBCryptHashData)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptDuplicateHash)(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptDestroyHash)(BCRYPT_HASH_HANDLE); static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); @@ -208,9 +209,9 @@ static void test_sha1(void) { static const char expected[] = "961fa64958818f767707072755d7018dcd278e94"; static const char expected_hmac[] = "2472cf65d0e090618d769d3e46f0d9446cf212da"; + UCHAR buf[512], buf_hmac[1024], buf_hmac2[1024], sha1[20], sha1_hmac[20]; + BCRYPT_HASH_HANDLE hash, hash2; BCRYPT_ALG_HANDLE alg; - BCRYPT_HASH_HANDLE hash; - UCHAR buf[512], buf_hmac[1024], sha1[20], sha1_hmac[20]; char str[41]; NTSTATUS ret; ULONG len; @@ -268,6 +269,29 @@ static void test_sha1(void) test_hash_length(hash, 20); test_alg_name(hash, "SHA1"); + len = sizeof(buf_hmac2); + ret = pBCryptDuplicateHash(NULL, &hash2, buf_hmac2, len, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + len = sizeof(buf_hmac2); + ret = pBCryptDuplicateHash(hash, NULL, buf_hmac2, len, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + hash2 = NULL; + len = sizeof(buf_hmac2); + ret = pBCryptDuplicateHash(hash, &hash2, buf_hmac2, len, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(hash2 != NULL, "hash not set\n"); + + memset(sha1_hmac, 0, sizeof(sha1_hmac)); + ret = pBCryptFinishHash(hash2, sha1_hmac, sizeof(sha1_hmac), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( sha1_hmac, sizeof(sha1_hmac), str ); + ok(!strcmp(str, expected_hmac), "got %s\n", str); + + ret = pBCryptDestroyHash(hash2); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + memset(sha1_hmac, 0, sizeof(sha1_hmac)); ret = pBCryptFinishHash(hash, sha1_hmac, sizeof(sha1_hmac), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -990,6 +1014,7 @@ START_TEST(bcrypt) pBCryptCreateHash = (void *)GetProcAddress(module, "BCryptCreateHash"); pBCryptHash = (void *)GetProcAddress(module, "BCryptHash"); pBCryptHashData = (void *)GetProcAddress(module, "BCryptHashData"); + pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash"); pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash"); pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash"); pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom");

1 0

Michael Müller : bcrypt: Implement BCryptDuplicateHash.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: da8853f06226f97e2486066b45785be7894afca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8853f06226f97e2486066b4… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 10 15:35:14 2017 +0100 bcrypt: Implement BCryptDuplicateHash. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 21 +++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index e299fe0..a1cce44 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -11,7 +11,7 @@ @ stdcall BCryptDestroyHash(ptr) @ stub BCryptDestroyKey @ stub BCryptDestroySecret -@ stub BCryptDuplicateHash +@ stdcall BCryptDuplicateHash(ptr ptr ptr long long) @ stub BCryptDuplicateKey @ stub BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 561b459..b188479 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -536,6 +536,27 @@ end: return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HANDLE *handle_copy, + UCHAR *object, ULONG objectlen, ULONG flags ) +{ + struct hash *hash_orig = handle; + struct hash *hash_copy; + + TRACE( "%p, %p, %p, %u, %u\n", handle, handle_copy, object, objectlen, flags ); + + if (!hash_orig || hash_orig->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!handle_copy) return STATUS_INVALID_PARAMETER; + if (object) FIXME( "ignoring object buffer\n" ); + + if (!(hash_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash_copy) ))) + return STATUS_NO_MEMORY; + + memcpy( hash_copy, hash_orig, sizeof(*hash_orig) ); + + *handle_copy = hash_copy; + return STATUS_SUCCESS; +} + NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) { struct hash *hash = handle; diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 0412760..6e871a5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -13,7 +13,7 @@ @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash @ stub BCryptDestroyKey @ stub BCryptDestroySecret -@ stub BCryptDuplicateHash +@ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash @ stub BCryptDuplicateKey @ stub BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms

1 0

Sebastian Lackner : bcrypt/tests: Move common tests to a helper function.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 1ffe98264cb77751b58a4ad08319c97883ceb452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ffe98264cb77751b58a4ad08… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:34:39 2017 +0100 bcrypt/tests: Move common tests to a helper function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 196 +++++++++++---------------------------------- 1 file changed, 46 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ffe98264cb77751b58a4…

1 0

Sebastian Lackner : bcrypt: Return error when requesting BCRYPT_HASH_LENGTH for unsupported object.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: eecb068ac0a9f6e380c521b69a27ea43840a35dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecb068ac0a9f6e380c521b69… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:34:08 2017 +0100 bcrypt: Return error when requesting BCRYPT_HASH_LENGTH for unsupported object. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 ++ dlls/bcrypt/tests/bcrypt.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ae64627..561b459 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -404,6 +404,8 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) { + if (!alg_props[id].hash_length) + return STATUS_NOT_SUPPORTED; *ret_size = sizeof(ULONG); if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 422f2cf..864c2c8 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -763,6 +763,10 @@ static void test_rng(void) ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + len = size = 0xdeadbeef; + ret = pBCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + test_alg_name(alg, "RNG"); memset(buf, 0, 16);

1 0

Sebastian Lackner : bcrypt: Unify the object length handling.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: ced491c65fc65f0a2f551d86aaed7e6d7b7cf141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced491c65fc65f0a2f551d86a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:33:42 2017 +0100 bcrypt: Unify the object length handling. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 104 ++++++++++------------------------------------ 1 file changed, 22 insertions(+), 82 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index cf4e3c6..ae64627 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -147,16 +147,17 @@ enum alg_id #define MAX_HASH_BLOCK_BITS 1024 static const struct { + ULONG object_length; ULONG hash_length; ULONG block_bits; const WCHAR *alg_name; } alg_props[] = { - /* ALG_ID_MD5 */ { 16, 512, BCRYPT_MD5_ALGORITHM }, - /* ALG_ID_RNG */ { 0, 0, BCRYPT_RNG_ALGORITHM }, - /* ALG_ID_SHA1 */ { 20, 512, BCRYPT_SHA1_ALGORITHM }, - /* ALG_ID_SHA256 */ { 32, 512, BCRYPT_SHA256_ALGORITHM }, - /* ALG_ID_SHA384 */ { 48, 1024, BCRYPT_SHA384_ALGORITHM }, - /* ALG_ID_SHA512 */ { 64, 1024, BCRYPT_SHA512_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 }, + /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM }, + /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM }, + /* ALG_ID_SHA512 */ { 382, 64, 1024, BCRYPT_SHA512_ALGORITHM } }; struct algorithm @@ -387,14 +388,20 @@ struct hash struct hash_impl inner; }; -#define OBJECT_LENGTH_MD5 274 -#define OBJECT_LENGTH_SHA1 278 -#define OBJECT_LENGTH_SHA256 286 -#define OBJECT_LENGTH_SHA384 382 -#define OBJECT_LENGTH_SHA512 382 - static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + if (!alg_props[id].object_length) + return STATUS_NOT_SUPPORTED; + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + if (buf) + *(ULONG *)buf = alg_props[id].object_length; + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) { *ret_size = sizeof(ULONG); @@ -421,78 +428,11 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; - ULONG value; status = generic_alg_property( id, prop, buf, size, ret_size ); - if (status != STATUS_NOT_IMPLEMENTED) - return status; - - switch (id) - { - case ALG_ID_MD5: - if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) - { - value = OBJECT_LENGTH_MD5; - break; - } - FIXME( "unsupported md5 algorithm property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_RNG: - if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) return STATUS_NOT_SUPPORTED; - FIXME( "unsupported rng algorithm property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_SHA1: - if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) - { - value = OBJECT_LENGTH_SHA1; - break; - } - FIXME( "unsupported sha1 algorithm property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_SHA256: - if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) - { - value = OBJECT_LENGTH_SHA256; - break; - } - FIXME( "unsupported sha256 algorithm property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_SHA384: - if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) - { - value = OBJECT_LENGTH_SHA384; - break; - } - FIXME( "unsupported sha384 algorithm property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_SHA512: - if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) - { - value = OBJECT_LENGTH_SHA512; - break; - } - FIXME( "unsupported sha512 algorithm property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - default: - FIXME( "unsupported algorithm %u\n", id ); - return STATUS_NOT_IMPLEMENTED; - } - - if (size < sizeof(ULONG)) - { - *ret_size = sizeof(ULONG); - return STATUS_BUFFER_TOO_SMALL; - } - if (buf) *(ULONG *)buf = value; - *ret_size = sizeof(ULONG); - - return STATUS_SUCCESS; + if (status == STATUS_NOT_IMPLEMENTED) + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return status; } static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size )

1 0

Piotr Caban : msvcp140: Add __crtSetThreadpoolWait implementation.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 10266f5bf5a4fb4be34e3ec94a17785ed6534f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10266f5bf5a4fb4be34e3ec94… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 17:33:51 2017 +0100 msvcp140: Add __crtSetThreadpoolWait implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 054540a..2c25ccb 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3777,7 +3777,7 @@ @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __crtSetFileInformationByHandle @ cdecl __crtSetThreadpoolTimer(ptr ptr long long) MSVCP__crtSetThreadpoolTimer -@ stub __crtSetThreadpoolWait +@ cdecl __crtSetThreadpoolWait(ptr long ptr) MSVCP__crtSetThreadpoolWait @ stub __crtWaitForThreadpoolTimerCallbacks @ stub __set_stl_sync_api_mode @ cdecl xtime_get(ptr long) xtime_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 433153a..c0a3421 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1296,6 +1296,15 @@ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, return CreateThreadpoolWait(callback, userdata, environment); } +/********************************************************************* + * __crtSetThreadpoolWait (MSVCP140.@) + */ +VOID CDECL MSVCP__crtSetThreadpoolWait(TP_WAIT *wait, HANDLE handle, FILETIME *due_time) +{ + TRACE("(%p %p %p)\n", wait, handle, due_time); + return SetThreadpoolWait(wait, handle, due_time); +} + /* ?_Execute_once@std@@YAHAAUonce_flag@1@P6GHPAX1PAPAX@Z1@Z */ /* ?_Execute_once@std@@YAHAEAUonce_flag@1@P6AHPEAX1PEAPEAX@Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param)

1 0

Piotr Caban : msvcp140: Add __crtCreateThreadpoolWait implementation.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: d0c398a56c2c9f0ab96fa2f74d767fdbd339cc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c398a56c2c9f0ab96fa2f74… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 17:33:45 2017 +0100 msvcp140: Add __crtCreateThreadpoolWait implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index da09926..054540a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3761,7 +3761,7 @@ @ cdecl __crtCreateSemaphoreExW(ptr long long wstr long long) MSVCP__crtCreateSemaphoreExW @ stub __crtCreateSymbolicLinkW @ cdecl __crtCreateThreadpoolTimer(ptr ptr ptr) MSVCP__crtCreateThreadpoolTimer -@ stub __crtCreateThreadpoolWait +@ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait @ stub __crtFlushProcessWriteBuffers @ stub __crtFreeLibraryWhenCallbackReturns @ stub __crtGetCurrentProcessorNumber diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c2b061a..433153a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1286,6 +1286,16 @@ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, return SetThreadpoolTimer(timer, due_time, period, window_length); } +/********************************************************************* + * __crtCreateThreadpoolWait (MSVCP140.@) + */ +PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, + PVOID userdata, TP_CALLBACK_ENVIRON *environment) +{ + TRACE("(%p %p %p)\n", callback, userdata, environment); + return CreateThreadpoolWait(callback, userdata, environment); +} + /* ?_Execute_once@std@@YAHAAUonce_flag@1@P6GHPAX1PAPAX@Z1@Z */ /* ?_Execute_once@std@@YAHAEAUonce_flag@1@P6AHPEAX1PEAPEAX@Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param)

1 0

Piotr Caban : msvcp140: Add __crtSetThreadpoolTimer implementation.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 941ce07a4c2586f8359131489fdd35788478cd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=941ce07a4c2586f8359131489… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 17:33:42 2017 +0100 msvcp140: Add __crtSetThreadpoolTimer implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 863954a..da09926 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3776,7 +3776,7 @@ @ stub __crtLCMapStringEx @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __crtSetFileInformationByHandle -@ stub __crtSetThreadpoolTimer +@ cdecl __crtSetThreadpoolTimer(ptr ptr long long) MSVCP__crtSetThreadpoolTimer @ stub __crtSetThreadpoolWait @ stub __crtWaitForThreadpoolTimerCallbacks @ stub __set_stl_sync_api_mode diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 2536e2c..c2b061a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1276,6 +1276,16 @@ PTP_TIMER CDECL MSVCP__crtCreateThreadpoolTimer(PTP_TIMER_CALLBACK callback, return CreateThreadpoolTimer(callback, userdata, environment); } +/********************************************************************* + * __crtSetThreadpoolTimer (MSVCP140.@) + */ +VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, + FILETIME *due_time, DWORD period, DWORD window_length) +{ + TRACE("(%p %p 0x%08x 0x%08x)\n", timer, due_time, period, window_length); + return SetThreadpoolTimer(timer, due_time, period, window_length); +} + /* ?_Execute_once@std@@YAHAAUonce_flag@1@P6GHPAX1PAPAX@Z1@Z */ /* ?_Execute_once@std@@YAHAEAUonce_flag@1@P6AHPEAX1PEAPEAX@Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) diff --git a/include/winbase.h b/include/winbase.h index b9a778d..2345443 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2560,6 +2560,7 @@ WINBASEAPI DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD); WINBASEAPI BOOL WINAPI SetThreadPriority(HANDLE,INT); WINBASEAPI BOOL WINAPI SetThreadPriorityBoost(HANDLE,BOOL); WINADVAPI BOOL WINAPI SetThreadToken(PHANDLE,HANDLE); +WINBASEAPI VOID WINAPI SetThreadpoolTimer(PTP_TIMER,FILETIME*,DWORD,DWORD); WINBASEAPI VOID WINAPI SetThreadpoolWait(PTP_WAIT,HANDLE,FILETIME *); WINBASEAPI HANDLE WINAPI SetTimerQueueTimer(HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,BOOL); WINBASEAPI BOOL WINAPI SetTimeZoneInformation(const TIME_ZONE_INFORMATION *);

1 0

Piotr Caban : msvcp140: Add __crtCreateThreadpoolTimer implementation.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 0f8a703dee65db2391b559842b6967d574b6ef74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8a703dee65db2391b559842… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 17:33:36 2017 +0100 msvcp140: Add __crtCreateThreadpoolTimer implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 7270e20..863954a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3760,7 +3760,7 @@ @ cdecl __crtCreateEventExW(ptr wstr long long) MSVCP__crtCreateEventExW @ cdecl __crtCreateSemaphoreExW(ptr long long wstr long long) MSVCP__crtCreateSemaphoreExW @ stub __crtCreateSymbolicLinkW -@ stub __crtCreateThreadpoolTimer +@ cdecl __crtCreateThreadpoolTimer(ptr ptr ptr) MSVCP__crtCreateThreadpoolTimer @ stub __crtCreateThreadpoolWait @ stub __crtFlushProcessWriteBuffers @ stub __crtFreeLibraryWhenCallbackReturns diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index aa0a289..2536e2c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1266,6 +1266,16 @@ HANDLE CDECL MSVCP__crtCreateSemaphoreExW( return CreateSemaphoreExW(attribs, initial_count, max_count, name, flags, access); } +/********************************************************************* + * __crtCreateThreadpoolTimer (MSVCP140.@) + */ +PTP_TIMER CDECL MSVCP__crtCreateThreadpoolTimer(PTP_TIMER_CALLBACK callback, + PVOID userdata, TP_CALLBACK_ENVIRON *environment) +{ + TRACE("(%p %p %p)\n", callback, userdata, environment); + return CreateThreadpoolTimer(callback, userdata, environment); +} + /* ?_Execute_once@std@@YAHAAUonce_flag@1@P6GHPAX1PAPAX@Z1@Z */ /* ?_Execute_once@std@@YAHAEAUonce_flag@1@P6AHPEAX1PEAPEAX@Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) diff --git a/include/winbase.h b/include/winbase.h index 289f6e9..b9a778d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1819,6 +1819,7 @@ WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityEx(PSECURITY_DESCRIPTOR WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID**,ULONG,BOOL,ULONG,HANDLE,PGENERIC_MAPPING); WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); WINBASEAPI PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup(void); +WINBASEAPI PTP_TIMER WINAPI CreateThreadpoolTimer(PTP_TIMER_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_WAIT WINAPI CreateThreadpoolWait(PTP_WAIT_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI BOOL WINAPI CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION);

1 0

Piotr Caban : msvcp140: Add _ContextCallback tests.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 72df2637a7db533eaa6f445af42e752ad90fe56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72df2637a7db533eaa6f445af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 16:01:40 2017 +0100 msvcp140: Add _ContextCallback tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 143 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index db241ca..99ab8a3 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -21,6 +21,38 @@ #include "wine/test.h" #include "winbase.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { \ + expect_ ## func = TRUE; \ + errno = 0xdeadbeef; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#ifdef _WIN64 +DEFINE_EXPECT(function_do_call); +DEFINE_EXPECT(function_do_clean); +#endif + #undef __thiscall #ifdef __i386__ #define __thiscall __stdcall @@ -43,6 +75,7 @@ struct thiscall_thunk #include "poppack.h" static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); static void init_thiscall_thunk(void) { @@ -54,24 +87,45 @@ static void init_thiscall_thunk(void) thunk->push_eax = 0x50; /* pushl %eax */ thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,a) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) #endif /* __i386__ */ +typedef unsigned char MSVCP_bool; typedef struct { void *unk0; BYTE unk1; } task_continuation_context; +typedef struct { + void *unused; +} _ContextCallback; + +typedef struct { + const void *vtable; + void (__cdecl *func)(void); + int unk[4]; + void *unk2[3]; + void *this; +} function_void_cdecl_void; + static unsigned int (__cdecl *p__Thrd_id)(void); static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); +static void (__thiscall *p__ContextCallback__Assign)(_ContextCallback*, void*); +static void (__thiscall *p__ContextCallback__CallInContext)(const _ContextCallback*, function_void_cdecl_void, MSVCP_bool); +static void (__thiscall *p__ContextCallback__Capture)(_ContextCallback*); +static void (__thiscall *p__ContextCallback__Reset)(_ContextCallback*); +static MSVCP_bool (__cdecl *p__ContextCallback__IsCurrentOriginSTA)(_ContextCallback*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -86,14 +140,27 @@ static BOOL init(void) } SET(p__Thrd_id, "_Thrd_id"); + SET(p__ContextCallback__IsCurrentOriginSTA, "?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AEAA@XZ"); + SET(p__ContextCallback__Assign, "?_Assign@_ContextCallback@details@Concurrency@@AEAAXPEAX@Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z"); + SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AEAAXXZ"); + SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AEAAXXZ"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAA@XZ"); + SET(p__ContextCallback__Assign, "?_Assign@_ContextCallback@details@Concurrency@@AAAXPAX@Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QBAXV?$function@$$A6AXXZ@std@@_N@Z"); + SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AAAXXZ"); + SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AAAXXZ"); #else SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAE@XZ"); + SET(p__ContextCallback__Assign, "?_Assign@_ContextCallback@details@Concurrency@@AAEXPAX@Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z"); + SET(p__ContextCallback__Capture, "?_Capture@_ContextCallback@details@Concurrency@@AAEXXZ"); + SET(p__ContextCallback__Reset, "?_Reset@_ContextCallback@details@Concurrency@@AAEXXZ"); #endif } @@ -153,11 +220,87 @@ static void test_task_continuation_context(void) ok(!tcc.unk1, "tcc.unk1 != 0 (%x)\n", tcc.unk1); } +#ifdef _WIN64 +static void __cdecl function_do_call(void *this) +{ + CHECK_EXPECT(function_do_call); +} + +static void __cdecl function_do_clean(void *this, MSVCP_bool b) +{ + CHECK_EXPECT(function_do_clean); + ok(b, "b == FALSE\n"); +} +#endif + +static void test__ContextCallback(void) +{ + _ContextCallback cc = {0}; + void *v = (void*)0xdeadbeef; +#ifdef _WIN64 + void* function_vtbl[] = { + NULL, + NULL, + (void*)function_do_call, + NULL, + (void*)function_do_clean, + NULL + }; + function_void_cdecl_void function = { function_vtbl, NULL, {0}, {NULL}, &function }; + function_void_cdecl_void function2 = { NULL, NULL, {0}, {NULL}, &function }; +#endif + + call_func2(p__ContextCallback__Assign, &cc, v); + ok(!cc.unused, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Reset, &cc); + ok(!cc.unused, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Capture, &cc); + ok(!cc.unused, "cc.unused = %p\n", cc.unused); + ok(!p__ContextCallback__IsCurrentOriginSTA(&cc), "IsCurrentOriginSTA returned TRUE\n"); + + cc.unused = v; + call_func2(p__ContextCallback__Assign, &cc, NULL); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Reset, &cc); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + call_func1(p__ContextCallback__Capture, &cc); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + ok(!p__ContextCallback__IsCurrentOriginSTA(&cc), "IsCurrentOriginSTA returned TRUE\n"); + ok(cc.unused == v, "cc.unused = %p\n", cc.unused); + +#ifdef _WIN64 + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function, FALSE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); + + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function, TRUE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); + + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function2, FALSE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); + + SET_EXPECT(function_do_call); + SET_EXPECT(function_do_clean); + p__ContextCallback__CallInContext(&cc, function2, TRUE); + CHECK_CALLED(function_do_call); + CHECK_CALLED(function_do_clean); +#endif +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); test_vbtable_size_exports(); test_task_continuation_context(); + test__ContextCallback(); FreeLibrary(msvcp); }

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
72
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 March 2017