September 2008 - Wine-Commits

Dylan Smith : richedit: Avoid acting on control words in skipped RTF groups .
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 9a7d475db8f86af8dcc8b5bbcca26d332bf228e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7d475db8f86af8dcc8b5bbc… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Sep 10 22:54:12 2008 -0400 richedit: Avoid acting on control words in skipped RTF groups. Previously the control words in skipped groups were being processed by the read hook on the RTF parser. By moving this code into the class callbacks for the parser, the skipped groups actually remain skipped. --- dlls/riched20/editor.c | 28 ++++++---------------------- dlls/riched20/editor.h | 6 ++++++ dlls/riched20/reader.c | 8 ++++++++ 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index adc9362..7b1a0b0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -346,7 +346,7 @@ static void ME_ApplyBorderProperties(RTF_Info *info, } } -static void ME_RTFCharAttrHook(RTF_Info *info) +void ME_RTFCharAttrHook(RTF_Info *info) { CHARFORMAT2W fmt; fmt.cbSize = sizeof(fmt); @@ -468,7 +468,7 @@ static void ME_RTFCharAttrHook(RTF_Info *info) /* FIXME this function doesn't get any information about context of the RTF tag, which is very bad, the same tags mean different things in different contexts */ -static void ME_RTFParAttrHook(RTF_Info *info) +void ME_RTFParAttrHook(RTF_Info *info) { PARAFORMAT2 fmt; fmt.cbSize = sizeof(fmt); @@ -825,7 +825,7 @@ static void ME_RTFParAttrHook(RTF_Info *info) } } -static void ME_RTFTblAttrHook(RTF_Info *info) +void ME_RTFTblAttrHook(RTF_Info *info) { switch (info->rtfMinor) { @@ -896,7 +896,7 @@ static void ME_RTFTblAttrHook(RTF_Info *info) } } -static void ME_RTFSpecialCharHook(RTF_Info *info) +void ME_RTFSpecialCharHook(RTF_Info *info) { RTFTable *tableDef = info->tableDef; switch (info->rtfMinor) @@ -1325,7 +1325,8 @@ static void ME_RTFReadObjectGroup(RTF_Info *info) RTFRouteToken(info); /* feed "}" back to router */ } -static void ME_RTFReadHook(RTF_Info *info) { +static void ME_RTFReadHook(RTF_Info *info) +{ switch(info->rtfClass) { case rtfGroup: @@ -1363,23 +1364,6 @@ static void ME_RTFReadHook(RTF_Info *info) { } } break; - case rtfControl: - switch(info->rtfMajor) - { - case rtfCharAttr: - ME_RTFCharAttrHook(info); - break; - case rtfParAttr: - ME_RTFParAttrHook(info); - break; - case rtfTblAttr: - ME_RTFTblAttrHook(info); - break; - case rtfSpecialChar: - ME_RTFSpecialCharHook(info); - break; - } - break; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b9c01b7..6ec4c1f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -21,6 +21,8 @@ #include "editstr.h" #include "wine/unicode.h" +struct _RTF_Info; + extern HANDLE me_heap; static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) @@ -275,6 +277,10 @@ void ME_SendOldNotify(ME_TextEditor *editor, int nCode); void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam); int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF); ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset); +void ME_RTFCharAttrHook(struct _RTF_Info *info); +void ME_RTFParAttrHook(struct _RTF_Info *info); +void ME_RTFTblAttrHook(struct _RTF_Info *info); +void ME_RTFSpecialCharHook(struct _RTF_Info *info); void ME_StreamInFill(ME_InStream *stream); int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar); extern int me_debug; diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 8801137..95d88f7 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2477,6 +2477,13 @@ ControlClass (RTF_Info *info) { case rtfCharAttr: CharAttr(info); + ME_RTFCharAttrHook(info); + break; + case rtfParAttr: + ME_RTFParAttrHook(info); + break; + case rtfTblAttr: + ME_RTFTblAttrHook(info); break; case rtfCharSet: CharSet(info); @@ -2492,6 +2499,7 @@ ControlClass (RTF_Info *info) break; case rtfSpecialChar: SpecialChar (info); + ME_RTFSpecialCharHook(info); break; } }

1 0

Lei Zhang : comctl32: Handle listview dragging better.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: fc2404bc206b07f7ffe6e980a026d1badf9d1376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2404bc206b07f7ffe6e980a… Author: Lei Zhang <thestig(a)google.com> Date: Wed Sep 10 16:45:13 2008 -0700 comctl32: Handle listview dragging better. --- dlls/comctl32/listview.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ba53434..1627001 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -257,6 +257,7 @@ typedef struct tagLISTVIEW_INFO HIMAGELIST himlState; BOOL bLButtonDown; BOOL bRButtonDown; + BOOL bDragging; POINT ptClickPos; /* point where the user clicked */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ INT nItemHeight; @@ -3344,7 +3345,11 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN nmlv.iItem = lvHitTestInfo.iItem; nmlv.ptAction = infoPtr->ptClickPos; - notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); + if (!infoPtr->bDragging) + { + notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); + infoPtr->bDragging = TRUE; + } return 0; } @@ -8605,6 +8610,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN /* set left button down flag and record the click position */ infoPtr->bLButtonDown = TRUE; infoPtr->ptClickPos = pt; + infoPtr->bDragging = FALSE; lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; @@ -8716,6 +8722,12 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT /* set left button flag */ infoPtr->bLButtonDown = FALSE; + if (infoPtr->bDragging) + { + infoPtr->bDragging = FALSE; + return 0; + } + /* if we clicked on a selected item, edit the label */ if(lvHitTestInfo.iItem == infoPtr->nEditLabelItem && (lvHitTestInfo.flags & LVHT_ONITEMLABEL)) {

1 0

Lei Zhang : comctl32: listview: Prevent DragDetect from removing WM_LBUTTONUP messages.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 5f9b0db21798e863c234fdc287fa3cfaa8a3cfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9b0db21798e863c234fdc28… Author: Lei Zhang <thestig(a)google.com> Date: Wed Sep 10 16:43:43 2008 -0700 comctl32: listview: Prevent DragDetect from removing WM_LBUTTONUP messages. --- dlls/comctl32/listview.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 35fd131..ba53434 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3321,21 +3321,33 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; - if (infoPtr->bLButtonDown && DragDetect(infoPtr->hwndSelf, infoPtr->ptClickPos)) + if (infoPtr->bLButtonDown) { - LVHITTESTINFO lvHitTestInfo; - NMLISTVIEW nmlv; + MSG msg; + BOOL skip = FALSE; + /* Check to see if we got a WM_LBUTTONUP, and skip the DragDetect. + * Otherwise, DragDetect will eat it. + */ + if (PeekMessageW(&msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_NOREMOVE)) + if (msg.message == WM_LBUTTONUP) + skip = TRUE; + + if (!skip && DragDetect(infoPtr->hwndSelf, infoPtr->ptClickPos)) + { + LVHITTESTINFO lvHitTestInfo; + NMLISTVIEW nmlv; - lvHitTestInfo.pt = infoPtr->ptClickPos; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + lvHitTestInfo.pt = infoPtr->ptClickPos; + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = lvHitTestInfo.iItem; - nmlv.ptAction = infoPtr->ptClickPos; + ZeroMemory(&nmlv, sizeof(nmlv)); + nmlv.iItem = lvHitTestInfo.iItem; + nmlv.ptAction = infoPtr->ptClickPos; - notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); + notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); - return 0; + return 0; + } } else infoPtr->bLButtonDown = FALSE;

1 0

Nikolay Sivov : gdiplus: Some TRACE(..) for Image calls.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: d7794170e7177c20c74c383b425b5845c88d6a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7794170e7177c20c74c383b4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 11 00:20:42 2008 +0400 gdiplus: Some TRACE(..) for Image calls. --- dlls/gdiplus/image.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 050187a..2f35f27 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -294,6 +294,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, GpStatus stat; IStream *stream; + TRACE("(%s) %p\n", debugstr_w(filename), bitmap); + if(!filename || !bitmap) return InvalidParameter; @@ -354,6 +356,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR* filename, GpBitmap **bitmap) { + TRACE("(%s) %p\n", debugstr_w(filename), bitmap); + return GdipCreateBitmapFromFile(filename, bitmap); } @@ -363,6 +367,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE hInstance, HBITMAP hbm; GpStatus stat = InvalidParameter; + TRACE("%p (%s) %p\n", hInstance, debugstr_w(lpBitmapName), bitmap); + if(!lpBitmapName || !bitmap) return InvalidParameter; @@ -516,6 +522,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, { GpStatus stat; + TRACE("%p %p\n", stream, bitmap); + stat = GdipLoadImageFromStream(stream, (GpImage**) bitmap); if(stat != Ok) @@ -534,6 +542,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream* stream, GpBitmap **bitmap) { + TRACE("%p %p\n", stream, bitmap); + return GdipCreateBitmapFromStream(stream, bitmap); } @@ -541,6 +551,8 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { HDC hdc; + TRACE("%p\n", image); + if(!image) return InvalidParameter; @@ -565,6 +577,8 @@ GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage *image, ImageItemData* item) GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, GpUnit *srcUnit) { + TRACE("%p %p %p\n", image, srcRect, srcUnit); + if(!image || !srcRect || !srcUnit) return InvalidParameter; if(image->type == ImageTypeMetafile){ @@ -593,6 +607,8 @@ GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, GpStatus WINGDIPAPI GdipGetImageDimension(GpImage *image, REAL *width, REAL *height) { + TRACE("%p %p %p\n", image, width, height); + if(!image || !height || !width) return InvalidParameter; @@ -626,6 +642,8 @@ GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, { HDC hdc; + TRACE("%p %p\n", image, graphics); + if(!image || !graphics) return InvalidParameter; @@ -646,6 +664,8 @@ GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) { + TRACE("%p %p\n", image, height); + if(!image || !height) return InvalidParameter; @@ -683,6 +703,8 @@ GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) /* FIXME: test this function for non-bitmap types */ GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage *image, PixelFormat *format) { + TRACE("%p %p\n", image, format); + if(!image || !format) return InvalidParameter; @@ -709,6 +731,8 @@ GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) GpStatus WINGDIPAPI GdipGetImageType(GpImage *image, ImageType *type) { + TRACE("%p %p\n", image, type); + if(!image || !type) return InvalidParameter; @@ -732,6 +756,8 @@ GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage *image, REAL *res) GpStatus WINGDIPAPI GdipGetImageWidth(GpImage *image, UINT *width) { + TRACE("%p %p\n", image, width); + if(!image || !width) return InvalidParameter; @@ -896,6 +922,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, GpStatus stat; IStream *stream; + TRACE("(%s) %p\n", debugstr_w(filename), image); + if (!filename || !image) return InvalidParameter; @@ -914,6 +942,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR* filename, /* FIXME: no icm handling */ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage **image) { + TRACE("(%s) %p\n", debugstr_w(filename), image); + return GdipLoadImageFromFile(filename, image); } @@ -922,6 +952,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) IPicture *pic; short type; + TRACE("%p %p\n", stream, image); + if(!stream || !image) return InvalidParameter; @@ -988,6 +1020,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) /* FIXME: no ICM */ GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream* stream, GpImage **image) { + TRACE("%p %p\n", stream, image); + return GdipLoadImageFromStream(stream, image); } @@ -1021,6 +1055,8 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam GpStatus stat; IStream *stream; + TRACE("%p (%s) %p %p\n", image, debugstr_w(filename), clsidEncoder, encoderParams); + if (!image || !filename|| !clsidEncoder) return InvalidParameter; @@ -1129,6 +1165,8 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, output = NULL; output_size = 0; + TRACE("%p %p %p %p\n", image, stream, clsid, params); + if(!image || !stream) return InvalidParameter; @@ -1243,6 +1281,8 @@ static const ImageCodecInfo codecs[NUM_ENCODERS_SUPPORTED] = */ GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size) { + TRACE("%p %p\n", numEncoders, size); + if (!numEncoders || !size) return InvalidParameter; @@ -1257,6 +1297,8 @@ GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size) */ GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders) { + TRACE("%u %u %p\n", numEncoders, size, encoders); + if (!encoders || (numEncoders != NUM_ENCODERS_SUPPORTED) || (size != sizeof (codecs))) @@ -1276,6 +1318,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi GpStatus retval; PixelFormat format; + TRACE("%p %p %p\n", hbm, hpal, bitmap); + if(!hbm || !bitmap) return InvalidParameter; @@ -1335,6 +1379,8 @@ GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, */ GpStatus WINGDIPAPI GdipGetImageFlags(GpImage *image, UINT *flags) { + TRACE("%p %p\n", image, flags); + if(!image || !flags) return InvalidParameter;

1 0

Alistair Leslie-Hughes : mshtml: Add tests for get_scrollLeft.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 573aa54a23f26d2cc56e5dabcde73dc01a39508b URL: http://source.winehq.org/git/wine.git/?a=commit;h=573aa54a23f26d2cc56e5dabc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 10 20:55:33 2008 +1000 mshtml: Add tests for get_scrollLeft. --- dlls/mshtml/tests/dom.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ce7391d..c294140 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1054,6 +1054,30 @@ static long _elem_get_scroll_top(unsigned line, IUnknown *unk) return l; } +#define elem_get_scroll_left(u) _elem_get_scroll_left(__LINE__,u) +static void _elem_get_scroll_left(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + IHTMLTextContainer *txtcont; + long l = -1, l2 = -1; + HRESULT hres; + + hres = IHTMLElement2_get_scrollLeft(elem, NULL); + ok(hres == E_INVALIDARG, "expect E_INVALIDARG got 0x%08x", hres); + + hres = IHTMLElement2_get_scrollLeft(elem, &l); + ok(hres == S_OK, "get_scrollTop failed: %08x\n", hres); + IHTMLElement2_Release(elem); + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); + ok(hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + + hres = IHTMLTextContainer_get_scrollLeft(txtcont, &l2); + IHTMLTextContainer_Release(txtcont); + ok(hres == S_OK, "IHTMLTextContainer::get_scrollLeft failed: %ld\n", l2); + ok(l == l2, "unexpected left %ld, expected %ld\n", l2, l); +} + #define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) { @@ -2033,7 +2057,8 @@ static void test_default_body(IHTMLBodyElement *body) l = elem_get_scroll_width((IUnknown*)body); ok(l != -1, "scrollWidth == -1\n"); l = elem_get_scroll_top((IUnknown*)body); - ok(!l, "scrollWidth = %ld\n", l); + ok(!l, "scrollTop = %ld\n", l); + elem_get_scroll_left((IUnknown*)body); } static void test_body_funs(IHTMLBodyElement *body)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLTextContainer get_scrollLeft.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: ab70f33151c76e6bedce723fa8fca4b3fa4d25d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab70f33151c76e6bedce723fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 10 20:51:29 2008 +1000 mshtml: Implement IHTMLTextContainer get_scrollLeft. --- dlls/mshtml/htmltextcont.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index f73bb0b..d96dfaf 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -141,8 +141,10 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, long *p) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement2_get_scrollLeft(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLTextContainer_put_onscroll(IHTMLTextContainer *iface, VARIANT v)

1 0

Alistair Leslie-Hughes : mshtml: Implement HTMLElement2 get_scrollLeft.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: fdaa0aff5604272f491040d346b0bfbd8d9e80c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdaa0aff5604272f491040d34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 10 20:50:13 2008 +1000 mshtml: Implement HTMLElement2 get_scrollLeft. --- dlls/mshtml/htmlelem2.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index e7319ef..0234933 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -831,8 +831,34 @@ static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v) static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, long *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 left = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + if(!This->nselem) + { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) + { + nsres = nsIDOMNSHTMLElement_GetScrollLeft(nselem, &left); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) + left = 0; + } + + *p = left; + TRACE("*p = %ld\n", *p); + + return S_OK; } static HRESULT WINAPI HTMLElement2_clearAttributes(IHTMLElement2 *iface)

1 0

Juan Lang : devenum: Fix order of operations bug (Coverity id 709).
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: df592b3c3a8a5180df7fd48e72ba43709d9b8af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df592b3c3a8a5180df7fd48e7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 10 11:31:50 2008 -0700 devenum: Fix order of operations bug (Coverity id 709). --- dlls/devenum/createdevenum.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 7f6ce14..d62c090 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -191,7 +191,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) if (rgPin->nMediaTypes == dwMediaTypeSize) { - DWORD dwNewSize = dwMediaTypeSize + (dwMediaTypeSize < 2) ? 1 : dwMediaTypeSize / 2; + DWORD dwNewSize = dwMediaTypeSize + (dwMediaTypeSize < 2 ? 1 : dwMediaTypeSize / 2); REGPINTYPES *lpNewMediaType; lpNewMediaType = CoTaskMemRealloc(lpMediaType, sizeof(REGPINTYPES) * dwNewSize);

1 0

Alexandre Julliard : jscript: Add necessary dependencies for the bison file .
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: a8513a2113bda259c8e2fd861eaa52124b44d518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8513a2113bda259c8e2fd861… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 12:12:23 2008 +0200 jscript: Add necessary dependencies for the bison file. --- dlls/jscript/Makefile.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index ee3f7e5..e87be62 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -31,4 +31,8 @@ BISON_SRCS = \ @MAKE_DLL_RULES@ +parser.tab.c: parser.tab.h # for parallel makes + @DEPENDENCIES@ # everything below this line is overwritten by make depend + +lex.o: parser.tab.h

1 0

Jacek Caban : jscript: Added add expression implementation.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 93a62e8f70be1eeb208799ea0217f97823baa250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a62e8f70be1eeb208799ea0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 21:12:45 2008 +0200 jscript: Added add expression implementation. --- dlls/jscript/engine.c | 107 ++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/jscript.h | 2 + dlls/jscript/jsutils.c | 41 +++++++++++++++++ dlls/jscript/tests/lang.js | 15 ++++++ 4 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ba3f9b0..a952ecb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -278,6 +278,17 @@ static inline DOUBLE num_val(const VARIANT *v) return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); } +static inline void num_set_val(VARIANT *v, DOUBLE d) +{ + if(d == (DOUBLE)(INT)d) { + V_VT(v) = VT_I4; + V_I4(v) = d; + }else { + V_VT(v) = VT_R8; + V_R8(v) = d; + } +} + /* ECMA-262 3rd Edition 11.9.6 */ HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) { @@ -751,6 +762,29 @@ static HRESULT get_binary_expr_values(exec_ctx_t *ctx, binary_expression_t *expr return S_OK; } +typedef HRESULT (*oper_t)(exec_ctx_t*,VARIANT*,VARIANT*,jsexcept_t*,VARIANT*); + +static HRESULT binary_expr_eval(exec_ctx_t *ctx, binary_expression_t *expr, oper_t oper, jsexcept_t *ei, + exprval_t *ret) +{ + VARIANT lval, rval, retv; + HRESULT hres; + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + hres = oper(ctx, &lval, &rval, ei, &retv); + VariantClear(&lval); + VariantClear(&rval); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = retv; + return S_OK; +} + /* ECMA-262 3rd Edition 13 */ HRESULT function_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -1192,10 +1226,77 @@ HRESULT in_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jse return E_NOTIMPL; } -HRESULT add_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.6.1 */ +static HRESULT add_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT r, l; + HRESULT hres; + + hres = to_primitive(ctx->parser->script, lval, ei, &l); + if(FAILED(hres)) + return hres; + + hres = to_primitive(ctx->parser->script, rval, ei, &r); + if(FAILED(hres)) { + VariantClear(&l); + return hres; + } + + if(V_VT(&l) == VT_BSTR || V_VT(&r) == VT_BSTR) { + BSTR lstr = NULL, rstr = NULL; + + if(V_VT(&l) == VT_BSTR) + lstr = V_BSTR(&l); + else + hres = to_string(ctx->parser->script, &l, ei, &lstr); + + if(SUCCEEDED(hres)) { + if(V_VT(&r) == VT_BSTR) + rstr = V_BSTR(&r); + else + hres = to_string(ctx->parser->script, &r, ei, &rstr); + } + + if(SUCCEEDED(hres)) { + int len1, len2; + + len1 = SysStringLen(lstr); + len2 = SysStringLen(rstr); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocStringLen(NULL, len1+len2); + memcpy(V_BSTR(retv), lstr, len1*sizeof(WCHAR)); + memcpy(V_BSTR(retv)+len1, rstr, (len2+1)*sizeof(WCHAR)); + } + + if(lstr && V_VT(&l) != VT_BSTR) + SysFreeString(lstr); + if(rstr && V_VT(&r) != VT_BSTR) + SysFreeString(rstr); + }else { + VARIANT nl, nr; + + hres = to_number(ctx->parser->script, &l, ei, &nl); + if(SUCCEEDED(hres)) { + hres = to_number(ctx->parser->script, &r, ei, &nr); + if(SUCCEEDED(hres)) + num_set_val(retv, num_val(&nl) + num_val(&nr)); + } + } + + VariantClear(&r); + VariantClear(&l); + return hres; +} + +/* ECMA-262 3rd Edition 11.6.1 */ +HRESULT add_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, add_eval, ei, ret); } HRESULT sub_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 5f15695..ee1215e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -116,7 +116,9 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx* HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); +HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); +HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*); HRESULT to_object(exec_ctx_t*,VARIANT*,IDispatch**); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 919bcca..a193b9e 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -133,6 +133,31 @@ void jsheap_free(jsheap_t *heap) jsheap_init(heap); } +/* ECMA-262 3rd Edition 9.1 */ +HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) +{ + switch(V_VT(v)) { + case VT_EMPTY: + case VT_NULL: + case VT_BOOL: + case VT_I4: + case VT_R8: + *ret = *v; + break; + case VT_BSTR: + V_VT(ret) = VT_BSTR; + V_BSTR(ret) = SysAllocString(V_BSTR(v)); + break; + case VT_DISPATCH: + return disp_propget(V_DISPATCH(v), DISPID_VALUE, ctx->lcid, ret, ei, NULL /*FIXME*/); + default: + FIXME("Unimplemented for vt %d\n", V_VT(v)); + return E_NOTIMPL; + } + + return S_OK; +} + /* ECMA-262 3rd Edition 9.2 */ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) { @@ -164,6 +189,22 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) return S_OK; } +/* ECMA-262 3rd Edition 9.3 */ +HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) +{ + switch(V_VT(v)) { + case VT_I4: + case VT_R8: + *ret = *v; + break; + default: + FIXME("unimplemented for vt %d\n", V_VT(v)); + return E_NOTIMPL; + } + + return S_OK; +} + /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) { diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b58e0f8..302de8d 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -161,4 +161,19 @@ ok(getVT("test") === "VT_BSTR", "getVT(\"test\") is not VT_BSTR"); ok(getVT(Math) === "VT_DISPATCH", "getVT(Math) is not VT_DISPATCH"); ok(getVT(false) === "VT_BOOL", "getVT(false) is not VT_BOOL"); +tmp = 2+2; +ok(tmp === 4, "2+2 !== 4"); +ok(getVT(tmp) === "VT_I4", "getVT(2+2) !== VT_I4"); + +tmp = 2+2.5; +ok(tmp === 4.5, "2+2.5 !== 4.5"); +ok(getVT(tmp) === "VT_R8", "getVT(2+2.5) !== VT_R8"); + +tmp = 1.5+2.5; +ok(tmp === 4, "1.4+2.5 !== 4"); +ok(getVT(tmp) === "VT_I4", "getVT(1.5+2.5) !== VT_I4"); + +tmp = "ab" + "cd"; +ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\""); + reportSuccess();

1 0