September 2017 - Wine-Commits

Alexandre Julliard : kernel32/tests: Avoid some delays in the process test.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 47ddc57571f549128773888cc1c8cb3d7304b920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ddc57571f549128773888cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 17:31:55 2017 +0200 kernel32/tests: Avoid some delays in the process test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c480a27..7e8ef16 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1382,7 +1382,7 @@ static void test_SuspendFlag(void) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); - Sleep(8000); + Sleep(1000); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); ok(ResumeThread(info.hThread) == 1, "Resuming thread\n"); @@ -1652,6 +1652,9 @@ static void test_Console(void) ok(ReadFile(hParentIn, buffer, sizeof(buffer), &w, NULL), "Reading from child\n"); ok(strcmp(buffer, msg) == 0, "Should have received '%s'\n", msg); + /* the child may also send the final "n tests executed" string, so read it to avoid a deadlock */ + ReadFile(hParentIn, buffer, sizeof(buffer), &w, NULL); + /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */

1 0

Nikolay Sivov : dwrite/tests: Added a helper to initialize test text source.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 39dbf09b3fe28ac8aaf31bd35ea569ca6478991e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dbf09b3fe28ac8aaf31bd35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 11:40:10 2017 +0300 dwrite/tests: Added a helper to initialize test text source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 2e2a2e9..c5a0b09 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -367,9 +367,18 @@ struct testanalysissource { IDWriteTextAnalysisSource IDWriteTextAnalysisSource_iface; const WCHAR *text; + UINT32 text_length; DWRITE_READING_DIRECTION direction; }; +static void init_textsource(struct testanalysissource *source, const WCHAR *text, + DWRITE_READING_DIRECTION direction) +{ + source->text = text; + source->text_length = lstrlenW(text); + source->direction = direction; +}; + static inline struct testanalysissource *impl_from_IDWriteTextAnalysisSource(IDWriteTextAnalysisSource *iface) { return CONTAINING_RECORD(iface, struct testanalysissource, IDWriteTextAnalysisSource_iface); @@ -380,7 +389,7 @@ static HRESULT WINAPI analysissource_GetTextAtPosition(IDWriteTextAnalysisSource { struct testanalysissource *source = impl_from_IDWriteTextAnalysisSource(iface); - if (position >= lstrlenW(source->text)) + if (position >= source->text_length) { *text = NULL; *text_len = 0; @@ -388,7 +397,7 @@ static HRESULT WINAPI analysissource_GetTextAtPosition(IDWriteTextAnalysisSource else { *text = source->text + position; - *text_len = lstrlenW(source->text) - position; + *text_len = source->text_length - position; } return S_OK; @@ -998,7 +1007,7 @@ static void get_script_analysis(const WCHAR *str, DWRITE_SCRIPT_ANALYSIS *sa) IDWriteTextAnalyzer *analyzer; HRESULT hr; - analysissource.text = str; + init_textsource(&analysissource, str, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1020,7 +1029,7 @@ static void test_AnalyzeScript(void) while (*ptr->string) { - analysissource.text = ptr->string; + init_textsource(&analysissource, ptr->string, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); init_expected_sa(expected_seq, ptr); hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, @@ -1122,7 +1131,7 @@ static void test_AnalyzeLineBreakpoints(void) hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - analysissource.text = emptyW; + init_textsource(&analysissource, emptyW, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, 0, &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1131,9 +1140,9 @@ static void test_AnalyzeLineBreakpoints(void) { UINT32 len; - analysissource.text = ptr->text; - len = lstrlenW(ptr->text); + init_textsource(&analysissource, ptr->text, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + len = lstrlenW(ptr->text); if (len > BREAKPOINT_COUNT) { ok(0, "test %u: increase BREAKPOINT_COUNT to at least %u\n", i, len); i++; @@ -2414,10 +2423,9 @@ static void test_AnalyzeBidi(void) { UINT32 len; - analysissource.text = ptr->text; - len = lstrlenW(ptr->text); - analysissource.direction = ptr->direction; + init_textsource(&analysissource, ptr->text, ptr->direction); + len = lstrlenW(ptr->text); if (len > BIDI_LEVELS_COUNT) { ok(0, "test %u: increase BIDI_LEVELS_COUNT to at least %u\n", i, len); i++;

1 0

Andrey Gusev : unicows: Fix CreateDialogParamW spec file entry.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

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

Huw Davies : riched20: Correctly release the STGMEDIUM.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

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

Zebediah Figura : msi/tests: Add external UI tests for top-level actions.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 042de13cff79e97eda9a3d95ea7d5ed84f11c6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042de13cff79e97eda9a3d95e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:57 2017 -0500 msi/tests: Add external UI tests for top-level actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=042de13cff79e97eda9a3…

1 0

Huw Davies : riched20: Don't special case the non-stretching case.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

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

Zebediah Figura : msi/tests: Some cleanup for external UI tests.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 13cb6a5b781cddd78ead55666a74733d08305dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13cb6a5b781cddd78ead55666… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:56 2017 -0500 msi/tests: Some cleanup for external UI tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c00ed61..c11da0f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9301,7 +9301,7 @@ static void ok_sequence_(const struct externalui_message *expected, const char * { if (expected->message == actual->message) { - if (expected->field_count != actual->field_count) + if (expected->field_count < actual->field_count) { todo_wine_if (todo) ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n", @@ -9323,6 +9323,10 @@ static void ok_sequence_(const struct externalui_message *expected, const char * expected++; actual++; } + else if (expected->optional) + { + expected++; + } else { todo_wine_if (todo) @@ -9357,6 +9361,26 @@ done: #define ok_sequence(exp, contx, todo) \ ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) +/* don't use PROGRESS, which is timing-dependent, + * or SHOWDIALOG, which due to a bug causes a hang on XP */ +static const INSTALLLOGMODE MSITEST_INSTALLLOGMODE = + INSTALLLOGMODE_FATALEXIT | + INSTALLLOGMODE_ERROR | + INSTALLLOGMODE_WARNING | + INSTALLLOGMODE_USER | + INSTALLLOGMODE_INFO | + INSTALLLOGMODE_FILESINUSE | + INSTALLLOGMODE_RESOLVESOURCE | + INSTALLLOGMODE_OUTOFDISKSPACE | + INSTALLLOGMODE_ACTIONSTART | + INSTALLLOGMODE_ACTIONDATA | + INSTALLLOGMODE_COMMONDATA | + INSTALLLOGMODE_INITIALIZE | + INSTALLLOGMODE_TERMINATE | + INSTALLLOGMODE_RMFILESINUSE | + INSTALLLOGMODE_INSTALLSTART | + INSTALLLOGMODE_INSTALLEND; + static const struct externalui_message empty_sequence[] = { {0} }; @@ -9534,9 +9558,8 @@ static void test_externalui_message(void) MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - /* processing SHOWDIALOG with a record handler causes a crash on XP */ MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, &retval); - r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); + r = MsiSetExternalUIRecord(externalui_message_callback, MSITEST_INSTALLLOGMODE, &retval, &prev); flush_sequence(); @@ -9759,9 +9782,8 @@ static void test_controlevent(void) MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - /* processing SHOWDIALOG with a record handler causes a crash on XP */ MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, NULL); - r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, NULL, &prev); + r = MsiSetExternalUIRecord(externalui_message_callback, MSITEST_INSTALLLOGMODE, NULL, &prev); flush_sequence();

1 0

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapEncoder:: SetPalette for a not initialized case in TIFF encoder.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 52672282b8957d25b4c05ac691ee826975e4f4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=52672282b8957d25b4c05ac69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 13 15:12:42 2017 -0500 windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in TIFF encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 0d6618b..a0eec53 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1903,10 +1903,20 @@ static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface, return E_NOTIMPL; } -static HRESULT WINAPI TiffEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +static HRESULT WINAPI TiffEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *palette) { - TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + EnterCriticalSection(&This->lock); + + hr = This->stream ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI TiffEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail)

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapFrameEncode:: SetPalette in the TIFF encoder.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

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

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapEncoder:: SetPalette for a not initialized case in BMP encoder.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

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