January 2022 - Wine-commits

Fabian Maurer : crypt32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 281836d5b1d9723529c87a2eb0e7c450c63cc2ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=281836d5b1d9723529c87a2e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:27 2022 +0100 crypt32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 09aea370227..b594256fb39 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -357,7 +357,7 @@ static void test_getDefaultCryptProv(void) prov = pI_CryptGetDefaultCryptProv(test_prov[i].algid); if (!prov) { -todo_wine_if(test_prov[i].algid == CALG_DSS_SIGN || test_prov[i].algid == CALG_NO_SIGN) + todo_wine_if(test_prov[i].algid == CALG_DSS_SIGN || test_prov[i].algid == CALG_NO_SIGN) ok(test_prov[i].optional, "%u: I_CryptGetDefaultCryptProv(%#x) failed\n", i, test_prov[i].algid); continue; }

1 0

Fabian Maurer : dbgeng/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 6cb395f22c77ca5b49cd0e347af115bec247411b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb395f22c77ca5b49cd0e34… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:33 2022 +0100 dbgeng/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0

Fabian Maurer : d2d1/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: d2f7621f349a4f06731242afaa710299f65baacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f7621f349a4f06731242af… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jan 26 15:43:44 2022 +0100 d2d1/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0228ae8d52b..b0aa02ad2a9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4766,7 +4766,7 @@ static void test_shared_bitmap(BOOL d3d11) bitmap_desc.pixelFormat = bitmap_format_tests[i].original; hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2); - todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) + todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -5233,8 +5233,7 @@ static void test_draw_text_layout(BOOL d3d11) ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == D2DERR_WRONG_FACTORY, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); @@ -5500,8 +5499,7 @@ static void test_dc_target(BOOL d3d11) /* Invalid DC. */ hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); -todo_wine - ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID2D1DCRenderTarget_BeginDraw(rt); @@ -5512,8 +5510,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08x.\n", clr); hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); @@ -5527,8 +5524,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2); @@ -7884,8 +7880,7 @@ static void test_gdi_interop(BOOL d3d11) dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); ok(FAILED(hr), "GetDC() was expected to fail, hr %#x.\n", hr); -todo_wine - ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); + todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); @@ -7942,8 +7937,7 @@ todo_wine ID2D1RenderTarget_BeginDraw(rt); hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Expected bitmap to be locked, hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IWICBitmapLock_Release(wic_lock); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -7954,8 +7948,7 @@ todo_wine ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr); ID2D1RenderTarget_BeginDraw(rt); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); IWICBitmapLock_Release(wic_lock); ID2D1GdiInteropRenderTarget_Release(interop); @@ -8460,7 +8453,7 @@ static void test_bitmap_surface(BOOL d3d11) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap); - todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) + todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -8716,8 +8709,7 @@ static void test_device_context(BOOL d3d11) ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); -todo_wine - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -8982,8 +8974,7 @@ static void test_command_list(BOOL d3d11) ok(device_context != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); -todo_wine - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (FAILED(hr)) {

1 0

Fabian Maurer : d3d10/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: e2d7f378140785312f3f6197388e6928ea2aece7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2d7f378140785312f3f6197… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:29 2022 +0100 d3d10/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index b4ea4402a05..dbc4dcf3941 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3852,7 +3852,7 @@ 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 + todo_wine ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); @@ -7114,7 +7114,7 @@ static void test_effect_pool(void) ok(!!device2, "Failed to create d3d device.\n"); hr = D3D10CreateEffectPoolFromMemory(NULL, 0, 0, device, &pool); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = create_effect_pool(fx_test_pool, device, &pool); @@ -7131,7 +7131,7 @@ todo_wine effect->lpVtbl->Release(effect); hr = pool->lpVtbl->QueryInterface(pool, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); @@ -7144,7 +7144,7 @@ todo_wine IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); @@ -7228,12 +7228,12 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10Effect, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk);

1 0

Fabian Maurer : d3dcompiler/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: cd7b14f1aeef115403f7a441f84a6204c9f9c827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd7b14f1aeef115403f7a441… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:30 2022 +0100 d3dcompiler/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index e467cec9623..27f2c5b063d 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1725,7 +1725,7 @@ static void test_disassemble_shader(void) HRESULT hr; hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); -todo_wine + todo_wine #if D3D_COMPILER_VERSION >= 46 ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); #else @@ -1733,7 +1733,7 @@ todo_wine #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D10Blob_Release(blob);

1 0

Fabian Maurer : d3dx10_43/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: cede46942ee5e2631c381345716f85ebc68cb623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cede46942ee5e2631c381345… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:31 2022 +0100 d3dx10_43/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0

Fabian Maurer : d3dx9_36/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: fc503ab07d65112a21126d01b378b7e05249a3b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc503ab07d65112a21126d01… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:32 2022 +0100 d3dx9_36/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)) {

1 0

Fabian Maurer : dwrite/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: ddb315bfd274ac806ba395fa14a1c0981fb83bf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddb315bfd274ac806ba395fa… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:34 2022 +0100 dwrite/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 50 +++++++++++++++++++++++----------------------- dlls/dwrite/tests/layout.c | 26 ++++++++++++------------ 2 files changed, 38 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddb315bfd274ac806ba3…

1 0

Michael Stefaniuc : dmusic: Implement the E_NOTIMPL methods of the synth port.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 340e1feef0500b46121e37803684dfdae492f390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340e1feef0500b46121e3780… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 23:11:23 2022 +0100 dmusic: Implement the E_NOTIMPL methods of the synth port. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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)

1 0

Michael Stefaniuc : dmsynth: Add error handling to the synth GetPortCaps method.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: e835e143f0f2682ef05fe513a755e12df7835e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e835e143f0f2682ef05fe513… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 23:11:24 2022 +0100 dmsynth: Add error handling to the synth GetPortCaps method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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)

1 0