Ziqing Hui : windowscodecs: Implement DdsEncoder_CreateNewFrame on top of DdsEncoder_Dds_CreateNewFrame.
Alexandre Julliard
julliard at winehq.org
Wed May 26 15:46:27 CDT 2021
Module: wine
Branch: master
Commit: 8a54803c4acfdf6cc64424ee21c887b7e885d57d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a54803c4acfdf6cc64424ee21c887b7e885d57d
Author: Ziqing Hui <zhui at codeweavers.com>
Date: Wed May 26 09:54:16 2021 +0800
windowscodecs: Implement DdsEncoder_CreateNewFrame on top of DdsEncoder_Dds_CreateNewFrame.
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 | 31 +------------------------------
dlls/windowscodecs/tests/ddsformat.c | 4 ----
2 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c
index 790fe72b8c9..6dd7a01ff42 100644
--- a/dlls/windowscodecs/ddsformat.c
+++ b/dlls/windowscodecs/ddsformat.c
@@ -2043,39 +2043,10 @@ static HRESULT WINAPI DdsEncoder_CreateNewFrame(IWICBitmapEncoder *iface,
IWICBitmapFrameEncode **frameEncode, IPropertyBag2 **encoderOptions)
{
DdsEncoder *This = impl_from_IWICBitmapEncoder(iface);
- DdsFrameEncode *result;
- HRESULT hr;
TRACE("(%p,%p,%p)\n", iface, frameEncode, encoderOptions);
- EnterCriticalSection(&This->lock);
-
- if (!This->stream)
- {
- hr = WINCODEC_ERR_WRONGSTATE;
- goto end;
- }
-
- result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result));
- if (!result)
- {
- hr = E_OUTOFMEMORY;
- goto end;
- }
-
- result->IWICBitmapFrameEncode_iface.lpVtbl = &DdsFrameEncode_Vtbl;
- result->ref = 1;
- result->parent = This;
- result->initialized = FALSE;
- result->frame_created = FALSE;
- IWICBitmapEncoder_AddRef(iface);
-
- *frameEncode = &result->IWICBitmapFrameEncode_iface;
- hr = S_OK;
-
-end:
- LeaveCriticalSection(&This->lock);
- return hr;
+ return IWICDdsEncoder_CreateNewFrame(&This->IWICDdsEncoder_iface, frameEncode, NULL, NULL, NULL);
}
static HRESULT WINAPI DdsEncoder_Commit(IWICBitmapEncoder *iface)
diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c
index 8900b7699f8..d530e65eb2d 100644
--- a/dlls/windowscodecs/tests/ddsformat.c
+++ b/dlls/windowscodecs/tests/ddsformat.c
@@ -1431,15 +1431,11 @@ static void test_dds_encoder_create_frame(void)
hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame0, NULL);
ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr);
hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL);
- todo_wine
ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr);
- if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1);
IWICBitmapFrameEncode_Release(frame0);
hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL);
- todo_wine
ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr);
- if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1);
release_encoder(encoder, dds_encoder, stream);
More information about the wine-cvs
mailing list