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

Michael Müller : cabinet: Set index of folder in FDICopy callback.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 4a568851815f80b9d4d4f0a356f99e2d6513e695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a568851815f80b9d4d4f0a35… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 01:07:36 2017 +0100 cabinet: Set index of folder in FDICopy callback. 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> (cherry picked from commit 67639e6ce7b88894009751b19051c58b7258f952) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cabinet/fdi.c | 2 ++ dlls/cabinet/tests/fdi.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index fdff0bf..758133e 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2640,6 +2640,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; + fdin.iFolder = file->index; if ((filehf = ((*pfnfdin)(fdintCOPY_FILE, &fdin))) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); filehf = 0; @@ -2765,6 +2766,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ + fdin.iFolder = file->index; ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); filehf = 0; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index b5bec38..ba622f6 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -116,7 +116,7 @@ static const struct { { {'M','S','C','F'}, 0, 0x59, 0, sizeof(struct CFHEADER) + sizeof(struct CFFOLDER), 0, 3,1, 1, 1, 0, 0x1225, 0x2013 }, { sizeof(struct CFHEADER) + sizeof(struct CFFOLDER) + sizeof(struct CFFILE) + sizeof("file.dat"), 1, tcompTYPE_NONE }, - { sizeof("Hello World!")-1, 0, 0, 0x1225, 0x2013, 0xa114 }, + { sizeof("Hello World!")-1, 0, 0x1234, 0x1225, 0x2013, 0xa114 }, { 'f','i','l','e','.','d','a','t',0 }, { 0, sizeof("Hello World!")-1, sizeof("Hello World!")-1 }, { 'H','e','l','l','o',' ','W','o','r','l','d','!' } @@ -841,7 +841,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->date == 0x1225, "expected 0x1225, got %#x\n", info->date); ok(info->time == 0x2013, "expected 0x2013, got %#x\n", info->time); ok(info->attribs == 0xa114, "expected 0xa114, got %#x\n", info->attribs); - ok(info->iFolder == 0, "expected 0, got %#x\n", info->iFolder); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 1; case fdintCOPY_FILE: @@ -850,6 +850,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->cb == 12, "expected 12, got %u\n", info->cb); ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 0x12345678; /* call write() callback */ }

1 0

Hans Leidekker : msi: Implement MsiGetComponentPathExA/W.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 879d06577c08e0d67c1fc2c0473c60db53138406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879d06577c08e0d67c1fc2c04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 3 11:52:36 2017 +0100 msi: Implement MsiGetComponentPathExA/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 64c0625f25e93ef9e9ef37876b93263ea06ed67d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/msi.c | 108 ++++++++++------- dlls/msi/msi.spec | 4 +- dlls/msi/tests/msi.c | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msi.h | 4 + 4 files changed, 396 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=879d06577c08e0d67c1fc…

1 0

Austin English : ntoskrnl.exe: Add KeAcquireInStackQueuedSpinLock stub.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: a37817e4e0b8d126d390c44b56500261989e4abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37817e4e0b8d126d390c44b5… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 7 16:01:20 2017 +0100 ntoskrnl.exe: Add KeAcquireInStackQueuedSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3ccfc092bc91773cf38e9e265eac6385d50cbc8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 10 ++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index bd6bc35..f441ac5 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -4,7 +4,7 @@ @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry -@ stub KeAcquireInStackQueuedSpinLock +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06320d0..b3db46c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3188,3 +3188,16 @@ VOID WINAPI KeClearEvent(PRKEVENT event) { FIXME("stub: %p\n", event); } + +/*********************************************************************** + * KeAcquireInStackQueuedSpinLock (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) +void WINAPI __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) +#else +void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) +#endif +{ + FIXME( "stub: %p %p\n", spinlock, handle ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3e9dba2..7416740 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -41,6 +41,7 @@ @ stub IoWritePartitionTable @ stdcall -norelay IofCallDriver(ptr ptr) @ stdcall -norelay IofCompleteRequest(ptr long) +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel @ stub KeSetTimeUpdateNotifyRoutine diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4c696f7..61374a7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1210,6 +1210,16 @@ typedef struct _CALLBACK_OBJECT UCHAR reserved[3]; } CALLBACK_OBJECT, *PCALLBACK_OBJECT; +typedef struct _KSPIN_LOCK_QUEUE { + struct _KSPIN_LOCK_QUEUE * volatile Next; + volatile PKSPIN_LOCK Lock; +} KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE; + +typedef struct _KLOCK_QUEUE_HANDLE { + KSPIN_LOCK_QUEUE LockQueue; + KIRQL OldIrql; +} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; + typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; diff --git a/tools/make_specfiles b/tools/make_specfiles index 1e2400e..404af76 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -338,6 +338,10 @@ my @dll_groups = "bcrypt", "ncrypt", ], + [ + "ntoskrnl.exe", + "hal", + ], ); my $update_flags = 0;

1 0

Sebastian Lackner : rasapi32: Set *lpcDevices in RasEnumDevicesA.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 82b93d427d6a9f1d5927456a6975f27092c89594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b93d427d6a9f1d5927456a6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 8 11:59:31 2017 -0300 rasapi32: Set *lpcDevices in RasEnumDevicesA. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3842e789b61964643e5000bb36366d1727ee122) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rasapi32/rasapi.c | 2 ++ dlls/rasapi32/tests/rasapi.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index fcd0cb8..b1721c6 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -254,6 +254,8 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l if(lpRasDevinfo && lpRasDevinfo->dwSize != sizeof(RASDEVINFOA)) return ERROR_INVALID_SIZE; + *lpcDevices = 1; + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index e0ff25f..5171bb2 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -77,54 +77,71 @@ static void test_rasenum(void) /* test first parameter */ cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); rasDevInfo[0].dwSize = 0; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); /* test second parameter */ rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, NULL, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = 0; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + todo_wine + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_SIZE, /* vista, 2k8 */ "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize -1; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL, "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize +1; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08d\n", result); @@ -136,7 +153,9 @@ static void test_rasenum(void) "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); /* test combinations of invalid parameters */ + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, NULL, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); @@ -147,7 +166,9 @@ static void test_rasenum(void) cb = 0; rasDevInfo[0].dwSize = 0; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result);

1 0

Michael Müller : wininet: Handle query parameters for HTTPS urls in InternetOpenUrlW.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: f26de321f94ae70457a39f43528e839253d4a32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26de321f94ae70457a39f435… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 23 12:31:06 2017 +0100 wininet: Handle query parameters for HTTPS urls in InternetOpenUrlW. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6caecb6e58166b980ac610829c808550168e4451) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/internet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 772e4c1..02379c2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3462,7 +3462,9 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return NULL; - if(urlComponents.nScheme == INTERNET_SCHEME_HTTP && urlComponents.dwExtraInfoLength) { + if ((urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && + urlComponents.dwExtraInfoLength) + { assert(urlComponents.lpszUrlPath + urlComponents.dwUrlPathLength == urlComponents.lpszExtraInfo); urlComponents.dwUrlPathLength += urlComponents.dwExtraInfoLength; }

1 0

Piotr Caban : msvcp110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 5fe13b40d9e9903c88f72e3e8f37128f9d411ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe13b40d9e9903c88f72e3e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:00 2017 +0100 msvcp110: Add _Lock_shared_ptr_spin_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3b9e9dd06a1c3b89c90d565e82f92eba1bea821e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/misc.c | 21 +++++++++++++++++++++ 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b09a1d4..a7c3297 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3815,7 +3815,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) @@ -3874,7 +3874,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 863ead9..61d4b32 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3760,7 +3760,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) @@ -3821,7 +3821,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 438cddb..f649bbc 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3760,7 +3760,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero msvcp120._LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() msvcp120._Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) msvcp120._Mbrtowc @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) msvcp120._Mtx_current_owns @@ -3821,7 +3821,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() msvcp120._Unlock_shared_ptr_spin_lock @ cdecl _Wcrtomb(ptr long ptr ptr) msvcp120._Wcrtomb @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) msvcp120._Wcscoll @ stub _Wcsxfrm diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index fb3d709..9ad393d 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3668,7 +3668,7 @@ @ extern _LSnan _LSnan @ stub _Last_write_time @ stub _Link -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ stub _Lstat @ stub _Make_dir @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc @@ -3738,7 +3738,7 @@ @ cdecl _Towlower(long ptr) _Towlower @ cdecl _Towupper(long ptr) _Towupper @ stub _Unlink -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ stub _WStod @ stub _WStodx @ stub _WStof diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ce9a4e2..703ed9f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1339,3 +1339,24 @@ void __cdecl threads__Mtx_unlock(void *mtx) { LeaveCriticalSection(mtx); } + +#if _MSVCP_VER >= 110 +static LONG shared_ptr_lock; + +void __cdecl _Lock_shared_ptr_spin_lock(void) +{ + LONG l = 0; + + while(InterlockedCompareExchange(&shared_ptr_lock, 1, 0) != 0) { + if(l++ == 1000) { + Sleep(0); + l = 0; + } + } +} + +void __cdecl _Unlock_shared_ptr_spin_lock(void) +{ + shared_ptr_lock = 0; +} +#endif

1 0

Piotr Caban : msvcp140: Add task_continuation_context constructor implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 70f8d9aba7b666287abe47d96e377448f57c31cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f8d9aba7b666287abe47d96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 1 13:18:01 2017 +0100 msvcp140: Add task_continuation_context constructor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10b36e3977edb214f5451fcaf6f9c316465c01e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 6 ++-- dlls/msvcp140/tests/msvcp140.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 17 ++++++++++ 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 9ad393d..13df2e1 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -358,9 +358,9 @@ @ cdecl -arch=arm ??0ios_base(a)std@@IAA(a)XZ(ptr) ios_base_ctor @ thiscall -arch=i386 ??0ios_base(a)std@@IAE(a)XZ(ptr) ios_base_ctor @ cdecl -arch=win64 ??0ios_base(a)std@@IEAA(a)XZ(ptr) ios_base_ctor -@ stub -arch=arm ??0task_continuation_context(a)Concurrency@@AAA(a)XZ -@ stub -arch=i386 ??0task_continuation_context(a)Concurrency@@AAE(a)XZ -@ stub -arch=win64 ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ +@ cdecl -arch=arm ??0task_continuation_context(a)Concurrency@@AAA(a)XZ(ptr) task_continuation_context_ctor +@ thiscall -arch=i386 ??0task_continuation_context(a)Concurrency@@AAE(a)XZ(ptr) task_continuation_context_ctor +@ cdecl -arch=win64 ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ(ptr) task_continuation_context_ctor @ stub -arch=arm ??0time_base(a)std@@QAA(a)I@Z @ stub -arch=i386 ??0time_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0time_base(a)std@@QEAA(a)_K@Z diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 82e2b34..db241ca 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -21,7 +21,57 @@ #include "wine/test.h" #include "winbase.h" +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) + +#endif /* __i386__ */ + +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + static unsigned int (__cdecl *p__Thrd_id)(void); +static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -37,6 +87,17 @@ static BOOL init(void) SET(p__Thrd_id, "_Thrd_id"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AEAA(a)XZ"); + } else { +#ifdef __arm__ + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); +#else + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAE(a)XZ"); +#endif + } + + init_thiscall_thunk(); return TRUE; } @@ -82,10 +143,21 @@ static void test_vbtable_size_exports(void) } } +static void test_task_continuation_context(void) +{ + task_continuation_context tcc; + + memset(&tcc, 0xdead, sizeof(tcc)); + call_func1(p_task_continuation_context_ctor, &tcc); + ok(!tcc.unk0, "tcc.unk0 != NULL (%p)\n", tcc.unk0); + ok(!tcc.unk1, "tcc.unk1 != 0 (%x)\n", tcc.unk1); +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); test_vbtable_size_exports(); + test_task_continuation_context(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 703ed9f..e819699 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1360,3 +1360,20 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) shared_ptr_lock = 0; } #endif + +#if _MSVCP_VER >= 140 +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + +/* ??0task_continuation_context(a)Concurrency@@AAE(a)XZ */ +/* ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(task_continuation_context_ctor, 4) +task_continuation_context* __thiscall task_continuation_context_ctor(task_continuation_context *this) +{ + TRACE("(%p)\n", this); + memset(this, 0, sizeof(*this)); + return this; +} +#endif

1 0

Piotr Caban : msvcp140: Add _ContextCallback implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 84ac5d59741f4c9c62ecf95b26cc4a6da8199fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ac5d59741f4c9c62ecf95b2… 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> (cherry picked from commit 2fe03d7d3765895260e524e41c187bc0393bc912) Signed-off-by: Michael Stefaniuc <mstefani(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 13df2e1..8d62936 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 _TaskEventLogger class implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 046de3692b8611b0d0265e5456971bf0f13e7866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046de3692b8611b0d0265e545… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 15 12:06:20 2017 +0100 msvcp140: Add _TaskEventLogger class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe1ae48bbe7a367ded3f551369f0d5763efffa36) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 36 +++++++++++++++--------------- dlls/msvcp90/misc.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 8d62936..f8a5dfd 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1475,24 +1475,24 @@ @ cdecl -arch=win32 ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_dtor @ cdecl -arch=win64 ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_dtor @ cdecl ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z(long) _Lockit_free -@ stub -arch=arm ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAAX_N(a)Z -@ stub -arch=i386 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z -@ stub -arch=win64 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAX_N(a)Z -@ stub -arch=arm ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=win32 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ +@ cdecl -arch=arm ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogCancelTask +@ thiscall -arch=i386 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogCancelTask +@ cdecl -arch=win64 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogCancelTask +@ cdecl -arch=arm ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAAX_N(a)Z(ptr long) _TaskEventLogger__LogScheduleTask +@ thiscall -arch=i386 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z(ptr long) _TaskEventLogger__LogScheduleTask +@ cdecl -arch=win64 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAX_N(a)Z(ptr long) _TaskEventLogger__LogScheduleTask +@ cdecl -arch=arm ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ thiscall -arch=i386 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ cdecl -arch=win64 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ cdecl -arch=arm ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ thiscall -arch=i386 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ cdecl -arch=win64 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ cdecl -arch=arm ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ thiscall -arch=i386 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ cdecl -arch=win64 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ cdecl -arch=arm ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogWorkItemStarted +@ thiscall -arch=i386 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogWorkItemStarted +@ cdecl -arch=win64 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogWorkItemStarted @ stub -arch=win32 ?_MP_Add(a)std@@YAXQA_K_K(a)Z @ stub -arch=win64 ?_MP_Add(a)std@@YAXQEA_K_K(a)Z @ stub -arch=win32 ?_MP_Get(a)std@@YA_KQA_K(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index aa0a289..4ff3d51 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1427,4 +1427,58 @@ MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) TRACE("(%p)\n", this); return FALSE; } + +typedef struct { + /*_Task_impl_base*/void *task; + MSVCP_bool scheduled; + MSVCP_bool started; +} _TaskEventLogger; + +/* ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogCancelTask, 4) +void __thiscall _TaskEventLogger__LogCancelTask(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z */ +/* ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAX_N(a)Z */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogScheduleTask, 8) +void __thiscall _TaskEventLogger__LogScheduleTask(_TaskEventLogger *this, MSVCP_bool continuation) +{ + TRACE("(%p %x)\n", this, continuation); +} + +/* ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogTaskCompleted, 4) +void __thiscall _TaskEventLogger__LogTaskCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogTaskExecutionCompleted, 4) +void __thiscall _TaskEventLogger__LogTaskExecutionCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogWorkItemCompleted, 4) +void __thiscall _TaskEventLogger__LogWorkItemCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogWorkItemStarted, 4) +void __thiscall _TaskEventLogger__LogWorkItemStarted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} #endif

1 0

Piotr Caban : msvcr: Add _Wcsftime implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: fd4ea8ea6a32dd1b6643efc474bb78bf60c23be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4ea8ea6a32dd1b6643efc47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 14 17:41:59 2017 +0100 msvcr: Add _Wcsftime implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6400b9fe7e6247de21c35a8ec73dba629c6dd52) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/time.c | 33 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 5da3851..463ad7f 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -5,7 +5,7 @@ @ cdecl _W_Getdays() ucrtbase._W_Getdays @ cdecl _W_Getmonths() ucrtbase._W_Getmonths @ cdecl _W_Gettnames() ucrtbase._W_Gettnames -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) ucrtbase._Wcsftime @ cdecl __daylight() ucrtbase.__daylight @ cdecl __dstbias() ucrtbase.__dstbias @ cdecl __timezone() ucrtbase.__timezone diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 39a2eef..3eaa90b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -867,7 +867,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d09c711..fa2cca7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -851,7 +851,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d51f5d3..7ecc163 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -845,7 +845,7 @@ @ cdecl _W_Getdays() msvcr120._W_Getdays @ cdecl _W_Getmonths() msvcr120._W_Getmonths @ cdecl _W_Gettnames() msvcr120._W_Gettnames -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) msvcr120._Wcsftime @ cdecl _XcptFilter(long ptr) msvcr120._XcptFilter @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer @ stub __BuildCatchObject diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b0f5285..c390df6 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1263,16 +1263,14 @@ MSVCRT_size_t CDECL MSVCRT_strftime( char *str, MSVCRT_size_t max, const char *f return strftime_helper(str, max, format, mstm, NULL, NULL); } -/********************************************************************* - * _wcsftime_l (MSVCRT.@) - */ -MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, - const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +static MSVCRT_size_t wcsftime_helper( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, + MSVCRT___lc_time_data *time_data, MSVCRT__locale_t loc ) { char *s, *fmt; MSVCRT_size_t len; - TRACE("%p %ld %s %p %p\n", str, max, debugstr_w(format), mstm, loc); + TRACE("%p %ld %s %p %p %p\n", str, max, debugstr_w(format), mstm, time_data, loc); len = MSVCRT__wcstombs_l( NULL, format, 0, loc ) + 1; if (!(fmt = MSVCRT_malloc( len ))) return 0; @@ -1280,7 +1278,7 @@ MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, if ((s = MSVCRT_malloc( max*4 ))) { - if (!MSVCRT__strftime_l( s, max*4, fmt, mstm, loc )) s[0] = 0; + if (!strftime_helper( s, max*4, fmt, mstm, time_data, loc )) s[0] = 0; len = MSVCRT__mbstowcs_l( str, s, max, loc ); MSVCRT_free( s ); } @@ -1291,12 +1289,31 @@ MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, } /********************************************************************* + * _wcsftime_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +{ + return wcsftime_helper(str, max, format, mstm, NULL, loc); +} + +/********************************************************************* * wcsftime (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) { - return MSVCRT__wcsftime_l(str, max, format, mstm, NULL); + return wcsftime_helper(str, max, format, mstm, NULL, NULL); +} + +/********************************************************************* + * _Wcsftime (MSVCRT.@) + */ +MSVCRT_size_t CDECL _Wcsftime(MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, + MSVCRT___lc_time_data *time_data) +{ + return wcsftime_helper(str, max, format, mstm, time_data, NULL); } static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b66a4fe..e57b6d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -44,7 +44,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper

1 0