[PATCH v4 1/3] windowscodecs: Implement DdsDecoder_Wine_Initialize().

[Ziqing Hui]

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize().
And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize().

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com>
---

v4: Add todo_wine() for cube map in d3dx10 tests.

 dlls/d3dx10_43/tests/d3dx10.c        |   3 +-
 dlls/windowscodecs/ddsformat.c       | 118 ++++++++++++++++-----------
 dlls/windowscodecs/tests/ddsformat.c |   3 -
 3 files changed, 72 insertions(+), 52 deletions(-)

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=75355

Your paranoid android.


=== build (build log) ===

error: patch failed: dlls/windowscodecs/ddsformat.c:104
error: patch failed: dlls/windowscodecs/tests/ddsformat.c:237
Task: Patch failed to apply

[Esme Povirk (they/them)]

Is this still breaking functionality in d3dx10 that previously worked?

My suggestion would be to move the code to DdsDecoder_Wine_Initialize,
update d3dx10 to use this interface if available, then update the
validation in DdsDecoder_Initialize.

[Ziqing Hui]

It breaks loading cube map in D3DX10GetImageInfoFromMemory().

I think a solution is using DdsDecoder_Wine_Initialize() in windowscodecs/imgfactory.c: find_decoder() if DdsDecoder_Initialize() fails, like:

    hr = DdsDecoder_Initialize();
    if (FAILED(hr)) {
        DdsDecoder_Wine_Initialize();
    }

(d3dx10 uses CreateDecoderFromStream() to create a decoder, CreateDecoderFromStream() invokes find_decoder())

I was planning to add these code in a future patch. Now we can add it in this patch. What do you think?

On 7/15/20 9:41 AM, Esme Povirk (they/them) wrote:
> tionality in d3dx10 that previously worked?
>
> My suggestion would be to move the code to DdsDecoder_Wine_Initialize,
> update d3dx10 to use this interface if available, then update the
> validation in DdsDecoder_In

[Esme Povirk (they/them)]

I think that's OK. CreateDecoderFromStream can succeed on Windows for
formats native doesn't support, because someone can always install a
new decoder.