January 2022 - Wine-Devel - list.winehq.org

[PATCH 3/4] dmusic: Forward the synth port GetCaps to the synth method

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 490ff88059e..afdd0d7be63 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -38,7 +38,6 @@ struct synth_port { IDirectMusicSynth *synth; IDirectMusicSynthSink *synth_sink; BOOL active; - DMUS_PORTCAPS caps; DMUS_PORTPARAMS params; int nrofgroups; DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; @@ -388,9 +387,7 @@ static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS TRACE("(%p/%p)->(%p)\n", iface, This, port_caps); - *port_caps = This->caps; - - return S_OK; + return IDirectMusicSynth_GetPortCaps(This->synth, port_caps); } static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD io_control_code, @@ -808,7 +805,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param HRESULT hr = E_FAIL; int i; - TRACE("(%p, %p, %p)\n", port_params, port_caps, port); + TRACE("(%p, %p)\n", port_params, port); *port = NULL; @@ -824,7 +821,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param obj->parent = parent; obj->active = FALSE; obj->params = *port_params; - obj->caps = *port_caps; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (void **)&obj->synth); -- 2.34.1

Jan. 25, 2022

[PATCH 2/4] dmsynth: Add error handling to the synth GetPortCaps method

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 3 +++ dlls/dmsynth/tests/dmsynth.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 51b33e8df8d..f05f769761e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -295,6 +295,9 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(IDirectMusicSynth8 *ifa TRACE("(%p)->(%p)\n", This, caps); + if (!caps || caps->dwSize < sizeof(*caps)) + return E_INVALIDARG; + *caps = This->caps; return S_OK; diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index e27d8abdb26..59ced1f0f21 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -64,6 +64,7 @@ static void test_dmsynth(void) KSPROPERTY property; ULONG value; ULONG bytes; + DMUS_PORTCAPS caps; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); @@ -146,6 +147,16 @@ static void test_dmsynth(void) ref_clock_synth = get_refcount(clock_synth); ok(ref_clock_synth > ref_clock_sink + 1, "Latency clock refcount didn't increase\n"); + /* GetPortCaps */ + hr = IDirectMusicSynth_GetPortCaps(dmsynth, NULL); + ok(hr == E_INVALIDARG, "GetPortCaps failed: %#x\n", hr); + memset(&caps, 0, sizeof(caps)); + hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); + ok(hr == E_INVALIDARG, "GetPortCaps failed: %#x\n", hr); + caps.dwSize = sizeof(caps) + 1; + hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); + ok(hr == S_OK, "GetPortCaps failed: %#x\n", hr); + if (control_synth) IDirectMusicSynth_Release(control_synth); if (control_sink) -- 2.34.1

Jan. 25, 2022

[PATCH 1/4] dmusic: Implement the E_NOTIMPL methods of the synth port

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7fe72563bb0..490ff88059e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -240,20 +240,14 @@ static HRESULT WINAPI synth_port_PlayBuffer(IDirectMusicPort *iface, IDirectMusi static HRESULT WINAPI synth_port_SetReadNotificationHandle(IDirectMusicPort *iface, HANDLE event) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, event); - - return S_OK; + TRACE("(%p, %p): method not implemented\n", iface, event); + return E_NOTIMPL; } static HRESULT WINAPI synth_port_Read(IDirectMusicPort *iface, IDirectMusicBuffer *buffer) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, buffer); - - return S_OK; + TRACE("(%p, %p): method not implemented\n", iface, buffer); + return E_NOTIMPL; } static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDirectMusicInstrument *instrument, @@ -384,11 +378,8 @@ static HRESULT WINAPI synth_port_GetRunningStats(IDirectMusicPort *iface, DMUS_S static HRESULT WINAPI synth_port_Compact(IDirectMusicPort *iface) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(): stub\n", iface, This); - - return S_OK; + TRACE("(%p): method not implemented\n", iface); + return E_NOTIMPL; } static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS *port_caps) -- 2.34.1

Jan. 25, 2022

Re: [PATCH 06/12] d2d1/tests: Fix misleading indentation warnings

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105991 Your paranoid android. === debian11 (32 bit report) === d2d1: d2d1.c:6785: Test failed: d2d1.c:9928: Test marked todo: Test 2: Got unexpected hr 0x88990029.

Jan. 25, 2022

Re: [PATCH vkd3d 3/6] vkd3d-shader/hlsl: Write SM4 unsigned multiplication instructions.

by Zebediah Figura (she/her)

On 1/25/22 14:19, Giovanni Mascellani wrote: > Hi, > > Il 25/01/22 20:06, Zebediah Figura (she/her) ha scritto: >> I want to find some way to put "2 dsts" in the function name, because >> as it is I can't tell just from reading. > > Might that be "write_sm4_binary_op_with_two_destinations"? Yes, although that's a bit unfortunately long. >> I'd also suggest specifying both dsts as optional hlsl_ir_node >> pointers, where NULL translates to SM4_RT_NULL. That would allow you >> to use this helper even if both dsts are used. > > Ok, good idea. Even though in later patches I am always using just one > result (and given how our IR is structured, I can't see how it can be > different), but generalizing anyway doesn't seem to hurt anybody. We'll probably want to find a way to combine things via peepholes, at least for things like div/mod and sin/cos. That's not exactly easy to do but shouldn't be too hard either. It's also not really a priority, though.

Jan. 25, 2022

Re: [PATCH vkd3d 2/6] tests: Test a number of simple HLSL operations.

by Zebediah Figura (she/her)

On 1/25/22 14:17, Giovanni Mascellani wrote: > Hi, > > Il 25/01/22 19:59, Zebediah Figura (she/her) ha scritto: >> I don't really like this approach. For one thing, it makes it harder >> to validate e.g. patches 4-6 from this series (I essentially have to >> write my own shaders). >> >> The complexity of the generated shader also makes it harder to read >> the IR to validate it's doing the right thing. >> >> Perhaps more importantly, some of these operations are supported by >> all HLSL versions, but some are only supported by SM4 (notably integer >> operations). Anything that can be tested in sm2 or sm3 should be, and >> as such I'd appreciate splitting those out where possible. > > Would it be better if I splitted this into many little shaders in the > same .shader_test file, like I already did for hlsl-shape.shader_test? I think that would be an improvement, yes. It doesn't let us remove them from XFAIL as easily, but it deals with the other problems. > > Also, is there a difference with 1/6 with this respect, since you signed > off on that one? Some of the problems apply to 1/6 as well, but I didn't find it problematic enough to complain about. But if you want to resend I won't object to that either.

Jan. 25, 2022

[PATCH 12/12] dwrite/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/dwrite/tests/font.c | 50 +++++++++++++++++++------------------- dlls/dwrite/tests/layout.c | 26 ++++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index af2f3a4104d..26f94a1e3b1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1566,8 +1566,8 @@ static void test_GetFontFamily(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(font2 != font, "got %p, %p\n", font2, font); -if (0) /* crashes on native */ - hr = IDWriteFont_GetFontFamily(font, NULL); + if (0) /* crashes on native */ + hr = IDWriteFont_GetFontFamily(font, NULL); EXPECT_REF(font, 1); hr = IDWriteFont_GetFontFamily(font, &family); @@ -1986,7 +1986,7 @@ static void test_CreateFontFace(void) ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* < win10 */, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_RAW_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); -todo_wine + todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION || broken(hr == E_INVALIDARG) /* older versions */, "got 0x%08x\n", hr); fontface = (void*)0xdeadbeef; @@ -2006,7 +2006,7 @@ todo_wine fontface = NULL; hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_UNKNOWN, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == E_INVALIDARG) /* < win10 */, "got 0x%08x\n", hr); if (hr == S_OK) { ok(fontface != NULL, "got %p\n", fontface); @@ -2596,7 +2596,7 @@ static void test_system_fontcollection(void) EXPECT_REF(collection1, 2); EXPECT_REF(factory, 2); hr = IDWriteFontCollection1_GetFontSet(collection1, &fontset); - todo_wine + todo_wine ok(hr == S_OK, "Failed to get fontset, hr %#x.\n", hr); if (hr == S_OK) { EXPECT_REF(collection1, 2); @@ -2635,7 +2635,7 @@ static void test_system_fontcollection(void) HANDLE event; event = IDWriteFontCollection3_GetExpirationEvent(collection3); -todo_wine + todo_wine ok(!!event, "Expected event handle.\n"); check_familymodel(collection3, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE); @@ -3075,7 +3075,7 @@ static void test_CustomFontCollection(void) EXPECT_REF(factory, 1); hr = IDWriteFactory_CreateCustomFontCollection(factory, loader, "Billy", 6, &font_collection); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine EXPECT_REF(factory, 1); EXPECT_REF(loader, 2); IDWriteFontCollection_Release(font_collection); @@ -3361,7 +3361,7 @@ if (0) { /* crashes on win10 */ /* file was created with different factory */ face2 = NULL; hr = IDWriteFactory_CreateFontFace(factory2, face_type, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &face2); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (face2) { IDWriteFontFace_Release(face2); @@ -5223,7 +5223,7 @@ static void test_GetDesignGlyphAdvances(void) advance = 0; hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, TRUE); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine + todo_wine ok(advance == 2048, "got %i\n", advance); IDWriteFontFace1_Release(fontface1); @@ -6026,7 +6026,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &rect, bits, size - 1); - todo_wine + todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, bits); @@ -6037,7 +6037,7 @@ static void test_CreateGlyphRunAnalysis(void) hr = IDWriteGlyphRunAnalysis_GetAlphaBlendParams(analysis, params, &gamma, &contrast, &cleartype_level); ok(hr == S_OK, "Failed to get alpha blend params, hr %#x.\n", hr); - todo_wine + todo_wine ok(cleartype_level == 0.0f, "Unexpected cleartype level %f.\n", cleartype_level); IDWriteRenderingParams_Release(params); @@ -6107,7 +6107,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &rect, bits, size - 1); - todo_wine + todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, bits); @@ -6272,8 +6272,8 @@ if (0) { /* this is not consistent */ metrics->subscriptSizeY, expected->subscriptSizeY); ok(metrics->superscriptPositionX == expected->superscriptPositionX, "supX: got %d expect %d.\n", metrics->superscriptPositionX, expected->superscriptPositionX); -if (0) - ok(metrics->superscriptPositionY == expected->superscriptPositionY, "supY: got %d expect %d.\n", + if (0) + ok(metrics->superscriptPositionY == expected->superscriptPositionY, "supY: got %d expect %d.\n", metrics->superscriptPositionY, expected->superscriptPositionY); ok(metrics->superscriptSizeX == expected->superscriptSizeX, "supsizeX: got %d expect %d.\n", metrics->superscriptSizeX, expected->superscriptSizeX); @@ -7851,7 +7851,7 @@ static void test_TranslateColorGlyphRun(void) ok(!!colorrun1->glyphRun.glyphIndices, "Unexpected indices %p.\n", colorrun1->glyphRun.glyphIndices); ok(!!colorrun1->glyphRun.glyphAdvances, "Unexpected advances %p.\n", colorrun1->glyphRun.glyphAdvances); ok(!colorrun1->glyphRunDescription, "Unexpected description pointer.\n"); - todo_wine + todo_wine ok(colorrun1->glyphImageFormat == (DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE | DWRITE_GLYPH_IMAGE_FORMATS_COLR) || colorrun1->glyphImageFormat == DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE, "Unexpected glyph image format %#x.\n", colorrun1->glyphImageFormat); @@ -8018,14 +8018,14 @@ static void test_CreateFontFaceReference(void) IDWriteFontFile_Release(file); hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface); -todo_wine + todo_wine ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); IDWriteFontFaceReference_Release(ref); /* path however has to be valid */ hr = IDWriteFactory3_CreateFontFaceReference(factory, L"dummy", NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); -todo_wine + todo_wine ok(hr == DWRITE_E_FILENOTFOUND, "got 0x%08x\n", hr); if (hr == S_OK) IDWriteFontFaceReference_Release(ref); @@ -8133,13 +8133,13 @@ todo_wine (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - todo_wine + todo_wine ok(axis_count >= 4, "Unexpected axis value count.\n"); hr = IDWriteFontFaceReference1_GetFontAxisValues(ref2, axis_values, ARRAY_SIZE(axis_values)); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - todo_wine + todo_wine ok(has_main_axis_values(axis_values, axis_count), "Unexpected axis returned.\n"); IDWriteFontFaceReference1_Release(ref2); @@ -9632,7 +9632,7 @@ static void test_fontsetbuilder(void) hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFactory3_CreateFontCollectionFromFontSet(factory, fontset, &collection); - todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); if (SUCCEEDED(hr)) { @@ -9649,7 +9649,7 @@ static void test_fontsetbuilder(void) ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFactory3_CreateFontCollectionFromFontSet(factory, fontset, &collection); - todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); if (SUCCEEDED(hr)) { @@ -9670,7 +9670,7 @@ static void test_fontsetbuilder(void) ok(hr == S_OK, "Unexpected hr %#x.\n",hr); count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref1); - todo_wine + todo_wine ok(count == 4, "Unexpected axis count %u.\n", count); if (count == 4) @@ -10182,7 +10182,7 @@ static void test_expiration_event(void) IDWriteFontCollection3_Release(collection3); event = get_collection_expiration_event(collection); -todo_wine + todo_wine ok(!!event, "Unexpected event handle.\n"); /* Compare handles with another isolated factory. */ @@ -10373,7 +10373,7 @@ static void test_CreateFontCollectionFromFontSet(void) props[0].propertyValue = L"Another Font"; props[0].localeName = L"en-US"; hr = IDWriteFontSetBuilder1_AddFontFaceReference_(builder, ref, props, 1); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); IDWriteFontFaceReference_Release(ref); @@ -10381,7 +10381,7 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFactory5_CreateFontCollectionFromFontSet(factory, fontset, &collection); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n",hr); if (SUCCEEDED(hr)) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3fe149927ca..3a6add954d9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1821,7 +1821,7 @@ static void test_Draw(void) ok_sequence(sequences, RENDERER_ID, draw_seq2, "draw test 2", TRUE); hr = IDWriteTextLayout_GetMetrics(layout, &tm); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(tm.lineCount == 6, "got %u\n", tm.lineCount); IDWriteTextLayout_Release(layout); @@ -3308,7 +3308,7 @@ static void test_GetMetrics(void) ok(metrics.height > 0.0, "got %.2f\n", metrics.height); ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); -todo_wine + todo_wine ok(metrics.maxBidiReorderingDepth > 1, "got %u\n", metrics.maxBidiReorderingDepth); ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); @@ -4646,7 +4646,7 @@ todo_wine { ok(mappedlength == 1, "got %u\n", mappedlength); } ok(scale == 1.0f, "got %f\n", scale); -todo_wine + todo_wine ok(font != NULL, "got %p\n", font); if (font) { IDWriteFont_Release(font); @@ -4663,7 +4663,7 @@ todo_wine { ok(mappedlength == 3, "got %u\n", mappedlength); } ok(scale == 1.0f, "got %f\n", scale); -todo_wine + todo_wine ok(font != NULL, "got %p\n", font); if (font) { IDWriteFont_Release(font); @@ -4680,7 +4680,7 @@ todo_wine { ok(mappedlength == 1, "got %u\n", mappedlength); } ok(scale == 1.0f, "got %f\n", scale); -todo_wine + todo_wine ok(font != NULL, "got %p\n", font); if (font) { IDWriteFont_Release(font); @@ -4696,7 +4696,7 @@ todo_wine { ok(mappedlength == 1, "got %u\n", mappedlength); } ok(scale == 1.0f, "got %f\n", scale); -todo_wine + todo_wine ok(font != NULL, "got %p\n", font); if (font) { IDWriteFont_Release(font); @@ -4740,7 +4740,7 @@ if (font) { ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists); hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, ARRAY_SIZE(buffW)); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font); @@ -5908,7 +5908,7 @@ static void test_text_format_axes(void) } hr = IDWriteFactory6_CreateTextFormat(factory, L"test_family", NULL, NULL, 0, 10.0f, L"en-us", &format3); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) @@ -6408,7 +6408,7 @@ static void test_HitTestTextRange(void) /* Start index exceeding layout text length, dummy range returned. */ count = 0; hr = IDWriteTextLayout_HitTestTextRange(layout, 7, 10, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { @@ -6420,7 +6420,7 @@ if (SUCCEEDED(hr)) /* Length exceeding layout text length, trimmed. */ count = 0; hr = IDWriteTextLayout_HitTestTextRange(layout, 0, 10, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { @@ -6437,7 +6437,7 @@ if (SUCCEEDED(hr)) count = 0; hr = IDWriteTextLayout_HitTestTextRange(layout, 0, 6, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { @@ -6459,7 +6459,7 @@ if (SUCCEEDED(hr)) count = 0; hr = IDWriteTextLayout_HitTestTextRange(layout, 0, 6, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { @@ -6473,7 +6473,7 @@ if (SUCCEEDED(hr)) } count = 0; hr = IDWriteTextLayout_HitTestTextRange(layout, 7, 10, 0.0f, 0.0f, metrics, ARRAY_SIZE(metrics), &count); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { -- 2.35.0

Jan. 25, 2022

[PATCH 11/12] dbgeng/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/dbgeng/tests/dbgeng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 62797175193..53dabd5bc36 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -303,7 +303,7 @@ static void test_attach(void) ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); hr = client->lpVtbl->EndSession(client, DEBUG_END_ACTIVE_DETACH); -todo_wine + todo_wine ok(hr == S_OK, "Failed to end session, hr %#x.\n", hr); SetEvent(event); -- 2.35.0

Jan. 25, 2022

[PATCH 10/12] d3dx9_36/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/d3dx9_36/tests/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 9e2c999c5f2..e8a57fc609e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2469,7 +2469,7 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR /* Constant buffer */ hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); -todo_wine + todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { @@ -2650,7 +2650,7 @@ todo_wine ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); -todo_wine + todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { -- 2.35.0

Jan. 25, 2022

[PATCH 09/12] d3dx10_43/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/d3dx10_43/tests/d3dx10.c | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 89a43355756..9b7a4d7cc9b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2383,15 +2383,15 @@ static void test_font(void) ok(!!hdc, "Unexpected hdc %p.\n", hdc); hr = ID3DX10Font_GetGlyphData(font, 0, NULL, &blackbox, &cellinc); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_GetGlyphData(font, 0, &srv, NULL, &cellinc); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D10ShaderResourceView_Release(srv); hr = ID3DX10Font_GetGlyphData(font, 0, &srv, &blackbox, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D10ShaderResourceView_Release(srv); @@ -2399,7 +2399,7 @@ todo_wine hr = ID3DX10Font_PreloadCharacters(font, 'b', 'a'); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadGlyphs(font, 1, 0); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadCharacters(font, 'a', 'a'); @@ -2412,7 +2412,7 @@ todo_wine ok(count != GDI_ERROR, "Unexpected count %u.\n", count); hr = ID3DX10Font_GetGlyphData(font, glyph, &srv, &blackbox, &cellinc); - todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) @@ -2468,7 +2468,7 @@ todo_wine /* Test glyphs that are not rendered */ hr = ID3DX10Font_PreloadGlyphs(font, 0, 5); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); for (glyph = 1; glyph < 4; ++glyph) @@ -2498,7 +2498,7 @@ todo_wine ok(count != GDI_ERROR, "Unexpected count %u.\n", count); hr = ID3DX10Font_GetGlyphData(font, glyph, &srv, NULL, NULL); - todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) @@ -3139,78 +3139,78 @@ static void test_sprite(void) /* View transform */ hr = ID3DX10Sprite_SetViewTransform(sprite, NULL); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_SetViewTransform(sprite, &mat); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Begin */ hr = ID3DX10Sprite_Begin(sprite, 0); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Flush/End */ hr = ID3DX10Sprite_Flush(sprite); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_End(sprite); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* May not be called before next Begin */ hr = ID3DX10Sprite_Flush(sprite); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_End(sprite); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); /* Draw */ hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, NULL, 0); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); memset(&sprite_desc, 0, sizeof(sprite_desc)); hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 0); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 1); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_Begin(sprite, 0); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); memset(&sprite_desc, 0, sizeof(sprite_desc)); hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 1); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); sprite_desc.pTexture = srv1; hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 1); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_Flush(sprite); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_Flush(sprite); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_End(sprite); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* D3DX10_SPRITE_ADDREF_TEXTURES */ hr = ID3DX10Sprite_Begin(sprite, D3DX10_SPRITE_ADDREF_TEXTURES); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); memset(&sprite_desc, 0, sizeof(sprite_desc)); @@ -3224,12 +3224,12 @@ todo_wine { } hr = ID3DX10Sprite_Flush(sprite); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(get_refcount(srv1) == refcount, "Unexpected refcount.\n"); hr = ID3DX10Sprite_End(sprite); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ID3DX10Sprite_Release(sprite); -- 2.35.0

Jan. 25, 2022