February 2011 - Wine-Commits

Vincent Povirk : gdiplus: Implement ImageLockModeUserInputBuf.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 21d6fc9643a33fb0ea2437fdd0383d7294e93dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d6fc9643a33fb0ea2437fdd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 24 16:48:03 2011 -0600 gdiplus: Implement ImageLockModeUserInputBuf. --- dlls/gdiplus/image.c | 49 +++++++++++++++++-------------------------- dlls/gdiplus/tests/image.c | 14 ++++++------ 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 070ea3d..2582ae2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -913,9 +913,7 @@ GpStatus convert_pixels(UINT width, UINT height, GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, UINT flags, PixelFormat format, BitmapData* lockeddata) { - INT stride, bitspp = PIXELFORMATBPP(format); - BYTE *buff = NULL; - UINT abs_height; + INT bitspp = PIXELFORMATBPP(format); GpRect act_rect; /* actual rect to be used */ GpStatus stat; @@ -937,20 +935,13 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, act_rect.Height = bitmap->height; } - if(flags & ImageLockModeUserInputBuf) - { - static int fixme=0; - if (!fixme++) FIXME("ImageLockModeUserInputBuf not implemented\n"); - return NotImplemented; - } - if(bitmap->lockmode) { WARN("bitmap is already locked and cannot be locked again\n"); return WrongState; } - if (bitmap->bits && bitmap->format == format) + if (bitmap->bits && bitmap->format == format && !(flags & ImageLockModeUserInputBuf)) { /* no conversion is necessary; just use the bits directly */ lockeddata->Width = act_rect.Width; @@ -990,13 +981,21 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } } - abs_height = act_rect.Height; - stride = (act_rect.Width * bitspp + 7) / 8; - stride = (stride + 3) & ~3; + lockeddata->Width = act_rect.Width; + lockeddata->Height = act_rect.Height; + lockeddata->PixelFormat = format; + lockeddata->Reserved = flags; + + if(!(flags & ImageLockModeUserInputBuf)) + { + lockeddata->Stride = (((act_rect.Width * bitspp + 7) / 8) + 3) & ~3; + + bitmap->bitmapbits = GdipAlloc(lockeddata->Stride * act_rect.Height); - buff = GdipAlloc(stride * abs_height); + if (!bitmap->bitmapbits) return OutOfMemory; - if (!buff) return OutOfMemory; + lockeddata->Scan0 = bitmap->bitmapbits; + } if (flags & ImageLockModeRead) { @@ -1009,28 +1008,21 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } stat = convert_pixels(act_rect.Width, act_rect.Height, - stride, buff, format, + lockeddata->Stride, lockeddata->Scan0, format, bitmap->stride, bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, bitmap->format, bitmap->image.palette_entries); if (stat != Ok) { - GdipFree(buff); + GdipFree(bitmap->bitmapbits); + bitmap->bitmapbits = NULL; return stat; } } - lockeddata->Width = act_rect.Width; - lockeddata->Height = act_rect.Height; - lockeddata->PixelFormat = format; - lockeddata->Reserved = flags; - lockeddata->Stride = stride; - lockeddata->Scan0 = buff; - bitmap->lockmode = flags; bitmap->numlocks++; - bitmap->bitmapbits = buff; bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y; @@ -1064,9 +1056,6 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if(!bitmap->lockmode) return WrongState; - if(lockeddata->Reserved & ImageLockModeUserInputBuf) - return NotImplemented; - if(!(lockeddata->Reserved & ImageLockModeWrite)){ if(!(--bitmap->numlocks)) bitmap->lockmode = 0; @@ -1076,7 +1065,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } - if (!bitmap->bitmapbits) + if (!bitmap->bitmapbits && !(lockeddata->Reserved & ImageLockModeUserInputBuf)) { /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 005969b..71a99ea 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -777,10 +777,10 @@ static void test_LockBits_UserBuf(void) /* read-only */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); - todo_wine expect(Ok, stat); + expect(Ok, stat); expect(0xaaaaaaaa, bits[0]); - todo_wine expect(0, bits[2+3*WIDTH]); + expect(0, bits[2+3*WIDTH]); bits[2+3*WIDTH] = 0xdeadbeef; @@ -795,7 +795,7 @@ static void test_LockBits_UserBuf(void) /* write-only */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); - todo_wine expect(Ok, stat); + expect(Ok, stat); expect(0xdeadbeef, bits[2+3*WIDTH]); bits[2+3*WIDTH] = 0x12345678; @@ -807,15 +807,15 @@ static void test_LockBits_UserBuf(void) stat = GdipBitmapGetPixel(bm, 2, 3, &color); expect(Ok, stat); - todo_wine expect(0x12345678, color); + expect(0x12345678, color); bits[2+3*WIDTH] = 0; /* read/write */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead|ImageLockModeWrite|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); - todo_wine expect(Ok, stat); + expect(Ok, stat); - todo_wine expect(0x12345678, bits[2+3*WIDTH]); + expect(0x12345678, bits[2+3*WIDTH]); bits[2+3*WIDTH] = 0xdeadbeef; if (stat == Ok) { @@ -825,7 +825,7 @@ static void test_LockBits_UserBuf(void) stat = GdipBitmapGetPixel(bm, 2, 3, &color); expect(Ok, stat); - todo_wine expect(0xdeadbeef, color); + expect(0xdeadbeef, color); stat = GdipDisposeImage((GpImage*)bm); expect(Ok, stat);

1 0

Łukasz Wojniłowicz : Correct misspelled word in Polish news translations
by Jeremy Newman Feb. 24, 2011

Feb. 24, 2011

1 0

Jacek Caban : mshtml: Improved debug traces.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: ceff92a512645c02e1b5fbd9a48dd6a549f7f0ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceff92a512645c02e1b5fbd9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:49 2011 +0100 mshtml: Improved debug traces. --- dlls/mshtml/mutation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index c4f7945..3e528bf 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -547,7 +547,7 @@ static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocu { HTMLDocumentNode *This = impl_from_nsIDocumentObserver(iface); - TRACE("\n"); + TRACE("(%p)\n", This); if(This->skip_mutation_notif) return;

1 0

Maarten Lankhorst : ntdll: Fix time accounting in NtQuerySystemInformation.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: f45b6c54bec52e9a8429fafa7a663edf98c98422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45b6c54bec52e9a8429fafa7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 23 14:12:22 2011 +0100 ntdll: Fix time accounting in NtQuerySystemInformation. --- dlls/ntdll/nt.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6165082..8b4f09c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1586,26 +1586,35 @@ NTSTATUS WINAPI NtQuerySystemInformation( FILE *cpuinfo = fopen("/proc/stat", "r"); if (cpuinfo) { - unsigned usr,nice,sys; - unsigned long idle; + unsigned long usr,nice,sys,idle,remainder[8]; int count; char name[10]; char line[255]; /* first line is combined usage */ if (fgets(line,255,cpuinfo)) - count = sscanf(line, "%s %u %u %u %lu", name, &usr, &nice, - &sys, &idle); + count = sscanf(line, "%s %lu %lu %lu %lu " + "%lu %lu %lu %lu %lu %lu %lu %lu", + name, &usr, &nice, &sys, &idle, + &remainder[0], &remainder[1], &remainder[2], + &remainder[3], &remainder[4], &remainder[5], + &remainder[6], &remainder[7]); else count = 0; /* we set this up in the for older non-smp enabled kernels */ - if (count == 5 && strcmp(name, "cpu") == 0) + if (count >= 5 && strcmp(name, "cpu") == 0) { + int i; + for (i = 0; i + 5 < count; ++i) + sys += remainder[i]; + usr += nice; sppi = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); sppi->IdleTime.QuadPart = idle; sppi->KernelTime.QuadPart = sys; - sppi->UserTime.QuadPart = usr; + sppi->UserTime.QuadPart = usr+nice; + sppi->Reserved1[0].QuadPart = 0; + sppi->Reserved1[1].QuadPart = 0; cpus = 1; len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); } @@ -1613,12 +1622,20 @@ NTSTATUS WINAPI NtQuerySystemInformation( do { if (fgets(line, 255, cpuinfo)) - count = sscanf(line, "%s %u %u %u %lu", name, &usr, - &nice, &sys, &idle); + count = sscanf(line, "%s %lu %lu %lu %lu " + "%lu %lu %lu %lu %lu %lu %lu %lu", + name, &usr, &nice, &sys, &idle, + &remainder[0], &remainder[1], &remainder[2], + &remainder[3], &remainder[4], &remainder[5], + &remainder[6], &remainder[7]); else count = 0; - if (count == 5 && strncmp(name, "cpu", 3)==0) + if (count >= 5 && strncmp(name, "cpu", 3)==0) { + int i; + for (i = 0; i + 5 < count; ++i) + sys += remainder[i]; + usr += nice; out_cpus --; if (name[3]=='0') /* first cpu */ { @@ -1633,6 +1650,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( sppi[cpus].IdleTime.QuadPart = idle; sppi[cpus].KernelTime.QuadPart = sys; sppi[cpus].UserTime.QuadPart = usr; + sppi[cpus].Reserved1[0].QuadPart = 0; + sppi[cpus].Reserved1[1].QuadPart = 0; cpus++; } }

1 0

Jacek Caban : mshtml: Make sure we don' t try to create node object for attributes.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 6fe3c709e2b31ce9e4b0f0c15d66097bd7d4cfba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe3c709e2b31ce9e4b0f0c15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:39 2011 +0100 mshtml: Make sure we don't try to create node object for attributes. --- dlls/mshtml/htmlnode.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e521850..1dc50ab 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1033,6 +1033,9 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod *ret = &comment->node; break; } + case ATTRIBUTE_NODE: + ERR("Called on attribute node\n"); + return E_UNEXPECTED; default: { HTMLDOMNode *node;

1 0

Jacek Caban : mshtml: Added attribute object tests.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 8f79e50e1a90d406b86f714c4d617266b6634ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f79e50e1a90d406b86f714c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:29 2011 +0100 mshtml: Added attribute object tests. --- dlls/mshtml/tests/dom.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d6dfff9..296de73 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2008 Jacek Caban for CodeWeavers + * Copyright 2007-2011 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -225,6 +225,12 @@ static const IID * const text_iids[] = { NULL }; +static const IID * const attr_iids[] = { + &IID_IHTMLDOMAttribute, + &IID_IDispatchEx, + NULL +}; + static const IID * const location_iids[] = { &IID_IDispatch, &IID_IHTMLLocation, @@ -468,6 +474,18 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) } } +#define test_no_iface(a,b) _test_no_iface(__LINE__,a,b) +static void _test_no_iface(unsigned line, IUnknown *iface, REFIID iid) +{ + IUnknown *unk; + HRESULT hres; + + unk = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(iface, iid, (void**)&unk); + ok_(__FILE__,line)(hres == E_NOINTERFACE, "hres = %08x, expected E_NOINTERFACE\n", hres); + ok_(__FILE__,line)(!unk, "unk = %p\n", unk); +} + #define test_get_dispid(u,id) _test_get_dispid(__LINE__,u,id) static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) { @@ -589,6 +607,17 @@ static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) return elem; } +#define get_elem4_iface(u) _get_elem4_iface(__LINE__,u) +static IHTMLElement4 *_get_elem4_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement4 *elem; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement4, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement4: %08x\n", hres); + return elem; +} + #define get_node_iface(u) _get_node_iface(__LINE__,u) static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) { @@ -2795,6 +2824,27 @@ static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) return doc; } +#define get_elem_attr_node(a,b,c) _get_elem_attr_node(__LINE__,a,b,c) +static IHTMLDOMAttribute *_get_elem_attr_node(unsigned line, IUnknown *unk, const char *attr_name, BOOL expect_success) +{ + IHTMLElement4 *elem = _get_elem4_iface(line, unk); + BSTR str = a2bstr(attr_name); + IHTMLDOMAttribute *attr; + HRESULT hres; + + attr = (void*)0xdeadbeef; + hres = IHTMLElement4_getAttributeNode(elem, str, &attr); + ok_(__FILE__,line)(hres == S_OK, "getAttributeNode failed: %08x\n", hres); + if(expect_success) + ok_(__FILE__,line)(attr != NULL, "attr = NULL\n"); + else + ok_(__FILE__,line)(!attr, "attr = %p\n", attr); + + IHTMLElement4_Release(elem); + SysFreeString(str); + return attr; +} + #define get_window_doc(e) _get_window_doc(__LINE__,e) static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) { @@ -6584,6 +6634,26 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } +static void test_attr(IHTMLElement *elem) +{ + IHTMLDOMAttribute *attr, *attr2; + + get_elem_attr_node((IUnknown*)elem, "noattr", FALSE); + + attr = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); + test_ifaces((IUnknown*)attr, attr_iids); + test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + + attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + todo_wine + ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n"); + IHTMLDOMAttribute_Release(attr2); + + IHTMLDOMAttribute_Release(attr); +} + static void test_elems2(IHTMLDocument2 *doc) { IHTMLElement *elem, *elem2, *div; @@ -6642,6 +6712,8 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_attr(div); + IHTMLElement_Release(div); }

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLDOMAttribute object.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 17736769c41720905b290b691abdd42d272a8e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17736769c41720905b290b691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:18 2011 +0100 mshtml: Added IDispatchEx support to HTMLDOMAttribute object. --- dlls/mshtml/htmlattr.c | 31 +++++++++++++++++++++++-------- dlls/mshtml/mshtml_private.h | 3 +++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 05b13fc..3d6de22 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -48,6 +48,8 @@ static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { TRACE("(%p)->(IID_IHTMLDOMAttribute %p)\n", This, ppv); *ppv = &This->IHTMLDOMAttribute_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; }else { WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -77,6 +79,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) if(!ref) { nsIDOMAttr_Release(This->nsattr); + release_dispex(&This->dispex); heap_free(This); } @@ -86,16 +89,14 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfoCount(IHTMLDOMAttribute *iface, UINT *pctinfo) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfo(IHTMLDOMAttribute *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDOMAttribute_GetIDsOfNames(IHTMLDOMAttribute *iface, REFIID riid, @@ -103,8 +104,8 @@ static HRESULT WINAPI HTMLDOMAttribute_GetIDsOfNames(IHTMLDOMAttribute *iface, R LCID lcid, DISPID *rgDispId) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); } static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID dispIdMember, @@ -112,8 +113,8 @@ static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID d VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BSTR *p) @@ -158,6 +159,17 @@ static const IHTMLDOMAttributeVtbl HTMLDOMAttributeVtbl = { HTMLDOMAttribute_get_specified }; +static const tid_t HTMLDOMAttribute_iface_tids[] = { + IHTMLDOMAttribute_tid, + 0 +}; +static dispex_static_data_t HTMLDOMAttribute_dispex = { + NULL, + DispHTMLDOMAttribute_tid, + 0, + HTMLDOMAttribute_iface_tids +}; + HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode *doc, nsIDOMAttr *nsattr, HTMLDOMAttribute **attr) { HTMLDOMAttribute *ret; @@ -172,6 +184,9 @@ HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode *doc, nsIDOMAttr *nsattr, HTMLD nsIDOMAttr_AddRef(nsattr); ret->nsattr = nsattr; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, + &HTMLDOMAttribute_dispex); + *attr = ret; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dc99fbf..e69949e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -74,6 +74,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLCommentElement) \ XDIID(DispHTMLCurrentStyle) \ XDIID(DispHTMLDocument) \ + XDIID(DispHTMLDOMAttribute) \ XDIID(DispHTMLDOMTextNode) \ XDIID(DispHTMLElementCollection) \ XDIID(DispHTMLEmbed) \ @@ -111,6 +112,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLDocument3) \ XIID(IHTMLDocument4) \ XIID(IHTMLDocument5) \ + XIID(IHTMLDOMAttribute) \ XIID(IHTMLDOMChildrenCollection) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ @@ -740,6 +742,7 @@ HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); typedef struct { + DispatchEx dispex; IHTMLDOMAttribute IHTMLDOMAttribute_iface; LONG ref;

1 0

Jacek Caban : mshtml: Added IHTMLElement4::getAttributeNode implementation.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 0e3bf9b2285a1f5e3e98b82dc6a76782c1f79cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3bf9b2285a1f5e3e98b82dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:08 2011 +0100 mshtml: Added IHTMLElement4::getAttributeNode implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlattr.c | 177 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem3.c | 29 +++++++- dlls/mshtml/mshtml_private.h | 9 ++ dlls/mshtml/nsiface.idl | 16 ++++- 5 files changed, 229 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 2093eb6..ea716fb 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ editor.c \ hlink.c \ htmlanchor.c \ + htmlattr.c \ htmlbody.c \ htmlcomment.c \ htmlcurstyle.c \ diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c new file mode 100644 index 0000000..05b13fc --- /dev/null +++ b/dlls/mshtml/htmlattr.c @@ -0,0 +1,177 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "mshtml_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMAttribute, IHTMLDOMAttribute_iface); +} + +static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, + REFIID riid, void **ppv) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IHTMLDOMAttribute_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { + TRACE("(%p)->(IID_IHTMLDOMAttribute %p)\n", This, ppv); + *ppv = &This->IHTMLDOMAttribute_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + nsIDOMAttr_Release(This->nsattr); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfoCount(IHTMLDOMAttribute *iface, UINT *pctinfo) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfo(IHTMLDOMAttribute *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_GetIDsOfNames(IHTMLDOMAttribute *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BSTR *p) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_put_nodeName(IHTMLDOMAttribute *iface, VARIANT v) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, VARIANT *p) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLDOMAttributeVtbl HTMLDOMAttributeVtbl = { + HTMLDOMAttribute_QueryInterface, + HTMLDOMAttribute_AddRef, + HTMLDOMAttribute_Release, + HTMLDOMAttribute_GetTypeInfoCount, + HTMLDOMAttribute_GetTypeInfo, + HTMLDOMAttribute_GetIDsOfNames, + HTMLDOMAttribute_Invoke, + HTMLDOMAttribute_get_nodeName, + HTMLDOMAttribute_put_nodeName, + HTMLDOMAttribute_get_nodeValue, + HTMLDOMAttribute_get_specified +}; + +HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode *doc, nsIDOMAttr *nsattr, HTMLDOMAttribute **attr) +{ + HTMLDOMAttribute *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IHTMLDOMAttribute_iface.lpVtbl = &HTMLDOMAttributeVtbl; + ret->ref = 1; + + nsIDOMAttr_AddRef(nsattr); + ret->nsattr = nsattr; + + *attr = ret; + return S_OK; +} diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 9fc0d39..7841346 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -560,8 +560,33 @@ static HRESULT WINAPI HTMLElement4_normalize(IHTMLElement4 *iface) static HRESULT WINAPI HTMLElement4_getAttributeNode(IHTMLElement4 *iface, BSTR bstrname, IHTMLDOMAttribute **ppAttribute) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrname), ppAttribute); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + nsAString name_str; + nsIDOMAttr *nsattr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrname), ppAttribute); + + nsAString_InitDepend(&name_str, bstrname); + nsres = nsIDOMHTMLElement_GetAttributeNode(This->nselem, &name_str, &nsattr); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("GetAttributeNode failed: %08x\n", nsres); + return E_FAIL; + } + + if(nsattr) { + hres = HTMLDOMAttribute_Create(This->node.doc, nsattr, &attr); + nsIDOMAttr_Release(nsattr); + if(FAILED(hres)) + return hres; + + *ppAttribute = &attr->IHTMLDOMAttribute_iface; + }else { + *ppAttribute = NULL; + } + return S_OK; } static HRESULT WINAPI HTMLElement4_setAttributeNode(IHTMLElement4 *iface, IHTMLDOMAttribute *pattr, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c6d56ee..dc99fbf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -739,6 +739,15 @@ HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); +typedef struct { + IHTMLDOMAttribute IHTMLDOMAttribute_iface; + + LONG ref; + nsIDOMAttr *nsattr; +} HTMLDOMAttribute; + +HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode*,nsIDOMAttr*,HTMLDOMAttribute**); + HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**); HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**); HRESULT HTMLAnchorElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 4248768..7d8b5ce 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -89,6 +89,7 @@ interface nsIDOMCSSStyleSheet; interface nsIDOMDocumentView; interface nsIDocumentObserver; interface nsIDOMWindow; +interface nsIDOMElement; interface IMoniker; @@ -111,7 +112,6 @@ typedef nsISupports nsIDOMBarProp; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; typedef nsISupports nsIDOMNamedNodeMap; -typedef nsISupports nsIDOMAttr; typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMCDATASection; @@ -675,6 +675,20 @@ interface nsIDOMNode : nsISupports [ object, + uuid(a6cf9070-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMAttr : nsIDOMNode +{ + nsresult GetName(nsAString *aName); + nsresult GetSpecified(PRBool *aSpecified); + nsresult GetValue(nsAString *aValue); + nsresult SetValue(const nsAString *aValue); + nsresult GetOwnerElement(nsIDOMElement **aOwnerElement); +} + +[ + object, uuid(a6cf9078-15b3-11d2-932e-00805f8add32), local ]

1 0

Jacek Caban : mshtml: Added IHTMLElement4 stub implementation.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 877069c2ada75e19b9913d03407091ebd9c3e393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877069c2ada75e19b9913d034… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:03:42 2011 +0100 mshtml: Added IHTMLElement4 stub implementation. --- dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmlelem3.c | 162 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 149 ++++++++------------------------------- 4 files changed, 195 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=877069c2ada75e19b9913…

1 0

Dmitry Timoshkov : gdi32: Add a EnumFontFamilies test to see how it handles various font faces.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 1b041c92cb770d2bcb9ef00d93599d542cdc9002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b041c92cb770d2bcb9ef00d9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 14 17:55:03 2011 +0800 gdi32: Add a EnumFontFamilies test to see how it handles various font faces. --- dlls/gdi32/tests/font.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8bce92b..a9a8755 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3483,6 +3483,101 @@ static void test_AddFontMemResource(void) free_font(font); } +static INT CALLBACK enum_fonts_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lparam) +{ + LOGFONT *lf; + + if (type != TRUETYPE_FONTTYPE) return 1; + + ok(ntm->tmWeight == elf->lfWeight, "expected %d got %d\n", ntm->tmWeight, elf->lfWeight); + + lf = (LOGFONT *)lparam; + *lf = *elf; + return 0; +} + +static INT CALLBACK enum_all_fonts_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lparam) +{ + int ret; + LOGFONT *lf; + + if (type != TRUETYPE_FONTTYPE) return 1; + + lf = (LOGFONT *)lparam; + ret = strcmp(lf->lfFaceName, elf->lfFaceName); + if(ret == 0) + { + ok(ntm->tmWeight == elf->lfWeight, "expected %d got %d\n", ntm->tmWeight, elf->lfWeight); + *lf = *elf; + return 0; + } + return 1; +} + +static void test_EnumFonts(void) +{ + int ret; + LOGFONT lf; + HDC hdc; + + if (!is_truetype_font_installed("Arial")) + { + skip("Arial is not installed\n"); + return; + } + + /* Windows uses localized font face names, so Arial Bold won't be found */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("User locale is not English, skipping the test\n"); + return; + } + + hdc = CreateCompatibleDC(0); + + ret = EnumFontFamilies(hdc, "Arial", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_NORMAL, "expected FW_NORMAL got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_NORMAL, "expected FW_NORMAL got %d\n", lf.lfWeight); + + ret = EnumFontFamilies(hdc, "Arial Bold", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial Bold is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_BOLD, "expected FW_BOLD got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial Bold"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Bold should not be enumerated\n"); + + ret = EnumFontFamilies(hdc, "Arial Bold Italic", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial Bold Italic is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_BOLD, "expected FW_BOLD got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial Bold Italic"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Bold Italic should not be enumerated\n"); + + ret = EnumFontFamilies(hdc, "Arial Italic Bold", enum_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Italic Bold should not be enumerated\n"); + + lstrcpy(lf.lfFaceName, "Arial Italic Bold"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Italic Bold should not be enumerated\n"); + + DeleteDC(hdc); +} + START_TEST(font) { init(); @@ -3504,6 +3599,7 @@ START_TEST(font) test_orientation(); test_height_selection(); test_AddFontMemResource(); + test_EnumFonts(); /* On Windows Arial has a lot of default charset aliases such as Arial Cyr, * I'd like to avoid them in this test.

1 0