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

Nikolay Sivov : gdi32/dibdrv: Fix a clipped_rects leak (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 8a3f3c081756af8b9a3f87a5ecaf6bed6dfbd743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3f3c081756af8b9a3f87a5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 12:36:44 2014 +0400 gdi32/dibdrv: Fix a clipped_rects leak (Valgrind). --- dlls/gdi32/dibdrv/bitblt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index a9c32bf..a944e71 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -925,7 +925,10 @@ DWORD put_image_into_bitmap( BITMAPOBJ *bmp, HRGN clip, BITMAPINFO *info, src_dib.bits.is_copy = bits->is_copy; if (get_clipped_rects( &dib, &dst->visrect, clip, &clipped_rects )) + { copy_rect( &dib, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, R2_COPYPEN ); + free_clipped_rects( &clipped_rects ); + } return ERROR_SUCCESS; @@ -981,6 +984,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, } else ret = execute_rop( pdev, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, rop ); + free_clipped_rects( &clipped_rects ); } if (tmp_rgn) DeleteObject( tmp_rgn ); return ret;

1 0

Nikolay Sivov : dwrite/tests: Fix a font instance leak (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: db49dec825fd8db82f0c671fff23aebfb9d86e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db49dec825fd8db82f0c671ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 13:00:37 2014 +0400 dwrite/tests: Fix a font instance leak (Valgrind). --- dlls/dwrite/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a4a7854..1447c1c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -588,6 +588,7 @@ static void test_ConvertFontFaceToLOGFONT(void) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); if (0) /* crashes on native */ {

1 0

Nikolay Sivov : gdiplus/tests: Fix some leaks when running with Wine ( Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: d68dde3751aee645ce4a7b800b875e4060a3d8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68dde3751aee645ce4a7b800… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 13:49:41 2014 +0400 gdiplus/tests: Fix some leaks when running with Wine (Valgrind). --- dlls/gdiplus/tests/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2b5cf09..b826ba6 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -798,17 +798,23 @@ static void test_font_substitution(void) lf.lfWeight = 0; lf.lfCharSet = 0; lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); + font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); + /* FIXME: remove when wine is fixed */ + if (font) GdipDeleteFont(font); /* empty FaceName */ lf.lfFaceName[0] = 0; + font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); + /* FIXME: remove when wine is fixed */ + if (font) GdipDeleteFont(font); GdipDeleteGraphics(graphics); DeleteDC(hdc);

1 0

Nikolay Sivov : gdiplus: Simplify GdipResetImageAttributes(), fix remap table leak (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: e9633ef220b9b72520b66407ac8fcb74a3c7cfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9633ef220b9b72520b66407a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 13:50:04 2014 +0400 gdiplus: Simplify GdipResetImageAttributes(), fix remap table leak (Valgrind). --- dlls/gdiplus/imageattributes.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 0b09547..17c525c 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -279,11 +279,10 @@ GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes *imageAttr, if(!imageAttr || type >= ColorAdjustTypeCount) return InvalidParameter; - memset(&imageAttr->colorkeys[type], 0, sizeof(imageAttr->colorkeys[type])); memset(&imageAttr->colormatrices[type], 0, sizeof(imageAttr->colormatrices[type])); - memset(&imageAttr->colorremaptables[type], 0, sizeof(imageAttr->colorremaptables[type])); - memset(&imageAttr->gamma_enabled[type], 0, sizeof(imageAttr->gamma_enabled[type])); - memset(&imageAttr->gamma[type], 0, sizeof(imageAttr->gamma[type])); + GdipSetImageAttributesColorKeys(imageAttr, type, FALSE, 0, 0); + GdipSetImageAttributesRemapTable(imageAttr, type, FALSE, 0, NULL); + GdipSetImageAttributesGamma(imageAttr, type, FALSE, 0.0); return Ok; }

1 0

Piotr Caban : include: Don't redefine LIBID_Accessibility in oleacc.idl.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 5953fefa84b9ca88a0ebecffd78205d483cf15c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5953fefa84b9ca88a0ebecffd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 25 12:45:05 2014 +0200 include: Don't redefine LIBID_Accessibility in oleacc.idl. --- include/oleacc.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index 241eb00..e9cf138 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -270,7 +270,6 @@ library Accessibility } }; -cpp_quote("DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b, 0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);") cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);")

1 0

Piotr Caban : oleacc: Add LresultFromObject implementation.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 959f785c0f66c931f558435c30dd38f9718dfd95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959f785c0f66c931f558435c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 25 12:45:16 2014 +0200 oleacc: Add LresultFromObject implementation. --- dlls/oleacc/Makefile.in | 2 +- dlls/oleacc/main.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 2f99ec7..0fb6eaf 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = user32 +IMPORTS = ole32 user32 C_SRCS = \ main.c diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 4a3e920..079b2aa 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -30,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); +static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; + static HINSTANCE oleacc_handle = 0; HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, @@ -48,8 +52,96 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { - FIXME("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc ); - return E_NOTIMPL; + static const WCHAR atom_fmt[] = {'%','0','8','x',':','%','0','8','x',':','%','0','8','x',0}; + static const LARGE_INTEGER seek_zero = {{0}}; + + WCHAR atom_str[sizeof(lresult_atom_prefix)/sizeof(WCHAR)+3*8+3]; + IStream *stream; + HANDLE mapping; + STATSTG stat; + HRESULT hr; + ATOM atom; + void *view; + + TRACE("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc); + + if(wParam) + FIXME("unsupported wParam = %lx\n", wParam); + + if(!pAcc) + return E_INVALIDARG; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(FAILED(hr)) + return hr; + + hr = CoMarshalInterface(stream, riid, pAcc, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); + if(FAILED(hr)) { + IStream_Release(stream); + return hr; + } + + hr = IStream_Seek(stream, seek_zero, STREAM_SEEK_SET, NULL); + if(FAILED(hr)) { + IStream_Release(stream); + return hr; + } + + hr = IStream_Stat(stream, &stat, STATFLAG_NONAME); + if(FAILED(hr)) { + CoReleaseMarshalData(stream); + IStream_Release(stream); + return hr; + }else if(stat.cbSize.u.HighPart) { + FIXME("stream size to big\n"); + CoReleaseMarshalData(stream); + IStream_Release(stream); + return E_NOTIMPL; + } + + mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, + stat.cbSize.u.HighPart, stat.cbSize.u.LowPart, NULL); + if(!mapping) { + CoReleaseMarshalData(stream); + IStream_Release(stream); + return hr; + } + + view = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + if(!view) { + CloseHandle(mapping); + CoReleaseMarshalData(stream); + IStream_Release(stream); + return E_FAIL; + } + + hr = IStream_Read(stream, view, stat.cbSize.u.LowPart, NULL); + UnmapViewOfFile(view); + if(FAILED(hr)) { + CloseHandle(mapping); + hr = IStream_Seek(stream, seek_zero, STREAM_SEEK_SET, NULL); + if(SUCCEEDED(hr)) + CoReleaseMarshalData(stream); + IStream_Release(stream); + return hr; + + } + + memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); + sprintfW(atom_str+sizeof(lresult_atom_prefix)/sizeof(WCHAR), + atom_fmt, GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); + atom = GlobalAddAtomW(atom_str); + if(!atom) { + CloseHandle(mapping); + hr = IStream_Seek(stream, seek_zero, STREAM_SEEK_SET, NULL); + if(SUCCEEDED(hr)) + CoReleaseMarshalData(stream); + IStream_Release(stream); + return E_FAIL; + } + + IStream_Release(stream); + return atom; } HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild )

1 0

Piotr Caban : oleacc: Add ObjectFromLresult implementation.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: d7000d70533d8a612e6095041e165dc7008b398d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7000d70533d8a612e6095041… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 25 14:50:37 2014 +0200 oleacc: Add ObjectFromLresult implementation. --- dlls/oleacc/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 079b2aa..5a7afd90 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -46,8 +46,72 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, void **ppObject ) { - FIXME("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject ); - return E_NOTIMPL; + WCHAR atom_str[sizeof(lresult_atom_prefix)/sizeof(WCHAR)+3*8+3]; + HANDLE server_proc, server_mapping, mapping; + DWORD proc_id, size; + IStream *stream; + HGLOBAL data; + void *view; + HRESULT hr; + WCHAR *p; + + TRACE("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject ); + + if(wParam) + FIXME("unsupported wParam = %lx\n", wParam); + + if(!ppObject) + return E_INVALIDARG; + *ppObject = NULL; + + if(result != (ATOM)result) + return E_FAIL; + + if(!GlobalGetAtomNameW(result, atom_str, sizeof(atom_str)/sizeof(WCHAR))) + return E_FAIL; + if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix))) + return E_FAIL; + p = atom_str + sizeof(lresult_atom_prefix)/sizeof(WCHAR); + proc_id = strtoulW(p, &p, 16); + if(*p != ':') + return E_FAIL; + server_mapping = ULongToHandle( strtoulW(p+1, &p, 16) ); + if(*p != ':') + return E_FAIL; + size = strtoulW(p+1, &p, 16); + if(*p != 0) + return E_FAIL; + + server_proc = OpenProcess(PROCESS_DUP_HANDLE, FALSE, proc_id); + if(!server_proc) + return E_FAIL; + + if(!DuplicateHandle(server_proc, server_mapping, GetCurrentProcess(), &mapping, + 0, FALSE, DUPLICATE_CLOSE_SOURCE|DUPLICATE_SAME_ACCESS)) + return E_FAIL; + CloseHandle(server_proc); + GlobalDeleteAtom(result); + + view = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + CloseHandle(mapping); + if(!view) + return E_FAIL; + + data = GlobalAlloc(GMEM_FIXED, size); + memcpy(data, view, size); + UnmapViewOfFile(view); + if(!data) + return E_OUTOFMEMORY; + + hr = CreateStreamOnHGlobal(data, TRUE, &stream); + if(FAILED(hr)) { + GlobalFree(data); + return hr; + } + + hr = CoUnmarshalInterface(stream, riid, ppObject); + IStream_Release(stream); + return hr; } LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )

1 0

Piotr Caban : oleacc: Add initial LresultFromObject tests.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 2858f1ee635b96d39a707c2bcbb66648f8305a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2858f1ee635b96d39a707c2bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 25 14:04:34 2014 +0200 oleacc: Add initial LresultFromObject tests. --- dlls/oleacc/tests/Makefile.in | 2 +- dlls/oleacc/tests/main.c | 101 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in index 47f3e57..374f15d 100644 --- a/dlls/oleacc/tests/Makefile.in +++ b/dlls/oleacc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oleacc.dll -IMPORTS = oleacc +IMPORTS = ole32 oleacc C_SRCS = \ main.c diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index db7ee9e..e3daefe 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -18,8 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <oleacc.h> +#define COBJMACROS + #include "wine/test.h" +#include <stdio.h> + +#include "initguid.h" +#include <oleacc.h> static void test_getroletext(void) { @@ -135,7 +140,101 @@ static void test_getroletext(void) } } +static int Object_ref = 1; +static HRESULT WINAPI Object_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualIID(riid, &IID_IUnknown)) { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Object_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&Object_ref); +} + +static ULONG WINAPI Object_Release(IUnknown *iface) +{ + return InterlockedDecrement(&Object_ref); +} + +static IUnknownVtbl ObjectVtbl = { + Object_QueryInterface, + Object_AddRef, + Object_Release +}; + +static IUnknown Object = {&ObjectVtbl}; + +static void test_LresultFromObject(const char *name) +{ + PROCESS_INFORMATION proc; + STARTUPINFOA startup; + char cmdline[MAX_PATH]; + IUnknown *unk; + HRESULT hres; + LRESULT lres; + + lres = LresultFromObject(NULL, 0, 0); + ok(lres == E_INVALIDARG, "got %lx\n", lres); + + hres = ObjectFromLresult(0, &IID_IUnknown, 0, (void**)&unk); + ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) + || hres==E_FAIL, "got %x\n", hres); + hres = ObjectFromLresult(0x10000, &IID_IUnknown, 0, (void**)&unk); + ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) + || hres==E_FAIL, "got %x\n", hres); + + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); + lres = LresultFromObject(&IID_IUnknown, 0, &Object); + ok(SUCCEEDED(lres), "got %lx\n", lres); + ok(Object_ref > 1, "Object_ref = %d\n", Object_ref); + + hres = ObjectFromLresult(lres, &IID_IUnknown, 0, (void**)&unk); + ok(hres == S_OK, "hres = %x\n", hres); + ok(unk == &Object, "unk != &Object\n"); + IUnknown_Release(unk); + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); + + lres = LresultFromObject(&IID_IUnknown, 0, &Object); + ok(SUCCEEDED(lres), "got %lx\n", lres); + ok(Object_ref > 1, "Object_ref = %d\n", Object_ref); + + sprintf(cmdline, "\"%s\" main ObjectFromLresult %lx", name, lres); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); +} + START_TEST(main) { + int argc; + char **argv; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + argc = winetest_get_mainargs(&argv); + if(argc == 4 && !strcmp(argv[2], "ObjectFromLresult")) { + IUnknown *unk; + HRESULT hres; + LRESULT lres; + + sscanf(argv[3], "%lx", &lres); + hres = ObjectFromLresult(lres, &IID_IUnknown, 0, (void**)&unk); + ok(hres == S_OK, "hres = %x\n", hres); + IUnknown_Release(unk); + + CoUninitialize(); + return; + } + test_getroletext(); + test_LresultFromObject(argv[0]); + + CoUninitialize(); }

1 0

Zhenbo Li : mshtml: Added IHTMLElement3:: contentEditable property implemention.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 2a8d4a03d3c81bda0182ef40f9969e48925f89a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8d4a03d3c81bda0182ef40f… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Apr 20 10:56:37 2014 +0800 mshtml: Added IHTMLElement3::contentEditable property implemention. --- dlls/mshtml/htmlelem3.c | 27 +++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 805e8aa..07f4854 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -174,15 +174,34 @@ static HRESULT WINAPI HTMLElement3_setActive(IHTMLElement3 *iface) static HRESULT WINAPI HTMLElement3_put_contentEditable(IHTMLElement3 *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement3(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsresult nsres; + nsAString str; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + nsres = nsIDOMHTMLElement_SetContentEditable(This->nselem, &str); + nsAString_Finish(&str); + + if (NS_FAILED(nsres)){ + ERR("SetContentEditable(%s) failed!\n", debugstr_w(v)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement3_get_contentEditable(IHTMLElement3 *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + nsAString str; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLElement_GetContentEditable(This->nselem, &str); + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLElement3_get_isContentEditable(IHTMLElement3 *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2ab701e..b863ac2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3012,6 +3012,31 @@ static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT ok_(__FILE__,line)(specified == expected, "specified = %x, expected %x\n", specified, expected); } +static void test_contenteditable(IUnknown *unk) +{ + IHTMLElement3 *elem3 = get_elem3_iface(unk); + HRESULT hres; + BSTR str, strDefault; + + hres = IHTMLElement3_get_contentEditable(elem3, &strDefault); + ok(hres == S_OK, "get_contentEditable failed: 0x%08x\n", hres); + + str = a2bstr("true"); + hres = IHTMLElement3_put_contentEditable(elem3, str); + ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08x\n", wine_dbgstr_w(str), hres); + SysFreeString(str); + hres = IHTMLElement3_get_contentEditable(elem3, &str); + ok(hres == S_OK, "get_contentEditable failed: 0x%08x\n", hres); + ok(!strcmp_wa(str, "true"), "Got %s, expected %s\n", wine_dbgstr_w(str), "true"); + + /* Restore origin contentEditable */ + hres = IHTMLElement3_put_contentEditable(elem3, strDefault); + ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08x\n", wine_dbgstr_w(strDefault), hres); + SysFreeString(strDefault); + + IHTMLElement3_Release(elem3); +} + #define test_input_type(i,t) _test_input_type(__LINE__,i,t) static void _test_input_type(unsigned line, IHTMLInputElement *input, const char *extype) { @@ -6612,6 +6637,7 @@ static void test_elems(IHTMLDocument2 *doc) if(elem) { test_dynamic_properties(elem); test_attr_collection(elem); + test_contenteditable((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Nikolay Sivov : msxml3: Fix a leak when trying to add to readonly collection (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: c2c37f8c406cbecca5e9f0a3a61b6d350c3f7ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c37f8c406cbecca5e9f0a3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 16:49:27 2014 +0400 msxml3: Fix a leak when trying to add to readonly collection (Valgrind). --- dlls/msxml3/schema.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2b2882c..8776de8 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1193,11 +1193,14 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri, VARIANT var) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); + xmlChar* name; + TRACE("(%p)->(%s %s)\n", This, debugstr_w(uri), debugstr_variant(&var)); if (This->read_only) return E_FAIL; + name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); + switch (V_VT(&var)) { case VT_NULL:

1 0