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

Józef Kucia : libs/vkd3d: Support D3D12_FEATURE_ROOT_SIGNATURE.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: vkd3d Branch: master Commit: b9a090769120202c293fba62728e0461afcda0cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b9a090769120202c293fba6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:40 2018 +0200 libs/vkd3d: Support D3D12_FEATURE_ROOT_SIGNATURE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fb57d76..5f3161d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1597,6 +1597,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_ROOT_SIGNATURE: + { + D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; + FIXME("Root signature version 1_1 not supported yet.\n"); + data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Józef Kucia : libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView ().
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: vkd3d Branch: master Commit: 72859f8898945cf5b43dea082968692b6df7df1f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=72859f8898945cf5b43dea0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:41 2018 +0200 libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e1a5adf..fb84e4b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1194,6 +1194,15 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { + case D3D12_SRV_DIMENSION_TEXTURE2D: + vk_view_type = VK_IMAGE_VIEW_TYPE_2D; + miplevel_idx = desc->u.Texture2D.MostDetailedMip; + miplevel_count = desc->u.Texture2D.MipLevels; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + if (desc->u.Texture2D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE; miplevel_idx = desc->u.TextureCube.MostDetailedMip;

1 0

Józef Kucia : libs/vkd3d: Return S_FALSE from D3D12CreateDevice() when device is NULL.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: vkd3d Branch: master Commit: 9ce53b74df1b6417a9e1dd9bdbf5f422a9172dee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9ce53b74df1b6417a9e1dd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:42 2018 +0200 libs/vkd3d: Return S_FALSE from D3D12CreateDevice() when device is NULL. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/vkd3d_main.c | 8 +++++++- tests/d3d12.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 97d642a..0e2d422 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -28,7 +28,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, TRACE("create_info %p, iid %s, device %p.\n", create_info, debugstr_guid(iid), device); - if (!create_info || !device) + if (!create_info) return E_INVALIDARG; if (create_info->type != VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO) { @@ -76,6 +76,12 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (FAILED(hr)) return hr; + if (!device) + { + ID3D12Device_Release(&object->ID3D12Device_iface); + return S_FALSE; + } + return return_interface((IUnknown *)&object->ID3D12Device_iface, &IID_ID3D12Device, iid, device); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 6128a40..e2337c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1080,6 +1080,9 @@ static void test_create_device(void) ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); ID3D12Device_Release(device); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_2, &IID_ID3D12Device, (void **)&device);

1 0

Józef Kucia : d3d10core/tests: Add more tests for multisample resolve.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 158fa85b8f13d90ac05e675643eb79119671a2e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=158fa85b8f13d90ac05e6756… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 17 11:02:38 2018 +0200 d3d10core/tests: Add more tests for multisample resolve. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8fba7a3..f3c3d86 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16899,6 +16899,47 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, &color, 0xffbf7f40, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, }; if (!init_test_context(&test_context))

1 0

Michael Stefaniuc : dswave: Reimplement ParseDescriptor() for DirectSoundWave.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 27dc1d05d79ccb51330225bae2351c39f83ff174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27dc1d05d79ccb51330225ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 23:55:33 2018 +0200 dswave: Reimplement ParseDescriptor() for DirectSoundWave. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave.c | 167 +++++++-------------------------------------- dlls/dswave/tests/dswave.c | 28 +++++--- 2 files changed, 42 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27dc1d05d79ccb513302…

1 0

Alexandre Julliard : user32: Fetch client and window rectangles in a single call.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 3735f36dc94ca68a9344520ac28b2f7d548b0b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3735f36dc94ca68a9344520a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 10:09:55 2018 +0200 user32: Fetch client and window rectangles in a single call. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 665e1c0..66e69f4 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -652,12 +652,12 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) { - RECT client, update; + RECT client, window, update; INT type; /* check if update rgn overlaps with nonclient area */ type = GetRgnBox( whole_rgn, &update ); - WIN_GetRectangles( hwnd, COORDS_SCREEN, 0, &client ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &window, &client ); if ((*flags & UPDATE_NONCLIENT) || update.left < client.left || update.top < client.top || @@ -667,15 +667,10 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) CombineRgn( client_rgn, client_rgn, whole_rgn, RGN_AND ); /* check if update rgn contains complete nonclient area */ - if (type == SIMPLEREGION) + if (type == SIMPLEREGION && EqualRect( &window, &update )) { - RECT window; - GetWindowRect( hwnd, &window ); - if (EqualRect( &window, &update )) - { - DeleteObject( whole_rgn ); - whole_rgn = (HRGN)1; - } + DeleteObject( whole_rgn ); + whole_rgn = (HRGN)1; } } else

1 0

Alexandre Julliard : user32: Make the MonitorFromRect() argument const.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: a36abda77377aba16b0039e1738f4155aa5e9d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36abda77377aba16b0039e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 14:11:32 2018 +0200 user32: Make the MonitorFromRect() argument const. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c92d9af..149b483 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3481,7 +3481,7 @@ static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARA /*********************************************************************** * MonitorFromRect (USER32.@) */ -HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) +HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) { struct monitor_enum_info info; diff --git a/include/winuser.h b/include/winuser.h index a653ef4..8489d05 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3981,7 +3981,7 @@ WINUSERAPI BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); WINUSERAPI BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); #define ModifyMenu WINELIB_NAME_AW(ModifyMenu) WINUSERAPI HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); -WINUSERAPI HMONITOR WINAPI MonitorFromRect(LPRECT,DWORD); +WINUSERAPI HMONITOR WINAPI MonitorFromRect(const RECT*,DWORD); WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD); WINUSERAPI BOOL WINAPI MoveWindow(HWND,INT,INT,INT,INT,BOOL); WINUSERAPI DWORD WINAPI MsgWaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD,DWORD);

1 0

Michael Müller : ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: b7f3e26e897838055644fa897e98dcb35a16b8fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f3e26e897838055644fa89… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 16 20:18:15 2018 -0600 ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index a259883..0213f31 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1063,6 +1063,10 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); break; + case VT_BOOL: + StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.boolVal); + TRACE("Read bool %d\n", prop->u.boolVal); + break; case VT_I2: StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal); TRACE("Read short %d\n", prop->u.iVal); @@ -1081,6 +1085,18 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, StorageUtl_ReadDWord(data, 0, &prop->u.ulVal); TRACE("Read ulong %d\n", prop->u.ulVal); break; + case VT_I8: + StorageUtl_ReadULargeInteger(data, 0, (ULARGE_INTEGER *)&prop->u.hVal); + TRACE("Read long long %s\n", wine_dbgstr_longlong(prop->u.hVal.QuadPart)); + break; + case VT_UI8: + StorageUtl_ReadULargeInteger(data, 0, &prop->u.uhVal); + TRACE("Read ulong long %s\n", wine_dbgstr_longlong(prop->u.uhVal.QuadPart)); + break; + case VT_R8: + memcpy(&prop->u.dblVal, data, sizeof(double)); + TRACE("Read double %f\n", prop->u.dblVal); + break; case VT_LPSTR: { DWORD count;

1 0

Daniel Lehman : msvcr110/tests: Add GetNumberOfVirtualProcessors tests.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 8ae5352a72508eddb01a7f0b62503981942a6e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ae5352a72508eddb01a7f0b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 17 16:23:37 2018 -0700 msvcr110/tests: Add GetNumberOfVirtualProcessors tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index c0a182f..423b5d2 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -33,6 +33,9 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); +static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); +static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); + static BOOL init(void) { HMODULE module; @@ -45,9 +48,30 @@ static BOOL init(void) } p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); + p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + return TRUE; } +static void test_CurrentScheduler(void) +{ + unsigned int ncpus; + unsigned int expect; + SYSTEM_INFO si; + + expect = ~0; + ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); + ok(ncpus == expect, "expected %x, got %x\n", expect, ncpus); + + GetSystemInfo(&si); + expect = si.dwNumberOfProcessors; + ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); + todo_wine 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); +} + static void test_setlocale(void) { int i; @@ -76,5 +100,6 @@ static void test_setlocale(void) START_TEST(msvcr110) { if (!init()) return; + test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); }

1 0

Daniel Lehman : msvcr110: Create current scheduler in _CurrentScheduler:: _GetNumberOfVirtualProcessors.
by Alexandre Julliard 18 Jul '18

18 Jul '18

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

1 0