September 2017 - Wine-commits

Huw Davies : riched20: Remove an unused parameter.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 3cc1ef6bcae68fbc2bc3c46ce3b9f6cf36d176d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc1ef6bcae68fbc2bc3c46ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:01 2017 +0100 riched20: Remove an unused parameter. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/richole.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 53c41a9..aba3026 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -248,7 +248,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 41b3896..b4b6697 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -481,7 +481,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } if (run->nFlags & MERF_GRAPHICS) - ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); + ME_DrawOLE(c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo)); else { ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dbb21b2..98cee74 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5284,8 +5284,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) } } -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, - ME_Paragraph *para, BOOL selected) +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { IDataObject* ido; FORMATETC fmt;

1 0

Huw Davies : riched20: Correctly release the STGMEDIUM.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 9249f7c4e709dab009d2c87a0826c7ffb7f31b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9249f7c4e709dab009d2c87a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:02 2017 +0100 riched20: Correctly release the STGMEDIUM. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 98cee74..335b244 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5257,6 +5257,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } } + IDataObject_Release(ido); switch (stgm.tymed) { @@ -5264,19 +5265,17 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); pSize->cx = dibsect.dsBm.bmWidth; pSize->cy = dibsect.dsBm.bmHeight; - if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); pSize->cx = emh.rclBounds.right - emh.rclBounds.left; pSize->cy = emh.rclBounds.bottom - emh.rclBounds.top; - if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed); break; } - IDataObject_Release(ido); + ReleaseStgMedium(&stgm); if (c->editor->nZoomNumerator != 0) { pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); @@ -5294,6 +5293,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) HDC hMemDC; SIZE sz; BOOL has_size; + HBITMAP old_bm; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -5319,12 +5319,14 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) return; } } + IDataObject_Release(ido); + switch (stgm.tymed) { case TYMED_GDI: GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); hMemDC = CreateCompatibleDC(c->hDC); - SelectObject(hMemDC, stgm.u.hBitmap); + old_bm = SelectObject(hMemDC, stgm.u.hBitmap); if (has_size) { convert_sizel(c, &run->ole_obj->sizel, &sz); @@ -5347,8 +5349,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); } + SelectObject(hMemDC, old_bm); DeleteDC(hMemDC); - if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); @@ -5374,16 +5376,16 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) rc.bottom = y; PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); } - if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed); selected = FALSE; break; } + ReleaseStgMedium(&stgm); + if (selected && !c->editor->bHideSelection) PatBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, DSTINVERT); - IDataObject_Release(ido); } void ME_DeleteReObject(REOBJECT* reo)

1 0

Huw Davies : riched20: Don't special case the non-stretching case.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: e5345825558973f47c6300800e85e48ab2953261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5345825558973f47c6300800… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:03 2017 +0100 riched20: Don't special case the non-stretching case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 335b244..0a8a32a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5339,16 +5339,9 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - if (sz.cx == dibsect.dsBm.bmWidth && sz.cy == dibsect.dsBm.bmHeight) - { - BitBlt(c->hDC, x, y - sz.cy, - dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, - hMemDC, 0, 0, SRCCOPY); - } else { - StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, - hMemDC, 0, 0, dibsect.dsBm.bmWidth, - dibsect.dsBm.bmHeight, SRCCOPY); - } + StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, + hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); + SelectObject(hMemDC, old_bm); DeleteDC(hMemDC); break;

1 0

Huw Davies : riched20: Don't scale the picture size with dpi.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 7020f47e0d4e1f78457d007c7c8b2207e76dd81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7020f47e0d4e1f78457d007c7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:04 2017 +0100 riched20: Don't scale the picture size with dpi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 0a8a32a..120bcf8 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5294,6 +5294,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) SIZE sz; BOOL has_size; HBITMAP old_bm; + RECT rc; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -5331,8 +5332,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cx = MulDiv(dibsect.dsBm.bmWidth, c->dpi.cx, 96); - sz.cy = MulDiv(dibsect.dsBm.bmHeight, c->dpi.cy, 96); + sz.cx = dibsect.dsBm.bmWidth; + sz.cy = dibsect.dsBm.bmHeight; } if (c->editor->nZoomNumerator != 0) { @@ -5351,8 +5352,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cy = MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, c->dpi.cx, 96); - sz.cx = MulDiv(emh.rclBounds.right - emh.rclBounds.left, c->dpi.cy, 96); + sz.cx = emh.rclBounds.right - emh.rclBounds.left; + sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; } if (c->editor->nZoomNumerator != 0) { @@ -5360,15 +5361,11 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - { - RECT rc; - - rc.left = x; - rc.top = y - sz.cy; - rc.right = x + sz.cx; - rc.bottom = y; - PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); - } + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed);

1 0

Jacek Caban : mshtml: Fixed getElementsByTagName for comment elements.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: d3ed68aff928bfad16280cb8adbc4ae8a21a4ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ed68aff928bfad16280cb8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 14 14:15:13 2017 +0200 mshtml: Fixed getElementsByTagName for comment elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 5 +++++ dlls/mshtml/tests/dom.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 782a632..a87bdf0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3101,6 +3101,11 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); + if(!This->nselem) { + *pelColl = create_collection_from_htmlcol(This->node.doc, NULL); + return S_OK; + } + nsAString_InitDepend(&tag_str, v); nsres = nsIDOMHTMLElement_GetElementsByTagName(This->nselem, &tag_str, &nscol); nsAString_Finish(&tag_str); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index aca64c1..d7cfedd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9468,6 +9468,8 @@ static void test_create_elems(IHTMLDocument2 *doc) test_comment_text((IUnknown*)node2, ""); IHTMLDOMNode_Release(node2); + test_elem_getelembytag((IUnknown*)comment, ET_COMMENT, 0, NULL); + IHTMLDOMNode_Release(comment); }

1 0

Andrey Gusev : unicows: Fix CreateDialogParamW spec file entry.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 218286bb87f8a38a48b4717247e578e02f6a051f URL: http://source.winehq.org/git/wine.git/?a=commit;h=218286bb87f8a38a48b471724… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 14 15:17:42 2017 +0300 unicows: Fix CreateDialogParamW spec file entry. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/unicows/unicows.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/unicows/unicows.spec b/dlls/unicows/unicows.spec index c008ea7..4867eb8 100644 --- a/dlls/unicows/unicows.spec +++ b/dlls/unicows/unicows.spec @@ -44,7 +44,7 @@ @ stdcall CreateColorSpaceW(ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) @ stdcall CreateDialogIndirectParamW(long ptr long ptr long) -@ stdcall CreateDialogParamW(long ptr long ptr long) +@ stdcall CreateDialogParamW(long wstr long ptr long) @ stdcall CreateDirectoryExW(wstr wstr ptr) @ stdcall CreateDirectoryW(wstr ptr) @ stdcall CreateEnhMetaFileW(long wstr ptr wstr)

1 0

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapEncoder:: SetPalette for a not initialized case in BMP encoder.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 02870de54150ad2e01d938aa495c8631ce0334bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=02870de54150ad2e01d938aa4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 13 15:12:38 2017 -0500 windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in BMP encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 3dce8bb..c09b542 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -465,10 +465,12 @@ static HRESULT WINAPI BmpEncoder_SetColorContexts(IWICBitmapEncoder *iface, return E_NOTIMPL; } -static HRESULT WINAPI BmpEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +static HRESULT WINAPI BmpEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *palette) { - TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); + + TRACE("(%p,%p)\n", iface, palette); + return This->stream ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; } static HRESULT WINAPI BmpEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail)

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapFrameEncode:: SetPalette in BMP encoder.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: f515878cad07f3e5f41411cd75eff5326e644fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f515878cad07f3e5f41411cd7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 13 15:12:39 2017 -0500 windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in BMP encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index c09b542..48a8e27 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -67,6 +67,8 @@ typedef struct BmpFrameEncode { double xres, yres; UINT lineswritten; UINT stride; + WICColor palette[256]; + UINT colors; BOOL committed; } BmpFrameEncode; @@ -197,10 +199,18 @@ static HRESULT WINAPI BmpFrameEncode_SetColorContexts(IWICBitmapFrameEncode *ifa } static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + + if (!This->initialized) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -520,6 +530,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->xres = 0.0; encode->yres = 0.0; encode->lineswritten = 0; + encode->colors = 0; encode->committed = FALSE; *ppIFrameEncode = &encode->IWICBitmapFrameEncode_iface;

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: CopyPalette in TIFF decoder.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 730f2bd132cd9b71a6635022f48f9836f0858610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730f2bd132cd9b71a6635022f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 13 15:12:40 2017 -0500 windowscodecs: Implement IWICBitmapDecoder::CopyPalette in TIFF decoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b613409..d14a4b0 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -683,10 +683,10 @@ static HRESULT WINAPI TiffDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, } static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, palette); + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI TiffDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapFrameEncode:: SetPalette in the TIFF encoder.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: e598538930f9306c424c3131d7531357554359c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e598538930f9306c424c3131d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 13 15:12:41 2017 -0500 windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in the TIFF encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index d14a4b0..0d6618b 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1441,6 +1441,8 @@ typedef struct TiffFrameEncode { UINT width, height; double xres, yres; UINT lines_written; + WICColor palette[256]; + UINT colors; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1602,10 +1604,24 @@ static HRESULT WINAPI TiffFrameEncode_SetColorContexts(IWICBitmapFrameEncode *if } static HRESULT WINAPI TiffFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + + EnterCriticalSection(&This->parent->lock); + + if (This->initialized) + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + else + hr = WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->parent->lock); + return hr; } static HRESULT WINAPI TiffFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -1974,6 +1990,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->xres = 0.0; result->yres = 0.0; result->lines_written = 0; + result->colors = 0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0