From: Vibhav Pant vibhavp@gmail.com
--- dlls/cfgmgr32/main.c | 18 +++++++++++++++--- dlls/cfgmgr32/tests/cfgmgr32.c | 12 ++++++------ include/devpropdef.h | 9 +++++++++ 3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index 2b0e4c029ba..f914fa0680b 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -1109,15 +1109,27 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
static const char *debugstr_DEVPROPKEY( const DEVPROPKEY *key ) { - if (!key) return wine_dbg_sprintf("(null)"); + if (!key) return "(null)"; return wine_dbg_sprintf( "{%s, %04lx}", debugstr_guid( &key->fmtid ), key->pid ); }
const DEVPROPERTY *WINAPI DevFindProperty( const DEVPROPKEY *key, DEVPROPSTORE store, const WCHAR *locale, ULONG props_len, const DEVPROPERTY *props ) { - FIXME( "(%s, %d, %s, %lu, %p): stub!\n", debugstr_DEVPROPKEY( key ), store, debugstr_w( locale ), props_len, - props ); + DEVPROPCOMPKEY comp_key; + ULONG i; + + TRACE( "(%s, %d, %s, %lu, %p)\n", debugstr_DEVPROPKEY( key ), store, debugstr_w( locale ), props_len, props ); + + /* Windows does not validate parameters here. */ + comp_key.Key = *key; + comp_key.Store = store; + comp_key.LocaleName = locale; + for (i = 0; i < props_len; i++) + { + if (IsEqualDevPropCompKey( comp_key, props[i].CompKey )) + return &props[i]; + } return NULL; }
diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c index 6564a4eb5aa..6384262074b 100644 --- a/dlls/cfgmgr32/tests/cfgmgr32.c +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -642,7 +642,7 @@ static void test_DevGetObjectProperties( DEV_OBJECT_TYPE type, const WCHAR *id, ok( dev_property_val_equal( &exp_props[i], &buf[j] ), "%s != %s\n", debugstr_DEVPROP_val( &buf[j] ), debugstr_DEVPROP_val( &exp_props[i] ) ); found_prop = pDevFindProperty( &exp_props[i].CompKey.Key, DEVPROP_STORE_SYSTEM, NULL, buf_len, buf ); - todo_wine ok( found_prop == &buf[i], "got found_prop %p != %p\n", found_prop, &buf[i] ); + ok( found_prop == &buf[i], "got found_prop %p != %p\n", found_prop, &buf[i] ); } winetest_pop_context(); rem_props--; @@ -680,7 +680,7 @@ static void test_DevGetObjectProperties( DEV_OBJECT_TYPE type, const WCHAR *id, winetest_push_context( "%s", debugstr_DEVPROPKEY( &exp_props[i].CompKey.Key ) ); rem_props--; found_prop = pDevFindProperty( &exp_props[i].CompKey.Key, DEVPROP_STORE_SYSTEM, NULL, buf_len, buf ); - todo_wine ok( found_prop == &buf[j], "got found_prop %p != %p\n", found_prop, &buf[j] ); + ok( found_prop == &buf[j], "got found_prop %p != %p\n", found_prop, &buf[j] ); winetest_pop_context(); break; } @@ -703,7 +703,7 @@ static void test_DevGetObjectProperties( DEV_OBJECT_TYPE type, const WCHAR *id, debugstr_guid( &buf[0].CompKey.Key.fmtid ), buf[0].CompKey.Key.pid ); ok( buf[0].Type == DEVPROP_TYPE_EMPTY, "got Type %#lx\n", buf[0].Type ); found_prop = pDevFindProperty( &DEVPKEY_dummy, DEVPROP_STORE_SYSTEM, NULL, buf_len, buf ); - todo_wine ok( found_prop == &buf[0], "got found_prop %p != %p\n", found_prop, &buf[0] ); + ok( found_prop == &buf[0], "got found_prop %p != %p\n", found_prop, &buf[0] ); pDevFreeObjectProperties( buf_len, buf ); } free( keys ); @@ -776,7 +776,7 @@ static void test_dev_object_iface_props( int line, const DEV_OBJECT *obj, const
found_prop = pDevFindProperty( &property->CompKey.Key, DEVPROP_STORE_SYSTEM, NULL, obj->cPropertyCount, obj->pProperties ); - todo_wine ok( found_prop == property, "got found_prop %p != %p\n", found_prop, property ); + ok( found_prop == property, "got found_prop %p != %p\n", found_prop, property ); free( buf ); winetest_pop_context(); break; @@ -922,7 +922,7 @@ static void test_DevGetObjects( void ) debugstr_guid( &obj->pProperties[0].CompKey.Key.fmtid ), obj->pProperties[0].CompKey.Key.pid, debugstr_guid( &prop->key.fmtid ), prop->key.pid ); found_prop = pDevFindProperty( &prop->key, DEVPROP_STORE_SYSTEM, NULL, obj->cPropertyCount, obj->pProperties ); - todo_wine ok( found_prop == &obj->pProperties[0], "got found_prop %p != %p\n", found_prop, &obj->pProperties[0] ); + ok( found_prop == &obj->pProperties[0], "got found_prop %p != %p\n", found_prop, &obj->pProperties[0] ); } /* Search for a property not in obj->pProperties, we should get NULL, as we haven't requested this * property in the DevGetObjects call. */ @@ -961,7 +961,7 @@ static void test_DevGetObjects( void ) ok( obj->pProperties[0].Type == DEVPROP_TYPE_EMPTY, "got Type %#lx != %#x", obj->pProperties[0].Type, DEVPROP_TYPE_EMPTY ); found_prop = pDevFindProperty( &DEVPKEY_dummy, DEVPROP_STORE_SYSTEM, NULL, obj->cPropertyCount, obj->pProperties ); - todo_wine ok( found_prop == &obj->pProperties[0], "got found_prop %p != %p\n", found_prop, &obj->pProperties[0] ); + ok( found_prop == &obj->pProperties[0], "got found_prop %p != %p\n", found_prop, &obj->pProperties[0] ); } winetest_pop_context(); } diff --git a/include/devpropdef.h b/include/devpropdef.h index de82648e661..b654425dd91 100644 --- a/include/devpropdef.h +++ b/include/devpropdef.h @@ -114,6 +114,15 @@ typedef struct _DEVPROPCOMPKEY PCWSTR LocaleName; } DEVPROPCOMPKEY, *PDEVPROPCOMPKEY;
+#ifndef IsEqualLocaleName +#define IsEqualLocaleName(a,b) ((a) == (b) || ((a) && (b) && !wcsicmp((a),(b)))) +#endif + +#ifndef IsEqualDevPropCompKey +#define IsEqualDevPropCompKey(a,b) (IsEqualDevPropKey((a).Key,(b).Key) && (a).Store == (b).Store && \ + IsEqualLocaleName((a).LocaleName,(b).LocaleName)) +#endif + typedef struct _DEVPROPERTY { DEVPROPCOMPKEY CompKey;