October 2018 - Wine-devel - list.winehq.org

[PATCH] mlang: Register codepages info in registry.
by Jacek Caban 09 Oct '18

09 Oct '18

Outlook 2016 requires Codepage key to exist (it doesn't seem to require it to be filled). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mlang/mlang.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 1 + 2 files changed, 54 insertions(+)

1 0

[PATCH 3/3] wbemdisp: Generate DISPIDs for object methods too.
by Hans Leidekker 09 Oct '18

09 Oct '18

Tests based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44474 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 102 +++++++++++++++++++++++++++++++---------- dlls/wbemdisp/tests/wbemdisp.c | 35 ++++++++++++++ 2 files changed, 112 insertions(+), 25 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 1c7f56ad25..78b81d8551 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -488,11 +488,13 @@ static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPro return S_OK; } -#define DISPID_BASE 0x1800000 +#define DISPID_BASE 0x1800000 +#define DISPID_BASE_METHOD 0x1000000 struct member { BSTR name; + BOOL is_method; DISPID dispid; }; @@ -504,6 +506,7 @@ struct object struct member *members; UINT nb_members; DISPID last_dispid; + DISPID last_dispid_method; }; static inline struct object *impl_from_ISWbemObject( @@ -585,41 +588,83 @@ static HRESULT WINAPI object_GetTypeInfo( static HRESULT init_members( struct object *object ) { - LONG bound, i; - SAFEARRAY *sa; + IWbemClassObject *sig_in, *sig_out; + LONG i = 0, count = 0; + BSTR name; HRESULT hr; if (object->members) return S_OK; - hr = IWbemClassObject_GetNames( object->object, NULL, 0, NULL, &sa ); - if (FAILED( hr )) return hr; - hr = SafeArrayGetUBound( sa, 1, &bound ); - if (FAILED( hr )) + hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); + if (SUCCEEDED( hr )) { - SafeArrayDestroy( sa ); - return hr; + while (IWbemClassObject_Next( object->object, 0, NULL, NULL, NULL, NULL ) == S_OK) count++; + IWbemClassObject_EndEnumeration( object->object ); } - if (!(object->members = heap_alloc( sizeof(struct member) * (bound + 1) ))) + + hr = IWbemClassObject_BeginMethodEnumeration( object->object, 0 ); + if (SUCCEEDED( hr )) { - SafeArrayDestroy( sa ); - return E_OUTOFMEMORY; + while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) + { + count++; + SysFreeString( name ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( sig_out ); + } + IWbemClassObject_EndMethodEnumeration( object->object ); } - for (i = 0; i <= bound; i++) + + if (!(object->members = heap_alloc( sizeof(struct member) * count ))) return E_OUTOFMEMORY; + + hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); + if (SUCCEEDED( hr )) { - hr = SafeArrayGetElement( sa, &i, &object->members[i].name ); - if (FAILED( hr )) + while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK) { - for (i--; i >= 0; i--) SysFreeString( object->members[i].name ); - SafeArrayDestroy( sa ); - heap_free( object->members ); - object->members = NULL; - return E_OUTOFMEMORY; + object->members[i].name = name; + object->members[i].is_method = FALSE; + object->members[i].dispid = 0; + if (++i > count) + { + IWbemClassObject_EndEnumeration( object->object ); + goto error; + } + TRACE( "added property %s\n", debugstr_w(name) ); } - object->members[i].dispid = 0; + IWbemClassObject_EndEnumeration( object->object ); } - object->nb_members = bound + 1; - SafeArrayDestroy( sa ); + + hr = IWbemClassObject_BeginMethodEnumeration( object->object, 0 ); + if (SUCCEEDED( hr )) + { + while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) + { + object->members[i].name = name; + object->members[i].is_method = TRUE; + object->members[i].dispid = 0; + if (++i > count) + { + IWbemClassObject_EndMethodEnumeration( object->object ); + goto error; + } + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( sig_out ); + TRACE( "added method %s\n", debugstr_w(name) ); + } + IWbemClassObject_EndMethodEnumeration( object->object ); + } + + object->nb_members = count; + TRACE( "added %u members\n", object->nb_members ); return S_OK; + +error: + for (--i; i >= 0; i--) SysFreeString( object->members[i].name ); + heap_free( object->members ); + object->members = NULL; + object->nb_members = 0; + return E_FAIL; } static DISPID get_member_dispid( struct object *object, const WCHAR *name ) @@ -629,7 +674,13 @@ static DISPID get_member_dispid( struct object *object, const WCHAR *name ) { if (!strcmpiW( object->members[i].name, name )) { - if (!object->members[i].dispid) object->members[i].dispid = ++object->last_dispid; + if (!object->members[i].dispid) + { + if (object->members[i].is_method) + object->members[i].dispid = ++object->last_dispid_method; + else + object->members[i].dispid = ++object->last_dispid; + } return object->members[i].dispid; } } @@ -701,7 +752,7 @@ static HRESULT WINAPI object_Invoke( TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - if (member <= DISPID_BASE) + if (member <= DISPID_BASE_METHOD) { hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); if (SUCCEEDED(hr)) @@ -1044,6 +1095,7 @@ static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject * object->members = NULL; object->nb_members = 0; object->last_dispid = DISPID_BASE; + object->last_dispid_method = DISPID_BASE_METHOD; *obj = &object->ISWbemObject_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 1ce045697a..68c0e3b589 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -48,6 +48,11 @@ static void test_ParseDisplayName(void) static const WCHAR name4[] = {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':', 'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; + static const WCHAR stdregprovW[] = + {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','d','e','f','a','u','l','t',':', + 'S','t','d','R','e','g','P','r','o','v',0}; + static const WCHAR getstringvalueW[] = + {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; static const struct { const WCHAR *name; @@ -242,6 +247,36 @@ static void test_ParseDisplayName(void) } IBindCtx_Release( ctx ); + + hr = CreateBindCtx( 0, &ctx ); + ok( hr == S_OK, "got %x\n", hr ); + + str = SysAllocString( stdregprovW ); + hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); + ok( hr == S_OK, "got %x\n", hr ); + SysFreeString( str ); + + if (moniker) + { + ISWbemObject *sobj = NULL; + hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_ISWbemObject, (void **)&sobj ); + ok( hr == S_OK, "got %x\n",hr ); + if (sobj) + { + DISPID dispid = 0xdeadbeef; + + str = SysAllocString( getstringvalueW ); + hr = ISWbemObject_GetIDsOfNames( sobj, &IID_NULL, &str, 1, english, &dispid ); + ok( hr == S_OK, "got %x\n", hr ); + ok( dispid == 0x1000001, "got %x\n", dispid ); + + ISWbemObject_Release( sobj ); + SysFreeString( str ); + } + IMoniker_Release( moniker ); + } + + IBindCtx_Release(ctx); IParseDisplayName_Release( displayname ); } -- 2.11.0

1 0

[PATCH 2/3] wbemprox: Make name and value optional in IWbemClassObject::Next.
by Hans Leidekker 09 Oct '18

09 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/class.c | 5 +++- dlls/wbemprox/query.c | 61 ++++++++++++++++++++++++++++++++------------- dlls/wbemprox/tests/query.c | 2 ++ 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 3f299ead5e..cc54fd5d30 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -532,8 +532,11 @@ static HRESULT WINAPI class_object_Next( SysFreeString( prop ); return hr; } + obj->index_property = i + 1; - *strName = prop; + if (strName) *strName = prop; + else SysFreeString( prop ); + return S_OK; } return WBEM_S_NO_MORE_DATA; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 8a51266298..d193574a39 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -668,50 +668,71 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (!strcmpiW( name, classW )) { - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_classname( view ); + if (ret) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_classname( view ); + } if (type) *type = CIM_STRING; return S_OK; } if (!strcmpiW( name, genusW )) { - V_VT( ret ) = VT_I4; - V_I4( ret ) = WBEM_GENUS_INSTANCE; /* FIXME */ + if (ret) + { + V_VT( ret ) = VT_I4; + V_I4( ret ) = WBEM_GENUS_INSTANCE; /* FIXME */ + } if (type) *type = CIM_SINT32; return S_OK; } else if (!strcmpiW( name, namespaceW )) { - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_namespace( view ); + if (ret) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_namespace( view ); + } if (type) *type = CIM_STRING; return S_OK; } else if (!strcmpiW( name, pathW )) { - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_path( view, index, name ); + if (ret) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_path( view, index, name ); + } if (type) *type = CIM_STRING; return S_OK; } if (!strcmpiW( name, propcountW )) { - V_VT( ret ) = VT_I4; - V_I4( ret ) = count_selected_properties( view ); + if (ret) + { + V_VT( ret ) = VT_I4; + V_I4( ret ) = count_selected_properties( view ); + } if (type) *type = CIM_SINT32; return S_OK; } else if (!strcmpiW( name, relpathW )) { - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_relpath( view, index, name ); + if (ret) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_relpath( view, index, name ); + } if (type) *type = CIM_STRING; return S_OK; } else if (!strcmpiW( name, serverW )) { - V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = build_servername( view ); + if (ret) + { + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = build_servername( view ); + } if (type) *type = CIM_STRING; return S_OK; } @@ -835,6 +856,11 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR hr = get_value( view->table, row, column, &val ); if (hr != S_OK) return hr; + if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; + if (flavor) *flavor = 0; + + if (!ret) return S_OK; + vartype = view->table->columns[column].vartype; if (view->table->columns[column].type & CIM_FLAG_ARRAY) { @@ -843,8 +869,10 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR val_ptr = to_safearray( (const struct array *)(INT_PTR)val, basetype ); if (!val_ptr) vartype = VT_NULL; else if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; - goto done; + set_variant( vartype, val, val_ptr, ret ); + return S_OK; } + switch (view->table->columns[column].type & COL_TYPE_MASK) { case CIM_BOOLEAN: @@ -891,10 +919,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR return WBEM_E_FAILED; } -done: set_variant( vartype, val, val_ptr, ret ); - if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; - if (flavor) *flavor = 0; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b2f5d68d8e..387952dd16 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1194,6 +1194,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) hr = IWbemClassObject_BeginEnumeration( obj, 0 ); ok( hr == S_OK, "got %08x\n", hr ); + while (IWbemClassObject_Next( obj, 0, NULL, NULL, NULL, NULL ) == S_OK) {} + hr = IWbemClassObject_EndEnumeration( obj ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.11.0

1 0

[PATCH 1/3] wbemprox: Don't return an error from IWbemClassObject::BeginMethodEnumeration if the object has an iterator.
by Hans Leidekker 09 Oct '18

09 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/class.c | 5 ----- dlls/wbemprox/tests/query.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 92c110f5f4..3f299ead5e 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -907,11 +907,6 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration( if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); - if (co->iter) - { - WARN("not allowed on instance\n"); - return WBEM_E_ILLEGAL_OPERATION; - } co->index_method = 0; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 26e2dfa30d..b2f5d68d8e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -722,8 +722,8 @@ static void test_StdRegProv( IWbemServices *services ) 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; static const WCHAR regtestW[] = {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; - BSTR class = SysAllocString( stdregprovW ), method; - IWbemClassObject *reg, *sig_in, *in, *out; + BSTR class = SysAllocString( stdregprovW ), method, name; + IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; VARIANT defkey, subkey, retval, names, types, value, valuename; CIMTYPE type; HRESULT hr; @@ -735,6 +735,29 @@ static void test_StdRegProv( IWbemServices *services ) win_skip( "StdRegProv not available\n" ); return; } + + hr = IWbemClassObject_BeginMethodEnumeration( reg, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + while (IWbemClassObject_NextMethod( reg, 0, &name, &sig_in, &sig_out ) == S_OK) + { + SysFreeString( name ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( sig_out ); + } + + hr = IWbemClassObject_EndMethodEnumeration( reg ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemClassObject_BeginEnumeration( reg, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + while (IWbemClassObject_Next( reg, 0, &name, NULL, NULL, NULL ) == S_OK) + SysFreeString( name ); + + hr = IWbemClassObject_EndEnumeration( reg ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWbemClassObject_GetMethod( reg, createkeyW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr ); @@ -1168,6 +1191,12 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + hr = IWbemClassObject_BeginEnumeration( obj, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemClassObject_EndEnumeration( obj ); + ok( hr == S_OK, "got %08x\n", hr ); + type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, buildnumberW, 0, &val, &type, NULL ); -- 2.11.0

1 0

[PATCH v2 1/2] gdi32: Improves the subpixel rendering availability for FreeType 2.8.1+.
by Byeongsik Jeon 09 Oct '18

09 Oct '18

FreeType 2.8.1+ implemented its own subpixel rendering. So FT_Err_Uniplemented_Feature check is not the reliable way. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 36a3431394..b95d223138 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -993,18 +993,22 @@ static BOOL is_hinting_enabled(void) static BOOL is_subpixel_rendering_enabled( void ) { -#ifdef FT_LCD_FILTER_H static int enabled = -1; if (enabled == -1) { - enabled = (pFT_Library_SetLcdFilter && - pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); + /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ + if ( FT_SimpleVersion >= ((2 << 16) | (8 << 8) | (1 << 0))) + enabled = TRUE; +#ifdef FT_LCD_FILTER_H + else if ( pFT_Library_SetLcdFilter && + pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature ) + enabled = TRUE; +#endif + else enabled = FALSE; + TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); } return enabled; -#else - return FALSE; -#endif } @@ -7274,7 +7278,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: -#ifdef FT_LCD_FILTER_H { switch (ft_face->glyph->format) { @@ -7360,8 +7363,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if ( needsTransform ) pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); +#ifdef FT_LCD_FILTER_H if ( pFT_Library_SetLcdFilter ) pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); +#endif pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer; @@ -7442,9 +7447,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, break; } -#else - return GDI_ERROR; -#endif case GGO_NATIVE: { -- 2.19.1

2 3

[PATCH] mshtml: Support registry configuration for maximal allowed compatibility mode.
by Jacek Caban 09 Oct '18

09 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/main.c | 125 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 ++ dlls/mshtml/mutation.c | 60 +++++++++++++-------- 3 files changed, 166 insertions(+), 22 deletions(-)

1 0

[PATCH] quartz/filtergraph: Fix SEGFAULT when num pin > 0.
by Brendan McGrath 08 Oct '18

08 Oct '18

When IPin_QueryInternalConnections returns S_OK and nb > 0, a SEGFAULT occurs at dlls/quartz/filtergraph.c:2144 as the code is expecting ppPins to be an initialized array if SUCCEEDED(hr) is TRUE and nb > 0. This patch ensures ppPins is an initialized array if SUCCEEDED(hr) is TRUE and nb > 0. Prior to this patch, ppPins was not being initialized when hr was S_OK and nb > 0. The Microsoft documentation for IPin_QueryInternalConnections states: *** This method has another use that is now deprecated: The Filter Graph Manager treats a filter as being a renderer filter if at least one input pin implements this method but returns zero in nPin. If you are writing a new renderer filter, however, you should implement the IAMFilterMiscFlags interface instead of using this method to indicate that the filter is a renderer. *** The code I changed was written back in 2004/2005. My guess is back then the deprecated behaviour would only return S_OK when nb == 0, but this no longer appears to be the case. See line 99 of https://chromium.googlesource.com/webm/webmdshow/+/master/webmsplit/webmspl… for an example. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/quartz/filtergraph.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c8595646a03..536c48d346e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -981,9 +981,7 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi TRACE("(%p, %p, %p, %p)\n", pfilter, pinputpin, pppins, pnb); hr = IPin_QueryInternalConnections(pinputpin, NULL, &nb); - if (hr == S_OK) { - /* Rendered input */ - } else if (hr == S_FALSE) { + if (SUCCEEDED(hr) && nb > 0) { *pppins = CoTaskMemAlloc(sizeof(IPin*)*nb); hr = IPin_QueryInternalConnections(pinputpin, *pppins, &nb); if (hr != S_OK) { -- 2.17.1

2 2

[PATCH 6/7] d3d11/tests: Add depth bias clamp tests.
by Henri Verbeet 08 Oct '18

08 Oct '18

This is pretty much a copy of the d3d10core tests by Zebediah. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 203 ++++++++++++++++++++++++++--------------------- 1 file changed, 114 insertions(+), 89 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ebccf9fd3f..0939990e206 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -24744,6 +24744,15 @@ static void test_gather_c(void) release_test_context(&test_context); } +static float clamp_depth_bias(float bias, float clamp) +{ + if (clamp > 0.0f) + return min(bias, clamp); + if (clamp < 0.0f) + return max(bias, clamp); + return bias; +} + static void test_depth_bias(void) { struct vec3 vertices[] = @@ -24757,15 +24766,15 @@ static void test_depth_bias(void) D3D11_RASTERIZER_DESC rasterizer_desc; struct swapchain_desc swapchain_desc; D3D11_TEXTURE2D_DESC texture_desc; - double m, r, bias, depth, data; ID3D11DeviceContext *context; + double m, bias, depth, data; struct resource_readback rb; ID3D11DepthStencilView *dsv; unsigned int expected_value; + unsigned int x, y, i, j, k; ID3D11RasterizerState *rs; ID3D11Texture2D *texture; unsigned int format_idx; - unsigned int x, y, i, j; unsigned int shift = 0; ID3D11Device *device; float *depth_values; @@ -24792,6 +24801,10 @@ static void test_depth_bias(void) -10000, -1000, -100, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 50, 100, 200, 500, 1000, 10000, }; + static const float bias_clamp_tests[] = + { + 0.0f, -1e-5f, 1e-5f, + }; static const float quad_slopes[] = { 0.0f, 0.5f, 1.0f @@ -24844,11 +24857,11 @@ static void test_depth_bias(void) ok(SUCCEEDED(hr), "Failed to create render depth stencil view, hr %#x.\n", hr); ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0); - draw_quad(&test_context); + draw_quad_z(&test_context, 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: - check_texture_float(texture, 0.0f, 0); + check_texture_float(texture, 1.0f, 0); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: /* FIXME: Depth/stencil byte order is reversed in wined3d. */ @@ -24872,6 +24885,7 @@ static void test_depth_bias(void) trace("Unhandled format %#x.\n", format); break; } + draw_quad(&test_context); /* DepthBias */ for (i = 0; i < ARRAY_SIZE(quads); ++i) @@ -24884,63 +24898,69 @@ static void test_depth_bias(void) for (j = 0; j < ARRAY_SIZE(bias_tests); ++j) { rasterizer_desc.DepthBias = bias_tests[j]; - ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); - ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D11DeviceContext_RSSetState(context, rs); - ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); - draw_quad(&test_context); - switch (format) + + for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { - case DXGI_FORMAT_D32_FLOAT: - bias = rasterizer_desc.DepthBias * pow(2.0f, quads[i].exponent - 23.0f); - depth = min(max(0.0f, quads[i].z + bias), 1.0f); + rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; + ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D11DeviceContext_RSSetState(context, rs); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + draw_quad(&test_context); + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + bias = rasterizer_desc.DepthBias * pow(2.0f, quads[i].exponent - 23.0f); + bias = clamp_depth_bias(bias, rasterizer_desc.DepthBiasClamp); + depth = min(max(0.0f, quads[i].z + bias), 1.0f); - check_texture_float(texture, depth, 2); - break; - case DXGI_FORMAT_D24_UNORM_S8_UINT: - r = 1.0f / 16777215.0f; - bias = rasterizer_desc.DepthBias * r; - depth = min(max(0.0f, quads[i].z + bias), 1.0f); + check_texture_float(texture, depth, 2); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + bias = clamp_depth_bias(rasterizer_desc.DepthBias / 16777215.0f, + rasterizer_desc.DepthBiasClamp); + depth = min(max(0.0f, quads[i].z + bias), 1.0f); - get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 16777215.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) { - u32 = get_readback_data(&rb, x, y, 0, sizeof(*u32)); - u32_value = *u32 >> shift; - ok(abs(u32_value - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); + expected_value = depth * 16777215.0f + 0.5f; + for (x = 0; x < texture_desc.Width; ++x) + { + u32 = get_readback_data(&rb, x, y, 0, sizeof(*u32)); + u32_value = *u32 >> shift; + ok(abs(u32_value - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + u32_value, u32_value / 16777215.0f, + expected_value, expected_value / 16777215.0f); + } } - } - release_resource_readback(&rb); - break; - case DXGI_FORMAT_D16_UNORM: - r = 1.0f / 65535.0f; - bias = rasterizer_desc.DepthBias * r; - depth = min(max(0.0f, quads[i].z + bias), 1.0f); + release_resource_readback(&rb); + break; + case DXGI_FORMAT_D16_UNORM: + bias = clamp_depth_bias(rasterizer_desc.DepthBias / 65535.0f, + rasterizer_desc.DepthBiasClamp); + depth = min(max(0.0f, quads[i].z + bias), 1.0f); - get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) { - u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + expected_value = depth * 65535.0f + 0.5f; + for (x = 0; x < texture_desc.Width; ++x) + { + u16 = get_readback_data(&rb, x, y, 0, sizeof(*u16)); + ok(abs(*u16 - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + } } - } - release_resource_readback(&rb); - break; - default: - break; + release_resource_readback(&rb); + break; + default: + break; + } + ID3D11RasterizerState_Release(rs); } - ID3D11RasterizerState_Release(rs); } } @@ -24982,47 +25002,52 @@ static void test_depth_bias(void) for (j = 0; j < ARRAY_SIZE(slope_scaled_bias_tests); ++j) { rasterizer_desc.SlopeScaledDepthBias = slope_scaled_bias_tests[j]; - ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); - ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D11DeviceContext_RSSetState(context, rs); - ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); - draw_quad(&test_context); - - m = quad_slopes[i] / texture_desc.Height; - bias = rasterizer_desc.SlopeScaledDepthBias * m; - get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + + for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { - depth = min(max(0.0f, depth_values[y] + bias), 1.0f); - switch (format) + rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; + ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D11DeviceContext_RSSetState(context, rs); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + draw_quad(&test_context); + + m = quad_slopes[i] / texture_desc.Height; + bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) { - case DXGI_FORMAT_D32_FLOAT: - data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), - "Got depth %.8e, expected %.8e.\n", data, depth); - break; - case DXGI_FORMAT_D24_UNORM_S8_UINT: - u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); - u32_value = *u32 >> shift; - expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); - break; - case DXGI_FORMAT_D16_UNORM: - u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); - expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - break; - default: - break; + depth = min(max(0.0f, depth_values[y] + bias), 1.0f); + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + data = get_readback_float(&rb, 0, y); + ok(compare_float(data, depth, 64), + "Got depth %.8e, expected %.8e.\n", data, depth); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); + u32_value = *u32 >> shift; + expected_value = depth * 16777215.0f + 0.5f; + ok(abs(u32_value - expected_value) <= 3, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + u32_value, u32_value / 16777215.0f, + expected_value, expected_value / 16777215.0f); + break; + case DXGI_FORMAT_D16_UNORM: + u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); + expected_value = depth * 65535.0f + 0.5f; + ok(abs(*u16 - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + break; + default: + break; + } } + release_resource_readback(&rb); + ID3D11RasterizerState_Release(rs); } - release_resource_readback(&rb); - ID3D11RasterizerState_Release(rs); } } -- 2.11.0

2 1

[PATCH vkd3d 6/7] vkd3d: Fix race condition while dumping DXBC shaders.
by Józef Kucia 08 Oct '18

08 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b60cebf26654..1d18c31a053f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1203,11 +1203,14 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline static void dump_shader(const char *path, const char *prefix, const void *data, size_t size) { - static unsigned int shader_id = 0; + static int shader_id = 0; char filename[1024]; + unsigned int id; FILE *f; - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, shader_id); + id = InterlockedIncrement(&shader_id) - 1; + + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); if (!(f = fopen(filename, "wb"))) { ERR("Failed to open %s for dumping shader.\n", filename); @@ -1218,8 +1221,6 @@ static void dump_shader(const char *path, const char *prefix, const void *data, ERR("Failed to write shader to %s.\n", filename); if (fclose(f)) ERR("Failed to close stream %s.\n", filename); - - ++shader_id; } static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, size_t size) -- 2.18.0

2 1

[PATCH vkd3d 1/7] vkd3d-shader: Implement SV_SampleIndex.
by Józef Kucia 08 Oct '18

08 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 98d7a9313f0e..63a1a0e0b7c2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2958,6 +2958,14 @@ static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } +static uint32_t sv_sample_index(struct vkd3d_dxbc_compiler *compiler, uint32_t id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + return id; +} + struct vkd3d_spirv_builtin { enum vkd3d_component_type component_type; @@ -2986,6 +2994,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, + {VKD3D_SIV_SAMPLE_INDEX, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleId, sv_sample_index}}, + {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, }; -- 2.18.0

2 1