September 2008 - Wine-Commits

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLBodyElement.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: ad76cc1f7cbf4f3217b0bb22305eacbca3e4d937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad76cc1f7cbf4f3217b0bb223… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 27 22:01:35 2008 +1000 mshtml: Implement IDispatch for IHTMLBodyElement. --- dlls/mshtml/htmlbody.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 8e1f70c..2d30895 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -110,16 +110,14 @@ static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->textcont.element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLBodyElement_GetTypeInfo(IHTMLBodyElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->textcont.element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REFIID riid, @@ -127,9 +125,7 @@ static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REF LCID lcid, DISPID *rgDispId) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->textcont.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dispIdMember, @@ -137,9 +133,8 @@ static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dis VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->textcont.element.node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLBodyElement_put_background(IHTMLBodyElement *iface, BSTR v)

1 0

Adam Petaccia : gdiplus: Implement GdipCreateTexture.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 7b3e6d018adaa813c4c205291698ccd7c6d1f741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3e6d018adaa813c4c205291… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sun Aug 31 01:06:58 2008 -0400 gdiplus: Implement GdipCreateTexture. --- dlls/gdiplus/brush.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ae7266e..3a991d2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -373,12 +373,38 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) return Ok; } +/******************************************************************************* + * GdipCreateTexture [GDIPLUS.@] + * + * PARAMS + * image [I] image to use + * wrapmode [I] optional + * texture [O] pointer to the resulting texturebrush + * + * RETURNS + * SUCCESS: Ok + * FAILURE: element of GpStatus + */ GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, GpTexture **texture) { - FIXME("stub: %p, %d %p\n", image, wrapmode, texture); + UINT width, height; + GpImageAttributes attributes; + GpStatus stat; - return NotImplemented; + TRACE("%p, %d %p\n", image, wrapmode, texture); + + if (!(image && texture)) + return InvalidParameter; + + stat = GdipGetImageWidth(image, &width); + if (stat != Ok) return stat; + stat = GdipGetImageHeight(image, &height); + if (stat != Ok) return stat; + attributes.wrap = wrapmode; + + return GdipCreateTextureIA(image, &attributes, 0, 0, width, height, + texture); } GpStatus WINGDIPAPI GdipCreateTexture2(GpImage *image, GpWrapMode wrapmode,

1 0

Adam Petaccia : gdiplus: Implement GdipCreateTexture2.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: b6afa7a743f8d5143e319687a4a1a30e322adbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6afa7a743f8d5143e319687a… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sun Aug 31 01:07:02 2008 -0400 gdiplus: Implement GdipCreateTexture2. --- dlls/gdiplus/brush.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3a991d2..57ff977 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -410,10 +410,14 @@ GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, GpStatus WINGDIPAPI GdipCreateTexture2(GpImage *image, GpWrapMode wrapmode, REAL x, REAL y, REAL width, REAL height, GpTexture **texture) { - FIXME("stub: %p %d %f %f %f %f %p\n", image, wrapmode, + GpImageAttributes attributes; + + TRACE("%p %d %f %f %f %f %p\n", image, wrapmode, x, y, width, height, texture); - return NotImplemented; + attributes.wrap = wrapmode; + return GdipCreateTextureIA(image, &attributes, x, y, width, height, + texture); } /* FIXME: imageattr ignored */

1 0

Adam Petaccia : gdiplus: Stub GdipCreateTexture2I.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: cb88bbd1765d713014b9c8ba933563ce7f0dd1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb88bbd1765d713014b9c8ba9… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sun Aug 31 01:06:54 2008 -0400 gdiplus: Stub GdipCreateTexture2I. --- dlls/gdiplus/brush.c | 8 ++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 5749fd2..ae7266e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -511,6 +511,14 @@ GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage *image, GDIPCONST GpImageAttrib return GdipCreateTextureIA(image,imageattr,(REAL)x,(REAL)y,(REAL)width,(REAL)height,texture); } +GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage *image, GpWrapMode wrapmode, + INT x, INT y, INT width, INT height, GpTexture **texture) +{ + FIXME("stub: %p %d %d %d %d %d %p", image, wrapmode, x, y, width, height, texture); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetBrushType(GpBrush *brush, GpBrushType *type) { if(!brush || !type) return InvalidParameter; diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 83c069b..97ab0c6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -132,7 +132,7 @@ @ stdcall GdipCreateStreamOnFile(ptr long ptr) @ stdcall GdipCreateStringFormat(long long ptr) @ stdcall GdipCreateTexture2(ptr long long long long long ptr) -@ stub GdipCreateTexture2I +@ stdcall GdipCreateTexture2I(ptr long long long long long ptr) @ stdcall GdipCreateTexture(ptr long ptr) @ stdcall GdipCreateTextureIA(ptr ptr long long long long ptr) @ stdcall GdipCreateTextureIAI(ptr ptr long long long long ptr)

1 0

Adam Petaccia : gdiplus: Stub GdipCreateTexture2.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 29e1994722acbf1dadc087e57e324a8df576e155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e1994722acbf1dadc087e57… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sun Aug 31 01:06:49 2008 -0400 gdiplus: Stub GdipCreateTexture2. --- dlls/gdiplus/brush.c | 9 +++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 575d43d..5749fd2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -381,6 +381,15 @@ GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, return NotImplemented; } +GpStatus WINGDIPAPI GdipCreateTexture2(GpImage *image, GpWrapMode wrapmode, + REAL x, REAL y, REAL width, REAL height, GpTexture **texture) +{ + FIXME("stub: %p %d %f %f %f %f %p\n", image, wrapmode, + x, y, width, height, texture); + + return NotImplemented; +} + /* FIXME: imageattr ignored */ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9879fc4..83c069b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -131,7 +131,7 @@ @ stdcall GdipCreateSolidFill(long ptr) @ stdcall GdipCreateStreamOnFile(ptr long ptr) @ stdcall GdipCreateStringFormat(long long ptr) -@ stub GdipCreateTexture2 +@ stdcall GdipCreateTexture2(ptr long long long long long ptr) @ stub GdipCreateTexture2I @ stdcall GdipCreateTexture(ptr long ptr) @ stdcall GdipCreateTextureIA(ptr ptr long long long long ptr)

1 0

Adam Petaccia : gdiplus: Stub GdipCreateTexture.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 406c5d3f4ddf2da60740a695eb94b34401db3ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=406c5d3f4ddf2da60740a695e… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sun Aug 31 01:06:42 2008 -0400 gdiplus: Stub GdipCreateTexture. --- dlls/gdiplus/brush.c | 8 ++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a4ced49..575d43d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -373,6 +373,14 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) return Ok; } +GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, + GpTexture **texture) +{ + FIXME("stub: %p, %d %p\n", image, wrapmode, texture); + + return NotImplemented; +} + /* FIXME: imageattr ignored */ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 848402d..9879fc4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -133,7 +133,7 @@ @ stdcall GdipCreateStringFormat(long long ptr) @ stub GdipCreateTexture2 @ stub GdipCreateTexture2I -@ stub GdipCreateTexture +@ stdcall GdipCreateTexture(ptr long ptr) @ stdcall GdipCreateTextureIA(ptr ptr long long long long ptr) @ stdcall GdipCreateTextureIAI(ptr ptr long long long long ptr) @ stdcall GdipDeleteBrush(ptr)

1 0

Aric Stewart : comctl32: monthcal: Set the stStart parameter when sending the MCN_GETDAYSTATE notification.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: bf6e766df6ba56155557cb9eebf6fe0528f013c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6e766df6ba56155557cb9ee… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 29 11:17:55 2008 -0500 comctl32: monthcal: Set the stStart parameter when sending the MCN_GETDAYSTATE notification. --- dlls/comctl32/monthcal.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9ca6fcc..0c0a45c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1303,6 +1303,11 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) nmds.cDayState = infoPtr->monthRange; nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); + nmds.stStart = infoPtr->todaysDate; + nmds.stStart.wYear = infoPtr->currentYear; + nmds.stStart.wMonth = infoPtr->currentMonth; + nmds.stStart.wDay = 1; + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; @@ -1333,6 +1338,11 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) nmds.prgDayState = Alloc (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); + nmds.stStart = infoPtr->todaysDate; + nmds.stStart.wYear = infoPtr->currentYear; + nmds.stStart.wMonth = infoPtr->currentMonth; + nmds.stStart.wDay = 1; + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i];

1 0

Adam Petaccia : gdiplus: Stub GdipTranslateLineTransform.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: a90bced72e1c9d9ba6a2f83f9053eec62bd87cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90bced72e1c9d9ba6a2f83f9… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sun Aug 31 01:06:37 2008 -0400 gdiplus: Stub GdipTranslateLineTransform. --- dlls/gdiplus/brush.c | 8 ++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 13cd3ab..a4ced49 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -959,6 +959,14 @@ GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient* brush, + REAL dx, REAL dy, GpMatrixOrder order) +{ + FIXME("stub: %p %f %f %d\n", brush, dx, dy, order); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient *brush, GpRectF *rect) { if(!brush || !rect) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 725c024..848402d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -611,7 +611,7 @@ @ stdcall GdipTransformRegion(ptr ptr) @ stub GdipTranslateClip @ stub GdipTranslateClipI -@ stub GdipTranslateLineTransform +@ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) @ stub GdipTranslatePathGradientTransform @ stub GdipTranslatePenTransform

1 0

Christian Costa : d3dxof: Fix IDirectXFileDataReference macros.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: b939b8d3452e6ccabde236a2087046c1649343d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b939b8d3452e6ccabde236a20… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Aug 31 10:34:46 2008 +0200 d3dxof: Fix IDirectXFileDataReference macros. --- include/dxfile.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/dxfile.h b/include/dxfile.h index cf63541..b0adceb 100644 --- a/include/dxfile.h +++ b/include/dxfile.h @@ -207,14 +207,14 @@ DECLARE_INTERFACE_(IDirectXFileDataReference,IDirectXFileObject) #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ -#define IDirectXFileData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectXFileData_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectXFileData_Release(p) (p)->lpVtbl->Release(p) +#define IDirectXFileDataReference_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectXFileDataReference_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectXFileDataReference_Release(p) (p)->lpVtbl->Release(p) /*** IDirectXFileObject methods ***/ -#define IDirectXFileData_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) -#define IDirectXFileData_GetId(p,a) (p)->lpVtbl->GetId(p,a) +#define IDirectXFileDataReference_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) +#define IDirectXFileDataReference_GetId(p,a) (p)->lpVtbl->GetId(p,a) /*** IDirectXFileDataReference methods ***/ -#define IDirectXFileData_Resolve(p,a) (p)->lpVtbl->GetData(p,a) +#define IDirectXFileDataReference_Resolve(p,a) (p)->lpVtbl->GetData(p,a) #endif #define INTERFACE IDirectXFileBinary

1 0

Paul Vriens : msxml3/tests: Add a missing CoUninitialize.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 7af5d5fb2319affb30d040f89b1a5b7ed3f3b343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af5d5fb2319affb30d040f89… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 1 16:17:06 2008 +0200 msxml3/tests: Add a missing CoUninitialize. --- dlls/msxml3/tests/xmlelem.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 00b9f3d..626984a 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -454,4 +454,6 @@ START_TEST(xmlelem) test_xmlelem(); test_xmlelem_collection(); + + CoUninitialize(); }

1 0