December 2018 - Wine-commits

Józef Kucia : include: Add ntddvdeo.h.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: c7616efb98469590badc68cd33a8b94f9a04ae39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7616efb98469590badc68cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 19:52:44 2018 +0100 include: Add ntddvdeo.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ntddvdeo.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2953748..fd47078 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -472,6 +472,7 @@ SOURCES = \ ntddndis.h \ ntddscsi.h \ ntddstor.h \ + ntddvdeo.h \ ntdef.h \ ntdsapi.h \ ntlsa.h \ diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h new file mode 100644 index 0000000..d2c0780 --- /dev/null +++ b/include/ntddvdeo.h @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NTDDVDEO_ +#define _NTDDVDEO_ + +DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); + +#endif

1 0

Alex Henrie : d3dcompiler: Turn variable 'components' into a static constant.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 358b814873c73822b641e5d5eba57631768af392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=358b814873c73822b641e5d5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:51 2018 -0700 d3dcompiler: Turn variable 'components' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index bda41c4..5499b8c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2138,7 +2138,8 @@ static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *construc static const char *debug_writemask(DWORD writemask) { - char string[5], components[] = {'x', 'y', 'z', 'w'}; + static const char components[] = {'x', 'y', 'z', 'w'}; + char string[5]; unsigned int i = 0, pos = 0; while (writemask)

1 0

Alex Henrie : ole32: Turn several variables into static constants.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: a05ce6ac6f7243f6d55f8fad888abe3541f2e980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a05ce6ac6f7243f6d55f8fad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:56 2018 -0700 ole32: Turn several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 886d9b9..a8bbd40 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10034,8 +10034,8 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName static const WCHAR wstrStreamName[] = {1,'C', 'o', 'm', 'p', 'O', 'b', 'j', 0}; WCHAR bufferW[OLESTREAM_MAX_STR_LEN]; - BYTE pCompObjUnknown1[] = {0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF}; - BYTE pCompObjUnknown2[] = {0xF4, 0x39, 0xB2, 0x71}; + static const BYTE pCompObjUnknown1[] = {0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF}; + static const BYTE pCompObjUnknown2[] = {0xF4, 0x39, 0xB2, 0x71}; /* Initialize the CompObj structure */ memset(&IStorageCompObj, 0, sizeof(IStorageCompObj)); @@ -10133,7 +10133,7 @@ static void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, HRESULT hRes; IStream *pStream; static const WCHAR wstrStreamName[] = {2, 'O', 'l', 'e', 'P', 'r', 'e', 's', '0', '0', '0', 0}; - BYTE pOlePresStreamHeader [] = + static const BYTE pOlePresStreamHeader[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, @@ -10141,7 +10141,7 @@ static void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, 0x00, 0x00, 0x00, 0x00 }; - BYTE pOlePresStreamHeaderEmpty [] = + static const BYTE pOlePresStreamHeaderEmpty[] = { 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

1 0

Nikolay Sivov : windowscodecs: Fix return values for scaler's CopyPalette( ).
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 8d75d949a6b36d4fce944272b058cd2290da48f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d75d949a6b36d4fce944272… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:41 2018 +0300 windowscodecs: Fix return values for scaler's CopyPalette(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 3789831..eedc1bb 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -163,7 +163,7 @@ static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, return E_INVALIDARG; if (!This->source) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_PALETTEUNAVAILABLE; return IWICBitmapSource_CopyPalette(This->source, pIPalette); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 2b5c373..d4b5979 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1084,6 +1084,7 @@ static void test_bitmap_scaler(void) { WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; + IWICPalette *palette; double res_x, res_y; IWICBitmap *bitmap; UINT width, height; @@ -1148,6 +1149,15 @@ static void test_bitmap_scaler(void) ok(width == 123, "Unexpected width %u.\n", width); ok(height == 321, "Unexpected height %u.\n", height); + hr = IWICBitmapScaler_CopyPalette(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 4, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1224,6 +1234,12 @@ static void test_bitmap_scaler(void) ok(hr == S_OK, "Failed to get scaler resolution, hr %#x.\n", hr); ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap);

1 0

Nikolay Sivov : windowscodecs: Implement GetContainerFormat() for encoders.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 938d00cd761de9d710882132b3119f7d26649aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=938d00cd761de9d710882132… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:42 2018 +0300 windowscodecs: Implement GetContainerFormat() for encoders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 5 +++++ dlls/windowscodecs/jpegformat.c | 12 ++++++++---- dlls/windowscodecs/pngformat.c | 12 ++++++++---- dlls/windowscodecs/tests/converter.c | 24 ++++++++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 5 +++++ 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index fb04f9d..b8783a4 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -472,6 +472,11 @@ static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *pguidContainerFormat) { + TRACE("(%p,%p)\n", iface, pguidContainerFormat); + + if (!pguidContainerFormat) + return E_INVALIDARG; + memcpy(pguidContainerFormat, &GUID_ContainerFormatBmp, sizeof(GUID)); return S_OK; } diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index bb3d418..451d725 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1381,11 +1381,15 @@ static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, format); + + if (!format) + return E_INVALIDARG; + + memcpy(format, &GUID_ContainerFormatJpeg, sizeof(*format)); + return S_OK; } static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3ac7dee..fc1f756 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1968,11 +1968,15 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, format); + + if (!format) + return E_INVALIDARG; + + memcpy(format, &GUID_ContainerFormatPng, sizeof(*format)); + return S_OK; } static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 5f9f1d8..1e557a7 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -849,6 +849,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, const struct setting *settings, const char *name, IWICPalette *palette) { + const GUID *container_format = NULL; HRESULT hr; IWICBitmapEncoder *encoder; BitmapTestSrc *src_obj; @@ -859,6 +860,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *framedecode; WICPixelFormatGUID pixelformat; + GUID guid; int i; hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, @@ -868,6 +870,28 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + hr = IWICBitmapEncoder_GetContainerFormat(encoder, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + if (IsEqualGUID(clsid_encoder, &CLSID_WICPngEncoder)) + container_format = &GUID_ContainerFormatPng; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder)) + container_format = &GUID_ContainerFormatBmp; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder)) + container_format = &GUID_ContainerFormatTiff; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICJpegEncoder)) + container_format = &GUID_ContainerFormatJpeg; + else + ok(0, "Unknown encoder %s.\n", wine_dbgstr_guid(clsid_encoder)); + + if (container_format) + { + memset(&guid, 0, sizeof(guid)); + hr = IWICBitmapEncoder_GetContainerFormat(encoder, &guid); + ok(SUCCEEDED(hr), "Failed to get container format, hr %#x.\n", hr); + ok(IsEqualGUID(container_format, &guid), "Unexpected container format %s.\n", wine_dbgstr_guid(&guid)); + } + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 67773fd..f9a61d4 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1884,6 +1884,11 @@ exit: static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *pguidContainerFormat) { + TRACE("(%p,%p)\n", iface, pguidContainerFormat); + + if (!pguidContainerFormat) + return E_INVALIDARG; + memcpy(pguidContainerFormat, &GUID_ContainerFormatTiff, sizeof(GUID)); return S_OK; }

1 0

Nikolay Sivov : windowscodecs/tests: Add more stream tests.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 3ad1750e45c962826fa443c73560c2fd03818c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad1750e45c962826fa443c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:43 2018 +0300 windowscodecs/tests: Add more stream tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/stream.c | 382 +++++++++++++++++++++++++++++++++----- 1 file changed, 331 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ad1750e45c962826fa4…

1 0

Nikolay Sivov : windowscodecs: Trace stream methods arguments.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: fc780fe313db0e36fd394928d48b54a7aaa18138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc780fe313db0e36fd394928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:44 2018 +0300 windowscodecs: Trace stream methods arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/stream.c | 106 +++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc780fe313db0e36fd39…

1 0

Nikolay Sivov : windowscodecs: Fix InitializeFromIStream() to simply wrap target stream.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 6704ef1430405742cee041f5600e659d02bd79d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6704ef1430405742cee041f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:45 2018 +0300 windowscodecs: Fix InitializeFromIStream() to simply wrap target stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/stream.c | 26 ++++++++++++++++++-------- dlls/windowscodecs/tests/stream.c | 36 ++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index ae90dfd..366d11b 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -912,16 +912,26 @@ static HRESULT WINAPI IWICStreamImpl_Clone(IWICStream *iface, return IStream_Clone(This->pStream, ppstm); } -static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, - IStream *pIStream) +static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, IStream *stream) { - ULARGE_INTEGER offset, size; - TRACE("(%p, %p)\n", iface, pIStream); + IWICStreamImpl *This = impl_from_IWICStream(iface); + HRESULT hr = S_OK; + + TRACE("(%p, %p)\n", iface, stream); + + if (!stream) return E_INVALIDARG; + if (This->pStream) return WINCODEC_ERR_WRONGSTATE; + + IStream_AddRef(stream); - offset.QuadPart = 0; - size.u.LowPart = 0xffffffff; - size.u.HighPart = 0xffffffff; - return IWICStream_InitializeFromIStreamRegion(iface, pIStream, offset, size); + if (InterlockedCompareExchangePointer((void **)&This->pStream, stream, NULL)) + { + /* Some other thread set the stream first. */ + IStream_Release(stream); + hr = WINCODEC_ERR_WRONGSTATE; + } + + return hr; } static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface, diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index c8fcdd1..3750c32 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -777,7 +777,7 @@ static void test_StreamOnIStream(void) hr = IWICStream_InitializeFromIStream(substream, (IStream *)stream); ok(hr == S_OK, "Failed to initialize stream, hr %#x.\n", hr); - CHECK_CUR_POS_TODO(substream, 1); + CHECK_CUR_POS(substream, 1); /* Seek */ CHECK_CUR_POS(stream, 1); @@ -785,12 +785,12 @@ static void test_StreamOnIStream(void) ok(hr == S_OK, "Failed to seek a stream, hr %#x.\n", hr); ok(newpos.QuadPart == sizeof(memory), "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); CHECK_CUR_POS(substream, sizeof(memory)); - CHECK_CUR_POS_TODO(stream, sizeof(memory)); + CHECK_CUR_POS(stream, sizeof(memory)); hr = IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, &newpos); ok(hr == S_OK, "Failed to seek a stream, hr %#x.\n", hr); ok(newpos.QuadPart == 0, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); CHECK_CUR_POS(substream, 0); hr = IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); @@ -801,41 +801,37 @@ static void test_StreamOnIStream(void) newpos.u.HighPart = 0xdeadbeef; newpos.u.LowPart = 0xdeadbeef; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_SET, &newpos); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "Unexpected hr %#x.\n", hr); ok(newpos.u.HighPart == 0xdeadbeef && newpos.u.LowPart == 0xdeadbeef, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); CHECK_CUR_POS(substream, 0); pos.QuadPart = sizeof(memory) + 1; newpos.u.HighPart = 0xdeadbeef; newpos.u.LowPart = 0xdeadbeef; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_SET, &newpos); -todo_wine { ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(newpos.u.HighPart == 0xdeadbeef && newpos.u.LowPart == 0xdeadbeef, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); -} - CHECK_CUR_POS_TODO(stream, 0); - CHECK_CUR_POS_TODO(substream, 0); + CHECK_CUR_POS(stream, 0); + CHECK_CUR_POS(substream, 0); pos.QuadPart = 1; newpos.u.HighPart = 0xdeadbeef; newpos.u.LowPart = 0xdeadbeef; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_END, &newpos); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(newpos.u.HighPart == 0xdeadbeef && newpos.u.LowPart == 0xdeadbeef, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, 0); - CHECK_CUR_POS_TODO(substream, 0); + CHECK_CUR_POS(stream, 0); + CHECK_CUR_POS(substream, 0); pos.QuadPart = -1; hr = IWICStream_Seek(substream, pos, STREAM_SEEK_END, &newpos); ok(hr == S_OK, "Failed to seek a stream, hr %#x.\n", hr); ok(newpos.QuadPart == sizeof(memory) - 1, "Unexpected position %s.\n", wine_dbgstr_longlong(newpos.QuadPart)); - CHECK_CUR_POS_TODO(stream, sizeof(memory) - 1); + CHECK_CUR_POS(stream, sizeof(memory) - 1); CHECK_CUR_POS(substream, sizeof(memory) - 1); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); @@ -846,23 +842,23 @@ todo_wine ok(read_len == 12, "Unexpected read length %u.\n", read_len); ok(!memcmp(buff, data, 12), "Unexpected data.\n"); CHECK_CUR_POS(substream, read_len); - CHECK_CUR_POS_TODO(stream, read_len); + CHECK_CUR_POS(stream, read_len); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); hr = IWICStream_Read(substream, memory, 10, &read_len); /* source = dest */ ok(hr == S_OK, "Failed to read from stream, hr %#x.\n", hr); ok(read_len == 10, "Unexpected read length %u.\n", read_len); ok(!memcmp(memory, data, read_len), "Unexpected data.\n"); - CHECK_CUR_POS_TODO(stream, 10); + CHECK_CUR_POS(stream, 10); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); hr = IWICStream_Read(substream, memory, 2 * sizeof(data), &read_len); /* request too many bytes */ ok(hr == S_OK, "Failed to read from stream, hr %#x.\n", hr); ok(read_len == 64, "Unexpected read length %u.\n", read_len); ok(!memcmp(memory, data, read_len), "Unexpected data.\n"); - CHECK_CUR_POS_TODO(stream, sizeof(data)); + CHECK_CUR_POS(stream, sizeof(data)); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); read_len = 0xdeadbeef; @@ -898,7 +894,7 @@ todo_wine ok(written == 3, "Unexpected written length %u.\n", written); ok(!memcmp(buff, memory, 3), "Unexpected stream data.\n"); CHECK_CUR_POS(substream, written); - CHECK_CUR_POS_TODO(stream, written); + CHECK_CUR_POS(stream, written); IWICStream_Seek(substream, zero_pos, STREAM_SEEK_SET, NULL); hr = IWICStream_Write(substream, buff, 0, &written); @@ -909,14 +905,14 @@ todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(written == 0xdeadbeef, "Unexpected written length %u.\n", written); CHECK_CUR_POS(substream, 0); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); written = 0xdeadbeef; hr = IWICStream_Write(substream, NULL, 0, &written); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(written == 0xdeadbeef, "Unexpected written length %u.\n", written); CHECK_CUR_POS(substream, 0); - CHECK_CUR_POS_TODO(stream, 0); + CHECK_CUR_POS(stream, 0); /* SetSize */ newpos.u.HighPart = 0;

1 0

Dmitry Timoshkov : windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 0b428f881972e656bc81c9af4f452bab9d460f58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b428f881972e656bc81c9af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 30 09:53:04 2018 +0300 windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f9a61d4..81c6394 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1969,7 +1969,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, VARIANT v; VariantInit(&v); V_VT(&v) = VT_UI1; - V_UNION(&v, bVal) = WICTiffCompressionDontCare; + V_UI1(&v) = WICTiffCompressionDontCare; hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); VariantClear(&v); if (FAILED(hr))

1 0

Dmitry Timoshkov : windowscodecs: Limit number of colors in a palette in BMP decoder.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 5a4f5ce8b4e2dd7a9597f8b94b2e58c0b37fd81f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a4f5ce8b4e2dd7a9597f8b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 30 09:53:15 2018 +0300 windowscodecs: Limit number of colors in a palette in BMP decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpdecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 6254b15..f5a2589 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -271,7 +271,7 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, if (This->bih.bV5ClrUsed == 0) count = 1 << This->bih.bV5BitCount; else - count = This->bih.bV5ClrUsed; + count = min(This->bih.bV5ClrUsed, 1 << This->bih.bV5BitCount); tablesize = sizeof(WICColor) * count; wiccolors = HeapAlloc(GetProcessHeap(), 0, tablesize);

1 0