wine-devel January 2019

wine-devel@winehq.org

68 participants
552 discussions

[PATCH] gdiplus/tests: Fix a memory leak (Valgrind).
by Sven Baars 23 Jan '19

23 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/gdiplus/tests/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index bd4d5264ed..49adbf71e3 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2519,6 +2519,9 @@ static void test_drawimage(void) check_emfplus(hemf, draw_image_bitmap_records, "draw image bitmap"); + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + /* test drawing metafile */ stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); expect(Ok, stat); -- 2.17.1

2 1

[PATCH 2/2] ddraw: Fix the "dwMipMapCount" field of texture sub-levels.
by Henri Verbeet 23 Jan '19

23 Jan '19

From: David Adam <david.adam.cnrs(a)gmail.com> Instead of the total count, it indicates the count starting from the current level. Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/surface.c | 2 ++ dlls/ddraw/tests/ddraw1.c | 16 +++++++--------- dlls/ddraw/tests/ddraw2.c | 16 +++++++--------- dlls/ddraw/tests/ddraw4.c | 16 +++++++--------- dlls/ddraw/tests/ddraw7.c | 16 +++++++--------- 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 385ba1ac966..14aa5ab744e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6342,6 +6342,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { mip = wined3d_texture_get_sub_resource_parent(wined3d_texture, i * levels + j); mip_desc = &mip->surface_desc; + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + mip_desc->u2.dwMipMapCount = levels - j; if (j) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 99df15aea5b..1f7e2ce04e7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5482,24 +5482,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface_Unlock(surface_mip, NULL); IDirectDrawSurface_Unlock(surface_base, NULL); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2c2008a2f02..842870d7d78 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6512,24 +6512,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface2_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface2_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface2_Unlock(surface_mip, NULL); IDirectDrawSurface2_Unlock(surface_base, NULL); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f94f62ef799..8062fe870a9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -8040,24 +8040,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface4_Unlock(surface_mip, NULL); IDirectDrawSurface4_Unlock(surface_base, NULL); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 061c691c961..6ef696d34fd 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7875,24 +7875,22 @@ static void test_mipmap(void) ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(U2(surface_desc).dwMipMapCount == mipmap_count, - "Test %u, %u: Got unexpected mipmap count %u.\n", - i, mipmap_count, U2(surface_desc).dwMipMapCount); + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_Lock(surface_base, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine_if(mipmap_count != tests[i].mipmap_count_out) - ok(surface_desc.dwMipMapCount == mipmap_count, - "Test %u, %u: unexpected change of mipmap count %u.\n", - i, mipmap_count, surface_desc.dwMipMapCount); + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_Lock(surface_mip, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); - todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + ok(surface_desc.dwMipMapCount == mipmap_count - 1, "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); IDirectDrawSurface7_Unlock(surface_mip, NULL); IDirectDrawSurface7_Unlock(surface_base, NULL); -- 2.11.0

2 1

[PATCH 1/2] ddraw/tests: Add tests for the "dwMipMapCount" field of texture sub-levels.
by Henri Verbeet 23 Jan '19

23 Jan '19

From: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 49 ++++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw7.c | 49 ++++++++++++++++++++++++++++++++++------------- 4 files changed, 144 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cb6bffef7f9..99df15aea5b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5396,10 +5396,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { - IDirectDrawSurface *surface, *surface2; + IDirectDrawSurface *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC surface_desc; IDirectDraw *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -5468,24 +5468,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface2_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface_Unlock(surface2, NULL); - IDirectDrawSurface_Unlock(surface, NULL); - - IDirectDrawSurface_Release(surface2); + hr = IDirectDrawSurface_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface_Unlock(surface_mip, NULL); + IDirectDrawSurface_Unlock(surface_base, NULL); + + IDirectDrawSurface_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface_Release(surface_base); IDirectDrawSurface_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a19327071d..2c2008a2f02 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6422,10 +6422,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { IDirectDrawSurface *surface1; - IDirectDrawSurface2 *surface, *surface2; + IDirectDrawSurface2 *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC surface_desc; IDirectDraw2 *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -6498,24 +6498,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface2_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface2_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface2_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface2_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface2_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface2_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface2_Unlock(surface2, NULL); - IDirectDrawSurface2_Unlock(surface, NULL); - - IDirectDrawSurface2_Release(surface2); + hr = IDirectDrawSurface2_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface2_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface2_Unlock(surface_mip, NULL); + IDirectDrawSurface2_Unlock(surface_base, NULL); + + IDirectDrawSurface2_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface2_Release(surface_base); IDirectDrawSurface2_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b304863a38b..f94f62ef799 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7954,10 +7954,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { - IDirectDrawSurface4 *surface, *surface2; + IDirectDrawSurface4 *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC2 surface_desc; IDirectDraw4 *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -8026,24 +8026,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface4_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface4_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface4_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface4_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface4_Unlock(surface2, NULL); - IDirectDrawSurface4_Unlock(surface, NULL); - - IDirectDrawSurface4_Release(surface2); + hr = IDirectDrawSurface4_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface4_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface4_Unlock(surface_mip, NULL); + IDirectDrawSurface4_Unlock(surface_base, NULL); + + IDirectDrawSurface4_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface4_Release(surface_base); IDirectDrawSurface4_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1cc8f8fe319..061c691c961 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7788,10 +7788,10 @@ static void test_create_surface_pitch(void) static void test_mipmap(void) { - IDirectDrawSurface7 *surface, *surface2; + IDirectDrawSurface7 *surface, *surface_base, *surface_mip; + unsigned int i, mipmap_count; DDSURFACEDESC2 surface_desc; IDirectDraw7 *ddraw; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -7861,24 +7861,47 @@ static void test_mipmap(void) ok(U2(surface_desc).dwMipMapCount == tests[i].mipmap_count_out, "Test %u: Got unexpected mipmap count %u.\n", i, U2(surface_desc).dwMipMapCount); - if (U2(surface_desc).dwMipMapCount > 1) + surface_base = surface; + IDirectDrawSurface7_AddRef(surface_base); + mipmap_count = U2(surface_desc).dwMipMapCount; + while (mipmap_count > 1) { - hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &surface2); - ok(SUCCEEDED(hr), "Test %u: Failed to get attached surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface_base, &caps, &surface_mip); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get attached surface, hr %#x.\n", i, mipmap_count, hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface_base, &surface_desc); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to get surface desc, hr %#x.\n", i, mipmap_count, hr); + ok(surface_desc.dwFlags & DDSD_MIPMAPCOUNT, + "Test %u, %u: Got unexpected flags %#x.\n", i, mipmap_count, surface_desc.dwFlags); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(U2(surface_desc).dwMipMapCount == mipmap_count, + "Test %u, %u: Got unexpected mipmap count %u.\n", + i, mipmap_count, U2(surface_desc).dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface7_Lock(surface2, NULL, &surface_desc, 0, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to lock surface, hr %#x.\n", i, hr); - IDirectDrawSurface7_Unlock(surface2, NULL); - IDirectDrawSurface7_Unlock(surface, NULL); - - IDirectDrawSurface7_Release(surface2); + hr = IDirectDrawSurface7_Lock(surface_base, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine_if(mipmap_count != tests[i].mipmap_count_out) + ok(surface_desc.dwMipMapCount == mipmap_count, + "Test %u, %u: unexpected change of mipmap count %u.\n", + i, mipmap_count, surface_desc.dwMipMapCount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(surface_mip, NULL, &surface_desc, 0, NULL); + ok(SUCCEEDED(hr), "Test %u, %u: Failed to lock surface, hr %#x.\n", i, mipmap_count, hr); + todo_wine ok(surface_desc.dwMipMapCount == mipmap_count - 1, + "Test %u, %u: Child mipmap count unexpected %u\n", i, mipmap_count, surface_desc.dwMipMapCount); + IDirectDrawSurface7_Unlock(surface_mip, NULL); + IDirectDrawSurface7_Unlock(surface_base, NULL); + + IDirectDrawSurface7_Release(surface_base); + surface_base = surface_mip; + --mipmap_count; } + IDirectDrawSurface7_Release(surface_base); IDirectDrawSurface7_Release(surface); } -- 2.11.0

2 1

[website] German translation for release 4.0 (try 2)
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net> try 2: attach correct file...

1 0

[website] German translation for release 4.0
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.0-rc7
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.0-rc6
by Julian Rüger 23 Jan '19

23 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH resend] user32: Fix a memory leak.
by Zhiyi Zhang 23 Jan '19

23 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Testbot will fail because of other user32 failures. dlls/user32/rawinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..088e50da4e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -172,6 +172,7 @@ static void find_hid_devices(void) done: LeaveCriticalSection(&hid_devices_cs); + SetupDiDestroyDeviceInfoList(set); heap_free(detail); } -- 2.19.2

2 1

[PATCH resend] user32: Check invalid handle in GetRawInputData.
by Zhiyi Zhang 23 Jan '19

23 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46499 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Testbot will fail because of other user32 failures. dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..4bfccdfb84 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8f77..ffdd4b7137 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); -- 2.19.2

2 1

[PATCH 2/2] ddraw: Return the correct swapchain surface in ddraw7_GetGDISurface().
by Henri Verbeet 23 Jan '19

23 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 13 ++++++++----- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 6 ++++++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c0c49dbab1e..8467fbf4ccc 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2266,21 +2266,24 @@ static HRESULT WINAPI ddraw4_TestCooperativeLevel(IDirectDraw4 *iface) * DDERR_NOTFOUND if the GDI surface wasn't found * *****************************************************************************/ -static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurface7 **GDISurface) +static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurface7 **surface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct ddraw_surface *ddraw_surface; - TRACE("iface %p, surface %p.\n", iface, GDISurface); + TRACE("iface %p, surface %p.\n", iface, surface); wined3d_mutex_lock(); - if (!(*GDISurface = &ddraw->primary->IDirectDrawSurface7_iface)) + if (!ddraw->gdi_surface || !(ddraw_surface = wined3d_texture_get_sub_resource_parent(ddraw->gdi_surface, 0))) { - WARN("Primary not created yet.\n"); + WARN("GDI surface not available.\n"); + *surface = NULL; wined3d_mutex_unlock(); return DDERR_NOTFOUND; } - IDirectDrawSurface7_AddRef(*GDISurface); + *surface = &ddraw_surface->IDirectDrawSurface7_iface; + IDirectDrawSurface7_AddRef(*surface); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b035a7e0509..77e28662724 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -97,6 +97,7 @@ struct ddraw struct ddraw_surface *primary; RECT primary_lock; struct wined3d_texture *wined3d_frontbuffer; + struct wined3d_texture *gdi_surface; struct wined3d_swapchain *wined3d_swapchain; HWND swapchain_window; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 819044214d5..385ba1ac966 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5800,7 +5800,10 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren IDirectDrawClipper_Release(&surface->clipper->IDirectDrawClipper_iface); if (surface == surface->ddraw->primary) + { surface->ddraw->primary = NULL; + surface->ddraw->gdi_surface = NULL; + } wined3d_private_store_cleanup(&surface->private_store); @@ -6457,7 +6460,10 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } if (surface_desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { ddraw->primary = root; + ddraw->gdi_surface = root->wined3d_texture; + } *surface = root; return DD_OK; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 20ec3291c5c..cb6bffef7f9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12080,7 +12080,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface_Release(gdi_surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1e16f2be9c1..8a19327071d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13381,7 +13381,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface_Release(gdi_surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6f9917643d2..b304863a38b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15586,7 +15586,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface4_Release(gdi_surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 21f8806999a..f5ec87ff395 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15294,7 +15294,7 @@ static void test_gdi_surface(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + ok(gdi_surface == backbuffer || broken(gdi_surface == primary), "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); IDirectDrawSurface7_Release(gdi_surface); -- 2.11.0

2 1

← Newer
1
...
24
25
26
27
28
29
30
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel January 2019