December 2010 - Wine-commits

Alexandre Julliard : include: Correctly define the msxml typelib by directly including xmldom. idl and xmldso.idl.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: f6b6c7bade8fe07bb8d0065be55686093ea5bc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b6c7bade8fe07bb8d0065be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 11:40:04 2010 +0100 include: Correctly define the msxml typelib by directly including xmldom.idl and xmldso.idl. --- .gitignore | 2 -- dlls/gameux/gameexplorer.c | 1 - dlls/mscoree/mscoree_main.c | 2 -- dlls/msxml3/factory.c | 1 - dlls/msxml3/regsvr.c | 2 -- dlls/msxml3/tests/domdoc.c | 1 - dlls/msxml3/tests/schema.c | 1 - dlls/msxml3/tests/xmlelem.c | 1 - dlls/msxml3/uuid.c | 2 -- dlls/uuid/uuid.c | 2 -- include/Makefile.in | 5 +++-- include/msxml.idl | 17 +++++++++++++++++ include/msxml2.idl | 5 +++-- include/msxml6.idl | 5 +++-- include/xmldom.h | 20 ++++++++++++++++++++ include/xmldom.idl | 6 +++--- include/xmldso.idl | 3 --- tools/make_makefiles | 2 ++ 18 files changed, 51 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 95b9fe9..31b5dcb 100644 --- a/.gitignore +++ b/.gitignore @@ -252,8 +252,6 @@ include/wine/winedxgi.h include/winsxs.h include/wtypes.h include/wuapi.h -include/xmldom.h -include/xmldso.h include/xmllite.h libs/wpp/ppl.yy.c libs/wpp/ppy.tab.c diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index ea9307b..096e48e 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -23,7 +23,6 @@ #include "ole2.h" #include "sddl.h" -#include "xmldom.h" #include "gameux.h" #include "gameux_private.h" diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index e63a1db..1f2cfb0 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -32,8 +32,6 @@ #include "ole2.h" #include "ocidl.h" #include "shellapi.h" -#include "xmldom.h" -#include "xmldso.h" #include "initguid.h" #include "msxml2.h" diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 4e7d29e..8ad1abc 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -29,7 +29,6 @@ #include "winuser.h" #include "ole2.h" #include "msxml.h" -#include "xmldom.h" #include "msxml2.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index ca1cc12..7097b41 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -34,8 +34,6 @@ #include "winerror.h" #include "ole2.h" #include "msxml.h" -#include "xmldom.h" -#include "xmldso.h" #include "msxml6.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6c2bf25..d821bac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -26,7 +26,6 @@ #include "windows.h" #include "ole2.h" #include "objsafe.h" -#include "xmldom.h" #include "msxml2.h" #include "msxml2did.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 9e8494a..2b20603 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -26,7 +26,6 @@ #include "initguid.h" #include "windows.h" #include "ole2.h" -#include "xmldom.h" #include "msxml2.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index f38d515..e591494 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -24,7 +24,6 @@ #include "windows.h" #include "ole2.h" -#include "xmldom.h" #include "msxml2.h" #include "ocidl.h" diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index a3c7965..4abbe5e 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -35,8 +35,6 @@ * First include the version 2 headers so that we don't redefine their * uuids - they're already in libuuid */ -#include "xmldom.h" -#include "xmldso.h" #include "msxml.h" /* Now we can initialize the rest of the uuids */ diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index f8d19e2..8df7334 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -63,8 +63,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "mshtml.h" #include "mshtmhst.h" #include "richole.h" -#include "xmldom.h" -#include "xmldso.h" #include "downloadmgr.h" #include "objsel.h" #include "hlink.h" diff --git a/include/Makefile.in b/include/Makefile.in index ae0e842..d31bd74 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -101,8 +101,6 @@ PUBLIC_IDL_H_SRCS = \ winsxs.idl \ wtypes.idl \ wuapi.idl \ - xmldom.idl \ - xmldso.idl \ xmllite.idl IDL_TLB_SRCS = \ @@ -549,7 +547,10 @@ SRCDIR_INCLUDES = \ wtsapi32.h \ xcmc.h \ xinput.h \ + xmldom.h \ + xmldom.idl \ xmldomdid.h \ + xmldso.idl \ xmldsodid.h \ zmouse.h diff --git a/include/msxml.idl b/include/msxml.idl index 8c2496b..62dbcfa 100644 --- a/include/msxml.idl +++ b/include/msxml.idl @@ -18,6 +18,8 @@ */ #include <msxmldid.h> +#include <msxml2did.h> +#include <idispids.h> #ifndef DO_NO_IMPORTS import "unknwn.idl"; @@ -27,6 +29,19 @@ import "oaidl.idl"; #endif [ + uuid(d63e0ce2-a0a2-11d0-9c02-00c04fc99c8e), + version(2.0), + helpstring("Microsoft XML, v2.0") +] +library MSXML +{ + +importlib("stdole2.tlb"); + +#include <xmldom.idl> +#include <xmldso.idl> + +[ local, object, odl, @@ -334,3 +349,5 @@ coclass XMLDocument { [default] interface IXMLDocument; } + +} /* Library MSXML */ diff --git a/include/msxml2.idl b/include/msxml2.idl index d91ba47..c5738d2 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -107,7 +107,8 @@ interface ISchemaNotation; cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") +cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") +cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType { NODE_INVALID = 0, @@ -124,7 +125,7 @@ typedef enum tagDOMNodeType NODE_DOCUMENT_FRAGMENT = 11, NODE_NOTATION = 12 } DOMNodeType; -cpp_quote("#endif /* __WIDL_XMLDOM_H */") +cpp_quote("#endif") typedef enum _SOMITEMTYPE { diff --git a/include/msxml6.idl b/include/msxml6.idl index 45cef98..565f65e 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -113,7 +113,8 @@ interface ISchemaNotation; cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") +cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") +cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType { NODE_INVALID = 0, @@ -130,7 +131,7 @@ typedef enum tagDOMNodeType NODE_DOCUMENT_FRAGMENT = 11, NODE_NOTATION = 12 } DOMNodeType; -cpp_quote("#endif /* __WIDL_XMLDOM_H */") +cpp_quote("#endif") typedef enum _SOMITEMTYPE { diff --git a/include/xmldom.h b/include/xmldom.h new file mode 100644 index 0000000..b774b30 --- /dev/null +++ b/include/xmldom.h @@ -0,0 +1,20 @@ +/* + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +/* xmldom.idl is included by msxml.idl so it doesn't need a stand-alone header */ +#include <msxml.h> diff --git a/include/xmldom.idl b/include/xmldom.idl index d5d51ff..d47c06e 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -19,8 +19,6 @@ #include <xmldomdid.h> #include <idispids.h> -import "ocidl.idl"; - interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; @@ -39,8 +37,9 @@ interface IXMLDOMNotation; interface IXMLDOMEntity; interface IXMLDOMEntityReference; interface IXMLDOMParseError; -interface IXTLRuntime; +cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") +cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType { NODE_INVALID, NODE_ELEMENT, @@ -56,6 +55,7 @@ typedef enum tagDOMNodeType { NODE_DOCUMENT_FRAGMENT, NODE_NOTATION } DOMNodeType; +cpp_quote("#endif") [ local, diff --git a/include/xmldso.idl b/include/xmldso.idl index 14f66a1..c203422 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "wtypes.idl"; -import "ocidl.idl"; - #include <idispids.h> #include <xmldsodid.h> diff --git a/tools/make_makefiles b/tools/make_makefiles index 29cb8d6..4c00814 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -156,6 +156,8 @@ my %private_idl_headers = ( "rstloc.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1, + "xmldom.idl" => 1, + "xmldso.idl" => 1, "wine/wined3d.idl" => 1, "wine/winedxgi.idl" => 1, );

1 0

Alexandre Julliard : include: Add a couple of missing interfaces in msxml2. idl.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: d1c07d11869764c85693b83b2a579e1147a30f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c07d11869764c85693b83b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 12:17:31 2010 +0100 include: Add a couple of missing interfaces in msxml2.idl. --- include/msxml2.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msxml2did.h | 46 ++++++++++++++++++++++ 2 files changed, 152 insertions(+), 0 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index c5738d2..9d49f46 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -258,6 +258,85 @@ typedef enum _SCHEMATYPEVARIETY [ local, object, +odl, +dual, +oleautomation, +uuid(65725580-9b5d-11d0-9bfe-00c04fc99c8e) +] +interface IXMLElementCollection : IDispatch +{ + [propput, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] + HRESULT length( [in] LONG v ); + + [propget, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] + HRESULT length( [retval, out] LONG *p ); + + [propget, id(DISPID_XMLELEMENTCOLLECTION_NEWENUM)] + HRESULT _newEnum( [retval, out] IUnknown ** ppUnk ); + + [id(DISPID_XMLELEMENTCOLLECTION_ITEM)] + HRESULT item( + [optional, in] VARIANT var1, + [optional, in] VARIANT var2, + [retval, out] IDispatch ** ppDisp ); +} + +[ +local, +object, +uuid(3f7f31ac-e15f-11d0-9c25-00c04fc99c8e) +] +interface IXMLElement : IDispatch +{ + [propget, id(DISPID_XMLELEMENT_TAGNAME)] + HRESULT tagName( [retval, out] BSTR *p); + + [propput, id(DISPID_XMLELEMENT_TAGNAME)] + HRESULT tagName( [in] BSTR p ); + + [propget, id(DISPID_XMLELEMENT_PARENT)] + HRESULT parent( [retval, out] IXMLElement **parent ); + + [id(DISPID_XMLELEMENT_SETATTRIBUTE)] + HRESULT setAttribute( + [in] BSTR strPropertyName, + [in] VARIANT PropertyValue ); + + [id(DISPID_XMLELEMENT_GETATTRIBUTE)] + HRESULT getAttribute( + [in] BSTR strPropertyName, + [retval, out] VARIANT *PropertyValue ); + + [id(DISPID_XMLELEMENT_REMOVEATTRIBUTE)] + HRESULT removeAttribute( + [in] BSTR strPropertyName ); + + [propget, id(DISPID_XMLELEMENT_CHILDREN)] + HRESULT children( [retval, out] IXMLElementCollection **p ); + + [propget, id(DISPID_XMLELEMENT_TYPE)] + HRESULT type( [retval, out] LONG *p ); + + [propget, id(DISPID_XMLELEMENT_TEXT)] + HRESULT text( [retval, out] BSTR *p ); + + [propput, id(DISPID_XMLELEMENT_TEXT)] + HRESULT text( [in] BSTR p ); + + [id(DISPID_XMLELEMENT_ADDCHILD)] + HRESULT addChild( + [in] IXMLElement *pChildElem, + [in] LONG lIndex, + [in] LONG lreserved ); + + [id(DISPID_XMLELEMENT_REMOVECHILD)] + HRESULT removeChild( + [in] IXMLElement *pChildElem ); +} + +[ +local, +object, dual, oleautomation, uuid (2933BF80-7B36-11d2-B20E-00C04F983E60) @@ -1112,6 +1191,33 @@ interface IXTLRuntime : IXMLDOMNode } [ +local, +object, +odl, +dual, +oleautomation, +uuid(310afa62-0575-11d2-9ca9-0060b0ec3d39), +pointer_default(unique) +] +interface IDSOControl : IDispatch +{ + [propget,id(DISPID_XMLDSO_DOCUMENT)] + HRESULT XMLDocument([out, retval] IXMLDOMDocument** ppDoc); + + [propput,id(DISPID_XMLDSO_DOCUMENT)] + HRESULT XMLDocument([in] IXMLDOMDocument* ppDoc); + + [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] + HRESULT JavaDSOCompatible([out, retval] BOOL* fJavaDSOCompatible); + + [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] + HRESULT JavaDSOCompatible([in] BOOL fJavaDSOCompatible); + + [propget, id(DISPID_READYSTATE)] + HRESULT readyState([out, retval] long *state); +} + +[ uuid(3efaa427-272f-11d2-836f-0000f87a7782) ] dispinterface XMLDOMDocumentEvents diff --git a/include/msxml2did.h b/include/msxml2did.h index 1aae2a7..e9dbeb8 100644 --- a/include/msxml2did.h +++ b/include/msxml2did.h @@ -20,6 +20,52 @@ #ifndef __MSXML2DID_H__ #define __MSXML2DID_H__ +#define DISPID_XOBJ_MIN 0x10000 +#define DISPID_XOBJ_MAX 0x1FFFF +#define DISPID_XOBJ_BASE 0x10000 + +#define DISPID_XMLELEMENTCOLLECTION 0x10000 +#define DISPID_XMLELEMENTCOLLECTION_LENGTH 0x10001 +#define DISPID_XMLELEMENTCOLLECTION_NEWENUM DISPID_NEWENUM +#define DISPID_XMLELEMENTCOLLECTION_ITEM 0x10003 + +#define DISPID_XMLDOCUMENT 0x10064 +#define DISPID_XMLDOCUMENT_ROOT 0x10065 +#define DISPID_XMLDOCUMENT_FILESIZE 0x10066 +#define DISPID_XMLDOCUMENT_FILEMODIFIEDDATE 0x10067 +#define DISPID_XMLDOCUMENT_FILEUPDATEDDATE 0x10068 +#define DISPID_XMLDOCUMENT_URL 0x10069 +#define DISPID_XMLDOCUMENT_MIMETYPE 0x1006a +#define DISPID_XMLDOCUMENT_READYSTATE 0x1006b +#define DISPID_XMLDOCUMENT_CREATEELEMENT 0x1006c +#define DISPID_XMLDOCUMENT_CHARSET 0x1006d +#define DISPID_XMLDOCUMENT_VERSION 0x1006e +#define DISPID_XMLDOCUMENT_DOCTYPE 0x1006f +#define DISPID_XMLDOCUMENT_DTDURL 0x10070 +#define DISPID_XMLDOCUMENT_ASYNC 0x10071 +#define DISPID_XMLDOCUMENT_CASEINSENSITIVE 0x10072 + +#define DISPID_XMLELEMENT 0x100c8 +#define DISPID_XMLELEMENT_TAGNAME 0x100c9 +#define DISPID_XMLELEMENT_PARENT 0x100ca +#define DISPID_XMLELEMENT_SETATTRIBUTE 0x100cb +#define DISPID_XMLELEMENT_GETATTRIBUTE 0x100cc +#define DISPID_XMLELEMENT_REMOVEATTRIBUTE 0x100cd +#define DISPID_XMLELEMENT_CHILDREN 0x100ce +#define DISPID_XMLELEMENT_TYPE 0x100cf +#define DISPID_XMLELEMENT_TEXT 0x100d0 +#define DISPID_XMLELEMENT_ADDCHILD 0x100d1 +#define DISPID_XMLELEMENT_REMOVECHILD 0x100d2 +#define DISPID_XMLELEMENT_ATTRIBUTES 0x100d3 + +#define DISPID_XMLNOTIFSINK 0x1012c +#define DISPID_XMLNOTIFSINK_CHILDADDED 0x1012d + +#define DISPID_XMLATTRIBUTE 0x10190 +#define DISPID_XMLATTRIBUTE_NAME 0x10191 +#define DISPID_XMLATTRIBUTE_VALUE 0x10192 + + #define DISPID_DOM_BASE 0x00000001 #define DISPID_DOM_COLLECTION_BASE 0x000f4240 #define DISPID_DOM_COLLECTION_MAX 0x002dc6bf

1 0

Alexandre Julliard : msxml: Add an msxml library that contains the v2. 0 msxml typelib.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 25ccc90b4207299a3e9b04feb3f3e1c2370913c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ccc90b4207299a3e9b04feb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 12:03:14 2010 +0100 msxml: Add an msxml library that contains the v2.0 msxml typelib. --- .gitignore | 1 + configure | 1 + configure.ac | 1 + dlls/msxml/Makefile.in | 10 +++++++ dlls/msxml/main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml/msxml.spec | 4 +++ dlls/msxml/msxml_tlb.idl | 19 ++++++++++++++ dlls/msxml/rsrc.rc | 22 ++++++++++++++++ 8 files changed, 121 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 31b5dcb..75e33da 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,7 @@ dlls/msi/sql.tab.c dlls/msi/sql.tab.h dlls/mstask/mstask_local.h dlls/mstask/mstask_local_i.c +dlls/msxml/msxml_tlb.tlb dlls/msxml3/msxml3_v1.tlb dlls/msxml3/xslpattern.tab.c dlls/msxml3/xslpattern.tab.h diff --git a/configure b/configure index a83e6b7..00fbb6f 100755 --- a/configure +++ b/configure @@ -15065,6 +15065,7 @@ wine_fn_config_test dlls/msvfw32/tests msvfw32_test wine_fn_config_dll msvidc32 enable_msvidc32 wine_fn_config_dll msvideo.dll16 enable_win16 wine_fn_config_dll mswsock enable_mswsock mswsock +wine_fn_config_dll msxml enable_msxml wine_fn_config_dll msxml3 enable_msxml3 wine_fn_config_test dlls/msxml3/tests msxml3_test wine_fn_config_dll msxml4 enable_msxml4 diff --git a/configure.ac b/configure.ac index 0706192..1250730 100644 --- a/configure.ac +++ b/configure.ac @@ -2611,6 +2611,7 @@ WINE_CONFIG_TEST(dlls/msvfw32/tests) WINE_CONFIG_DLL(msvidc32) WINE_CONFIG_DLL(msvideo.dll16,enable_win16) WINE_CONFIG_DLL(mswsock,,[mswsock]) +WINE_CONFIG_DLL(msxml) WINE_CONFIG_DLL(msxml3) WINE_CONFIG_TEST(dlls/msxml3/tests) WINE_CONFIG_DLL(msxml4) diff --git a/dlls/msxml/Makefile.in b/dlls/msxml/Makefile.in new file mode 100644 index 0000000..25c45bc --- /dev/null +++ b/dlls/msxml/Makefile.in @@ -0,0 +1,10 @@ +MODULE = msxml.dll + +C_SRCS = main.c + +IDL_TLB_SRCS = msxml_tlb.idl +IDL_R_SRCS = msxml_tlb.idl + +RC_SRCS = rsrc.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/msxml/main.c b/dlls/msxml/main.c new file mode 100644 index 0000000..008c0a9 --- /dev/null +++ b/dlls/msxml/main.c @@ -0,0 +1,63 @@ +/* + * MSXML implementation + * + * Copyright 2010 Alexandre Julliard + * + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +/*********************************************************************** + * DllCanUnloadNow (MSXML.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (MSXML.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance, NULL ); +} + +/*********************************************************************** + * DllUnregisterServer (MSXML.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance, NULL ); +} diff --git a/dlls/msxml/msxml.spec b/dlls/msxml/msxml.spec new file mode 100644 index 0000000..5fd4c28 --- /dev/null +++ b/dlls/msxml/msxml.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) msxml3.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msxml/msxml_tlb.idl b/dlls/msxml/msxml_tlb.idl new file mode 100644 index 0000000..8ad22a2 --- /dev/null +++ b/dlls/msxml/msxml_tlb.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2010 Alexandre Julliard + * + * 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 "msxml.idl" diff --git a/dlls/msxml/rsrc.rc b/dlls/msxml/rsrc.rc new file mode 100644 index 0000000..9537637 --- /dev/null +++ b/dlls/msxml/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for msxml + * + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +/* @makedep: msxml_tlb.tlb */ +1 TYPELIB msxml_tlb.tlb

1 0

Alexandre Julliard : msxml: Register the v2. 0 classes using the IRegistrar mechanism.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: cfa37214b90cc16747a99c8d8d542d294df39094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa37214b90cc16747a99c8d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 13:26:15 2010 +0100 msxml: Register the v2.0 classes using the IRegistrar mechanism. --- dlls/msxml/msxml.rgs | 13 +++++++ dlls/msxml/rsrc.rc | 3 ++ dlls/msxml3/regsvr.c | 90 -------------------------------------------------- include/msxml.idl | 5 ++- include/xmldom.idl | 18 ++++++++-- include/xmldso.idl | 6 +++- tools/wine.inf.in | 1 + 7 files changed, 41 insertions(+), 95 deletions(-) diff --git a/dlls/msxml/msxml.rgs b/dlls/msxml/msxml.rgs new file mode 100644 index 0000000..6f235da --- /dev/null +++ b/dlls/msxml/msxml.rgs @@ -0,0 +1,13 @@ +HKCR +{ + ForceRemove MSXML.DOMDocument = s 'XML DOM Document' + { + CLSID = s '{2933BF90-7B36-11D2-B20E-00C04F983E60}' + CurVer = s 'Microsoft.XMLDOM.1.0' + } + ForceRemove MSXML.FreeThreadedDOMDocument = s 'Free Threaded XML DOM Document' + { + CLSID = s '{2933BF91-7B36-11D2-B20E-00C04F983E60}' + CurVer = s 'Microsoft.FreeThreadedXMLDOM.1.0' + } +} diff --git a/dlls/msxml/rsrc.rc b/dlls/msxml/rsrc.rc index 9537637..473a324 100644 --- a/dlls/msxml/rsrc.rc +++ b/dlls/msxml/rsrc.rc @@ -20,3 +20,6 @@ /* @makedep: msxml_tlb.tlb */ 1 TYPELIB msxml_tlb.tlb + +/* @makedep: msxml.rgs */ +1 WINE_REGISTRY msxml.rgs diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 7097b41..bbefedd 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -466,14 +466,6 @@ static LONG register_key_defvalueA( * coclass list */ static struct regsvr_coclass const coclass_list[] = { - { &CLSID_DOMDocument, - "XML DOM Document", - NULL, - "msxml3.dll", - "Both", - "Microsoft.XMLDOM", - "1.0" - }, { &CLSID_DOMDocument2, "XML DOM Document", NULL, @@ -490,22 +482,6 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.DOMDocument", "3.0" }, - { &CLSID_DOMFreeThreadedDocument, - "Free threaded XML DOM Document", - NULL, - "msxml3.dll", - "Both", - "Microsoft.FreeThreadedXMLDOM", - "1.0" - }, - { &CLSID_DOMFreeThreadedDocument, - "Free threaded XML DOM Document", - NULL, - "msxml3.dll", - "Both", - "Microsoft.FreeThreadedXMLDOM", - NULL - }, { &CLSID_FreeThreadedDOMDocument, "Free Threaded XML DOM Document", NULL, @@ -530,14 +506,6 @@ static struct regsvr_coclass const coclass_list[] = { "Microsoft.FreeThreadedDOMDocument.1.0", "1.0" }, - { &CLSID_XMLHTTPRequest, - "XML HTTP Request", - NULL, - "msxml3.dll", - "Apartment", - "Microsoft.XMLHTTP", - "1.0" - }, { &CLSID_XMLHTTP26, "XML HTTP 2.6", NULL, @@ -554,14 +522,6 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.XMLHTTP.3.0", "3.0" }, - { &CLSID_XMLDSOControl, - "XML Data Source Object", - NULL, - "msxml3.dll", - "Apartment", - "Microsoft.XMLDSO", - "1.0" - }, { &CLSID_XMLDocument, "Msxml", NULL, @@ -655,21 +615,6 @@ static struct regsvr_interface const interface_list[] = { * progid list */ static struct progid const progid_list[] = { - { "Microsoft.XMLDOM", - "XML DOM Document", - &CLSID_DOMDocument, - "Microsoft.XMLDOM.1.0" - }, - { "Microsoft.XMLDOM.1.0", - "XML DOM Document", - &CLSID_DOMDocument, - NULL - }, - { "MSXML.DOMDocument", - "XML DOM Document", - &CLSID_DOMDocument, - "Microsoft.XMLDOM.1.0" - }, { "Msxml2.DOMDocument", "XML DOM Document", &CLSID_DOMDocument2, @@ -680,21 +625,6 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument30, NULL }, - { "Microsoft.FreeThreadedXMLDOM", - "Free threaded XML DOM Document", - &CLSID_DOMFreeThreadedDocument, - "Microsoft.FreeThreadedXMLDOM.1.0" - }, - { "Microsoft.FreeThreadedXMLDOM.1.0", - "Free threaded XML DOM Document", - &CLSID_DOMFreeThreadedDocument, - NULL - }, - { "MSXML.FreeThreadedDOMDocument", - "Free threaded XML DOM Document", - &CLSID_DOMFreeThreadedDocument, - "Microsoft.FreeThreadedXMLDOM.1.0" - }, { "MSXML.FreeThreadedDOMDocument26", "Free threaded XML DOM Document 2.6", &CLSID_FreeThreadedDOMDocument26, @@ -705,16 +635,6 @@ static struct progid const progid_list[] = { &CLSID_FreeThreadedDOMDocument30, NULL }, - { "Microsoft.XMLHTTP", - "XML HTTP Request", - &CLSID_XMLHTTPRequest, - "Microsoft.XMLHTTP.1.0" - }, - { "Microsoft.XMLHTTP.1.0", - "XML HTTP Request", - &CLSID_XMLHTTPRequest, - NULL - }, { "Msxml2.XMLHTTP.2.6", "XML HTTP 2.6", &CLSID_XMLHTTP26, @@ -725,16 +645,6 @@ static struct progid const progid_list[] = { &CLSID_XMLHTTP30, NULL }, - { "Microsoft.XMLDSO", - "XML Data Source Object", - &CLSID_XMLDSOControl, - "Microsoft.XMLDSO.1.0" - }, - { "Microsoft.XMLDSO.1.0", - "XML Data Source Object", - &CLSID_XMLDSOControl, - NULL - }, { "Msxml", "Msxml", &CLSID_XMLDocument, diff --git a/include/msxml.idl b/include/msxml.idl index 62dbcfa..c6dd745 100644 --- a/include/msxml.idl +++ b/include/msxml.idl @@ -343,7 +343,10 @@ interface IXMLElementNotificationSink : IDispatch } [ -uuid(cfc399af-d876-11d0-9c10-00c04fc99c8e) + helpstring("Msxml"), + progid("Msxml"), + threading(both), + uuid(cfc399af-d876-11d0-9c10-00c04fc99c8e) ] coclass XMLDocument { diff --git a/include/xmldom.idl b/include/xmldom.idl index d47c06e..3e3b613 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -736,7 +736,11 @@ dispinterface XMLDOMDocumentEvents } [ -uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) + helpstring("XML DOM Document"), + progid("Microsoft.XMLDOM.1.0"), + vi_progid("Microsoft.XMLDOM"), + threading(both), + uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) ] coclass DOMDocument { @@ -745,7 +749,11 @@ coclass DOMDocument } [ -uuid(2933bf91-7b36-11d2-b20e-00c04f983e60) + helpstring("Free Threaded XML DOM Document"), + progid("Microsoft.FreeThreadedXMLDOM.1.0"), + vi_progid("Microsoft.FreeThreadedXMLDOM"), + threading(both), + uuid(2933bf91-7b36-11d2-b20e-00c04f983e60) ] coclass DOMFreeThreadedDocument { @@ -809,7 +817,11 @@ interface IXMLHttpRequest : IDispatch } [ -uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8) + helpstring("XML HTTP Request"), + progid("Microsoft.XMLHTTP.1.0"), + vi_progid("Microsoft.XMLHTTP"), + threading(apartment), + uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8) ] coclass XMLHTTPRequest { diff --git a/include/xmldso.idl b/include/xmldso.idl index c203422..60af6c3 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -49,7 +49,11 @@ interface IXMLDSOControl : IDispatch } [ -uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) + helpstring("XML Data Source Object"), + progid("Microsoft.XMLDSO.1.0"), + vi_progid("Microsoft.XMLDSO"), + threading(apartment), + uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) ] coclass XMLDSOControl { diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0221640..e65162d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2527,6 +2527,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msimtf.dll,1 11,,msisip.dll,1 11,,mstask.dll,1 +11,,msxml.dll,1 11,,msxml3.dll,1 11,,msxml4.dll,1 11,,msxml6.dll,1

1 0

Łukasz Wojniłowicz : acknowledgement.template: Add Polish translation
by Jeremy Newman 21 Dec '10

21 Dec '10

Module: website Branch: master Commit: 663cf8f229ed744bbaf093aba42efa561241e147 URL: http://source.winehq.org/git/website.git/?a=commit;h=663cf8f229ed744bbaf093… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 18 10:27:46 2010 +0100 acknowledgement.template: Add Polish translation --- templates/pl/acknowledgement.template | 206 +++++++++++++++++++++++++++++++++ 1 files changed, 206 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=663cf8f229ed744bba…

1 0

Łukasz Wojniłowicz : donate.template: Add Polish translation
by Jeremy Newman 21 Dec '10

21 Dec '10

Module: website Branch: master Commit: cd80bb23e8f45f133b0a8c52a28961bcd7d597e2 URL: http://source.winehq.org/git/website.git/?a=commit;h=cd80bb23e8f45f133b0a8c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 18 10:47:14 2010 +0100 donate.template: Add Polish translation --- templates/pl/donate.template | 77 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/templates/pl/donate.template b/templates/pl/donate.template new file mode 100644 index 0000000..dc30249 --- /dev/null +++ b/templates/pl/donate.template @@ -0,0 +1,77 @@ + + + +<h1 class="title">Podaruj pieniądze projektowi Wine</h1> + +<p>Jest kilka sposobów na podarowanie pieniędzy projektowi Wine.</p> + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> + + <tr> + <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Opcja</b></td> + <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">O tej opcji darowizny</b></td> + </tr> + + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> + <input type="hidden" name="cmd" value="_donations"> + <input type="hidden" name="business" value="donate(a)winehq.org"> + <input type="hidden" name="item_name" value="Wine donation"> + </form> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="javascript:document.donateForm.submit();">Paypal</a> + </td> + <td valign="top"> + Z <a href="javascript:document.donateForm.submit();">Paypalem</a> możesz przekazać datki przez kartę kredytową lub przez konto Paypal. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.freewear.org/?org=Wine">FreeWear</a> + </td> + <td valign="top"> + Możesz kupić ubrania Wine pod adresem <a href="http://www.freewear.org/?org=Wine">FreeWear.org</a>. + Za każde kupione ubranie firma przekazuje część swoich zysków dla Wine. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.winehq.org/contributing#wpf">Mail</a> + </td> + <td valign="top"> + Możesz także przesłać nam pieniądze, czek lub międzynarodowy nakaz przelewu w kapitale Stanów Zjednoczonych. + Kliknij na <a href="http://www.winehq.org/contributing#wpf">ten link</a> po więcej informacji. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon</a> + </td> + <td valign="top"> + Kupuj na <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon.com</a> przez ten konkretny link. + </td> + </tr> + +<tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> + </td> + <td valign="top"> + Kupuj na <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> przez ten konkretny link. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge</a> + </td> + <td valign="top"> + Posiadamy także konto <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge.net</a>na PayPalu. + </td> + </tr> + +</table>

1 0

Łukasz Wojniłowicz : lang.template: Add Polish translation
by Jeremy Newman 21 Dec '10

21 Dec '10

Module: website Branch: master Commit: 4a1f9b877ebe5689e66f3cf01df061fa94fd894c URL: http://source.winehq.org/git/website.git/?a=commit;h=4a1f9b877ebe5689e66f3c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 18 10:47:15 2010 +0100 lang.template: Add Polish translation --- templates/pl/lang.template | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/templates/pl/lang.template b/templates/pl/lang.template new file mode 100644 index 0000000..094bba8 --- /dev/null +++ b/templates/pl/lang.template @@ -0,0 +1,12 @@ + + + + + +<h1 class="title">{$langChange}</h1> + +<p><b>Obecnie wybrany język: </b> {$langCur}</p> + +<ul style="list-style: none; margin-left: 20px; padding: 0;"> + +</ul>

1 0

Łukasz Wojniłowicz : download.template: Update Polish translation
by Jeremy Newman 21 Dec '10

21 Dec '10

Module: website Branch: master Commit: 0d6a6b872005b6f5aeb190716deab5ce374a835e URL: http://source.winehq.org/git/website.git/?a=commit;h=0d6a6b872005b6f5aeb190… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 18 10:27:44 2010 +0100 download.template: Update Polish translation --- templates/pl/download.template | 72 ++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0d6a6b872005b6f5ae…

1 0

Łukasz Wojniłowicz : deb.template: Update Polish translation
by Jeremy Newman 21 Dec '10

21 Dec '10

Module: website Branch: master Commit: 42c95300ff3a3324d55d6e623c6f425cc6a633da URL: http://source.winehq.org/git/website.git/?a=commit;h=42c95300ff3a3324d55d6e… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 18 10:27:45 2010 +0100 deb.template: Update Polish translation --- templates/pl/download/deb.template | 102 ++++++++---------------------------- 1 files changed, 22 insertions(+), 80 deletions(-) diff --git a/templates/pl/download/deb.template b/templates/pl/download/deb.template index e8ebaba..fc4c589 100644 --- a/templates/pl/download/deb.template +++ b/templates/pl/download/deb.template @@ -1,114 +1,56 @@ - - + + <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> -Wine dla Ubuntu i pochodnych Ubuntu +Wine dla Ubuntu i jego pochodnych <a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> -<p>Ubuntu i inne dystrybucje bazujące na Debianie -używają specjalnego narzędzia zwanego APT do zarządzania -paczkami. APT jest zdolne automagicznie zainstalować wszystkie -potrzebne zależności dla paczki z programem, jak również -utrzymywać zawsze najnowsze wersje paczki, poprzez przeszukiwanie -czegoś, co jest znane pod nazwą repozytoria APT. Ubuntu ma swoje -własne repozytorium programów, które zawiera w sobie Wine, -jednakże my utrzymujemy nasze własne repozytorium najnowszych -dostępnych paczek beta, które można tutaj pobrać.</p> +<p>Ubuntu i pochodne Ubuntu (takie jak Kubuntu) uzyskują oprogramowanie z +<i>paczek</i>, które są przechowywane w <i>repozytoriach</i>. Domyślne repozytorium Ubuntu +zawiera Wine, jednakże jeśli chcesz być na bieżąco z najnowszymi paczkami beta +konieczne jest użycie tych z WineHQ, co możesz zrobić poprzez zastosowanie się do poniższych instrukcji. +</p> -<h2>Uwaga: To są paczki beta</h2> +<h2>Uwaga: To są paczki beta dla Ubuntu 10.04 i późniejszych</h2> <p><i>Te paczki są paczkami beta. Oznacza to, że okresowo mogą cierpieć z powodu -<a href="http://wiki.winehq.org/Regression">regresji</a>, a aktualizacja do nich może popsuć funkcjonalność Wine. Jeżeli w -twoim przypadku ostatnie stabilne wydanie Wine (aktualnie Wine 1.0.1) -działa, to nie musisz używać paczek beta.</i></p> +<a href="http://wiki.winehq.org/Regression">regresji</a>, a aktualizacja do nich może popsuć funkcjonalność Wine. Jeżeli wersja Wine dostarczona z Ubuntu działa bez problemu, to nie jest koniecznym instalowanie tych paczek beta.</i></p> -<h2>Dodawanie repozytorium APT WineHQ:</h2> +<h2>Dodawanie repozytorium WineHQ:</h2> <p>Otwórz źródła oprogramowania z menu <b>System->Administracja->źródła oprogramowania</b>. Następnie przejdź na zakładkę <b>Oprogramowanie osób trzecich</b> i kliknij <b>Dodaj...</b></p> -<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Other Software" border="0"> -<p>Następnie, <b>wklej jedną z poniższych linijek</b> zależnie od wersji twojego systemu.</p> +<p>Następnie, <b>wklej poniższą linijkę</b>.</p> -<p><b>Dla Ubuntu Lucid (10.04):</b><br> <i>ppa:ubuntu-wine/ppa</i></p> -<p><b>Dla Ubuntu Karmic (9.10):</b><br> -<i>ppa:ubuntu-wine/ppa</i></p> -<p><b>Dla Ubuntu Jaunty (9.04):</b><br> -<i>deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope"</i></p> -<p><b>Dla Ubuntu Intrepid (8.10):</b><br> -<i>deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex"</i></p> -<p><b>Dla Ubuntu Hardy (8.04):</b><br> -<i>deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron"</i></p> - -<h2>Przyznanie zaufania repozytorium APT WineHQ (tylko dla Ubuntu 9.04 i wcześniejszych):</h2> - -<p>Po dodaniu repozytorium, musisz również dodać klucz do tego -repozytorium do swojej systemowej listy zaufanych kluczy.</p> - -<p>Dla Ubuntu 9.04 i wcześniejszych, -<b><a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Pobierz -i zapisz klucz Scotta Ritchiego</a></b> (prawy przycisk myszy -> zapisz jako) na pulpicie. -Następnie przejdź na zakładkę <b>Uwierzytelnianie</b> , kliknij <b>Zaimportuj plik klucza...</b>, i wybierz plik klucza, -którego właśnie zapisałeś (<i>Scott Ritchie.gpg</i>). Możesz usunąć ten plik po wykonaniu tego kroku.</p> - -<img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> <h2>Instalowanie Wine:</h2> <p>Kliknij zamknij, aby zakończyć, a potem <b>uaktualnij dane o paczkach</b> w momencie pytania. Jeżeli masz zainstalowane Wine to systemowy -menadżer aktualizacji poinformuje cię o najnowszym wydaniu Wine -beta i zapyta cię o aktualizację. Jeżeli nie instalowałeś -jeszcze Wine, to przejdź do <b>Aplikacje->Dodaj/usuń aplikacje</b> i poszukaj Wine lub po prostu <a href="apt://wine">kliknij na tego -linka</a>.</p> +menadżer aktualizacji zaoferuje aktualizację do stabilnej wersji Wine 1.2. Aby zaktualizować do najnowszej wersji Wine 1.3 beta, konieczne będzie zainstalowanie <i>paczki wine1.3</i> lub <a href="apt://wine1.3">kliknięcie na ten link</a>.</p> <h2>Aktualizacja do nowej wersji Ubuntu</h2> <p>Jeżeli aktualizujesz cały system np. przechodzisz z -Ubuntu 8.10 na 9.04, to będzie konieczny powrót do tej strony i +Ubuntu 10.04 na 10.10, to będzie konieczny powrót do tej strony i dodanie repozytorium do nowej wersji systemu. Wbudowany menadżer -aktualizacji nie zmieni automatycznie repozytorium Wine.</p> - -<h2>Starsze paczki .deb</h2> - -<p>Jako że repozytorium APT może przechowywać -jedynie najnowsze paczki, tak więc starsze wersje paczek są -dostępne w -<a href="http://wine.budgetdedicated.com/archive/index.html">archiwum WineHQ paczek .deb</a>.</p> - -<p>Możesz zainstalować pobrane paczki klikając na nie dwukrotnie.</p> +aktualizacji nie zmieni automatycznie repozytorium Wine. +</p> <h2>Alternatywne komendy wiersza poleceń do zainstalowania Wine:</h2> -<p>Możliwe jest także dodanie repozytoriów Wine i zainstalowanie go z wiersza poleceń. -Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu. -Aby to zrobić będziesz musiał wpisać poniższe linijki w terminalowym wierszu poleceń</p> - -<h3>Dla Ubuntu 10.04 (Lucid) i 9.10 (Karmic):</h3> +<p>Możliwe jest także dodanie repozytoriów Wine i instalowanie z wiersza poleceń. +Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu.</p> <p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> -<h3>Dla Ubuntu 9.04 i wcześniejszych:</h3> -<p>Dodaj klucz repozytorium do swojej systemowej listy zaufanych kluczy poprzez -kopiuj/wklej następujących linijek w terminalu:</p> - -<p><i>wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add -</i></p> - -<p>Następnie, dodaj repozytorium do systemowej listy źródeł APT:</p> - -<p><b>Dla Ubuntu Jaunty (9.04):</b><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>Dla Ubuntu Intrepid (8.10):</b><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>Dla Ubuntu Hardy (8.04):</b><br> -<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list</i></p> - <p>Następnie zaktualizuj informacje o paczkach APT wpisując '<b>sudo apt-get -update</b>'. . Teraz możesz zainstalować Wine zwyczajnie lub wpisując '<b>sudo apt-get -install wine</b>' w terminalu.</p> +update</b>'. Teraz możesz zainstalować Wine zwyczajnie lub wpisując w terminalu '<b>sudo apt-get +install wine1.3</b>'.</p> -<br> -<p><i>Bardzo szybki i niezawodny webhosting dla repozytoriów APT uprzejmie dostarcza <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.</i></p> +<p>Możliwe jest ręczne przyeglądanie repozytorium PPA poprzez <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">wejście na jego stronę Launchpad</a>.</p>

1 0

Jacek Caban : urlmon: Added IUriContainer stub implementation of URLMoniker object.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: b6db01177cec6f22b7f7e5589c340a8b79808d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6db01177cec6f22b7f7e5589… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 20 14:15:00 2010 +0000 urlmon: Added IUriContainer stub implementation of URLMoniker object. --- dlls/urlmon/tests/url.c | 22 +++++++++++++++++++++- dlls/urlmon/umon.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index c635da3..875294b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -37,7 +37,7 @@ static HRESULT (WINAPI *pCreateAsyncBindCtxEx)(IBindCtx *, DWORD, IBindStatusCallback *, IEnumFORMATETC *, IBindCtx **, DWORD); - +static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); @@ -3157,6 +3157,22 @@ static void test_StdURLMoniker(void) hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); ok(hres == E_OUTOFMEMORY, "GetDisplayName failed: %08x, expected E_OUTOFMEMORY\n", hres); + if(pCreateUri) { + IUriContainer *uri_container; + IUri *uri; + + hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); + ok(hres == S_OK, "Coud not get IUriMoniker iface: %08x\n", hres); + + + uri = (void*)0xdeadbeef; + hres = IUriContainer_GetIUri(uri_container, &uri); + ok(hres == S_FALSE, "GetIUri failed: %08x\n", hres); + ok(!uri, "uri = %p, expected NULL\n", uri); + + IUriContainer_Release(uri_container); + } + IMoniker_Release(mon); } @@ -3191,6 +3207,10 @@ START_TEST(url) return; } + pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); + if(!pCreateUri) + win_skip("IUri not supported\n"); + complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index fbb00a4..d33e0bf 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IMonikerVtbl *lpIMonikerVtbl; + IUriContainer IUriContainer_iface; LONG ref; @@ -63,6 +64,9 @@ static HRESULT WINAPI URLMoniker_QueryInterface(IMoniker *iface, REFIID riid, vo }else if(IsEqualIID(&IID_IAsyncMoniker, riid)) { TRACE("(%p)->(IID_IAsyncMoniker %p)\n", This, ppv); *ppv = iface; + }else if(IsEqualIID(&IID_IUriContainer, riid)) { + TRACE("(%p)->(IID_IUriContainer %p)\n", This, ppv); + *ppv = &This->IUriContainer_iface; }else { WARN("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -454,6 +458,46 @@ static const IMonikerVtbl URLMonikerVtbl = URLMoniker_IsSystemMoniker }; +static inline URLMoniker *impl_from_IUriContainer(IUriContainer *iface) +{ + return CONTAINING_RECORD(iface, URLMoniker, IUriContainer_iface); +} + +static HRESULT WINAPI UriContainer_QueryInterface(IUriContainer *iface, REFIID riid, void **ppv) +{ + URLMoniker *This = impl_from_IUriContainer(iface); + return IMoniker_QueryInterface((IMoniker*)&This->lpIMonikerVtbl, riid, ppv); +} + +static ULONG WINAPI UriContainer_AddRef(IUriContainer *iface) +{ + URLMoniker *This = impl_from_IUriContainer(iface); + return IMoniker_AddRef((IMoniker*)&This->lpIMonikerVtbl); +} + +static ULONG WINAPI UriContainer_Release(IUriContainer *iface) +{ + URLMoniker *This = impl_from_IUriContainer(iface); + return IMoniker_Release((IMoniker*)&This->lpIMonikerVtbl); +} + +static HRESULT WINAPI UriContainer_GetIUri(IUriContainer *iface, IUri **ppIUri) +{ + URLMoniker *This = impl_from_IUriContainer(iface); + + FIXME("(%p)->(%p)\n", This, ppIUri); + + *ppIUri = NULL; + return S_FALSE; +} + +static const IUriContainerVtbl UriContainerVtbl = { + UriContainer_QueryInterface, + UriContainer_AddRef, + UriContainer_Release, + UriContainer_GetIUri +}; + static URLMoniker *alloc_moniker(void) { URLMoniker *ret; @@ -463,6 +507,7 @@ static URLMoniker *alloc_moniker(void) return NULL; ret->lpIMonikerVtbl = &URLMonikerVtbl; + ret->IUriContainer_iface.lpVtbl = &UriContainerVtbl; ret->ref = 1; ret->URLName = NULL;

1 0