Ziqing Hui : windowscodecs: Implement IWICDdsEncoder_GetParameters.

Alexandre Julliard julliard at winehq.org
Wed May 12 15:44:30 CDT 2021


Module: wine
Branch: master
Commit: 8e8b70b9d3892d952ca5be879e663504af825168
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8e8b70b9d3892d952ca5be879e663504af825168

Author: Ziqing Hui <zhui at codeweavers.com>
Date:   Wed May 12 13:07:49 2021 +0800

windowscodecs: Implement IWICDdsEncoder_GetParameters.

Signed-off-by: Ziqing Hui <zhui at codeweavers.com>
Signed-off-by: Esme Povirk <esme at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/windowscodecs/ddsformat.c       | 50 ++++++++++++++++++++++++++++++++++--
 dlls/windowscodecs/tests/ddsformat.c |  2 --
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c
index a102d4883cd..8f505aed993 100644
--- a/dlls/windowscodecs/ddsformat.c
+++ b/dlls/windowscodecs/ddsformat.c
@@ -168,6 +168,7 @@ typedef struct DdsEncoder {
     UINT frame_count;
     BOOL uncommitted_frame;
     BOOL committed;
+    dds_info info;
 } DdsEncoder;
 
 typedef struct DdsFrameEncode {
@@ -1740,8 +1741,39 @@ static HRESULT WINAPI DdsEncoder_Dds_SetParameters(IWICDdsEncoder *iface,
 static HRESULT WINAPI DdsEncoder_Dds_GetParameters(IWICDdsEncoder *iface,
                                                    WICDdsParameters *parameters)
 {
-    FIXME("(%p,%p): stub.\n", iface, parameters);
-    return E_NOTIMPL;
+    DdsEncoder *This = impl_from_IWICDdsEncoder(iface);
+    HRESULT hr;
+
+    TRACE("(%p,%p)\n", iface, parameters);
+
+    if (!parameters) return E_INVALIDARG;
+
+    EnterCriticalSection(&This->lock);
+
+    if (!This->stream)
+    {
+        hr = WINCODEC_ERR_WRONGSTATE;
+        goto end;
+    }
+
+    parameters->Width      = This->info.width;
+    parameters->Height     = This->info.height;
+    parameters->Depth      = This->info.depth;
+    parameters->MipLevels  = This->info.mip_levels;
+    parameters->ArraySize  = This->info.array_size;
+    parameters->DxgiFormat = This->info.format;
+    parameters->Dimension  = This->info.dimension;
+    parameters->AlphaMode  = This->info.alpha_mode;
+
+    TRACE("(%p,%p) -> (%dx%d depth=%u mipLevels=%u arraySize=%u dxgiFormat=%#x dimension=%#x alphaMode=%#x)\n",
+          iface, parameters, parameters->Width, parameters->Height, parameters->Depth, parameters->MipLevels,
+          parameters->ArraySize, parameters->DxgiFormat, parameters->Dimension, parameters->AlphaMode);
+
+    hr = S_OK;
+
+end:
+    LeaveCriticalSection(&This->lock);
+    return hr;
 }
 
 static HRESULT WINAPI DdsEncoder_Dds_CreateNewFrame(IWICDdsEncoder *iface,
@@ -1835,6 +1867,20 @@ static HRESULT WINAPI DdsEncoder_Initialize(IWICBitmapEncoder *iface,
     This->stream = stream;
     IStream_AddRef(stream);
 
+    This->info.width = 1;
+    This->info.height = 1;
+    This->info.depth = 1;
+    This->info.mip_levels = 1;
+    This->info.array_size = 1;
+    This->info.frame_count = 1;
+    This->info.data_offset = 0;
+    This->info.bytes_per_block = get_bytes_per_block_from_format(DXGI_FORMAT_BC3_UNORM);
+    This->info.format = DXGI_FORMAT_BC3_UNORM;
+    This->info.dimension = WICDdsTexture2D;
+    This->info.alpha_mode = WICDdsAlphaModeUnknown;
+    This->info.pixel_format = &GUID_WICPixelFormatUndefined;
+    This->info.pixel_format_bpp = 0;
+
     hr = S_OK;
 
 end:
diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c
index 681a73cf6de..dc8333a433f 100644
--- a/dlls/windowscodecs/tests/ddsformat.c
+++ b/dlls/windowscodecs/tests/ddsformat.c
@@ -1317,11 +1317,9 @@ static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder *
     HRESULT hr;
 
     hr = IWICDdsEncoder_GetParameters(dds_encoder, NULL);
-    todo_wine
     ok(hr == E_INVALIDARG, "GetParameters got unexpected hr %#x\n", hr);
 
     hr = IWICDdsEncoder_GetParameters(dds_encoder, &params);
-    todo_wine
     ok(hr == S_OK, "GetParameters failed, hr %#x\n", hr);
     if (hr != S_OK) return;
 




More information about the wine-cvs mailing list