August 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msi: Don' t error when an ODBC Data Source fails to register.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: e4f1f9b7bdd46bf1f18c1e337ac6864bee3b0733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f1f9b7bdd46bf1f18c1e33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 28 01:05:50 2019 +0000 msi: Don't error when an ODBC Data Source fails to register. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 55f978c..f6f7ffb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6783,10 +6783,7 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) attrs[len + 1] = 0; if (!SQLConfigDataSourceW(NULL, request, driver, attrs)) - { - ERR("Failed to install SQL data source!\n"); - r = ERROR_FUNCTION_FAILED; - } + WARN("Failed to install SQL data source!\n"); uirow = MSI_CreateRecord( 5 ); MSI_RecordSetStringW( uirow, 1, desc );

1 0

Hans Leidekker : wbemprox/tests: Add tests for Win32_Baseboard.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 22ae86f65cc9402044744369d848e4e4b601353b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22ae86f65cc9402044744369… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 14:14:25 2019 +0200 wbemprox/tests: Add tests for Win32_Baseboard. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 82 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 2c1ca7f..162df54 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -329,7 +329,7 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro static void test_Win32_Bios( IWbemServices *services ) { static const WCHAR queryW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'B','i','o','s',0}; + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','i','o','s',0}; static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR identificationcodeW[] = {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; @@ -380,6 +380,57 @@ static void test_Win32_Bios( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Baseboard( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','B','a','s','e','b','o','a','r','d',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR modelW[] = {'M','o','d','e','l',0}; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR productW[] = {'P','r','o','d','u','c','t',0}; + static const WCHAR tagW[] = {'T','a','g',0}; + static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + CIMTYPE type; + ULONG count; + VARIANT val; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) + { + win_skip( "Win32_Baseboard not available\n" ); + return; + } + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + + check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, modelW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get model %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "model: %s\n", wine_dbgstr_w(V_BSTR(&val)) ); + VariantClear( &val ); + + check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, productW, VT_BSTR, CIM_STRING ); + check_property( obj, tagW, VT_BSTR, CIM_STRING ); + check_property( obj, versionW, VT_BSTR, CIM_STRING ); + + IWbemClassObject_Release( obj ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) { static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; @@ -1591,28 +1642,31 @@ START_TEST(query) 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_GetNames( services ); test_associators( services ); - test_Win32_Bios( services ); - test_Win32_Process( services, FALSE ); - test_Win32_Process( services, TRUE ); - test_Win32_Service( services ); - test_Win32_ComputerSystem( services ); - test_Win32_SystemEnclosure( services ); - test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services ); test_query_semisync( services ); - test_GetNames( services ); + test_select( services ); + + /* classes */ + test_StdRegProv( services ); test_SystemSecurity( services ); - test_Win32_OperatingSystem( services ); + test_Win32_Baseboard( services ); + test_Win32_ComputerSystem( services ); test_Win32_ComputerSystemProduct( services ); - test_Win32_PhysicalMemory( services ); + test_Win32_Bios( services ); test_Win32_IP4RouteTable( services ); + test_Win32_OperatingSystem( services ); + test_Win32_PhysicalMemory( services ); + test_Win32_PnPEntity( services ); + test_Win32_Printer( services ); + test_Win32_Process( services, FALSE ); + test_Win32_Process( services, TRUE ); test_Win32_Processor( services ); + test_Win32_Service( services ); + test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); - test_Win32_Printer( services ); - test_Win32_PnPEntity( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Hans Leidekker : wbemprox: Avoid evaluating row conditions twice.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 08d928171c2e18156eb3239bb198dae6bb817bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d928171c2e18156eb3239b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 14:14:26 2019 +0200 wbemprox: Avoid evaluating row conditions twice. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 9 ++++++--- dlls/wbemprox/query.c | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 75cdfc3..3d2a067 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3026,7 +3026,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; + if (!count) return FILL_STATUS_UNFILTERED; if (!(info = heap_alloc( size ))) return FILL_STATUS_FAILED; if (!EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, (BYTE *)info, size, &size, &count )) @@ -3093,7 +3093,11 @@ static enum fill_status fill_process( struct table *table, const struct expr *co do { - if (!resize_table( table, row + 1, sizeof(*rec) )) goto done; + if (!resize_table( table, row + 1, sizeof(*rec) )) + { + status = FILL_STATUS_FAILED; + goto done; + } rec = (struct record_process *)(table->data + offset); rec->caption = heap_strdupW( entry.szExeFile ); @@ -3118,7 +3122,6 @@ static enum fill_status fill_process( struct table *table, const struct expr *co TRACE("created %u rows\n", row); table->num_rows = row; - status = FILL_STATUS_UNFILTERED; done: CloseHandle( snap ); diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0165d23..e00f067 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -404,13 +404,15 @@ HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, HRESULT execute_view( struct view *view ) { UINT i, j = 0, len; + enum fill_status status = FILL_STATUS_UNFILTERED; if (!view->table) return S_OK; if (view->table->fill) { clear_table( view->table ); - view->table->fill( view->table, view->cond ); + status = view->table->fill( view->table, view->cond ); } + if (status == FILL_STATUS_FAILED) return WBEM_E_FAILED; if (!view->table->num_rows) return S_OK; len = min( view->table->num_rows, 16 ); @@ -429,7 +431,8 @@ HRESULT execute_view( struct view *view ) if (!(tmp = heap_realloc( view->result, len * sizeof(UINT) ))) return E_OUTOFMEMORY; view->result = tmp; } - if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; + if (status == FILL_STATUS_FILTERED) val = 1; + else if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; if (val) view->result[j++] = i; } view->count = j;

1 0

Hans Leidekker : wbemprox: Support boolean qualifier values.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 59b647a3e85999379c97534bfd9a6472babe50d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b647a3e85999379c97534b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 14:14:27 2019 +0200 wbemprox: Support boolean qualifier values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 18 +++++++++++------- dlls/wbemprox/qualifier.c | 4 ++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3d2a067..bbc96bf 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -137,6 +137,8 @@ static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; static const WCHAR prop_binaryrepresentationW[] = {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; +static const WCHAR prop_boolvalueW[] = + {'B','o','o','l','V','a','l','u','e',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = @@ -667,13 +669,14 @@ static const struct column col_processor[] = }; static const struct column col_qualifier[] = { - { prop_classW, CIM_STRING }, - { prop_memberW, CIM_STRING }, - { prop_typeW, CIM_UINT32 }, - { prop_flavorW, CIM_SINT32 }, - { prop_nameW, CIM_STRING }, - { prop_intvalueW, CIM_SINT32 }, - { prop_strvalueW, CIM_STRING } + { prop_classW, CIM_STRING }, + { prop_memberW, CIM_STRING }, + { prop_typeW, CIM_UINT32 }, + { prop_flavorW, CIM_SINT32 }, + { prop_nameW, CIM_STRING }, + { prop_intvalueW, CIM_SINT32 }, + { prop_strvalueW, CIM_STRING }, + { prop_boolvalueW, CIM_BOOLEAN } }; static const struct column col_service[] = { @@ -1101,6 +1104,7 @@ struct record_qualifier const WCHAR *name; INT32 intvalue; const WCHAR *strvalue; + int boolvalue; }; struct record_service { diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index 9a4f74b..aa64481 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -126,6 +126,7 @@ static HRESULT get_qualifier_value( const WCHAR *class, const WCHAR *member, con static const WCHAR qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; static const WCHAR intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; static const WCHAR strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; + static const WCHAR boolvalueW[] = {'B','o','o','l','V','a','l','u','e',0}; static const WCHAR flavorW[] = {'F','l','a','v','o','r',0}; static const WCHAR typeW[] = {'T','y','p','e',0}; IEnumWbemClassObject *iter; @@ -156,6 +157,9 @@ static HRESULT get_qualifier_value( const WCHAR *class, const WCHAR *member, con case CIM_SINT32: hr = IWbemClassObject_Get( obj, intvalueW, 0, val, NULL, NULL ); break; + case CIM_BOOLEAN: + hr = IWbemClassObject_Get( obj, boolvalueW, 0, val, NULL, NULL ); + break; default: ERR("unhandled type %u\n", V_UI4( &var )); break;

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetQualifierSet.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 8e2e897432e7b557ba1d069a6718dda1b68d239f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e2e897432e7b557ba1d069a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 14:14:28 2019 +0200 wbemprox: Implement IWbemClassObject::GetQualifierSet. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 943d5fe..d052278 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -336,8 +336,11 @@ static HRESULT WINAPI class_object_GetQualifierSet( IWbemClassObject *iface, IWbemQualifierSet **ppQualSet ) { - FIXME("%p, %p\n", iface, ppQualSet); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %p\n", iface, ppQualSet); + + return WbemQualifierSet_create( co->name, NULL, (void **)ppQualSet ); } static HRESULT record_get_value( const struct record *record, UINT index, VARIANT *var, CIMTYPE *type )

1 0

Hans Leidekker : wbemprox: Implement IWbemQualifierSet::GetNames.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 434e94a68941df70e48cd9641bf195281a2208c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=434e94a68941df70e48cd964… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 14:14:29 2019 +0200 wbemprox: Implement IWbemQualifierSet::GetNames. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/qualifier.c | 65 +++++++++++++++++++++++++++++++++++---------- dlls/wbemprox/tests/query.c | 11 ++++++++ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index aa64481..d29abd3 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -101,19 +101,32 @@ static HRESULT create_qualifier_enum( const WCHAR *class, const WCHAR *member, c {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','_','_','Q','U','A','L', 'I','F','I','E','R','S',' ','W','H','E','R','E',' ','C','l','a','s','s','=', '\'','%','s','\'',' ','A','N','D',' ','M','e','m','b','e','r','=','\'','%','s','\'',0}; - static const WCHAR noneW[] = {'_','_','N','O','N','E',0}; + static const WCHAR fmt3W[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','_','_','Q','U','A','L', + 'I','F','I','E','R','S',' ','W','H','E','R','E',' ','C','l','a','s','s','=', + '\'','%','s','\'',0}; WCHAR *query; HRESULT hr; int len; - if (!member) member = noneW; - len = lstrlenW( class ) + lstrlenW( member ); - if (name) len += lstrlenW( name ) + ARRAY_SIZE(fmtW); - else len += ARRAY_SIZE(fmt2W); - - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - if (name) swprintf( query, len, fmtW, class, member, name ); - else swprintf( query, len, fmt2W, class, member ); + if (member && name) + { + len = lstrlenW( class ) + lstrlenW( member ) + lstrlenW( name ) + ARRAY_SIZE(fmtW); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + swprintf( query, len, fmtW, class, member, name ); + } + else if (member) + { + len = lstrlenW( class ) + lstrlenW( member ) + ARRAY_SIZE(fmt2W); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + swprintf( query, len, fmt2W, class, member ); + } + else + { + len = lstrlenW( class ) + ARRAY_SIZE(fmt3W); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + swprintf( query, len, fmt3W, class ); + } hr = exec_query( query, iter ); heap_free( query ); @@ -123,7 +136,6 @@ static HRESULT create_qualifier_enum( const WCHAR *class, const WCHAR *member, c static HRESULT get_qualifier_value( const WCHAR *class, const WCHAR *member, const WCHAR *name, VARIANT *val, LONG *flavor ) { - static const WCHAR qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; static const WCHAR intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; static const WCHAR strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; static const WCHAR boolvalueW[] = {'B','o','o','l','V','a','l','u','e',0}; @@ -137,7 +149,7 @@ static HRESULT get_qualifier_value( const WCHAR *class, const WCHAR *member, con hr = create_qualifier_enum( class, member, name, &iter ); if (FAILED( hr )) return hr; - hr = create_class_object( qualifiersW, iter, 0, NULL, &obj ); + hr = create_class_object( NULL, iter, 0, NULL, &obj ); IEnumWbemClassObject_Release( iter ); if (FAILED( hr )) return hr; @@ -179,7 +191,12 @@ static HRESULT WINAPI qualifier_set_Get( { struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); - FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor); + TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor); + if (lFlags) + { + FIXME("flags %08x not supported\n", lFlags); + return E_NOTIMPL; + } return get_qualifier_value( set->class, set->member, wszName, pVal, plFlavor ); } @@ -206,8 +223,28 @@ static HRESULT WINAPI qualifier_set_GetNames( LONG lFlags, SAFEARRAY **pNames ) { - FIXME("%p, %08x, %p\n", iface, lFlags, pNames); - return E_NOTIMPL; + struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); + IEnumWbemClassObject *iter; + IWbemClassObject *obj; + HRESULT hr; + + TRACE("%p, %08x, %p\n", iface, lFlags, pNames); + if (lFlags) + { + FIXME("flags %08x not supported\n", lFlags); + return E_NOTIMPL; + } + + hr = create_qualifier_enum( set->class, set->member, NULL, &iter ); + if (FAILED( hr )) return hr; + + hr = create_class_object( NULL, iter, 0, NULL, &obj ); + IEnumWbemClassObject_Release( iter ); + if (FAILED( hr )) return hr; + + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, pNames ); + IWbemClassObject_Release( obj ); + return hr; } static HRESULT WINAPI qualifier_set_BeginEnumeration( diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 162df54..b180cfc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -46,6 +46,8 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC for (;;) { VARIANT var; + IWbemQualifierSet *qualifiers; + SAFEARRAY *names; IEnumWbemClassObject_Next( *result, 10000, 1, &obj, &count ); if (!count) break; @@ -60,6 +62,15 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC trace("description: %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear( &var ); } + + hr = IWbemClassObject_GetQualifierSet( obj, &qualifiers ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemQualifierSet_GetNames( qualifiers, 0, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + + SafeArrayDestroy( names ); + IWbemQualifierSet_Release( qualifiers ); IWbemClassObject_Release( obj ); } }

1 0

Dmitry Timoshkov : rpcrt4: Add an exception handler to NdrAsyncClientCall.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 1df0091dacbc25ea895131bf960cc6f1c1070d57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1df0091dacbc25ea895131bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 28 17:51:48 2019 +0800 rpcrt4: Add an exception handler to NdrAsyncClientCall. NdrClientCall already uses TRY/EXCEPT block if the procedure has Oi_HAS_COMM_OR_FAULT in its Oi_flags, I've added similar block to NdrAsyncClientCall but without mapping the fault code using CommFaultOffsets because NdrAsyncClientCall doesn't have this implemented. An installer that I have here calls NdrAsyncClientCall in order to query status of a not yet installed service, and that leads to a crash due to RaiseException from inside of NdrAsyncClientCall. With this patch it no longer crashes on an unhandled exception, and then installs the service. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index b47ffa9..de58a9f 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1574,8 +1574,9 @@ struct async_call_data ULONG_PTR NdrCorrCache[256]; }; -LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, - void **stack_top ) +/* Helper for ndr_async_client_call, to factor out the part that may or may not be + * guarded by a try/except block. */ +static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) { /* pointer to start of stack where arguments start */ PRPC_MESSAGE pRpcMsg; @@ -1592,8 +1593,6 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, const NDR_PROC_HEADER * pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; RPC_STATUS status; - TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); - /* Later NDR language versions probably won't be backwards compatible */ if (pStubDesc->Version > 0x50002) { @@ -1650,7 +1649,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, pFormat += get_handle_desc_size(pProcHeader, pFormat); async_call_data->hBinding = client_get_handle(pStubMsg, pProcHeader, async_call_data->pHandleFormat); - if (!async_call_data->hBinding) goto done; + if (!async_call_data->hBinding) return; if (is_oicf_stubdesc(pStubDesc)) { @@ -1769,8 +1768,30 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, RpcRaiseException(status); } } +} + +LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top ) +{ + const NDR_PROC_HEADER *pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; + + TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); + + if (pProcHeader->Oi_flags & Oi_HAS_COMM_OR_FAULT) + { + __TRY + { + do_ndr_async_client_call( pStubDesc, pFormat, stack_top ); + } + __EXCEPT_ALL + { + FIXME("exception %x during ndr_async_client_call()\n", GetExceptionCode()); + } + __ENDTRY + } + else + do_ndr_async_client_call( pStubDesc, pFormat, stack_top); -done: TRACE("returning 0\n"); return 0; }

1 0

Henri Verbeet : wined3d: Initialise d3d_info after quirks are applied.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 7260e8bd4a884ef17716c0747db1c675452e36dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7260e8bd4a884ef17716c074… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 21:32:26 2019 +0430 wined3d: Initialise d3d_info after quirks are applied. In particular, quirk_broken_viewport_subpixel_bits() disables ARB_CLIP_CONTROL, which affects "d3d_info->clip_control". This fixes a regression introduced by commit e795ddb3d80d7b94d29cf97a24a01bb157b0138d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47636 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 170 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 90 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7260e8bd4a884ef17716…

1 0

Zhiyi Zhang : d3d9/tests: Add a test for stencil reference value truncation.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: c67a27c87f680f60c52c4d531c1adbaac417324b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c67a27c87f680f60c52c4d53… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 28 21:32:27 2019 +0430 d3d9/tests: Add a test for stencil reference value truncation. With suggestions by Paul Gofman. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 136 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 97 insertions(+), 39 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f2c6ee4..948582a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10958,33 +10958,37 @@ static void stencil_cull_test(void) D3DCAPS9 caps; HWND window; HRESULT hr; - static const float quad1[] = + static const struct { - -1.0, -1.0, 0.1, - 0.0, -1.0, 0.1, - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - }; - static const float quad2[] = + struct vec3 position; + } + quad1[] = { - 0.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - }; - static const float quad3[] = + {{-1.0f, -1.0f, 0.1f}}, + {{ 0.0f, -1.0f, 0.1f}}, + {{-1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + }, + quad2[] = { - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - 0.0, 1.0, 0.1, - 1.0, 1.0, 0.1, - }; - static const float quad4[] = + {{ 0.0f, -1.0f, 0.1f}}, + {{ 1.0f, -1.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + {{ 1.0f, 0.0f, 0.1f}}, + }, + quad3[] = + { + {{ 0.0f, 0.0f, 0.1f}}, + {{ 1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 1.0f, 0.1f}}, + {{ 1.0f, 1.0f, 0.1f}}, + }, + quad4[] = { - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 0.0, 1.0, 0.1, + {{-1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + {{-1.0f, 1.0f, 0.1f}}, + {{ 0.0f, 1.0f, 0.1f}}, }; struct { @@ -11057,40 +11061,40 @@ static void stencil_cull_test(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, TRUE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad2, sizeof(*quad2)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(*quad2)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad3, sizeof(*quad3)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(*quad3)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CCW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad4, sizeof(*quad4)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(*quad4)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -11155,6 +11159,60 @@ static void stencil_cull_test(void) color = getPixelColor(device, 480, 60); ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); + /* Test for reference truncation. */ + /* 1st pass: set stencil. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_STENCIL, 0x00ff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0x1cc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_ALWAYS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* 2nd pass: draw image. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0xdb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0x0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_LESS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, painter, sizeof(painter[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 280, 360); + todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Zhiyi Zhang : wined3d: Truncate stencil reference values to the stencil component size.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: wine Branch: master Commit: 124f48d3114fe86f5feda2ce200d87b97c4009de URL: https://source.winehq.org/git/wine.git/?a=commit;h=124f48d3114fe86f5feda2ce… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 28 21:32:28 2019 +0430 wined3d: Truncate stencil reference values to the stencil component size. As opposed to OpenGL, which clamps them. This fixes a regression introduced by commit a9e199e5ad76c0540381f25011d6051ace3e7c0a. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/cs.c | 7 +++++-- dlls/wined3d/state.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 948582a..9907028 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11211,7 +11211,7 @@ static void stencil_cull_test(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 280, 360); - todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 32f9954..044d586 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1152,9 +1152,12 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + else if (prev) { - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->stencil_size != op->view->format->stencil_size) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); } device_invalidate_state(device, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4cdca27..54c0c67 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -925,7 +925,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; mask = state->render_states[WINED3D_RS_STENCILMASK]; - ref = state->render_states[WINED3D_RS_STENCILREF] & mask; + ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]);

1 0