July 2008 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: DispatchEx's QueryInterface implementation clean up.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: af3d19fa0496f07669ea53b2d2f10099645d83e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3d19fa0496f07669ea53b2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:38:23 2008 +0200 mshtml: DispatchEx's QueryInterface implementation clean up. --- dlls/mshtml/dispex.c | 17 +++++++++++++++++ dlls/mshtml/htmlelem.c | 8 ++------ dlls/mshtml/htmlnode.c | 10 ++++------ dlls/mshtml/htmlstyle.c | 8 ++------ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 8 ++------ 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 25f6214..a94806d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -621,6 +621,23 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; +BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = DISPATCHEX(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(This); + }else { + return FALSE; + } + + if(*ppv) + IUnknown_AddRef((IUnknown*)*ppv); + return TRUE; +} + void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { dispex->lpIDispatchExVtbl = &DispatchExVtbl; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7c20c2c..5f67356 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1542,15 +1542,11 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = HTMLELEMCOL(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLELEMCOL(This); - }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); *ppv = HTMLELEMCOL(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ae2bff0..7c03a96 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -58,15 +58,11 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_QueryInterface(IHTMLDOMChildrenC if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = HTMLCHILDCOL(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLCHILDCOL(This); - }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IHTMLDOMChildrenCollection, riid)) { TRACE("(%p)->(IID_IHTMLDOMChildrenCollection %p)\n", This, ppv); *ppv = HTMLCHILDCOL(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { @@ -819,6 +815,8 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) { TRACE("(%p)->(IID_IHTMLDOMNode2 %p)\n", This, ppv); *ppv = HTMLDOMNODE2(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 8bceb26..83a587f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -235,15 +235,11 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = HTMLSTYLE(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLSTYLE(This); - }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IHTMLStyle, riid)) { TRACE("(%p)->(IID_IHTMLStyle %p)\n", This, ppv); *ppv = HTMLSTYLE(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f815b26..ef7868d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -134,6 +134,7 @@ typedef struct { } DispatchEx; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); +BOOL dispex_query_interface(DispatchEx*,REFIID,void**); typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 9a6d537..a579333 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -51,15 +51,11 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = OMNAVIGATOR(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = DISPATCHEX(&This->dispex); - }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IOmNavigator, riid)) { TRACE("(%p)->(IID_IOmNavigator %p)\n", This, ppv); *ppv = OMNAVIGATOR(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) {

1 0

Jacek Caban : mshtml: Silence common invalid QueryInterface FIXME.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: fe863e0326ec28e87454b5cc5700f2c8a9860605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe863e0326ec28e87454b5cc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:38:55 2008 +0200 mshtml: Silence common invalid QueryInterface FIXME. --- dlls/mshtml/dispex.c | 6 ++++++ dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlwindow.c | 2 ++ dlls/mshtml/tests/htmldoc.c | 14 +++++++++++--- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a94806d..5d472ee 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -623,12 +623,18 @@ static IDispatchExVtbl DispatchExVtbl = { BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) { + static const IID IID_UndocumentedScriptIface = + {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; + if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = DISPATCHEX(This); }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = DISPATCHEX(This); + }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { + TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); + *ppv = NULL; }else { return FALSE; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3a457cb..4a2c696 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -134,6 +134,8 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("(%p)->(IID_IRunnableObject %p) returning NULL\n", This, ppvObject); return E_NOINTERFACE; + }else if(dispex_query_interface(&This->dispex, riid, ppvObject)) { + return *ppvObject ? S_OK : E_NOINTERFACE; } if(*ppvObject) { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index edd9491..b79067a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -61,6 +61,8 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = HTMLWINDOW3(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d46e11a..27248df 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3701,20 +3701,28 @@ static void test_QueryInterface(IUnknown *unk) IUnknown *qi; HRESULT hres; + static const IID IID_UndocumentedScriptIface = + {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; + qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "runnable=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qirunnable=%p, ezpected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "runnable=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode2, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "runnable=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(unk, &IID_UndocumentedScriptIface, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); } static void init_test(enum load_state_t ls) {

1 0

Jacek Caban : mshtml: Added support for DOCHOSTUIFLAG_SCROLL_NO DOCHOSTINFO flag.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 19be7d620d31de34fd86d5faa3895bebf6818659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19be7d620d31de34fd86d5faa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:37:56 2008 +0200 mshtml: Added support for DOCHOSTUIFLAG_SCROLL_NO DOCHOSTINFO flag. --- dlls/mshtml/oleobj.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 5e7181c..0b1dd6b 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -61,6 +61,32 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) return IHTMLDocument2_Release(HTMLDOC(This)); } +static void update_hostinfo(HTMLDocument *This, DOCHOSTUIINFO *hostinfo) +{ + nsIScrollable *scrollable; + nsresult nsres; + + if(!This->nscontainer) + return; + + nsres = nsIWebBrowser_QueryInterface(This->nscontainer->webbrowser, &IID_nsIScrollable, (void**)&scrollable); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, ScrollOrientation_Y, + (hostinfo->dwFlags & DOCHOSTUIFLAG_SCROLL_NO) ? Scrollbar_Never : Scrollbar_Always); + if(NS_FAILED(nsres)) + ERR("Could not set default Y scrollbar prefs: %08x\n", nsres); + + nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, ScrollOrientation_X, + hostinfo->dwFlags & DOCHOSTUIFLAG_SCROLL_NO ? Scrollbar_Never : Scrollbar_Auto); + if(NS_FAILED(nsres)) + ERR("Could not set default X scrollbar prefs: %08x\n", nsres); + + nsIScrollable_Release(scrollable); + }else { + ERR("Could not get nsIScrollable: %08x\n", nsres); + } +} + static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { HTMLDocument *This = OLEOBJ_THIS(iface); @@ -103,6 +129,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite TRACE("hostinfo = {%u %08x %08x %s %s}\n", hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); + update_hostinfo(This, &hostinfo); This->hostinfo = hostinfo; }

1 0

Jacek Caban : mshtml: Added IHTMLWindow::get_window implementation.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: ebb4a9b1974ec0f77a13fe1d5ca337d98c0dc187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb4a9b1974ec0f77a13fe1d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:37:18 2008 +0200 mshtml: Added IHTMLWindow::get_window implementation. --- dlls/mshtml/htmlwindow.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e8ed7d9..3a9a17b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -335,8 +335,13 @@ static HRESULT WINAPI HTMLWindow2_get_top(IHTMLWindow2 *iface, IHTMLWindow2 **p) static HRESULT WINAPI HTMLWindow2_get_window(IHTMLWindow2 *iface, IHTMLWindow2 **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: We should return kind of proxy window here. */ + IHTMLWindow2_AddRef(HTMLWINDOW2(This)); + *p = HTMLWINDOW2(This); + return S_OK; } static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_self implementation.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: f58b963f4bb6fc986c7161a3eca44c84ae8e57ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58b963f4bb6fc986c7161a3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:37:41 2008 +0200 mshtml: Added IHTMLWindow2::get_self implementation. --- dlls/mshtml/htmlwindow.c | 9 +++++++-- dlls/mshtml/tests/dom.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3a9a17b..edd9491 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -321,8 +321,13 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, static HRESULT WINAPI HTMLWindow2_get_self(IHTMLWindow2 *iface, IHTMLWindow2 **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: We should return kind of proxy window here. */ + IHTMLWindow2_AddRef(HTMLWINDOW2(This)); + *p = HTMLWINDOW2(This); + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_top(IHTMLWindow2 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d06ad4c..92a240e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1821,7 +1821,7 @@ static void test_default_body(IHTMLBodyElement *body) static void test_window(IHTMLDocument2 *doc) { - IHTMLWindow2 *window; + IHTMLWindow2 *window, *window2, *self; IHTMLDocument2 *doc2 = NULL; HRESULT hres; @@ -1835,6 +1835,20 @@ static void test_window(IHTMLDocument2 *doc) ok(doc2 != NULL, "doc2 == NULL\n"); IHTMLDocument_Release(doc2); + + hres = IHTMLWindow2_get_window(window, &window2); + ok(hres == S_OK, "get_window failed: %08x\n", hres); + ok(window2 != NULL, "window2 == NULL\n"); + + hres = IHTMLWindow2_get_self(window, &self); + ok(hres == S_OK, "get_window failed: %08x\n", hres); + ok(window2 != NULL, "self == NULL\n"); + + ok(self == window2, "self != window2\n"); + + IHTMLWindow2_Release(window2); + IHTMLWindow2_Release(self); + IHTMLWindow2_Release(window); }

1 0

Hwang YunSong(황윤성) : winecfg: Updated Korean resource.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: c41d74167e583f582e9a664b6d7c52d1d3e057e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41d74167e583f582e9a664b6… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jun 30 10:22:12 2008 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 75c24c5..7f72af4 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -42,9 +42,9 @@ BEGIN LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 LTEXT "�� ̺귯�� Ʈ��Դϴ�. �� Ʈ�� (Free Software Foundation)�� GNU LGPL(Lesser General Public License) �Ʒ�� α׷�� Ǵ� �� ֽ��ϴ�. ��̼�� 2.1 �Ǵ� (��) �� ˴ϴ�.", IDC_STATIC,119,44,124,72 - GROUPBOX " Windows Registration Information ", IDC_STATIC, 15, 110, 230, 55 - LTEXT "Owner:", IDC_STATIC, 22, 126, 40, 20 - LTEXT "Organization:", IDC_STATIC, 22, 140, 50, 20 + GROUPBOX " �� ", IDC_STATIC, 15, 110, 230, 55 + LTEXT "��:", IDC_STATIC, 22, 126, 40, 20 + LTEXT "��ü:", IDC_STATIC, 22, 140, 50, 20 EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP EDITTEXT IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END

1 0

Huw Davies : gdiplus: Add some region tests.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: e2f9b8c27452c04fce53e415cd6cad7a92335c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f9b8c27452c04fce53e415c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 30 14:56:04 2008 +0100 gdiplus: Add some region tests. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/region.c | 222 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 223 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 28b2959..fbe4e89 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -13,6 +13,7 @@ CTESTS = \ image.c \ matrix.c \ pen.c \ + region.c \ stringformat.c @MAKE_TEST_RULES@ diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c new file mode 100644 index 0000000..166df2d --- /dev/null +++ b/dlls/gdiplus/tests/region.c @@ -0,0 +1,222 @@ +/* + * Unit test suite for gdiplus regions + * + * Copyright (C) 2008 Huw Davies + * + * 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 "windows.h" +#include "gdiplus.h" +#include "wingdi.h" +#include "wine/test.h" + +static inline void expect_dword(DWORD *value, DWORD expected) +{ + ok(*value == expected, "expected %08x got %08x\n", expected, *value); +} + +static inline void expect_float(DWORD *value, FLOAT expected) +{ + FLOAT valuef = *(FLOAT*)value; + ok(valuef == expected, "expected %f got %f\n", expected, valuef); +} + +static void test_create_rgn(void) +{ + GpStatus status; + GpRegion *region, *region2; + UINT needed; + DWORD buf[100]; + GpRect rect; + + status = GdipCreateRegion(&region); +todo_wine + ok(status == Ok, "status %08x\n", status); + + if(status != Ok) return; + + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 20, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 20, "got %d\n", needed); + expect_dword(buf, 12); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, 0x10000003); + + status = GdipSetEmpty(region); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 20, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 20, "got %d\n", needed); + expect_dword(buf, 12); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, 0x10000002); + + status = GdipSetInfinite(region); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 20, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 20, "got %d\n", needed); + expect_dword(buf, 12); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, 0x10000003); + + status = GdipDeleteRegion(region); + ok(status == Ok, "status %08x\n", status); + + rect.X = 10; + rect.Y = 20; + rect.Width = 100; + rect.Height = 200; + status = GdipCreateRegionRectI(&rect, &region); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 36, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 36, "got %d\n", needed); + expect_dword(buf, 28); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, 0x10000000); + expect_float(buf + 5, 10.0); + expect_float(buf + 6, 20.0); + expect_float(buf + 7, 100.0); + expect_float(buf + 8, 200.0); + + rect.X = 50; + rect.Y = 30; + rect.Width = 10; + rect.Height = 20; + status = GdipCombineRegionRectI(region, &rect, CombineModeIntersect); + ok(status == Ok, "status %08x\n", status); + rect.X = 100; + rect.Y = 300; + rect.Width = 30; + rect.Height = 50; + status = GdipCombineRegionRectI(region, &rect, CombineModeXor); + ok(status == Ok, "status %08x\n", status); + + rect.X = 200; + rect.Y = 100; + rect.Width = 133; + rect.Height = 266; + status = GdipCreateRegionRectI(&rect, &region2); + ok(status == Ok, "status %08x\n", status); + rect.X = 20; + rect.Y = 10; + rect.Width = 40; + rect.Height = 66; + status = GdipCombineRegionRectI(region2, &rect, CombineModeUnion); + ok(status == Ok, "status %08x\n", status); + + status = GdipCombineRegionRegion(region, region2, CombineModeComplement); + ok(status == Ok, "status %08x\n", status); + + rect.X = 400; + rect.Y = 500; + rect.Width = 22; + rect.Height = 55; + status = GdipCombineRegionRectI(region, &rect, CombineModeExclude); + ok(status == Ok, "status %08x\n", status); + + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 156, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 156, "got %d\n", needed); + expect_dword(buf, 148); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 3, 10); + expect_dword(buf + 4, CombineModeExclude); + expect_dword(buf + 5, CombineModeComplement); + expect_dword(buf + 6, CombineModeXor); + expect_dword(buf + 7, CombineModeIntersect); + expect_dword(buf + 8, 0x10000000); + expect_float(buf + 9, 10.0); + expect_float(buf + 10, 20.0); + expect_float(buf + 11, 100.0); + expect_float(buf + 12, 200.0); + expect_dword(buf + 13, 0x10000000); + expect_float(buf + 14, 50.0); + expect_float(buf + 15, 30.0); + expect_float(buf + 16, 10.0); + expect_float(buf + 17, 20.0); + expect_dword(buf + 18, 0x10000000); + expect_float(buf + 19, 100.0); + expect_float(buf + 20, 300.0); + expect_float(buf + 21, 30.0); + expect_float(buf + 22, 50.0); + expect_dword(buf + 23, CombineModeUnion); + expect_dword(buf + 24, 0x10000000); + expect_float(buf + 25, 200.0); + expect_float(buf + 26, 100.0); + expect_float(buf + 27, 133.0); + expect_float(buf + 28, 266.0); + expect_dword(buf + 29, 0x10000000); + expect_float(buf + 30, 20.0); + expect_float(buf + 31, 10.0); + expect_float(buf + 32, 40.0); + expect_float(buf + 33, 66.0); + expect_dword(buf + 34, 0x10000000); + expect_float(buf + 35, 400.0); + expect_float(buf + 36, 500.0); + expect_float(buf + 37, 22.0); + expect_float(buf + 38, 55.0); + + + status = GdipDeleteRegion(region2); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteRegion(region); + ok(status == Ok, "status %08x\n", status); + +} + +START_TEST(region) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_create_rgn(); + + GdiplusShutdown(gdiplusToken); + +}

1 0

Huw Davies : gdiplus: Add stubs for a few region functions.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 0ea97b5ff13d00917b8e2cfaf6b436020b032bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea97b5ff13d00917b8e2cfaf… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 30 14:54:26 2008 +0100 gdiplus: Add stubs for a few region functions. --- dlls/gdiplus/gdiplus.spec | 14 ++++++------ dlls/gdiplus/region.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 7 ++++++ 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7e127d7..5cbc5ba 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -62,9 +62,9 @@ @ stdcall GdipClosePathFigure(ptr) @ stdcall GdipClosePathFigures(ptr) @ stub GdipCombineRegionPath -@ stub GdipCombineRegionRect -@ stub GdipCombineRegionRectI -@ stub GdipCombineRegionRegion +@ stdcall GdipCombineRegionRect(ptr ptr long) +@ stdcall GdipCombineRegionRectI(ptr ptr long) +@ stdcall GdipCombineRegionRegion(ptr ptr long) @ stub GdipComment @ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @@ -125,8 +125,8 @@ @ stdcall GdipCreateRegion(ptr) @ stub GdipCreateRegionHrgn @ stdcall GdipCreateRegionPath(ptr ptr) -@ stub GdipCreateRegionRect -@ stub GdipCreateRegionRectI +@ stdcall GdipCreateRegionRect(ptr ptr) +@ stdcall GdipCreateRegionRectI(ptr ptr) @ stub GdipCreateRegionRgnData @ stdcall GdipCreateSolidFill(long ptr) @ stdcall GdipCreateStreamOnFile(ptr long ptr) @@ -377,8 +377,8 @@ @ stub GdipGetPropertySize @ stub GdipGetRegionBounds @ stub GdipGetRegionBoundsI -@ stub GdipGetRegionData -@ stub GdipGetRegionDataSize +@ stdcall GdipGetRegionData(ptr ptr long ptr) +@ stdcall GdipGetRegionDataSize(ptr ptr) @ stdcall GdipGetRegionHRgn(ptr ptr ptr) @ stub GdipGetRegionScans @ stub GdipGetRegionScansCount diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 46e9919..92239ff 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -67,6 +67,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); * */ +GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, GDIPCONST GpRectF *rect, + CombineMode mode) +{ + FIXME("(%p %p %d): stub\n", region, rect, mode); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, GDIPCONST GpRect *rect, + CombineMode mode) +{ + FIXME("(%p %p %d): stub\n", region, rect, mode); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, GpRegion *region2, + CombineMode mode) +{ + FIXME("(%p %p %d): stub\n", region1, region2, mode); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) { FIXME("(%p): stub\n", region); @@ -83,12 +104,42 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) return NotImplemented; } +GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, GpRegion **region) +{ + FIXME("(%p, %p): stub\n", rect, region); + + *region = NULL; + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, GpRegion **region) +{ + FIXME("(%p, %p): stub\n", rect, region); + + *region = NULL; + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) { FIXME("(%p): stub\n", region); return NotImplemented; } +GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) +{ + FIXME("(%p, %p, %d, %p): stub\n", region, buffer, size, needed); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) +{ + FIXME("(%p, %p): stub\n", region, needed); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) { FIXME("(%p, %p, %p): stub\n", region, graphics, hrgn); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0903637..87135e3 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -389,9 +389,16 @@ GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringForm GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*); +GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *, GDIPCONST GpRectF *, CombineMode); +GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *, GDIPCONST GpRect *, CombineMode); +GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *, GpRegion *, CombineMode); GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **); GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *, GpRegion **); +GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *, GpRegion **); +GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *, GpRegion **); GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *); +GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *, BYTE *, UINT, UINT *); +GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *, UINT *); GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *); GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *); GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *);

1 0

Vladimir Pankratov : taskmgr: Changed about form to standard shell32.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 92642828d69ed6831a89686c4c2e8d3c1fb67ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92642828d69ed6831a89686c4… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jun 30 12:38:38 2008 +0500 taskmgr: Changed about form to standard shell32. --- programs/taskmgr/about.c | 39 ++++++++------------------------------- 1 files changed, 8 insertions(+), 31 deletions(-) diff --git a/programs/taskmgr/about.c b/programs/taskmgr/about.c index 424124d..948c7ea 100644 --- a/programs/taskmgr/about.c +++ b/programs/taskmgr/about.c @@ -24,6 +24,7 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> +#include <shellapi.h> #include <malloc.h> #include <memory.h> #include <tchar.h> @@ -31,38 +32,14 @@ #include "taskmgr.h" -static INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - HWND hLicenseEditWnd; - TCHAR strLicense[0x1000]; - - switch (message) - { - case WM_INITDIALOG: - - hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - - LoadString(hInst, IDS_LICENSE, strLicense, 0x1000); - - SetWindowText(hLicenseEditWnd, strLicense); - - return TRUE; - - case WM_COMMAND: - - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - - break; - } - - return 0; -} void OnAbout(void) { - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, AboutDialogWndProc); + WCHAR appname[256]; + WCHAR copy[] = {'B','r','i','a','n',' ', + 'P','a','l','m','e','r',' ', + '<','b','r','i','a','n','p','@','r','e','a','c','t','o','s','.','o','r','g','>',0}; + LoadStringW( hInst, IDC_TASKMGR, appname, sizeof(appname)/sizeof(WCHAR) ); + ShellAboutW( hMainWnd, appname, copy, + LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 32, 32, LR_SHARED )); }

1 0

James Hawkins : fusion: Add initial implementation of IAssemblyName.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 7b1dde9d2089a387e7b054b7ed2c2936761ee511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1dde9d2089a387e7b054b7e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:23:22 2008 -0500 fusion: Add initial implementation of IAssemblyName. --- dlls/fusion/asmname.c | 358 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/fusion/fusion.c | 13 -- include/corerror.h | 7 +- 3 files changed, 354 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b1dde9d2089a387e7b05…

1 0