July 2015 - Wine-commits - list.winehq.org

Henri Verbeet : d2d1: Introduce a separate function to construct pixel shader constant buffers for brushes.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 3bb382aabbbb6cc95df05ef359a6fce4124754f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb382aabbbb6cc95df05ef35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:41 2015 +0200 d2d1: Introduce a separate function to construct pixel shader constant buffers for brushes. --- dlls/d2d1/brush.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 14 ++++++++ dlls/d2d1/render_target.c | 72 ++------------------------------------- 3 files changed, 103 insertions(+), 70 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index edce7a2..762d201 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -709,6 +709,93 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTE } } +HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, + ID3D10Buffer **ps_cb) +{ + D3D10_SUBRESOURCE_DATA buffer_data; + D3D10_BUFFER_DESC buffer_desc; + struct + { + float _11, _21, _31, pad0; + float _12, _22, _32, pad1; + } transform; + D2D1_COLOR_F color; + HRESULT hr; + + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + buffer_data.SysMemPitch = 0; + buffer_data.SysMemSlicePitch = 0; + + if (brush->type == D2D_BRUSH_TYPE_SOLID) + { + color = brush->u.solid.color; + color.a *= brush->opacity; + + buffer_desc.ByteWidth = sizeof(color); + buffer_data.pSysMem = &color; + } + else if (brush->type == D2D_BRUSH_TYPE_BITMAP) + { + struct d2d_bitmap *bitmap = brush->u.bitmap.bitmap; + D2D_MATRIX_3X2_F w, b; + float dpi_scale, d; + + /* Scale for dpi. */ + w = render_target->drawing_state.transform; + dpi_scale = render_target->dpi_x / 96.0f; + w._11 *= dpi_scale; + w._21 *= dpi_scale; + w._31 *= dpi_scale; + dpi_scale = render_target->dpi_y / 96.0f; + w._12 *= dpi_scale; + w._22 *= dpi_scale; + w._32 *= dpi_scale; + + /* Scale for bitmap size and dpi. */ + b = brush->transform; + dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); + b._11 *= dpi_scale; + b._21 *= dpi_scale; + dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); + b._12 *= dpi_scale; + b._22 *= dpi_scale; + + d2d_matrix_multiply(&b, &w); + + /* Invert the matrix. (Because the matrix is applied to the sampling + * coordinates. I.e., to scale the bitmap by 2 we need to divide the + * coordinates by 2.) */ + d = b._11 * b._22 - b._21 * b._12; + if (d != 0.0f) + { + transform._11 = b._22 / d; + transform._21 = -b._21 / d; + transform._31 = (b._21 * b._32 - b._31 * b._22) / d; + transform._12 = -b._12 / d; + transform._22 = b._11 / d; + transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; + } + transform.pad1 = brush->opacity; + + buffer_desc.ByteWidth = sizeof(transform); + buffer_data.pSysMem = &transform; + } + else + { + FIXME("Unhandled brush type %#x.\n", brush->type); + return E_NOTIMPL; + } + + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, ps_cb))) + ERR("Failed to create constant buffer, hr %#x.\n", hr); + + return hr; +} + void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) { static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 91ebd9f..2e9f741 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -142,6 +142,8 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) DECLSPEC_HIDDEN; +HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, + ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style @@ -233,4 +235,16 @@ struct d2d_geometry void d2d_path_geometry_init(struct d2d_geometry *geometry) DECLSPEC_HIDDEN; HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN; +static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) +{ + D2D_MATRIX_3X2_F tmp = *a; + + a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; + a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; + a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; + a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; + a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; + a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; +} + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index fa98b5b..01b484e 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -32,18 +32,6 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; -static void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) -{ - D2D_MATRIX_3X2_F tmp = *a; - - a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; - a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; - a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; - a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; - a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; - a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; -} - static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) { dst->x = x; @@ -550,7 +538,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; - D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; struct @@ -609,64 +596,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - if (brush_impl->type == D2D_BRUSH_TYPE_BITMAP) - { - struct d2d_bitmap *bitmap = brush_impl->u.bitmap.bitmap; - D2D_MATRIX_3X2_F w, b; - float dpi_scale, d; - - /* Scale for dpi. */ - w = render_target->drawing_state.transform; - dpi_scale = render_target->dpi_x / 96.0f; - w._11 *= dpi_scale; - w._21 *= dpi_scale; - w._31 *= dpi_scale; - dpi_scale = render_target->dpi_y / 96.0f; - w._12 *= dpi_scale; - w._22 *= dpi_scale; - w._32 *= dpi_scale; - - /* Scale for bitmap size and dpi. */ - b = brush_impl->transform; - dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); - b._11 *= dpi_scale; - b._21 *= dpi_scale; - dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); - b._12 *= dpi_scale; - b._22 *= dpi_scale; - - d2d_matrix_multiply(&b, &w); - - /* Invert the matrix. (Because the matrix is applied to the sampling - * coordinates. I.e., to scale the bitmap by 2 we need to divide the - * coordinates by 2.) */ - d = b._11 * b._22 - b._21 * b._12; - if (d != 0.0f) - { - transform._11 = b._22 / d; - transform._21 = -b._21 / d; - transform._31 = (b._21 * b._32 - b._31 * b._22) / d; - transform._12 = -b._12 / d; - transform._22 = b._11 / d; - transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; - } - transform.pad1 = brush_impl->opacity; - - buffer_desc.ByteWidth = sizeof(transform); - buffer_data.pSysMem = &transform; - } - else - { - color = brush_impl->u.solid.color; - color.a *= brush_impl->opacity; - - buffer_desc.ByteWidth = sizeof(color); - buffer_data.pSysMem = &color; - } - - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) + if (FAILED(hr = d2d_brush_get_ps_cb(brush_impl, render_target, &ps_cb))) { - WARN("Failed to create constant buffer, hr %#x.\n", hr); + WARN("Failed to get ps constant buffer, hr %#x.\n", hr); ID3D10Buffer_Release(vs_cb); return; }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_FillGeometry().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: b92a05c84ed92f8ebe618991315f95af3189a47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92a05c84ed92f8ebe6189913… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:42 2015 +0200 d2d1: Implement d2d_d3d_render_target_FillGeometry(). --- dlls/d2d1/d2d1_private.h | 2 + dlls/d2d1/geometry.c | 9 +++ dlls/d2d1/render_target.c | 190 ++++++++++++++++++++++++++++------------------ 3 files changed, 126 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b92a05c84ed92f8ebe618…

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddLines().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: a8f45dff604058d419bd6c2e070f65a13a6ddfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f45dff604058d419bd6c2e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:43 2015 +0200 d2d1: Implement d2d_geometry_sink_AddLines(). --- dlls/d2d1/d2d1_private.h | 7 +- dlls/d2d1/geometry.c | 983 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 135 +++++++ 3 files changed, 1118 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8f45dff604058d419bd6…

1 0

Dmitry Timoshkov : gdiplus: Move the burden of supporting GIF encoding to the WIC backend.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: f78a6dd15c85f374a841427d7edce7427e5bbb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78a6dd15c85f374a841427d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 15:02:12 2015 +0800 gdiplus: Move the burden of supporting GIF encoding to the WIC backend. --- dlls/gdiplus/image.c | 10 ++++-- dlls/gdiplus/tests/image.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 73f2f74..23c465e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4401,6 +4401,12 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params); } +static GpStatus encode_image_gif(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); +} + /***************************************************************************** * GdipSaveImageToStream [GDIPLUS.@] */ @@ -4611,14 +4617,14 @@ static const struct image_codec codecs[NUM_CODECS] = { /* FormatDescription */ gif_format, /* FilenameExtension */ gif_extension, /* MimeType */ gif_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsEncoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 2, /* SigSize */ 6, /* SigPattern */ gif_sig_pattern, /* SigMask */ gif_sig_mask, }, - NULL, + encode_image_gif, decode_image_gif, select_frame_gif }, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 63fc96e..1335d97 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4544,6 +4544,91 @@ static void test_CloneBitmapArea(void) GdipDisposeImage((GpImage *)bitmap); } +static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) +{ + GpStatus status; + UINT n_codecs, info_size, i; + ImageCodecInfo *info; + BOOL ret = FALSE; + + status = GdipGetImageEncodersSize(&n_codecs, &info_size); + expect(Ok, status); + + info = GdipAlloc(info_size); + + status = GdipGetImageEncoders(n_codecs, info_size, info); + expect(Ok, status); + + for (i = 0; i < n_codecs; i++) + { + if (!lstrcmpW(info[i].MimeType, mime)) + { + *format = info[i].FormatID; + *clsid = info[i].Clsid; + ret = TRUE; + break; + } + } + + GdipFree(info); + return ret; +} + +static void test_supported_encoders(void) +{ + static const WCHAR bmp_mimetype[] = { 'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p',0 }; + static const WCHAR jpeg_mimetype[] = { 'i','m','a','g','e','/','j','p','e','g',0 }; + static const WCHAR gif_mimetype[] = { 'i','m','a','g','e','/','g','i','f',0 }; + static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; + static const WCHAR png_mimetype[] = { 'i','m','a','g','e','/','p','n','g',0 }; + static const struct test_data + { + LPCWSTR mime; + const GUID *format; + BOOL todo; + } td[] = + { + { bmp_mimetype, &ImageFormatBMP, FALSE }, + { jpeg_mimetype, &ImageFormatJPEG, FALSE }, + { gif_mimetype, &ImageFormatGIF, TRUE }, + { tiff_mimetype, &ImageFormatTIFF, FALSE }, + { png_mimetype, &ImageFormatPNG, FALSE } + }; + GUID format, clsid; + BOOL ret; + HRESULT hr; + GpStatus status; + GpBitmap *bm; + IStream *stream; + HGLOBAL hmem; + int i; + + status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bm); + ok(status == Ok, "GdipCreateBitmapFromScan0 error %d\n", status); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + ret = get_encoder_clsid(td[i].mime, &format, &clsid); + ok(ret, "%s encoder is not in the list\n", wine_dbgstr_w(td[i].mime)); + expect_guid(td[i].format, &format, __LINE__, FALSE); + + hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD, 16); + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL); + if (td[i].todo) + todo_wine ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + else + ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + + IStream_Release(stream); + } + + GdipDisposeImage((GpImage *)bm); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4556,6 +4641,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); test_DrawImage_scale();

1 0

Dmitry Timoshkov : windowscodecs/tests: Add some tests for loading truncated GIF images.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 51a3bc2d9d42bcf0065e95a1795c69c427f02ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a3bc2d9d42bcf0065e95a17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 17:09:30 2015 +0800 windowscodecs/tests: Add some tests for loading truncated GIF images. --- dlls/windowscodecs/gifformat.c | 8 ++- dlls/windowscodecs/tests/gifformat.c | 106 +++++++++++++++++++++++++++++++++-- 2 files changed, 108 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 3a82c09..d134515 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1055,10 +1055,13 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { - IStream_Release(This->stream); + if (This->stream) + { + IStream_Release(This->stream); + DGifCloseFile(This->gif); + } This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - DGifCloseFile(This->gif); HeapFree(GetProcessHeap(), 0, This); } @@ -1435,6 +1438,7 @@ HRESULT GifDecoder_CreateInstance(REFIID iid, void** ppv) This->IWICBitmapDecoder_iface.lpVtbl = &GifDecoder_Vtbl; This->IWICMetadataBlockReader_iface.lpVtbl = &GifDecoder_BlockVtbl; + This->stream = NULL; This->ref = 1; This->initialized = FALSE; This->gif = NULL; diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 5b4cd8bc..85ffc8f 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -80,15 +80,12 @@ static const char gif_frame_sizes[] = { static IWICImagingFactory *factory; -static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +static IStream *create_stream(const void *image_data, UINT image_size) { HGLOBAL hmem; BYTE *data; HRESULT hr; - IWICBitmapDecoder *decoder = NULL; IStream *stream; - GUID format; - LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -98,6 +95,20 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + return stream; +} + +static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IStream *stream; + GUID format; + LONG refcount; + + stream = create_stream(image_data, image_size); + if (!stream) return NULL; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); @@ -402,6 +413,92 @@ static void test_gif_frame_sizes(void) IWICBitmapDecoder_Release(decoder); } +static const char gif_with_trailer_1[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x80,0x00,0x00, +/* palette */0xff,0xff,0xff,0xff,0xff,0xff, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0x01,0x00,0x3b +}; +static const char gif_with_trailer_2[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x00,0x00,0x00, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0x3b +}; +static const char gif_without_trailer_1[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x80,0x00,0x00, +/* palette */0xff,0xff,0xff,0xff,0xff,0xff, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef +}; + +static const char gif_without_trailer_2[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x00,0x00,0x00, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef +}; + +static void test_truncated_gif(void) +{ + HRESULT hr; + IStream *stream; + IWICBitmapDecoder *decoder; + GUID format; + + stream = create_stream(gif_with_trailer_1, sizeof(gif_with_trailer_1)); + if (!stream) return; + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); + IStream_Release(stream); + + stream = create_stream(gif_with_trailer_2, sizeof(gif_with_trailer_2)); + if (!stream) return; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); +todo_wine + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); +if (hr != S_OK) goto skip_1; + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); +skip_1: + IStream_Release(stream); + + stream = create_stream(gif_without_trailer_1, sizeof(gif_without_trailer_1)); + if (!stream) return; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); +todo_wine + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); +if (hr != S_OK) goto skip_2; + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); +skip_2: + IStream_Release(stream); + + stream = create_stream(gif_without_trailer_2, sizeof(gif_without_trailer_2)); + if (!stream) return; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); +todo_wine + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); +if (hr != S_OK) goto skip_3; + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); +skip_3: + IStream_Release(stream); +} + START_TEST(gifformat) { HRESULT hr; @@ -428,6 +525,7 @@ START_TEST(gifformat) test_global_gif_palette_2frames(); test_local_gif_palette(); test_gif_frame_sizes(); + test_truncated_gif(); IWICImagingFactory_Release(factory); }

1 0

Dmitry Timoshkov : windowscodecs: Don' t fail to decode GIF if an image has been already loaded.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: d1fde625a352b67b06a1ae176bcde3ca62459972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fde625a352b67b06a1ae176… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 17:09:40 2015 +0800 windowscodecs: Don't fail to decode GIF if an image has been already loaded. --- dlls/windowscodecs/tests/gifformat.c | 9 --------- dlls/windowscodecs/ungif.c | 9 +++++++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 85ffc8f..53b4e47 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -459,43 +459,34 @@ static void test_truncated_gif(void) stream = create_stream(gif_with_trailer_2, sizeof(gif_with_trailer_2)); if (!stream) return; hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); -if (hr != S_OK) goto skip_1; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), "wrong container format %s\n", wine_dbgstr_guid(&format)); IWICBitmapDecoder_Release(decoder); -skip_1: IStream_Release(stream); stream = create_stream(gif_without_trailer_1, sizeof(gif_without_trailer_1)); if (!stream) return; hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); -if (hr != S_OK) goto skip_2; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), "wrong container format %s\n", wine_dbgstr_guid(&format)); IWICBitmapDecoder_Release(decoder); -skip_2: IStream_Release(stream); stream = create_stream(gif_without_trailer_2, sizeof(gif_without_trailer_2)); if (!stream) return; hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); -if (hr != S_OK) goto skip_3; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), "wrong container format %s\n", wine_dbgstr_guid(&format)); IWICBitmapDecoder_Release(decoder); -skip_3: IStream_Release(stream); } diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 427b32f..b413ff0 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -53,8 +53,10 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" - #include "ungif.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static void *ungif_alloc( size_t sz ) { @@ -491,7 +493,10 @@ DGifGetLine(GifFileType * GifFile, * image until empty block (size 0) detected. We use GetCodeNext. */ do if (DGifGetCodeNext(GifFile, &Dummy) == GIF_ERROR) - return GIF_ERROR; + { + WARN("GIF is not properly terminated\n"); + break; + } while (Dummy != NULL) ; } return GIF_OK;

1 0

Michael Müller : aclocal.m4: Search for otool using AC_CHECK_TOOL.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 2bb9ece0e981c8f55714da4483b08cb38b4b5d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb9ece0e981c8f55714da448… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 13 21:29:24 2015 +0200 aclocal.m4: Search for otool using AC_CHECK_TOOL. --- aclocal.m4 | 3 +- configure | 155 ++++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 126 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bb9ece0e981c8f55714d…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 6dad3f2121d938de594940fd8281349fc8a6e78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dad3f2121d938de594940fd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 13 19:46:13 2015 +0300 po: Update Russian translation. --- po/ru.po | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/po/ru.po b/po/ru.po index ab59f71..8fe9987 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2186,8 +2186,8 @@ msgstr "" "сертификатов.\n" "\n" "Сертификаты позволяют идентифицировать вас или компьютер, с которым " -"устанавливается связь.Также они используются для подтверждения подлинности и " -"подписывания сообщений. Хранилище сертификатов представляет собой набор " +"устанавливается связь. Также они используются для подтверждения подлинности " +"и подписывания сообщений. Хранилище сертификатов представляет собой набор " "сертификатов, списков отзыва сертификатов и списков доверенных " "сертификатов.\n" "\n" @@ -2324,8 +2324,8 @@ msgstr "" "файл.\n" "\n" "Сертификаты позволяют идентифицировать вас или компьютер, с которым " -"устанавливается связь.Также они используются для подтверждения подлинности и " -"подписывания сообщений. Хранилище сертификатов представляет собой набор " +"устанавливается связь. Также они используются для подтверждения подлинности " +"и подписывания сообщений. Хранилище сертификатов представляет собой набор " "сертификатов, списков отзыва сертификатов и списков доверенных " "сертификатов.\n" "\n" @@ -9072,7 +9072,7 @@ msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"Невозможно использовать текущее устройство для воспроизведения, т.к. оно " +"Невозможно использовать текущее устройство для воспроизведения, так как оно " "занято. Подождите, пока устройство освободится, и попробуйте заново." #: winmm.rc:114 @@ -9080,7 +9080,7 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"Невозможно использовать текущее устройство для записи, т.к. оно занято. " +"Невозможно использовать текущее устройство для записи, так как оно занято. " "Подождите, пока устройство освободится, и попробуйте заново." #: winmm.rc:115 @@ -9088,7 +9088,7 @@ msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"Невозможно использовать текущее устройство для воспроизведения, т.к. оно " +"Невозможно использовать текущее устройство для воспроизведения, так как оно " "занято. Подождите, пока устройство освободится, и попробуйте заново." #: winmm.rc:116 @@ -9741,7 +9741,6 @@ msgstr "" "другой.\n" #: cmd.rc:142 -#, fuzzy msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -9755,12 +9754,12 @@ msgid "" msgstr "" "PATH отображает или изменяет маршрут поиска в cmd.\n" "\n" -"Команда PATH отображает текущую установку пути поиска исполняемых файлов\n" -"(первоначально это значение задаётся в вашем файле wine.conf). Для\n" -"изменения значения вызовите PATH с новым значением.\n" +"Команда PATH отображает текущее значение PATH (начальное значение\n" +"задаётся в реестре). Для изменения значения вызовите PATH с новым\n" +"значением.\n" "\n" -"Так же возможно изменять значение PATH, используя значение переменной\n" -"окружения PATH, например:\n" +"Также возможно изменить значение PATH, используя переменную окружения\n" +"PATH, например:\n" "PATH %PATH%;c:\\temp\n" #: cmd.rc:148 @@ -13501,16 +13500,12 @@ msgid "Command history" msgstr "История команд" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Зона буфера" +msgstr "Р&азмер буфера:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Удалять повторяющиеся" +msgstr "&Удалять повторы" #: wineconsole.rc:74 msgid "Popup menu" @@ -13525,22 +13520,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Закрывать консоль" +msgstr "Консоль" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Быстрое редактирование" +msgstr "&Быстрое редактирование" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Режим эксперта" +msgstr "&Режим вставки" #: wineconsole.rc:88 msgid "&Font"

1 0

Dmitry Timoshkov : include: Add support for NtCurrentTeb and PSDK compiler in 64-bit mode.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 770e15eef1aee5f9cf0096be92c3d95623b260aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=770e15eef1aee5f9cf0096be9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:17:10 2015 +0800 include: Add support for NtCurrentTeb and PSDK compiler in 64-bit mode. --- include/winnt.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 68a33f3..a1116bd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2335,6 +2335,12 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); return teb; } +#elif defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(__readgsqword) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Dmitry Timoshkov : winex11.drv: On KeymapNotify event also sychronize WinKey state.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: a02c3ae7591f463a656d8189dd02c3e640c9d0f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02c3ae7591f463a656d8189d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:39:25 2015 +0800 winex11.drv: On KeymapNotify event also sychronize WinKey state. --- dlls/winex11.drv/keyboard.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b0f5b95..bd24961 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1233,6 +1233,7 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) WORD vkey; BOOL pressed; } modifiers[6]; /* VK_LSHIFT through VK_RMENU are contiguous */ + BOOL lwin_pressed = FALSE, rwin_pressed = FALSE; if (!get_async_key_state( keystate )) return; @@ -1264,6 +1265,12 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) if (!modifiers[m].vkey) modifiers[m].vkey = vkey; if (event->xkeymap.key_vector[i] & (1<<j)) modifiers[m].pressed = TRUE; break; + case VK_LWIN: + if (event->xkeymap.key_vector[i] & (1<<j)) lwin_pressed = TRUE; + break; + case VK_RWIN: + if (event->xkeymap.key_vector[i] & (1<<j)) rwin_pressed = TRUE; + break; } } } @@ -1281,12 +1288,27 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) } } + if (!(keystate[VK_LWIN] & 0x80) != !lwin_pressed) + { + TRACE( "Adjusting state for VK_LWIN. State before %#.2x\n", keystate[VK_LWIN]); + update_key_state( keystate, VK_LWIN, lwin_pressed ); + changed = TRUE; + } + if (!(keystate[VK_RWIN] & 0x80) != !rwin_pressed) + { + TRACE( "Adjusting state for VK_RWIN. State before %#.2x\n", keystate[VK_RWIN]); + update_key_state( keystate, VK_RWIN, rwin_pressed ); + changed = TRUE; + } + LeaveCriticalSection( &kbd_section ); if (!changed) return; update_key_state( keystate, VK_CONTROL, (keystate[VK_LCONTROL] | keystate[VK_RCONTROL]) & 0x80 ); update_key_state( keystate, VK_MENU, (keystate[VK_LMENU] | keystate[VK_RMENU]) & 0x80 ); update_key_state( keystate, VK_SHIFT, (keystate[VK_LSHIFT] | keystate[VK_RSHIFT]) & 0x80 ); + update_key_state( keystate, VK_LWIN, keystate[VK_LWIN] & 0x80 ); + update_key_state( keystate, VK_RWIN, keystate[VK_RWIN] & 0x80 ); set_async_key_state( keystate ); }

1 0