[PATCH 0/1] MR1057: wbemprox: Add HyperVisorPresent property to win32_ComputerSystem
Native Access 2 queries for this property -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Native Access 2 queries for this property --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 466611721ab..c76bbba30d1 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -100,6 +100,7 @@ static const struct column col_compsys[] = { L"Description", CIM_STRING }, { L"Domain", CIM_STRING }, { L"DomainRole", CIM_UINT16 }, + { L"HypervisorPresent", CIM_BOOLEAN}, { L"Manufacturer", CIM_STRING }, { L"Model", CIM_STRING }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -485,6 +486,7 @@ struct record_computersystem const WCHAR *description; const WCHAR *domain; UINT16 domainrole; + int hypervisorpresent; const WCHAR *manufacturer; const WCHAR *model; const WCHAR *name; @@ -1460,6 +1462,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->description = L"AT/AT COMPATIBLE"; rec->domain = L"WORKGROUP"; rec->domainrole = 0; /* standalone workstation */ + rec->hypervisorpresent = 0; rec->manufacturer = L"The Wine Project"; rec->model = L"Wine"; rec->name = get_computername(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 578e9308df7..4226dcea7c9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -532,6 +532,17 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) trace( "numlogicalprocessors %u\n", V_I4( &value ) ); } + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, L"HypervisorPresent", 0, &value, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win7 testbot */, "got %#lx\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &value ) == VT_BOOL, "unexpected variant type %#x\n", V_VT( &value ) ); + ok( type == CIM_BOOLEAN, "unexpected type %#lx\n", type ); + trace( "HypervisorPresent %d\n", V_BOOL( &value ) ); + } + check_property( obj, L"NumberOfProcessors", VT_I4, CIM_UINT32 ); type = 0xdeadbeef; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1057
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=124972 Your paranoid android. === build (build log) === error: patch failed: dlls/wbemprox/builtin.c:1460 error: patch failed: dlls/wbemprox/tests/query.c:532 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/wbemprox/builtin.c:1460 error: patch failed: dlls/wbemprox/tests/query.c:532 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/wbemprox/builtin.c:1460 error: patch failed: dlls/wbemprox/tests/query.c:532 Task: Patch failed to apply
Following documentation I end up with a local wine tree that says wine-5.11.... So apparently patch is diffed against wine-5.11. I don`t know how to solve this -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057#note_10630
On Thu Oct 13 23:48:39 2022 +0000, Louis Lenders wrote:
Following documentation I end up with a local wine tree that says wine-5.11.... So apparently patch is diffed against wine-5.11. I don`t know how to solve this make a fork of this repo on gitlab, then create a new branch on your fork, then add your feature into it, then create a merge request using gitlab. Hopefully if you follow these steps you won't get a 20000 commit old version of wine
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057#note_10633
Etaash Mathamsetty (@etaash.mathamsetty) commented about dlls/wbemprox/builtin.c:
{ L"Description", CIM_STRING }, { L"Domain", CIM_STRING }, { L"DomainRole", CIM_UINT16 }, + { L"HypervisorPresent", CIM_BOOLEAN},
there's a missing space here, just me being picky (after CIM_BOOLEAN) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057#note_10634
Etaash Mathamsetty (@etaash.mathamsetty) commented about dlls/wbemprox/builtin.c:
const WCHAR *description; const WCHAR *domain; UINT16 domainrole; + int hypervisorpresent;
this should be a BOOL rather than int (it seems to be a BOOL based on what I have read) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057#note_10635
Etaash Mathamsetty (@etaash.mathamsetty) commented about dlls/wbemprox/builtin.c:
rec->description = L"AT/AT COMPATIBLE"; rec->domain = L"WORKGROUP"; rec->domainrole = 0; /* standalone workstation */ + rec->hypervisorpresent = 0;
Set this to FALSE instead of 0, since it's now a BOOL -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057#note_10636
On Thu Oct 13 23:53:37 2022 +0000, Etaash Mathamsetty wrote:
this should be a BOOL rather than int (it seems to be a BOOL based on what I have read) No, CIM_BOOLEAN is mapped to int.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057#note_10642
This merge request was closed by Louis Lenders. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057
On Fri Oct 14 06:03:37 2022 +0000, Hans Leidekker wrote:
No, CIM_BOOLEAN is mapped to int. oh my bad then
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1057#note_10662
participants (5)
-
Etaash Mathamsetty (＠etaash.mathamsetty) -
Hans Leidekker (＠hans)
-
Louis Lenders
-
Louis Lenders (＠xe)
-
Marvin