Module: wine Branch: master Commit: 7b8d104d6682785fe395d7651f33fb9941f64314 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8d104d6682785fe395d7651... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 20:54:02 2019 +0200 msvcrt: Update arguments for some forwarded functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 4ba1825..1535456 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -36,8 +36,8 @@ @ cdecl -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcp120.??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @@ -521,8 +521,8 @@ @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z @ stub -arch=win32 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PAV12(a)I@Z @ stub -arch=win64 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PEAV12(a)I@Z -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z @ stub -arch=win32 ?wait_for_all(a)agent@Concurrency@@SAXIPAPAV12(a)PAW4agent_status@2(a)I@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index a9c21cb..af6b0fe 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -48,9 +48,9 @@ @ cdecl -arch=arm ??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z -@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z +@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ cdecl -arch=arm ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @@ -790,9 +790,9 @@ @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z -@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAAII(a)Z -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z +@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAAII(a)Z +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z @ cdecl -arch=arm ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z