October 2012 - Wine-commits

Henri Verbeet : wined3d: Add support for SM4 relative addressing.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: fc185f9baeba656178839b8a0cc8d12eac4afad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc185f9baeba656178839b8a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:58 2012 +0200 wined3d: Add support for SM4 relative addressing. --- dlls/wined3d/shader.c | 24 +++--- dlls/wined3d/shader_sm4.c | 157 ++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 149 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc185f9baeba656178839…

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk.Name.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: dca427fded76dfc7c95c49df1a36ccb96e5d81bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca427fded76dfc7c95c49df1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 14:24:54 2012 +0200 wbemprox: Implement Win32_LogicalDisk.Name. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5be3b2c..063c16d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -247,6 +247,7 @@ static const struct column col_logicaldisk[] = { prop_drivetypeW, CIM_UINT32, VT_I4 }, { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_freespaceW, CIM_UINT64 }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_sizeW, CIM_UINT64 } }; static const struct column col_networkadapter[] = @@ -421,6 +422,7 @@ struct record_logicaldisk UINT32 drivetype; const WCHAR *filesystem; UINT64 freespace; + const WCHAR *name; UINT64 size; }; struct record_networkadapter @@ -681,6 +683,7 @@ static void fill_logicaldisk( struct table *table ) rec->drivetype = type; rec->filesystem = get_filesystem( root ); rec->freespace = get_freespace( root, &size ); + rec->name = heap_strdupW( device_id ); rec->size = size; offset += sizeof(*rec); num_rows++;

1 0

Hans Leidekker : wbemprox: Always convert from BSTR.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 3b8266d20b9242450c45a27b4e75304391116c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8266d20b9242450c45a27b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 14:25:13 2012 +0200 wbemprox: Always convert from BSTR. --- dlls/wbemprox/class.c | 21 ++++++++++++++++----- dlls/wbemprox/query.c | 30 +++++++++++++++++++++--------- dlls/wbemprox/wbemprox_private.h | 3 +++ 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index b1fc364..c17e1b3 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -232,6 +232,20 @@ static struct record *create_record( const struct column *columns, UINT num_cols return record; } +void destroy_array( struct array *array, CIMTYPE type ) +{ + UINT i, size; + + if (!array) return; + if (type == CIM_STRING || type == CIM_DATETIME) + { + size = get_type_size( type ); + for (i = 0; i < array->count; i++) heap_free( *(WCHAR **)((char *)array->ptr + i * size) ); + } + heap_free( array->ptr ); + heap_free( array ); +} + static void destroy_record( struct record *record ) { UINT i; @@ -241,11 +255,8 @@ static void destroy_record( struct record *record ) { if (record->fields[i].type == CIM_STRING || record->fields[i].type == CIM_DATETIME) heap_free( record->fields[i].u.sval ); - else if ((record->fields[i].type & CIM_FLAG_ARRAY) && record->fields[i].u.aval) - { - heap_free( record->fields[i].u.aval->ptr ); - heap_free( record->fields[i].u.aval ); - } + else if (record->fields[i].type & CIM_FLAG_ARRAY) + destroy_array( record->fields[i].u.aval, record->fields[i].type & CIM_TYPE_MASK ); } heap_free( record->fields ); heap_free( record ); diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f2c1782..b48d75d 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -639,8 +639,6 @@ static void set_variant( VARTYPE type, LONGLONG val, void *val_ptr, VARIANT *ret V_VT( ret ) = type; } -#define CIM_TYPE_MASK 0xfff - HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type, LONG *flavor ) { @@ -750,19 +748,33 @@ static struct array *to_array( VARIANT *var, CIMTYPE *type ) ret->count = bound + 1; size = get_type_size( basetype ); - if (!(ret->ptr = heap_alloc( ret->count * size ))) + if (!(ret->ptr = heap_alloc_zero( ret->count * size ))) { heap_free( ret ); return NULL; } for (i = 0; i < ret->count; i++) { - if (SafeArrayGetElement( V_ARRAY( var ), &i, (char *)ret->ptr + i * size ) != S_OK) + void *ptr = (char *)ret->ptr + i * size; + if (vartype == VT_BSTR) + { + BSTR str; + if (SafeArrayGetElement( V_ARRAY( var ), &i, &str ) != S_OK) + { + destroy_array( ret, basetype ); + return NULL; + } + *(WCHAR **)ptr = heap_strdupW( str ); + SysFreeString( str ); + if (!*(WCHAR **)ptr) + { + destroy_array( ret, basetype ); + return NULL; + } + } + else if (SafeArrayGetElement( V_ARRAY( var ), &i, ptr ) != S_OK) { - if (vartype == VT_BSTR) - for (i--; i >= 0; i--) SysFreeString( *(BSTR *)(char *)ret->ptr + i * size ); - heap_free( ret->ptr ); - heap_free( ret ); + destroy_array( ret, basetype ); return NULL; } } @@ -790,7 +802,7 @@ HRESULT to_longlong( VARIANT *var, LONGLONG *val, CIMTYPE *type ) *type = CIM_BOOLEAN; break; case VT_BSTR: - *val = (INT_PTR)SysAllocString( V_BSTR( var ) ); + *val = (INT_PTR)heap_strdupW( V_BSTR( var ) ); if (!*val) return E_OUTOFMEMORY; *type = CIM_STRING; break; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 0f1305e..8de3a0c 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -31,6 +31,8 @@ enum param_direction PARAM_IN = 1 }; +#define CIM_TYPE_MASK 0x00000fff + #define COL_TYPE_MASK 0x0000ffff #define COL_FLAG_DYNAMIC 0x00010000 #define COL_FLAG_KEY 0x00020000 @@ -177,6 +179,7 @@ HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN; HRESULT to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; +void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Support overriding the CIM to VARIANT type mapping for method parameters.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 248049f36e64b96e5f4d64f616073208372243e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248049f36e64b96e5f4d64f61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 14:25:39 2012 +0200 wbemprox: Support overriding the CIM to VARIANT type mapping for method parameters. --- dlls/wbemprox/builtin.c | 12 ++++++++---- dlls/wbemprox/class.c | 36 ++++++++++++++++++++++-------------- dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 063c16d..ccb6d53 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -186,6 +186,8 @@ static const WCHAR prop_typeW[] = {'T','y','p','e',0}; static const WCHAR prop_uniqueidW[] = {'U','n','i','q','u','e','I','d',0}; +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}; @@ -277,6 +279,7 @@ static const struct column col_params[] = { prop_directionW, CIM_SINT32 }, { prop_parameterW, CIM_STRING }, { prop_typeW, CIM_UINT32 }, + { prop_varianttypeW, CIM_UINT32 }, { prop_defaultvalueW, CIM_UINT32 } }; static const struct column col_process[] = @@ -452,6 +455,7 @@ struct record_params INT32 direction; const WCHAR *parameter; UINT32 type; + UINT32 varianttype; UINT32 defaultvalue; }; struct record_process @@ -537,13 +541,13 @@ static const struct record_diskdrive data_diskdrive[] = }; static const struct record_params data_params[] = { - { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_UINT32, 0x80000002 }, + { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, { class_stdregprovW, method_enumkeyW, 1, param_subkeynameW, CIM_STRING }, - { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32 }, + { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_stdregprovW, method_enumkeyW, -1, param_namesW, CIM_STRING|CIM_FLAG_ARRAY }, - { class_stdregprovW, method_enumvaluesW, 1, param_defkeyW, CIM_UINT32, 0x80000002 }, + { class_stdregprovW, method_enumvaluesW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, { class_stdregprovW, method_enumvaluesW, 1, param_subkeynameW, CIM_STRING }, - { class_stdregprovW, method_enumvaluesW, -1, param_returnvalueW, CIM_UINT32 }, + { class_stdregprovW, method_enumvaluesW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_stdregprovW, method_enumvaluesW, -1, param_namesW, CIM_STRING|CIM_FLAG_ARRAY }, { class_stdregprovW, method_enumvaluesW, -1, param_typesW, CIM_SINT32|CIM_FLAG_ARRAY } }; diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index c17e1b3..a2d7068 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -225,8 +225,9 @@ static struct record *create_record( const struct column *columns, UINT num_cols } for (i = 0; i < num_cols; i++) { - record->fields[i].type = columns[i].type; - record->fields[i].u.ival = 0; + record->fields[i].type = columns[i].type; + record->fields[i].vartype = columns[i].vartype; + record->fields[i].u.ival = 0; } record->count = num_cols; return record; @@ -341,34 +342,37 @@ static HRESULT WINAPI class_object_GetQualifierSet( static HRESULT record_get_value( const struct record *record, UINT index, VARIANT *var, CIMTYPE *type ) { + VARTYPE vartype = record->fields[index].vartype; + if (type) *type = record->fields[index].type; if (record->fields[index].type & CIM_FLAG_ARRAY) { - V_VT( var ) = VT_ARRAY; - V_ARRAY( var ) = to_safearray( record->fields[index].u.aval, record->fields[index].type & COL_TYPE_MASK ); + V_VT( var ) = vartype ? vartype : to_vartype( record->fields[index].type & CIM_TYPE_MASK ) | VT_ARRAY; + V_ARRAY( var ) = to_safearray( record->fields[index].u.aval, record->fields[index].type & CIM_TYPE_MASK ); return S_OK; } switch (record->fields[index].type) { case CIM_STRING: case CIM_DATETIME: - V_VT( var ) = VT_BSTR; + if (!vartype) vartype = VT_BSTR; V_BSTR( var ) = SysAllocString( record->fields[index].u.sval ); - return S_OK; + break; case CIM_SINT32: - V_VT( var ) = VT_I4; + if (!vartype) vartype = VT_I4; V_I4( var ) = record->fields[index].u.ival; - return S_OK; + break; case CIM_UINT32: - V_VT( var ) = VT_UI4; + if (!vartype) vartype = VT_UI4; V_UI4( var ) = record->fields[index].u.ival; - return S_OK; + break; default: FIXME("unhandled type %u\n", record->fields[index].type); - break; + return WBEM_E_INVALID_PARAMETER; } - return WBEM_E_INVALID_PARAMETER; + V_VT( var ) = vartype; + return S_OK; } static HRESULT WINAPI class_object_Get( @@ -713,6 +717,7 @@ static HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UI { static const WCHAR parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; static const WCHAR typeW[] = {'T','y','p','e',0}; + static const WCHAR varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; struct column *columns; BYTE *row; @@ -739,8 +744,11 @@ static HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UI hr = IWbemClassObject_Get( param, typeW, 0, &val, NULL, NULL ); if (hr != S_OK) goto error; - columns[i].type = V_UI4( &val ); - columns[i].vartype = 0; + columns[i].type = V_UI4( &val ); + + hr = IWbemClassObject_Get( param, varianttypeW, 0, &val, NULL, NULL ); + if (hr != S_OK) goto error; + columns[i].vartype = V_UI4( &val ); hr = IWbemClassObject_Get( param, defaultvalueW, 0, &val, NULL, NULL ); if (hr != S_OK) goto error; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 8de3a0c..f2dff02 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -78,6 +78,7 @@ struct array struct field { UINT type; + VARTYPE vartype; /* 0 for default mapping */ union { LONGLONG ival; @@ -179,6 +180,7 @@ HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN; HRESULT to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; +VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN; void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement class methods StdRegProv. EnumKey and StdRegProv.EnumValues.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 71fbae963e7e5750116c3f245f8452dd576aed42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fbae963e7e5750116c3f245… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 14:26:12 2012 +0200 wbemprox: Implement class methods StdRegProv.EnumKey and StdRegProv.EnumValues. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 33 +----- dlls/wbemprox/class.c | 4 +- dlls/wbemprox/query.c | 2 +- dlls/wbemprox/reg.c | 268 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 17 +++ 6 files changed, 291 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71fbae963e7e5750116c3…

1 0

Hans Leidekker : wbemprox: Add tests for the standard registry provider.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 84ceddf8f36e88f5407a375fd5fd50b2d08e11ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ceddf8f36e88f5407a375fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 14:26:58 2012 +0200 wbemprox: Add tests for the standard registry provider. --- dlls/wbemprox/tests/query.c | 177 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 152 insertions(+), 25 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 6916443..864559a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -67,9 +67,8 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC return hr; } -static void test_select(void) +static void test_select( IWbemServices *services ) { - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; static const WCHAR sqlW[] = {'S','Q','L',0}; static const WCHAR query1[] = {'S','E','L','E','C','T',' ','H','O','T','F','I','X','I','D',' ','F','R','O','M',' ', @@ -93,31 +92,12 @@ static void test_select(void) 'L','I','K','E',' ','\'','%','%','R','E','G','E','D','I','T','%','\'',0}; static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; HRESULT hr; - IWbemLocator *locator; - IWbemServices *services; IEnumWbemClassObject *result; - BSTR path = SysAllocString( cimv2W ); BSTR wql = SysAllocString( wqlW ); BSTR sql = SysAllocString( sqlW ); BSTR query = SysAllocString( query1 ); UINT i; - hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, - (void **)&locator ); - if (hr != S_OK) - { - win_skip("can't create instance of WbemLocator\n"); - return; - } - ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); - - hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); - - hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, - RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); - ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); - hr = IWbemServices_ExecQuery( services, NULL, NULL, 0, NULL, &result ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); @@ -140,19 +120,166 @@ static void test_select(void) if (result) IEnumWbemClassObject_Release( result ); } - IWbemServices_Release( services ); - IWbemLocator_Release( locator ); - SysFreeString( path ); SysFreeString( wql ); SysFreeString( sql ); SysFreeString( query ); } +static void test_StdRegProv( IWbemServices *services ) +{ + static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; + static const WCHAR enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; + static const WCHAR stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; + static const WCHAR defkeyW[] = {'h','D','e','f','K','e','y',0}; + static const WCHAR subkeynameW[] = {'s','S','u','b','K','e','y','N','a','m','e',0}; + static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; + static const WCHAR namesW[] = {'s','N','a','m','e','s',0}; + static const WCHAR typesW[] = {'T','y','p','e','s',0}; + static const WCHAR windowsW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + BSTR class = SysAllocString( stdregprovW ), method; + IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; + VARIANT defkey, subkey, retval, names, types; + CIMTYPE type; + HRESULT hr; + + hr = IWbemServices_GetObject( services, class, 0, NULL, &reg, NULL ); + if (hr != S_OK) + { + win_skip( "StdRegProv not available\n" ); + return; + } + hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, &sig_out ); + ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + V_VT( &defkey ) = VT_I4; + V_I4( &defkey ) = 0x80000002; + hr = IWbemClassObject_Put( in, defkeyW, 0, &defkey, 0 ); + ok( hr == S_OK, "failed to set root %08x\n", hr ); + + V_VT( &subkey ) = VT_BSTR; + V_BSTR( &subkey ) = SysAllocString( windowsW ); + hr = IWbemClassObject_Put( in, subkeynameW, 0, &subkey, 0 ); + ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + + out = NULL; + method = SysAllocString( enumkeyW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + type = 0xdeadbeef; + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + + type = 0xdeadbeef; + VariantInit( &names ); + hr = IWbemClassObject_Get( out, namesW, 0, &names, &type, NULL ); + ok( hr == S_OK, "failed to get names %08x\n", hr ); + ok( V_VT( &names ) == (VT_BSTR|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &names ) ); + ok( type == (CIM_STRING|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + + VariantClear( &names ); + VariantClear( &subkey ); + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( sig_out ); + + hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, &sig_out ); + ok( hr == S_OK, "failed to get EnumValues method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + V_VT( &defkey ) = VT_I4; + V_I4( &defkey ) = 0x80000002; + hr = IWbemClassObject_Put( in, defkeyW, 0, &defkey, 0 ); + ok( hr == S_OK, "failed to set root %08x\n", hr ); + + V_VT( &subkey ) = VT_BSTR; + V_BSTR( &subkey ) = SysAllocString( windowsW ); + hr = IWbemClassObject_Put( in, subkeynameW, 0, &subkey, 0 ); + ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + + out = NULL; + method = SysAllocString( enumvaluesW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + type = 0xdeadbeef; + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + + type = 0xdeadbeef; + VariantInit( &names ); + hr = IWbemClassObject_Get( out, namesW, 0, &names, &type, NULL ); + ok( hr == S_OK, "failed to get names %08x\n", hr ); + ok( V_VT( &names ) == (VT_BSTR|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &names ) ); + ok( type == (CIM_STRING|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + + type = 0xdeadbeef; + VariantInit( &types ); + hr = IWbemClassObject_Get( out, typesW, 0, &types, &type, NULL ); + ok( hr == S_OK, "failed to get names %08x\n", hr ); + ok( V_VT( &types ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &types ) ); + ok( type == (CIM_SINT32|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + + VariantClear( &types ); + VariantClear( &names ); + VariantClear( &subkey ); + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( sig_out ); + + IWbemClassObject_Release( reg ); + SysFreeString( class ); +} + START_TEST(query) { + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + BSTR path = SysAllocString( cimv2W ); + IWbemLocator *locator; + IWbemServices *services; + HRESULT hr; + CoInitialize( NULL ); CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); - test_select(); + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator ); + if (hr != S_OK) + { + win_skip("can't create instance of WbemLocator\n"); + return; + } + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_select( services ); + test_StdRegProv( services ); + + SysFreeString( path ); + IWbemServices_Release( services ); + IWbemLocator_Release( locator ); CoUninitialize(); }

1 0

Marcus Meissner : regedit: FIXME() on printing.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 443e196e082a8d113b11bd1849dca9a110f5d0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443e196e082a8d113b11bd184… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Oct 12 14:38:24 2012 +0200 regedit: FIXME() on printing. --- programs/regedit/framewnd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b3ca594..2e28670 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -30,8 +30,11 @@ #include "main.h" #include "regproc.h" +#include "wine/debug.h" #include "wine/unicode.h" +WINE_DEFAULT_DEBUG_CHANNEL(regedit); + /******************************************************************************** * Global and Local Variables: */ @@ -408,6 +411,7 @@ static BOOL PrintRegistryHive(HWND hWnd, LPCWSTR path) pd.nMinPage = 1; pd.nMaxPage = 0xFFFF; if (PrintDlgW(&pd)) { + FIXME("printing is not yet implemented.\n"); /* GDI calls to render output. */ DeleteDC(pd.hDC); /* Delete DC when done.*/ } @@ -420,11 +424,13 @@ static BOOL PrintRegistryHive(HWND hWnd, LPCWSTR path) switch (pd.dwResultAction) { case PD_RESULT_APPLY: /*The user clicked the Apply button and later clicked the Cancel button. This indicates that the user wants to apply the changes made in the property sheet, but does not yet want to print. The PRINTDLGEX structure contains the information specified by the user at the time the Apply button was clicked. */ + FIXME("printing is not yet implemented.\n"); break; case PD_RESULT_CANCEL: /*The user clicked the Cancel button. The information in the PRINTDLGEX structure is unchanged. */ break; case PD_RESULT_PRINT: + FIXME("printing is not yet implemented.\n"); /*The user clicked the Print button. The PRINTDLGEX structure contains the information specified by the user. */ break; default:

1 0

Jacek Caban : mshtml.idl: Added IHTMLLinkElement* declarations.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: df9355301e8bc4bb56582cedd386c54b372330f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9355301e8bc4bb56582cedd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 14:49:47 2012 +0200 mshtml.idl: Added IHTMLLinkElement* declarations. --- include/mshtmdid.h | 23 ++++++ include/mshtml.idl | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 9e33845..d885ee3 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2224,6 +2224,29 @@ #define DISPID_IHTMLDOMNODE_PREVIOUSSIBLING DISPID_ELEMENT+78 #define DISPID_IHTMLDOMNODE_NEXTSIBLING DISPID_ELEMENT+79 +/* IHTMLLinkElement */ +#define DISPID_IHTMLLINKELEMENT_HREF DISPID_HEDELEMS+5 +#define DISPID_IHTMLLINKELEMENT_REL DISPID_HEDELEMS+6 +#define DISPID_IHTMLLINKELEMENT_REV DISPID_HEDELEMS+7 +#define DISPID_IHTMLLINKELEMENT_TYPE DISPID_HEDELEMS+8 +#define DISPID_IHTMLLINKELEMENT_READYSTATE DISPID_A_READYSTATE +#define DISPID_IHTMLLINKELEMENT_ONREADYSTATECHANGE DISPID_EVPROP_ONREADYSTATECHANGE +#define DISPID_IHTMLLINKELEMENT_ONLOAD DISPID_EVPROP_ONLOAD +#define DISPID_IHTMLLINKELEMENT_ONERROR DISPID_EVPROP_ONERROR +#define DISPID_IHTMLLINKELEMENT_STYLESHEET DISPID_HEDELEMS+14 +#define DISPID_IHTMLLINKELEMENT_DISABLED STDPROPID_XOBJ_DISABLED +#define DISPID_IHTMLLINKELEMENT_MEDIA DISPID_HEDELEMS+16 + +/* IHTMLLinkElement2 */ +#define DISPID_IHTMLLINKELEMENT2_TARGET DISPID_HEDELEMS+17 + +/* IHTMLLinkElement3 */ +#define DISPID_IHTMLLINKELEMENT3_CHARSET DISPID_HEDELEMS+18 +#define DISPID_IHTMLLINKELEMENT3_HREFLANG DISPID_HEDELEMS+19 + +/* IHTMLLinkElement4 */ +#define DISPID_IHTMLLINKELEMENT4_IE8_HREF DISPID_IE8_LINK + /* IHTMLDOMNode2 */ #define DISPID_IHTMLDOMNODE2_OWNERDOCUMENT DISPID_ELEMENT+113 diff --git a/include/mshtml.idl b/include/mshtml.idl index f71ecac..502b286 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6788,6 +6788,221 @@ methods: } /***************************************************************************** + * IHTMLLinkElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f205-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + HRESULT href([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + HRESULT href([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + HRESULT rel([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + HRESULT rel([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + HRESULT rev([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + HRESULT rev([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + HRESULT type([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + HRESULT type([out, retval] BSTR *p); + + [propget, id(DISPID_IHTMLLINKELEMENT_READYSTATE)] + HRESULT readyState([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([in] VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + HRESULT onload([in] VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + HRESULT onload([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([in] VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLLINKELEMENT_STYLESHEET)] + HRESULT styleSheet([out, retval] IHTMLStyleSheet **p); + + [propput, id(DISPID_IHTMLLINKELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLLINKELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([out, retval] VARIANT_BOOL *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable] + HRESULT media([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable]\ + HRESULT media([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLLinkElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4e5-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + HRESULT target([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + HRESULT target([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLLinkElement3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f81e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement3 : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + HRESULT charset([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + HRESULT charset([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + HRESULT hreflang([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + HRESULT hreflang([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLLinkElement4 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051043a-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement4 : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + HRESULT href([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + HRESULT href([retval, out] BSTR * p); +} + +/***************************************************************************** + * DispHTMLLinkElement dispinterface + */ +[ + hidden, + uuid(3050f524-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLLinkElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + void href(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + BSTR href(); + + [propput, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + void rel(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + BSTR rel(); + + [propput, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + void rev(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + BSTR rev(); + + [propput, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + void type(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + BSTR type(); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + void onload(VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + VARIANT onload(); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + void onerror(VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + VARIANT onerror(); + + [propget, id(DISPID_IHTMLLINKELEMENT_STYLESHEET)] + IHTMLStyleSheet *styleSheet(); + + [propput, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable] + void media(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable] + BSTR media(); + + [propput, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + void target(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + BSTR target(); + + [propput, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + void charset(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + BSTR charset(); + + [propput, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + void hreflang(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + BSTR hreflang(); + + [propput, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + void ie8_href(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + BSTR ie8_href(); +} + +/***************************************************************************** * IHTMLTxtRange interface */ [

1 0

Erich Hoover : ws2_32: Silence error when binding to loopback adapter.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 9f1b1bef5cd174f957dacb73856f4019d90b862e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1b1bef5cd174f957dacb738… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Oct 11 14:08:23 2012 -0600 ws2_32: Silence error when binding to loopback adapter. --- dlls/ws2_32/socket.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f978350..792ab1c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2146,13 +2146,14 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; unsigned int sock_type = 0, optlen = sizeof(sock_type); + in_addr_t bind_addr = in_sock->sin_addr.s_addr; PIP_ADAPTER_INFO adapters = NULL, adapter; BOOL ret = FALSE; DWORD adap_size; int enable = 1; - if (in_sock->sin_addr.s_addr == htonl(WS_INADDR_ANY)) - return FALSE; /* Not binding to specific interface, uses default route */ + if (bind_addr == htonl(WS_INADDR_ANY) || bind_addr == htonl(WS_INADDR_LOOPBACK)) + return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &optlen) == -1 || sock_type != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) @@ -2165,7 +2166,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { in_addr_t adapter_addr = (in_addr_t) inet_addr(adapter->IpAddressList.IpAddress.String); - if (in_sock->sin_addr.s_addr == adapter_addr) + if (bind_addr == adapter_addr) { #if defined(IP_BOUND_IF) /* IP_BOUND_IF sets both the incoming and outgoing restriction at once */

1 0

Daniel Lehman : msvcp90: Fix parsing in num_get<>::_Getifld.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: c65bd5cad2f0be3633a55de8a2eaa1833c149aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65bd5cad2f0be3633a55de8a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 13 10:36:53 2012 -0700 msvcp90: Fix parsing in num_get<>::_Getifld. --- dlls/msvcp90/locale.c | 152 +++++---- dlls/msvcp90/tests/Makefile.in | 1 + dlls/msvcp90/tests/ios.c | 718 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 810 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c65bd5cad2f0be3633a55…

1 0