winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
710 discussions
Start a n
N
ew thread
Michael Stefaniuc : mshtml: Print the debug string and not the pointer to it.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: e6a30efe70a784646e448ea14c62f88d19e61a30 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e6a30efe70a784646e448ea14…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:37:01 2012 +0100 mshtml: Print the debug string and not the pointer to it. --- dlls/mshtml/htmlanchor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 27d39e3..1ef7f72 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -392,7 +392,7 @@ static HRESULT WINAPI HTMLAnchorElement_get_protocol(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_put_search(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, debugstr_w(v)); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; }
1
0
0
0
Michael Stefaniuc : msxml3: Print the debug string and not the pointer to it.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: 4df6fe1246a1db0c5a176982ef037c3c31d95904 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4df6fe1246a1db0c5a176982e…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:37:36 2012 +0100 msxml3: Print the debug string and not the pointer to it. --- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/domdoc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index c6d1f8c..63265bf 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -380,7 +380,7 @@ static HRESULT WINAPI domcdata_put_text( BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - TRACE("(%p)->(%p)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); return node_put_text( &This->node, p ); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index aa0691c..6805c75 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2951,7 +2951,7 @@ static HRESULT WINAPI domdoc_getProperty( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(%p)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if (!var) return E_INVALIDARG;
1
0
0
0
Michael Stefaniuc : ieframe: Print the debug string and not the pointer to it.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: 5a5a89a3276f377c97211df6efc916cae7fb97b7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5a5a89a3276f377c97211df6e…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:36:19 2012 +0100 ieframe: Print the debug string and not the pointer to it. --- dlls/ieframe/dochost.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 9f22514..ac74c9c 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -520,8 +520,8 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, { DocHost *This = impl_from_IOleCommandTarget(iface); - TRACE("(%p)->(%s %d %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, - nCmdexecopt, debugstr_variant(pvaIn), debugstr_variant(pvaOut)); + TRACE("(%p)->(%s %d %d %s %s)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, + debugstr_variant(pvaIn), debugstr_variant(pvaOut)); if(!pguidCmdGroup) { switch(nCmdID) {
1
0
0
0
Michael Stefaniuc : gameux: Print the debug string and not the pointer to it.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: e5db5b8dfdec39cf865fde08e17f622130a54a09 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e5db5b8dfdec39cf865fde08e…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:35:35 2012 +0100 gameux: Print the debug string and not the pointer to it. --- dlls/gameux/gameexplorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index bada386..556bf36 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -683,7 +683,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { LPWSTR lpRegistryPath; LPWSTR lpGDFBinaryPath, lpGameInstallDirectory; - TRACE("(%p)\n", debugstr_guid(InstanceID)); + TRACE("(%s)\n", debugstr_guid(InstanceID)); /* first, check is game exists in CURRENT_USER scope */ installScope = GIS_CURRENT_USER;
1
0
0
0
Michael Stefaniuc : dplayx: Print the debug string and not the pointer to it.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: f454d8cd0888880fc2e5fc509e6180eb92f03dd2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f454d8cd0888880fc2e5fc509…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:34:50 2012 +0100 dplayx: Print the debug string and not the pointer to it. --- dlls/dplayx/dpclassfactory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index d14169d..c0842b0 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -128,7 +128,7 @@ static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 }; */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if ( IsEqualCLSID( riid, &IID_IClassFactory ) ) { @@ -138,6 +138,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } - ERR("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + ERR("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }
1
0
0
0
Michael Stefaniuc : d3dx9_36: Print the debug string and not the pointer to it.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: 60cf73d6faace79edd3c5c720d745ec05b486a66 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=60cf73d6faace79edd3c5c720…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:34:10 2012 +0100 d3dx9_36: Print the debug string and not the pointer to it. --- dlls/d3dx9_36/texture.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 20d8880..4fc6eff 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -673,8 +673,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, DWORD size; LPVOID buffer; - TRACE("(%p, %p, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", device, debugstr_w(srcfile), width, - height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + TRACE("(%p, %s, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", + device, debugstr_w(srcfile), width, height, miplevels, usage, format, pool, filter, + mipfilter, colorkey, srcinfo, palette, texture); if (!srcfile) return D3DERR_INVALIDCALL; @@ -710,8 +711,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileExA(LPDIRECT3DDEVICE9 device, HRESULT hr; DWORD len; - TRACE("(%p, %p, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", device, debugstr_a(srcfile), width, - height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + TRACE("(%p, %s, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", + device, debugstr_a(srcfile), width, height, miplevels, usage, format, pool, filter, + mipfilter, colorkey, srcinfo, palette, texture); if (!device || !srcfile || !texture) return D3DERR_INVALIDCALL;
1
0
0
0
Michael Stefaniuc : activeds: Print the debug string and not the pointer to it.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: 1660c39cadaf5585c47ceff9cd82d12b8db01529 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1660c39cadaf5585c47ceff9c…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:33:39 2012 +0100 activeds: Print the debug string and not the pointer to it. --- dlls/activeds/activeds_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 67066f0..c249cf1 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -116,7 +116,7 @@ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, */ HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject) { - FIXME("(%s,%s,%u,%p,%p)!stub\n", debugstr_w(lpszPathName), + FIXME("(%s,%s,%u,%s,%p)!stub\n", debugstr_w(lpszPathName), debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject); return E_NOTIMPL; }
1
0
0
0
Jacek Caban : mshtml.idl: Added IHTMLObjectElement2 declaration.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: ab51e119b52937712bb2cc4c2c9b6c4d27eed407 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ab51e119b52937712bb2cc4c2…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 12:00:18 2012 +0200 mshtml.idl: Added IHTMLObjectElement2 declaration. --- include/mshtml.idl | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index d80400e..91e853b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15851,6 +15851,36 @@ interface IHTMLObjectElement : IDispatch } /***************************************************************************** + * IHTMLObjectElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4cd-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLObjectElement2 : IDispatch +{ + [id(DISPID_IHTMLOBJECTELEMENT2_NAMEDRECORDSET)] + HRESULT namedRecordset( + [in] BSTR dataMember, + [in, optional] VARIANT *hierarchy, + [out, retval] IDispatch **ppRecordset); + + [propput, id(DISPID_IHTMLOBJECTELEMENT2_CLASSID), hidden] + HRESULT classid([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT2_CLASSID), hidden] + HRESULT classid([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT2_DATA), hidden] + HRESULT data([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT2_DATA), hidden] + HRESULT data([out, retval] BSTR *p); +} + +/***************************************************************************** * IHTMLParamElement interface */ [
1
0
0
0
Jacek Caban : vbscript: Added parameterized member assignment statement implementation.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: d0be36213a80c9257405771e8a88efe15b55b2fd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d0be36213a80c9257405771e8…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:54:54 2012 +0200 vbscript: Added parameterized member assignment statement implementation. --- dlls/vbscript/interp.c | 7 +------ dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8cfec58..67e1070 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -682,11 +682,6 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -708,7 +703,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index fd64bfc..861ec7b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1288,6 +1288,12 @@ static void run_tests(void) CHECK_CALLED(global_propargput_d); CHECK_CALLED(global_propargput_i); + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("test.propargput(counter(), counter()) = counter()"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); parse_script_a("x = _ \n3");
1
0
0
0
Jacek Caban : vbscript: Added parameterized assign member statement tests.
by Alexandre Julliard
26 Mar '12
26 Mar '12
Module: wine Branch: master Commit: 1bc8db60051bef0dc2c4e92534c34930bac11c3c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1bc8db60051bef0dc2c4e9253…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:54:38 2012 +0200 vbscript: Added parameterized assign member statement tests. --- dlls/vbscript/tests/run.c | 63 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 3fb506b..fd64bfc 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -61,6 +61,8 @@ DEFINE_EXPECT(testobj_propget_d); DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); +DEFINE_EXPECT(global_propargput_d); +DEFINE_EXPECT(global_propargput_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -72,6 +74,8 @@ DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_ISNULLDISP 1007 #define DISPID_GLOBAL_TESTDISP 1008 #define DISPID_GLOBAL_REFOBJ 1009 +#define DISPID_GLOBAL_PROPARGPUT 1010 +#define DISPID_GLOBAL_COUNTER 1011 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -80,6 +84,7 @@ static const WCHAR testW[] = {'t','e','s','t',0}; static BOOL strict_dispid_check; static const char *test_name = "(null)"; +static int test_counter; static BSTR a2bstr(const char *str) { @@ -598,6 +603,17 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_REFOBJ; return S_OK; } + if(!strcmp_wa(bstrName, "propargput")) { + CHECK_EXPECT(global_propargput_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_PROPARGPUT; + return S_OK; + } + if(!strcmp_wa(bstrName, "counter")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_COUNTER; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -717,7 +733,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); - ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); @@ -779,6 +795,43 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); test_disp(V_DISPATCH(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_PROPARGPUT: + CHECK_EXPECT(global_propargput_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 0, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 2, "V_I2(psp->rgvargs+1) = %d\n", V_I2(pdp->rgvarg+1)); + + ok(V_VT(pdp->rgvarg+2) == VT_I2, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I2(pdp->rgvarg+2) == 1, "V_I2(psp->rgvargs+2) = %d\n", V_I2(pdp->rgvarg+2)); + return S_OK; + + case DISPID_GLOBAL_COUNTER: + ok(pdp != NULL, "pdp == NULL\n"); + todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = test_counter++; + return S_OK; } ok(0, "unexpected call %d\n", id); @@ -948,6 +1001,8 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) ok(script_disp != NULL, "script_disp == NULL\n"); ok(script_disp != (IDispatch*)&Global, "script_disp == Global\n"); + test_counter = 0; + hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); IActiveScript_Close(engine); @@ -1227,6 +1282,12 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_d); CHECK_CALLED(testobj_propput_i); + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("propargput(counter(), counter()) = counter()"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); parse_script_a("x = _ \n3");
1
0
0
0
← Newer
1
...
21
22
23
24
25
26
27
...
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200