From e92999d7d540d354380e669efc074146d60ce1f5 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 20 Mar 2017 05:54:30 +0100 Subject: [PATCH] Added patch to add Vendor field in Win32_ComputerSystemProduct. --- patches/patchinstall.sh | 2 + ...dor-field-in-Win32_ComputerSystemPro.patch | 60 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 patches/wbemprox-Win32_VideoController/0005-wbemprox-Add-Vendor-field-in-Win32_ComputerSystemPro.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 28dec813..406fc3ec 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -7961,11 +7961,13 @@ if test "$enable_wbemprox_Win32_VideoController" -eq 1; then patch_apply wbemprox-Win32_VideoController/0002-wbemprox-Add-Status-for-Win32_VideoController.patch patch_apply wbemprox-Win32_VideoController/0003-wbemprox-Add-InstalledDisplayDrivers-for-Win32_Video.patch patch_apply wbemprox-Win32_VideoController/0004-wbemprox-Add-DriverDate-for-Win32_VideoController.patch + patch_apply wbemprox-Win32_VideoController/0005-wbemprox-Add-Vendor-field-in-Win32_ComputerSystemPro.patch ( printf '%s\n' '+ { "Michael Müller", "wbemprox: Add ConfigManagerErrorCode for Win32_VideoController.", 1 },'; printf '%s\n' '+ { "Michael Müller", "wbemprox: Add Status for Win32_VideoController.", 1 },'; printf '%s\n' '+ { "Michael Müller", "wbemprox: Add InstalledDisplayDrivers for Win32_VideoController.", 1 },'; printf '%s\n' '+ { "Michael Müller", "wbemprox: Add DriverDate for Win32_VideoController.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "wbemprox: Add Vendor field in Win32_ComputerSystemProduct.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/wbemprox-Win32_VideoController/0005-wbemprox-Add-Vendor-field-in-Win32_ComputerSystemPro.patch b/patches/wbemprox-Win32_VideoController/0005-wbemprox-Add-Vendor-field-in-Win32_ComputerSystemPro.patch new file mode 100644 index 00000000..16c296e5 --- /dev/null +++ b/patches/wbemprox-Win32_VideoController/0005-wbemprox-Add-Vendor-field-in-Win32_ComputerSystemPro.patch @@ -0,0 +1,60 @@ +From eae806b2918bb7e417c0deeca518102434eb7041 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Sun, 19 Mar 2017 21:42:24 +0100 +Subject: wbemprox: Add Vendor field in Win32_ComputerSystemProduct. + +--- + dlls/wbemprox/builtin.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c +index ffcffaa621..70907bf1d4 100644 +--- a/dlls/wbemprox/builtin.c ++++ b/dlls/wbemprox/builtin.c +@@ -391,6 +391,8 @@ static const WCHAR prop_varianttypeW[] = + {'V','a','r','i','a','n','t','T','y','p','e',0}; + static const WCHAR prop_versionW[] = + {'V','e','r','s','i','o','n',0}; ++static const WCHAR prop_vendorW[] = ++ {'V','e','n','d','o','r',0}; + static const WCHAR prop_videoarchitectureW[] = + {'V','i','d','e','o','A','r','c','h','i','t','e','c','t','u','r','e',0}; + static const WCHAR prop_videomemorytypeW[] = +@@ -452,7 +454,8 @@ static const struct column col_compsys[] = + static const struct column col_compsysproduct[] = + { + { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, +- { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC } ++ { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC }, ++ { prop_vendorW, CIM_STRING }, + }; + static const struct column col_datafile[] = + { +@@ -760,6 +763,8 @@ static const WCHAR compsysproduct_identifyingnumberW[] = + static const WCHAR compsysproduct_uuidW[] = + {'d','e','a','d','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-', + 'd','e','a','d','d','e','a','d','d','e','a','d',0}; ++static const WCHAR compsysproduct_vendorW[] = ++ {'W','i','n','e',0}; + static const WCHAR diskdrive_interfacetypeW[] = + {'I','D','E',0}; + static const WCHAR diskdrive_manufacturerW[] = +@@ -854,6 +859,7 @@ struct record_computersystemproduct + { + const WCHAR *identifyingnumber; + const WCHAR *uuid; ++ const WCHAR *vendor; + }; + struct record_datafile + { +@@ -1448,6 +1454,7 @@ static enum fill_status fill_compsysproduct( struct table *table, const struct e + rec = (struct record_computersystemproduct *)table->data; + rec->identifyingnumber = compsysproduct_identifyingnumberW; + rec->uuid = get_compsysproduct_uuid(); ++ rec->vendor = compsysproduct_vendorW; + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + +-- +2.11.0 +