March 2017 - Wine-commits - list.winehq.org

Sebastian Lackner : bcrypt: Remove a FIXME which no longer applies.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: b26d89b54a8c42bc71cb2c9b968d15ef4073378e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26d89b54a8c42bc71cb2c9b9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:36:31 2017 +0100 bcrypt: Remove a FIXME which no longer applies. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b188479..80d7ddb 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -527,7 +527,6 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL end: if (status != STATUS_SUCCESS) { - /* FIXME: call hash_finish to release resources */ HeapFree( GetProcessHeap(), 0, hash ); return status; }

1 0

Sebastian Lackner : vcomp/tests: Use ULL macro to define 64-bit constants.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 375e5f50a87454875a6120c461a481f4832b734e URL: http://source.winehq.org/git/wine.git/?a=commit;h=375e5f50a87454875a6120c46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 14:31:15 2017 +0100 vcomp/tests: Use ULL macro to define 64-bit constants. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 100 ++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=375e5f50a87454875a612…

1 0

Jacek Caban : wininet/tests: Added more HTTP read tests.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 4b1445940d47870895b7fa87b7d69d12abe701ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1445940d47870895b7fa87b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 10 14:17:33 2017 +0100 wininet/tests: Added more HTTP read tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 344 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b1445940d47870895b7f…

1 0

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

10 Mar '17

Module: wine Branch: master Commit: 2fe03d7d3765895260e524e41c187bc0393bc912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe03d7d3765895260e524e41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 16:01:36 2017 +0100 msvcp140: Add _ContextCallback implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 26 +++++++++++------------ dlls/msvcp90/misc.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 9da2675..7270e20 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1096,9 +1096,9 @@ @ cdecl -arch=win64 ?_Addfac(a)_Locimp@locale(a)std@@AEAAXPEAVfacet(a)23@_K(a)Z(ptr ptr long) locale__Locimp__Addfac @ cdecl -arch=win32 ?_Addstd(a)ios_base@std@@SAXPAV12@@Z(ptr) ios_base_Addstd @ cdecl -arch=win64 ?_Addstd(a)ios_base@std@@SAXPEAV12@@Z(ptr) ios_base_Addstd -@ stub -arch=arm ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAAXPAX(a)Z -@ stub -arch=i386 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAEXPAX(a)Z -@ stub -arch=win64 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AEAAXPEAX(a)Z +@ cdecl -arch=arm ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAAXPAX(a)Z(ptr ptr) _ContextCallback__Assign +@ thiscall -arch=i386 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAEXPAX(a)Z(ptr ptr) _ContextCallback__Assign +@ cdecl -arch=win64 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AEAAXPEAX(a)Z(ptr ptr) _ContextCallback__Assign @ stub ?_Atexit@@YAXP6AXXZ(a)Z @ extern ?_BADOFF(a)std@@3_JB std_BADOFF @ cdecl -arch=arm ?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @@ -1110,15 +1110,15 @@ @ cdecl -arch=arm ?_C_str@?$_Yarn(a)_W@std@@QBAPB_WXZ(ptr) _Yarn_wchar__C_str @ thiscall -arch=i386 ?_C_str@?$_Yarn(a)_W@std@@QBEPB_WXZ(ptr) _Yarn_wchar__C_str @ cdecl -arch=win64 ?_C_str@?$_Yarn(a)_W@std@@QEBAPEB_WXZ(ptr) _Yarn_wchar__C_str -@ stub -arch=arm ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z -@ stub -arch=i386 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBEXV?$function@$$A6AXXZ(a)std@@_N(a)Z -@ stub -arch=win64 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QEBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z +@ cdecl -arch=arm ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z(ptr ptr long) _ContextCallback__CallInContext +@ thiscall -arch=i386 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBEXV?$function@$$A6AXXZ(a)std@@_N(a)Z(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) _ContextCallback__CallInContext +@ cdecl -arch=win64 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QEBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z(ptr ptr long) _ContextCallback__CallInContext @ cdecl -arch=arm ?_Callfns(a)ios_base@std@@AAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ thiscall -arch=i386 ?_Callfns(a)ios_base@std@@AAEXW4event(a)12@@Z(ptr long) ios_base_Callfns @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns -@ stub -arch=arm ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAAXXZ(ptr) _ContextCallback__Capture +@ thiscall -arch=i386 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAEXXZ(ptr) _ContextCallback__Capture +@ cdecl -arch=win64 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ(ptr) _ContextCallback__Capture @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref @@ -1442,7 +1442,7 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_short__Iput @ cdecl -arch=win32 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AAVios_base(a)2@_WPADI(a)Z(ptr ptr long ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput -@ stub ?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ +@ cdecl ?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ(ptr) _ContextCallback__IsCurrentOriginSTA @ stub ?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @@ -1592,9 +1592,9 @@ @ stub ?_ReportUnobservedException(a)details@Concurrency@@YAXXZ @ stub -arch=win32 ?_Reschedule_chore(a)details@Concurrency@@YAHPBU_Threadpool_chore(a)12@@Z @ stub -arch=win64 ?_Reschedule_chore(a)details@Concurrency@@YAHPEBU_Threadpool_chore(a)12@@Z -@ stub -arch=arm ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ(ptr) _ContextCallback__Reset +@ thiscall -arch=i386 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ(ptr) _ContextCallback__Reset +@ cdecl -arch=win64 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ(ptr) _ContextCallback__Reset @ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index e819699..aa0a289 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1376,4 +1376,55 @@ task_continuation_context* __thiscall task_continuation_context_ctor(task_contin memset(this, 0, sizeof(*this)); return this; } + +typedef struct { + const vtable_ptr *vtable; + void (__cdecl *func)(void); + int unk[4]; + void *unk2[3]; + void *this; +} function_void_cdecl_void; + +/* ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAEXPAX(a)Z */ +/* ?_Assign(a)_ContextCallback@details(a)Concurrency@@AEAAXPEAX(a)Z */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Assign, 8) +void __thiscall _ContextCallback__Assign(void *this, void *v) +{ + TRACE("(%p %p)\n", this, v); +} + +#define call_function_do_call(this) CALL_VTBL_FUNC(this, 8, void, (function_void_cdecl_void*), (this)) +#define call_function_do_clean(this,b) CALL_VTBL_FUNC(this, 16, void, (function_void_cdecl_void*,MSVCP_bool), (this, b)) +/* ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBEXV?$function@$$A6AXXZ(a)std@@_N(a)Z */ +/* ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QEBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__CallInContext, 48) +void __thiscall _ContextCallback__CallInContext(const void *this, function_void_cdecl_void func, MSVCP_bool b) +{ + TRACE("(%p %p %x)\n", this, func.func, b); + call_function_do_call(func.this); + call_function_do_clean(func.this, func.this!=&func); +} + +/* ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAEXXZ */ +/* ?_Capture(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Capture, 4) +void __thiscall _ContextCallback__Capture(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ */ +/* ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Reset, 4) +void __thiscall _ContextCallback__Reset(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ */ +MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) +{ + TRACE("(%p)\n", this); + return FALSE; +} #endif

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(a)_ContextCallback@details(a)Concurrency@@CA_NXZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AEAA(a)XZ"); + SET(p__ContextCallback__Assign, "?_Assign(a)_ContextCallback@details(a)Concurrency@@AEAAXPEAX(a)Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QEBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z"); + SET(p__ContextCallback__Capture, "?_Capture(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ"); + SET(p__ContextCallback__Reset, "?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); + SET(p__ContextCallback__Assign, "?_Assign(a)_ContextCallback@details(a)Concurrency@@AAAXPAX(a)Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z"); + SET(p__ContextCallback__Capture, "?_Capture(a)_ContextCallback@details(a)Concurrency@@AAAXXZ"); + SET(p__ContextCallback__Reset, "?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ"); #else SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAE(a)XZ"); + SET(p__ContextCallback__Assign, "?_Assign(a)_ContextCallback@details(a)Concurrency@@AAEXPAX(a)Z"); + SET(p__ContextCallback__CallInContext, "?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBEXV?$function@$$A6AXXZ(a)std@@_N(a)Z"); + SET(p__ContextCallback__Capture, "?_Capture(a)_ContextCallback@details(a)Concurrency@@AAEXXZ"); + SET(p__ContextCallback__Reset, "?_Reset(a)_ContextCallback@details(a)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

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(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ /* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)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 __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(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ /* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)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 __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(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ /* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param)

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(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ /* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param)

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