April 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Merge drawStridedSlow() and drawStridedSlowVs().
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: f3c155cc56eb31fa9294d388e755208a2633c398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c155cc56eb31fa9294d388e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:05 2016 +0200 wined3d: Merge drawStridedSlow() and drawStridedSlowVs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 15 +-- dlls/wined3d/context.c | 5 +- dlls/wined3d/directx.c | 6 +- dlls/wined3d/drawprim.c | 351 ++++++++++++++++++------------------------------ dlls/wined3d/state.c | 20 +-- dlls/wined3d/utils.c | 26 ++-- 6 files changed, 166 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3c155cc56eb31fa9294d…

1 0

Henri Verbeet : wined3d: Merge drawStridedFast() and drawStridedInstanced( ).
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: d85706381c9d85065dea262914d9c2a94705f610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85706381c9d85065dea26291… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:06 2016 +0200 wined3d: Merge drawStridedFast() and drawStridedInstanced(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/drawprim.c | 211 +++++++++++++++++++++++------------------------- 2 files changed, 101 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d85706381c9d85065dea2…

1 0

Stefan Dösinger : wined3d: Get rid of wined3d_texture_ops.texture_sub_resource_load().
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 7d23c8a4d822e8bcda4be074f915538bdfcf846b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d23c8a4d822e8bcda4be074f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 6 19:12:07 2016 +0200 wined3d: Get rid of wined3d_texture_ops.texture_sub_resource_load(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 --------------------- dlls/wined3d/texture.c | 18 +++--------------- dlls/wined3d/volume.c | 8 -------- dlls/wined3d/wined3d_private.h | 5 ----- 4 files changed, 3 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d898bc..9c015cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1422,27 +1422,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const checkGLcall("set_compatible_renderbuffer"); } -/* Context activation is done by the caller. */ -void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - DWORD location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - - TRACE("surface %p, srgb %#x.\n", surface, srgb); - - if (surface->container->resource.pool == WINED3D_POOL_SCRATCH) - ERR("Not supported on scratch surfaces.\n"); - - if (surface_get_sub_resource(surface)->locations & location) - { - TRACE("surface is already in texture\n"); - return; - } - TRACE("Reloading because surface is dirty.\n"); - - surface_load_location(surface, context, location); - surface_evict_sysmem(surface); -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3476b32..b31b0e1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -663,7 +663,9 @@ void wined3d_texture_load(struct wined3d_texture *texture, /* Reload the surfaces if the texture is marked dirty. */ for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i].resource, context, srgb); + if (!texture->texture_ops->texture_load_location(texture, i, context, + srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB)) + ERR("Failed to load location (srgb %#x).\n", srgb); } texture->flags |= flag; } @@ -1087,12 +1089,6 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, return WINED3D_OK; } -static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb) -{ - surface_load(surface_from_resource(sub_resource), context, srgb); -} - static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { @@ -1203,7 +1199,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture2d_ops = { - texture2d_sub_resource_load, texture2d_sub_resource_upload_data, texture2d_load_location, texture2d_prepare_location, @@ -1689,12 +1684,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb) -{ - wined3d_volume_load(volume_from_resource(sub_resource), context, srgb); -} - static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { @@ -1766,7 +1755,6 @@ static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture3d_ops = { - texture3d_sub_resource_load, texture3d_sub_resource_upload_data, texture3d_load_location, texture3d_prepare_location, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 60bc2d7..02b5db6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -355,14 +355,6 @@ done: return TRUE; } -/* Context activation is done by the caller. */ -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) -{ - wined3d_texture_prepare_texture(volume->container, context, srgb_mode); - wined3d_volume_load_location(volume, context, - srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); -} - void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca1065f..cb6d967 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2416,8 +2416,6 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_sub_resource_load)(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb); void (*texture_sub_resource_upload_data)(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2580,8 +2578,6 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc void wined3d_volume_cleanup(struct wined3d_volume *volume) DECLSPEC_HIDDEN; HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, - BOOL srgb_mode) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, @@ -2698,7 +2694,6 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags) DECLSPEC_HIDDEN; -void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface,

1 0

Vincent Povirk : gdiplus: Fix bounds of recorded Metafile objects.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 18e65a95a7e294af04a62696a8181a72860c561f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e65a95a7e294af04a62696a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:55 2016 -0500 gdiplus: Fix bounds of recorded Metafile objects. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 19 +++++++++++-- dlls/gdiplus/tests/metafile.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 922c101..79bf5c3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -260,8 +260,9 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->image.palette = NULL; (*metafile)->image.xres = dpix; (*metafile)->image.yres = dpiy; - (*metafile)->bounds = *frameRect; - (*metafile)->unit = frameUnit; + (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; + (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; + (*metafile)->unit = UnitPixel; (*metafile)->metafile_type = type; (*metafile)->record_dc = record_dc; (*metafile)->comment_data = NULL; @@ -471,6 +472,20 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) metafile->comment_data = NULL; metafile->comment_data_size = 0; + if (stat == Ok) + { + MetafileHeader header; + + stat = GdipGetMetafileHeaderFromEmf(metafile->hemf, &header); + if (stat == Ok) + { + metafile->bounds.X = header.X; + metafile->bounds.Y = header.Y; + metafile->bounds.Width = header.Width; + metafile->bounds.Height = header.Height; + } + } + return stat; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 0c52718..086a261 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1141,6 +1141,68 @@ static void test_converttoemfplus(void) expect(Ok, stat); } +static void test_frameunit(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpUnit unit; + REAL dpix, dpiy; + GpRectF bounds; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitInch, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &dpix); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &dpiy); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(5.0 * dpix, bounds.Width, 1.0); + expectf_(5.0 * dpiy, bounds.Height, 1.0); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1166,6 +1228,7 @@ START_TEST(metafile) test_fillrect(); test_pagetransform(); test_converttoemfplus(); + test_frameunit(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Add test for creating a metafile with NULL frameRect.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 1e67fcce9d99bb427f2154c7dd490dd89c0e9fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e67fcce9d99bb427f2154c7d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:56 2016 -0500 gdiplus: Add test for creating a metafile with NULL frameRect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 086a261..932fe1c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -862,6 +862,117 @@ static void test_fillrect(void) expect(Ok, stat); } +static void test_nullframerect(void) { + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc, metafile_dc; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpBrush *brush; + HBRUSH hbrush, holdbrush; + GpRectF bounds; + GpUnit unit; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitPixel, description, &metafile); + todo_wine expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 25, 25, 75, 75); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(1.0, bounds.Width); + expectf(1.0, bounds.Height); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf_(25.0, bounds.X, 0.05); + expectf_(25.0, bounds.Y, 0.05); + expectf_(75.0, bounds.Width, 0.05); + expectf_(75.0, bounds.Height, 0.05); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitMillimeter, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + expectf_(25.0, bounds.X, 0.05); + expectf_(25.0, bounds.Y, 0.05); + expectf_(50.0, bounds.Width, 0.05); + expectf_(50.0, bounds.Height, 0.05); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + static const emfplus_record pagetransform_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, @@ -1226,6 +1337,7 @@ START_TEST(metafile) test_getdc(); test_emfonly(); test_fillrect(); + test_nullframerect(); test_pagetransform(); test_converttoemfplus(); test_frameunit();

1 0

Vincent Povirk : gdiplus: Allow recording metafiles with a NULL frame.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 4ed1b4f5e8fdad19555899ad2ec14da903205e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed1b4f5e8fdad19555899ad2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:57 2016 -0500 gdiplus: Allow recording metafiles with a NULL frame. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 71 ++++++++++++++++++++++--------------------- dlls/gdiplus/tests/metafile.c | 14 ++++----- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 79bf5c3..82a7abf 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -195,7 +195,7 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF HDC record_dc; REAL dpix, dpiy; REAL framerect_factor_x, framerect_factor_y; - RECT rc; + RECT rc, *lprc; GpStatus stat; TRACE("(%p %d %p %d %p %p)\n", hdc, type, frameRect, frameUnit, desc, metafile); @@ -203,46 +203,47 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) return InvalidParameter; - if (!frameRect) - { - FIXME("not implemented for NULL rect\n"); - return NotImplemented; - } - dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; - switch (frameUnit) + if (frameRect) { - case MetafileFrameUnitPixel: - framerect_factor_x = 2540.0 / dpix; - framerect_factor_y = 2540.0 / dpiy; - break; - case MetafileFrameUnitPoint: - framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; - break; - case MetafileFrameUnitInch: - framerect_factor_x = framerect_factor_y = 2540.0; - break; - case MetafileFrameUnitDocument: - framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; - break; - case MetafileFrameUnitMillimeter: - framerect_factor_x = framerect_factor_y = 100.0; - break; - case MetafileFrameUnitGdi: - framerect_factor_x = framerect_factor_y = 1.0; - break; - default: - return InvalidParameter; - } + switch (frameUnit) + { + case MetafileFrameUnitPixel: + framerect_factor_x = 2540.0 / dpix; + framerect_factor_y = 2540.0 / dpiy; + break; + case MetafileFrameUnitPoint: + framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; + break; + case MetafileFrameUnitInch: + framerect_factor_x = framerect_factor_y = 2540.0; + break; + case MetafileFrameUnitDocument: + framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; + break; + case MetafileFrameUnitMillimeter: + framerect_factor_x = framerect_factor_y = 100.0; + break; + case MetafileFrameUnitGdi: + framerect_factor_x = framerect_factor_y = 1.0; + break; + default: + return InvalidParameter; + } + + rc.left = framerect_factor_x * frameRect->X; + rc.top = framerect_factor_y * frameRect->Y; + rc.right = rc.left + framerect_factor_x * frameRect->Width; + rc.bottom = rc.top + framerect_factor_y * frameRect->Height; - rc.left = framerect_factor_x * frameRect->X; - rc.top = framerect_factor_y * frameRect->Y; - rc.right = rc.left + framerect_factor_x * frameRect->Width; - rc.bottom = rc.top + framerect_factor_y * frameRect->Height; + lprc = &rc; + } + else + lprc = NULL; - record_dc = CreateEnhMetaFileW(hdc, NULL, &rc, desc); + record_dc = CreateEnhMetaFileW(hdc, NULL, lprc, desc); if (!record_dc) return GenericError; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 932fe1c..550dc6b 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -876,7 +876,7 @@ static void test_nullframerect(void) { hdc = CreateCompatibleDC(0); stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitPixel, description, &metafile); - todo_wine expect(Ok, stat); + expect(Ok, stat); DeleteDC(hdc); @@ -917,10 +917,10 @@ static void test_nullframerect(void) { stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); expect(Ok, stat); expect(UnitPixel, unit); - expectf_(25.0, bounds.X, 0.05); - expectf_(25.0, bounds.Y, 0.05); - expectf_(75.0, bounds.Width, 0.05); - expectf_(75.0, bounds.Height, 0.05); + todo_wine expectf_(25.0, bounds.X, 0.05); + todo_wine expectf_(25.0, bounds.Y, 0.05); + todo_wine expectf_(75.0, bounds.Width, 0.05); + todo_wine expectf_(75.0, bounds.Height, 0.05); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); @@ -966,8 +966,8 @@ static void test_nullframerect(void) { expect(UnitPixel, unit); expectf_(25.0, bounds.X, 0.05); expectf_(25.0, bounds.Y, 0.05); - expectf_(50.0, bounds.Width, 0.05); - expectf_(50.0, bounds.Height, 0.05); + todo_wine expectf_(50.0, bounds.Width, 0.05); + todo_wine expectf_(50.0, bounds.Height, 0.05); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Implement GdipRecordMetafileStream.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: a9e4e3b4031c86b476f3b2488df130655212908c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e4e3b4031c86b476f3b2488… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 14:36:58 2016 -0500 gdiplus: Implement GdipRecordMetafileStream. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 7 ------ dlls/gdiplus/image.c | 4 ++++ dlls/gdiplus/metafile.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0013d75..10092f1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -343,6 +343,7 @@ struct GpMetafile{ BYTE *comment_data; DWORD comment_data_size; DWORD comment_data_length; + IStream *record_stream; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 15c0bed..dac52ef 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6436,13 +6436,6 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 brush, positions, flags, matrix); } -GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRect *frameRect, - MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) -{ - FIXME("(%p %p %d %p %d %p %p): stub\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); - return NotImplemented; -} - /***************************************************************************** * GdipIsVisibleClipEmpty [GDIPLUS.@] */ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f803efa..d1a5593 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2142,6 +2142,10 @@ static GpStatus free_image_data(GpImage *image) metafile->record_graphics->image = NULL; metafile->record_graphics->busy = TRUE; } + if (metafile->record_stream) + { + IStream_Release(metafile->record_stream); + } } else { diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 82a7abf..ee16d8e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -308,6 +308,27 @@ GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect return GdipRecordMetafile(hdc, type, pFrameRectF, frameUnit, desc, metafile); } +GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + GpStatus stat; + + TRACE("(%p %p %d %p %d %p %p)\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); + + if (!stream) + return InvalidParameter; + + stat = GdipRecordMetafile(hdc, type, frameRect, frameUnit, desc, metafile); + + if (stat == Ok) + { + (*metafile)->record_stream = stream; + IStream_AddRef(stream); + } + + return stat; +} + GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) { GpStatus stat; @@ -487,6 +508,37 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) } } + if (stat == Ok && metafile->record_stream) + { + BYTE *buffer; + UINT buffer_size; + + buffer_size = GetEnhMetaFileBits(metafile->hemf, 0, NULL); + + buffer = heap_alloc(buffer_size); + if (buffer) + { + HRESULT hr; + + GetEnhMetaFileBits(metafile->hemf, buffer_size, buffer); + + hr = IStream_Write(metafile->record_stream, buffer, buffer_size, NULL); + + if (FAILED(hr)) + stat = hresult_to_status(hr); + + heap_free(buffer); + } + else + stat = OutOfMemory; + } + + if (metafile->record_stream) + { + IStream_Release(metafile->record_stream); + metafile->record_stream = NULL; + } + return stat; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 264aeb6570c538d3a50178879f5e3782c2957d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=264aeb6570c538d3a50178879… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 6 22:15:00 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0086d6a..6041789 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-04 22:30+0300\n" +"PO-Revision-Date: 2016-04-06 22:14+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11646,15 +11646,10 @@ msgstr "" "reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n" #: reg.rc:54 -#, fuzzy -#| msgid "" -#| "reg: Unable to delete all registry values in '%1'. An unexpected error " -#| "occurred.\n" msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" -msgstr "" -"reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n" +msgstr "reg: Nepavyko užbaigti nurodytos operacijos. Įvyko netikėta klaida.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Michael Müller : winex11: Add 320x240 as supported resolution in desktop mode.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: b49601b5cef28a14f1bf5f5dbb56ae3bfa79f1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49601b5cef28a14f1bf5f5db… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 07:47:49 2016 +0200 winex11: Add 320x240 as supported resolution in desktop mode. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 72916c8..034d7f3 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 240, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Dmitry Timoshkov : user32: Avoid dereferencing NULL pointer in a trace.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: e37e0f27438e9c8d17c43fd84652b3daa6014f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37e0f27438e9c8d17c43fd84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 7 07:50:54 2016 +0200 user32: Avoid dereferencing NULL pointer in a trace. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 33aedbd..8474e2d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3472,7 +3472,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) { WND *wndPtr; - TRACE( "%p\n", pfinfo->hwnd ); + TRACE( "%p\n", pfinfo ); if (!pfinfo) {

1 0