September 2016 - Wine-commits

Alexandre Julliard : winex11: Use the correct data type for property atoms.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 13ff291905941444cc0b3cffd0b57bca9981dff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ff291905941444cc0b3cffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 22:55:56 2016 +0900 winex11: Use the correct data type for property atoms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ed304ac..aedcd69 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -108,8 +108,8 @@ typedef HANDLE (*DRVIMPORTFUNC)(Display *d, Window w, Atom prop); typedef struct clipboard_format { struct list entry; - UINT wFormatID; - UINT drvData; + UINT id; + Atom atom; DRVIMPORTFUNC lpDrvImportFunc; DRVEXPORTFUNC lpDrvExportFunc; } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; @@ -310,11 +310,11 @@ void X11DRV_InitClipboard(void) for (i = 0; i < count; i++) { if (builtin_formats[i].name) - formats[i].wFormatID = RegisterClipboardFormatW( builtin_formats[i].name ); + formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); else - formats[i].wFormatID = builtin_formats[i].id; + formats[i].id = builtin_formats[i].id; - formats[i].drvData = GET_ATOM(builtin_formats[i].data); + formats[i].atom = GET_ATOM(builtin_formats[i].data); formats[i].lpDrvImportFunc = builtin_formats[i].import; formats[i].lpDrvExportFunc = builtin_formats[i].export; list_add_tail( &format_list, &formats[i].entry ); @@ -338,7 +338,7 @@ static void intern_atoms(void) count = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (!format->drvData) count++; + if (!format->atom) count++; if (!count) return; display = thread_init_display(); @@ -348,8 +348,8 @@ static void intern_atoms(void) i = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (!format->drvData) { - if (GetClipboardFormatNameW(format->wFormatID, buffer, 256) > 0) + if (!format->atom) { + if (GetClipboardFormatNameW( format->id, buffer, 256 ) > 0) { /* use defined format name */ len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); @@ -360,7 +360,7 @@ static void intern_atoms(void) * which is normally used by GetClipboardFormatNameW */ static const WCHAR fmt[] = {'#','%','u',0}; - len = sprintfW(buffer, fmt, format->wFormatID) + 1; + len = sprintfW(buffer, fmt, format->id) + 1; } names[i] = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, names[i++], len, NULL, NULL); @@ -370,9 +370,9 @@ static void intern_atoms(void) i = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (!format->drvData) { + if (!format->atom) { HeapFree(GetProcessHeap(), 0, names[i]); - format->drvData = atoms[i++]; + format->atom = atoms[i++]; } HeapFree( GetProcessHeap(), 0, names ); @@ -391,16 +391,16 @@ static struct clipboard_format *register_format( UINT id, Atom prop ) /* walk format chain to see if it's already registered */ LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) - if (format->wFormatID == id) return format; + if (format->id == id) return format; if (!(format = HeapAlloc( GetProcessHeap(), 0, sizeof(*format) ))) return NULL; - format->wFormatID = id; - format->drvData = prop; + format->id = id; + format->atom = prop; format->lpDrvImportFunc = import_data; format->lpDrvExportFunc = export_data; list_add_tail( &format_list, &format->entry ); - TRACE( "Registering format %s atom %lx\n", debugstr_format(id), prop ); + TRACE( "Registering format %s atom %ld\n", debugstr_format(id), prop ); return format; } @@ -408,7 +408,7 @@ static struct clipboard_format *register_format( UINT id, Atom prop ) /************************************************************************** * X11DRV_CLIPBOARD_LookupProperty */ -static LPWINE_CLIPFORMAT X11DRV_CLIPBOARD_LookupProperty(LPWINE_CLIPFORMAT current, UINT drvData) +static struct clipboard_format *X11DRV_CLIPBOARD_LookupProperty( struct clipboard_format *current, Atom prop ) { for (;;) { @@ -417,9 +417,9 @@ static LPWINE_CLIPFORMAT X11DRV_CLIPBOARD_LookupProperty(LPWINE_CLIPFORMAT curre while ((ptr = list_next( &format_list, ptr ))) { - LPWINE_CLIPFORMAT lpFormat = LIST_ENTRY( ptr, WINE_CLIPFORMAT, entry ); - if (lpFormat->drvData == drvData) return lpFormat; - if (!lpFormat->drvData) need_intern = TRUE; + struct clipboard_format *format = LIST_ENTRY( ptr, struct clipboard_format, entry ); + if (format->atom == prop) return format; + if (!format->atom) need_intern = TRUE; } if (!need_intern) return NULL; intern_atoms(); @@ -1319,7 +1319,7 @@ HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom clipFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, target); if (clipFormat) { - *windowsFormat = clipFormat->wFormatID; + *windowsFormat = clipFormat->id; return clipFormat->lpDrvImportFunc(d, w, prop); } return NULL; @@ -1967,9 +1967,9 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p */ while (lpFormat) { - TRACE("Atom#%d Property(%d): --> Format %s\n", - i, lpFormat->drvData, debugstr_format(lpFormat->wFormatID)); - X11DRV_CLIPBOARD_InsertClipboardData(lpFormat->wFormatID, 0, lpFormat, FALSE); + TRACE( "atom #%d property(%ld) -> format %s\n", + i, lpFormat->atom, debugstr_format(lpFormat->id) ); + X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); } } @@ -2010,9 +2010,9 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p ERR("Failed to register %s property. Type will not be cached.\n", names[i]); continue; } - TRACE("Atom#%d Property(%d): --> Format %s\n", - i, lpFormat->drvData, debugstr_format(lpFormat->wFormatID)); - X11DRV_CLIPBOARD_InsertClipboardData(lpFormat->wFormatID, 0, lpFormat, FALSE); + TRACE( "atom #%d property(%ld) -> format %s\n", + i, lpFormat->atom, debugstr_format(lpFormat->id) ); + X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); } for (i = 0; i < nb_atoms; i++) XFree( names[i] ); HeapFree( GetProcessHeap(), 0, names ); @@ -2159,11 +2159,11 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA return FALSE; } - TRACE("Requesting conversion of %s property (%d) from selection type %08x\n", - debugstr_format(lpData->lpFormat->wFormatID), lpData->lpFormat->drvData, + TRACE("Requesting conversion of %s property (%ld) from selection type %08x\n", + debugstr_format(lpData->lpFormat->id), lpData->lpFormat->atom, (UINT)selectionCacheSrc); - XConvertSelection(display, selectionCacheSrc, lpData->lpFormat->drvData, + XConvertSelection(display, selectionCacheSrc, lpData->lpFormat->atom, x11drv_atom(SELECTION_DATA), w, CurrentTime); /* wait until SelectionNotify is received */ @@ -2745,8 +2745,8 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if ((format->wFormatID == lpData->wFormatID) && - format->lpDrvExportFunc && format->drvData) + if ((format->id == lpData->wFormatID) && + format->lpDrvExportFunc && format->atom) cTargets++; TRACE(" found %d formats\n", cTargets); @@ -2761,9 +2761,9 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if ((format->wFormatID == lpData->wFormatID) && - format->lpDrvExportFunc && format->drvData) - targets[i++] = format->drvData; + if ((format->id == lpData->wFormatID) && + format->lpDrvExportFunc && format->atom) + targets[i++] = format->atom; if (TRACE_ON(clipboard)) { @@ -2947,7 +2947,7 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev if (lpFormat && lpFormat->lpDrvExportFunc) { - LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(lpFormat->wFormatID); + LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(lpFormat->id); if (lpData) { @@ -2961,7 +2961,7 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev int mode = PropModeReplace; TRACE("\tUpdating property %s, %d bytes\n", - debugstr_format(lpFormat->wFormatID), cBytes); + debugstr_format(lpFormat->id), cBytes); do { int nelements = min(cBytes, 65536);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.19
by Jeremy Newman 19 Sep '16

19 Sep '16

Module: website Branch: master Commit: 7062283c17596a45e5b261455b09910c2b815fae URL: http://source.winehq.org/git/website.git/?a=commit;h=7062283c17596a45e5b261… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Sep 17 08:53:34 2016 +0200 Polish translation for release 1.9.19 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016091701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016091701.xml b/news/pl/2016091701.xml new file mode 100644 index 0000000..8e6224c --- /dev/null +++ b/news/pl/2016091701.xml @@ -0,0 +1,16 @@ +<news> +<date>Wrzesień 17, 2016</date> +<title>Wydano Wine 1.9.19</title> +<body> + Wydanie rozwojowe Wine 1.9.19 jest już dostępne. + <a href="{$root}/announce/1.9.19">Co nowego</a> w tym wydaniu: +<ul> + <li>Początkowa wersja sterownika szyny udev dla HID.</li> + <li>Rozmaite usprawnienia w obsłudze joysticka.</li> + <li>Początkowa implementacja wyświeltania DC w Direct2D.</li> + <li>Ulepszona obsługa metaplików w GDI+.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.19.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.9.19
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: website Branch: master Commit: 12d7b294e0c22879fce6a9498699636e876055ec URL: http://source.winehq.org/git/website.git/?a=commit;h=12d7b294e0c22879fce6a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 17 00:16:18 2016 +0900 Wine release 1.9.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016091701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016091701.xml b/news/en/2016091701.xml new file mode 100644 index 0000000..c579305 --- /dev/null +++ b/news/en/2016091701.xml @@ -0,0 +1,16 @@ +<news> +<date>September 17, 2016</date> +<title>Wine 1.9.19 Released</title> +<body> + The Wine development release 1.9.19 is now available. + <a href="{$root}/announce/1.9.19">What's new</a> in this release: +<ul> + <li>Initial version of a udev bus driver for HID.</li> + <li>Various improvements in joystick support.</li> + <li>Initial implementation of DC rendering in Direct2D.</li> + <li>Improved metafile support in GDI+.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.19.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Dmitry Timoshkov : windowscodecs: Add support for 32bppGrayFloat format.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: 8836ed61aa77b55296b8b7097c599f8e054c621b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8836ed61aa77b55296b8b7097… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 15 16:10:17 2016 -0500 windowscodecs: Add support for 32bppGrayFloat format. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 45 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + dlls/windowscodecs/tests/converter.c | 37 +++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 4 files changed, 84 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index efe78d8..21301cb 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -49,6 +49,7 @@ enum pixelformat { format_16bppBGRA5551, format_24bppBGR, format_24bppRGB, + format_32bppGrayFloat, format_32bppBGR, format_32bppBGRA, format_32bppPBGRA, @@ -996,6 +997,49 @@ static HRESULT copypixels_to_24bppRGB(struct FormatConverter *This, const WICRec } } +static HRESULT copypixels_to_32bppGrayFloat(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppBGR: + case format_32bppBGRA: + case format_32bppPBGRA: + case format_32bppGrayFloat: + if (prc) + { + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + break; + } + return S_OK; + + default: + hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + break; + } + + if (SUCCEEDED(hr) && prc && source_format != format_32bppGrayFloat) + { + INT x, y; + BYTE *p = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = p; + for (x = 0; x < prc->Width; x++) + { + float gray = (bgr[2] * 0.2126f + bgr[1] * 0.7152f + bgr[0] * 0.0722f) / 255.0f; + *(float *)bgr = gray; + bgr += 4; + } + p += cbStride; + } + } + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, @@ -1011,6 +1055,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_16bppBGRA5551, &GUID_WICPixelFormat16bppBGRA5551, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, copypixels_to_24bppBGR}, {format_24bppRGB, &GUID_WICPixelFormat24bppRGB, copypixels_to_24bppRGB}, + {format_32bppGrayFloat, &GUID_WICPixelFormat32bppGrayFloat, copypixels_to_32bppGrayFloat}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index ff499e5..10a6c03 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1452,6 +1452,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, + &GUID_WICPixelFormat32bppGrayFloat, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat32bppCMYK, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index d6f581d..ef60552 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -35,6 +35,7 @@ typedef struct bitmap_data { UINT height; double xres; double yres; + const struct bitmap_data *alt_data; } bitmap_data; typedef struct BitmapTestSrc { @@ -43,6 +44,11 @@ typedef struct BitmapTestSrc { const bitmap_data *data; } BitmapTestSrc; +static BOOL near_equal(float a, float b) +{ + return fabsf(a - b) < 0.001; +} + static inline BitmapTestSrc *impl_from_IWICBitmapSource(IWICBitmapSource *iface) { return CONTAINING_RECORD(iface, BitmapTestSrc, IWICBitmapSource_iface); @@ -213,9 +219,24 @@ static BOOL compare_bits(const struct bitmap_data *expect, UINT buffersize, cons break; } } + else if (IsEqualGUID(expect->format, &GUID_WICPixelFormat32bppGrayFloat)) + { + UINT i; + const float *a=(const float*)expect->bits, *b=(const float*)converted_bits; + equal=TRUE; + for (i=0; i<(buffersize/4); i++) + if (!near_equal(a[i], b[i])) + { + equal = FALSE; + break; + } + } else equal = (memcmp(expect->bits, converted_bits, buffersize) == 0); + if (!equal && expect->alt_data) + equal = compare_bits(expect->alt_data, buffersize, converted_bits); + return equal; } @@ -289,6 +310,19 @@ static const BYTE bits_32bppBGRA[] = { static const struct bitmap_data testdata_32bppBGRA = { &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGRA, 4, 2, 96.0, 96.0}; +/* XP and 2003 use linear color conversion, later versions use sRGB gamma */ +static const float bits_32bppGrayFloat_xp[] = { + 0.114000f,0.587000f,0.299000f,0.000000f, + 0.886000f,0.413000f,0.701000f,1.000000f}; +static const struct bitmap_data testdata_32bppGrayFloat_xp = { + &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat_xp, 4, 2, 96.0, 96.0}; + +static const float bits_32bppGrayFloat[] = { + 0.072200f,0.715200f,0.212600f,0.000000f, + 0.927800f,0.284800f,0.787400f,1.000000f}; +static const struct bitmap_data testdata_32bppGrayFloat = { + &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat, 4, 2, 96.0, 96.0, &testdata_32bppGrayFloat_xp}; + static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { BitmapTestSrc *src_obj; @@ -729,6 +763,9 @@ START_TEST(converter) test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_24bppRGB, "32bppBGRA -> 24bppRGB", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_32bppGrayFloat, "24bppRGB -> 32bppGrayFloat", FALSE); + test_conversion(&testdata_32bppBGR, &testdata_32bppGrayFloat, "32bppBGR -> 32bppGrayFloat", FALSE); + test_invalid_conversion(); test_default_converter(); diff --git a/include/wincodec.idl b/include/wincodec.idl index 639d925..83daba8 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -196,6 +196,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGB, 0xd98c6b95,0x3efe,0x47d6,0xbb,0x25,0xeb,0x17,0x48,0xab,0x0c,0xf1);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGBA, 0xf5c7ad2d,0x6a8d,0x43dd,0xa7,0xa8,0xa2,0x99,0x35,0x26,0x1a,0xe9);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPRGBA, 0x3cc4a650,0xa527,0x4d37,0xa9,0x16,0x31,0x42,0xc7,0xeb,0xed,0xba);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppGrayFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x11);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);")

1 0

Dmitry Timoshkov : windowscodecs: Add support for converting to 8bpp grayscale format.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: 1196c3a2a285c5f0b5b542d83546f12e605bcc20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1196c3a2a285c5f0b5b542d83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 15 16:10:18 2016 -0500 windowscodecs: Add support for converting to 8bpp grayscale format. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 101 ++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/converter.c | 15 ++++++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 21301cb..002d917 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,7 @@ #include "config.h" #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -78,6 +80,55 @@ typedef struct FormatConverter { CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; +/* https://www.w3.org/Graphics/Color/srgb */ +static inline float from_sRGB_component(float f) +{ + if (f <= 0.04045f) return f / 12.92f; + return powf((f + 0.055f) / 1.055f, 2.4f); +} + +static inline float to_sRGB_component(float f) +{ + if (f <= 0.0031308f) return 12.92f * f; + return 1.055f * powf(f, 1.0f/2.4f) - 0.055f; +} + +#if 0 /* FIXME: enable once needed */ +static void from_sRGB(BYTE *bgr) +{ + float r, g, b; + + r = bgr[2] / 255.0f; + g = bgr[1] / 255.0f; + b = bgr[0] / 255.0f; + + r = from_sRGB_component(r); + g = from_sRGB_component(g); + b = from_sRGB_component(b); + + bgr[2] = (BYTE)(r * 255.0f); + bgr[1] = (BYTE)(g * 255.0f); + bgr[0] = (BYTE)(b * 255.0f); +} + +static void to_sRGB(BYTE *bgr) +{ + float r, g, b; + + r = bgr[2] / 255.0f; + g = bgr[1] / 255.0f; + b = bgr[0] / 255.0f; + + r = to_sRGB_component(r); + g = to_sRGB_component(g); + b = to_sRGB_component(b); + + bgr[2] = (BYTE)(r * 255.0f); + bgr[1] = (BYTE)(g * 255.0f); + bgr[0] = (BYTE)(b * 255.0f); +} +#endif + static inline FormatConverter *impl_from_IWICFormatConverter(IWICFormatConverter *iface) { return CONTAINING_RECORD(iface, FormatConverter, IWICFormatConverter_iface); @@ -1040,6 +1091,54 @@ static HRESULT copypixels_to_32bppGrayFloat(struct FormatConverter *This, const return hr; } +static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + UINT srcstride, srcdatasize; + + if (source_format == format_8bppGray) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + float gray = (bgr[2] * 0.2126f + bgr[1] * 0.7152f + bgr[0] * 0.0722f) / 255.0f; + + gray = to_sRGB_component(gray) * 255.0f; + dst[x] = (BYTE)floorf(gray + 0.51f); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, @@ -1048,7 +1147,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, - {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, + {format_8bppGray, &GUID_WICPixelFormat8bppGray, copypixels_to_8bppGray}, {format_16bppGray, &GUID_WICPixelFormat16bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index ef60552..6297e1b 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -323,6 +323,18 @@ static const float bits_32bppGrayFloat[] = { static const struct bitmap_data testdata_32bppGrayFloat = { &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat, 4, 2, 96.0, 96.0, &testdata_32bppGrayFloat_xp}; +static const BYTE bits_8bppGray_xp[] = { + 29,150,76,0, + 226,105,179,255}; +static const struct bitmap_data testdata_8bppGray_xp = { + &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray_xp, 4, 2, 96.0, 96.0}; + +static const BYTE bits_8bppGray[] = { + 76,220,127,0, + 247,145,230,255}; +static const struct bitmap_data testdata_8bppGray = { + &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray, 4, 2, 96.0, 96.0, &testdata_8bppGray_xp}; + static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { BitmapTestSrc *src_obj; @@ -766,6 +778,9 @@ START_TEST(converter) test_conversion(&testdata_24bppRGB, &testdata_32bppGrayFloat, "24bppRGB -> 32bppGrayFloat", FALSE); test_conversion(&testdata_32bppBGR, &testdata_32bppGrayFloat, "32bppBGR -> 32bppGrayFloat", FALSE); + test_conversion(&testdata_24bppBGR, &testdata_8bppGray, "24bppBGR -> 8bppGray", FALSE); + test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); + test_invalid_conversion(); test_default_converter();

1 0

Dmitry Timoshkov : windowscodecs: Add support for converting 32bpp grayscale float to 24bpp BGR format.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: fa36f75c68d1cb53bdc3596ad0d4d1258cd9dbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa36f75c68d1cb53bdc3596ad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 15 16:10:19 2016 -0500 windowscodecs: Add support for converting 32bpp grayscale float to 24bpp BGR format. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 43 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 7 ++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 002d917..7ff6bec 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -969,6 +969,49 @@ static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRec return res; } return S_OK; + + case format_32bppGrayFloat: + if (prc) + { + BYTE *srcdata; + UINT srcstride, srcdatasize; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + float *gray_float = (float *)src; + BYTE *bgr = dst; + + for (x = 0; x < prc->Width; x++) + { + BYTE gray = (BYTE)floorf(to_sRGB_component(gray_float[x]) * 255.0f + 0.51f); + *bgr++ = gray; + *bgr++ = gray; + *bgr++ = gray; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return hr; + } + return S_OK; + default: FIXME("Unimplemented conversion path!\n"); return WINCODEC_ERR_UNSUPPORTEDOPERATION; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 6297e1b..7ca201a 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -335,6 +335,12 @@ static const BYTE bits_8bppGray[] = { static const struct bitmap_data testdata_8bppGray = { &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray, 4, 2, 96.0, 96.0, &testdata_8bppGray_xp}; +static const BYTE bits_24bppBGR_gray[] = { + 76,76,76, 220,220,220, 127,127,127, 0,0,0, + 247,247,247, 145,145,145, 230,230,230, 255,255,255}; +static const struct bitmap_data testdata_24bppBGR_gray = { + &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR_gray, 4, 2, 96.0, 96.0}; + static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { BitmapTestSrc *src_obj; @@ -780,6 +786,7 @@ START_TEST(converter) test_conversion(&testdata_24bppBGR, &testdata_8bppGray, "24bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); + test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Alexandre Julliard : winex11: Merge named formats into the builtin clipboard formats table.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: 217f05466acdb905d7b86513fae65e94cbf15674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=217f05466acdb905d7b86513f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 16:58:38 2016 +0900 winex11: Merge named formats into the builtin clipboard formats table. Also rename the import/export functions to make the table more readable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 319 +++++++++++++++++++------------------------ 1 file changed, 141 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=217f05466acdb905d7b86…

1 0

Alexandre Julliard : winex11: Get rid of the X11DRV_CLIPBOARD_SerializeMetafile helper.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: 9f2ccf315eff6b245d56f1200a292ca8893e9b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2ccf315eff6b245d56f1200… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 17:30:49 2016 +0900 winex11: Get rid of the X11DRV_CLIPBOARD_SerializeMetafile helper. THere's no common code between the different branches anyway. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 137 ++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 81 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index acbcac8..190935c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -159,7 +159,6 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, unsigned char** data, unsigned long* datasize); static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData); -static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDWORD lpcbytes, BOOL out); static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *event, BOOL bIsMultiple ); static void empty_clipboard(void); @@ -1128,7 +1127,20 @@ static HANDLE import_metafile(Display *display, Window w, Atom prop) if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) { if (cbytes) - hClipData = X11DRV_CLIPBOARD_SerializeMetafile(CF_METAFILEPICT, lpdata, (LPDWORD)&cbytes, FALSE); + { + hClipData = GlobalAlloc(0, sizeof(METAFILEPICT)); + if (hClipData) + { + unsigned int wiresize; + LPMETAFILEPICT lpmfp = GlobalLock(hClipData); + + memcpy(lpmfp, lpdata, sizeof(METAFILEPICT)); + wiresize = cbytes - sizeof(METAFILEPICT); + lpmfp->hMF = SetMetaFileBitsEx(wiresize, + ((const BYTE *)lpdata) + sizeof(METAFILEPICT)); + GlobalUnlock(hClipData); + } + } /* Free the retrieved property data */ HeapFree(GetProcessHeap(), 0, lpdata); @@ -1150,7 +1162,7 @@ static HANDLE import_enhmetafile(Display *display, Window w, Atom prop) if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) { if (cbytes) - hClipData = X11DRV_CLIPBOARD_SerializeMetafile(CF_ENHMETAFILE, lpdata, (LPDWORD)&cbytes, FALSE); + hClipData = SetEnhMetaFileBits(cbytes, lpdata); /* Free the retrieved property data */ HeapFree(GetProcessHeap(), 0, lpdata); @@ -1641,13 +1653,36 @@ static HANDLE export_image_bmp(Display *display, Window requestor, Atom aTarget, static HANDLE export_metafile(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { + LPMETAFILEPICT lpmfp; + unsigned int size; + HANDLE h; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) { ERR("Failed to export %04x format\n", lpdata->wFormatID); return 0; } - return X11DRV_CLIPBOARD_SerializeMetafile(CF_METAFILEPICT, lpdata->hData, lpBytes, TRUE); + *lpBytes = 0; /* Assume failure */ + + lpmfp = GlobalLock(lpdata->hData); + size = GetMetaFileBitsEx(lpmfp->hMF, 0, NULL); + + h = GlobalAlloc(0, size + sizeof(METAFILEPICT)); + if (h) + { + char *pdata = GlobalLock(h); + + memcpy(pdata, lpmfp, sizeof(METAFILEPICT)); + GetMetaFileBitsEx(lpmfp->hMF, size, pdata + sizeof(METAFILEPICT)); + + *lpBytes = size + sizeof(METAFILEPICT); + + GlobalUnlock(h); + } + GlobalUnlock(lpdata->hData); + + return h; } @@ -1659,13 +1694,29 @@ static HANDLE export_metafile(Display *display, Window requestor, Atom aTarget, static HANDLE export_enhmetafile(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { + unsigned int size; + HANDLE h; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) { ERR("Failed to export %04x format\n", lpdata->wFormatID); return 0; } - return X11DRV_CLIPBOARD_SerializeMetafile(CF_ENHMETAFILE, lpdata->hData, lpBytes, TRUE); + *lpBytes = 0; /* Assume failure */ + + size = GetEnhMetaFileBits(lpdata->hData, 0, NULL); + h = GlobalAlloc(0, size); + if (h) + { + LPVOID pdata = GlobalLock(h); + + GetEnhMetaFileBits(lpdata->hData, size, pdata); + *lpBytes = size; + + GlobalUnlock(h); + } + return h; } @@ -2348,82 +2399,6 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, /************************************************************************** - * CLIPBOARD_SerializeMetafile - */ -static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDWORD lpcbytes, BOOL out) -{ - HANDLE h = 0; - - TRACE(" wFormat=%d hdata=%p out=%d\n", wformat, hdata, out); - - if (out) /* Serialize out, caller should free memory */ - { - *lpcbytes = 0; /* Assume failure */ - - if (wformat == CF_METAFILEPICT) - { - LPMETAFILEPICT lpmfp = GlobalLock(hdata); - unsigned int size = GetMetaFileBitsEx(lpmfp->hMF, 0, NULL); - - h = GlobalAlloc(0, size + sizeof(METAFILEPICT)); - if (h) - { - char *pdata = GlobalLock(h); - - memcpy(pdata, lpmfp, sizeof(METAFILEPICT)); - GetMetaFileBitsEx(lpmfp->hMF, size, pdata + sizeof(METAFILEPICT)); - - *lpcbytes = size + sizeof(METAFILEPICT); - - GlobalUnlock(h); - } - - GlobalUnlock(hdata); - } - else if (wformat == CF_ENHMETAFILE) - { - int size = GetEnhMetaFileBits(hdata, 0, NULL); - - h = GlobalAlloc(0, size); - if (h) - { - LPVOID pdata = GlobalLock(h); - - GetEnhMetaFileBits(hdata, size, pdata); - *lpcbytes = size; - - GlobalUnlock(h); - } - } - } - else - { - if (wformat == CF_METAFILEPICT) - { - h = GlobalAlloc(0, sizeof(METAFILEPICT)); - if (h) - { - unsigned int wiresize; - LPMETAFILEPICT lpmfp = GlobalLock(h); - - memcpy(lpmfp, hdata, sizeof(METAFILEPICT)); - wiresize = *lpcbytes - sizeof(METAFILEPICT); - lpmfp->hMF = SetMetaFileBitsEx(wiresize, - ((const BYTE *)hdata) + sizeof(METAFILEPICT)); - GlobalUnlock(h); - } - } - else if (wformat == CF_ENHMETAFILE) - { - h = SetEnhMetaFileBits(*lpcbytes, hdata); - } - } - - return h; -} - - -/************************************************************************** * X11DRV_CLIPBOARD_ReleaseSelection * * Release XA_CLIPBOARD and XA_PRIMARY in response to a SelectionClear event.

1 0

Huw Davies : user32/tests: Add space for the mask data to prevent failures on Win 8 and 10.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: 512c8f94444689b949387ddc1c5eb97e6d5de5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=512c8f94444689b949387ddc1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 16 15:17:33 2016 +0100 user32/tests: Add space for the mask data to prevent failures on Win 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5f2306a..4b79d46 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -83,6 +83,7 @@ typedef struct { typedef struct { BYTE data[32*32*4]; + BYTE mask_data[32*32/8]; } ani_data32x32x32; typedef struct {

1 0

Alexandre Julliard : Release 1.9.19.
by Alexandre Julliard 16 Sep '16

16 Sep '16

Module: wine Branch: master Commit: e2ebc0dc23f0fa04ea79cefc9e3d2faf189a6bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ebc0dc23f0fa04ea79cefc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 17 00:14:20 2016 +0900 Release 1.9.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 639 ++++++++++++++++++++++++-------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 253 insertions(+), 408 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2ebc0dc23f0fa04ea79c…

1 0