ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wbemprox: Add ProductType to win32_operatingsystem class. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50805
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 733dc15bae)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Louis Lenders 2021-03-14 21:22:51 +01:00 committed by Michael Stefaniuc
parent ef574b5e0c
commit 81f705ee5b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wbemprox/builtin.c
View File

@ -246,6 +246,7 @@ static const struct column col_operatingsystem[] =
{ L"OSProductSuite", CIM_UINT32 }, { L"OSProductSuite", CIM_UINT32 },
{ L"OSType", CIM_UINT16 }, { L"OSType", CIM_UINT16 },
{ L"Primary", CIM_BOOLEAN }, { L"Primary", CIM_BOOLEAN },
{ L"ProductType", CIM_UINT32 },
{ L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC },
{ L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMajorVersion", CIM_UINT16 },
{ L"ServicePackMinorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 },
@ -654,6 +655,7 @@ struct record_operatingsystem
UINT32 osproductsuite; UINT32 osproductsuite;
UINT16 ostype; UINT16 ostype;
int primary; int primary;
UINT32 producttype;
const WCHAR *serialnumber; const WCHAR *serialnumber;
UINT16 servicepackmajor; UINT16 servicepackmajor;
UINT16 servicepackminor; UINT16 servicepackminor;
@ -3543,6 +3545,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct
rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->osproductsuite = 2461140; /* Windows XP Professional */
rec->ostype = 18; /* WINNT */ rec->ostype = 18; /* WINNT */
rec->primary = -1; rec->primary = -1;
rec->producttype = 1;
rec->serialnumber = get_osserialnumber(); rec->serialnumber = get_osserialnumber();
rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackmajor = ver.wServicePackMajor;
rec->servicepackminor = ver.wServicePackMinor; rec->servicepackminor = ver.wServicePackMinor;

1
dlls/wbemprox/tests/query.c
View File

@ -1289,6 +1289,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services )
check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 );
check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING );
check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 );
check_property( obj, L"ProductType", VT_I4, CIM_UINT32 );
check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 );
check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 );
check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 );