wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Jacek Caban : urlmon: Converted more registration process to IRegistrar mechanism.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: fcc4c4647673e96fea5086ccc006a1f19493eb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc4c4647673e96fea5086ccc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 22 19:01:07 2010 +0100 urlmon: Converted more registration process to IRegistrar mechanism. --- dlls/urlmon/Makefile.in | 1 - dlls/urlmon/regsvr.c | 543 --------------------------------------------- dlls/urlmon/rsrc.rc | 3 + dlls/urlmon/urlmon.inf | 37 +--- dlls/urlmon/urlmon.rgs | 75 +++++++ dlls/urlmon/urlmon_main.c | 40 ++++ 6 files changed, 120 insertions(+), 579 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc4c4647673e96fea508…

1 0

Alexandre Julliard : mshtml: Convert the classes registration to the IRegistrar mechanism.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 20310d1d6c0a5e516038e60b1786a51534db3680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20310d1d6c0a5e516038e60b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 21:26:11 2010 +0100 mshtml: Convert the classes registration to the IRegistrar mechanism. --- dlls/mshtml/Makefile.in | 4 + dlls/mshtml/main.c | 10 +- dlls/mshtml/mshtml.inf | 203 --------------------------- dlls/mshtml/mshtml_classes.idl | 299 ++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_tlb.idl | 19 +++ 5 files changed, 329 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20310d1d6c0a5e516038e…

1 0

Alexandre Julliard : include: Define the Scriptlet class in mshtml.idl.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 080d6462dfa7defedd2b0aa904ea61bf471dc1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=080d6462dfa7defedd2b0aa90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 21:25:44 2010 +0100 include: Define the Scriptlet class in mshtml.idl. --- include/mshtmdid.h | 20 +++++++++ include/mshtml.idl | 116 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 127 insertions(+), 9 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 1e9ab77..c6dc2e7 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -946,6 +946,26 @@ #define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+105 #define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+106 +/* DWebBridgeEvents */ +#define DISPID_DWEBBRIDGEEVENTS_ONSCRIPTLETEVENT 1 +#define DISPID_DWEBBRIDGEEVENTS_ONREADYSTATECHANGE DISPID_HTMLDOCUMENTEVENTS_ONREADYSTATECHANGE +#define DISPID_DWEBBRIDGEEVENTS_ONCLICK DISPID_HTMLDOCUMENTEVENTS_ONCLICK +#define DISPID_DWEBBRIDGEEVENTS_ONDBLCLICK DISPID_HTMLDOCUMENTEVENTS_ONDBLCLICK +#define DISPID_DWEBBRIDGEEVENTS_ONKEYDOWN DISPID_HTMLDOCUMENTEVENTS_ONKEYDOWN +#define DISPID_DWEBBRIDGEEVENTS_ONKEYUP DISPID_HTMLDOCUMENTEVENTS_ONKEYUP +#define DISPID_DWEBBRIDGEEVENTS_ONKEYPRESS DISPID_HTMLDOCUMENTEVENTS_ONKEYPRESS +#define DISPID_DWEBBRIDGEEVENTS_ONMOUSEDOWN DISPID_HTMLDOCUMENTEVENTS_ONMOUSEDOWN +#define DISPID_DWEBBRIDGEEVENTS_ONMOUSEMOVE DISPID_HTMLDOCUMENTEVENTS_ONMOUSEMOVE +#define DISPID_DWEBBRIDGEEVENTS_ONMOUSEUP DISPID_HTMLDOCUMENTEVENTS_ONMOUSEUP + +/* IWebBridge */ +#define DISPID_IWEBBRIDGE_URL 1 +#define DISPID_IWEBBRIDGE_SCROLLBAR 2 +#define DISPID_IWEBBRIDGE_EMBED 3 +#define DISPID_IWEBBRIDGE_EVENT DISPID_IHTMLWINDOW2_EVENT +#define DISPID_IWEBBRIDGE_READYSTATE DISPID_READYSTATE +#define DISPID_IWEBBRIDGE_ABOUTBOX DISPID_ABOUTBOX + /* IHTMLEmbedElement */ #define DISPID_IHTMLEMBEDELEMENT_HIDDEN DISPID_OBJECT+10 #define DISPID_IHTMLEMBEDELEMENT_PALETTE DISPID_OBJECT+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index 0269b66..f7dde54 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -93,6 +93,15 @@ typedef enum _SELECTION_TYPE { } SELECTION_TYPE; [ + version(4.0), + uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) +] +library MSHTML +{ + +importlib("stdole2.tlb"); + +[ odl, oleautomation, dual, @@ -143,15 +152,6 @@ interface IHTMLFiltersCollection : IDispatch [retval, out] VARIANT *pvarResult); } -[ - version(4.0), - uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) -] -library MSHTML -{ - -importlib("stdole2.tlb"); - /***************************************************************************** * IHTMLStyle interface */ @@ -13138,6 +13138,104 @@ coclass HTMLDocument } /***************************************************************************** + * DWebBridgeEvents dispinterface + */ +[ + hidden, + uuid(a6d897ff-0a95-11d1-b0ba-006008166e11) +] +dispinterface DWebBridgeEvents +{ +properties: +methods: + [id(DISPID_DWEBBRIDGEEVENTS_ONSCRIPTLETEVENT)] + void onscriptletevent([in] BSTR name,[in] VARIANT eventData); + + [id(DISPID_DWEBBRIDGEEVENTS_ONREADYSTATECHANGE)] + void onreadystatechange(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONCLICK)] + VARIANT_BOOL onclick(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONDBLCLICK)] + VARIANT_BOOL ondblclick(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONKEYDOWN)] + void onkeydown(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONKEYUP)] + void onkeyup(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONKEYPRESS)] + VARIANT_BOOL onkeypress(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONMOUSEDOWN)] + void onmousedown(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONMOUSEMOVE)] + void onmousemove(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONMOUSEUP)] + void onmouseup(); +} + +/***************************************************************************** + * IWebBridge interface + */ +[ + odl, + oleautomation, + dual, + uuid(ae24fdad-03c6-11d1-8b76-0080c744f389) +] +interface IWebBridge : IDispatch +{ + [propput, id(DISPID_IWEBBRIDGE_URL)] + HRESULT URL([in] BSTR v); + + [propget, id(DISPID_IWEBBRIDGE_URL)] + HRESULT URL([retval, out] BSTR * p); + + [propput, id(DISPID_IWEBBRIDGE_SCROLLBAR)] + HRESULT Scrollbar([in] VARIANT_BOOL v); + + [propget, id(DISPID_IWEBBRIDGE_SCROLLBAR)] + HRESULT Scrollbar([retval, out] VARIANT_BOOL * p); + + [propput, id(DISPID_IWEBBRIDGE_EMBED)] + HRESULT embed([in] VARIANT_BOOL v); + + [propget, id(DISPID_IWEBBRIDGE_EMBED)] + HRESULT embed([retval, out] VARIANT_BOOL * p); + + [propget, id(DISPID_IWEBBRIDGE_EVENT)] + HRESULT event([retval, out] IDispatch* * p); + + [propget, id(DISPID_IWEBBRIDGE_READYSTATE)] + HRESULT readyState([retval, out] long * p); + + [id(DISPID_IWEBBRIDGE_ABOUTBOX)] + HRESULT AboutBox(); +} + +/***************************************************************************** + * Scriptlet coclass + */ +[ + control, + helpstring("Microsoft Scriptlet Component"), + progid("ScriptBridge.ScriptBridge.1"), + vi_progid("ScriptBridge.ScriptBridge"), + threading(apartment), + uuid(ae24fdae-03c6-11d1-8b76-0080c744f389) +] +coclass Scriptlet +{ + [default] interface IWebBridge; + [source, default] dispinterface DWebBridgeEvents; +} + +/***************************************************************************** * IHTMLEmbedElement interface */ [

1 0

Alexandre Julliard : widl: Allow specifying a class version outside of a typelib too.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 90c7acf845c260aace38b2abee237024908b7bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c7acf845c260aace38b2abe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 23 12:50:35 2010 +0100 widl: Allow specifying a class version outside of a typelib too. --- tools/widl/register.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index d58fc0a..6b9980f 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -121,6 +121,7 @@ static int write_coclass( const type_t *class, const typelib_t *typelib ) const char *progid = get_attrp( class->attrs, ATTR_PROGID ); const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); const char *threading = get_coclass_threading( class ); + unsigned int version = get_attrv( class->attrs, ATTR_VERSION ); if (!uuid) return 0; if (typelib && !threading) return 0; @@ -134,11 +135,10 @@ static int write_coclass( const type_t *class, const typelib_t *typelib ) if (typelib) { const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); - unsigned int version = get_attrv( class->attrs, ATTR_VERSION ); - if (!version) version = get_attrv( typelib->attrs, ATTR_VERSION ); put_str( indent, "TypeLib = s '%s'\n", format_uuid( typelib_uuid )); - put_str( indent, "Version = s '%u.%u'\n", MAJORVERSION(version), MINORVERSION(version) ); + if (!version) version = get_attrv( typelib->attrs, ATTR_VERSION ); } + if (version) put_str( indent, "Version = s '%u.%u'\n", MAJORVERSION(version), MINORVERSION(version) ); if (vi_progid) put_str( indent, "VersionIndependentProgId = s '%s'\n", vi_progid ); put_str( --indent, "}\n" ); return 1;

1 0

Alexandre Julliard : widl: Don't free the input file name since it' s stored in various places in the location info.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: fc3114ca806151f8ee81677d0382b0e8164747e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3114ca806151f8ee81677d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 21:26:43 2010 +0100 widl: Don't free the input file name since it's stored in various places in the location info. --- tools/widl/parser.l | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3a535e8..e806167 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -142,7 +142,6 @@ UUID *parse_uuid(const char *u) error_loc("Malformed '#...' line-directive; missing terminating \"\n"); *cptr = '\0'; line_number = lineno - 1; /* We didn't read the newline */ - free( input_name ); input_name = xstrdup(fname); } <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0;

1 0

Yaron Shahrabani : shlwapi: Added Hebrew translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 1cc46828f14a5d9fa0c63a99f2eba24270160f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc46828f14a5d9fa0c63a99f… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Dec 22 15:58:21 2010 +0200 shlwapi: Added Hebrew translation. --- dlls/shlwapi/Makefile.in | 1 + dlls/shlwapi/shlwapi_He.rc | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 9f2e59a..a005881 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ shlwapi_Es.rc \ shlwapi_Fi.rc \ shlwapi_Fr.rc \ + shlwapi_He.rc \ shlwapi_Hu.rc \ shlwapi_It.rc \ shlwapi_Ja.rc \ diff --git a/dlls/shlwapi/shlwapi_He.rc b/dlls/shlwapi/shlwapi_He.rc new file mode 100644 index 0000000..2f2bf0b --- /dev/null +++ b/dlls/shlwapi/shlwapi_He.rc @@ -0,0 +1,49 @@ +/* + * Hebrew resources for shlwapi + * + * Copyright 2004 Jon Griffiths + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "שגיאה!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "&אין להציג הודעה זו שוב", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&אישור", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&ביטול", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&כן", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&לא", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld בתים" + IDS_TIME_INTERVAL_HOURS " שעות" + IDS_TIME_INTERVAL_MINUTES " דקות" + IDS_TIME_INTERVAL_SECONDS " שניות" +}

1 0

Jacek Caban : mshtml: Added GUID_CUSTOM_CONFIRMOBJECTSAFETY with CONFIRMSAFETYACTION_LOADOBJECT flag tests .
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: b5653bfa4b2459ad922573bfa567e6543f1b7703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5653bfa4b2459ad922573bfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 22 09:33:58 2010 -0600 mshtml: Added GUID_CUSTOM_CONFIRMOBJECTSAFETY with CONFIRMSAFETYACTION_LOADOBJECT flag tests. --- dlls/mshtml/tests/script.c | 289 ++++++++++++++++++++++++++++++++------------ 1 files changed, 209 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5653bfa4b2459ad92257…

1 0

Jacek Caban : urlmon: Added more IInternetProtocolEx tests.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 67f7e2695e7de6a111563dcdc02ccf8095f50a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f7e2695e7de6a111563dcdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 22 09:07:33 2010 -0600 urlmon: Added more IInternetProtocolEx tests. --- dlls/urlmon/tests/protocol.c | 133 +++++++++++++++++++++++++++++------------ 1 files changed, 94 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67f7e2695e7de6a111563…

1 0

Alexandre Julliard : hhctrl.ocx: Add a typelib and register it.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: efc319bfa5b87ee6b8a2425b4178360ee2503bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc319bfa5b87ee6b8a2425b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 15:52:33 2010 +0100 hhctrl.ocx: Add a typelib and register it. --- .gitignore | 1 + dlls/hhctrl.ocx/Makefile.in | 6 +- dlls/hhctrl.ocx/hhctrl.c | 28 ++ dlls/hhctrl.ocx/hhctrl_tlb.idl | 98 ++++++ dlls/hhctrl.ocx/regsvr.c | 507 ------------------------------- dlls/hhctrl.ocx/{version.rc => rsrc.rc} | 5 +- 6 files changed, 135 insertions(+), 510 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efc319bfa5b87ee6b8a24…

1 0

Alexandre Julliard : include: Set version to 1.0 for msxml classes.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: e11f65f6b7d27856fb785370af7fb2b4b513c162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11f65f6b7d27856fb785370a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 15:51:45 2010 +0100 include: Set version to 1.0 for msxml classes. --- include/msxml.idl | 1 + include/xmldom.idl | 3 +++ include/xmldso.idl | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/msxml.idl b/include/msxml.idl index c6dd745..375bb64 100644 --- a/include/msxml.idl +++ b/include/msxml.idl @@ -346,6 +346,7 @@ interface IXMLElementNotificationSink : IDispatch helpstring("Msxml"), progid("Msxml"), threading(both), + version(1.0), uuid(cfc399af-d876-11d0-9c10-00c04fc99c8e) ] coclass XMLDocument diff --git a/include/xmldom.idl b/include/xmldom.idl index 3e3b613..45e9f13 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -740,6 +740,7 @@ dispinterface XMLDOMDocumentEvents progid("Microsoft.XMLDOM.1.0"), vi_progid("Microsoft.XMLDOM"), threading(both), + version(1.0), uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) ] coclass DOMDocument @@ -753,6 +754,7 @@ coclass DOMDocument progid("Microsoft.FreeThreadedXMLDOM.1.0"), vi_progid("Microsoft.FreeThreadedXMLDOM"), threading(both), + version(1.0), uuid(2933bf91-7b36-11d2-b20e-00c04f983e60) ] coclass DOMFreeThreadedDocument @@ -821,6 +823,7 @@ interface IXMLHttpRequest : IDispatch progid("Microsoft.XMLHTTP.1.0"), vi_progid("Microsoft.XMLHTTP"), threading(apartment), + version(1.0), uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8) ] coclass XMLHTTPRequest diff --git a/include/xmldso.idl b/include/xmldso.idl index 60af6c3..cde98dc 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -53,6 +53,7 @@ interface IXMLDSOControl : IDispatch progid("Microsoft.XMLDSO.1.0"), vi_progid("Microsoft.XMLDSO"), threading(apartment), + version(1.0), uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) ] coclass XMLDSOControl

1 0

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 December 2010