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

Nikolay Sivov : d3d10/tests: Add a test for inline geometry shader with stream output declaration.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: a81c645c65904a7696752d5905aac13c301f0f88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a81c645c65904a7696752d59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 31 14:54:09 2021 +0200 d3d10/tests: Add a test for inline geometry shader with stream output declaration. 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 | 86 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 62 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index da698078f08..70bcf1ea72b 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2584,14 +2584,20 @@ technique10 Render SetVertexShader( v[1] ); SetGeometryShader( g ); } + pass P8 + { + SetPixelShader( p ); + SetVertexShader( v[1] ); + SetGeometryShader( ConstructGSWithSO(CompileShader( gs_4_0, GS()), "SV_POSITION.y") ); + } } #endif static DWORD fx_local_shader[] = { - 0x43425844, 0x0a74ff0f, 0xea10b516, 0x8be88332, 0x2a273ca7, 0x00000001, 0x0000182d, 0x00000001, - 0x00000024, 0x30315846, 0x00001801, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00001549, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000006, 0x00000000, 0x74726556, + 0x43425844, 0xd50d5743, 0xb5236e8f, 0x9a35cd8d, 0x59e3afe1, 0x00000001, 0x00001a92, 0x00000001, + 0x00000024, 0x30315846, 0x00001a66, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00001772, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000f, 0x00000007, 0x00000000, 0x74726556, 0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, @@ -2762,26 +2768,45 @@ static DWORD fx_local_shader[] = 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00001320, 0x00000000, 0x50003550, 0x00a50036, 0x00000000, 0x37500000, 0x0000a500, 0x00000100, - 0x00002d00, 0x00001100, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00005800, 0x00003c00, - 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00008600, 0x00006a00, 0x00000000, 0xffffff00, - 0x000000ff, 0x00000000, 0x0000a500, 0x00008900, 0x00000000, 0xffffff00, 0x0000a7ff, 0x00025300, - 0x00000000, 0x0003ff00, 0x00003c00, 0x00000000, 0xffffff00, 0x000401ff, 0x00000000, 0x0005a900, - 0x00006a00, 0x00000000, 0xffffff00, 0x0005abff, 0x00000000, 0x0007cf00, 0x0007b300, 0x00000000, - 0xffffff00, 0x0007d4ff, 0x0009dc00, 0x00000000, 0x0009ea00, 0x00000800, 0x00000000, 0x0009f100, - 0x00000000, 0x00000000, 0x0009f400, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, - 0x0009f700, 0x00000600, 0x00000000, 0x00000100, 0x000a0300, 0x00000800, 0x00000000, 0x00000100, - 0x000a0f00, 0x000a1b00, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, 0x000a1e00, - 0x00000600, 0x00000000, 0x00000100, 0x000a2a00, 0x00000800, 0x00000000, 0x00000100, 0x000a3600, - 0x000a4200, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x000bed00, 0x00000600, - 0x00000000, 0x00000700, 0x000da100, 0x00000800, 0x00000000, 0x00000700, 0x000fb100, 0x000fb900, - 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x00116400, 0x00000600, 0x00000000, - 0x00000700, 0x00131800, 0x00000800, 0x00000000, 0x00000700, 0x00152800, 0x00153000, 0x00000300, - 0x00000000, 0x00000700, 0x00000000, 0x00000200, 0x00005800, 0x00000600, 0x00000000, 0x00000200, - 0x00002d00, 0x00000800, 0x00000000, 0x00000200, 0x00008600, 0x00153300, 0x00000300, 0x00000000, - 0x00000700, 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00153600, - 0x00000800, 0x00000000, 0x00000200, 0x0005a900, 0x00153e00, 0x00000300, 0x00000000, 0x00000700, - 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00154100, 0x00000800, - 0x00000000, 0x00000200, 0x0005a900, 0x00000000, + 0x00385000, 0x000000a5, 0x00000001, 0x00000204, 0x43425844, 0x8e325e23, 0x0774e86e, 0xe636e15f, + 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, + 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x47530400, + 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x00000098, + 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, 0x00000000, 0x00000001, 0x0100185d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, 0x0100003e, 0x54415453, 0x00000074, + 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, + 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x505f5653, 0x5449534f, 0x2e4e4f49, + 0x15540079, 0x175c0000, 0x002d0000, 0x00110000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, + 0x00580000, 0x003c0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00860000, 0x006a0000, + 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00a50000, 0x00890000, 0x00000000, 0xffff0000, + 0x00a7ffff, 0x02530000, 0x00000000, 0x03ff0000, 0x003c0000, 0x00000000, 0xffff0000, 0x0401ffff, + 0x00000000, 0x05a90000, 0x006a0000, 0x00000000, 0xffff0000, 0x05abffff, 0x00000000, 0x07cf0000, + 0x07b30000, 0x00000000, 0xffff0000, 0x07d4ffff, 0x09dc0000, 0x00000000, 0x09ea0000, 0x00090000, + 0x00000000, 0x09f10000, 0x00000000, 0x00000000, 0x09f40000, 0x00030000, 0x00000000, 0x00070000, + 0x00000000, 0x00010000, 0x09f70000, 0x00060000, 0x00000000, 0x00010000, 0x0a030000, 0x00080000, + 0x00000000, 0x00010000, 0x0a0f0000, 0x0a1b0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, + 0x00010000, 0x0a1e0000, 0x00060000, 0x00000000, 0x00010000, 0x0a2a0000, 0x00080000, 0x00000000, + 0x00010000, 0x0a360000, 0x0a420000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, + 0x0bed0000, 0x00060000, 0x00000000, 0x00070000, 0x0da10000, 0x00080000, 0x00000000, 0x00070000, + 0x0fb10000, 0x0fb90000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x11640000, + 0x00060000, 0x00000000, 0x00070000, 0x13180000, 0x00080000, 0x00000000, 0x00070000, 0x15280000, + 0x15300000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x00580000, 0x00060000, + 0x00000000, 0x00020000, 0x002d0000, 0x00080000, 0x00000000, 0x00020000, 0x00860000, 0x15330000, + 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x03ff0000, 0x00060000, 0x00000000, + 0x00030000, 0x15360000, 0x00080000, 0x00000000, 0x00020000, 0x05a90000, 0x153e0000, 0x00030000, + 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x03ff0000, 0x00060000, 0x00000000, 0x00030000, + 0x15410000, 0x00080000, 0x00000000, 0x00020000, 0x05a90000, 0x15490000, 0x00030000, 0x00000000, + 0x00070000, 0x00000000, 0x00020000, 0x03ff0000, 0x00060000, 0x00000000, 0x00030000, 0x154c0000, + 0x00080000, 0x00000000, 0x00070000, 0x176a0000, 0x00000000, }; static void test_effect_local_shader(void) @@ -3639,6 +3664,19 @@ if (0) ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); /* Geometry shader with stream output */ + + /* Inline variant */ + p = t->lpVtbl->GetPassByName(t, "P8"); + hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(shaderdesc.SODecl && !strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", + shaderdesc.SODecl); +} + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc);

1 0

Nikolay Sivov : d3dx10/font: Store font description data.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 6c2fad576b2bb21c64231099992973e65fc7542d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2fad576b2bb21c64231099… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:08 2021 +0300 d3dx10/font: Store font description data. 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/d3dx10_43/font.c | 26 ++++++++++++++++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 6 +----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 7b2295cc414..77604895903 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -32,6 +32,7 @@ struct d3dx_font ID3DX10Font ID3DX10Font_iface; LONG refcount; + D3DX10_FONT_DESCW desc; ID3D10Device *device; }; @@ -97,16 +98,32 @@ static HRESULT WINAPI d3dx_font_GetDevice(ID3DX10Font *iface, ID3D10Device **dev static HRESULT WINAPI d3dx_font_GetDescA(ID3DX10Font *iface, D3DX10_FONT_DESCA *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return D3DERR_INVALIDCALL; + + memcpy(desc, &font->desc, FIELD_OFFSET(D3DX10_FONT_DESCA, FaceName)); + WideCharToMultiByte(CP_ACP, 0, font->desc.FaceName, -1, desc->FaceName, + ARRAY_SIZE(desc->FaceName), NULL, NULL); + + return S_OK; } static HRESULT WINAPI d3dx_font_GetDescW(ID3DX10Font *iface, D3DX10_FONT_DESCW *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return D3DERR_INVALIDCALL; + + *desc = font->desc; + + return S_OK; } static BOOL WINAPI d3dx_font_GetTextMetricsA(ID3DX10Font *iface, TEXTMETRICA *metrics) @@ -345,6 +362,7 @@ HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT object->ID3DX10Font_iface.lpVtbl = &d3dx_font_vtbl; object->refcount = 1; object->device = device; + object->desc = *desc; ID3D10Device_AddRef(device); *font = &object->ID3DX10Font_iface; diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 1b875e4fc09..eec2bfd3206 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2176,15 +2176,11 @@ static void test_font(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_GetDescA(font, NULL); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_GetDescA(font, &desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ ok(desc.Height == 12, "Unexpected height %d.\n", desc.Height); ok(desc.Width == 8, "Unexpected width %u.\n", desc.Width); ok(desc.Weight == FW_BOLD, "Unexpected weight %u.\n", desc.Weight); @@ -2195,7 +2191,7 @@ if (SUCCEEDED(hr)) ok(desc.Quality == ANTIALIASED_QUALITY, "Unexpected quality %u.\n", desc.Quality); ok(desc.PitchAndFamily == VARIABLE_PITCH, "Unexpected pitch and family %#x.\n", desc.PitchAndFamily); ok(!strcmp(desc.FaceName, "Tahoma"), "Unexpected facename %s.\n", debugstr_a(desc.FaceName)); -} + ID3DX10Font_Release(font); /* GetDC + GetTextMetrics */

1 0

Nikolay Sivov : d3dx10/font: Create gdi objects on font object creation.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 5e0577c2b85fd0e5fa35e467d93a17f2cdbf834a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e0577c2b85fd0e5fa35e467… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:09 2021 +0300 d3dx10/font: Create gdi objects on font object creation. 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/d3dx10_43/Makefile.in | 2 +- dlls/d3dx10_43/font.c | 30 ++++++++++++++++++++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 33 ++++++++++++++++++--------------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index b6baed2b619..5509bca7e08 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 d3dcompiler dxguid uuid +IMPORTS = d3d10_1 d3dcompiler dxguid uuid gdi32 DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 77604895903..d1590c8cc99 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -32,6 +32,8 @@ struct d3dx_font ID3DX10Font ID3DX10Font_iface; LONG refcount; + HDC hdc; + HFONT hfont; D3DX10_FONT_DESCW desc; ID3D10Device *device; }; @@ -77,6 +79,8 @@ static ULONG WINAPI d3dx_font_Release(ID3DX10Font *iface) if (!refcount) { + DeleteObject(font->hfont); + DeleteDC(font->hdc); ID3D10Device_Release(font->device); heap_free(font); } @@ -142,9 +146,11 @@ static BOOL WINAPI d3dx_font_GetTextMetricsW(ID3DX10Font *iface, TEXTMETRICW *me static HDC WINAPI d3dx_font_GetDC(ID3DX10Font *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + + TRACE("iface %p.\n", iface); - return NULL; + return font->hdc; } static HRESULT WINAPI d3dx_font_GetGlyphData(ID3DX10Font *iface, UINT glyph, @@ -353,11 +359,27 @@ HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT if (!device || !desc || !font) return D3DERR_INVALIDCALL; + *font = NULL; + if (!(object = heap_alloc_zero(sizeof(*object)))) - { - *font = NULL; return E_OUTOFMEMORY; + + object->hdc = CreateCompatibleDC(NULL); + if (!object->hdc) + { + heap_free(object); + return E_FAIL; + } + + object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, + desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); + if (!object->hfont) + { + DeleteDC(object->hdc); + heap_free(object); + return E_FAIL; } + SelectObject(object->hdc, object->hfont); object->ID3DX10Font_iface.lpVtbl = &d3dx_font_vtbl; object->refcount = 1; diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index eec2bfd3206..499d219924d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2200,13 +2200,12 @@ static void test_font(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hdc = ID3DX10Font_GetDC(font); -todo_wine ok(!!hdc, "Unexpected hdc %p.\n", hdc); - ret = ID3DX10Font_GetTextMetricsA(font, &metrics); -todo_wine - ok(ret, "Unexpected ret %#x.\n", ret); ret = GetTextMetricsA(hdc, &expmetrics); + ok(ret, "Unexpected ret %#x.\n", ret); + + ret = ID3DX10Font_GetTextMetricsA(font, &metrics); todo_wine ok(ret, "Unexpected ret %#x.\n", ret); @@ -2303,7 +2302,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hdc = ID3DX10Font_GetDC(font); -todo_wine ok(!!hdc, "Unexpected hdc %p.\n", hdc); hr = ID3DX10Font_GetGlyphData(font, 0, NULL, &blackbox, &cellinc); @@ -2333,15 +2331,20 @@ todo_wine for (c = 'b'; c <= 'z'; ++c) { - if (!hdc) break; - winetest_push_context("Character %c", c); count = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); ok(count != GDI_ERROR, "Unexpected count %u.\n", count); hr = ID3DX10Font_GetGlyphData(font, glyph, &srv, &blackbox, &cellinc); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + winetest_pop_context(); + break; + } + ID3D10ShaderResourceView_GetResource(srv, &resource); hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2415,22 +2418,22 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hdc = ID3DX10Font_GetDC(font); - todo_wine ok(!!hdc, "Unexpected hdc %p.\n", hdc); - if (!hdc) - { - ID3DX10Font_Release(font); - winetest_pop_context(); - break; - } - count = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); ok(count != GDI_ERROR, "Unexpected count %u.\n", count); hr = ID3DX10Font_GetGlyphData(font, glyph, &srv, NULL, NULL); + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + ID3DX10Font_Release(font); + winetest_pop_context(); + break; + } + ID3D10ShaderResourceView_GetResource(srv, &resource); hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : d3dx10/font: Implement GetTextMetrics().
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 107562fdbf46ce5c94a65d798568ed8d3db41dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=107562fdbf46ce5c94a65d79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:10 2021 +0300 d3dx10/font: Implement GetTextMetrics(). 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/d3dx10_43/font.c | 12 ++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 5 +---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index d1590c8cc99..2145b1c6f1e 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -132,16 +132,20 @@ static HRESULT WINAPI d3dx_font_GetDescW(ID3DX10Font *iface, D3DX10_FONT_DESCW * static BOOL WINAPI d3dx_font_GetTextMetricsA(ID3DX10Font *iface, TEXTMETRICA *metrics) { - FIXME("iface %p, metrics %p stub!\n", iface, metrics); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + + TRACE("iface %p, metrics %p.\n", iface, metrics); - return FALSE; + return GetTextMetricsA(font->hdc, metrics); } static BOOL WINAPI d3dx_font_GetTextMetricsW(ID3DX10Font *iface, TEXTMETRICW *metrics) { - FIXME("iface %p, metrics %p stub!\n", iface, metrics); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + + TRACE("iface %p, metrics %p.\n", iface, metrics); - return FALSE; + return GetTextMetricsW(font->hdc, metrics); } static HDC WINAPI d3dx_font_GetDC(ID3DX10Font *iface) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 499d219924d..8c55dd5810b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2206,11 +2206,8 @@ static void test_font(void) ok(ret, "Unexpected ret %#x.\n", ret); ret = ID3DX10Font_GetTextMetricsA(font, &metrics); -todo_wine ok(ret, "Unexpected ret %#x.\n", ret); -if (ret) -{ ok(metrics.tmHeight == expmetrics.tmHeight, "Unexpected height %d, expected %d.\n", metrics.tmHeight, expmetrics.tmHeight); ok(metrics.tmAscent == expmetrics.tmAscent, "Unexpected ascent %d, expected %d.\n", @@ -2251,7 +2248,7 @@ if (ret) metrics.tmPitchAndFamily, expmetrics.tmPitchAndFamily); ok(metrics.tmCharSet == expmetrics.tmCharSet, "Unexpected charset %u, expected %u.\n", metrics.tmCharSet, expmetrics.tmCharSet); -} + ID3DX10Font_Release(font); /* PreloadText */

1 0

Nikolay Sivov : d3dx10_39/tests: Enable tests.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 5006f4c50d41165d44c17b3e7d0bde9831ff43b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5006f4c50d41165d44c17b3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 30 08:08:50 2021 +0300 d3dx10_39/tests: Enable tests. 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> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_39/Makefile.in | 1 + dlls/d3dx10_39/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 5f8735b0d37..46ae09a38e8 100755 --- a/configure +++ b/configure @@ -20385,6 +20385,7 @@ wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 +wine_fn_config_makefile dlls/d3dx10_39/tests enable_tests wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 wine_fn_config_makefile dlls/d3dx10_40/tests enable_tests wine_fn_config_makefile dlls/d3dx10_41 enable_d3dx10_41 diff --git a/configure.ac b/configure.ac index 594794ed93c..11c43cdce47 100644 --- a/configure.ac +++ b/configure.ac @@ -3085,6 +3085,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_39/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in index c8267284e61..94af7e61a13 100644 --- a/dlls/d3dx10_39/Makefile.in +++ b/dlls/d3dx10_39/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_39.dll +IMPORTLIB = d3dx10_39 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_39/tests/Makefile.in b/dlls/d3dx10_39/tests/Makefile.in new file mode 100644 index 00000000000..d4554399554 --- /dev/null +++ b/dlls/d3dx10_39/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_39.dll +IMPORTS = d3dx10_39 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Francois Gouget : iphlpapi: Make the adapters_addresses_*() functions static.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 9d82cda245ce7032d99a1afdeb8ec06e5437ca11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d82cda245ce7032d99a1afd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 15:06:03 2021 +0200 iphlpapi: Make the adapters_addresses_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f83271eae97..b2e996a6241 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -832,7 +832,7 @@ static void address_lists_iterate( IP_ADAPTER_ADDRESSES *aa, void (*fn)(void *en } } -void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) +static void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) { IP_ADAPTER_ADDRESSES *aa; @@ -845,7 +845,7 @@ void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) heap_free( info ); } -ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) +static ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) { IP_ADAPTER_ADDRESSES *aa; ULONG size = 0, align = sizeof(ULONGLONG) - 1; @@ -861,7 +861,7 @@ ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) return size; } -void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) +static void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) { char *ptr; DWORD len; @@ -3115,7 +3115,7 @@ static int tcp6_row_owner_cmp( const void *a, const void *b ) * Implementation of GetExtendedTcpTable() which additionally handles TCP_TABLE2 * corresponding to GetTcp(6)Table2() */ -DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG family, ULONG table_class ) +static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG family, ULONG table_class ) { DWORD err, count, needed, i, num = 0, row_size = 0; struct nsi_tcp_conn_key *key;

1 0

Francois Gouget : crypt32: Make gnutls_(un)?initialize() static.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: dc502ec5d06a55759d5e38434337a2d0152aac92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc502ec5d06a55759d5e3843… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 15:06:41 2021 +0200 crypt32: Make gnutls_(un)?initialize() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/unixlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 0c2370968e9..dcfca5b1966 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -84,7 +84,7 @@ static void gnutls_log( int level, const char *msg ) TRACE( "<%d> %s", level, msg ); } -BOOL gnutls_initialize(void) +static BOOL gnutls_initialize(void) { const char *env_str; int ret; @@ -146,7 +146,7 @@ fail: return FALSE; } -void gnutls_uninitialize(void) +static void gnutls_uninitialize(void) { pgnutls_global_deinit(); dlclose( libgnutls_handle );

1 0

Gijs Vermeulen : include/wuapi: Add WindowsUpdateAgentInfo coclass and interface.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 440a14dac38f9b0641a174e7e19ed184521702ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=440a14dac38f9b0641a174e7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Aug 27 15:29:17 2021 +0200 include/wuapi: Add WindowsUpdateAgentInfo coclass and interface. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wuapi.idl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/wuapi.idl b/include/wuapi.idl index a0a8e4359a9..67045232636 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -1320,6 +1320,22 @@ interface ISystemInformation : IDispatch [out, retval] VARIANT_BOOL *retval); } +[ + object, + uuid(85713fa1-7796-4fa2-be3b-e2d6124dd373), + oleautomation, + dual, + nonextensible, + pointer_default(unique), + hidden +] +interface IWindowsUpdateAgentInfo : IDispatch +{ + [id(0x60020001)] + HRESULT GetInfo([in] VARIANT varInfoIdentifier, + [out, retval] VARIANT *retval); +} + [ helpstring("AutomaticUpdates Class"), threading(both), @@ -1356,4 +1372,13 @@ coclass UpdateSession { interface IUpdateSession; } ] coclass SystemInformation { interface ISystemInformation; } +[ + helpstring("WindowsUpdateAgentInfo Class"), + threading(both), + progid("Microsoft.Update.AgentInfo.1"), + vi_progid("Microsoft.Update.AgentInfo"), + uuid(c2e88c2f-6f5b-4aaa-894b-55c847ad3a2d) +] +coclass WindowsUpdateAgentInfo { interface IWindowsUpdateAgentInfo; } + } /* WUApiLib */

1 0

Francois Gouget : comctl32: Fix an ASCII / ANSI mixup in a comment.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 29f73481df0508c9e6db94a055063f08794766b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f73481df0508c9e6db94a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 14:53:03 2021 +0200 comctl32: Fix an ASCII / ANSI mixup in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2585e11530e..cf1dc42449b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -156,7 +156,7 @@ typedef struct BOOL bAnchor; /* anchor highlight enabled */ BOOL bDoRedraw; /* Redraw status */ BOOL bDragOutSent; /* has TBN_DRAGOUT notification been sent for this drag? */ - BOOL bUnicode; /* Notifications are ASCII (FALSE) or Unicode (TRUE)? */ + BOOL bUnicode; /* Notifications are ANSI (FALSE) or Unicode (TRUE)? */ BOOL bCaptured; /* mouse captured? */ DWORD dwStyle; /* regular toolbar style */ DWORD dwExStyle; /* extended toolbar style */

1 0

Anton Baskanov : fonts: Fix breve glyph position in 16px MS Sans Serif.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: wine Branch: master Commit: 9ecca23a32a14976641e44e88f79ffa81050f4f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ecca23a32a14976641e44e8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Aug 29 21:06:24 2021 +0700 fonts: Fix breve glyph position in 16px MS Sans Serif. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/ms_sans_serif.sfd | 2 +- fonts/ms_sans_serif.ttf | Bin 38536 -> 38536 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index e8c720b528c..f2de1843448 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -5448,7 +5448,7 @@ BDFChar: 291 710 4 1 2 0 9 ^qdb$^qdb$^q]pM BDFChar: 292 711 5 0 3 11 12 OC/%g -BDFChar: 293 728 5 0 4 14 15 +BDFChar: 293 728 5 0 4 11 12 Li<=o BDFChar: 294 729 3 1 1 12 12 J,fQL diff --git a/fonts/ms_sans_serif.ttf b/fonts/ms_sans_serif.ttf index fd20edb4595..8c492c7d310 100644 Binary files a/fonts/ms_sans_serif.ttf and b/fonts/ms_sans_serif.ttf differ

1 0