- Wine-Devel - list.winehq.org

[PATCH 1/5] d3d10/effect: Set IsInline in GetShaderDesc().
by Nikolay Sivov Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 4 +++- dlls/d3d10/tests/effect.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 64c445ec07a..4d73121d6ca 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -118,6 +118,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; char *stream_output_declaration; + unsigned int isinline : 1; }; struct d3d10_effect_state_object_variable diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 81745f7f239..d521684f788 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1409,6 +1409,7 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ v->type = t; v->effect = e; + v->u.shader.isinline = 1; set_variable_vtbl(v); if (!copy_name("$Anonymous", &v->name)) @@ -7008,7 +7009,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( D3D10_SHADER_DESC shader_desc; HRESULT hr; - FIXME("iface %p, index %u, desc %p semi-stub.\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) return hr; @@ -7017,6 +7018,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( if (s->input_signature) desc->pInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); desc->SODecl = s->stream_output_declaration; + desc->IsInline = s->isinline; if (s->bytecode) { desc->pBytecode = ID3D10Blob_GetBufferPointer(s->bytecode); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 70bcf1ea72b..f59686c26a3 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3671,8 +3671,8 @@ if (0) 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"); +todo_wine { ok(shaderdesc.SODecl && !strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); } -- 2.33.0

3 11

[PATCH] dwrite: Silence warning for name entries with platform 1/encoding 20.
by aurelien.ina Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Aurélien Inacio <aurelien.ina(a)protonmail.com> --- dlls/gdi32/opentype.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 01/10] ntoskrnl.exe/tests: Reduce the verbosity of test_return_status.
by Rémi Bernon Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Looks like my attempt to move driver tests around will need some thought so I'm sending the HID tests changes in ntoskrnl.exe/tests instead, as there'll be exhibiting a few things that need fixing. Also sending a few ntoskrnl.exe tests improvements to fix a few potential spurious failures, especially when running the tests several times, where there's sometimes stale devices laying around. I'll probably then duplicate the code for DInput driver-based tests. The first patch may just be skipped, otherwise Marvin was going to complain on every other patch. dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..e3afd46181c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -946,7 +946,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) static void test_return_status(void) { struct return_status_params params; - unsigned int i, j, k; + unsigned int i, j, k, old_threshold; static const ULONG method_tests[] = { @@ -979,12 +979,15 @@ static void test_return_status(void) params.ret_status = status_tests[i]; params.iosb_status = status_tests[j]; - winetest_push_context("return 0x%08x, iosb 0x%08x, pending %d, method %u", - params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + trace("testing return 0x%08x, iosb 0x%08x, pending %d, method %u\n", + params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + old_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; do_return_status(method_tests[k], &params); - winetest_pop_context(); + winetest_mute_threshold = old_threshold; + trace("done\n"); } } } -- 2.33.0

3 19

[PATCH v3 1/2] wined3d: Fix the odd line condition in gen_yv12_read().
by Anton Baskanov Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- The original condition is true for every other line, which is incorrect since the chroma has only half the resolution. Fixes comb artifacts around color transitions. v2: Added a comment. v3: Split condition simplification into a separate patch. --- dlls/wined3d/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..c760d519b30 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12621,8 +12621,10 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll * get filtering bleeding. */ - /* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep + * in mind that each line of the chroma plane corresponds to 2 lines of the + * resulting image. */ + shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.25 + 1.0 / 6.0) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */ -- 2.25.1

3 5

[PATCH] mf: Remove WINAPI on static functions where not needed.
by Francois Gouget Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 5730a6e769f..a5545c157de 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -638,7 +638,7 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) +static HRESULT video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) { HRESULT hr = S_OK; -- 2.30.2

2 1

[PATCH 0/2] Better handling of WoW in winedbg
by Eric Pouech Sept. 2, 2021

Sept. 2, 2021

a couple of fixes for winedbg (64bit) debugging a Wow64 32bit debuggee A+ --- Eric Pouech (2): winedbg: allow debugging a 32bit target from a 64bit winedbg dbghelp: handle the case where loader isn't what WINELOADER reports dlls/dbghelp/elf_module.c | 10 ++++++++-- dlls/dbghelp/macho_module.c | 10 +++++++++- dlls/dbghelp/module.c | 28 +++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 6 deletions(-)

2 3

[PATCH 1/3] d3dx10/font: Add PreloadTextW().
by Nikolay Sivov Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/font.c | 28 ++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 9 --------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 2145b1c6f1e..51704e2bbbe 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -210,9 +210,33 @@ static HRESULT WINAPI d3dx_font_PreloadTextA(ID3DX10Font *iface, const char *str static HRESULT WINAPI d3dx_font_PreloadTextW(ID3DX10Font *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_wn(string, count), count); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + WORD *indices; + int i; - return E_NOTIMPL; + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return S_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DX10Font_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return S_OK; } static INT WINAPI d3dx_font_DrawTextA(ID3DX10Font *iface, ID3DX10Sprite *sprite, diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 8c55dd5810b..65bccb71521 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2263,32 +2263,23 @@ static void test_font(void) hr = ID3DX10Font_PreloadTextA(font, NULL, 1); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "test", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, -1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, testW, -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ID3DX10Font_Release(font); -- 2.33.0

2 5

[PATCH 9/9] gdi32: Move GdiConvertToDevmodeW to gdidc.c.
by Jacek Caban Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 52 +-------------------------------------------- dlls/gdi32/gdidc.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 51 deletions(-)

2 1

[PATCH 8/9] gdi32: Use ntgdi interface for printer driver functions.
by Jacek Caban Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 32 ++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 21 +++++++++------------ 2 files changed, 41 insertions(+), 12 deletions(-)

2 1

[PATCH 7/9] gdi32: Use NtGdiStartDoc for StartDoc.
by Jacek Caban Sept. 2, 2021

Sept. 2, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 67 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 55 ++--------------------------------- include/ntgdi.h | 2 +- 3 files changed, 70 insertions(+), 54 deletions(-)

2 1