From: Vibhav Pant vibhavp@gmail.com
--- dlls/windows.devices.enumeration/Makefile.in | 2 +- dlls/windows.devices.enumeration/aqs.c | 224 +++++++++++++++++- dlls/windows.devices.enumeration/aqs.h | 3 +- dlls/windows.devices.enumeration/main.c | 100 +++++++- dlls/windows.devices.enumeration/private.h | 1 + .../tests/devices.c | 2 +- 6 files changed, 322 insertions(+), 10 deletions(-)
diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in index 4911acc0185..5d89e9bc645 100644 --- a/dlls/windows.devices.enumeration/Makefile.in +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -1,5 +1,5 @@ MODULE = windows.devices.enumeration.dll -IMPORTS = cfgmgr32 combase uuid +IMPORTS = cfgmgr32 combase propsys uuid
SOURCES = \ access.c \ diff --git a/dlls/windows.devices.enumeration/aqs.c b/dlls/windows.devices.enumeration/aqs.c index bc89d934bd6..c69ba85e8bf 100644 --- a/dlls/windows.devices.enumeration/aqs.c +++ b/dlls/windows.devices.enumeration/aqs.c @@ -29,7 +29,7 @@ #include "aqs.h" #include "aqs.tab.h"
-WINE_DEFAULT_DEBUG_CHANNEL( aqs ); +WINE_DECLARE_DEBUG_CHANNEL( aqs );
static const char id_char[] = { @@ -190,12 +190,16 @@ UINT aqs_lex( void *p, struct aqs_parser *parser ) return token; }
-HRESULT aqs_parse_query( const WCHAR *str ) +static HRESULT aqs_expr_to_filters( const struct aqs_expr *expr, DEVPROP_FILTER_EXPRESSION **filters, ULONG *filters_len ); + +HRESULT aqs_parse_query( const WCHAR *str, DEVPROP_FILTER_EXPRESSION **filters, ULONG *filters_len ) { struct aqs_parser parser = {0}; HRESULT hr; int ret;
+ *filters = NULL; + *filters_len = 0; if (!wcslen( str )) return S_OK;
parser.query = str; @@ -203,8 +207,11 @@ HRESULT aqs_parse_query( const WCHAR *str ) return hr; aqs_debug = TRACE_ON( aqs ); ret = aqs_parse( &parser ); - if (!ret) - FIXME( "semi-stub!\n" ); + if (!ret && parser.expr) + { + hr = aqs_expr_to_filters( parser.expr, filters, filters_len ); + free_expr( parser.expr ); + } else hr = FAILED(parser.error) ? parser.error : E_INVALIDARG;
@@ -312,3 +319,212 @@ void free_expr( struct aqs_expr *expr ) } free( expr ); } + +static HRESULT propval_to_devprop( const PROPVARIANT *val, IPropertyDescription *desc, DEVPROPERTY *devprop ) +{ + DEVPROPTYPE devprop_type; + union + { + BYTE byte; + UINT16 int16; + UINT32 int32; + UINT64 int64; + GUID guid; + DEVPROP_BOOLEAN boolean; + } devprop_val = {0}; + const PROPVARIANT *src; + PROPVARIANT tmp = {0}; + HRESULT hr; + VARTYPE vt; + SIZE_T size; + + if(FAILED(hr = IPropertyDescription_GetPropertyKey( desc, (PROPERTYKEY *)&devprop->CompKey.Key))) + return hr; + if (FAILED(hr = IPropertyDescription_GetPropertyType( desc, &vt ))) + return hr; + if (val->vt == VT_EMPTY) /* We want to treat this as DEVPROP_TYPE_EMPTY */ + goto fallback; + if (FAILED(hr = PropVariantChangeType( &tmp, val, 0, vt ))) + return (hr == E_FAIL || hr == E_NOTIMPL) ? E_INVALIDARG : hr; + + switch (vt) + { + case VT_CLSID: + devprop_type = DEVPROP_TYPE_GUID; + devprop_val.guid = *tmp.puuid; + size = sizeof( devprop_val.guid ); + break; + case VT_I1: + case VT_UI1: + devprop_type = vt == VT_I1 ? DEVPROP_TYPE_SBYTE : DEVPROP_TYPE_BYTE; + devprop_val.byte = tmp.bVal; + size = sizeof( devprop_val.byte ); + break; + case VT_BOOL: + devprop_type = DEVPROP_TYPE_BOOLEAN; + devprop_val.boolean = tmp.boolVal ? DEVPROP_TRUE : DEVPROP_FALSE; + size = sizeof( devprop_val.boolean ); + case VT_I2: + case VT_UI2: + devprop_type = vt == VT_I2 ? DEVPROP_TYPE_INT16 : DEVPROP_TYPE_UINT16; + devprop_val.int16 = tmp.uiVal; + size = sizeof( devprop_val.int16 ); + break; + case VT_I4: + case VT_UI4: + devprop_type = vt == VT_I4 ? DEVPROP_TYPE_INT32 : DEVPROP_TYPE_UINT32; + devprop_val.int32 = tmp.ulVal; + size = sizeof( devprop_val.int32 ); + break; + case VT_I8: + case VT_UI8: + devprop_type = vt == VT_I8 ? DEVPROP_TYPE_INT64 : DEVPROP_TYPE_UINT64; + devprop_val.int64 = tmp.uhVal.QuadPart; + size = sizeof( devprop_val.int64 ); + break; + case VT_LPWSTR: + devprop_type = DEVPROP_TYPE_STRING; + size = (wcslen( tmp.pwszVal ) + 1) * sizeof( WCHAR ); + break; + default: + goto fallback; + } + src = &tmp; + goto done; + +fallback: + switch (val->vt) + { + case VT_BOOL: + devprop_type = DEVPROP_TYPE_BOOLEAN; + devprop_val.boolean = val->bVal; + size = sizeof( devprop_val.boolean ); + break; + case VT_EMPTY: + devprop_type = DEVPROP_TYPE_EMPTY; + size = 0; + break; + case VT_UI4: + devprop_type = DEVPROP_TYPE_UINT32; + devprop_val.int32 = val->ulVal; + size = sizeof( devprop_val.int32 ); + break; + default: /* VT_LPWSTR */ + devprop_type = DEVPROP_TYPE_STRING; + size = (wcslen( val->pwszVal ) + 1) * sizeof( WCHAR ); + break; + } + src = val; + +done: + devprop->CompKey.Store = DEVPROP_STORE_SYSTEM; + devprop->CompKey.LocaleName = NULL; + devprop->Buffer = NULL; + if (size && !(devprop->Buffer = calloc( 1, size ))) + { + PropVariantClear( &tmp ); + return E_OUTOFMEMORY; + } + devprop->BufferSize = size; + switch (devprop_type) + { + case DEVPROP_TYPE_STRING: + wcscpy( devprop->Buffer, src->pwszVal ); + break; + case DEVPROP_TYPE_EMPTY: + break; + default: + memcpy( devprop->Buffer, &devprop_val, size ); + break; + } + PropVariantClear( &tmp ); + return S_OK; +} + +static HRESULT filters_append_op( DEVPROP_FILTER_EXPRESSION **filters, ULONG *len, ULONG len_hint, DEVPROP_OPERATOR op ) +{ + DEVPROP_FILTER_EXPRESSION *tmp; + + if (!(tmp = realloc( *filters, sizeof( *tmp ) * (len_hint ? len_hint : (*len + 1)) ))) + return E_OUTOFMEMORY; + + *filters = tmp; + tmp = &(*filters)[*len]; + memset( tmp, 0, sizeof( *tmp ) ); + tmp->Operator = op; + *len += 1; + return S_OK; +} + +static HRESULT devprop_filters_append_expr( const struct aqs_expr *expr, DEVPROP_FILTER_EXPRESSION **filters, ULONG *len ) +{ + static const DEVPROP_OPERATOR boolean_ops[] = { + DEVPROP_OPERATOR_AND_OPEN, + DEVPROP_OPERATOR_OR_OPEN, + DEVPROP_OPERATOR_NOT_OPEN, + }; + static const DEVPROP_OPERATOR compare_ops[] = { + DEVPROP_OPERATOR_EQUALS, + DEVPROP_OPERATOR_NOT_EQUALS, + DEVPROP_OPERATOR_GREATER_THAN, + DEVPROP_OPERATOR_GREATER_THAN_EQUALS, + DEVPROP_OPERATOR_LESS_THAN, + DEVPROP_OPERATOR_LESS_THAN_EQUALS, + }; + HRESULT hr; + + if (!expr) + return S_OK; + + switch (expr->op_type) + { + case OP_TYPE_BOOLEAN: + { + const struct expr_boolean *boolean = &expr->u.boolean; + DEVPROP_OPERATOR open = boolean_ops[boolean->op]; + DEVPROP_OPERATOR close = open + (DEVPROP_OPERATOR_AND_CLOSE - DEVPROP_OPERATOR_AND_OPEN); + + /* We'll append at least two filters, _OPEN and _CLOSE. */ + if (FAILED(hr = filters_append_op( filters, len, *len + 2, open ))) + goto done; + if (FAILED(hr = devprop_filters_append_expr( boolean->lhs, filters, len ))) + goto done; + if (FAILED(hr = devprop_filters_append_expr( boolean->rhs, filters, len ))) + goto done; + hr = filters_append_op( filters, len, 0, close ); + break; + } + case OP_TYPE_COMPARE: + { + const struct expr_compare *compare = &expr->u.compare; + DEVPROP_OPERATOR op; + + if ((compare->op == OP_EQ || compare->op == OP_NEQ) && compare->val.vt == VT_EMPTY) + op = compare->op == OP_EQ ? DEVPROP_OPERATOR_NOT_EXISTS : DEVPROP_OPERATOR_EXISTS; + else + op = compare_ops[expr->op_type]; + if (FAILED(hr = filters_append_op( filters, len, 0, op ))) + goto done; + hr = propval_to_devprop( &compare->val, compare->prop_desc, &(*filters)[*len - 1].Property); + break; + } + } + +done: + return hr; +} + +static HRESULT aqs_expr_to_filters( const struct aqs_expr *expr, DEVPROP_FILTER_EXPRESSION **filters, ULONG *filters_len ) +{ + HRESULT hr; + + *filters = NULL; + *filters_len = 0; + if (FAILED(hr = devprop_filters_append_expr( expr, filters, filters_len ))) + { + free_devprop_filters( *filters, *filters_len ); + *filters = NULL; + *filters_len = 0; + } + return hr; +} diff --git a/dlls/windows.devices.enumeration/aqs.h b/dlls/windows.devices.enumeration/aqs.h index cb4d8ec59ee..503183c7648 100644 --- a/dlls/windows.devices.enumeration/aqs.h +++ b/dlls/windows.devices.enumeration/aqs.h @@ -95,7 +95,7 @@ struct aqs_expr } u; };
-extern HRESULT aqs_parse_query( const WCHAR *str ); +extern HRESULT aqs_parse_query( const WCHAR *str, DEVPROP_FILTER_EXPRESSION **filters, ULONG *filters_len );
extern UINT aqs_lex( void *val, struct aqs_parser *parser );
@@ -108,3 +108,4 @@ extern HRESULT get_compare_expr( struct aqs_parser *parser, enum operator_compar PROPVARIANT val, struct aqs_expr **expr );
extern void free_expr( struct aqs_expr *expr ); +extern void free_devprop_filters( DEVPROP_FILTER_EXPRESSION *filters, ULONG filters_len ); diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index ca5af3f2100..88c6664805e 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -531,6 +531,90 @@ static HRESULT WINAPI device_statics_CreateFromIdAsyncAdditionalProperties( IDev return E_NOTIMPL; }
+struct devquery_params +{ + IUnknown IUnknown_iface; + DEVPROP_FILTER_EXPRESSION *filters; + ULONG filters_len; + LONG ref; +}; + +static inline struct devquery_params *impl_from_IUnknown( IUnknown *iface ) +{ + return CONTAINING_RECORD( iface, struct devquery_params, IUnknown_iface ); +} + +static HRESULT WINAPI devquery_params_QueryInterface( IUnknown *iface, REFIID iid, void **out ) +{ + TRACE( "iface %p, iid %s, out %p\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown )) + { + IUnknown_AddRef(( iface )); + *out = iface; + return S_OK; + } + + *out = NULL; + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + return S_OK; +} + +static ULONG WINAPI devquery_params_AddRef( IUnknown *iface ) +{ + struct devquery_params *impl = impl_from_IUnknown( iface ); + + TRACE( "iface %p\n", iface ); + return InterlockedIncrement( &impl->ref ); +} + +static void free_devprop_filters( DEVPROP_FILTER_EXPRESSION *filters, ULONG filters_len ) +{ + ULONG i; + + for (i = 0; i < filters_len; i++) + free( filters[i].Property.Buffer ); + free( filters ); +} + +static ULONG WINAPI devquery_params_Release( IUnknown *iface ) +{ + struct devquery_params *impl = impl_from_IUnknown( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p\n", iface ); + + if (!ref) + { + free_devprop_filters( impl->filters, impl->filters_len ); + free( impl ); + } + return ref; +} + +static const IUnknownVtbl devquery_params_vtbl = +{ + /* IUnknown */ + devquery_params_QueryInterface, + devquery_params_AddRef, + devquery_params_Release, +}; + +static HRESULT create_devquery_params( DEVPROP_FILTER_EXPRESSION *filters, ULONG filters_len, IUnknown **out ) +{ + struct devquery_params *impl; + + *out = NULL; + if (!(impl = calloc( 1, sizeof( *impl ) ))) return E_OUTOFMEMORY; + + impl->IUnknown_iface.lpVtbl = &devquery_params_vtbl; + impl->ref = 1; + impl->filters = filters; + impl->filters_len = filters_len; + *out = &impl->IUnknown_iface; + return S_OK; +} + static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ) { static const struct vector_iids iids = @@ -541,6 +625,7 @@ static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT * .iterator = &IID_IIterator_DeviceInformation, }; IVectorView_DeviceInformation *view; + struct devquery_params *params; IVector_IInspectable *vector; const DEV_OBJECT *objects; ULONG len, i; @@ -548,8 +633,9 @@ static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *
TRACE( "invoker %p, param %p, result %p\n", invoker, param, result );
+ params = impl_from_IUnknown( param ); if (FAILED(hr = vector_create( &iids, (void *)&vector ))) return hr; - if (FAILED(hr = DevGetObjects( DevObjectTypeDeviceInterfaceDisplay, DevQueryFlagNone, 0, NULL, 0, NULL, &len, &objects ))) + if (FAILED(hr = DevGetObjects( DevObjectTypeDeviceInterfaceDisplay, DevQueryFlagNone, 0, NULL, params->filters_len, params->filters, &len, &objects ))) { IVector_IInspectable_Release( vector ); return hr; @@ -590,12 +676,20 @@ static HRESULT WINAPI device_statics_FindAllAsyncDeviceClass( IDeviceInformation static HRESULT WINAPI device_statics_FindAllAsyncAqsFilter( IDeviceInformationStatics *iface, HSTRING filter, IAsyncOperation_DeviceInformationCollection **op ) { + DEVPROP_FILTER_EXPRESSION *filters; + ULONG filters_len; + IUnknown *params; HRESULT hr;
TRACE( "iface %p, aqs %p, op %p\n", iface, debugstr_hstring(filter), op );
- if (FAILED(hr = aqs_parse_query(WindowsGetStringRawBuffer( filter, NULL )))) return hr; - return async_operation_inspectable_create( &IID_IAsyncOperation_DeviceInformationCollection, (IUnknown *)iface, NULL, + if (FAILED(hr = aqs_parse_query(WindowsGetStringRawBuffer( filter, NULL ), &filters, &filters_len ))) return hr; + if (FAILED(hr = create_devquery_params( filters, filters_len, ¶ms ))) + { + free_devprop_filters( filters, filters_len ); + return hr; + } + return async_operation_inspectable_create( &IID_IAsyncOperation_DeviceInformationCollection, (IUnknown *)iface, (IUnknown *)params, find_all_async, (IAsyncOperation_IInspectable **)op ); }
diff --git a/dlls/windows.devices.enumeration/private.h b/dlls/windows.devices.enumeration/private.h index 0ce5624b21c..f61b16e6b6c 100644 --- a/dlls/windows.devices.enumeration/private.h +++ b/dlls/windows.devices.enumeration/private.h @@ -41,6 +41,7 @@ #include "wine/list.h"
#include "async_private.h" +#include "query_params.h" #include "weakref.h"
struct vector_iids diff --git a/dlls/windows.devices.enumeration/tests/devices.c b/dlls/windows.devices.enumeration/tests/devices.c index 1b2a54915cd..babe51b4d5f 100644 --- a/dlls/windows.devices.enumeration/tests/devices.c +++ b/dlls/windows.devices.enumeration/tests/devices.c @@ -662,7 +662,7 @@ static void test_DeviceInformation_filters( void ) test_FindAllAsyncAqsFilter( statics, simple, FALSE, FALSE ); test_FindAllAsyncAqsFilter( statics, case_insensitive, TRUE, FALSE ); test_FindAllAsyncAqsFilter( statics, no_results, FALSE, TRUE ); - test_FindAllAsyncAqsFilter( statics, invalid_comparand_type, TRUE, FALSE ); + test_FindAllAsyncAqsFilter( statics, invalid_comparand_type, FALSE, FALSE ); test_FindAllAsyncAqsFilter( statics, invalid_empty, FALSE, FALSE ); test_FindAllAsyncAqsFilter( statics, invalid_operator, FALSE, FALSE ); test_FindAllAsyncAqsFilter( statics, invalid_operand, FALSE, FALSE );