January 2011 - Wine-commits

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDrawFactory iface.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 0b9cfcfcc956d21320889ac0369498c22c09c7db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9cfcfcc956d21320889ac03… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:02:50 2011 +0100 ddrawex: COM cleanup for the IDirectDrawFactory iface. --- dlls/ddrawex/ddrawex_private.h | 9 --------- dlls/ddrawex/main.c | 37 ++++++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 079b26c..34608c6 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -44,15 +44,6 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) #endif -/****************************************************************************** - * DirectDrawFactory implementation - ******************************************************************************/ -typedef struct -{ - const IDirectDrawFactoryVtbl *lpVtbl; - LONG ref; -} IDirectDrawFactoryImpl; - HRESULT WINAPI IDirectDrawFactoryImpl_CreateDirectDraw(IDirectDrawFactory* iface, GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw); diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index b5923e2..7b32323 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -150,16 +150,28 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = }; +/****************************************************************************** + * DirectDrawFactory implementation + ******************************************************************************/ +typedef struct +{ + IDirectDrawFactory IDirectDrawFactory_iface; + LONG ref; +} IDirectDrawFactoryImpl; + +static inline IDirectDrawFactoryImpl *impl_from_IDirectDrawFactory(IDirectDrawFactory *iface) +{ + return CONTAINING_RECORD(iface, IDirectDrawFactoryImpl, IDirectDrawFactory_iface); +} + /******************************************************************************* * IDirectDrawFactory::QueryInterface * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, - REFIID riid, - void **obj) +static HRESULT WINAPI IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, REFIID riid, + void **obj) { - IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface; + IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); @@ -179,10 +191,9 @@ IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, * IDirectDrawFactory::AddRef * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface) +static ULONG WINAPI IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface) { - IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface; + IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->() incrementing from %d.\n", This, ref - 1); @@ -194,11 +205,11 @@ IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface) * IDirectDrawFactory::Release * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface) +static ULONG WINAPI IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface) { - IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface; + IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->() decrementing from %d.\n", This, ref+1); if (ref == 0) @@ -255,9 +266,9 @@ CreateDirectDrawFactory(IUnknown* UnkOuter, REFIID iid, void **obj) return E_OUTOFMEMORY; } - This->lpVtbl = &IDirectDrawFactory_Vtbl; + This->IDirectDrawFactory_iface.lpVtbl = &IDirectDrawFactory_Vtbl; - hr = IDirectDrawFactory_QueryInterface((IDirectDrawFactory *)This, iid, obj); + hr = IDirectDrawFactory_QueryInterface(&This->IDirectDrawFactory_iface, iid, obj); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDraw iface.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 8003b4842143673266ffda18add64f40edb1a823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8003b4842143673266ffda18a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:04:56 2011 +0100 ddrawex: COM cleanup for the IDirectDraw iface. --- dlls/ddrawex/ddraw.c | 184 ++++++++++++++-------------------------- dlls/ddrawex/ddrawex_private.h | 2 +- 2 files changed, 66 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8003b4842143673266ffd…

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDraw2 iface.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 9b77bdff545ab82cf8122eedf7ae98ff7dc38792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b77bdff545ab82cf8122eedf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:05:51 2011 +0100 ddrawex: COM cleanup for the IDirectDraw2 iface. --- dlls/ddrawex/ddraw.c | 192 ++++++++++++++-------------------------- dlls/ddrawex/ddrawex_private.h | 2 +- 2 files changed, 68 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b77bdff545ab82cf8122…

1 0

Nikolay Sivov : msxml3: Fix invalid read before allocated block (Valgrind).
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 952f0a6af43f9252d696953a99e37a4b5ba4a1fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=952f0a6af43f9252d696953a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 14:13:01 2011 +0300 msxml3: Fix invalid read before allocated block (Valgrind). --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b2e5b16..08df8bd 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -534,8 +534,8 @@ static inline xmlChar* trim_whitespace(xmlChar* str) while (*ret && isspace(*ret)) ++ret; len = xmlStrlen(ret); - while (isspace(ret[len-1])) - --len; + if (len) + while (isspace(ret[len-1])) --len; ret = xmlStrndup(ret, len); xmlFree(str);

1 0

Nikolay Sivov : msxml3: Fix interface leak (Valgrind).
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 3ba78cf101a8b85991c9dd38c3d2919e61970b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba78cf101a8b85991c9dd38c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 14:56:28 2011 +0300 msxml3: Fix interface leak (Valgrind). --- dlls/msxml3/cdata.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index d0984c1..1e7ca1f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -828,6 +828,7 @@ static HRESULT WINAPI domcdata_splitText( { IXMLDOMCDATASection_deleteData(iface, 0, offset); hr = IXMLDOMNode_appendChild(parent, (IXMLDOMNode*)*txtNode, NULL); + IXMLDOMNode_Release(parent); } } SysFreeString(data);

1 0

Nikolay Sivov : urlmon/tests: Fix a leak in test (Valgrind).
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 5b1d46174888df708e1708bd363177c51474dc59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1d46174888df708e1708bd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 16:18:58 2011 +0300 urlmon/tests: Fix a leak in test (Valgrind). --- dlls/urlmon/tests/misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 0dacd12..cd3372c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1183,6 +1183,7 @@ static void test_CopyStgMedium(void) ok(dst.u.lpszFileName && dst.u.lpszFileName != fileW, "lpszFileName=%p\n", dst.u.lpszFileName); ok(!lstrcmpW(dst.u.lpszFileName, fileW), "wrong file name\n"); ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); + ReleaseStgMedium(&dst); hres = pCopyStgMedium(&src, NULL); ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres);

1 0

Greg Geldorp : gdi32/tests: Fix font tests on Arabic machines.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 566d455b29e8e43b5f5329899d4191df049f47ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=566d455b29e8e43b5f5329899… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 23 17:42:29 2011 +0100 gdi32/tests: Fix font tests on Arabic machines. --- dlls/gdi32/tests/font.c | 48 ++++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eda7056..fa9df33 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -670,6 +670,7 @@ static void test_bitmap_font_metrics(void) int weight, height, ascent, descent, int_leading, ext_leading; int ave_char_width, max_char_width, dpi; DWORD ansi_bitfield; + WORD skip_lang_id; } fd[] = { { "MS Sans Serif", FW_NORMAL, 13, 11, 2, 2, 0, 5, 11, 96, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC }, @@ -741,19 +742,23 @@ static void test_bitmap_font_metrics(void) { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, FS_LATIN1 }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, FS_LATIN1 }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, FS_LATIN1 }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, FS_LATIN2 | FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, FS_LATIN1 }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, FS_LATIN2 | FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, FS_LATIN1 | FS_LATIN2 }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, FS_LATIN1 | FS_LATIN2, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 120, FS_LATIN1 | FS_JISJAPAN }, @@ -783,6 +788,9 @@ static void test_bitmap_font_metrics(void) HFONT hfont, old_hfont; TEXTMETRIC tm; INT ret, i; + WORD system_lang_id; + + system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); hdc = CreateCompatibleDC(0); assert(hdc); @@ -818,18 +826,24 @@ static void test_bitmap_font_metrics(void) if(fd[i].dpi == tm.tmDigitizedAspectX) { trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); - ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmWeight, fd[i].weight); - ok(tm.tmHeight == fd[i].height, "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmHeight, fd[i].height); - ok(tm.tmAscent == fd[i].ascent, "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAscent, fd[i].ascent); - ok(tm.tmDescent == fd[i].descent, "%s(%d): tm.tmDescent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmDescent, fd[i].descent); - ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmInternalLeading, fd[i].int_leading); - ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmExternalLeading, fd[i].ext_leading); - ok(tm.tmAveCharWidth == fd[i].ave_char_width, "%s(%d): tm.tmAveCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAveCharWidth, fd[i].ave_char_width); - - /* Don't run the max char width test on System/ANSI_CHARSET. We have extra characters in our font - that make the max width bigger */ - if(strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) - ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmMaxCharWidth, fd[i].max_char_width); + if (fd[i].skip_lang_id == 0 || system_lang_id != fd[i].skip_lang_id) + { + ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmWeight, fd[i].weight); + ok(tm.tmHeight == fd[i].height, "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmHeight, fd[i].height); + ok(tm.tmAscent == fd[i].ascent, "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAscent, fd[i].ascent); + ok(tm.tmDescent == fd[i].descent, "%s(%d): tm.tmDescent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmDescent, fd[i].descent); + ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmInternalLeading, fd[i].int_leading); + ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmExternalLeading, fd[i].ext_leading); + ok(tm.tmAveCharWidth == fd[i].ave_char_width, "%s(%d): tm.tmAveCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAveCharWidth, fd[i].ave_char_width); + + /* Don't run the max char width test on System/ANSI_CHARSET. We have extra characters in our font + that make the max width bigger */ + if(strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) + ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmMaxCharWidth, fd[i].max_char_width); + } + else + skip("Skipping font metrics test for system langid 0x%x\n", + system_lang_id); } SelectObject(hdc, old_hfont); DeleteObject(hfont);

1 0

Detlef Riekenberg : kernel32: Don' t mask when printing unsupported flags in load_library.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 27d31c76527d9880915feaa2ea25824ec47943d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d31c76527d9880915feaa2e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 23 17:46:29 2011 +0100 kernel32: Don't mask when printing unsupported flags in load_library. --- dlls/kernel32/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index f544e24..d94850f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -856,7 +856,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LOAD_LIBRARY_REQUIRE_SIGNED_TARGET; if( flags & unsupported_flags) - FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags & ~unsupported_flags); + FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL );

1 0

Vincent Povirk : gdiplus: Add a software implementation of line gradient brushes.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 0c17a0b5bbfc2af4d29e35caee1877a8f3d19086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c17a0b5bbfc2af4d29e35cae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 21 15:48:45 2011 -0600 gdiplus: Add a software implementation of line gradient brushes. --- dlls/gdiplus/graphics.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 284847e..de1e28f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -256,6 +256,15 @@ static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; ARGB i; + INT a1, a2, a3; + + a1 = (start >> 24) & 0xff; + a2 = (end >> 24) & 0xff; + + a3 = (int)(a1*(1.0f - position)+a2*(position)); + + result |= a3 << 24; + for (i=0xff; i<=0xff0000; i = i << 8) result |= (int)((start&i)*(1.0f - position)+(end&i)*(position))&i; return result; @@ -493,6 +502,7 @@ static INT brush_can_fill_pixels(GpBrush *brush) { case BrushTypeSolidColor: case BrushTypeHatchFill: + case BrushTypeLinearGradient: return 1; default: return 0; @@ -539,6 +549,66 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, return Ok; } + case BrushTypeLinearGradient: + { + GpLineGradient *fill = (GpLineGradient*)brush; + GpPointF draw_points[3], line_points[3]; + GpStatus stat; + static const GpRectF box_1 = { 0.0, 0.0, 1.0, 1.0 }; + GpMatrix *world_to_gradient; /* FIXME: Store this in the brush? */ + int x, y; + + draw_points[0].X = fill_area->X; + draw_points[0].Y = fill_area->Y; + draw_points[1].X = fill_area->X+1; + draw_points[1].Y = fill_area->Y; + draw_points[2].X = fill_area->X; + draw_points[2].Y = fill_area->Y+1; + + /* Transform the points to a co-ordinate space where X is the point's + * position in the gradient, 0.0 being the start point and 1.0 the + * end point. */ + stat = GdipTransformPoints(graphics, CoordinateSpaceWorld, + CoordinateSpaceDevice, draw_points, 3); + + if (stat == Ok) + { + line_points[0] = fill->startpoint; + line_points[1] = fill->endpoint; + line_points[2].X = fill->startpoint.X + (fill->startpoint.Y - fill->endpoint.Y); + line_points[2].Y = fill->startpoint.Y + (fill->endpoint.X - fill->startpoint.X); + + stat = GdipCreateMatrix3(&box_1, line_points, &world_to_gradient); + } + + if (stat == Ok) + { + stat = GdipInvertMatrix(world_to_gradient); + + if (stat == Ok) + stat = GdipTransformMatrixPoints(world_to_gradient, draw_points, 3); + + GdipDeleteMatrix(world_to_gradient); + } + + if (stat == Ok) + { + REAL x_delta = draw_points[1].X - draw_points[0].X; + REAL y_delta = draw_points[2].X - draw_points[0].X; + + for (y=0; y<fill_area->Height; y++) + { + for (x=0; x<fill_area->Width; x++) + { + REAL pos = draw_points[0].X + x * x_delta + y * y_delta; + + argb_pixels[x + y*cdwStride] = blend_line_gradient(fill, pos); + } + } + } + + return stat; + } default: return NotImplemented; }

1 0

Jacek Caban : urlmon: Fixed key name size and format in open_zone_key.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: c117f218765902019a2d29273a4bd5472c2bc6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c117f218765902019a2d29273… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 22 01:52:47 2011 +0100 urlmon: Fixed key name size and format in open_zone_key. --- dlls/urlmon/sec_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 87b8fda..e3be8fe 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -221,9 +221,9 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { - static const WCHAR wszFormat[] = {'%','s','%','l','d',0}; + static const WCHAR wszFormat[] = {'%','s','%','u',0}; - WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+8]; + WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+12]; DWORD res; wsprintfW(key_name, wszFormat, wszZonesKey, zone);

1 0