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
July
June
May
April
March
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 2015
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
2 participants
775 discussions
Start a n
N
ew thread
Piotr Caban : oleacc: Added AccessibleChildren tests.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: cc737bd4606be9dae0f0dd79c446dca8324f60c1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cc737bd4606be9dae0f0dd79c…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:23 2015 +0100 oleacc: Added AccessibleChildren tests. --- dlls/oleacc/tests/main.c | 351 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc737bd4606be9dae0f0d…
1
0
0
0
Piotr Caban : oleacc: Added AccessibleChildren implementation.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: 88b5b6a51ed532214541bb8e097a5eba994064c5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=88b5b6a51ed532214541bb8e0…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:09 2015 +0100 oleacc: Added AccessibleChildren implementation. --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index fa7d592..4d9c55e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -568,3 +568,50 @@ UINT WINAPI GetStateTextA(DWORD state_bit, CHAR *state_str, UINT state_str_len) return LoadStringA(oleacc_handle, state_id, tmp, sizeof(tmp)); } } + +HRESULT WINAPI AccessibleChildren(IAccessible *container, + LONG start, LONG count, VARIANT *children, LONG *children_cnt) +{ + IEnumVARIANT *ev; + LONG i, child_no; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", container, start, count, children, children_cnt); + + if(!container || !children || !children_cnt) + return E_INVALIDARG; + + for(i=0; i<count; i++) + VariantInit(children+i); + + hr = IAccessible_QueryInterface(container, &IID_IEnumVARIANT, (void**)&ev); + if(SUCCEEDED(hr)) { + hr = IEnumVARIANT_Reset(ev); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Skip(ev, start); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Next(ev, count, children, (ULONG*)children_cnt); + IEnumVARIANT_Release(ev); + return hr; + } + + hr = IAccessible_get_accChildCount(container, &child_no); + if(FAILED(hr)) + return hr; + + for(i=0; i<count && start+i+1<=child_no; i++) { + IDispatch *disp; + + V_VT(children+i) = VT_I4; + V_I4(children+i) = start+i+1; + + hr = IAccessible_get_accChild(container, children[i], &disp); + if(SUCCEEDED(hr) && disp) { + V_VT(children+i) = VT_DISPATCH; + V_DISPATCH(children+i) = disp; + } + } + + *children_cnt = i; + return i==count ? S_OK : S_FALSE; +} diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 9f3a9a0..4cff0b8 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,4 +1,4 @@ -@ stub AccessibleChildren +@ stdcall AccessibleChildren(ptr long long ptr ptr) @ stub AccessibleObjectFromEvent @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr)
1
0
0
0
Piotr Caban : oleacc: Added client IEnumVARIANT tests.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: 15e13220f18ea68df4c7621fa9ce9ae6dc704f93 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=15e13220f18ea68df4c7621fa…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:03 2015 +0100 oleacc: Added client IEnumVARIANT tests. --- dlls/oleacc/tests/main.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 0a091df..d11c344 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -384,6 +384,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; IOleWindow *ow; + IEnumVARIANT *ev; HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; @@ -391,6 +392,7 @@ static void test_default_client_accessible_object(void) POINT pt; RECT rect; LONG l, left, top, width, height; + ULONG fetched; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -432,6 +434,31 @@ static void test_default_client_accessible_object(void) ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + hr = IAccessible_QueryInterface(acc, &IID_IEnumVARIANT, (void**)&ev); + ok(hr == S_OK, "got %x\n", hr); + + hr = IEnumVARIANT_Skip(ev, 100); + ok(hr == S_FALSE, "Skip returned %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 1; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_FALSE, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(fetched == 0, "fetched = %d\n", fetched); + + hr = IEnumVARIANT_Reset(ev); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 2; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + IDispatch_Release(V_DISPATCH(&v)); + ok(fetched == 1, "fetched = %d\n", fetched); + IEnumVARIANT_Release(ev); + V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str);
1
0
0
0
Piotr Caban : oleacc: Added client IEnumVARIANT::{Reset, Skip, Next} implementation.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: 8c4a3f9fac5559e1ecd509c700cfd34bc79bacf2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8c4a3f9fac5559e1ecd509c70…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 13:19:59 2015 +0100 oleacc: Added client IEnumVARIANT::{Reset,Skip,Next} implementation. --- dlls/oleacc/client.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 9409990..ddaa89d 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -33,6 +33,7 @@ typedef struct { LONG ref; HWND hwnd; + HWND enum_pos; } Client; static inline Client* impl_from_Client(IAccessible *iface) @@ -526,22 +527,82 @@ static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); - return E_NOTIMPL; + HWND cur = This->enum_pos, next; + ULONG fetched = 0; + HRESULT hr; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if(!celt) { + if(pCeltFetched) + *pCeltFetched = 0; + return S_OK; + } + + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + + while(next) { + cur = next; + + V_VT(rgVar+fetched) = VT_DISPATCH; + hr = AccessibleObjectFromWindow(cur, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(rgVar+fetched)); + if(FAILED(hr)) { + V_VT(rgVar+fetched) = VT_EMPTY; + while(fetched > 0) { + VariantClear(rgVar+fetched-1); + fetched--; + } + if(pCeltFetched) + *pCeltFetched = 0; + return hr; + } + fetched++; + if(fetched == celt) + break; + + next = GetWindow(cur, GW_HWNDNEXT); + } + + This->enum_pos = cur; + if(pCeltFetched) + *pCeltFetched = fetched; + return celt == fetched ? S_OK : S_FALSE; } static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)->(%u)\n", This, celt); - return E_NOTIMPL; + HWND next; + + TRACE("(%p)->(%u)\n", This, celt); + + while(celt) { + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + if(!next) + return S_FALSE; + + This->enum_pos = next; + celt--; + } + + return S_OK; } static HRESULT WINAPI Client_EnumVARIANT_Reset(IEnumVARIANT *iface) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->enum_pos = 0; + return S_OK; } static HRESULT WINAPI Client_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) @@ -578,6 +639,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; client->ref = 1; client->hwnd = hwnd; + client->enum_pos = 0; hres = IAccessible_QueryInterface(&client->IAccessible_iface, iid, obj); IAccessible_Release(&client->IAccessible_iface);
1
0
0
0
Piotr Caban : oleacc: Added window IEnumVARIANT stub.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: ee144b66abfc8a1b3ed81cc13f54713bf646acd2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee144b66abfc8a1b3ed81cc13…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:52 2015 +0100 oleacc: Added window IEnumVARIANT stub. --- dlls/oleacc/window.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index f8090b5..64d7167 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; } Window; @@ -49,6 +50,8 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -346,6 +349,68 @@ static const IOleWindowVtbl WindowOleWindowVtbl = { Window_OleWindow_ContextSensitiveHelp }; +static inline Window* impl_from_Window_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Window, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl WindowEnumVARIANTVtbl = { + Window_EnumVARIANT_QueryInterface, + Window_EnumVARIANT_AddRef, + Window_EnumVARIANT_Release, + Window_EnumVARIANT_Next, + Window_EnumVARIANT_Skip, + Window_EnumVARIANT_Reset, + Window_EnumVARIANT_Clone +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -360,6 +425,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) window->IAccessible_iface.lpVtbl = &WindowVtbl; window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; + window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);
1
0
0
0
Piotr Caban : oleacc: Added client IEnumVARIANT stub.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: 843f463d2eaa81b11e3e34e086b4f600de9e146e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=843f463d2eaa81b11e3e34e08…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:45 2015 +0100 oleacc: Added client IEnumVARIANT stub. --- dlls/oleacc/client.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 9456f81..9409990 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; @@ -51,6 +52,8 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -496,6 +499,68 @@ static const IOleWindowVtbl ClientOleWindowVtbl = { Client_OleWindow_ContextSensitiveHelp }; +static inline Client* impl_from_Client_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Client, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { + Client_EnumVARIANT_QueryInterface, + Client_EnumVARIANT_AddRef, + Client_EnumVARIANT_Release, + Client_EnumVARIANT_Next, + Client_EnumVARIANT_Skip, + Client_EnumVARIANT_Reset, + Client_EnumVARIANT_Clone +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -510,6 +575,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; + client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; client->ref = 1; client->hwnd = hwnd;
1
0
0
0
Piotr Caban : oleacc: Added Client_get_accChild implementation.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: 89721ba40dff31f000fc26375c8153fe9772d9ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=89721ba40dff31f000fc26375…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:39 2015 +0100 oleacc: Added Client_get_accChild implementation. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index cc7b53a..9456f81 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -144,8 +144,11 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, VARIANT varChildID, IDispatch **ppdispChild) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); + + *ppdispChild = NULL; + return E_INVALIDARG; } static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 4e92c5e..0a091df 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -421,6 +421,19 @@ static void test_default_client_accessible_object(void) V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + V_I4(&vid) = 1; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str));
1
0
0
0
Bruno Jesus : netapi32: Return an empty comment instead of NULL pointer in NetServerGetInfo.
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: ea2507f461bb8401723e7233fe65509d009d125e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ea2507f461bb8401723e7233f…
Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 21 01:18:40 2015 -0300 netapi32: Return an empty comment instead of NULL pointer in NetServerGetInfo. --- dlls/netapi32/netapi32.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f7701e3..f9bfb48 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1042,7 +1042,8 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu GetComputerNameW(computerName, &computerNameLen); computerNameLen++; /* include NULL terminator */ - size = sizeof(SERVER_INFO_101) + computerNameLen * sizeof(WCHAR); + /* Plus 1 for empty comment */ + size = sizeof(SERVER_INFO_101) + (computerNameLen + 1) * sizeof(WCHAR); ret = NetApiBufferAllocate(size, (LPVOID *)bufptr); if (ret == NERR_Success) { @@ -1060,7 +1061,9 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu info->sv101_version_minor = verInfo.dwMinorVersion; /* Use generic type as no wine equivalent of DC / Server */ info->sv101_type = SV_TYPE_NT; - info->sv101_comment = NULL; + info->sv101_comment = (LMSTR)(*bufptr + sizeof(SERVER_INFO_101) + + computerNameLen * sizeof(WCHAR)); + info->sv101_comment[0] = '\0'; } break; }
1
0
0
0
Bruno Jesus : netapi32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: 1fa2986d00c4130eb01557c034425c15edf9222a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1fa2986d00c4130eb01557c03…
Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 21 00:05:40 2015 -0300 netapi32/tests: Fix a memory leak (Valgrind). --- dlls/netapi32/tests/access.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index b71e1c8..7675cbf 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -348,6 +348,8 @@ static void run_localgroupgetinfo_tests(void) for(i=0;i<entries_read;i++) trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname)); + + pNetApiBufferFree(buffer); } START_TEST(access)
1
0
0
0
Sebastian Lackner : gdiplus: Add missing returns in initialize_decoder_wic (Coverity).
by Alexandre Julliard
23 Mar '15
23 Mar '15
Module: wine Branch: master Commit: 2af09b49a8ff66acf0d846fc4cafd19ddad2c1b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2af09b49a8ff66acf0d846fc4…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 20 22:34:49 2015 +0100 gdiplus: Add missing returns in initialize_decoder_wic (Coverity). --- dlls/gdiplus/image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8eb1419..77b9305 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3425,13 +3425,13 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB TRACE("%p,%s\n", stream, wine_dbgstr_guid(container)); hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); hr = IWICImagingFactory_CreateDecoder(factory, container, NULL, decoder); IWICImagingFactory_Release(factory); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); hr = IWICBitmapDecoder_Initialize(*decoder, stream, WICDecodeMetadataCacheOnLoad); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); return Ok; }
1
0
0
0
← Newer
1
...
22
23
24
25
26
27
28
...
78
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
72
73
74
75
76
77
78
Results per page:
10
25
50
100
200