March 2006 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Add d3d7 and d3d8/ 9 cap flags to wined3d_types.h.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 033769f94dd4ff21f1dd87008a32df0f9696fa32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=033769f94dd4ff21f1dd870… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Mar 5 21:07:10 2006 +0100 wined3d: Add d3d7 and d3d8/9 cap flags to wined3d_types.h. --- dlls/wined3d/directx.c | 88 +++++++++++++++++++------------------- include/wine/wined3d_types.h | 97 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=033769f94dd4ff21f1d…

1 0

Jason Green : wined3d: Add a few more WINED3DFMT formats to be recognized.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 6d30800db6e8f8376a37c289567cd6cfb22c7cca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d30800db6e8f8376a37c28… Author: Jason Green <jave27(a)gmail.com> Date: Sun Mar 5 21:26:19 2006 -0500 wined3d: Add a few more WINED3DFMT formats to be recognized. --- dlls/wined3d/utils.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 53a9533..af2ede2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -86,6 +86,10 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_R16F); FMT_TO_STR(WINED3DFMT_G16R16F); FMT_TO_STR(WINED3DFMT_A16B16G16R16F); + FMT_TO_STR(WINED3DFMT_R32F); + FMT_TO_STR(WINED3DFMT_G32R32F); + FMT_TO_STR(WINED3DFMT_A32B32G32R32F); + FMT_TO_STR(WINED3DFMT_CxV8U8); #undef FMT_TO_STR default: FIXME("Unrecognized %u D3DFORMAT!\n", fmt);

1 0

Jacek Caban : mshtml: Added IHTMLElement implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 874fd57841f8d9670c50429b8b28d6b3627b0bb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=874fd57841f8d9670c50429… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:39:59 2006 +0100 mshtml: Added IHTMLElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 875 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 2 dlls/mshtml/mshtml_private.h | 14 + dlls/mshtml/nsiface.idl | 51 ++ 5 files changed, 940 insertions(+), 3 deletions(-) create mode 100644 dlls/mshtml/htmlelem.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=874fd57841f8d9670c5…

1 0

Jacek Caban : mshtml: Added get_documentElement implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 6ef5f9556215ac4b3426028cc7156eaa133d20ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ef5f9556215ac4b3426028… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:41:18 2006 +0100 mshtml: Added get_documentElement implementation. --- dlls/mshtml/htmldoc3.c | 31 +++++++++++++++++++++++++++---- dlls/mshtml/nsiface.idl | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index bc74509..9c12693 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -112,11 +112,34 @@ static HRESULT WINAPI HTMLDocument3_crea return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument3_documentElement(IHTMLDocument3 *iface, IHTMLElement **p) +static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, IHTMLElement **p) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + HTMLDOMNode *node; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nscontainer) { + *p = NULL; + return S_OK; + } + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) + ERR("GetDocument failed: %08lx\n", nsres); + + if(nsdoc) { + node = get_node(This, (nsIDOMNode*)nsdoc); + nsIDOMDocument_Release(nsdoc); + + IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); + }else { + *p = NULL; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument3_uniqueID(IHTMLDocument3 *iface, BSTR *p) @@ -402,7 +425,7 @@ static const IHTMLDocument3Vtbl HTMLDocu HTMLDocument3_releaseCapture, HTMLDocument3_recalc, HTMLDocument3_createTextNode, - HTMLDocument3_documentElement, + HTMLDocument3_get_documentElement, HTMLDocument3_uniqueID, HTMLDocument3_attachEvent, HTMLDocument3_detachEvent, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index fabe6bb..7aa4acd 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -55,6 +55,7 @@ typedef nsStringContainer nsAString; interface nsIWebBrowserChrome; interface nsILoadGroup; interface nsIDOMNode; +interface nsIDOMDocument; [ object, @@ -69,7 +70,6 @@ interface nsISupports /* Currently we don't need a full declaration of these interfaces */ typedef nsISupports nsIWeakReference; -typedef nsISupports nsIDOMDocument; typedef nsISupports nsISHistory; typedef nsISupports nsISimpleEnumerator; typedef nsISupports nsIWidget; @@ -86,6 +86,14 @@ typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; typedef nsISupports nsIDOMNamedNodeMap; typedef nsISupports nsIDOMAttr; +typedef nsISupports nsIDOMDocumentType; +typedef nsISupports nsIDOMDOMImplementation; +typedef nsISupports nsIDOMDocumentFragment; +typedef nsISupports nsIDOMText; +typedef nsISupports nsIDOMComment; +typedef nsISupports nsIDOMCDATASection; +typedef nsISupports nsIDOMProcessingInstruction; +typedef nsISupports nsIDOMEntityReference; [ object, @@ -394,6 +402,35 @@ interface nsIDOMHTMLElement : nsIDOMElem [ object, + uuid(a6cf9075-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMDocument : nsIDOMNode +{ + nsresult GetDoctype(nsIDOMDocumentType **aDoctype); + nsresult GetImplementation(nsIDOMDOMImplementation **aImplementation); + nsresult GetDocumentElement(nsIDOMElement **aDocumentElement); + nsresult CreateElement(const nsAString *tagName, nsIDOMElement **_retval); + nsresult CreateDocumentFragment(nsIDOMDocumentFragment **_retval); + nsresult CreateTextNode(const nsAString *data, nsIDOMText **_retval); + nsresult CreateComment(const nsAString *data, nsIDOMComment **_retval); + nsresult CreateCDATASection(const nsAString *data, nsIDOMCDATASection **_retval); + nsresult CreateProcessingInstruction(const nsAString *target, const nsAString *data, + nsIDOMProcessingInstruction **_retval); + nsresult CreateAttribute(const nsAString *name, nsIDOMAttr **_retval); + nsresult CreateEntityReference(const nsAString *name, nsIDOMEntityReference **_retval); + nsresult GetElementsByTagName(const nsAString *tagname, nsIDOMNodeList **_retval); + nsresult ImportNode(nsIDOMNode *importedNode, PRBool deep, nsIDOMNode **_retval); + nsresult CreateElementNS(const nsAString *namespaceURI, const nsAString *qualifiedName, + nsIDOMElement **_retval); + nsresult CreateAttributeNS(const nsAString *namespaceURI, const nsAString *qualifiedName, + nsIDOMAttr **_retval); + nsresult GetElementsByTagNameNS(const nsAString *namespaceURI, const nsAString *localName, + nsIDOMNodeList **_retval); + nsresult GetElementById(const nsAString *elementId, nsIDOMElement **_retval); +} + +[ + object, uuid(a6cf906b-15b3-11d2-932e-00805f8add32) ] interface nsIDOMWindow : nsISupports

1 0

Jacek Caban : shdocvw: Beginning ShowContextMenu implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 7a3a554c9b4aa3a894864a7c3f3eef6bac053eb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a3a554c9b4aa3a894864a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 22:28:37 2006 +0100 shdocvw: Beginning ShowContextMenu implementation. --- dlls/shdocvw/dochost.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index ffe1fda..07c9522 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -281,7 +281,18 @@ static HRESULT WINAPI DocHostUIHandler_S DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved); + HRESULT hres; + + TRACE("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved); + + if(This->hostui) { + hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, pcmdtReserved, + pdispReserved); + if(hres == S_OK) + return S_OK; + } + + FIXME("default action not implemented\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added more interfaces to mshtml.idl.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: ee1e7e503fb641b4bb21c2561111ca081f7e1475 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee1e7e503fb641b4bb21c25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:52:19 2006 +0100 mshtml: Added more interfaces to mshtml.idl. --- include/mshtmdid.h | 129 ++++++++ include/mshtml.idl | 802 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 879 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ee1e7e503fb641b4bb2…

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 54036bf6efa06337f5d8649037246f6a75ec652d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54036bf6efa06337f5d8649… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:38:30 2006 +0100 mshtml: Added IHTMLDOMNode implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmldoc.c | 2 dlls/mshtml/htmlnode.c | 364 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 34 ++++ dlls/mshtml/nsiface.idl | 46 +++++ 5 files changed, 445 insertions(+), 2 deletions(-) create mode 100644 dlls/mshtml/htmlnode.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=54036bf6efa06337f5d…

1 0

Vitaly Budovski : wined3d: Added OpenGL 2.0 function definitions.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 3832eb7de4c6a6a6fc8c2f401d1b8e49116e4b75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3832eb7de4c6a6a6fc8c2f4… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sun Mar 5 19:21:28 2006 +1100 wined3d: Added OpenGL 2.0 function definitions. --- dlls/wined3d/device.c | 16 +-- dlls/wined3d/directx.c | 6 + include/wine/wined3d_gl.h | 278 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3832eb7de4c6a6a6fc8…

1 0

Robert Shearman : wcmd: Improve command line processing.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 7f515f31121f3a8e782a6233d8291f19097e3eb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f515f31121f3a8e782a623… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:36:03 2006 +0000 wcmd: Improve command line processing. Make the command line processing more robust by continuing to process command line options if an unknown one is detected and remove the skipping of argv[0], which is no longer necessary. This fixes the parsing when argv[0] isn't set to the program name. --- programs/wcmd/wcmdmain.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index a0fc4ec..644ebc1 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -57,7 +57,6 @@ int main (int argc, char *argv[]) HANDLE h; int opt_c, opt_k, opt_q; - argv++; opt_c=opt_k=opt_q=0; while (*argv!=NULL) { @@ -74,8 +73,6 @@ int main (int argc, char *argv[]) } else if (lstrcmpi(*argv,"/t")==0 || lstrcmpi(*argv,"/x")==0 || lstrcmpi(*argv,"/y")==0) { /* Ignored for compatibility with Windows */ - } else { - break; } argv++; }

1 0

Robert Shearman : oleaut: Implement VarBstrFromDisp.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: b3a8a3d5591a12ccffed9220d733988e56e504ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3a8a3d5591a12ccffed922… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:37:47 2006 +0000 oleaut: Implement VarBstrFromDisp. --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/vartype.c | 54 ++++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 9da60ec..ad110c7 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -111,7 +111,7 @@ 112 stdcall VarBstrFromR8(double long long ptr) 113 stdcall VarBstrFromCy(double long long ptr) 114 stdcall VarBstrFromDate(double long long ptr) -115 stub VarBstrFromDisp +115 stdcall VarBstrFromDisp(ptr long long ptr) 116 stdcall VarBstrFromBool(long long long ptr) 117 stdcall VarFormatPercent(ptr long long long long long ptr) 118 stdcall VarBoolFromUI1(long ptr) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 1214752..5c5ec0c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -110,7 +110,8 @@ static HRESULT VARIANT_NumberFromBstr(OL } /* Coerce VT_DISPATCH to another type */ -static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, VARTYPE vt) +static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, + VARTYPE vt, DWORD dwFlags) { static const DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; VARIANTARG srcVar, dstVar; @@ -127,7 +128,7 @@ static HRESULT VARIANT_FromDisp(IDispatc { /* Convert the property to the requested type */ V_VT(&dstVar) = VT_EMPTY; - hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, 0, vt); + hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, dwFlags, vt); VariantClear(&srcVar); if (SUCCEEDED(hRet)) @@ -448,7 +449,7 @@ HRESULT WINAPI VarI1FromStr(OLECHAR* str */ HRESULT WINAPI VarI1FromDisp(IDispatch* pdispIn, LCID lcid, signed char* pcOut) { - return VARIANT_FromDisp(pdispIn, lcid, pcOut, VT_I1); + return VARIANT_FromDisp(pdispIn, lcid, pcOut, VT_I1, 0); } /************************************************************************ @@ -741,7 +742,7 @@ HRESULT WINAPI VarUI1FromStr(OLECHAR* st */ HRESULT WINAPI VarUI1FromDisp(IDispatch* pdispIn, LCID lcid, BYTE* pbOut) { - return VARIANT_FromDisp(pdispIn, lcid, pbOut, VT_UI1); + return VARIANT_FromDisp(pdispIn, lcid, pbOut, VT_UI1, 0); } /************************************************************************ @@ -1042,7 +1043,7 @@ HRESULT WINAPI VarI2FromStr(OLECHAR* str */ HRESULT WINAPI VarI2FromDisp(IDispatch* pdispIn, LCID lcid, SHORT* psOut) { - return VARIANT_FromDisp(pdispIn, lcid, psOut, VT_I2); + return VARIANT_FromDisp(pdispIn, lcid, psOut, VT_I2, 0); } /************************************************************************ @@ -1356,7 +1357,7 @@ HRESULT WINAPI VarUI2FromStr(OLECHAR* st */ HRESULT WINAPI VarUI2FromDisp(IDispatch* pdispIn, LCID lcid, USHORT* pusOut) { - return VARIANT_FromDisp(pdispIn, lcid, pusOut, VT_UI2); + return VARIANT_FromDisp(pdispIn, lcid, pusOut, VT_UI2, 0); } /************************************************************************ @@ -1632,7 +1633,7 @@ HRESULT WINAPI VarI4FromStr(OLECHAR* str */ HRESULT WINAPI VarI4FromDisp(IDispatch* pdispIn, LCID lcid, LONG *piOut) { - return VARIANT_FromDisp(pdispIn, lcid, piOut, VT_I4); + return VARIANT_FromDisp(pdispIn, lcid, piOut, VT_I4, 0); } /************************************************************************ @@ -1941,7 +1942,7 @@ HRESULT WINAPI VarUI4FromStr(OLECHAR* st */ HRESULT WINAPI VarUI4FromDisp(IDispatch* pdispIn, LCID lcid, ULONG *pulOut) { - return VARIANT_FromDisp(pdispIn, lcid, pulOut, VT_UI4); + return VARIANT_FromDisp(pdispIn, lcid, pulOut, VT_UI4, 0); } /************************************************************************ @@ -2248,7 +2249,7 @@ HRESULT WINAPI VarI8FromStr(OLECHAR* str */ HRESULT WINAPI VarI8FromDisp(IDispatch* pdispIn, LCID lcid, LONG64* pi64Out) { - return VARIANT_FromDisp(pdispIn, lcid, pi64Out, VT_I8); + return VARIANT_FromDisp(pdispIn, lcid, pi64Out, VT_I8, 0); } /************************************************************************ @@ -2576,7 +2577,7 @@ HRESULT WINAPI VarUI8FromStr(OLECHAR* st */ HRESULT WINAPI VarUI8FromDisp(IDispatch* pdispIn, LCID lcid, ULONG64* pui64Out) { - return VARIANT_FromDisp(pdispIn, lcid, pui64Out, VT_UI8); + return VARIANT_FromDisp(pdispIn, lcid, pui64Out, VT_UI8, 0); } /************************************************************************ @@ -2851,7 +2852,7 @@ HRESULT WINAPI VarR4FromStr(OLECHAR* str */ HRESULT WINAPI VarR4FromDisp(IDispatch* pdispIn, LCID lcid, float *pFltOut) { - return VARIANT_FromDisp(pdispIn, lcid, pFltOut, VT_R4); + return VARIANT_FromDisp(pdispIn, lcid, pFltOut, VT_R4, 0); } /************************************************************************ @@ -3172,7 +3173,7 @@ HRESULT WINAPI VarR8FromStr(OLECHAR* str */ HRESULT WINAPI VarR8FromDisp(IDispatch* pdispIn, LCID lcid, double *pDblOut) { - return VARIANT_FromDisp(pdispIn, lcid, pDblOut, VT_R8); + return VARIANT_FromDisp(pdispIn, lcid, pDblOut, VT_R8, 0); } /************************************************************************ @@ -3594,7 +3595,7 @@ HRESULT WINAPI VarCyFromStr(OLECHAR* str */ HRESULT WINAPI VarCyFromDisp(IDispatch* pdispIn, LCID lcid, CY* pCyOut) { - return VARIANT_FromDisp(pdispIn, lcid, pCyOut, VT_CY); + return VARIANT_FromDisp(pdispIn, lcid, pCyOut, VT_CY, 0); } /************************************************************************ @@ -4265,7 +4266,7 @@ HRESULT WINAPI VarDecFromStr(OLECHAR* st */ HRESULT WINAPI VarDecFromDisp(IDispatch* pdispIn, LCID lcid, DECIMAL* pDecOut) { - return VARIANT_FromDisp(pdispIn, lcid, pDecOut, VT_DECIMAL); + return VARIANT_FromDisp(pdispIn, lcid, pDecOut, VT_DECIMAL, 0); } /************************************************************************ @@ -5806,7 +5807,7 @@ VarBoolFromStr_CheckLocalised: */ HRESULT WINAPI VarBoolFromDisp(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL *pBoolOut) { - return VARIANT_FromDisp(pdispIn, lcid, pBoolOut, VT_BOOL); + return VARIANT_FromDisp(pdispIn, lcid, pBoolOut, VT_BOOL, 0); } /************************************************************************ @@ -6544,6 +6545,27 @@ HRESULT WINAPI VarBstrFromUI8(ULONG64 ul return VARIANT_BstrFromUInt(ullIn, lcid, dwFlags, pbstrOut); } +/************************************************************************ + * VarBstrFromDisp (OLEAUT32.115) + * + * Convert a VT_DISPATCH to a BSTR. + * + * PARAMS + * pdispIn [I] Source + * lcid [I] LCID for conversion + * dwFlags [I] Flags controlling the conversion (VAR_ flags from "oleauto.h") + * pbstrOut [O] Destination + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG, if the source value is invalid + * DISP_E_TYPEMISMATCH, if the type cannot be converted + */ +HRESULT WINAPI VarBstrFromDisp(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) +{ + return VARIANT_FromDisp(pdispIn, lcid, pbstrOut, VT_BSTR, dwFlags); +} + /********************************************************************** * VarBstrCat (OLEAUT32.313) * @@ -6727,7 +6749,7 @@ HRESULT WINAPI VarDateFromR8(double dblI */ HRESULT WINAPI VarDateFromDisp(IDispatch* pdispIn, LCID lcid, DATE* pdateOut) { - return VARIANT_FromDisp(pdispIn, lcid, pdateOut, VT_DATE); + return VARIANT_FromDisp(pdispIn, lcid, pdateOut, VT_DATE, 0); } /******************************************************************************

1 0