March 2011 - Wine-Commits - list.winehq.org

Thomas Mullaly : urlmon/tests: Added CoInternetParseUrl tests.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 2f5ca80ccef913454d3260bf54b210dfd18cf519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5ca80ccef913454d3260bf5… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun Mar 20 15:40:23 2011 -0400 urlmon/tests: Added CoInternetParseUrl tests. --- dlls/urlmon/tests/misc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index fc1ba53..47ab4f8 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -271,7 +271,8 @@ static const WCHAR url9[] = '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', '.','j','p','g',0}; - +static const WCHAR url11[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','*','.', + 'c','o','m',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -283,10 +284,13 @@ static const WCHAR wszFile[] = {'f','i','l','e',0}; static const WCHAR wszHttp[] = {'h','t','t','p',0}; static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; static const WCHAR wszEmpty[] = {0}; +static const WCHAR wszGoogle[] = {'g','o','o','g','l','e','.','*','.','c','o','m',0}; static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR wszHttpWineHQ[] = {'h','t','t','p',':','/','/','w','w','w','.', 'w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR wszHttpGoogle[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e', + '.','*','.','c','o','m',0}; struct parse_test { LPCWSTR url; @@ -308,6 +312,7 @@ static const struct parse_test parse_tests[] = { {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK, NULL, E_FAIL}, {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK, wszHttpWineHQ, S_OK}, {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL, NULL, E_FAIL}, + {url11, E_FAIL, url11, E_INVALIDARG, NULL, wszHttp, wszGoogle, S_OK, wszHttpGoogle, S_OK} }; static void test_CoInternetParseUrl(void)

1 0

Vincent Povirk : windowscodecs: Add support for reading tiled TIFF images.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 10080298dc7fb1ca3dee7903101dfd1de8fcfa5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=10080298dc7fb1ca3dee79031… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 25 15:59:41 2011 -0500 windowscodecs: Add support for reading tiled TIFF images. --- dlls/windowscodecs/tiffformat.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 976870a..b1dd152 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -62,6 +62,7 @@ MAKE_FUNCPTR(TIFFGetField); MAKE_FUNCPTR(TIFFIsByteSwapped); MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); +MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); #undef MAKE_FUNCPTR @@ -89,6 +90,7 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFIsByteSwapped); LOAD_FUNCPTR(TIFFReadDirectory); LOAD_FUNCPTR(TIFFReadEncodedStrip); + LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); #undef LOAD_FUNCPTR @@ -215,6 +217,8 @@ typedef struct { UINT tile_width, tile_height; UINT tile_stride; UINT tile_size; + int tiled; + UINT tiles_across; } tiff_decode_info; typedef struct { @@ -248,6 +252,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->indexed = 0; decode_info->reverse_bgr = 0; decode_info->invert_grayscale = 0; + decode_info->tiled = 0; ret = pTIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric); if (!ret) @@ -418,8 +423,28 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } - ret = pTIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &decode_info->tile_height); - if (ret) + if ((ret = pTIFFGetField(tiff, TIFFTAG_TILEWIDTH, &decode_info->tile_width))) + { + decode_info->tiled = 1; + + if (!ret) + { + WARN("missing tile width\n"); + return E_FAIL; + } + + ret = pTIFFGetField(tiff, TIFFTAG_TILELENGTH, &decode_info->tile_height); + if (!ret) + { + WARN("missing tile height\n"); + return E_FAIL; + } + + decode_info->tile_stride = ((decode_info->bpp * decode_info->tile_width + 7)/8); + decode_info->tile_size = decode_info->tile_height * decode_info->tile_stride; + decode_info->tiles_across = (decode_info->width + decode_info->tile_width - 1) / decode_info->tile_width; + } + else if ((ret = pTIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &decode_info->tile_height))) { if (decode_info->tile_height > decode_info->height) decode_info->tile_height = decode_info->height; @@ -429,7 +454,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } else { - /* Probably a tiled image */ FIXME("missing RowsPerStrip value\n"); return E_FAIL; } @@ -797,7 +821,14 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT if (hr == S_OK) { - ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); + if (This->decode_info.tiled) + { + ret = pTIFFReadEncodedTile(This->parent->tiff, tile_x + tile_y * This->decode_info.tiles_across, This->cached_tile, This->decode_info.tile_size); + } + else + { + ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); + } if (ret == -1) hr = E_FAIL;

1 0

Thomas Mullaly : urlmon/tests: Added zone domain mapping tests.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: b9308fa06f4bcce4c340e6d9199c52c6b5ad9130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9308fa06f4bcce4c340e6d91… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Fri Mar 11 00:55:31 2011 -0500 urlmon/tests: Added zone domain mapping tests. --- dlls/urlmon/tests/sec_mgr.c | 235 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 234 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9308fa06f4bcce4c340e…

1 0

Thomas Mullaly : urlmon/tests: Added SecurityManager zone mapping cache tests.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: b41d85d773f2c3f65eaa38425bb7a84bba95ea95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41d85d773f2c3f65eaa38425… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Wed Mar 9 22:03:49 2011 -0500 urlmon/tests: Added SecurityManager zone mapping cache tests. --- dlls/urlmon/tests/sec_mgr.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 1711755..6af2622 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1,6 +1,7 @@ /* * Copyright 2005-2006 Jacek Caban for CodeWeavers * Copyright 2009-2010 Detlef Riekenberg + * Copyright 2011 Thomas Mullaly for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +36,8 @@ #include "initguid.h" +#define URLZONE_CUSTOM URLZONE_USER_MIN+1 + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -99,6 +102,8 @@ static const WCHAR security_url2W[] = {'w','i','n','e','t','e','s','t',':','t',' static const WCHAR security_expectedW[] = {'w','i','n','e','t','e','s','t',':','z','i','p',0}; static const WCHAR winetest_to_httpW[] = {'w','i','n','e','t','e','s','t',':','h',0}; +static const char *szZoneMapDomainsKey = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap\\Domains"; + static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', '.','w','i','n','e','t','e','s','t',3,0,0,0}; @@ -453,6 +458,69 @@ static void test_polices(void) IInternetZoneManager_Release(zonemgr); } +/* IE (or at least newer versions of it) seem to cache the keys in ZoneMap + * when urlmon.dll is loaded and it doesn't seem to update its cache, unless + * SetZoneMapping is used. + */ +static void test_zone_domain_cache(void) +{ + HRESULT hres; + DWORD res, zone; + IInternetSecurityManager *secmgr = NULL; + HKEY domains, domain; + + static const WCHAR testing_domain_urlW[] = {'h','t','t','p',':','/','/','t','e','s','t','i','n','g','.', + 'd','o','m','a','i','n','/',0}; + + res = RegOpenKeyA(HKEY_CURRENT_USER, szZoneMapDomainsKey, &domains); + ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); + if(res != ERROR_SUCCESS) + return; + + res = RegCreateKeyA(domains, "testing.domain", &domain); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + if(res != ERROR_SUCCESS) { + RegCloseKey(domains); + return; + } + + zone = URLZONE_CUSTOM; + res = RegSetValueExA(domain, "http", 0, REG_DWORD, (BYTE*)&zone, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); + + RegCloseKey(domain); + + hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0); + ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); + + zone = URLZONE_INVALID; + hres = IInternetSecurityManager_MapUrlToZone(secmgr, testing_domain_urlW, &zone, 0); + ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); + ok(zone == URLZONE_INTERNET, "Got %d, expected URLZONE_INTERNET\n", zone); + + /* FIXME: Play nice with ZoneMaps that existed before the test is run. */ + res = RegDeleteKeyA(domains, "testing.domain"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + RegCloseKey(domains); + IInternetSecurityManager_Release(secmgr); +} + +static void test_zone_domains(void) +{ + if(is_ie_hardened()) { + skip("IE running in Enhanced Security Configuration\n"); + return; + } else if(!pCreateUri) { + win_skip("Skipping zone domain tests, IE too old\n"); + return; + } + + trace("testing zone domains...\n"); + + test_zone_domain_cache(); +} + static void test_CoInternetCreateZoneManager(void) { IInternetZoneManager *zonemgr = NULL; @@ -1202,6 +1270,7 @@ START_TEST(sec_mgr) test_SecurityManager(); test_polices(); + test_zone_domains(); test_CoInternetCreateZoneManager(); test_CreateZoneEnumerator(); test_GetZoneActionPolicy();

1 0

Dan Kegel : urlmon: IsValidUrl should not fail if first parameter is not NULL.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 6bbd0b87d5e9a7568f42ee7e90c299ac836a70ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbd0b87d5e9a7568f42ee7e9… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Mar 21 01:45:51 2011 +0000 urlmon: IsValidUrl should not fail if first parameter is not NULL. --- dlls/urlmon/tests/misc.c | 11 +++++++++++ dlls/urlmon/urlmon_main.c | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cd3372c..fc1ba53 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1454,9 +1454,20 @@ static void test_MkParseDisplayNameEx(void) static void test_IsValidURL(void) { HRESULT hr; + IBindCtx *bctx = NULL; hr = IsValidURL(NULL, 0, 0); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IsValidURL(NULL, wszHttpWineHQ, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + CreateBindCtx(0, &bctx); + + hr = IsValidURL(bctx, wszHttpWineHQ, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + IBindCtx_Release(bctx); } START_TEST(misc) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 57eeaf9..01442c1 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -426,7 +426,7 @@ HRESULT WINAPI DllRegisterServerEx(void) * Determines if a specified string is a valid URL. * * PARAMS - * pBC [I] ignored, must be NULL. + * pBC [I] ignored, should be NULL. * szURL [I] string that represents the URL in question. * dwReserved [I] reserved and must be zero. * @@ -442,7 +442,7 @@ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved) { FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved); - if (pBC || dwReserved || !szURL) + if (dwReserved || !szURL) return E_INVALIDARG; return S_OK;

1 0

Eric Pouech : dbghelp: Now that compilers (like clang) start to merge symbols across compilation units, no longer barf about duplicates.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: b10977fc3cdfec0203132b30e0e620f9efda1946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10977fc3cdfec0203132b30e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:23 2011 +0100 dbghelp: Now that compilers (like clang) start to merge symbols across compilation units, no longer barf about duplicates. --- dlls/dbghelp/elf_module.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index c663455..4ea27f6 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -767,28 +767,6 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h */ module->sortlist_valid = TRUE; } - else if (strcmp(ste->ht_elt.name, symt->hash_elt.name)) - { - ULONG64 xaddr = 0, xsize = 0; - DWORD kind = -1; - - symt_get_address(&symt->symt, &xaddr); - symt_get_info(module, &symt->symt, TI_GET_LENGTH, &xsize); - symt_get_info(module, &symt->symt, TI_GET_DATAKIND, &kind); - - /* If none of symbols has a correct size, we consider they are both markers - * Hence, we can silence this warning - * Also, we check that we don't have two symbols, one local, the other - * global which is legal - */ - if ((xsize || ste->symp->st_size) && - (kind == (ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal)) - FIXME("Duplicate in %s: %s<%08lx-%08x> %s<%s-%s>\n", - debugstr_w(module->module.ModuleName), - ste->ht_elt.name, addr, (unsigned int)ste->symp->st_size, - symt->hash_elt.name, - wine_dbgstr_longlong(xaddr), wine_dbgstr_longlong(xsize)); - } } } /* see comment above */

1 0

Thomas Mullaly : shlwapi: Improved UrlGetPart support when parsing host names.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 65d3eab864adac58022af2c6af5f5b31a96f764f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d3eab864adac58022af2c6a… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Thu Mar 17 12:24:26 2011 -0400 shlwapi: Improved UrlGetPart support when parsing host names. --- dlls/shlwapi/tests/url.c | 4 ++++ dlls/shlwapi/url.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0a4dcb3..5a035ac 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -56,6 +56,8 @@ static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD); static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; static const char* TEST_URL_3 = "http://foo:bar(a)localhost:21/internal.php?query=x&return=y"; +static const char* TEST_URL_4 = "http://foo:bar(a)google.*.com:21/internal.php?query=x&return=y"; + static const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; static const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; @@ -690,6 +692,8 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com"); + test_url_part(file_url, URL_PART_HOSTNAME, 0, "h o s t"); test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org"); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 6b469e2..b8c51a4 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2049,7 +2049,8 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) if (isalnumW(*start) || (*start == '-') || (*start == '.') || - (*start == ' ') ) { + (*start == ' ') || + (*start == '*') ) { start++; (*size)++; }

1 0

Vincent Povirk : gdiplus: Implement color transforms.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 805f0321ebffe0db2d39f414c0f19c21958bb3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805f0321ebffe0db2d39f414c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 24 16:50:05 2011 -0500 gdiplus: Implement color transforms. --- dlls/gdiplus/graphics.c | 65 +++++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/image.c | 30 +++++++++++++++++--- 2 files changed, 88 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7d2dbcd..840825a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -331,6 +331,45 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) } } +static ARGB transform_color(ARGB color, const ColorMatrix *matrix) +{ + REAL val[5], res[4]; + int i, j; + unsigned char a, r, g, b; + + val[0] = ((color >> 16) & 0xff) / 255.0; /* red */ + val[1] = ((color >> 8) & 0xff) / 255.0; /* green */ + val[2] = (color & 0xff) / 255.0; /* blue */ + val[3] = ((color >> 24) & 0xff) / 255.0; /* alpha */ + val[4] = 1.0; /* translation */ + + for (i=0; i<4; i++) + { + res[i] = 0.0; + + for (j=0; j<5; j++) + res[i] += matrix->m[j][i] * val[j]; + } + + a = min(max(floorf(res[3]*255.0), 0.0), 255.0); + r = min(max(floorf(res[0]*255.0), 0.0), 255.0); + g = min(max(floorf(res[1]*255.0), 0.0), 255.0); + b = min(max(floorf(res[2]*255.0), 0.0), 255.0); + + return (a << 24) | (r << 16) | (g << 8) | b; +} + +static int color_is_gray(ARGB color) +{ + unsigned char r, g, b; + + r = (color >> 16) & 0xff; + g = (color >> 8) & 0xff; + b = color & 0xff; + + return (r == g) && (g == b); +} + static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type) { @@ -400,9 +439,29 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d if (attributes->colormatrices[type].enabled || attributes->colormatrices[ColorAdjustTypeDefault].enabled) { - static int fixme; - if (!fixme++) - FIXME("Color transforms not implemented\n"); + const struct color_matrix *colormatrices; + + if (attributes->colormatrices[type].enabled) + colormatrices = &attributes->colormatrices[type]; + else + colormatrices = &attributes->colormatrices[ColorAdjustTypeDefault]; + + for (x=0; x<width; x++) + for (y=0; y<height; y++) + { + ARGB *src_color; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + + if (colormatrices->flags == ColorMatrixFlagsDefault || + !color_is_gray(*src_color)) + { + *src_color = transform_color(*src_color, &colormatrices->colormatrix); + } + else if (colormatrices->flags == ColorMatrixFlagsAltGray) + { + *src_color = transform_color(*src_color, &colormatrices->graymatrix); + } + } } if (attributes->gamma_enabled[type] || diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 71a99ea..cbae047 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1923,6 +1923,12 @@ static void test_colormatrix(void) {0.0,0.0,1.0,0.0,0.0}, {0.0,0.0,0.0,1.0,0.0}, {0.0,0.0,0.0,0.0,1.0}}}; + const ColorMatrix asymmetric = {{ + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {1.0,0.0,0.0,0.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; GpBitmap *bitmap1, *bitmap2; GpGraphics *graphics; ARGB color; @@ -1983,13 +1989,13 @@ static void test_colormatrix(void) TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); expect(Ok, stat); - stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppARGB, NULL, &bitmap1); expect(Ok, stat); - stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap2); + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppARGB, NULL, &bitmap2); expect(Ok, stat); - stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff40ffff); + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff40ccee); expect(Ok, stat); stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); @@ -2001,7 +2007,23 @@ static void test_colormatrix(void) stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xff80ffff, color); + expect(0xff80ccee, color); + + colormatrix = asymmetric; + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap2, 0, 0, 0); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xeeff40cc, color, 3), "expected 0xeeff40cc, got 0x%08x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1);

1 0

Eric Pouech : loader: Protect preloader against ELF file without loadable segments (clang).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 7b544af170e3a89d606f41ae4b3bd5c5b4f5f167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b544af170e3a89d606f41ae4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 12:16:51 2011 +0100 loader: Protect preloader against ELF file without loadable segments (clang). --- loader/preloader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e1c2276..a94c52c 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -788,6 +788,8 @@ static void map_so_lib( const char *name, struct wld_link_map *l) } /* Now process the load commands and map segments into memory. */ + if (!nloadcmds) + fatal_error( "%s: no segments to load\n", name ); c = loadcmds; /* Length of the sections to be loaded. */

1 0

Vincent Povirk : gdiplus: Implement gamma adjustment.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 19b71b035ed81bb65f00ae84a263a9ff404a9c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b71b035ed81bb65f00ae84a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 24 17:31:57 2011 -0500 gdiplus: Implement gamma adjustment. --- dlls/gdiplus/graphics.c | 28 +++++++++++++++++++++++++--- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 840825a..eb74021 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -467,9 +467,31 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d if (attributes->gamma_enabled[type] || attributes->gamma_enabled[ColorAdjustTypeDefault]) { - static int fixme; - if (!fixme++) - FIXME("Gamma adjustment not implemented\n"); + REAL gamma; + + if (attributes->gamma_enabled[type]) + gamma = attributes->gamma[type]; + else + gamma = attributes->gamma[ColorAdjustTypeDefault]; + + for (x=0; x<width; x++) + for (y=0; y<height; y++) + { + ARGB *src_color; + BYTE blue, green, red; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + + blue = *src_color&0xff; + green = (*src_color>>8)&0xff; + red = (*src_color>>16)&0xff; + + /* FIXME: We should probably use a table for this. */ + blue = floorf(powf(blue / 255.0, gamma) * 255.0); + green = floorf(powf(green / 255.0, gamma) * 255.0); + red = floorf(powf(red / 255.0, gamma) * 255.0); + + *src_color = (*src_color & 0xff000000) | (red << 16) | (green << 8) | blue; + } } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cbae047..1e6a9e9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2085,7 +2085,7 @@ static void test_gamma(void) stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); expect(Ok, stat); - todo_wine ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8x\n", color); + ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1);

1 0