October 2012 - Wine-Commits

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

Oct. 12, 2012

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

Nikolay Sivov : dwrite: Store text format properties.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 2c0c4132247b670f964e6aba99b4f7515653024c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0c4132247b670f964e6aba9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 12 09:12:57 2012 -0400 dwrite: Store text format properties. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/layout.c | 21 ++++++++++++++++++++- dlls/dwrite/main.c | 8 ++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c569495..d5890bb 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -54,7 +54,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; -extern HRESULT create_textformat(IDWriteTextFormat**) DECLSPEC_HIDDEN; +extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, + FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index bb48a51..64f3c0d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -40,6 +40,15 @@ struct dwrite_textlayout { struct dwrite_textformat { IDWriteTextFormat IDWriteTextFormat_iface; LONG ref; + + WCHAR *family_name; + WCHAR *locale; + + DWRITE_FONT_WEIGHT weight; + DWRITE_FONT_STYLE style; + DWRITE_FONT_STRETCH stretch; + + FLOAT size; }; static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout(IDWriteTextLayout *iface) @@ -689,7 +698,11 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + heap_free(This->family_name); + heap_free(This->locale); heap_free(This); + } return S_OK; } @@ -904,7 +917,8 @@ static const IDWriteTextFormatVtbl dwritetextformatvtbl = { dwritetextformat_GetLocaleName }; -HRESULT create_textformat(IDWriteTextFormat **format) +HRESULT create_textformat(const WCHAR *family_name, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, + DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) { struct dwrite_textformat *This; @@ -913,6 +927,11 @@ HRESULT create_textformat(IDWriteTextFormat **format) This->IDWriteTextFormat_iface.lpVtbl = &dwritetextformatvtbl; This->ref = 1; + This->family_name = heap_strdupW(family_name); + This->locale = heap_strdupW(locale); + This->weight = weight; + This->style = style; + This->size = size; *format = &This->IDWriteTextFormat_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 7b54710..20aed56 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -479,9 +479,13 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHA IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, FLOAT size, WCHAR const *locale, IDWriteTextFormat **format) { - FIXME("(%s %p %d %d %d %f %s %p): semi-stub\n", debugstr_w(family_name), collection, weight, style, stretch, + TRACE("(%s %p %d %d %d %f %s %p)\n", debugstr_w(family_name), collection, weight, style, stretch, size, debugstr_w(locale), format); - return create_textformat(format); + + if (collection) + FIXME("font collection not supported\n"); + + return create_textformat(family_name, weight, style, stretch, size, locale, format); } static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory *iface, IDWriteTypography **typography)

1 0

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

Oct. 12, 2012

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: Always convert from BSTR.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

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

Henri Verbeet : wined3d: Implement WINED3DSIH_ITOF in the GLSL shader backend.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: b7cd93240d139e2140826931dba2ba7d617b782e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7cd93240d139e2140826931d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:55 2012 +0200 wined3d: Implement WINED3DSIH_ITOF in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2ac51b2..dd1c8e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2560,6 +2560,23 @@ static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "int(%s));\n", src_param.param_str); } +static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src_param; + unsigned int mask_size; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + + if (mask_size > 1) + shader_addline(buffer, "vec%u(%s));\n", mask_size, src_param.param_str); + else + shader_addline(buffer, "float(%s));\n", src_param.param_str); +} + /** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) { @@ -5302,7 +5319,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMUL */ NULL, - /* WINED3DSIH_ITOF */ NULL, + /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_FTOI in the GLSL shader backend.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: d48a0bc4274d491f252ee5b89ff3557ea7f8b1ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48a0bc4274d491f252ee5b89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:54 2012 +0200 wined3d: Implement WINED3DSIH_FTOI in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4f9477..2ac51b2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2543,6 +2543,23 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src_param; + unsigned int mask_size; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + + if (mask_size > 1) + shader_addline(buffer, "ivec%u(%s));\n", mask_size, src_param.param_str); + else + shader_addline(buffer, "int(%s));\n", src_param.param_str); +} + /** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) { @@ -5277,7 +5294,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EXP */ shader_glsl_map2gl, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, - /* WINED3DSIH_FTOI */ NULL, + /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL,

1 0

Nikolay Sivov : dwrite: Implement GetWeight() for IDWriteFont.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 0358413e35eec41d0444182390a679f6f0457d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0358413e35eec41d044418239… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 12 08:43:57 2012 -0400 dwrite: Implement GetWeight() for IDWriteFont. --- dlls/dwrite/font.c | 55 +++++++++++++++++++++++++--------------------- dlls/dwrite/tests/font.c | 3 -- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d91a424..e7beee5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -105,6 +105,7 @@ struct dwrite_font { IDWriteFontFace *face; DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_WEIGHT weight; }; struct dwrite_fontface { @@ -371,8 +372,8 @@ static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont *iface, IDWriteFontFa static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->weight; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) @@ -592,28 +593,30 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa return S_OK; } -static DWRITE_FONT_STRETCH get_font_stretch(HDC hdc) +static void get_font_properties(struct dwrite_font *font, HDC hdc) { - DWRITE_FONT_STRETCH stretch; TT_OS2_V2 tt_os2; LONG size; - /* default stretch to normal */ - stretch = DWRITE_FONT_STRETCH_NORMAL; + /* default stretch and weight to normal */ + font->stretch = DWRITE_FONT_STRETCH_NORMAL; + font->weight = DWRITE_FONT_WEIGHT_NORMAL; size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); - if (size == GDI_ERROR) return stretch; - - if (size > sizeof(tt_os2)) size = sizeof(tt_os2); + if (size != GDI_ERROR) + { + if (size > sizeof(tt_os2)) size = sizeof(tt_os2); - memset(&tt_os2, 0, sizeof(tt_os2)); - if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return stretch; + memset(&tt_os2, 0, sizeof(tt_os2)); + if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return; - /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ - if (GET_BE_WORD(tt_os2.usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - stretch = GET_BE_WORD(tt_os2.usWidthClass); + /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ + if (GET_BE_WORD(tt_os2.usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + font->stretch = GET_BE_WORD(tt_os2.usWidthClass); - return stretch; + font->weight = GET_BE_WORD(tt_os2.usWeightClass); + TRACE("stretch=%d, weight=%d\n", font->stretch, font->weight); + } } HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) @@ -622,7 +625,6 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) struct dwrite_font *This; IDWriteFontFamily *family; OUTLINETEXTMETRICW *otm; - DWRITE_FONT_STRETCH stretch; HRESULT hr; HFONT hfont; HDC hdc; @@ -630,8 +632,15 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) *font = NULL; + This = heap_alloc(sizeof(struct dwrite_font)); + if (!This) return E_OUTOFMEMORY; + hfont = CreateFontIndirectW(logfont); - if (!hfont) return DWRITE_E_NOFONT; + if (!hfont) + { + heap_free(This); + return DWRITE_E_NOFONT; + } hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -641,7 +650,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) otm->otmSize = ret; ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm); - stretch = get_font_stretch(hdc); + get_font_properties(This, hdc); DeleteDC(hdc); DeleteObject(hfont); @@ -652,13 +661,10 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) hr = create_fontfamily(familyname, &family); heap_free(otm); - if (hr != S_OK) return hr; - - This = heap_alloc(sizeof(struct dwrite_font)); - if (!This) + if (hr != S_OK) { - IDWriteFontFamily_Release(family); - return E_OUTOFMEMORY; + heap_free(This); + return hr; } This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; @@ -666,7 +672,6 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) This->face = NULL; This->family = family; This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; - This->stretch = stretch; *font = &This->IDWriteFont_iface; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 81e17fd..70c714c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -91,7 +91,6 @@ if (0) /* now check properties */ weight = IDWriteFont_GetWeight(font); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); @@ -115,7 +114,6 @@ todo_wine EXPECT_HR(hr, S_OK); weight = IDWriteFont_GetWeight(font); - todo_wine ok(weight == weights[i][1], "%d: got %d, expected %d\n", i, weight, weights[i][1]); IDWriteFont_Release(font); @@ -132,7 +130,6 @@ todo_wine EXPECT_HR(hr, S_OK); weight = IDWriteFont_GetWeight(font); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_NORMAL || broken(weight == DWRITE_FONT_WEIGHT_BOLD) /* win7 w/o SP */, "got %d\n", weight); IDWriteFont_Release(font);

1 0

Vincas Miliūnas : kernel32/tests: Added tests for OpenFileById.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: be1c0edfcfeca7d9d051aaa7d394b9f6bbe4889e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1c0edfcfeca7d9d051aaa7d… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Fri Oct 12 13:35:25 2012 +0300 kernel32/tests: Added tests for OpenFileById. --- dlls/kernel32/tests/file.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 16 ++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 41fca60..6cc79c0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -32,6 +32,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winnls.h" static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); @@ -40,6 +41,7 @@ static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); static BOOL (WINAPI *pGetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID, DWORD); +static HANDLE (WINAPI *pOpenFileById)(HANDLE, LPFILE_ID_DESCRIPTOR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -75,6 +77,7 @@ static void InitFunctionPointers(void) pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hkernel32, "GetVolumeNameForVolumeMountPointA"); pQueueUserAPC = (void *) GetProcAddress(hkernel32, "QueueUserAPC"); pGetFileInformationByHandleEx = (void *) GetProcAddress(hkernel32, "GetFileInformationByHandleEx"); + pOpenFileById = (void *) GetProcAddress(hkernel32, "OpenFileById"); } static void test__hread( void ) @@ -3332,6 +3335,111 @@ static void test_GetFileInformationByHandleEx(void) DeleteFile(tempFileName); } +static void test_OpenFileById(void) +{ + char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[256], tickCount[256]; + WCHAR tempFileNameW[MAX_PATH]; + BOOL ret, found; + DWORD ret2, count, tempFileNameLen; + HANDLE directory, handle, tempFile; + FILE_ID_BOTH_DIR_INFO *bothDirInfo; + FILE_ID_DESCRIPTOR fileIdDescr; + + if (!pGetFileInformationByHandleEx || !pOpenFileById) + { + win_skip("GetFileInformationByHandleEx or OpenFileById is missing.\n"); + return; + } + + ret2 = GetTempPathA(sizeof(tempPath), tempPath); + ok(ret2, "OpenFileById: GetTempPath failed, got error %u.\n", GetLastError()); + + /* ensure the existance of a file in the temp folder */ + ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); + ok(ret2, "OpenFileById: GetTempFileNameA failed, got error %u.\n", GetLastError()); + ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, + "OpenFileById: GetFileAttributesA failed to find the temp file, got error %u\n", GetLastError()); + + ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)); + ok(ret2, "OpenFileById: MultiByteToWideChar failed to convert tempFileName, got error %u.\n", GetLastError()); + tempFileNameLen = ret2 - 1; + + tempFile = CreateFileA(tempFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(tempFile != INVALID_HANDLE_VALUE, "OpenFileById: failed to create a temp file, " + "got error %u.\n", GetLastError()); + ret2 = sprintf(tickCount, "%u", GetTickCount()); + ret = WriteFile(tempFile, tickCount, ret2, &count, NULL); + ok(ret, "OpenFileById: WriteFile failed, got error %u.\n", GetLastError()); + CloseHandle(tempFile); + + directory = CreateFileA(tempPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + ok(directory != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the temp folder, " + "got error %u.\n", GetLastError()); + + /* get info about the temp folder itself */ + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); + ok(ret, "OpenFileById: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); + ok(bothDirInfo->FileNameLength == sizeof(WCHAR) && bothDirInfo->FileName[0] == '.', + "OpenFileById: failed to return the temp folder at the first entry, got error %u.\n", GetLastError()); + + /* open the temp folder itself */ + fileIdDescr.dwSize = sizeof(fileIdDescr); + fileIdDescr.Type = FileIdType; + U(fileIdDescr).FileId = bothDirInfo->FileId; + handle = pOpenFileById(directory, &fileIdDescr, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); + todo_wine + ok(handle != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the temp folder itself, got error %u.\n", GetLastError()); + CloseHandle(handle); + + /* find the temp file in the temp folder */ + found = FALSE; + while (!found) + { + ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); + ok(ret, "OpenFileById: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); + if (!ret) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + while (TRUE) + { + if (tempFileNameLen == bothDirInfo->FileNameLength / sizeof(WCHAR) && + memcmp(tempFileNameW, bothDirInfo->FileName, bothDirInfo->FileNameLength) == 0) + { + found = TRUE; + break; + } + if (!bothDirInfo->NextEntryOffset) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + } + ok(found, "OpenFileById: failed to find the temp file in the temp folder.\n"); + + SetLastError(0xdeadbeef); + handle = pOpenFileById(directory, NULL, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); + todo_wine + ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER, + "OpenFileById: expected ERROR_INVALID_PARAMETER, got error %u.\n", GetLastError()); + + fileIdDescr.dwSize = sizeof(fileIdDescr); + fileIdDescr.Type = FileIdType; + U(fileIdDescr).FileId = bothDirInfo->FileId; + handle = pOpenFileById(directory, &fileIdDescr, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); + todo_wine + ok(handle != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the file, got error %u.\n", GetLastError()); + + ret = ReadFile(handle, buffer, sizeof(buffer), &count, NULL); + buffer[count] = 0; + ok(ret, "OpenFileById: ReadFile failed, got error %u.\n", GetLastError()); + ok(strcmp(tickCount, buffer) == 0, "OpenFileById: invalid contents of the temp file.\n"); + + CloseHandle(handle); + CloseHandle(directory); + DeleteFile(tempFileName); +} + START_TEST(file) { InitFunctionPointers(); @@ -3372,4 +3480,5 @@ START_TEST(file) test_ReplaceFileA(); test_ReplaceFileW(); test_GetFileInformationByHandleEx(); + test_OpenFileById(); } diff --git a/include/winbase.h b/include/winbase.h index 2e97048..a9abb30 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -740,6 +740,22 @@ typedef struct _BY_HANDLE_FILE_INFORMATION DWORD nFileIndexLow; } BY_HANDLE_FILE_INFORMATION, *PBY_HANDLE_FILE_INFORMATION, *LPBY_HANDLE_FILE_INFORMATION ; +typedef enum _FILE_ID_TYPE { + FileIdType, + ObjectIdType, + ExtendedFileIdType, + MaximumFileIdType +} FILE_ID_TYPE, *PFILE_ID_TYPE; + +typedef struct _FILE_ID_DESCRIPTOR { + DWORD dwSize; + FILE_ID_TYPE Type; + union { + LARGE_INTEGER FileId; + GUID ObjectId; + } DUMMYUNIONNAME; +} FILE_ID_DESCRIPTOR, *LPFILE_ID_DESCRIPTOR; + typedef enum _FILE_INFO_BY_HANDLE_CLASS { FileBasicInfo, FileStandardInfo,

1 0

Christian Costa : amstream: Check filename pointer in IAMMultiMediaStreamImpl_OpenFile.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 7272256a609f12e361190230e6876f5877d61af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7272256a609f12e361190230e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 07:15:58 2012 +0200 amstream: Check filename pointer in IAMMultiMediaStreamImpl_OpenFile. --- dlls/amstream/amstream.c | 9 ++++++--- dlls/amstream/tests/amstream.c | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 293e2b9..a78abee 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -397,7 +397,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR pszFileName, DWORD dwFlags) +static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR filename, DWORD flags) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT ret = S_OK; @@ -407,14 +407,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac PIN_DIRECTION pin_direction; const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; - TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags); + TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(filename), flags); + + if (!filename) + return E_POINTER; /* If Initialize was not called before, we do it here */ if (!This->pFilterGraph) ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); if (SUCCEEDED(ret)) - ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, sourceW, &BaseFilter); + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, filename, sourceW, &BaseFilter); if (SUCCEEDED(ret)) ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6a198e0..5121b35 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -412,6 +412,10 @@ static void test_media_streams(void) } } + /* Test open file with no filename */ + hr = IAMMultiMediaStream_OpenFile(pams, NULL, 0); + ok(hr == E_POINTER, "IAMMultiMediaStream_OpenFile returned %x instead of %x\n", hr, E_POINTER); + if (video_stream) IMediaStream_Release(video_stream); if (audio_stream)

1 0

Alistair Leslie-Hughes : include: dbs.idl: Add missing defines.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: d183cc6dfba31ce2090b5e70a6c79741a1830cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d183cc6dfba31ce2090b5e70a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 12 10:31:21 2012 +1100 include: dbs.idl: Add missing defines. --- include/dbs.idl | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d183cc6dfba31ce2090b5…

1 0