February 2019 - Wine-commits

Jactry Zeng : shcore: Don't return E_FAIL in IStream::SetSize() for read-only mode.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: 13e0b4839b7b1f79d526316cc9825bf3feece836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e0b4839b7b1f79d526316c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 5 23:39:04 2019 +0800 shcore: Don't return E_FAIL in IStream::SetSize() for read-only mode. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 15 +++++- dlls/shcore/tests/shcore.c | 119 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 973b7c7..fdf878e 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -913,15 +913,26 @@ static HRESULT WINAPI filestream_Seek(IStream *iface, LARGE_INTEGER move, DWORD static HRESULT WINAPI filestream_SetSize(IStream *iface, ULARGE_INTEGER size) { struct shstream *stream = impl_from_IStream(iface); + LARGE_INTEGER origin, move; TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(size.QuadPart)); - if (!SetFilePointer(stream->u.file.handle, size.QuadPart, NULL, FILE_BEGIN)) + move.QuadPart = 0; + if (!SetFilePointerEx(stream->u.file.handle, move, &origin, FILE_CURRENT)) return E_FAIL; - if (!SetEndOfFile(stream->u.file.handle)) + move.QuadPart = size.QuadPart; + if (!SetFilePointerEx(stream->u.file.handle, move, NULL, FILE_BEGIN)) return E_FAIL; + if (stream->u.file.mode != STGM_READ) + { + if (!SetEndOfFile(stream->u.file.handle)) + return E_FAIL; + if (!SetFilePointerEx(stream->u.file.handle, origin, NULL, FILE_BEGIN)) + return E_FAIL; + } + return S_OK; } diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 0738659..2a8ebcc 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -41,6 +41,8 @@ static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY, const char *, const char *, SRRF, static DWORD (WINAPI *pSHQueryValueExA)(HKEY, const char *, DWORD *, DWORD *, void *buff, DWORD *buff_len); static DWORD (WINAPI *pSHRegGetPathA)(HKEY, const char *, const char *, char *, DWORD); static DWORD (WINAPI *pSHCopyKeyA)(HKEY, const char *, HKEY, DWORD); +static HRESULT (WINAPI *pSHCreateStreamOnFileA)(const char *path, DWORD mode, IStream **stream); +static HRESULT (WINAPI *pIStream_Size)(IStream *stream, ULARGE_INTEGER *size); /* Keys used for testing */ #define REG_TEST_KEY "Software\\Wine\\Test" @@ -73,6 +75,8 @@ static void init(HMODULE hshcore) X(SHQueryValueExA); X(SHRegGetPathA); X(SHCopyKeyA); + X(SHCreateStreamOnFileA); + X(IStream_Size); #undef X } @@ -671,6 +675,120 @@ static void test_SHCopyKey(void) delete_key( hkey, "Software\\Wine", "Test" ); } +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const CHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + +#define CHECK_STREAM_SIZE(obj,exp_size) _check_stream_size(obj, exp_size, __LINE__) +static void _check_stream_size(IStream *obj, LONG exp_size, int line) +{ + ULARGE_INTEGER stream_size; + STATSTG stat; + HRESULT hr; + stream_size.QuadPart = 0xdeadbeef; + hr = pIStream_Size(obj, &stream_size); + ok_(__FILE__,line)(hr == S_OK, "IStream_Size failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stream_size.QuadPart == exp_size, "Size(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stream_size.QuadPart)); + hr = IStream_Stat(obj, &stat, STATFLAG_NONAME); + ok_(__FILE__,line)(hr == S_OK, "IStream_Stat failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stat.cbSize.QuadPart == exp_size, "Stat(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stat.cbSize.QuadPart)); +} + +#define CHECK_STREAM_POS(obj,exp_pos) _check_stream_pos(obj, exp_pos, __LINE__) +static void _check_stream_pos(IStream *obj, LONG exp_pos, int line) +{ + LARGE_INTEGER move; + ULARGE_INTEGER pos; + HRESULT hr; + move.QuadPart = 0; + pos.QuadPart = 0xdeadbeef; + hr = IStream_Seek(obj, move, STREAM_SEEK_CUR, &pos); + ok_(__FILE__,line)(hr == S_OK, "IStream_Seek failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(pos.QuadPart == exp_pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(pos.QuadPart)); +} + +static void test_stream_size(void) +{ + static const byte test_data[] = {0x1,0x2,0x3,0x4,0x5,0x6}; + static const CHAR filename[] = "test_file"; + IStream *stream, *stream2; + HANDLE handle; + DWORD written = 0; + ULARGE_INTEGER stream_size; + HRESULT hr; + + handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(handle, test_data, sizeof(test_data), &written, NULL); + ok(written == sizeof(test_data), "Failed to write data into file.\n"); + CloseHandle(handle); + + /* in read-only mode, SetSize() will success but it has no effect on Size() and the file */ + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 100); + IStream_Release(stream); + CHECK_FILE_SIZE(filename, sizeof(test_data)); + + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream2); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_SIZE(stream2, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 0); + CHECK_STREAM_SIZE(stream2, 0); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 90; + hr = IStream_SetSize(stream2, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 90); + IStream_Release(stream); + IStream_Release(stream2); + CHECK_FILE_SIZE(filename, 100); + + DeleteFileA(filename); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -695,4 +813,5 @@ START_TEST(shcore) test_SHQueryValueEx(); test_SHRegGetPath(); test_SHCopyKey(); + test_stream_size(); }

1 0

Dmitry Timoshkov : windowscodecs: WICConvertBitmapSource should ask IWICFormatConverter:: Initialize to use an optimized palette.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: 603ac6ad218bbdf890feb8e1a655e57424007ef6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=603ac6ad218bbdf890feb8e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 5 11:24:12 2019 +0800 windowscodecs: WICConvertBitmapSource should ask IWICFormatConverter::Initialize to use an optimized palette. This matches Windows' behaviour, and makes a simple test application that converts any WIC compatible RGB(A) source image to 8bppIndexed format work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index d0c2c69..9bec30f 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2523,7 +2523,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma if (SUCCEEDED(res) && canconvert) res = IWICFormatConverter_Initialize(converter, pISrc, dstFormat, WICBitmapDitherTypeNone, - NULL, 0.0, WICBitmapPaletteTypeCustom); + NULL, 0.0, WICBitmapPaletteTypeMedianCut); if (FAILED(res) || !canconvert) {

1 0

Dmitry Timoshkov : windowscodecs: Fix behaviour of format converter for indexed formats when NULL or empty palette has been provided.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: 312cd7b5883748603c0d0c2ed14c12ac53688224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=312cd7b5883748603c0d0c2e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 5 11:24:16 2019 +0800 windowscodecs: Fix behaviour of format converter for indexed formats when NULL or empty palette has been provided. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 5288a32..83f1339 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1278,7 +1278,6 @@ static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WIC hr = IWICPalette_GetColors(This->palette, 256, colors, &count); if (hr != S_OK) return hr; - if (!count) return WINCODEC_ERR_WRONGSTATE; srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; @@ -1447,7 +1446,18 @@ static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, TRACE("(%p,%p)\n", iface, palette); if (!palette) return E_INVALIDARG; - if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + if (!This->source) return WINCODEC_ERR_WRONGSTATE; + + if (!This->palette) + { + HRESULT hr; + UINT bpp; + + hr = get_pixelformat_bpp(This->dst_format->guid, &bpp); + if (hr != S_OK) return hr; + if (bpp <= 8) return WINCODEC_ERR_WRONGSTATE; + return IWICBitmapSource_CopyPalette(This->source, palette); + } return IWICPalette_InitializeFromPalette(palette, This->palette); } @@ -1478,7 +1488,7 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, pbBuffer, This->src_format->format); } else - return WINCODEC_ERR_NOTINITIALIZED; + return WINCODEC_ERR_WRONGSTATE; } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, @@ -1495,6 +1505,10 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (!palette) { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res != S_OK) return res; + res = PaletteImpl_Create(&palette); if (res != S_OK) return res; @@ -1503,20 +1517,19 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, case WICBitmapPaletteTypeCustom: IWICPalette_Release(palette); palette = NULL; - res = S_OK; + if (bpp <= 8) return E_INVALIDARG; break; case WICBitmapPaletteTypeMedianCut: { - UINT bpp; - res = get_pixelformat_bpp(dstFormat, &bpp); - if (res == S_OK && bpp <= 8) + if (bpp <= 8) res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); break; } default: - res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + if (bpp <= 8) + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); break; } @@ -1576,6 +1589,9 @@ end: LeaveCriticalSection(&This->lock); + if (res != S_OK && palette) + IWICPalette_Release(palette); + return res; }

1 0

Dmitry Timoshkov : windowscodecs/tests: Add a bunch of new tests for indexed format conversions.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: 4883556adde7cf7d608c2d07be1289af0fa4b981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4883556adde7cf7d608c2d07… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 5 11:24:18 2019 +0800 windowscodecs/tests: Add a bunch of new tests for indexed format conversions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 274 ++++++++++++++++++++++++++--------- 1 file changed, 204 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4883556adde7cf7d608c…

1 0

Dmitry Timoshkov : windowscodecs/tests: Add some tests for converting 24bppBGR to 8bppIndexed format.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: 6e7a2bd3492aeaf4cb13262cce7ac677d768e924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7a2bd3492aeaf4cb13262c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 5 11:24:21 2019 +0800 windowscodecs/tests: Add some tests for converting 24bppBGR to 8bppIndexed format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 158 +++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 481e563..1cfa29b 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1571,6 +1571,163 @@ static const struct setting png_interlace_settings[] = { {NULL} }; +static void test_converter_8bppIndexed(void) +{ + HRESULT hr; + BitmapTestSrc *src_obj; + IWICFormatConverter *converter; + IWICPalette *palette; + UINT count, i; + BYTE buf[32 * 2 * 3]; /* enough to hold 32x2 24bppBGR data */ + + CreateTestBitmap(&testdata_24bppBGR, &src_obj); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + /* NULL palette + Custom type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat24bppBGR, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeCustom); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == 0xdeadbeef, "unexpected error %#x\n", hr); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32 * 3, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + IWICFormatConverter_Release(converter); + + /* NULL palette + Custom type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeCustom); + ok(hr == E_INVALIDARG, "unexpected error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == WINCODEC_ERR_WRONGSTATE, "unexpected error %#x\n", hr); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == WINCODEC_ERR_WRONGSTATE, "unexpected error %#x\n", hr); + IWICFormatConverter_Release(converter); + + /* empty palette + Custom type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + palette, 0.0, WICBitmapPaletteTypeCustom); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + memset(buf, 0xaa, sizeof(buf)); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count == 0, "expected 0\n"); + IWICFormatConverter_Release(converter); + + /* NULL palette + Predefined type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeFixedGray16); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + IWICFormatConverter_Release(converter); + + /* not empty palette + Predefined type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + palette, 0.0, WICBitmapPaletteTypeFixedHalftone64); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + IWICFormatConverter_Release(converter); + + /* not empty palette + MedianCut type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + palette, 0.0, WICBitmapPaletteTypeMedianCut); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + IWICFormatConverter_Release(converter); + + /* NULL palette + MedianCut type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeMedianCut); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* XP */, "Initialize error %#x\n", hr); + if (hr == S_OK) + { + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 8, "expected 8, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + } + IWICFormatConverter_Release(converter); + + IWICPalette_Release(palette); + DeleteTestBitmap(src_obj); +} + START_TEST(converter) { HRESULT hr; @@ -1615,6 +1772,7 @@ START_TEST(converter) test_invalid_conversion(); test_default_converter(); + test_converter_8bppIndexed(); test_encoder(&testdata_BlackWhite, &CLSID_WICPngEncoder, &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite");

1 0

Alistair Leslie-Hughes : comdlg32: Improve PRINT32 dialog.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: 0bee07ec573dfb5ca0aa185f7bff1b8acb5f4aad URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bee07ec573dfb5ca0aa185f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 29 01:06:06 2019 +0000 comdlg32: Improve PRINT32 dialog. Correct TAB order, and move Help button to bottom right. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 24 ++++++++--------- po/ar.po | 64 ++++++++++++++++++++++----------------------- po/bg.po | 64 ++++++++++++++++++++++----------------------- po/ca.po | 64 ++++++++++++++++++++++----------------------- po/cs.po | 64 ++++++++++++++++++++++----------------------- po/da.po | 64 ++++++++++++++++++++++----------------------- po/de.po | 64 ++++++++++++++++++++++----------------------- po/el.po | 64 ++++++++++++++++++++++----------------------- po/en.po | 64 ++++++++++++++++++++++----------------------- po/en_US.po | 64 ++++++++++++++++++++++----------------------- po/eo.po | 64 ++++++++++++++++++++++----------------------- po/es.po | 64 ++++++++++++++++++++++----------------------- po/fa.po | 66 +++++++++++++++++++++++------------------------ po/fi.po | 64 ++++++++++++++++++++++----------------------- po/fr.po | 64 ++++++++++++++++++++++----------------------- po/he.po | 64 ++++++++++++++++++++++----------------------- po/hi.po | 60 +++++++++++++++++++++--------------------- po/hr.po | 64 ++++++++++++++++++++++----------------------- po/hu.po | 64 ++++++++++++++++++++++----------------------- po/it.po | 64 ++++++++++++++++++++++----------------------- po/ja.po | 64 ++++++++++++++++++++++----------------------- po/ko.po | 64 ++++++++++++++++++++++----------------------- po/lt.po | 64 ++++++++++++++++++++++----------------------- po/ml.po | 60 +++++++++++++++++++++--------------------- po/nb_NO.po | 64 ++++++++++++++++++++++----------------------- po/nl.po | 64 ++++++++++++++++++++++----------------------- po/or.po | 60 +++++++++++++++++++++--------------------- po/pa.po | 60 +++++++++++++++++++++--------------------- po/pl.po | 64 ++++++++++++++++++++++----------------------- po/pt_BR.po | 64 ++++++++++++++++++++++----------------------- po/pt_PT.po | 64 ++++++++++++++++++++++----------------------- po/rm.po | 62 ++++++++++++++++++++++---------------------- po/ro.po | 64 ++++++++++++++++++++++----------------------- po/ru.po | 64 ++++++++++++++++++++++----------------------- po/si.po | 64 ++++++++++++++++++++++----------------------- po/sk.po | 64 ++++++++++++++++++++++----------------------- po/sl.po | 64 ++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 64 ++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 66 +++++++++++++++++++++++------------------------ po/sv.po | 64 ++++++++++++++++++++++----------------------- po/te.po | 60 +++++++++++++++++++++--------------------- po/th.po | 64 ++++++++++++++++++++++----------------------- po/tr.po | 64 ++++++++++++++++++++++----------------------- po/uk.po | 64 ++++++++++++++++++++++----------------------- po/wa.po | 66 +++++++++++++++++++++++------------------------ po/wine.pot | 60 +++++++++++++++++++++--------------------- po/zh_CN.po | 64 ++++++++++++++++++++++----------------------- po/zh_TW.po | 64 ++++++++++++++++++++++----------------------- 48 files changed, 1506 insertions(+), 1506 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bee07ec573dfb5ca0aa…

1 0

Nikolay Sivov : dwrite: Implement mark-to-mark attachment, GPOS lookup 6.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: 717030df10c29a5899b2f499084f80771f3cfc44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717030df10c29a5899b2f499… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 5 12:18:41 2019 +0300 dwrite: Implement mark-to-mark attachment, GPOS lookup 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 92a5d40..c74382b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -681,6 +681,16 @@ struct ot_gpos_mark_to_base_format1 WORD base_array; }; +struct ot_gpos_mark_to_mark_format1 +{ + WORD format; + WORD mark1_coverage; + WORD mark2_coverage; + WORD mark_class_count; + WORD mark1_array; + WORD mark2_array; +}; + typedef struct { WORD SubstFormat; WORD Coverage; @@ -3503,6 +3513,85 @@ static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(const struct scrip static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(const struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + unsigned int i; + WORD format; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + if (format == 1) + { + const struct ot_gpos_mark_to_mark_format1 *format1 = table_read_ensure(&cache->gpos.table, + subtable_offset, sizeof(*format1)); + unsigned int count, mark1_array_offset, mark2_array_offset, mark_class_count; + unsigned int mark1_index, mark2_index, mark2_anchor; + const struct ot_gpos_mark_array *mark1_array; + const struct ot_gpos_base_array *mark2_array; + float mark1_x, mark1_y, mark2_x, mark2_y; + struct glyph_iterator mark_iter; + + if (!format1) + continue; + + mark1_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->mark1_coverage), context->u.pos.glyphs[iter->pos]); + + mark1_array_offset = subtable_offset + GET_BE_WORD(format1->mark1_array); + if (!(count = table_read_be_word(&cache->gpos.table, mark1_array_offset))) + continue; + + mark1_array = table_read_ensure(&cache->gpos.table, mark1_array_offset, + FIELD_OFFSET(struct ot_gpos_mark_array, records[count])); + if (!mark1_array) + continue; + + if (mark1_index == GLYPH_NOT_COVERED || mark1_index >= count) + continue; + + glyph_iterator_init(context, lookup->flags & ~LOOKUP_FLAG_IGNORE_MASK, iter->pos, 1, &mark_iter); + if (!glyph_iterator_prev(&mark_iter)) + continue; + + if (!context->u.pos.glyph_props[mark_iter.pos].isDiacritic) + continue; + + mark2_array_offset = subtable_offset + GET_BE_WORD(format1->mark2_array); + if (!(count = table_read_be_word(&cache->gpos.table, mark2_array_offset))) + continue; + + mark_class_count = GET_BE_WORD(format1->mark_class_count); + + mark2_array = table_read_ensure(&cache->gpos.table, mark2_array_offset, + FIELD_OFFSET(struct ot_gpos_base_array, offsets[count * mark_class_count])); + if (!mark2_array) + continue; + + mark2_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->mark2_coverage), context->u.pos.glyphs[mark_iter.pos]); + + if (mark2_index == GLYPH_NOT_COVERED || mark2_index >= count) + continue; + + mark2_anchor = GET_BE_WORD(mark2_array->offsets[mark2_index * mark_class_count + + GET_BE_WORD(mark1_array->records[mark1_index].mark_class)]); + opentype_layout_gpos_get_anchor(context, mark1_array_offset + + GET_BE_WORD(mark1_array->records[mark1_index].mark_anchor), iter->pos, &mark1_x, &mark1_y); + opentype_layout_gpos_get_anchor(context, mark2_array_offset + mark2_anchor, mark_iter.pos, + &mark2_x, &mark2_y); + + context->offsets[iter->pos].advanceOffset = mark2_x - mark1_x; + context->offsets[iter->pos].ascenderOffset = mark2_y - mark1_y; + + break; + } + else + WARN("Unknown mark-to-mark format %u.\n", format); + } + return FALSE; }

1 0

Nikolay Sivov : dwrite: Add a stub for mark-to-ligature attachment handler.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: cbf1207b88359f9f8c7f5e5f7fb2390be1dc9584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf1207b88359f9f8c7f5e5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 5 12:18:42 2019 +0300 dwrite: Add a stub for mark-to-ligature attachment handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c74382b..b13f424 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -681,6 +681,16 @@ struct ot_gpos_mark_to_base_format1 WORD base_array; }; +struct ot_gpos_mark_to_lig_format1 +{ + WORD format; + WORD mark_coverage; + WORD lig_coverage; + WORD mark_class_count; + WORD mark_array; + WORD lig_array; +}; + struct ot_gpos_mark_to_mark_format1 { WORD format; @@ -3507,6 +3517,46 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(const struct scri static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(const struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + unsigned int i; + WORD format; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + if (format == 1) + { + const struct ot_gpos_mark_to_lig_format1 *format1 = table_read_ensure(&cache->gpos.table, + subtable_offset, sizeof(*format1)); + unsigned int mark_index, lig_index; + struct glyph_iterator lig_iter; + + if (!format1) + continue; + + mark_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->mark_coverage), context->u.pos.glyphs[iter->pos]); + if (mark_index == GLYPH_NOT_COVERED) + continue; + + glyph_iterator_init(context, LOOKUP_FLAG_IGNORE_MARKS, iter->pos, 1, &lig_iter); + if (!glyph_iterator_prev(&lig_iter)) + continue; + + lig_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->lig_coverage), context->u.pos.glyphs[lig_iter.pos]); + if (lig_index == GLYPH_NOT_COVERED) + continue; + + FIXME("Unimplemented.\n"); + } + else + WARN("Unknown mark-to-ligature format %u.\n", format); + } + return FALSE; }

1 0

Paul Gofman : user32: Select more appropriate stretch mode for colored images interpolation.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: bfe1ea26dd5ee401159e117029ecc63466a6ccb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe1ea26dd5ee401159e1170… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 5 18:28:11 2019 +0300 user32: Select more appropriate stretch mode for colored images interpolation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46375 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 4 ++++ dlls/user32/tests/cursoricon.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 539fc7c..3214746 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2976,6 +2976,8 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, } orig_bm = SelectObject(screen_mem_dc, hbitmap); + if (info->bmiHeader.biBitCount > 1) + SetStretchBltMode(screen_mem_dc, HALFTONE); StretchDIBits(screen_mem_dc, 0, 0, new_width, new_height, 0, 0, width, height, bits, fix_info, DIB_RGB_COLORS, SRCCOPY); SelectObject(screen_mem_dc, orig_bm); @@ -3217,6 +3219,8 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, void * bits; dc = CreateCompatibleDC(NULL); + if (ds.dsBm.bmBitsPixel > 1) + SetStretchBltMode(dc, HALFTONE); bi->bmiHeader.biWidth = ds.dsBm.bmWidth; bi->bmiHeader.biHeight = ds.dsBm.bmHeight; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 56621a6..8ce1eb1 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2918,9 +2918,9 @@ static void test_Image_StretchMode(void) sizeof(colors_bits_1), FALSE}, {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, - sizeof(colors_bits_8), TRUE}, + sizeof(colors_bits_8), FALSE}, {4, 4, 2, 2, 16, (const unsigned char *)test_bits_16, (const unsigned char *)expected_bits_16, - sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, TRUE}, + sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, FALSE}, }; static const char filename[] = "test.bmp"; BITMAPINFO *bmi, *bmi_output;

1 0

Michael Stefaniuc : taskschd: Avoid TRUE : FALSE conditional expressions.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: wine Branch: master Commit: d99f91c5c664aeb3b1380f383d8982dc9cfbcb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99f91c5c664aeb3b1380f38… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 4 23:16:40 2019 +0100 taskschd: Avoid TRUE : FALSE conditional expressions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1306c8c..54b6782 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -239,7 +239,7 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO TRACE("(%p)->(%x)\n", This, enabled); - This->enabled = enabled ? TRUE : FALSE; + This->enabled = !!enabled; return S_OK; } @@ -939,7 +939,7 @@ static HRESULT WINAPI TaskSettings_put_AllowDemandStart(ITaskSettings *iface, VA TRACE("%p,%d\n", iface, allow); - taskset->allow_on_demand_start = allow ? TRUE : FALSE; + taskset->allow_on_demand_start = !!allow; return S_OK; } @@ -1045,7 +1045,7 @@ static HRESULT WINAPI TaskSettings_put_StopIfGoingOnBatteries(ITaskSettings *ifa TRACE("%p,%d\n", iface, stop); - taskset->stop_if_going_on_batteries = stop ? TRUE : FALSE; + taskset->stop_if_going_on_batteries = !!stop; return S_OK; } @@ -1069,7 +1069,7 @@ static HRESULT WINAPI TaskSettings_put_DisallowStartIfOnBatteries(ITaskSettings TRACE("%p,%d\n", iface, disallow); - taskset->disallow_start_if_on_batteries = disallow ? TRUE : FALSE; + taskset->disallow_start_if_on_batteries = !!disallow; return S_OK; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI TaskSettings_put_AllowHardTerminate(ITaskSettings *iface, TRACE("%p,%d\n", iface, allow); - taskset->allow_hard_terminate = allow ? TRUE : FALSE; + taskset->allow_hard_terminate = !!allow; return S_OK; } @@ -1117,7 +1117,7 @@ static HRESULT WINAPI TaskSettings_put_StartWhenAvailable(ITaskSettings *iface, TRACE("%p,%d\n", iface, start); - taskset->start_when_available = start ? TRUE : FALSE; + taskset->start_when_available = !!start; return S_OK; } @@ -1153,7 +1153,7 @@ static HRESULT WINAPI TaskSettings_put_RunOnlyIfNetworkAvailable(ITaskSettings * TRACE("%p,%d\n", iface, run); - taskset->run_only_if_network_available = run ? TRUE : FALSE; + taskset->run_only_if_network_available = !!run; return S_OK; } @@ -1211,7 +1211,7 @@ static HRESULT WINAPI TaskSettings_put_Enabled(ITaskSettings *iface, VARIANT_BOO TRACE("%p,%d\n", iface, enabled); - taskset->enabled = enabled ? TRUE : FALSE; + taskset->enabled = !!enabled; return S_OK; } @@ -1311,7 +1311,7 @@ static HRESULT WINAPI TaskSettings_put_Hidden(ITaskSettings *iface, VARIANT_BOOL TRACE("%p,%d\n", iface, hidden); - taskset->hidden = hidden ? TRUE : FALSE; + taskset->hidden = !!hidden; return S_OK; } @@ -1347,7 +1347,7 @@ static HRESULT WINAPI TaskSettings_put_RunOnlyIfIdle(ITaskSettings *iface, VARIA TRACE("%p,%d\n", iface, run); - taskset->run_only_if_idle = run ? TRUE : FALSE; + taskset->run_only_if_idle = !!run; return S_OK; } @@ -1371,7 +1371,7 @@ static HRESULT WINAPI TaskSettings_put_WakeToRun(ITaskSettings *iface, VARIANT_B TRACE("%p,%d\n", iface, wake); - taskset->wake_to_run = wake ? TRUE : FALSE; + taskset->wake_to_run = !!wake; return S_OK; }

1 0