From eece5e5b198830b2348106cdd7d3cb87706815dd Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Tue, 17 Jul 2018 15:49:10 -0700 Subject: [PATCH 2/2] msvcr110: Create current scheduler in _CurrentScheduler::_GetNumberOfVirtualProcessors. Signed-off-by: Daniel Lehman --- dlls/msvcr110/tests/msvcr110.c | 4 ++-- dlls/msvcrt/scheduler.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 423b5d24995..4b0043bc1a4 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -67,9 +67,9 @@ static void test_CurrentScheduler(void) GetSystemInfo(&si); expect = si.dwNumberOfProcessors; ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); - todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); - todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); } static void test_setlocale(void) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index e4c18612df9..6269c98cdbe 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1063,6 +1063,7 @@ _Scheduler* __cdecl _CurrentScheduler__Get(_Scheduler *ret) unsigned int __cdecl _CurrentScheduler__GetNumberOfVirtualProcessors(void) { TRACE("()\n"); + get_current_scheduler(); return CurrentScheduler_GetNumberOfVirtualProcessors(); } -- 2.17.0