October 2009 - Wine-Commits

Vincent Povirk : windowscodecs: Implement SetSize for the PNG encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: e324b8ef4c4f962dddb8e3792d8043aeb9d4c9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e324b8ef4c4f962dddb8e3792… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 16:39:12 2009 -0500 windowscodecs: Implement SetSize for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index ab35d89..af074e8 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -699,6 +699,7 @@ typedef struct PngEncoder { BOOL frame_initialized; const struct png_pixelformat *format; BOOL info_written; + UINT width, height; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -757,8 +758,15 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); - return E_NOTIMPL; + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); + + if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + + This->width = uiWidth; + This->height = uiHeight; + + return S_OK; } static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, @@ -1089,6 +1097,8 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = FALSE; This->format = NULL; This->info_written = FALSE; + This->width = 0; + This->height = 0; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement Initialize for the PNG frame encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 6afcb2eb33a32a14d7a556038cb46616a2ed2ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afcb2eb33a32a14d7a556038… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 15:06:11 2009 -0500 windowscodecs: Implement Initialize for the PNG frame encoder. --- dlls/windowscodecs/pngformat.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 61efb8b..cfae867 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -673,6 +673,7 @@ typedef struct PngEncoder { png_structp png_ptr; png_infop info_ptr; UINT frame_count; + BOOL frame_initialized; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -718,8 +719,14 @@ static ULONG WINAPI PngFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); - return E_NOTIMPL; + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + + if (This->frame_initialized) return WINCODEC_ERR_WRONGSTATE; + + This->frame_initialized = TRUE; + + return S_OK; } static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, @@ -1038,6 +1045,7 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->info_ptr = NULL; This->stream = NULL; This->frame_count = 0; + This->frame_initialized = FALSE; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement SetPixelFormat for the PNG encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: a2214f04d4785bb51e891206ff3000f58ab7ebaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2214f04d4785bb51e891206f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 16:28:30 2009 -0500 windowscodecs: Implement SetPixelFormat for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 47 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index cfae867..ab35d89 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -665,6 +665,29 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +struct png_pixelformat { + const WICPixelFormatGUID *guid; + UINT bpp; + int bit_depth; + int color_type; + BOOL remove_filler; + BOOL swap_rgb; +}; + +static const struct png_pixelformat formats[] = { + {&GUID_WICPixelFormat24bppBGR, 24, 8, PNG_COLOR_TYPE_RGB, 0, 1}, + {&GUID_WICPixelFormatBlackWhite, 1, 1, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat2bppGray, 2, 2, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat4bppGray, 4, 4, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat8bppGray, 8, 8, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat16bppGray, 16, 16, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1}, + {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, + {&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0}, + {&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0}, + {NULL}, +}; + typedef struct PngEncoder { const IWICBitmapEncoderVtbl *lpVtbl; const IWICBitmapFrameEncodeVtbl *lpFrameVtbl; @@ -674,6 +697,8 @@ typedef struct PngEncoder { png_infop info_ptr; UINT frame_count; BOOL frame_initialized; + const struct png_pixelformat *format; + BOOL info_written; } PngEncoder; static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) @@ -746,8 +771,24 @@ static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - TRACE("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + PngEncoder *This = encoder_from_frame(iface); + int i; + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + + for (i=0; formats[i].guid; i++) + { + if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!formats[i].guid) i = 0; + + This->format = &formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI PngFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -1046,6 +1087,8 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->stream = NULL; This->frame_count = 0; This->frame_initialized = FALSE; + This->format = NULL; + This->info_written = FALSE; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement CreateNewFrame for the PNG encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 049a2e0c0c37925b97075b3efa8895969e40083b URL: http://source.winehq.org/git/wine.git/?a=commit;h=049a2e0c0c37925b97075b3ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 14:49:17 2009 -0500 windowscodecs: Implement CreateNewFrame for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 158 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 7a2f4ba..61efb8b 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -667,12 +667,147 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) typedef struct PngEncoder { const IWICBitmapEncoderVtbl *lpVtbl; + const IWICBitmapFrameEncodeVtbl *lpFrameVtbl; LONG ref; IStream *stream; png_structp png_ptr; png_infop info_ptr; + UINT frame_count; } PngEncoder; +static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, PngEncoder, lpFrameVtbl); +} + +static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, + void **ppv) +{ + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) + { + *ppv = &This->lpFrameVtbl; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngFrameEncode_AddRef(IWICBitmapFrameEncode *iface) +{ + PngEncoder *This = encoder_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI PngFrameEncode_Release(IWICBitmapFrameEncode *iface) +{ + PngEncoder *This = encoder_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, + IPropertyBag2 *pIEncoderOptions) +{ + FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, + UINT uiWidth, UINT uiHeight) +{ + FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + TRACE("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, + UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) +{ + FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIBitmapSource, WICRect *prc) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapFrameEncodeVtbl PngEncoder_FrameVtbl = { + PngFrameEncode_QueryInterface, + PngFrameEncode_AddRef, + PngFrameEncode_Release, + PngFrameEncode_Initialize, + PngFrameEncode_SetSize, + PngFrameEncode_SetResolution, + PngFrameEncode_SetPixelFormat, + PngFrameEncode_SetColorContexts, + PngFrameEncode_SetPalette, + PngFrameEncode_SetThumbnail, + PngFrameEncode_WritePixels, + PngFrameEncode_WriteSource, + PngFrameEncode_Commit, + PngFrameEncode_GetMetadataQueryWriter +}; + static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -826,8 +961,25 @@ static HRESULT WINAPI PngEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); - return E_NOTIMPL; + PngEncoder *This = (PngEncoder*)iface; + HRESULT hr; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); + + if (This->frame_count != 0) + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + if (!This->stream) + return WINCODEC_ERR_NOTINITIALIZED; + + hr = CreatePropertyBag2(ppIEncoderOptions); + if (FAILED(hr)) return hr; + + This->frame_count = 1; + + IWICBitmapEncoder_AddRef(iface); + *ppIFrameEncode = (IWICBitmapFrameEncode*)&This->lpFrameVtbl; + + return S_OK; } static HRESULT WINAPI PngEncoder_Commit(IWICBitmapEncoder *iface) @@ -880,10 +1032,12 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) if (!This) return E_OUTOFMEMORY; This->lpVtbl = &PngEncoder_Vtbl; + This->lpFrameVtbl = &PngEncoder_FrameVtbl; This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL; This->stream = NULL; + This->frame_count = 0; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Add test for BMP encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 7833b68aca592f25510ca5b354e7edbc2fb83ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7833b68aca592f25510ca5b35… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 13:10:41 2009 -0500 windowscodecs: Add test for BMP encoder. --- dlls/windowscodecs/tests/converter.c | 101 +++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 06067e3..680c350 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -199,8 +199,8 @@ static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSour hr = IWICBitmapSource_GetResolution(source, &xres, &yres); ok(SUCCEEDED(hr), "GetResolution(%s) failed, hr=%x\n", name, hr); - ok(fabs(xres - expect->xres) < 0.01, "expecting %0.2f, got %0.2f (%s)\n", expect->xres, xres, name); - ok(fabs(yres - expect->yres) < 0.01, "expecting %0.2f, got %0.2f (%s)\n", expect->yres, yres, name); + ok(fabs(xres - expect->xres) < 0.02, "expecting %0.2f, got %0.2f (%s)\n", expect->xres, xres, name); + ok(fabs(yres - expect->yres) < 0.02, "expecting %0.2f, got %0.2f (%s)\n", expect->yres, yres, name); hr = IWICBitmapSource_GetPixelFormat(source, &dst_pixelformat); ok(SUCCEEDED(hr), "GetPixelFormat(%s) failed, hr=%x\n", name, hr); @@ -318,6 +318,100 @@ static void test_default_converter(void) DeleteTestBitmap(src_bitmap); } +static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encoder, + const struct bitmap_data *dst, const CLSID *clsid_decoder, const char *name) +{ + HRESULT hr; + IWICBitmapEncoder *encoder; + IWICBitmapSource *src_bitmap; + HGLOBAL hglobal; + IStream *stream; + IWICBitmapFrameEncode *frameencode; + IPropertyBag2 *options=NULL; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + WICPixelFormatGUID pixelformat; + + CreateTestBitmap(src, &src_bitmap); + + hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void**)&encoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hglobal = GlobalAlloc(GMEM_MOVEABLE, 0); + ok(hglobal != NULL, "GlobalAlloc failed\n"); + if (hglobal) + { + hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + } + + if (hglobal && SUCCEEDED(hr)) + { + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, &options); + ok(SUCCEEDED(hr), "CreateFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_Initialize(frameencode, options); + ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); + + memcpy(&pixelformat, src->format, sizeof(GUID)); + hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); + ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, src->format), "SetPixelFormat changed the format\n"); + + hr = IWICBitmapFrameEncode_SetSize(frameencode, src->width, src->height); + ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); + + hr = IWICBitmapFrameEncode_WriteSource(frameencode, src_bitmap, NULL); + ok(SUCCEEDED(hr), "WriteSource failed, hr=%x\n", hr); + + hr = IWICBitmapFrameEncode_Commit(frameencode); + ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); + + hr = IWICBitmapEncoder_Commit(encoder); + ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); + + IWICBitmapFrameEncode_Release(frameencode); + IPropertyBag2_Release(options); + } + + if (SUCCEEDED(hr)) + { + hr = CoCreateInstance(clsid_decoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); + ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + compare_bitmap_data(dst, (IWICBitmapSource*)framedecode, name); + + IWICBitmapFrameDecode_Release(framedecode); + } + + IWICBitmapDecoder_Release(decoder); + } + + IStream_Release(stream); + } + } + + DeleteTestBitmap(src_bitmap); +} + START_TEST(converter) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -328,5 +422,8 @@ START_TEST(converter) test_invalid_conversion(); test_default_converter(); + test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, + &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR"); + CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Add stub PNG encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 60d1be132640673fdc7085a4bb5dc387ae1d3979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d1be132640673fdc7085a4b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 13:54:39 2009 -0500 windowscodecs: Add stub PNG encoder. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/pngformat.c | 170 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 6 + dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 178 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index af3ce51..d8d2105 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -45,6 +45,7 @@ static classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ImagingFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, + {&CLSID_WICPngEncoder, PngEncoder_CreateInstance}, {&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance}, {&CLSID_WICGifDecoder, GifDecoder_CreateInstance}, {&CLSID_WICIcoDecoder, IcoDecoder_CreateInstance}, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index a20f6cd..1721281 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -659,6 +659,170 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +typedef struct PngEncoder { + const IWICBitmapEncoderVtbl *lpVtbl; + LONG ref; +} PngEncoder; + +static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, + void **ppv) +{ + PngEncoder *This = (PngEncoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapEncoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngEncoder_AddRef(IWICBitmapEncoder *iface) +{ + PngEncoder *This = (PngEncoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PngEncoder_Release(IWICBitmapEncoder *iface) +{ + PngEncoder *This = (PngEncoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, + IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) +{ + FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, + IWICBitmapEncoderInfo **ppIEncoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +{ + TRACE("(%p,%p)\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) +{ + TRACE("(%p,%p)\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) +{ + TRACE("(%p,%p)\n", iface, pIPreview); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, + IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) +{ + FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_Commit(IWICBitmapEncoder *iface) +{ + TRACE("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapEncoderVtbl PngEncoder_Vtbl = { + PngEncoder_QueryInterface, + PngEncoder_AddRef, + PngEncoder_Release, + PngEncoder_Initialize, + PngEncoder_GetContainerFormat, + PngEncoder_GetEncoderInfo, + PngEncoder_SetColorContexts, + PngEncoder_SetPalette, + PngEncoder_SetThumbnail, + PngEncoder_SetPreview, + PngEncoder_CreateNewFrame, + PngEncoder_Commit, + PngEncoder_GetMetadataQueryWriter +}; + +HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + PngEncoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + if (!libpng_handle && !load_libpng()) + { + ERR("Failed writing PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngEncoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &PngEncoder_Vtbl; + This->ref = 1; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + #else /* !HAVE_PNG_H */ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) @@ -667,4 +831,10 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return E_FAIL; } +HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to save PNG picture, but PNG supported not compiled in.\n"); + return E_FAIL; +} + #endif diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 6544372..c87aa4b 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -741,6 +741,12 @@ static struct regsvr_coclass const coclass_list[] = { "windowscodecs.dll", "Apartment" }, + { &CLSID_WICPngEncoder, + "WIC PNG Encoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { &CLSID_WICBmpEncoder, "WIC BMP Encoder", NULL, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index de719d2..632f822 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -23,6 +23,7 @@ extern HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID riid, extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv);

1 0

Vincent Povirk : windowscodecs: Implement Initialize for the PNG encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: c79b70507ab4a669931ae4ddeb2712ca054c668c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79b70507ab4a669931ae4dde… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 14:13:12 2009 -0500 windowscodecs: Implement Initialize for the PNG encoder. --- dlls/windowscodecs/pngformat.c | 72 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1721281..7a2f4ba 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -45,7 +45,9 @@ static void *libpng_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(png_create_read_struct); MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_create_write_struct); MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_destroy_write_struct); MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); @@ -61,6 +63,7 @@ MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_read_fn); MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS_to_alpha); +MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); @@ -77,7 +80,9 @@ static void *load_libpng(void) } LOAD_FUNCPTR(png_create_read_struct); LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_create_write_struct); LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_destroy_write_struct); LOAD_FUNCPTR(png_error); LOAD_FUNCPTR(png_get_bit_depth); LOAD_FUNCPTR(png_get_color_type); @@ -93,6 +98,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_read_fn); LOAD_FUNCPTR(png_set_strip_16); LOAD_FUNCPTR(png_set_tRNS_to_alpha); + LOAD_FUNCPTR(png_set_write_fn); LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); @@ -662,6 +668,9 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) typedef struct PngEncoder { const IWICBitmapEncoderVtbl *lpVtbl; LONG ref; + IStream *stream; + png_structp png_ptr; + png_infop info_ptr; } PngEncoder; static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, @@ -706,17 +715,73 @@ static ULONG WINAPI PngEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { + if (This->png_ptr) + ppng_destroy_write_struct(&This->png_ptr, &This->info_ptr); + if (This->stream) + IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } return ref; } +static void user_write_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + PngEncoder *This = ppng_get_io_ptr(png_ptr); + HRESULT hr; + ULONG byteswritten; + + hr = IStream_Write(This->stream, data, length, &byteswritten); + if (FAILED(hr) || byteswritten != length) + { + ppng_error(png_ptr, "failed writing data"); + } +} + +static void user_flush(png_structp png_ptr) +{ +} + static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); - return E_NOTIMPL; + PngEncoder *This = (PngEncoder*)iface; + + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); + + if (This->png_ptr) + return WINCODEC_ERR_WRONGSTATE; + + /* initialize libpng */ + This->png_ptr = ppng_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!This->png_ptr) + return E_FAIL; + + This->info_ptr = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_write_struct(&This->png_ptr, (png_infopp)NULL); + This->png_ptr = NULL; + return E_FAIL; + } + + IStream_AddRef(pIStream); + This->stream = pIStream; + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + ppng_destroy_write_struct(&This->png_ptr, &This->info_ptr); + This->png_ptr = NULL; + IStream_Release(This->stream); + This->stream = NULL; + return E_FAIL; + } + + /* set up custom i/o handling */ + ppng_set_write_fn(This->png_ptr, This, user_write_data, user_flush); + + return S_OK; } static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, @@ -816,6 +881,9 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lpVtbl = &PngEncoder_Vtbl; This->ref = 1; + This->png_ptr = NULL; + This->info_ptr = NULL; + This->stream = NULL; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Support more formats in the BMP encoder.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 64146fa97e982ca90c724ed675c6b462c8e29eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=64146fa97e982ca90c724ed67… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 13:26:25 2009 -0500 windowscodecs: Support more formats in the BMP encoder. --- dlls/windowscodecs/bmpencode.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index abe9977..b79a19b 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -47,6 +47,13 @@ struct bmp_pixelformat { static const struct bmp_pixelformat formats[] = { {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, +#if 0 + /* Windows doesn't seem to support this one. */ + {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, +#endif {NULL} }; @@ -338,6 +345,19 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5ClrUsed = 0; bih.bV5ClrImportant = 0; + if (This->format->compression == BI_BITFIELDS) + { + if (This->format->alphamask) + bih.bV5Size = info_size = sizeof(BITMAPV4HEADER); + else + info_size = sizeof(BITMAPINFOHEADER)+12; + bih.bV5RedMask = This->format->redmask; + bih.bV5GreenMask = This->format->greenmask; + bih.bV5BlueMask = This->format->bluemask; + bih.bV5AlphaMask = This->format->alphamask; + bih.bV5AlphaMask = LCS_DEVICE_RGB; + } + bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size;

1 0

Vincent Povirk : windowscodecs: Implement GetResolution for the PNG decoder .
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 48cf4536e551aa3c20c68ee2aec7c83d55dc4cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48cf4536e551aa3c20c68ee2a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 23 17:29:42 2009 -0500 windowscodecs: Implement GetResolution for the PNG decoder. --- dlls/windowscodecs/pngformat.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index be0bd6e..a20f6cd 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -52,6 +52,7 @@ MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); @@ -83,6 +84,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); @@ -510,8 +512,26 @@ static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *ifa static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + PngDecoder *This = impl_from_frame(iface); + png_uint_32 ret, xres, yres; + int unit_type; + + ret = ppng_get_pHYs(This->png_ptr, This->info_ptr, &xres, &yres, &unit_type); + + if (ret && unit_type == PNG_RESOLUTION_METER) + { + *pDpiX = xres * 0.0254; + *pDpiY = yres * 0.0254; + } + else + { + WARN("no pHYs block present\n"); + *pDpiX = *pDpiY = 96.0; + } + + TRACE("(%p)->(%0.2f,%0.2f)\n", iface, *pDpiX, *pDpiY); + + return S_OK; } static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface,

1 0

Henri Verbeet : d3d9: Add tests for D3DSBT_PIXELSTATE stateblocks.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: de45a38003c2a499c49300bfea4eb9dcb32b9228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de45a38003c2a499c49300bfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 9 09:58:51 2009 +0200 d3d9: Add tests for D3DSBT_PIXELSTATE stateblocks. --- dlls/d3d9/tests/stateblock.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index c02c707..9d70b93 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -123,6 +123,7 @@ struct state_test const void *test_data_in; const void *test_data_out_all; const void *test_data_out_vertex; + const void *test_data_out_pixel; /* Test resource management handlers */ HRESULT (*setup_handler) (struct state_test* test); @@ -158,6 +159,7 @@ enum stateblock_data SB_DATA_TEST_IN, SB_DATA_TEST_ALL, SB_DATA_TEST_VERTEX, + SB_DATA_TEST_PIXEL, }; struct event @@ -186,6 +188,9 @@ static const void *get_event_data(const struct state_test *test, enum stateblock case SB_DATA_TEST_VERTEX: return test->test_data_out_vertex; + case SB_DATA_TEST_PIXEL: + return test->test_data_out_pixel; + default: return NULL; } @@ -319,6 +324,16 @@ static int create_stateblock_vertex(IDirect3DDevice9 *device, struct event_data return EVENT_OK; } +static int create_stateblock_pixel(IDirect3DDevice9 *device, struct event_data *event_data) +{ + HRESULT hr; + + hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_PIXELSTATE, &event_data->stateblock); + ok(SUCCEEDED(hr), "CreateStateBlock returned %#x.\n", hr); + if (FAILED(hr)) return EVENT_ERROR; + return EVENT_OK; +} + static int begin_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { HRESULT hret; @@ -439,6 +454,20 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * {apply_stateblock, SB_DATA_TEST_VERTEX, SB_DATA_NONE}, }; + struct event create_stateblock_capture_apply_pixel_events[] = + { + {create_stateblock_pixel, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {capture_stateblock, SB_DATA_TEST_ALL, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST_PIXEL, SB_DATA_NONE}, + }; + + struct event create_stateblock_apply_pixel_events[] = + { + {NULL, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {create_stateblock_pixel, SB_DATA_TEST_ALL, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST_PIXEL, SB_DATA_NONE}, + }; + struct event rendertarget_switch_events[] = { {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, @@ -490,6 +519,12 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * trace("Running create stateblock apply vertex state tests\n"); execute_test_chain(device, test, ntests, create_stateblock_apply_vertex_events, 3, &arg); + trace("Running create stateblock capture/apply pixel state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_capture_apply_pixel_events, 3, &arg); + + trace("Running create stateblock apply pixel state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_apply_pixel_events, 3, &arg); + trace("Running rendertarget switch state tests\n"); execute_test_chain(device, test, ntests, rendertarget_switch_events, 3, &arg); @@ -630,10 +665,12 @@ static HRESULT shader_constant_setup_handler(struct state_test *test) if (test_arg->pshader) { test->test_data_out_vertex = &shader_constant_default_data; + test->test_data_out_pixel = &shader_constant_test_data; } else { test->test_data_out_vertex = &shader_constant_test_data; + test->test_data_out_pixel = &shader_constant_default_data; } test->default_data = &shader_constant_default_data; test->initial_data = &shader_constant_default_data; @@ -851,6 +888,7 @@ static HRESULT light_setup_handler(struct state_test *test) test->test_data_in = &light_test_data_in; test->test_data_out_all = &light_test_data_out; test->test_data_out_vertex = &light_test_data_out; + test->test_data_out_pixel = &light_default_data; test->default_data = &light_default_data; test->initial_data = &light_initial_data; @@ -1100,6 +1138,7 @@ static HRESULT transform_setup_handler(struct state_test *test) test->test_data_in = &transform_test_data; test->test_data_out_all = &transform_test_data; test->test_data_out_vertex = &transform_default_data; + test->test_data_out_pixel = &transform_default_data; test->default_data = &transform_default_data; test->initial_data = &transform_default_data; @@ -1250,6 +1289,7 @@ struct render_state_context struct render_state_data default_data_buffer; struct render_state_data test_data_all_buffer; struct render_state_data test_data_vertex_buffer; + struct render_state_data test_data_pixel_buffer; struct render_state_data poison_data_buffer; }; @@ -1571,6 +1611,70 @@ static HRESULT render_state_setup_handler(struct state_test *test) D3DRS_VERTEXBLEND, }; + static const DWORD states_pixel[] = + { + D3DRS_ALPHABLENDENABLE, + D3DRS_ALPHAFUNC, + D3DRS_ALPHAREF, + D3DRS_ALPHATESTENABLE, + D3DRS_ANTIALIASEDLINEENABLE, + D3DRS_BLENDFACTOR, + D3DRS_BLENDOP, + D3DRS_BLENDOPALPHA, + D3DRS_CCW_STENCILFAIL, + D3DRS_CCW_STENCILPASS, + D3DRS_CCW_STENCILZFAIL, + D3DRS_COLORWRITEENABLE, + D3DRS_COLORWRITEENABLE1, + D3DRS_COLORWRITEENABLE2, + D3DRS_COLORWRITEENABLE3, + D3DRS_DEPTHBIAS, + D3DRS_DESTBLEND, + D3DRS_DESTBLENDALPHA, + D3DRS_DITHERENABLE, + D3DRS_FILLMODE, + D3DRS_FOGDENSITY, + D3DRS_FOGEND, + D3DRS_FOGSTART, + D3DRS_LASTPIXEL, + D3DRS_SCISSORTESTENABLE, + D3DRS_SEPARATEALPHABLENDENABLE, + D3DRS_SHADEMODE, + D3DRS_SLOPESCALEDEPTHBIAS, + D3DRS_SRCBLEND, + D3DRS_SRCBLENDALPHA, + D3DRS_SRGBWRITEENABLE, + D3DRS_STENCILENABLE, + D3DRS_STENCILFAIL, + D3DRS_STENCILFUNC, + D3DRS_STENCILMASK, + D3DRS_STENCILPASS, + D3DRS_STENCILREF, + D3DRS_STENCILWRITEMASK, + D3DRS_STENCILZFAIL, + D3DRS_TEXTUREFACTOR, + D3DRS_TWOSIDEDSTENCILMODE, + D3DRS_WRAP0, + D3DRS_WRAP1, + D3DRS_WRAP10, + D3DRS_WRAP11, + D3DRS_WRAP12, + D3DRS_WRAP13, + D3DRS_WRAP14, + D3DRS_WRAP15, + D3DRS_WRAP2, + D3DRS_WRAP3, + D3DRS_WRAP4, + D3DRS_WRAP5, + D3DRS_WRAP6, + D3DRS_WRAP7, + D3DRS_WRAP8, + D3DRS_WRAP9, + D3DRS_ZENABLE, + D3DRS_ZFUNC, + D3DRS_ZWRITEENABLE, + }; + const struct render_state_arg *rsarg = test->test_arg; unsigned int i, j; @@ -1583,6 +1687,7 @@ static HRESULT render_state_setup_handler(struct state_test *test) test->test_data_in = &ctx->test_data_all_buffer; test->test_data_out_all = &ctx->test_data_all_buffer; test->test_data_out_vertex = &ctx->test_data_vertex_buffer; + test->test_data_out_pixel = &ctx->test_data_pixel_buffer; render_state_default_data_init(rsarg, &ctx->default_data_buffer); render_state_test_data_init(&ctx->test_data_all_buffer); @@ -1599,6 +1704,16 @@ static HRESULT render_state_setup_handler(struct state_test *test) break; } } + + ctx->test_data_pixel_buffer.states[i] = ctx->default_data_buffer.states[i]; + for (j = 0; j < sizeof(states_pixel) / sizeof(*states_pixel); ++j) + { + if (render_state_indices[i] == states_pixel[j]) + { + ctx->test_data_pixel_buffer.states[i] = ctx->test_data_all_buffer.states[i]; + break; + } + } } return D3D_OK;

1 0