Re: [3/4] gdiplus: Load EMF images directly instead of through olepicture.

[Dmitry Timoshkov]

Vincent Povirk  wrote:
> @@ -4721,7 +4767,7 @@ static const struct image_codec codecs[NUM_CODECS] = {
>              /* SigMask */            emf_sig_mask,
>          },
>          NULL,
> -
>    decode_image_olepicture_metafile,
> -
>    decode_image_emf,
>    NULL
> },

This patch is very incomplete, and probably won't pass the 'make test'.
wine-staging contains a pretty full and well tested patch that reimplements
metafile loading in gdiplus using gdi32 APis:
https://github.com/wine-compholio/wine-staging/blob/master/patches/oleaut32-...
it should be possible to either use it directly or as a base for your work.
There are some other related patches in staging that touch the metafile
loading in gdiplus.

[3/4] gdiplus: Load EMF images directly instead of through olepicture.

[Vincent Povirk]

> This patch is very incomplete, and probably won't pass the 'make test'.

It did for me, but that's not saying much. The current IPicture-based
loading is quite broken.
> wine-staging contains a pretty full and well tested patch that reimplements
> metafile loading in gdiplus using gdi32 APis:
> https://github.com/wine-compholio/wine-staging/blob/master/patches/oleaut32-...
> it should be possible to either use it directly or as a base for your work.
> There are some other related patches in staging that touch the metafile
> loading in gdiplus.

Yes, that looks better than my version of emf loading. Would you be
willing to send it to wine-patches?

[3/4] gdiplus: Load EMF images directly instead of through olepicture.

[Sebastian Lackner]

On 17.08.2016 06:14, Vincent Povirk wrote:
> > This patch is very incomplete, and probably won't pass the 'make test'.
>
> It did for me, but that's not saying much. The current IPicture-based
> loading is quite broken.
> > wine-staging contains a pretty full and well tested patch that reimplements
> > metafile loading in gdiplus using gdi32 APis:
> > https://github.com/wine-compholio/wine-staging/blob/master/patches/oleaut32-...
> > it should be possible to either use it directly or as a base for your work.
> > There are some other related patches in staging that touch the metafile
> > loading in gdiplus.
>
> Yes, that looks better than my version of emf loading. Would you be
> willing to send it to wine-patches?

Its probably not necessary when Dmitry will send it himself, however I would
also like to remind that everyone is welcome to pick up work-in-progress patches
stored in the Staging tree and to improve them for upstream inclusion.

Dmitrys patches also have some minor issues left:

* Second parameter for GdipCreateMetafileFromEmf is wrong.
* STREAM_SEEK_SET at the beginning is unnecessary.
* Errors are not passed through correctly in the decode_image_metafile wrapper.

Regards,
Sebastian