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

Jacek Caban : ieframe: Moved WebBrowser and InternetExplorer objects implementations to ieframe.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 4acbae4d696d48efe36cf291d9999058be9c623f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4acbae4d696d48efe36cf291d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 27 14:46:48 2011 +0200 ieframe: Moved WebBrowser and InternetExplorer objects implementations to ieframe. --- dlls/ieframe/Makefile.in | 17 ++- dlls/{shdocvw => ieframe}/classinfo.c | 6 +- dlls/{shdocvw => ieframe}/client.c | 6 +- dlls/{shdocvw => ieframe}/dochost.c | 11 +- dlls/{shdocvw => ieframe}/events.c | 4 +- dlls/{shdocvw => ieframe}/frame.c | 3 +- dlls/{shdocvw => ieframe}/ie.c | 3 +- dlls/ieframe/ieframe.h | 237 +++++++++++++++++++++++++ dlls/ieframe/ieframe.spec | 3 + dlls/ieframe/ieframe_main.c | 125 +++++++++++++- dlls/{shdocvw => ieframe}/iexplore.c | 55 +++--- dlls/{shdocvw => ieframe}/navigate.c | 9 +- dlls/{shdocvw => ieframe}/oleobject.c | 11 +- dlls/{shdocvw => ieframe}/persist.c | 3 +- dlls/{shdocvw => ieframe}/shellbrowser.c | 6 +- dlls/{shdocvw => ieframe}/view.c | 3 +- dlls/{shdocvw => ieframe}/webbrowser.c | 22 ++- dlls/shdocvw/Makefile.in | 19 +-- dlls/shdocvw/factory.c | 157 +++-------------- dlls/shdocvw/resource.h | 59 ------- dlls/shdocvw/shdocvw.h | 279 ------------------------------ dlls/shdocvw/shdocvw.rc | 2 +- dlls/shdocvw/shdocvw_main.c | 54 ------ 23 files changed, 488 insertions(+), 606 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4acbae4d696d48efe36cf…

1 0

Vincent Povirk : gdiplus: Don' t use a gdi32 brush for semi-transparent hatch brushes.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: ae6ce97db0315da5d979db2de43510008a30a2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6ce97db0315da5d979db2de… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 27 11:25:35 2011 -0500 gdiplus: Don't use a gdi32 brush for semi-transparent hatch brushes. --- dlls/gdiplus/graphics.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 324b895..8ad0c1d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -669,8 +669,13 @@ static INT brush_can_fill_path(GpBrush *brush) switch (brush->bt) { case BrushTypeSolidColor: - case BrushTypeHatchFill: return 1; + case BrushTypeHatchFill: + { + GpHatch *hatch = (GpHatch*)brush; + return ((hatch->forecol & 0xff000000) == 0xff000000) && + ((hatch->backcol & 0xff000000) == 0xff000000); + } case BrushTypeLinearGradient: case BrushTypeTextureFill: /* Gdi32 isn't much help with these, so we should use brush_fill_pixels instead. */

1 0

Jacek Caban : ieframe: Moved image resources to ieframe.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: d134e7520bc13d847341b4ae2da3cc66c3fb3640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d134e7520bc13d847341b4ae2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 27 14:46:25 2011 +0200 ieframe: Moved image resources to ieframe. --- dlls/ieframe/Makefile.in | 3 +++ dlls/ieframe/ieframe.rc | 3 +++ dlls/{shdocvw => ieframe}/ietoolbar.bmp | Bin 24698 -> 24698 bytes dlls/{shdocvw => ieframe}/ietoolbar.svg | 0 dlls/shdocvw/Makefile.in | 3 --- dlls/shdocvw/shdocvw.rc | 3 --- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 726f4dc..a310dd9 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -31,6 +31,9 @@ RC_SRCS = \ PO_SRCS = ieframe.rc +SVG_SRCS = \ + ietoolbar.svg + IDL_TLB_SRCS = ieframe_v1.idl @MAKE_DLL_RULES@ diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index e15928f..58f6fb7 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -87,3 +87,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: ieframe_v1.tlb */ 1 TYPELIB ieframe_v1.tlb + +/* @makedep: ietoolbar.bmp */ +IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/shdocvw/ietoolbar.bmp b/dlls/ieframe/ietoolbar.bmp similarity index 100% rename from dlls/shdocvw/ietoolbar.bmp rename to dlls/ieframe/ietoolbar.bmp diff --git a/dlls/shdocvw/ietoolbar.svg b/dlls/ieframe/ietoolbar.svg similarity index 100% rename from dlls/shdocvw/ietoolbar.svg rename to dlls/ieframe/ietoolbar.svg diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index ab92a78..894585b 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -25,9 +25,6 @@ C_SRCS = \ RC_SRCS = \ shdocvw.rc -SVG_SRCS = \ - ietoolbar.svg - IDL_TLB_SRCS = shdocvw_v1.idl IDL_R_SRCS = shdocvw_v1.idl diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 3529ee4..cabcad1 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -38,6 +38,3 @@ REGINST REGINST shdocvw.inf /* @makedep: shdocvw.rgs */ 2 WINE_REGISTRY shdocvw.rgs - -/* @makedep: ietoolbar.bmp */ -IDB_IETOOLBAR BITMAP ietoolbar.bmp

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::put_returnValue implementation.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 9a3aa863be37f14b355a61a4df75345d9865de46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a3aa863be37f14b355a61a4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 27 16:45:49 2011 +0200 mshtml: Added IHTMLEventObj::put_returnValue implementation. --- dlls/mshtml/htmlevent.c | 13 ++++++- dlls/mshtml/tests/events.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d0e8814..f638b9a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -434,8 +434,17 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT v) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BOOL) { + FIXME("unsupported vt %d\n", V_VT(&v)); + return DISP_E_BADVARTYPE; + } + + if(!V_BOOL(&v)) + This->prevent_default = TRUE; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_returnValue(IHTMLEventObj *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index fa2fb6f..55baaca 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -77,6 +77,7 @@ DEFINE_EXPECT(form_onsubmit); DEFINE_EXPECT(form_onclick); DEFINE_EXPECT(submit_onclick); DEFINE_EXPECT(submit_onclick_attached); +DEFINE_EXPECT(submit_onclick_setret); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -989,6 +990,33 @@ static HRESULT WINAPI submit_onclick_attached(IDispatchEx *iface, DISPID id, LCI EVENT_HANDLER_FUNC_OBJ(submit_onclick_attached); +static VARIANT onclick_retval, onclick_event_retval; + +static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLEventObj *event; + HRESULT hres; + + CHECK_EXPECT(submit_onclick_setret); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + + event = NULL; + hres = IHTMLWindow2_get_event(window, &event); + ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(event != NULL, "event == NULL\n"); + + hres = IHTMLEventObj_put_returnValue(event, onclick_event_retval); + ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); + IHTMLEventObj_Release(event); + + *pvarRes = onclick_retval; + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(submit_onclick_setret); + static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1778,6 +1806,57 @@ static void test_submit(IHTMLDocument2 *doc) unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&submit_onclick_setret_obj; + hres = IHTMLElement_put_onclick(submit, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + V_VT(&onclick_retval) = VT_BOOL; + V_BOOL(&onclick_retval) = VARIANT_TRUE; + V_VT(&onclick_event_retval) = VT_BOOL; + V_BOOL(&onclick_event_retval) = VARIANT_TRUE; + + SET_EXPECT(submit_onclick_setret); + SET_EXPECT(form_onclick); + SET_EXPECT(form_onsubmit); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(submit_onclick_setret); + CHECK_CALLED(form_onclick); + CHECK_CALLED(form_onsubmit); + + V_VT(&onclick_event_retval) = VT_BOOL; + V_BOOL(&onclick_event_retval) = VARIANT_FALSE; + + SET_EXPECT(submit_onclick_setret); + SET_EXPECT(form_onclick); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(submit_onclick_setret); + CHECK_CALLED(form_onclick); + + V_VT(&onclick_retval) = VT_BOOL; + V_BOOL(&onclick_retval) = VARIANT_FALSE; + V_VT(&onclick_event_retval) = VT_BOOL; + V_BOOL(&onclick_event_retval) = VARIANT_TRUE; + + SET_EXPECT(submit_onclick_setret); + SET_EXPECT(form_onclick); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(submit_onclick_setret); + CHECK_CALLED(form_onclick); + + V_VT(&onclick_event_retval) = VT_BOOL; + V_BOOL(&onclick_event_retval) = VARIANT_FALSE; + + SET_EXPECT(submit_onclick_setret); + SET_EXPECT(form_onclick); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(submit_onclick_setret); + CHECK_CALLED(form_onclick); + IHTMLElement_Release(submit); }

1 0

Alexander Morozov : include: Synchronize CRYPTUI_SELECTCERTIFICATE_STRUCT definition with MSDN.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 2077c09b3b6b202ff3bd0c18212e300ef0e555d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2077c09b3b6b202ff3bd0c182… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Jul 27 19:23:51 2011 +0400 include: Synchronize CRYPTUI_SELECTCERTIFICATE_STRUCT definition with MSDN. --- include/cryptuiapi.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index 4ba04a3..f151fa4 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -348,12 +348,14 @@ typedef struct _CRYPTUI_SELECTCERTIFICATE_STRUCTA DWORD dwSize; HWND hwndParent; DWORD dwFlags; - LPCWSTR szTitle; + LPCSTR szTitle; DWORD dwDontUseColumn; - LPCWSTR szDisplayString; + LPCSTR szDisplayString; PFNCFILTERPROC pFilterCallback; PFNCCERTDISPLAYPROC pDisplayCallback; void *pvCallbackData; + DWORD cDisplayStores; + HCERTSTORE *rghDisplayStores; DWORD cStores; HCERTSTORE *rghStores; DWORD cPropSheetPages; @@ -374,6 +376,8 @@ typedef struct _CRYPTUI_SELECTCERTIFICATE_STRUCTW PFNCFILTERPROC pFilterCallback; PFNCCERTDISPLAYPROC pDisplayCallback; void *pvCallbackData; + DWORD cDisplayStores; + HCERTSTORE *rghDisplayStores; DWORD cStores; HCERTSTORE *rghStores; DWORD cPropSheetPages;

1 0

Jacek Caban : ieframe: Added typelib.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: dbee669362ee9ece1b436daf3a65b3842201a48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbee669362ee9ece1b436daf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 27 14:45:58 2011 +0200 ieframe: Added typelib. --- .gitignore | 1 + dlls/ieframe/Makefile.in | 2 ++ dlls/ieframe/ieframe.rc | 3 +++ dlls/ieframe/ieframe_v1.idl | 19 +++++++++++++++++++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b4003a8..ed67e11 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h dlls/gameux/gameux_tlb.tlb dlls/hhctrl.ocx/hhctrl_tlb.tlb +dlls/ieframe/ieframe_v1.tlb dlls/infosoft/infosoft.h dlls/jscript/jscript_classes.h dlls/jscript/jsglobal.tlb diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 5d4f48c..726f4dc 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -31,4 +31,6 @@ RC_SRCS = \ PO_SRCS = ieframe.rc +IDL_TLB_SRCS = ieframe_v1.idl + @MAKE_DLL_RULES@ diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index 88798f5..e15928f 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -84,3 +84,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" + +/* @makedep: ieframe_v1.tlb */ +1 TYPELIB ieframe_v1.tlb diff --git a/dlls/ieframe/ieframe_v1.idl b/dlls/ieframe/ieframe_v1.idl new file mode 100644 index 0000000..45b9111 --- /dev/null +++ b/dlls/ieframe/ieframe_v1.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2006 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 "exdisp.idl"

1 0

Jacek Caban : ieframe: Moved string and menu resources to ieframe.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: c685f8cb327d6b79d04b182f61e1d578dbaa8ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c685f8cb327d6b79d04b182f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 27 14:45:47 2011 +0200 ieframe: Moved string and menu resources to ieframe. --- configure | 4 +- configure.ac | 4 +- dlls/ieframe/Makefile.in | 2 + dlls/ieframe/ieframe.rc | 57 ++++++++++- dlls/ieframe/resource.h | 34 ++++++ dlls/shdocvw/Makefile.in | 2 - dlls/shdocvw/iexplore.c | 6 +- dlls/shdocvw/shdocvw.rc | 55 ---------- po/ar.po | 204 ++++++++++++++++++------------------ po/bg.po | 212 +++++++++++++++++++------------------- po/ca.po | 194 +++++++++++++++++----------------- po/cs.po | 228 ++++++++++++++++++++-------------------- po/da.po | 262 +++++++++++++++++++++++----------------------- po/de.po | 216 +++++++++++++++++++------------------- po/el.po | 204 ++++++++++++++++++------------------ po/en.po | 190 +++++++++++++++++----------------- po/en_US.po | 190 +++++++++++++++++----------------- po/eo.po | 224 ++++++++++++++++++++-------------------- po/es.po | 218 +++++++++++++++++++------------------- po/fa.po | 204 ++++++++++++++++++------------------ po/fi.po | 238 +++++++++++++++++++++--------------------- po/fr.po | 190 +++++++++++++++++----------------- po/he.po | 196 +++++++++++++++++----------------- po/hi.po | 200 ++++++++++++++++++------------------ po/hu.po | 248 ++++++++++++++++++++++---------------------- po/it.po | 234 +++++++++++++++++++++--------------------- po/ja.po | 190 +++++++++++++++++----------------- po/ko.po | 190 +++++++++++++++++----------------- po/lt.po | 190 +++++++++++++++++----------------- po/ml.po | 200 ++++++++++++++++++------------------ po/nb_NO.po | 240 +++++++++++++++++++++--------------------- po/nl.po | 196 +++++++++++++++++----------------- po/or.po | 200 ++++++++++++++++++------------------ po/pa.po | 200 ++++++++++++++++++------------------ po/pl.po | 190 +++++++++++++++++----------------- po/pt_BR.po | 224 ++++++++++++++++++++-------------------- po/pt_PT.po | 260 +++++++++++++++++++++++----------------------- po/rm.po | 202 ++++++++++++++++++------------------ po/ro.po | 226 ++++++++++++++++++++-------------------- po/ru.po | 192 +++++++++++++++++----------------- po/sk.po | 212 +++++++++++++++++++------------------- po/sl.po | 196 +++++++++++++++++----------------- po/sr_RS(a)cyrillic.po | 198 +++++++++++++++++----------------- po/sr_RS(a)latin.po | 196 +++++++++++++++++----------------- po/sv.po | 196 +++++++++++++++++----------------- po/te.po | 200 ++++++++++++++++++------------------ po/th.po | 202 ++++++++++++++++++------------------ po/tr.po | 226 ++++++++++++++++++++-------------------- po/uk.po | 190 +++++++++++++++++----------------- po/wa.po | 202 ++++++++++++++++++------------------ po/wine.pot | 190 +++++++++++++++++----------------- po/zh_CN.po | 224 ++++++++++++++++++++-------------------- po/zh_TW.po | 216 +++++++++++++++++++------------------- 53 files changed, 4799 insertions(+), 4765 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c685f8cb327d6b79d04b1…

1 0

Michael Stefaniuc : dmstyle: Implement IClassFactory::QueryInterface.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: ae43b099f901534e8e8dc18e034499961e1dbf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae43b099f901534e8e8dc18e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 14:07:03 2011 +0200 dmstyle: Implement IClassFactory::QueryInterface. --- dlls/dmstyle/dmstyle_main.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 74e9e7c..5392748 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -47,12 +47,22 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - if (ppv == NULL) return E_POINTER; - return E_NOINTERFACE; + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)

1 0

Michael Stefaniuc : dmstyle: Merge all the different IClassFactory implementations.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 1afbbb749a42e1182a93128e34ef6b40c5896716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1afbbb749a42e1182a93128e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 14:00:47 2011 +0200 dmstyle: Merge all the different IClassFactory implementations. --- dlls/dmstyle/dmstyle_main.c | 430 ++++++------------------------------------- 1 files changed, 54 insertions(+), 376 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1afbbb749a42e1182a931…

1 0

Jacek Caban : ieframe: Moved dialog resources to ieframe.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 932cc2678c15d9297ae899e699e6d3e41aaeb752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932cc2678c15d9297ae899e69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 27 14:45:34 2011 +0200 ieframe: Moved dialog resources to ieframe. --- dlls/{shdocvw => ieframe}/De.rc | 0 dlls/{shdocvw => ieframe}/En.rc | 0 dlls/{shdocvw => ieframe}/Es.rc | 0 dlls/{shdocvw => ieframe}/Fr.rc | 0 dlls/{shdocvw => ieframe}/He.rc | 0 dlls/{shdocvw => ieframe}/It.rc | 0 dlls/{shdocvw => ieframe}/Ja.rc | 0 dlls/{shdocvw => ieframe}/Ko.rc | 0 dlls/{shdocvw => ieframe}/Lt.rc | 0 dlls/ieframe/Makefile.in | 18 ++++++++++++++++++ dlls/{shdocvw => ieframe}/Nl.rc | 0 dlls/{shdocvw => ieframe}/Pl.rc | 0 dlls/{shdocvw => ieframe}/Pt.rc | 0 dlls/{shdocvw => ieframe}/Ro.rc | 0 dlls/{shdocvw => ieframe}/Ru.rc | 0 dlls/{shdocvw => ieframe}/Si.rc | 0 dlls/{shdocvw => ieframe}/Sr.rc | 0 dlls/{shdocvw => ieframe}/Sv.rc | 0 dlls/{shdocvw => ieframe}/Uk.rc | 0 dlls/{shdocvw/En.rc => ieframe/resource.h} | 20 ++++++-------------- dlls/shdocvw/Makefile.in | 18 ------------------ dlls/shdocvw/iexplore.c | 2 +- 22 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/ieframe/De.rc similarity index 100% rename from dlls/shdocvw/De.rc rename to dlls/ieframe/De.rc diff --git a/dlls/shdocvw/En.rc b/dlls/ieframe/En.rc similarity index 100% copy from dlls/shdocvw/En.rc copy to dlls/ieframe/En.rc diff --git a/dlls/shdocvw/Es.rc b/dlls/ieframe/Es.rc similarity index 100% rename from dlls/shdocvw/Es.rc rename to dlls/ieframe/Es.rc diff --git a/dlls/shdocvw/Fr.rc b/dlls/ieframe/Fr.rc similarity index 100% rename from dlls/shdocvw/Fr.rc rename to dlls/ieframe/Fr.rc diff --git a/dlls/shdocvw/He.rc b/dlls/ieframe/He.rc similarity index 100% rename from dlls/shdocvw/He.rc rename to dlls/ieframe/He.rc diff --git a/dlls/shdocvw/It.rc b/dlls/ieframe/It.rc similarity index 100% rename from dlls/shdocvw/It.rc rename to dlls/ieframe/It.rc diff --git a/dlls/shdocvw/Ja.rc b/dlls/ieframe/Ja.rc similarity index 100% rename from dlls/shdocvw/Ja.rc rename to dlls/ieframe/Ja.rc diff --git a/dlls/shdocvw/Ko.rc b/dlls/ieframe/Ko.rc similarity index 100% rename from dlls/shdocvw/Ko.rc rename to dlls/ieframe/Ko.rc diff --git a/dlls/shdocvw/Lt.rc b/dlls/ieframe/Lt.rc similarity index 100% rename from dlls/shdocvw/Lt.rc rename to dlls/ieframe/Lt.rc diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 4e2f58a..3a0f688 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -9,6 +9,24 @@ C_SRCS = \ urlhist.c RC_SRCS = \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + He.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sr.rc \ + Sv.rc \ + Uk.rc \ ieframe.rc @MAKE_DLL_RULES@ diff --git a/dlls/shdocvw/Nl.rc b/dlls/ieframe/Nl.rc similarity index 100% rename from dlls/shdocvw/Nl.rc rename to dlls/ieframe/Nl.rc diff --git a/dlls/shdocvw/Pl.rc b/dlls/ieframe/Pl.rc similarity index 100% rename from dlls/shdocvw/Pl.rc rename to dlls/ieframe/Pl.rc diff --git a/dlls/shdocvw/Pt.rc b/dlls/ieframe/Pt.rc similarity index 100% rename from dlls/shdocvw/Pt.rc rename to dlls/ieframe/Pt.rc diff --git a/dlls/shdocvw/Ro.rc b/dlls/ieframe/Ro.rc similarity index 100% rename from dlls/shdocvw/Ro.rc rename to dlls/ieframe/Ro.rc diff --git a/dlls/shdocvw/Ru.rc b/dlls/ieframe/Ru.rc similarity index 100% rename from dlls/shdocvw/Ru.rc rename to dlls/ieframe/Ru.rc diff --git a/dlls/shdocvw/Si.rc b/dlls/ieframe/Si.rc similarity index 100% rename from dlls/shdocvw/Si.rc rename to dlls/ieframe/Si.rc diff --git a/dlls/shdocvw/Sr.rc b/dlls/ieframe/Sr.rc similarity index 100% rename from dlls/shdocvw/Sr.rc rename to dlls/ieframe/Sr.rc diff --git a/dlls/shdocvw/Sv.rc b/dlls/ieframe/Sv.rc similarity index 100% rename from dlls/shdocvw/Sv.rc rename to dlls/ieframe/Sv.rc diff --git a/dlls/shdocvw/Uk.rc b/dlls/ieframe/Uk.rc similarity index 100% rename from dlls/shdocvw/Uk.rc rename to dlls/ieframe/Uk.rc diff --git a/dlls/shdocvw/En.rc b/dlls/ieframe/resource.h similarity index 64% rename from dlls/shdocvw/En.rc rename to dlls/ieframe/resource.h index e685b15..ba82f52 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/ieframe/resource.h @@ -1,4 +1,6 @@ /* + * Resource identifiers for ieframe.dll + * * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or @@ -16,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +#include <windef.h> +#include <winuser.h> -IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 -STYLE DS_MODALFRAME | WS_CAPTION -CAPTION "Open URL" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Specify the URL you wish to open in Internet Explorer",-1,25, 5, 150,15 - LTEXT "Open:", -1, 2, 32, 20, 15 - EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 - DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 85, 50, 50, 15 -} +#define IDD_BROWSE_OPEN 1001 +#define IDC_BROWSE_OPEN_URL 1002 diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index b3c3156..41a8a76 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -23,24 +23,6 @@ C_SRCS = \ webbrowser.c RC_SRCS = \ - De.rc \ - En.rc \ - Es.rc \ - Fr.rc \ - He.rc \ - It.rc \ - Ja.rc \ - Ko.rc \ - Lt.rc \ - Nl.rc \ - Pl.rc \ - Pt.rc \ - Ro.rc \ - Ru.rc \ - Si.rc \ - Sr.rc \ - Sv.rc \ - Uk.rc \ shdocvw.rc PO_SRCS = shdocvw.rc diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 0ad1e89..815b7d1 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -566,7 +566,7 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR switch(LOWORD(wparam)) { case ID_BROWSE_OPEN: - DialogBoxParamW(shdocvw_hinstance, MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc, (LPARAM)This); + DialogBoxParamW(get_ieframe_instance(), MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc, (LPARAM)This); break; case ID_BROWSE_PRINT:

1 0