August 2013 - Wine-devel - list.winehq.org

Re: windowscodecs: Workaround libtiff bug when it defines toff_t as 32-bit for 32-bit builds. Take 3.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -208,9 +233,22 @@ static TIFF* tiff_open_stream(IStream *stream, const char *mode) > zero.QuadPart = 0; > IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); > > + /* Workaround for broken libtiff 4.x headers on some 64-bit hosts which > + * define TIFF_UINT64_T/toff_t as 32-bit for 32-bit builds, while they > + * are supposed to be always 64-bit. > + * TIFF_UINT64_T doesn't exist in libtiff 3.x, it was introduced in 4.x. > + */ > +#ifdef TIFF_UINT64_T > + /* libtiff 4.x */ > + return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, > + tiff_stream_write, (void *)tiff_stream_seek, tiff_stream_close, > + (void *)tiff_stream_size, (void *)tiff_stream_map, (void *)tiff_stream_unmap); > +#else > + /* libtiff 3.x */ > return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, > - tiff_stream_write, tiff_stream_seek, tiff_stream_close, > - tiff_stream_size, tiff_stream_map, tiff_stream_unmap); > + tiff_stream_write, tiff_stream_seek_v3, tiff_stream_close, > + tiff_stream_size_v3, tiff_stream_map_v3, tiff_stream_unmap_v3); > +#endif Now that you are using ifdefs there's no reason to have two sets of functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: oledb32: Add IDataSourceLocator support
by Alistair Leslie-Hughes 01 Aug '13

01 Aug '13

Ignore this patch On 1/08/2013 6:36 PM, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > oledb32: Add IDataSourceLocator support > > > Best Regards > Alistair Leslie-Hughes > > >

1 0

Re: Re: apphelp: Implement SdbTagToString.
by Marvin 01 Aug '13

01 Aug '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=26567 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0