April 2008 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IDispatchEx::InvokeEx implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: de74e1aeb95285aea351ae8005f80c1b5350b9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de74e1aeb95285aea351ae800… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 21:59:46 2008 +0200 mshtml: Added IDispatchEx::InvokeEx implementation. --- dlls/mshtml/dispex.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 647b4d8..47a0443 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -374,8 +374,60 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - return E_NOTIMPL; + IUnknown *unk; + ITypeInfo *ti; + dispex_data_t *data; + UINT argerr=0; + int min, max, n; + HRESULT hres; + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + + if(wFlags == DISPATCH_CONSTRUCT) { + FIXME("DISPATCH_CONSTRUCT not implemented\n"); + return E_NOTIMPL; + } + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + min = 0; + max = data->func_cnt-1; + + while(min <= max) { + n = (min+max)/2; + + if(data->funcs[n].id == id) + break; + + if(data->funcs[n].id < id) + min = n+1; + else + max = n-1; + } + + if(min > max) { + WARN("invalid id %x\n", id); + return DISP_E_UNKNOWNNAME; + } + + hres = get_typeinfo(data->funcs[n].tid, &ti); + if(FAILED(hres)) { + ERR("Could not get type info: %08x\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(This->outer, tid_ids[data->funcs[n].tid], (void**)&unk); + if(FAILED(hres)) { + ERR("Could not get iface: %08x\n", hres); + return E_FAIL; + } + + hres = ITypeInfo_Invoke(ti, unk, id, wFlags, pdp, pvarRes, pei, &argerr); + + IUnknown_Release(unk); + return hres; } static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)

1 0

Dmitry Timoshkov : winedump: Print contents of EMR_INTERSECTCLIPRECT and EMR_EXTSELECTCLIPRGN.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: ae9fe5e36e2f866c62b83e8686bddca9ef065928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9fe5e36e2f866c62b83e868… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 18 22:42:15 2008 +0900 winedump: Print contents of EMR_INTERSECTCLIPRECT and EMR_EXTSELECTCLIPRGN. --- tools/winedump/emf.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f539ea6..f3b6f50 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -112,7 +112,18 @@ static int dump_emfrecord(void) EMRCASE(EMR_MOVETOEX); EMRCASE(EMR_SETMETARGN); EMRCASE(EMR_EXCLUDECLIPRECT); - EMRCASE(EMR_INTERSECTCLIPRECT); + + case EMR_INTERSECTCLIPRECT: + { + const EMRINTERSECTCLIPRECT *clip = (const EMRINTERSECTCLIPRECT *)PRD(offset, sizeof(*clip)); + + printf("%-20s %08x\n", "EMR_INTERSECTCLIPRECT", length); + printf("rect %d,%d - %d, %d\n", + clip->rclClip.left, clip->rclClip.top, + clip->rclClip.right, clip->rclClip.bottom); + break; + } + EMRCASE(EMR_SCALEVIEWPORTEXTEX); EMRCASE(EMR_SCALEWINDOWEXTEX); EMRCASE(EMR_SAVEDC); @@ -156,7 +167,25 @@ static int dump_emfrecord(void) EMRCASE(EMR_FRAMERGN); EMRCASE(EMR_INVERTRGN); EMRCASE(EMR_PAINTRGN); - EMRCASE(EMR_EXTSELECTCLIPRGN); + + case EMR_EXTSELECTCLIPRGN: + { + const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)PRD(offset, sizeof(*clip)); + const RGNDATA *data = (RGNDATA *)clip->RgnData; + DWORD i, rc_count = 0; + RECT *rc; + + if (length >= sizeof(*clip) + sizeof(*data)) + rc_count = data->rdh.nCount; + + printf("%-20s %08x\n", "EMREXTSELECTCLIPRGN", length); + printf("mode %d, rects %d\n", clip->iMode, rc_count); + for (i = 0, rc = (RECT *)data->Buffer; i < rc_count; i++, rc++) + printf(" (%d,%d)-(%d,%d)", rc->left, rc->top, rc->right, rc->bottom); + if (rc_count != 0) printf("\n"); + break; + } + EMRCASE(EMR_BITBLT); EMRCASE(EMR_STRETCHBLT); EMRCASE(EMR_MASKBLT); @@ -166,7 +195,7 @@ static int dump_emfrecord(void) case EMR_EXTCREATEFONTINDIRECTW: { - const EMREXTCREATEFONTINDIRECTW *pf = (const EMREXTCREATEFONTINDIRECTW *)PRD(offset, 4); + const EMREXTCREATEFONTINDIRECTW *pf = (const EMREXTCREATEFONTINDIRECTW *)PRD(offset, sizeof(*pf)); const LOGFONTW *plf = &pf->elfw.elfLogFont; printf("%-20s %08x\n", "EMR_EXTCREATEFONTINDIRECTW", length); @@ -187,7 +216,7 @@ static int dump_emfrecord(void) case EMR_EXTTEXTOUTW: { - const EMREXTTEXTOUTW *etoW = (const EMREXTTEXTOUTW *)PRD(offset, 4); + const EMREXTTEXTOUTW *etoW = (const EMREXTTEXTOUTW *)PRD(offset, sizeof(*etoW)); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n",

1 0

Dmitry Timoshkov : gdi32: Add a test for ExtCreateRegion, make it pass under Wine.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f52b92efe504044018403e6221ab7d2664be51fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52b92efe504044018403e622… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 18 22:42:43 2008 +0900 gdi32: Add a test for ExtCreateRegion, make it pass under Wine. --- dlls/gdi32/region.c | 61 +++++++++++++++++--- dlls/gdi32/tests/clipping.c | 136 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index d0d8580..c9b9e1d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -985,6 +985,19 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) } +static void translate( POINT *pt, UINT count, const XFORM *xform ) +{ + while (count--) + { + FLOAT x = pt->x; + FLOAT y = pt->y; + pt->x = floor( x * xform->eM11 + y * xform->eM21 + xform->eDx + 0.5 ); + pt->y = floor( x * xform->eM12 + y * xform->eM22 + xform->eDy + 0.5 ); + pt++; + } +} + + /*********************************************************************** * ExtCreateRegion (GDI32.@) * @@ -1008,16 +1021,47 @@ HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* TRACE(" %p %d %p\n", lpXform, dwCount, rgndata ); - if( lpXform ) - WARN("(Xform not implemented - ignored)\n"); + if (!rgndata) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (rgndata->rdh.dwSize < sizeof(RGNDATAHEADER)) + return 0; + + /* XP doesn't care about the type */ if( rgndata->rdh.iType != RDH_RECTANGLES ) + WARN("(Unsupported region data type: %u)\n", rgndata->rdh.iType); + + if (lpXform) { - /* FIXME: We can use CreatePolyPolygonRgn() here - * for trapezoidal data */ + RECT *pCurRect, *pEndRect; - WARN("(Unsupported region data type: %u)\n", rgndata->rdh.iType); - goto fail; + hrgn = CreateRectRgn( 0, 0, 0, 0 ); + + pEndRect = (RECT *)rgndata->Buffer + rgndata->rdh.nCount; + for (pCurRect = (RECT *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++) + { + static const INT count = 4; + HRGN poly_hrgn; + POINT pt[4]; + + pt[0].x = pCurRect->left; + pt[0].y = pCurRect->top; + pt[1].x = pCurRect->right; + pt[1].y = pCurRect->top; + pt[2].x = pCurRect->right; + pt[2].y = pCurRect->bottom; + pt[3].x = pCurRect->left; + pt[3].y = pCurRect->bottom; + + translate( pt, 4, lpXform ); + poly_hrgn = CreatePolyPolygonRgn( pt, &count, 1, WINDING ); + CombineRgn( hrgn, hrgn, poly_hrgn, RGN_OR ); + DeleteObject( poly_hrgn ); + } + return hrgn; } if( (hrgn = REGION_CreateRegion( rgndata->rdh.nCount )) ) @@ -1039,8 +1083,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* } else ERR("Could not get pointer to newborn Region!\n"); } -fail: - WARN("Failed\n"); + return 0; } @@ -2743,6 +2786,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, int numFullPtBlocks = 0; INT poly, total; + TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); + if(!(hrgn = REGION_CreateRegion(nbpolygons))) return 0; obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 5e1d35f..25cc146 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -119,7 +119,143 @@ static void test_GetRandomRgn(void) DestroyWindow(hwnd); } +static void verify_region(HRGN hrgn, const RECT *rc) +{ + union + { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + } rgn; + const RECT *rect; + DWORD ret; + + ret = GetRegionData(hrgn, 0, NULL); + if (IsRectEmpty(rc)) + ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret); + else + ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); + + if (!ret) return; + + ret = GetRegionData(hrgn, sizeof(rgn), &rgn.data); + if (IsRectEmpty(rc)) + ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret); + else + ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); + + trace("size %u, type %u, count %u, rgn size %u, bound (%d,%d-%d,%d)\n", + rgn.data.rdh.dwSize, rgn.data.rdh.iType, + rgn.data.rdh.nCount, rgn.data.rdh.nRgnSize, + rgn.data.rdh.rcBound.left, rgn.data.rdh.rcBound.top, + rgn.data.rdh.rcBound.right, rgn.data.rdh.rcBound.bottom); + if (rgn.data.rdh.nCount != 0) + { + rect = (const RECT *)rgn.data.Buffer; + trace("rect (%d,%d-%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); + ok(EqualRect(rect, rc), "rects don't match\n"); + } + + ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u", rgn.data.rdh.dwSize); + ok(rgn.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn.data.rdh.iType); + if (IsRectEmpty(rc)) + { + ok(rgn.data.rdh.nCount == 0, "expected 0, got %u\n", rgn.data.rdh.nCount); + ok(rgn.data.rdh.nRgnSize == 0, "expected 0, got %u\n", rgn.data.rdh.nRgnSize); + } + else + { + ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount); + ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); + } + ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n"); +} + +static void test_ExtCreateRegion(void) +{ + static const RECT empty_rect; + static const RECT rc = { 111, 222, 333, 444 }; + static const RECT rc_xformed = { 76, 151, 187, 262 }; + union + { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + } rgn; + HRGN hrgn; + XFORM xform; + +if (0) /* crashes under Win9x */ +{ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 0, NULL); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); +} + + rgn.data.rdh.dwSize = 0; + rgn.data.rdh.iType = 0; + rgn.data.rdh.nCount = 0; + rgn.data.rdh.nRgnSize = 0; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh) - 1; + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + + /* although XP doesn't care about the type Win9x does */ + rgn.data.rdh.iType = RDH_RECTANGLES; + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &empty_rect); + DeleteObject(hrgn); + + rgn.data.rdh.nCount = 1; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); + + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh) + 1; + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 1, &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); + + xform.eM11 = 0.5; /* 50% width */ + xform.eM12 = 0.0; + xform.eM21 = 0.0; + xform.eM22 = 0.5; /* 50% height */ + xform.eDx = 20.0; + xform.eDy = 40.0; + + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(&xform, sizeof(rgn), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError()); + verify_region(hrgn, &rc_xformed); + DeleteObject(hrgn); +} + START_TEST(clipping) { test_GetRandomRgn(); + test_ExtCreateRegion(); }

1 0

Frans Kool : winecfg: Added missing Dutch translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 9e482ce938cc15d03f69c47e3443c8109ba4487b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e482ce938cc15d03f69c47e3… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Fri Apr 18 16:27:17 2008 +0200 winecfg: Added missing Dutch translation. --- programs/winecfg/Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 5fb6929..fd9b4a6 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -66,6 +66,8 @@ BEGIN CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Laat de window manager de vensters &decoreren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 + CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Wanneer de vensters door de window manager worden beheerd hebben deze de standaard kaders, er wordt rekening gehouden met de virtuele desktop en ze staan in de lijst met vensters.\n\nAls de vensters niet worden beheerd, worden ze losgekoppeld van de window manager. Dit betekent dat vensters niet perfect met uw desktop integreren. De 'emulatie' is echter exacter en kan ervoor zorgen dat programma's beter werken.", IDC_STATIC,19,51,225,80

1 0

Jeff Zaroyko : revise application rating definitions to include " cannot be installed" under Garbage
by Chris Morgan 20 Apr '08

20 Apr '08

Module: appdb Branch: master Commit: 8e6b4fe2fd621df796883ca8e9d05846980958f4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8e6b4fe2fd621df796883ca8… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Sun Apr 20 16:06:40 2008 +1000 revise application rating definitions to include "cannot be installed" under Garbage --- help/maintainer_ratings.help | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/help/maintainer_ratings.help b/help/maintainer_ratings.help index 9f5d2ae..fded0ad 100644 --- a/help/maintainer_ratings.help +++ b/help/maintainer_ratings.help @@ -40,7 +40,7 @@ Application works, but it has some issues, even for normal use; a game may not r An application gets this rating if it cannot be used for the purpose it was designed for. There should be at least one bug report in Bugzilla if it gets this rating. -Application does not start, or starts but has so many errors that it is nearly impossible to use it. +Application cannot be installed, does not start, or starts but has so many errors that it is nearly impossible to use it. </ul>

1 0

Alexandre Julliard : Wine release 0.9.60
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: website Branch: master Commit: 51ebfa70127af30e54abe4ce7c3bbe55d3b51eee URL: http://source.winehq.org/git/website.git/?a=commit;h=51ebfa70127af30e54abe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 17:59:13 2008 +0200 Wine release 0.9.60 --- news/2008041801.xml | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/news/2008041801.xml b/news/2008041801.xml new file mode 100644 index 0000000..7448e3a --- /dev/null +++ b/news/2008041801.xml @@ -0,0 +1,27 @@ +<news> +<date>April 18, 2008</date> +<title>Wine 0.9.60 Released</title> +<body> +Wine 0.9.60 was released today, with the following main changes: + +<ul> +<li>Better support for Windows IMEs.</li> +<li>Option for Windows-style window decorations.</li> +<li>Improved system tray behavior.</li> +<li>Window management fixes.</li> +<li>Improved quartz audio support.</li> +<li>Better support for launching apps from Unix file managers.</li> +<li>Lots of bug fixes.</li> +</ul> + + +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.60.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.60">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.60.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: b807c6197a95df14126206b7eb1f8be47821db6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b807c6197a95df14126206b7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 17:47:52 2008 +0200 Release 0.9.60. --- ANNOUNCE | 1489 ++++++++++++++++++++------------------- ChangeLog | 2361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 3150 insertions(+), 720 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b807c6197a95df1412620…

1 0

Tag wine-0.9.60 : Alexandre Julliard : Release 0.9.60
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: refs/tags/wine-0.9.60 Tag: cfed77c92c1759a4701844dc5685559958d188e9 URL: http://source.winehq.org/git/wine.git/?a=tag;h=cfed77c92c1759a4701844dc5685… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 17:47:52 2008 +0200 Release 0.9.60

1 0

Louis Lenders : wininet: Improve stub for FindNextUrlCacheEntryW a tiny bit .
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: b3f786091763d5dd0db40c0a8b016318e62f923f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f786091763d5dd0db40c0a8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Apr 18 11:44:47 2008 +0000 wininet: Improve stub for FindNextUrlCacheEntryW a tiny bit. --- dlls/wininet/urlcache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 429867a..ba16ed2 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3114,6 +3114,7 @@ BOOL WINAPI FindNextUrlCacheEntryW( ) { FIXME("(%p, %p, %p) stub\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Nikolay Sivov : gdiplus: Implemented GdipVectorTransformMatrixPoints.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 256874426dc6ec5260e3e729cb65d69f0b32f572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=256874426dc6ec5260e3e729c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 18 04:39:03 2008 +0400 gdiplus: Implemented GdipVectorTransformMatrixPoints. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 20 ++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index da33824..f2426b1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -619,7 +619,7 @@ @ stub GdipTranslateRegionI @ stub GdipTranslateTextureTransform @ stdcall GdipTranslateWorldTransform(ptr long long long) -@ stub GdipVectorTransformMatrixPoints +@ stdcall GdipVectorTransformMatrixPoints(ptr ptr long) @ stub GdipVectorTransformMatrixPointsI @ stub GdipWarpPath @ stub GdipWidenPath diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index dee6460..a40f690 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -281,3 +281,23 @@ GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, return Ok; } + +GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, INT count) +{ + REAL x, y; + INT i; + + if(!matrix || !pts) + return InvalidParameter; + + for(i = 0; i < count; i++) + { + x = pts[i].X; + y = pts[i].Y; + + pts[i].X = x * matrix->matrix[0] + y * matrix->matrix[2]; + pts[i].Y = x * matrix->matrix[1] + y * matrix->matrix[3]; + } + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c181b21..215864a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -229,6 +229,7 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);

1 0