September 2021 - Wine-Commits

Nikolay Sivov : d3d10/effect: Set corresponding variable flag when explicit bind point is specified for a constant buffer.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 86194bff11941b6efa1cf8c6b04cc1d7d13a190c URL: https://source.winehq.org/git/wine.git/?a=commit;h=86194bff11941b6efa1cf8c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 08:57:36 2021 +0300 d3d10/effect: Set corresponding variable flag when explicit bind point is specified for a constant buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 3 +++ dlls/d3d10/tests/effect.c | 39 ++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6d12920c762..f8e7674ae1a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2502,6 +2502,9 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, return hr; } + if (l->explicit_bind_point != ~0u) + l->flag |= D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT; + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7923f70ed1e..628c1856c78 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -56,30 +56,23 @@ static inline HRESULT create_effect(DWORD *data, UINT flags, ID3D10Device *devic * test_effect_constant_buffer_type */ #if 0 -cbuffer cb +cbuffer cb : register(b1) { float f1 : SV_POSITION; float f2 : COLOR0; }; #endif -static DWORD fx_test_ecbt[] = { -0x43425844, 0xc92a4732, 0xbd0d68c0, 0x877f71ee, -0x871fc277, 0x00000001, 0x0000010a, 0x00000001, -0x00000024, 0x30315846, 0x000000de, 0xfeff1001, -0x00000001, 0x00000002, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000042, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x66006263, -0x74616f6c, 0x00000700, 0x00000100, 0x00000000, -0x00000400, 0x00001000, 0x00000400, 0x00090900, -0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, -0x43003266, 0x524f4c4f, 0x00040030, 0x00100000, -0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, -0x00290000, 0x000d0000, 0x002c0000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00380000, -0x000d0000, 0x003b0000, 0x00040000, 0x00000000, -0x00000000, 0x00000000, 0x52590000, +static DWORD fx_test_ecbt[] = +{ + 0x43425844, 0xa2e18995, 0x540597cc, 0x670b9d73, 0x777fe190, 0x00000001, 0x0000010a, 0x00000001, + 0x00000024, 0x30315846, 0x000000de, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000042, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, + 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, + 0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x00040030, 0x00100000, + 0x00000000, 0x00020000, 0x00010000, 0x00000000, 0x00290000, 0x000d0000, 0x002c0000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00380000, 0x000d0000, 0x003b0000, 0x00040000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, }; static void test_effect_constant_buffer_type(void) @@ -87,6 +80,7 @@ static void test_effect_constant_buffer_type(void) ID3D10Effect *effect; ID3D10EffectConstantBuffer *constantbuffer; ID3D10EffectType *type, *type2, *null_type; + D3D10_EFFECT_VARIABLE_DESC var_desc; D3D10_EFFECT_TYPE_DESC type_desc; D3D10_EFFECT_DESC desc; ID3D10Device *device; @@ -119,6 +113,13 @@ static void test_effect_constant_buffer_type(void) ok(desc.Techniques == 0, "Unexpected techniques count %u.\n", desc.Techniques); constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); + + hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); +todo_wine + ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); + type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc);

1 0

Alex Henrie : uiautomationcore: Add UiaDisconnectProvider stub.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: eac5cef24038f0194e58ed0004c4a162b4f3e9a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eac5cef24038f0194e58ed00… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 10 01:18:17 2021 -0600 uiautomationcore: Add UiaDisconnectProvider stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51729 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 6 ++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 42014af6035..2dada95af80 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -89,3 +89,9 @@ HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **pr FIXME("(%p, %p): stub\n", hwnd, provider); return E_NOTIMPL; } + +HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) +{ + FIXME("(%p): stub\n", provider); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index c9b96ab39ef..656641c4bad 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -56,7 +56,7 @@ @ stub UiaAddEvent @ stdcall UiaClientsAreListening() #@ stub UiaDisconnectAllProviders -#@ stub UiaDisconnectProvider +@ stdcall UiaDisconnectProvider(ptr) @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind

1 0

Jacek Caban : gdi32: Directly use ntgdi functions in font.c.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: a8131cb3e709eeab34f1f4e2b078f1935a921e66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8131cb3e709eeab34f1f4e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 14:28:30 2021 +0200 gdi32: Directly use ntgdi functions in font.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d32e8b8fe40..5758a999561 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3760,9 +3760,9 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { LOGFONTW lf; FMAT2 dcmat; - BOOL can_use_bitmap = !!(GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_RA_ABLE); + BOOL can_use_bitmap = !!(NtGdiGetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_RA_ABLE); - GetObjectW( hfont, sizeof(lf), &lf ); + NtGdiExtGetObjectW( hfont, sizeof(lf), &lf ); switch (lf.lfQuality) { case NONANTIALIASED_QUALITY: @@ -4218,7 +4218,7 @@ static void update_font_code_page( DC *dc, HANDLE font ) { LOGFONTW lf; - GetObjectW( font, sizeof(lf), &lf ); + NtGdiExtGetObjectW( font, sizeof(lf), &lf ); if (!(lf.lfClipPrecision & CLIP_DFA_DISABLE)) charset = DEFAULT_CHARSET; } @@ -4515,8 +4515,8 @@ BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics, ULONG flags ) /* device layer returns values in device units * therefore we have to convert them to logical */ - metrics->tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); - metrics->tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); + metrics->tmDigitizedAspectX = NtGdiGetDeviceCaps(hdc, LOGPIXELSX); + metrics->tmDigitizedAspectY = NtGdiGetDeviceCaps(hdc, LOGPIXELSY); metrics->tmHeight = height_to_LP( dc, metrics->tmHeight ); metrics->tmAscent = height_to_LP( dc, metrics->tmAscent ); metrics->tmDescent = height_to_LP( dc, metrics->tmDescent ); @@ -4578,8 +4578,8 @@ UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, if (lpOTM && ret) { - output->otmTextMetrics.tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); - output->otmTextMetrics.tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); + output->otmTextMetrics.tmDigitizedAspectX = NtGdiGetDeviceCaps(hdc, LOGPIXELSX); + output->otmTextMetrics.tmDigitizedAspectY = NtGdiGetDeviceCaps(hdc, LOGPIXELSY); output->otmTextMetrics.tmHeight = height_to_LP( dc, output->otmTextMetrics.tmHeight ); output->otmTextMetrics.tmAscent = height_to_LP( dc, output->otmTextMetrics.tmAscent ); output->otmTextMetrics.tmDescent = height_to_LP( dc, output->otmTextMetrics.tmDescent ); @@ -4700,7 +4700,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, for (i = 0; i < ARRAY_SIZE( indices ); i++) { index = indices[i]; - ret = GetGlyphOutlineW( hdc, index, aa_flags, metrics, 0, NULL, &identity ); + ret = NtGdiGetGlyphOutline( hdc, index, aa_flags, metrics, 0, NULL, &identity, FALSE ); if (ret != GDI_ERROR) break; } @@ -4722,7 +4722,8 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, image->is_copy = TRUE; image->free = free_heap_bits; - ret = GetGlyphOutlineW( hdc, index, aa_flags, metrics, size, image->ptr, &identity ); + ret = NtGdiGetGlyphOutline( hdc, index, aa_flags, metrics, size, image->ptr, + &identity, FALSE ); if (ret == GDI_ERROR) { HeapFree( GetProcessHeap(), 0, image->ptr ); @@ -4811,7 +4812,11 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS * } assert( count <= max_count ); dp_to_lp( dc, pts, count ); - for (i = 0; i < count; i += 2) Polyline( dc->hSelf, pts + i, 2 ); + for (i = 0; i < count; i += 2) + { + const UINT pts_count = 2; + NtGdiPolyPolyDraw( dc->hSelf, pts + i, &pts_count, 1, NtGdiPolyPolyline ); + } HeapFree( GetProcessHeap(), 0, pts ); } @@ -4830,7 +4835,8 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT if (flags & ETO_OPAQUE) { RECT rc = *rect; - HBRUSH brush = CreateSolidBrush( NtGdiGetNearestColor( dev->hdc, dc->attr->background_color )); + COLORREF brush_color = NtGdiGetNearestColor( dev->hdc, dc->attr->background_color ); + HBRUSH brush = NtGdiCreateSolidBrush( brush_color, NULL); if (brush) { @@ -4922,7 +4928,7 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT } } - pen = CreatePen( PS_SOLID, 1, dc->attr->text_color ); + pen = NtGdiCreatePen( PS_SOLID, 1, dc->attr->text_color, NULL ); orig = NtGdiSelectPen( dev->hdc, pen ); for (i = 0; i < count; i++) @@ -5062,8 +5068,8 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr y = pt.y; } - GetTextMetricsW(hdc, &tm); - GetObjectW(dc->hFont, sizeof(lf), &lf); + NtGdiGetTextMetricsW( hdc, &tm, 0 ); + NtGdiExtGetObjectW( dc->hFont, sizeof(lf), &lf ); if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ lf.lfEscapement = 0; @@ -5107,8 +5113,8 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr x = pt.x; y = pt.y; - char_extra = GetTextCharacterExtra(hdc); - if (char_extra && lpDx && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + char_extra = dc->attr->char_extra; + if (char_extra && lpDx && NtGdiGetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) char_extra = 0; /* Printer drivers don't add char_extra if lpDx is supplied */ if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0) @@ -5185,10 +5191,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr { POINT desired[2]; - if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, str, count, &sz); - else - GetTextExtentPointW(hdc, str, count, &sz); + NtGdiGetTextExtentExW( hdc, str, count, 0, NULL, NULL, &sz, !!(flags & ETO_GLYPH_INDEX) ); desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0; @@ -5216,7 +5219,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr pt.x = x + width.x; pt.y = y + width.y; dp_to_lp(dc, &pt, 1); - MoveToEx(hdc, pt.x, pt.y, NULL); + NtGdiMoveTo( hdc, pt.x, pt.y, NULL ); } break; @@ -5233,7 +5236,7 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr pt.x = x; pt.y = y; dp_to_lp(dc, &pt, 1); - MoveToEx(hdc, pt.x, pt.y, NULL); + NtGdiMoveTo( hdc, pt.x, pt.y, NULL ); } break; } @@ -5289,7 +5292,7 @@ done: OUTLINETEXTMETRICW* otm = NULL; POINT pts[5]; HPEN hpen = NtGdiSelectPen( hdc, get_stock_object(NULL_PEN) ); - HBRUSH hbrush = CreateSolidBrush( dc->attr->text_color ); + HBRUSH hbrush = NtGdiCreateSolidBrush( dc->attr->text_color, NULL ); hbrush = NtGdiSelectBrush(hdc, hbrush); @@ -5821,7 +5824,7 @@ static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR DWORD num_in_res; TRACE("Found resource %s - trying to load\n", wine_dbgstr_w(type)); - if (!AddFontMemResourceEx(pMem, SizeofResource(hModule, rsrc), NULL, &num_in_res)) + if (!NtGdiAddFontMemResourceEx( pMem, SizeofResource(hModule, rsrc), NULL, 0, &num_in_res )) { ERR("Failed to load PE font resource mod=%p ptr=%p\n", hModule, hMem); return FALSE;

1 0

Rémi Bernon : dinput8/tests: Stop increasing the sequence in HID_GET_INPUT_REPORT.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 202296c282b69fbf4d479a69f8e6fa954be0aee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=202296c282b69fbf4d479a69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:22:44 2021 +0200 dinput8/tests: Stop increasing the sequence in HID_GET_INPUT_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 1 - dlls/dinput8/tests/hid.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index eefdc05d1a3..b393ddb41cb 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -295,7 +295,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) memset( packet->reportBuffer, 0xa5, 3 ); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; - ((char *)packet->reportBuffer)[1] = seq++; irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; break; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 4483a5ec479..ebf3a6e7da9 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1839,6 +1839,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + todo_wine ok( memcmp( report, buffer + caps.InputReportByteLength, caps.InputReportByteLength ), "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" );

1 0

Nikolay Sivov : d3d10/tests: Test SystemValueType field.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: e5e6000654d42a513c4fff95f1d30e16dd07d450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e6000654d42a513c4fff95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 08:57:35 2021 +0300 d3d10/tests: Test SystemValueType field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 60db5ad55be..7923f70ed1e 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3698,18 +3698,25 @@ if (0) hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); +todo_wine + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); v = effect->lpVtbl->GetVariableByName(effect, "v"); vs = v->lpVtbl->AsShader(v); @@ -3717,18 +3724,24 @@ if (0) hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); /* NULL shader variable */ v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -3746,6 +3759,8 @@ if (0) hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); @@ -3759,6 +3774,7 @@ if (0) hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); effect->lpVtbl->Release(effect);

1 0

Dmitry Timoshkov : wininet: Add handling for remaining special errors to InternetErrorDlg.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 03236a391aa5e4b34367bdba6d5d7dad6d05ef6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=03236a391aa5e4b34367bdba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 10 16:01:12 2021 +0200 wininet: Add handling for remaining special errors to InternetErrorDlg. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/dialogs.c | 48 +++++++++++++++++++++++++++++++++++++++++-- dlls/wininet/tests/internet.c | 40 +++++------------------------------- 2 files changed, 51 insertions(+), 37 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 25ed1f2a651..a48c75865ac 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -514,11 +514,17 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, } break; } + + case ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED: + if(!req) + return ERROR_INVALID_PARAMETER; + /* fall through */ case ERROR_INTERNET_SEC_CERT_ERRORS: case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_INVALID_CA: case ERROR_INTERNET_SEC_CERT_REV_FAILED: + case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { res = ERROR_CANCELLED; break; @@ -530,13 +536,51 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); break; + + case ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION: + if(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) { + res = ERROR_HTTP_COOKIE_DECLINED; + break; + } + FIXME("Need to display dialog for error %d\n", dwError); + res = ERROR_CANCELLED; + break; + + case ERROR_INTERNET_INSERT_CDROM: + if(!req) + return ERROR_INVALID_PARAMETER; + /* fall through */ + case ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION: + case ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT: + case ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT: + case ERROR_INTERNET_MIXED_SECURITY: + case ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR: + if(!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) + FIXME("Need to display dialog for error %d\n", dwError); + res = ERROR_CANCELLED; + break; + + case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: + case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: + if(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) { + res = ERROR_SUCCESS; + break; + } + FIXME("Need to display dialog for error %d\n", dwError); + res = ERROR_CANCELLED; + break; + case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_POST_IS_NON_SECURE: - FIXME("Need to display dialog for error %d\n", dwError); + if (!(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI)) + FIXME("Need to display dialog for error %d\n", dwError); res = ERROR_SUCCESS; break; + default: - res = ERROR_CANCELLED; + if(!(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS)) + res = ERROR_CANCELLED; + break; } if(req) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e83b142e998..8513aabe174 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1566,29 +1566,14 @@ static void test_InternetErrorDlg(void) break; } - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE && - i != ERROR_INTERNET_MIXED_SECURITY && - i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED && - i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INSERT_CDROM && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) - ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ if(test_flags & FLAG_NEEDREQ) @@ -1598,31 +1583,16 @@ static void test_InternetErrorDlg(void) } res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_INSERT_CDROM || - i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_POST_IS_NON_SECURE && - i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INCORRECT_PASSWORD && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && - i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) - ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetCloseHandle(req);

1 0

Rémi Bernon : winexinput.sys: Look for caps in the lower HID report descriptor.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: b027f70a91421c01ee6ce4cee3572c0615f99506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b027f70a91421c01ee6ce4ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:08:20 2021 +0200 winexinput.sys: Look for caps in the lower HID report descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 69 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 60f7a8ed5dd..dfe747d6515 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -82,6 +82,14 @@ struct func_device WCHAR instance_id[MAX_DEVICE_ID_LEN]; + HIDP_VALUE_CAPS lx_caps; + HIDP_VALUE_CAPS ly_caps; + HIDP_VALUE_CAPS lt_caps; + HIDP_VALUE_CAPS rx_caps; + HIDP_VALUE_CAPS ry_caps; + HIDP_VALUE_CAPS rt_caps; + HIDP_DEVICE_DESC device_desc; + /* everything below requires holding the cs */ CRITICAL_SECTION cs; ULONG report_len; @@ -442,13 +450,27 @@ static NTSTATUS sync_ioctl(DEVICE_OBJECT *device, DWORD code, void *in_buf, DWOR return io.Status; } +static void check_value_caps(struct func_device *fdo, USHORT usage, HIDP_VALUE_CAPS *caps) +{ + switch (usage) + { + case HID_USAGE_GENERIC_X: fdo->lx_caps = *caps; break; + case HID_USAGE_GENERIC_Y: fdo->ly_caps = *caps; break; + case HID_USAGE_GENERIC_Z: fdo->lt_caps = *caps; break; + case HID_USAGE_GENERIC_RX: fdo->rx_caps = *caps; break; + case HID_USAGE_GENERIC_RY: fdo->ry_caps = *caps; break; + case HID_USAGE_GENERIC_RZ: fdo->rt_caps = *caps; break; + } +} + static NTSTATUS initialize_device(DEVICE_OBJECT *device) { struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - ULONG i, report_desc_len, report_count; + ULONG i, u, button_count, report_desc_len, report_count; PHIDP_REPORT_DESCRIPTOR report_desc; PHIDP_PREPARSED_DATA preparsed; - HIDP_DEVICE_DESC device_desc; + HIDP_BUTTON_CAPS *button_caps; + HIDP_VALUE_CAPS *value_caps; HIDP_REPORT_IDS *reports; HID_DESCRIPTOR hid_desc; NTSTATUS status; @@ -461,16 +483,49 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(report_desc = malloc(report_desc_len))) return STATUS_NO_MEMORY; status = sync_ioctl(fdo->bus_device, IOCTL_HID_GET_REPORT_DESCRIPTOR, NULL, 0, report_desc, report_desc_len); - if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &device_desc); + if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &fdo->device_desc); free(report_desc); if (status != HIDP_STATUS_SUCCESS) return status; - preparsed = device_desc.CollectionDesc->PreparsedData; + preparsed = fdo->device_desc.CollectionDesc->PreparsedData; status = HidP_GetCaps(preparsed, &caps); if (status != HIDP_STATUS_SUCCESS) return status; - reports = device_desc.ReportIDs; - report_count = device_desc.ReportIDsLength; + button_count = 0; + if (!(button_caps = malloc(sizeof(*button_caps) * caps.NumberInputButtonCaps))) return STATUS_NO_MEMORY; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &caps.NumberInputButtonCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputButtonCaps; i++) + { + if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) continue; + if (button_caps[i].IsRange) button_count = max(button_count, button_caps[i].Range.UsageMax); + else button_count = max(button_count, button_caps[i].NotRange.Usage); + } + free(button_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (button_count < 10) WARN("only %u buttons found\n", button_count); + + if (!(value_caps = malloc(sizeof(*value_caps) * caps.NumberInputValueCaps))) return STATUS_NO_MEMORY; + status = HidP_GetValueCaps(HidP_Input, value_caps, &caps.NumberInputValueCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputValueCaps; i++) + { + HIDP_VALUE_CAPS *caps = value_caps + i; + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) continue; + if (!caps->IsRange) check_value_caps(fdo, caps->NotRange.Usage, caps); + else for (u = caps->Range.UsageMin; u <=caps->Range.UsageMax; u++) check_value_caps(fdo, u, value_caps + i); + } + free(value_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (!fdo->lx_caps.UsagePage) WARN("missing lx axis\n"); + if (!fdo->ly_caps.UsagePage) WARN("missing ly axis\n"); + if (!fdo->lt_caps.UsagePage) WARN("missing lt axis\n"); + if (!fdo->rx_caps.UsagePage) WARN("missing rx axis\n"); + if (!fdo->ry_caps.UsagePage) WARN("missing ry axis\n"); + if (!fdo->rt_caps.UsagePage) WARN("missing rt axis\n"); + + reports = fdo->device_desc.ReportIDs; + report_count = fdo->device_desc.ReportIDsLength; for (i = 0; i < report_count; ++i) if (!reports[i].ReportID || reports[i].InputLength) break; if (i == report_count) i = 0; /* no input report?!, just use first ID */ @@ -478,7 +533,6 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(fdo->report_buf = malloc(fdo->report_len))) return STATUS_NO_MEMORY; fdo->report_buf[0] = reports[i].ReportID; - HidP_FreeCollectionDescription(&device_desc); return STATUS_SUCCESS; } @@ -556,6 +610,7 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) status = IoCallDriver(fdo->bus_device, irp); IoDetachDevice(fdo->bus_device); RtlDeleteCriticalSection(&fdo->cs); + HidP_FreeCollectionDescription(&fdo->device_desc); free(fdo->report_buf); IoDeleteDevice(device); return status;

1 0

Rémi Bernon : winexinput.sys: Translate lower reports into XInput HID reports.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 2eea1d615ae7e74282fe19e015ecadd10b4be9ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eea1d615ae7e74282fe19e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:08:21 2021 +0200 winexinput.sys: Translate lower reports into XInput HID reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 188 +++++++++++++++++++++++++++++++++-- dlls/winexinput.sys/pop_hid_macros.h | 83 ++++++++++++++++ dlls/winexinput.sys/psh_hid_macros.h | 85 ++++++++++++++++ dlls/xinput1_3/tests/xinput.c | 25 ----- 4 files changed, 349 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2eea1d615ae7e74282fe…

1 0

Nikolay Sivov : d3d10/effect: Use same field to return ExplicitBindPoint for all variable types.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 78f4ce0b11a9917d9bc5d732bc6bc38659ac612b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f4ce0b11a9917d9bc5d732… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 08:57:37 2021 +0300 d3d10/effect: Use same field to return ExplicitBindPoint for all variable types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 23 ++++++++++++----------- dlls/d3d10/tests/effect.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index f8e7674ae1a..4807136f670 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2045,6 +2045,9 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, return hr; } + if (v->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) + v->explicit_bind_point = v->buffer_offset; + return S_OK; } @@ -3967,7 +3970,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_variable_GetType static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVariable *iface, D3D10_EFFECT_VARIABLE_DESC *desc) { - struct d3d10_effect_variable *This = impl_from_ID3D10EffectVariable(iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -3985,16 +3988,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVaria /* FIXME: This isn't correct. Anonymous shaders let desc->ExplicitBindPoint untouched, but normal shaders set it! */ memset(desc, 0, sizeof(*desc)); - desc->Name = This->name; - desc->Semantic = This->semantic; - desc->Flags = This->flag; - desc->Annotations = This->annotation_count; - desc->BufferOffset = This->buffer_offset; - - if (This->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) - { - desc->ExplicitBindPoint = This->buffer_offset; - } + desc->Name = v->name; + desc->Semantic = v->semantic; + desc->Flags = v->flag; + desc->Annotations = v->annotation_count; + desc->BufferOffset = v->buffer_offset; + + if (v->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) + desc->ExplicitBindPoint = v->explicit_bind_point; return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 628c1856c78..ba46b18b678 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -61,18 +61,25 @@ cbuffer cb : register(b1) float f1 : SV_POSITION; float f2 : COLOR0; }; + +cbuffer cb2 : register(b0) +{ + float f3 : packoffset(c2); +}; #endif static DWORD fx_test_ecbt[] = { - 0x43425844, 0xa2e18995, 0x540597cc, 0x670b9d73, 0x777fe190, 0x00000001, 0x0000010a, 0x00000001, - 0x00000024, 0x30315846, 0x000000de, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000042, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x7cfb8cde, 0x31ec2d95, 0x38500042, 0xa9330c67, 0x00000001, 0x00000145, 0x00000001, + 0x00000024, 0x30315846, 0x00000119, 0xfeff1001, 0x00000002, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000049, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, - 0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x00040030, 0x00100000, - 0x00000000, 0x00020000, 0x00010000, 0x00000000, 0x00290000, 0x000d0000, 0x002c0000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00380000, 0x000d0000, 0x003b0000, 0x00040000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, + 0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x62630030, 0x33660032, + 0x00000400, 0x00001000, 0x00000000, 0x00000200, 0x00000100, 0x00000000, 0x00002900, 0x00000d00, + 0x00002c00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003800, 0x00000d00, 0x00003b00, + 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00004200, 0x00003000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00004600, 0x00000d00, 0x00000000, 0x00002000, 0x00000000, 0x00000400, + 0x00000000, 0x00000000, }; static void test_effect_constant_buffer_type(void) @@ -82,6 +89,7 @@ static void test_effect_constant_buffer_type(void) ID3D10EffectType *type, *type2, *null_type; D3D10_EFFECT_VARIABLE_DESC var_desc; D3D10_EFFECT_TYPE_DESC type_desc; + ID3D10EffectVariable *v; D3D10_EFFECT_DESC desc; ID3D10Device *device; ULONG refcount; @@ -104,10 +112,10 @@ static void test_effect_constant_buffer_type(void) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); - ok(desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); + ok(desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", desc.SharedConstantBuffers); - ok(desc.GlobalVariables == 2, "Unexpected global variables count %u.\n", desc.GlobalVariables); + ok(desc.GlobalVariables == 3, "Unexpected global variables count %u.\n", desc.GlobalVariables); ok(desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", desc.SharedGlobalVariables); ok(desc.Techniques == 0, "Unexpected techniques count %u.\n", desc.Techniques); @@ -117,7 +125,6 @@ static void test_effect_constant_buffer_type(void) hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); -todo_wine ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); type = constantbuffer->lpVtbl->GetType(constantbuffer); @@ -216,6 +223,15 @@ todo_wine string = type->lpVtbl->GetMemberSemantic(type, 3); ok(string == NULL, "GetMemberSemantic is \"%s\", expected \"NULL\"\n", string); + constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); + v = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); + ok(var_desc.BufferOffset == 0x20, "Unexpected buffer offset %#x.\n", var_desc.BufferOffset); + ok(var_desc.ExplicitBindPoint == 0x20, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Handle rgba masks in stream output declarations.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: bf1d4b569734b9662d961d0007f8dbc1e9961e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1d4b569734b9662d961d00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 08:57:38 2021 +0300 d3d10/effect: Handle rgba masks in stream output declarations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 10 +- dlls/d3d10/tests/effect.c | 264 +++++++++++++++++++++++----------------------- 2 files changed, 140 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1d4b569734b9662d96…

1 0