September 2019 - Wine-commits

Matteo Bruni : d3dx9/tests: Add more tests loading misaligned block textures.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: c29f770e8bf1da56856b457cf92221e88f6323d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29f770e8bf1da56856b457c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:56 2019 +0200 d3dx9/tests: Add more tests loading misaligned block textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 57 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2f8149fd01..11bc3159bb 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -181,6 +181,23 @@ static const BYTE dds_dxt5[] = 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, }; +/* 8x8 dxt5 */ +static const BYTE dds_dxt5_8_8[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x08,0x00,0x00,0x00, + 0x08,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0xe0,0x07,0x05,0x05,0x50,0x50, + 0x3f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x07,0x05,0x05,0x50,0x50, + 0x7f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xf8,0xe0,0xff,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x05,0x05,0x50,0x50, +}; + static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size) { DWORD received; @@ -729,13 +746,13 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) IDirect3DSurface9 *surf, *newsurf; RECT rect, destrect; D3DLOCKED_RECT lockrect; - const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 }; - const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 }; - const WORD pixdata_r5g6b5[] = { 0x9ef6, 0x658d, 0x0aee, 0x42ee }; - const WORD pixdata_a8l8[] = { 0xff00, 0x00ff, 0xff30, 0x7f7f }; - const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 }; - const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 }; - const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 }; + static const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 }; + static const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 }; + static const WORD pixdata_r5g6b5[] = { 0x9ef6, 0x658d, 0x0aee, 0x42ee }; + static const WORD pixdata_a8l8[] = { 0xff00, 0x00ff, 0xff30, 0x7f7f }; + static const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 }; + static const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 }; + static const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 }; hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); @@ -1303,8 +1320,30 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) D3DFMT_DXT5, 16, NULL, &rect, D3DX_FILTER_POINT, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - check_release((IUnknown*)newsurf, 1); - check_release((IUnknown*)tex, 0); + check_release((IUnknown *)newsurf, 1); + check_release((IUnknown *)tex, 0); + + /* More misalignment tests. */ + hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, 0, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &tex, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + SetRect(&rect, 2, 2, 6, 6); + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, NULL, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, NULL, D3DX_FILTER_POINT, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + check_release((IUnknown *)newsurf, 1); + check_release((IUnknown *)tex, 0); } hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &tex, NULL);

1 0

Matteo Bruni : d3dx9/tests: Add even more tests for misaligned block textures.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 5472b8b98332400a7ad434ed94bed82b21f622fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5472b8b98332400a7ad434ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:57 2019 +0200 d3dx9/tests: Add even more tests for misaligned block textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 68bbd37f8a..ced362ff9f 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1583,6 +1583,28 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) 0x7fff00ff, 0x7fff00ff, 0x7fffff00, 0x7fffff00, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000, 0x7fff00ff, 0x7fff00ff, 0x7fffff00, 0x7fffff00, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000, }; + static const DWORD dds_dxt5_8_8_expected_misaligned_1[] = + { + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + }; + static const DWORD dds_dxt5_8_8_expected_misaligned_3[] = + { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + }; IDirect3DSurface9 *surface, *uncompressed_surface; IDirect3DTexture9 *texture; D3DLOCKED_RECT lock_rect; @@ -1591,6 +1613,7 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) unsigned int i, x, y; DWORD level_count; HRESULT hr; + RECT rect; hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); @@ -1706,6 +1729,75 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 2; ++y) + memset(&((BYTE *)lock_rect.pBits)[y * lock_rect.Pitch], 0, 16 * 2); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + SetRect(&rect, 2, 2, 6, 6); + hr = D3DXLoadSurfaceFromMemory(surface, NULL, NULL, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 8; ++y) + { + for (x = 0; x < 8; ++x) + { + ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_1[y * 8 + x], 0), + "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", + x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_1[y * 8 + x]); + } + } + hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 2; ++y) + memset(&((BYTE *)lock_rect.pBits)[y * lock_rect.Pitch], 0, 16 * 2); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surface, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, NULL, D3DX_FILTER_POINT, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surface, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 8; ++y) + { + for (x = 0; x < 8; ++x) + { + ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_3[y * 8 + x], 0), + "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", + x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_3[y * 8 + x]); + } + } + hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + IDirect3DSurface9_Release(uncompressed_surface); IDirect3DSurface9_Release(surface); IDirect3DTexture9_Release(texture);

1 0

Matteo Bruni : d3dx9: Add traces to filtering functions.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 1f9243c757589c6ff2333794c3a44327d64855ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f9243c757589c6ff2333794… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:58 2019 +0200 d3dx9: Add traces to filtering functions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 10 ++++++++++ dlls/d3dx9_36/texture.c | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 39dfbf16ac..b78742c041 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1619,6 +1619,11 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit UINT min_width, min_height, min_depth; UINT x, y, z; + TRACE("src %p, src_row_pitch %u, src_slice_pitch %u, src_size %p, src_format %p, dst %p, " + "dst_row_pitch %u, dst_slice_pitch %u, dst_size %p, dst_format %p, color_key 0x%08x, palette %p.\n", + src, src_row_pitch, src_slice_pitch, src_size, src_format, dst, dst_row_pitch, dst_slice_pitch, dst_size, + dst_format, color_key, palette); + ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(src_format, dst_format, &conv_info); @@ -1721,6 +1726,11 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic DWORD channels[4]; UINT x, y, z; + TRACE("src %p, src_row_pitch %u, src_slice_pitch %u, src_size %p, src_format %p, dst %p, " + "dst_row_pitch %u, dst_slice_pitch %u, dst_size %p, dst_format %p, color_key 0x%08x, palette %p.\n", + src, src_row_pitch, src_slice_pitch, src_size, src_format, dst, dst_row_pitch, dst_slice_pitch, dst_size, + dst_format, color_key, palette); + ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(src_format, dst_format, &conv_info); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 26d07ca9f6..b7d017a836 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -430,7 +430,6 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) return D3DERR_NOTAVAILABLE; - /* ensure width/height is power of 2 */ if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s))) s = make_pow2(s); @@ -470,7 +469,6 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *devic if (d == D3DX_DEFAULT) d = 1; - /* ensure width/height is power of 2 */ if ((caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2) && (!is_pow2(w) || !is_pow2(h) || !is_pow2(d))) { @@ -646,7 +644,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi skip_levels = 0; } - /* fix texture creation parameters */ + /* Fix up texture creation parameters. */ hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool); if (FAILED(hr)) {

1 0

Matteo Bruni : d3dx9: Handle compressed surfaces in D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 376182062ff1ab8e7835fd67bc650da83c2cc75d URL: https://source.winehq.org/git/wine.git/?a=commit;h=376182062ff1ab8e7835fd67… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:59 2019 +0200 d3dx9: Handle compressed surfaces in D3DXLoadSurfaceFromMemory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24983 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 2 + dlls/d3dx9_25/Makefile.in | 2 + dlls/d3dx9_26/Makefile.in | 2 + dlls/d3dx9_27/Makefile.in | 2 + dlls/d3dx9_28/Makefile.in | 2 + dlls/d3dx9_29/Makefile.in | 2 + dlls/d3dx9_30/Makefile.in | 2 + dlls/d3dx9_31/Makefile.in | 2 + dlls/d3dx9_32/Makefile.in | 2 + dlls/d3dx9_33/Makefile.in | 2 + dlls/d3dx9_34/Makefile.in | 2 + dlls/d3dx9_35/Makefile.in | 2 + dlls/d3dx9_36/Makefile.in | 2 + dlls/d3dx9_36/d3dx9_private.h | 4 +- dlls/d3dx9_36/surface.c | 112 ++++- dlls/d3dx9_36/tests/surface.c | 63 +-- dlls/d3dx9_36/tests/texture.c | 158 +++---- dlls/d3dx9_36/texture.c | 41 +- dlls/d3dx9_36/txc_compress_dxtn.c | 841 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/txc_dxtn.h | 52 +++ dlls/d3dx9_36/txc_fetch_dxtn.c | 243 +++++++++++ dlls/d3dx9_36/volume.c | 1 - dlls/d3dx9_37/Makefile.in | 2 + dlls/d3dx9_38/Makefile.in | 2 + dlls/d3dx9_39/Makefile.in | 2 + dlls/d3dx9_40/Makefile.in | 2 + dlls/d3dx9_41/Makefile.in | 2 + dlls/d3dx9_42/Makefile.in | 2 + dlls/d3dx9_43/Makefile.in | 2 + 29 files changed, 1423 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=376182062ff1ab8e7835…

1 0

Matteo Bruni : d3dx9/tests: Improve tests to check for DXTn fallback formats.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: d2f3fc03cb1dbcae77e199f3fd8eb2ccf419cfa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f3fc03cb1dbcae77e199f3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:54:00 2019 +0200 d3dx9/tests: Improve tests to check for DXTn fallback formats. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 69 ++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 04513fa4b0..fc1589d25e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,7 +25,7 @@ #include "d3dx9tex.h" #include "resources.h" -static int has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3; +static int has_2d_dxt1, has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3; /* 2x2 16-bit dds, no mipmaps */ static const unsigned char dds_16bit[] = { @@ -419,30 +419,57 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(format == expected, "Returned format %u, expected %u\n", format, expected); /* Block-based texture formats and size < block size. */ - if (has_2d_dxt5) + format = D3DFMT_DXT1; + width = 2; height = 2; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mipmaps == 1, "Got unexpected level count %u.\n", mipmaps); + if (has_2d_dxt1) { - format = D3DFMT_DXT5; - width = 2; height = 2; - mipmaps = 1; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == 4, "Returned width %d, expected %d\n", width, 4); - ok(height == 4, "Returned height %d, expected %d\n", height, 4); - ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); - ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + ok(width == 4, "Got unexpected width %d.\n", width); + ok(height == 4, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_DXT1, "Got unexpected format %u.\n", format); + } + else + { + ok(width == 2, "Got unexpected width %d.\n", width); + ok(height == 2, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", format); + } - width = 4; - height = 2; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(width == 4, "Got unexpected width %u.\n", width); + format = D3DFMT_DXT5; + width = 2; height = 2; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mipmaps == 1, "Got unexpected level count %u.\n", mipmaps); + if (has_2d_dxt5) + { + ok(width == 4, "Got unexpected width %d.\n", width); + ok(height == 4, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format); + } + else + { + ok(width == 2, "Got unexpected width %d.\n", width); + ok(height == 2, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", format); + } + width = 4; + height = 2; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(width == 4, "Got unexpected width %u.\n", width); + ok(mipmaps == 1, "Got unexpected level count %u.\n", mipmaps); + if (has_2d_dxt5) + { ok(height == 4, "Got unexpected height %u.\n", height); - ok(mipmaps == 1, "Got unexpected mipmap level count %u.\n", mipmaps); ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format); } else { - skip("D3DFMT_DXT5 textures are not supported, skipping a test.\n"); + ok(height == 2, "Got unexpected height %u.\n", height); + ok(format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", format); } IDirect3D9_Release(d3d); @@ -2511,6 +2538,8 @@ START_TEST(texture) } /* Check whether DXTn textures are supported. */ + has_2d_dxt1 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT1)); has_2d_dxt3 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT3)); has_2d_dxt5 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, @@ -2519,8 +2548,8 @@ START_TEST(texture) D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, D3DFMT_DXT5)); has_3d_dxt3 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT3)); - trace("DXTn texture support: 2D DXT3 %#x, 2D DXT5 %#x, cube DXT5 %#x, 3D dxt3 %#x.\n", - has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3); + trace("DXTn texture support: 2D DXT1 %#x, 2D DXT3 %#x, 2D DXT5 %#x, cube DXT5 %#x, 3D dxt3 %#x.\n", + has_2d_dxt1, has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3); test_D3DXCheckTextureRequirements(device); test_D3DXCheckCubeTextureRequirements(device);

1 0

Sven Baars : msi: Fix a leak on error path (Coverity).
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: fe91ae51f1553875c1858df264c0603877d50737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe91ae51f1553875c1858df2… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 16:32:28 2019 +0200 msi: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6ccf46ec30..8a28e4d4af 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4033,7 +4033,11 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di msiobj_release( &rec->hdr ); rec = MSI_CreateRecord(2); - if (!rec) return NULL; + if (!rec) + { + msi_dialog_destroy(dialog); + return NULL; + } MSI_RecordSetStringW(rec, 1, name); MSI_RecordSetStringW(rec, 2, szDialogCreated); MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, rec);

1 0

Michael Stefaniuc : widl: Add the ARRAY_SIZE() macro.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: bbcf44eb970761d8c40eecc5692cf58ce378a8c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbcf44eb970761d8c40eecc5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 26 17:50:59 2019 +0200 widl: Add the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 5 ++--- tools/widl/utils.c | 2 +- tools/widl/utils.h | 2 ++ tools/widl/widl.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 79e72e0472..cf027558d0 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -64,7 +64,6 @@ static const struct oatype { {"VARIANT", VT_VARIANT}, {"VARIANT_BOOL", VT_BOOL} }; -#define NTYPES (sizeof(oatypes)/sizeof(oatypes[0])) #define KWP(p) ((const struct oatype *)(p)) static int kw_cmp_func(const void *s1, const void *s2) @@ -79,11 +78,11 @@ static unsigned short builtin_vt(const type_t *t) const struct oatype *kwp; key.kw = kw; #ifdef KW_BSEARCH - kwp = bsearch(&key, oatypes, NTYPES, sizeof(oatypes[0]), kw_cmp_func); + kwp = bsearch(&key, oatypes, ARRAY_SIZE(oatypes), sizeof(oatypes[0]), kw_cmp_func); #else { unsigned int i; - for (kwp=NULL, i=0; i < NTYPES; i++) + for (kwp = NULL, i = 0; i < ARRAY_SIZE(oatypes); i++) if (!kw_cmp_func(&key, &oatypes[i])) { kwp = &oatypes[i]; break; diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 90668873aa..20c63064c7 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -309,7 +309,7 @@ void add_output_to_resources( const char *type, const char *name ) size_t data_size = output_buffer_pos; size_t header_size = 5 * sizeof(unsigned int) + 2 * sizeof(unsigned short); - assert( nb_resources < sizeof(resources)/sizeof(resources[0]) ); + assert( nb_resources < ARRAY_SIZE( resources )); if (type[0] != '#') header_size += (strlen( type ) + 1) * sizeof(unsigned short); else header_size += 2 * sizeof(unsigned short); diff --git a/tools/widl/utils.h b/tools/widl/utils.h index ec02fc7c37..74dba11d3c 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -34,6 +34,8 @@ int strendswith(const char* str, const char* end); #define __attribute__(X) #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + void parser_error(const char *s) __attribute__((noreturn)); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1620dfdb3a..f5fa20c884 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -302,7 +302,7 @@ static void set_target( const char *target ) if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) { if (!strcmp( cpu_names[i].name, spec )) {

1 0

Sven Baars : kernelbase: Fix a leak on error path (Coverity).
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: f4ecef456595325f973487173cad3ac1269d87f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ecef456595325f97348717… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 21:21:32 2019 +0200 kernelbase: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f633dfa3de..d60e3b1a47 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -868,6 +868,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH CreateFiberEx( SIZE_T stack_commit, SIZE_T stack if ((status = RtlCreateUserStack( stack_commit, stack_reserve, 0, 1, 1, &stack ))) { SetLastError( RtlNtStatusToDosError(status) ); + HeapFree( GetProcessHeap(), 0, fiber ); return NULL; }

1 0

Alexandre Julliard : kernel32: Move some handle functions to kernelbase.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 950773dc06adf58810945868a4ab4cf00fda67e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950773dc06adf58810945868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 10:32:55 2019 +0200 kernel32: Move some handle functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processenvironment-l1-1-0.spec | 2 +- .../api-ms-win-core-processenvironment-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 8 +- dlls/kernel32/process.c | 109 --------------------- dlls/kernelbase/console.c | 6 -- dlls/kernelbase/kernelbase.h | 6 ++ dlls/kernelbase/kernelbase.spec | 10 +- dlls/kernelbase/process.c | 90 +++++++++++++++++ 8 files changed, 107 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=950773dc06adf5881094…

1 0

Alexandre Julliard : kernel32: Move delay-load functions to kernelbase.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 0f5538b9e349fe7b5924b8c0b84ca8a917962701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f5538b9e349fe7b5924b8c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 10:33:54 2019 +0200 kernel32: Move delay-load functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/module.c | 17 ----------------- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/loader.c | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4196582739..24a33e7600 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -356,7 +356,7 @@ @ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer @ stdcall DefineDosDeviceA(long str str) @ stdcall DefineDosDeviceW(long wstr wstr) -@ stdcall DelayLoadFailureHook(str str) +@ stdcall -import DelayLoadFailureHook(str str) @ stdcall DeleteAtom(long) # @ stub DeleteBoundaryDescriptor @ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 24fb9e33f5..ad6956d1ce 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1018,23 +1018,6 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) return get_proc_address_wrapper( hModule, function ); } -/*********************************************************************** - * DelayLoadFailureHook (KERNEL32.@) - */ -FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ) -{ - ULONG_PTR args[2]; - - if ((ULONG_PTR)function >> 16) - ERR( "failed to delay load %s.%s\n", name, function ); - else - ERR( "failed to delay load %s.%u\n", name, LOWORD(function) ); - args[0] = (ULONG_PTR)name; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); - return NULL; -} - typedef struct _PEB32 { BOOLEAN InheritedAddressSpace; diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ac2bfe55da..c4fd8511b3 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -244,7 +244,7 @@ # @ stub DecodeRemotePointer @ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer @ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW -@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook +@ stdcall DelayLoadFailureHook(str str) # @ stub DelayLoadFailureHookLookup @ stdcall DeleteAce(ptr long) # @ stub DeleteBoundaryDescriptor @@ -1344,7 +1344,7 @@ @ stdcall ResetEvent(long) # @ stub ResetState @ stdcall ResetWriteWatch(ptr long) -@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI +@ stdcall -import ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) LdrResolveDelayLoadedAPI # @ stub ResolveDelayLoadsFromDll @ stdcall ResolveLocaleName(wstr ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 34c8add910..9d0486d8a6 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -42,6 +42,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); ***********************************************************************/ +/*********************************************************************** + * DelayLoadFailureHook (kernelbase.@) + */ +FARPROC WINAPI DECLSPEC_HOTPATCH DelayLoadFailureHook( LPCSTR name, LPCSTR function ) +{ + ULONG_PTR args[2]; + + if ((ULONG_PTR)function >> 16) + ERR( "failed to delay load %s.%s\n", name, function ); + else + ERR( "failed to delay load %s.%u\n", name, LOWORD(function) ); + args[0] = (ULONG_PTR)name; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); + return NULL; +} + + /**************************************************************************** * DisableThreadLibraryCalls (kernelbase.@) */

1 0