wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Henri Verbeet : dxgi: Implement dxgi_surface_GetDesc().
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: d17bd8d82136853867de39988dc9342d7afd5945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17bd8d82136853867de39988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:20 2014 +0200 dxgi: Implement dxgi_surface_GetDesc(). --- dlls/d3d10core/texture.c | 8 +++++++- dlls/dxgi/device.c | 3 +-- dlls/dxgi/dxgi_private.h | 5 ++++- dlls/dxgi/surface.c | 12 +++++++++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index f169190..80ac899 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -253,6 +253,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic if (desc->MipLevels == 1 && desc->ArraySize == 1) { + DXGI_SURFACE_DESC surface_desc; IWineDXGIDevice *wine_device; if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, @@ -262,7 +263,12 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic return E_FAIL; } - hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, + surface_desc.Width = desc->Width; + surface_desc.Height = desc->Height; + surface_desc.Format = desc->Format; + surface_desc.SampleDesc = desc->SampleDesc; + + hr = IWineDXGIDevice_create_surface(wine_device, &surface_desc, 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index e98a2c0..837c57f 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -276,8 +276,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer); - if (FAILED(hr)) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, desc))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 24d9a26..75126cf 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -142,8 +142,11 @@ struct dxgi_surface IUnknown *outer_unknown; LONG refcount; IDXGIDevice *device; + + DXGI_SURFACE_DESC desc; }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) DECLSPEC_HIDDEN; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 2814742..10daff7 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -154,9 +154,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF /* IDXGISurface methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = surface->desc; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) @@ -200,13 +204,15 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = dxgi_surface_inner_Release, }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; + surface->desc = *desc; return S_OK; }

1 0

Marcus Meissner : d3dx9_36: Fixed typo in HeapAlloc return checking ( Coverity).
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 20ef8d29911fdd6f63bdc95ff67482da2b0f9084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ef8d29911fdd6f63bdc95ff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 08:24:55 2014 +0200 d3dx9_36: Fixed typo in HeapAlloc return checking (Coverity). --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4d11618..17c5d9c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -3687,7 +3687,7 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, } HeapFree(GetProcessHeap(), 0, raw_outline); raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); - if (!glyphs) { + if (!raw_outline) { hr = E_OUTOFMEMORY; goto error; }

1 0

Thomas Faber : quartz: Destroy BaseFilter after child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 5ce8c7a5a794cc86297fda637596140e9bb10e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce8c7a5a794cc86297fda637… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:29:54 2014 +0200 quartz: Destroy BaseFilter after child class. --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/nullrenderer.c | 3 ++- dlls/quartz/parser.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a0af3a4..96d83a1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -480,7 +480,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -500,6 +500,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) CoTaskMemFree(This->pszFileName); if (This->pmt) FreeMediaType(This->pmt); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0; } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 16a24ac..7befc46 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -128,11 +128,12 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); if (!refCount) { TRACE("Destroying Null Renderer\n"); + BaseFilter_Destroy(&This->renderer.filter); CoTaskMemFree(This); } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f702c62..b57bae4 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -194,6 +194,7 @@ void Parser_Destroy(ParserImpl *This) } CoTaskMemFree(This->ppPins); + BaseFilter_Destroy(&This->filter); TRACE("Destroying parser\n"); CoTaskMemFree(This); @@ -202,7 +203,7 @@ void Parser_Destroy(ParserImpl *This) ULONG WINAPI Parser_Release(IBaseFilter * iface) { ParserImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Thomas Faber : wineqtdecoder: Destroy BaseFilter after QT child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: c6dfc084a535349676941ed46ac06c2004c01202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dfc084a535349676941ed46… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:41:54 2014 +0200 wineqtdecoder: Destroy BaseFilter after QT child class. --- dlls/wineqtdecoder/qtsplitter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 35dc807..8bb51a4 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -343,6 +343,7 @@ static void QT_Destroy(QTSplitter *This) This->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csReceive); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); } @@ -381,7 +382,7 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID static ULONG WINAPI QT_Release(IBaseFilter *iface) { QTSplitter *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Thomas Faber : winegstreamer: Destroy BaseFilter after GST child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 04240e6ae3b8bca126e11cb344d9155b521a9696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04240e6ae3b8bca126e11cb34… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:40:28 2014 +0200 winegstreamer: Destroy BaseFilter after GST child class. --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3694b54..4e5f04d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1099,6 +1099,7 @@ static void GST_Destroy(GSTImpl *This) { gst_bus_set_sync_handler(This->bus, NULL, NULL); gst_object_unref(This->bus); } + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); } @@ -1131,7 +1132,7 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID static ULONG WINAPI GST_Release(IBaseFilter *iface) { GSTImpl *This = (GSTImpl *)iface; - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0

Thomas Faber : qcap: Destroy BaseFilter after VfwCapture child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 5cbc081a1fef1e89a755bc44dc509bed29feaf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc081a1fef1e89a755bc44d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:38:26 2014 +0200 qcap: Destroy BaseFilter after VfwCapture child class. --- dlls/qcap/vfwcapture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 41a05a5..6d416b7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -203,7 +203,7 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) { VfwCapture *This = (VfwCapture *)iface; - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("%p->() New refcount: %d\n", This, refCount); @@ -225,6 +225,7 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) IPin_Disconnect(This->pOutputPin); } IPin_Release(This->pOutputPin); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); ObjectRefCount(FALSE); }

1 0

Shuai Meng : vbscript: Implemented IsNumeric.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 13fe9147b340472b3af57344ea6098e456a6578a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fe9147b340472b3af57344e… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jul 21 23:41:22 2014 +0800 vbscript: Implemented IsNumeric. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 610de43..68fa388 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -91,6 +91,15 @@ static HRESULT return_bstr(VARIANT *res, BSTR str) return S_OK; } +static HRESULT return_bool(VARIANT *res, BOOL val) +{ + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = val ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; +} + static HRESULT return_short(VARIANT *res, short val) { if(res) { @@ -600,8 +609,16 @@ static HRESULT Global_IsNull(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_IsNumeric(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_double(arg, &d); + + return return_bool(res, SUCCEEDED(hres)); } static HRESULT Global_IsArray(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 38e5e76..fbf252a 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1,4 +1,3 @@ -' ' Copyright 2011 Jacek Caban for CodeWeavers ' ' This library is free software; you can redistribute it and/or @@ -195,6 +194,31 @@ Call ok(not isNull(4), "isNull(4) is true?") Call ok(not isNull("x"), "isNull(""x"") is true?") Call ok(isNull(Null), "isNull(Null) is not true?") +Call ok(isNumeric(Empty), "isNumeric(empty) is not true?") +Call ok(not isNumeric(Null), "isNumeric(Null) is not true?") +Call ok(isNumeric(32767), "isNumeric(32767) is true?") +Call ok(isNumeric(32768), "isNumeric(32768) is true?") +Call ok(isNumeric(CSng(3242.4)), "isNumeric(CSng(3242.4)) is true?") +Call ok(isNumeric(32768.4), "isNumeric(32768.4) is true?") +Call ok(isNumeric(CCur(32768.4)), "isNumeric(CCur(32768.4)) is true?") +Call ok(isNumeric("44"), "isNumeric(""44"") is true?") +Call ok(not isNumeric("rwrf"), "isNumeric(""rwrf"") is not true?") +Call ok(not isNumeric(Nothing), "isNumeric(Nothing) is not true?") +Call ok(not isNumeric(New EmptyClass), "isNumeric(New EmptyClass) is not true?") +Call ok(isNumeric(true), "isNumeric(true) is true?") +Call ok(isNumeric(CByte(32)), "isNumeric(CByte(32)) is true?") +Dim arr(2) +arr(0) = 2 +arr(1) = 3 +Call ok(not isNumeric(arr), "isNumeric(arr) is not true?") + +Dim newObject +Set newObject = New ValClass +newObject.myval = 1 +Call ok(isNumeric(newObject), "isNumeric(newObject) is true?") +newObject.myval = "test" +Call ok(not isNumeric(newObject), "isNumeric(newObject) is not true?") + Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) Sub TestHex(x, ex)

1 0

Zhenbo Li : mshtml: Added IHTMLFormElement:: target property implementation.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: f8f8964afeb8058b4ccf52a243bddb625fa501af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f8964afeb8058b4ccf52a24… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Jul 21 22:51:11 2014 +0800 mshtml: Added IHTMLFormElement::target property implementation. --- dlls/mshtml/htmlform.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 86af350..10b2df4 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -286,15 +286,36 @@ static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDis static HRESULT WINAPI HTMLFormElement_put_target(IHTMLFormElement *iface, BSTR v) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLFormElement_SetTarget(This->nsform, &str); + + nsAString_Finish(&str); + if (NS_FAILED(nsres)) { + ERR("Set Target(%s) failed: %08x\n", wine_dbgstr_w(v), nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_target(IHTMLFormElement *iface, BSTR *p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLFormElement_GetTarget(This->nsform, &str); + + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLFormElement_put_name(IHTMLFormElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 487c25c..533d7b7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3775,6 +3775,27 @@ static void _test_form_reset(unsigned line, IUnknown *unk) IHTMLFormElement_Release(form); } + +static void test_form_target(IUnknown *unk) +{ + IHTMLFormElement *form = get_form_iface(unk); + HRESULT hres; + BSTR str; + static const char target[] = "_blank"; + + str = a2bstr(target); + hres = IHTMLFormElement_put_target(form, str); + ok(hres == S_OK, "put_target(%s) failed: %08x\n", target, hres); + SysFreeString(str); + + hres = IHTMLFormElement_get_target(form, &str); + ok(hres == S_OK, "get_target failed: %08x\n", hres); + ok(!strcmp_wa(str, target), "Expected %s, got %s\n", target, wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFormElement_Release(form); +} + #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -7342,6 +7363,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_encoding((IUnknown*)elem, "multipart/form-data"); test_form_elements((IUnknown*)elem); test_form_reset((IUnknown*)elem); + test_form_target((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Zhenbo Li : mshtml: Fixed get_target_window when no parent frame is found.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: fbc4d3f1602e6ae28ae92e497f2e01ccbb9cb224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc4d3f1602e6ae28ae92e497… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Jul 21 22:20:39 2014 +0800 mshtml: Fixed get_target_window when no parent frame is found. --- dlls/mshtml/htmlanchor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a9187a4..0de0585 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -98,8 +98,9 @@ HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_st if(!strcmpiW(target, _parentW)) { if(!window->parent) { - WARN("Window has no parent\n"); - return NULL; + WARN("Window has no parent, treat as self\n"); + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + return window; } IHTMLWindow2_AddRef(&window->parent->base.IHTMLWindow2_iface);

1 0

Jactry Zeng : riched20: Implement ITextSelection::GetText.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 1f6073c8614f7358b76551a9e35dccb1254d8a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6073c8614f7358b76551a9e… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 22 00:41:29 2014 +0800 riched20: Implement ITextSelection::GetText. --- dlls/riched20/clipboard.c | 2 +- dlls/riched20/editor.c | 22 +++++++---- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 27 ++++++++++++- dlls/riched20/tests/richole.c | 90 +++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 2 +- 6 files changed, 132 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f6073c8614f7358b7655…

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2014