[PATCH 0/1] MR10212: propsys: Add more System Device Properties.

[Alistair Leslie-Hughes (＠alesliehughes)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10212

[PATCH 1/1] propsys: Add more System Device Properties.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <[e-mail]>

---
 dlls/propsys/propsys_main.c  | 2 ++
 dlls/propsys/tests/propsys.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c
index 011c05eca96..b8e800fbbc4 100644
--- a/dlls/propsys/propsys_main.c
+++ b/dlls/propsys/propsys_main.c
@@ -855,6 +855,8 @@ static struct system_property_description system_properties[] =
     {L"System.Devices.Aep.DeviceAddress", &PKEY_Devices_Aep_DeviceAddress, VT_LPWSTR},
     {L"System.Devices.AepContainer.IsPaired", &PKEY_Devices_AepContainer_IsPaired, VT_BOOL},
     {L"System.Devices.AepService.ProtocolId", &PKEY_Devices_AepService_ProtocolId, VT_CLSID},
+    {L"System.Devices.ModelName", &PKEY_Devices_ModelName, VT_LPWSTR},
+    {L"System.Devices.Manufacturer", &PKEY_Devices_Manufacturer, VT_LPWSTR},
 };
 
 static HRESULT propdesc_from_system_property( const struct system_property_description *desc, IPropertyDescription **out )
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index 17c9e87d7ef..c7ed96d72df 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -3102,7 +3102,9 @@ static void test_PropertySystem(void)
         {&PKEY_Devices_ContainerId, L"System.Devices.ContainerId", VT_CLSID},
         {&PKEY_Devices_InterfaceClassGuid, L"System.Devices.InterfaceClassGuid", VT_CLSID, TYPE_E_ELEMENTNOTFOUND /* Win7 */},
         {&PKEY_Devices_HardwareIds, L"System.Devices.HardwareIds", VT_VECTOR | VT_LPWSTR, TYPE_E_ELEMENTNOTFOUND /* Win7 */},
-        {&PKEY_Devices_ClassGuid, L"System.Devices.ClassGuid", VT_CLSID, TYPE_E_ELEMENTNOTFOUND /* <= Win8 */}
+        {&PKEY_Devices_ClassGuid, L"System.Devices.ClassGuid", VT_CLSID, TYPE_E_ELEMENTNOTFOUND /* <= Win8 */},
+        {&PKEY_Devices_ModelName, L"System.Devices.ModelName", VT_LPWSTR},
+        {&PKEY_Devices_Manufacturer, L"System.Devices.Manufacturer", VT_LPWSTR},
     };
     IPropertySystem *system;
     HRESULT hr;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10212