Module: wine Branch: master Commit: 16f9a9e1224988172c055cd2e276286c62492e7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=16f9a9e1224988172c055cd2e...
Author: Daniel Lehman dlehman@esri.com Date: Tue Jul 17 15:49:10 2018 -0700
msvcr110: Create current scheduler in _CurrentScheduler::_GetNumberOfVirtualProcessors.
Signed-off-by: Daniel Lehman dlehman@esri.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 423b5d2..4b0043b 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 e4c1861..6269c98 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(); }