Commit Graph

94 Commits

Author SHA1 Message Date
Ziqing Hui 1a35f589c3 d3dx10/tests: Add tests for D3DX10CreateTextureFromResource{A, W}.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-27 11:35:45 +02:00
Ziqing Hui 133fa91a81 d3dx10/tests: Add tests for D3DX10CreateTextureFromFile{A, W}.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-27 11:35:43 +02:00
Matteo Bruni ba149e1296 d3dx10/tests: Only accept D3DX10_IFF_WMP tests failure on Windows.
Since eb0180e7b4 we're guaranteed to
have support for the format in Wine.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-27 11:35:38 +02:00
Ziqing Hui 5636088871 d3dx10: Add stubs for D3DX10CreateTextureFromResource{A, W}.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-07 22:54:59 +02:00
Ziqing Hui 6623915b61 d3dx10: Add stubs for D3DX10CreateTextureFromFile{A,W}.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-07 22:54:55 +02:00
Alexandre Julliard 088a787a2c makefiles: Make -mno-cygwin the default.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-20 22:45:48 +02:00
Nikolay Sivov 613044fab7 d3dx10: Handle null filename for W->A conversion explicitly in D3DX10CreateEffectFromResourceW().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-13 22:35:29 +02:00
Nikolay Sivov 737da3eb1c d3dx10: Partially implement D3DX10CreateEffectFromResource().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-08 17:27:33 +02:00
Nikolay Sivov 66d7ba2d8c d3dx10/sprite: Store projection matrix.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-02 21:57:39 +02:00
Nikolay Sivov c09f114319 d3dx10/font: Add PreloadCharacters().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-02 21:57:39 +02:00
Nikolay Sivov abbab131b8 d3dx10/font: Add PreloadTextW().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-02 21:57:39 +02:00
Nikolay Sivov 107562fdbf d3dx10/font: Implement GetTextMetrics().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-31 15:50:40 +02:00
Nikolay Sivov 5e0577c2b8 d3dx10/font: Create gdi objects on font object creation.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-31 15:50:38 +02:00
Nikolay Sivov 6c2fad576b d3dx10/font: Store font description data.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-31 15:50:35 +02:00
Michael Stefaniuc 460ca9a9b5 d3dx10: Remove redundant NULL check before heap_free().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-27 18:06:29 +02:00
Nikolay Sivov 8b6be4426a d3dx10/tests: Add some tests for sprite object.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-25 21:06:23 +02:00
Nikolay Sivov fa2658499e d3dx10: Check device in d3dx10_sprite_GetDevice().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-25 21:06:23 +02:00
Nikolay Sivov fafd607eff d3dx10: Add a stub mesh object.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-25 21:06:11 +02:00
Nikolay Sivov 7d60044e18 d3dx10_43/tests: Test all attributes of glyph textures.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-20 21:59:52 +02:00
Nikolay Sivov c40896d269 d3dx10/tests: Add some tests for font object.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-17 19:24:22 +02:00
Nikolay Sivov 6177af8b1e d3dx10: Add a stub font object.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-17 19:20:59 +02:00
Nikolay Sivov c2be6fa691 d3dx10: Add a stub sprite object.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-17 19:20:53 +02:00
Matteo Bruni 4b6819262c d3dx10/tests: Ignore D3DX10GetImageInfoFromResourceA/W() test failures on Vista.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51305
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-12 23:07:12 +02:00
Matteo Bruni da217f9bd3 d3dx10/tests: Don't fail tests when WMP support is missing.
That's apparently the case on Vista (and Wine when compiled without
jxrlib).

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51305
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-12 23:07:09 +02:00
Nikolay Sivov 1e0f7d6489 d3dx10: Forward D3DX10CreateEffectFromFileA() to D3DX10CreateEffectFromFileW().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-11 23:00:50 +02:00
Nikolay Sivov eb2946addf d3dx10: Partially implement D3DX10CreateEffectFromFileW().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-10 23:01:43 +02:00
Nikolay Sivov 5279212cd9 d3dx10: Partially implement D3DX10CreateEffectFromMemory().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-10 23:01:40 +02:00
Ziqing Hui 52ba1b498a d3dx10: Support block compressed formats in D3DX10CreateTextureFromMemory().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-07-01 22:34:32 +02:00
Ziqing Hui ce0e61dbe8 d3dx10: Handle format conversion in D3DX10CreateTextureFromMemory().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-07-01 22:34:32 +02:00
Ziqing Hui 68ac49bc11 d3dx10: Introduce initial D3DX10CreateTextureFromMemory() implementation.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-07-01 22:34:32 +02:00
Ziqing Hui dd55d9ce1b d3dx10/tests: Test texture returned by D3DX10CreateTextureFromMemory on failure.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-07-01 22:34:32 +02:00
Ziqing Hui bcb261b4f9 d3dx10/tests: Test subresource data for created texture.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-06-15 12:06:13 +02:00
Ziqing Hui b798b3869d d3dx10/tests: Use winetest_push_context.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-06-15 12:06:11 +02:00
Ziqing Hui 6161571a72 d3dx10/tests: Check more members of texture descriptor.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-06-10 20:47:32 +02:00
Alexandre Julliard 174bfbc1c1 d3dx10: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-02-22 14:42:08 +01:00
Rémi Bernon 958b433272 wmphoto: Implement WMP decoder using jxrlib.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Esme Povirk <esme@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-02-08 10:51:56 +01:00
Ziqing Hui 1e6599f7ad d3dx10/tests: Add tests for D3DX10CreateTextureFromMemory.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-23 12:41:00 +01:00
Ziqing Hui 43aa33714e d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-18 20:28:05 +01:00
Ziqing Hui 6ffc3ecbd8 d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-18 20:28:05 +01:00
Michael Stefaniuc 6325887e3d d3dx10/tests: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-01 11:46:46 +02:00
Ziqing Hui 937b585996 d3dx10: Implement D3DX10GetImageInfoFromFileA().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-30 15:50:53 +02:00
Ziqing Hui a0fa7810e1 d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-30 15:50:51 +02:00
Ziqing Hui d2406ad95e d3dx10: Implement D3DX10GetImageInfoFromFileW().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-30 15:50:49 +02:00
Ziqing Hui 3c068a2d86 d3dx10: Move D3DX10GetImageInfo*() to texture.c.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-29 12:02:29 +02:00
Ziqing Hui b341009993 d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileW().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-09 11:15:48 +02:00
Ziqing Hui 99aeb964f6 d3dx10/tests: Introduce check_image_info().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-09 11:15:48 +02:00
Ziqing Hui ccf3964ba2 d3dx10/tests: Introduce create_file() and delete_file().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-09 11:15:48 +02:00
Ziqing Hui 94edc0b3f1 d3dx10: Add D3DX10GetImageInfoFromResource{A, W}() stub implementation.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-09 11:15:48 +02:00
Ziqing Hui 4d0f38b86c d3dx10: Add D3DX10GetImageInfoFromFile{A, W}() stub implementation.
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-09 11:15:48 +02:00
Ziqing Hui b4d273e7fe d3dx10: Introduce get_d3dx10_dds_format().
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-01 20:56:43 +02:00