wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Dmitry Timoshkov : gdiplus: Add missing 'break'.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: 9697829511b91b0207bada9284ca25a3e7f3f9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9697829511b91b0207bada928… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 26 11:29:25 2012 +0900 gdiplus: Add missing 'break'. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c20eee5..9972f40 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3578,6 +3578,7 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, { memcpy(&wicformat, pixel_formats[i].wic_format, sizeof(GUID)); gdipformat = bitmap->format; + break; } } if (!gdipformat)

1 0

Alexandre Julliard : msvcr90/tests: Fix tests for errno values.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: 9e76bcf33151410da9460dbd2b3fc9d5e7efccc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e76bcf33151410da9460dbd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 11:06:37 2012 +0200 msvcr90/tests: Fix tests for errno values. --- dlls/msvcr90/tests/msvcr90.c | 94 ++++++++++++++++++++++------------------- 1 files changed, 50 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e76bcf33151410da9460…

1 0

Alexandre Julliard : msvcrt: Make sure that errno is always set when calling the invalid parameter handler .
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: 06989a04834bfd8dc8bbf33bfd34485c2d8e8542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06989a04834bfd8dc8bbf33bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 11:05:32 2012 +0200 msvcrt: Make sure that errno is always set when calling the invalid parameter handler. --- dlls/msvcrt/data.c | 19 +------- dlls/msvcrt/dir.c | 25 ++++------- dlls/msvcrt/environ.c | 54 ++++++++++-------------- dlls/msvcrt/errno.c | 11 ++--- dlls/msvcrt/file.c | 77 ++++++++++------------------------ dlls/msvcrt/heap.c | 10 ++--- dlls/msvcrt/math.c | 16 ++----- dlls/msvcrt/mbcs.c | 10 ++--- dlls/msvcrt/misc.c | 15 +++---- dlls/msvcrt/msvcrt.h | 5 +- dlls/msvcrt/printf.h | 3 +- dlls/msvcrt/string.c | 108 +++++++++++++++++++++---------------------------- dlls/msvcrt/time.c | 87 ++++++++++++++-------------------------- dlls/msvcrt/wcs.c | 66 +++++++++++------------------- 14 files changed, 184 insertions(+), 322 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06989a04834bfd8dc8bbf…

1 0

Lucas Zawacki : Portuguese translation for release 1.5.9
by Jeremy Newman 26 Jul '12

26 Jul '12

Module: website Branch: master Commit: 56e0cd8f43d85e57098abd9cac5e68cb5ce7b686 URL: http://source.winehq.org/git/website.git/?a=commit;h=56e0cd8f43d85e57098abd… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Jul 24 16:04:37 2012 -0300 Portuguese translation for release 1.5.9 --- news/pt/2012071701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012071701.xml b/news/pt/2012071701.xml new file mode 100644 index 0000000..7fd6938 --- /dev/null +++ b/news/pt/2012071701.xml @@ -0,0 +1,17 @@ +<news> +<date>17 de Julho de 2012</date> +<title>Wine 1.5.9 lançado</title> +<body> + A versão de desenvolvmento 1.5.9 já está disponível. + <a href="{$root}/announce/1.5.9">Novidades</a> nesta versão: +<ul> + <li>Suporte a tabelas GPOS de fontes no Uniscribe.</li> + <li>Suporte ao XRandr 1.2 e 1.3.</li> + <li>Melhoras no parser do compilador HLSL.</li> + <li>Mais algoritmos de troca de chaves suportados no Mac OS.</li> + <li>Relay tracing na arquitetura ARM.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.9.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Alexandre Julliard : patches: Avoid deadlocks when uncompressing large patches.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: tools Branch: master Commit: 4a01b75984f9120fe7b87881311b79f9c8b17d4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=4a01b75984f9120fe7b87881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 14:31:20 2012 +0200 patches: Avoid deadlocks when uncompressing large patches. --- patches/filter | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/filter b/patches/filter index bed4dca..dbdb9ec 100755 --- a/patches/filter +++ b/patches/filter @@ -20,7 +20,7 @@ use strict; use Email::MIME; -use IPC::Open2; +use File::Temp; use Encode; my $debug = 0; @@ -127,16 +127,18 @@ sub decode_parts(@) $name =~ /\.bz2$/ || $name =~ /\.gz$/) { - my $cmd = "gunzip -c"; + my ($file, $filename) = File::Temp::tempfile(); + my $cmd = "gunzip -c >$filename"; if ($type =~ /^application\/x-bzip2/ || $name =~ /\.bz2$/) { - $cmd = "bunzip2 -c"; + $cmd = "bunzip2 -c >$filename"; } - open2( *READ, *WRITE, $cmd) or die "cannot run $cmd"; + open WRITE, "|$cmd" or die "cannot run $cmd"; print WRITE $part->body; close WRITE; - push @lines, filter_patch(<READ>); - close READ; + push @lines, filter_patch(<$file>); + close $file; + unlink $filename; } elsif ($type =~ /^multipart/) {

1 0

Dan Kegel : msvcp100: Add _Container_base0::_Swap_all, _Container_base0:: _Orphan_all.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 47b9dd1b55979bd810517f2bf4e0f5947c73ab60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b9dd1b55979bd810517f2bf… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jul 24 13:33:40 2012 -0700 msvcp100: Add _Container_base0::_Swap_all, _Container_base0::_Orphan_all. --- dlls/msvcp100/msvcp100.c | 46 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 8 +++--- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index ed44b72..6a24a97 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -18,14 +18,60 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" +/* Copied from dlls/msvcrt/cpp.c */ +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#else /* __i386__ */ + +#define THISCALL(func) func +#define THISCALL_NAME(func) __ASM_NAME(#func) +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#endif /* __i386__ */ + /* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */ const __int64 std_BADOFF = -1; +/* _Container_base0 is used by apps compiled without iterator checking + * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). + * It provides empty versions of methods used by visual c++'s stl's + * iterator checking. + * msvcr100 has to provide them in case apps are compiled with /Od + * or the optimizer fails to inline those (empty) calls. + */ + +/* ?_Orphan_all@_Container_base0@std@@QAEXXZ */ +/* ?_Orphan_all@_Container_base0@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) +void __thiscall Container_base0_Orphan_all(void *this) +{ +} + +/* ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z */ +/* ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) +void __thiscall Container_base0_Swap_all(void *this, void *that) +{ +} + BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index c26de60..5fb3c39 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1123,8 +1123,8 @@ @ cdecl -arch=win32 ?_Mutex_dtor@_Mutex@std@@CAXPAV12@@Z(ptr) msvcp90.?_Mutex_dtor@_Mutex@std@@CAXPAV12@@Z @ cdecl -arch=win64 ?_Mutex_dtor@_Mutex@std@@CAXPEAV12@@Z(ptr) msvcp90.?_Mutex_dtor@_Mutex@std@@CAXPEAV12@@Z @ stub ?_Nomemory@std@@YAXXZ -@ stub -arch=win32 ?_Orphan_all@_Container_base0@std@@QAEXXZ -@ stub -arch=win64 ?_Orphan_all@_Container_base0@std@@QEAAXXZ +@ thiscall -arch=win32 ?_Orphan_all@_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all +@ cdecl -arch=win64 ?_Orphan_all@_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all @ stub -arch=win32 ?_Orphan_all@_Container_base12@std@@QAEXXZ @ stub -arch=win64 ?_Orphan_all@_Container_base12@std@@QEAAXXZ @ thiscall -arch=win32 ?_Osfx@?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) msvcp90.?_Osfx@?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEXXZ @@ -1202,8 +1202,8 @@ @ stub -arch=win64 ?_Segment_index_of@_Concurrent_vector_base_v4@details@Concurrency@@KA_K_K@Z @ cdecl -arch=win32 ?_Setgloballocale@locale@std@@CAXPAX@Z(ptr) msvcp90.?_Setgloballocale@locale@std@@CAXPAX@Z @ cdecl -arch=win64 ?_Setgloballocale@locale@std@@CAXPEAX@Z(ptr) msvcp90.?_Setgloballocale@locale@std@@CAXPEAX@Z -@ stub -arch=win32 ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z -@ stub -arch=win64 ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z +@ thiscall -arch=win32 ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all +@ cdecl -arch=win64 ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) Container_base0_Swap_all @ stub -arch=win32 ?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z @ stub -arch=win64 ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z @ extern ?_Sync@ios_base@std@@0_NA msvcp90.?_Sync@ios_base@std@@0_NA

1 0

Dmitry Timoshkov : gdiplus: Handle image loading failures under some XP versions.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: c67951c70adb8c719e35769b9fcfa2b24b78be42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67951c70adb8c719e35769b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 25 18:11:05 2012 +0900 gdiplus: Handle image loading failures under some XP versions. --- dlls/gdiplus/tests/image.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 7f89aec..3d17f3d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2702,7 +2702,13 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); status = GdipLoadImageFromStream(stream, &image); - ok(status == Ok, "GdipLoadImageFromStream error %d\n", status); + ok(status == Ok || broken(status == InvalidParameter), /* XP */ + "GdipLoadImageFromStream error %d\n", status); + if (status != Ok) + { + IStream_Release(stream); + return NULL; + } status = GdipGetImageType(image, &image_type); ok(status == Ok, "GdipGetImageType error %d\n", status); @@ -2770,8 +2776,11 @@ static void test_image_properties(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { image = load_image(td[i].image_data, td[i].image_size); - ok(image != 0, "%u: failed to load image data\n", i); - if (!image) continue; + if (!image) + { + trace("%u: failed to load image data\n", i); + continue; + } status = GdipGetImageType(image, &image_type); ok(status == Ok, "%u: GdipGetImageType error %d\n", i, status);

1 0

Dmitry Timoshkov : gdiplus: Make get_palette() usable for generating predefined palettes.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 0b40df2990284ae5d6f5386c994e8902cb7114e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b40df2990284ae5d6f5386c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:28:20 2012 +0900 gdiplus: Make get_palette() usable for generating predefined palettes. --- dlls/gdiplus/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index cef619f..c20eee5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -76,7 +76,9 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); if (hr == S_OK) { - hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); + hr = WINCODEC_ERR_PALETTEUNAVAILABLE; + if (frame) + hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); if (hr != S_OK) { TRACE("using predefined palette %#x\n", palette_type);

1 0

Dmitry Timoshkov : gdiplus: Add 8bppGray to the list of supported formats.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: f165e2725f79dbb879fdf692600673d2c5386cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f165e2725f79dbb879fdf6926… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:27:29 2012 +0900 gdiplus: Add 8bppGray to the list of supported formats. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a93ade5..cef619f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -52,6 +52,7 @@ static const struct { { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 },

1 0

Dmitry Timoshkov : gdiplus: Use predefined palette if an image doesn' t provide one.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 271d801ea49538e196f04290fc83cd57955fed17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271d801ea49538e196f04290f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 18 17:26:38 2012 +0900 gdiplus: Use predefined palette if an image doesn't provide one. --- dlls/gdiplus/image.c | 88 +++++++++++++++++++++++-------------------------- 1 files changed, 41 insertions(+), 47 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 81fa16b..a93ade5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -42,7 +42,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) -static ColorPalette *get_palette(IWICBitmapFrameDecode *frame) +static const struct +{ + const WICPixelFormatGUID *wic_format; + PixelFormat gdip_format; + /* predefined palette type to use for pixel format conversions */ + WICBitmapPaletteType palette_type; +} pixel_formats[] = +{ + { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { NULL } +}; + +static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteType palette_type) { HRESULT hr; IWICImagingFactory *factory; @@ -57,6 +76,11 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame) if (hr == S_OK) { hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); + if (hr != S_OK) + { + TRACE("using predefined palette %#x\n", palette_type); + hr = IWICPalette_InitializePredefined(wic_palette, palette_type, FALSE); + } if (hr == S_OK) { UINT count; @@ -3003,29 +3027,6 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * return GdipLoadImageFromFile(filename, image); } -static const WICPixelFormatGUID * const wic_pixel_formats[] = { - &GUID_WICPixelFormatBlackWhite, - &GUID_WICPixelFormat1bppIndexed, - &GUID_WICPixelFormat8bppIndexed, - &GUID_WICPixelFormat16bppBGR555, - &GUID_WICPixelFormat24bppBGR, - &GUID_WICPixelFormat32bppBGR, - &GUID_WICPixelFormat32bppBGRA, - &GUID_WICPixelFormat32bppPBGRA, - NULL -}; - -static const PixelFormat wic_gdip_formats[] = { - PixelFormat1bppIndexed, - PixelFormat1bppIndexed, - PixelFormat8bppIndexed, - PixelFormat16bppRGB555, - PixelFormat24bppRGB, - PixelFormat32bppRGB, - PixelFormat32bppARGB, - PixelFormat32bppPARGB, -}; - static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { GpStatus status=Ok; @@ -3038,6 +3039,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr WICPixelFormatGUID wic_format; PixelFormat gdip_format=0; ColorPalette *palette = NULL; + WICBitmapPaletteType palette_type = WICBitmapPaletteTypeFixedHalftone256; int i; UINT width, height, frame_count; BitmapData lockeddata; @@ -3066,12 +3068,13 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICBitmapSource *bmp_source; IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICBitmapSource, (void **)&bmp_source); - for (i=0; wic_pixel_formats[i]; i++) + for (i=0; pixel_formats[i].wic_format; i++) { - if (IsEqualGUID(&wic_format, wic_pixel_formats[i])) + if (IsEqualGUID(&wic_format, pixel_formats[i].wic_format)) { source = bmp_source; - gdip_format = wic_gdip_formats[i]; + gdip_format = pixel_formats[i].gdip_format; + palette_type = pixel_formats[i].palette_type; break; } } @@ -3146,7 +3149,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICMetadataBlockReader_Release(block_reader); } - palette = get_palette(frame); + palette = get_palette(frame, palette_type); IWICBitmapFrameDecode_Release(frame); } @@ -3566,30 +3569,21 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, if (SUCCEEDED(hr)) { - for (i=0; wic_pixel_formats[i]; i++) + for (i=0; pixel_formats[i].wic_format; i++) { - if (wic_gdip_formats[i] == bitmap->format) - break; + if (pixel_formats[i].gdip_format == bitmap->format) + { + memcpy(&wicformat, pixel_formats[i].wic_format, sizeof(GUID)); + gdipformat = bitmap->format; + } } - if (wic_pixel_formats[i]) - memcpy(&wicformat, wic_pixel_formats[i], sizeof(GUID)); - else + if (!gdipformat) + { memcpy(&wicformat, &GUID_WICPixelFormat32bppBGRA, sizeof(GUID)); + gdipformat = PixelFormat32bppARGB; + } hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &wicformat); - - for (i=0; wic_pixel_formats[i]; i++) - { - if (IsEqualGUID(&wicformat, wic_pixel_formats[i])) - break; - } - if (wic_pixel_formats[i]) - gdipformat = wic_gdip_formats[i]; - else - { - ERR("cannot provide pixel format %s\n", debugstr_guid(&wicformat)); - hr = E_FAIL; - } } if (SUCCEEDED(hr))

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012