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
May 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
428 discussions
Start a n
N
ew thread
Nikolay Sivov : riched20: Implement SetEnd().
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: f0959dc1759a8434ccab66eecd0b671693a1a96a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f0959dc1759a8434ccab66eec…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:30:06 2015 +0300 riched20: Implement SetEnd(). --- dlls/riched20/richole.c | 23 ++++++++++++-- dlls/riched20/tests/richole.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1cb47c2..4f85325 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -948,14 +948,31 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) return S_OK; } -static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim) +static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG end) { ITextRangeImpl *This = impl_from_ITextRange(me); + int len; + + TRACE("(%p)->(%d)\n", This, end); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (end == This->end) + return S_FALSE; + + if (end < This->start) { + This->start = This->end = max(0, end); + return S_OK; + } + + len = ME_GetTextLength(This->reOle->editor); + if (end > len) + This->end = len + 1; + else + This->end = end; + + return S_OK; } static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **font) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 2d46729..0af617b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -759,6 +759,76 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(end == 12, "got %d\n", end); + /* SetEnd */ + hres = ITextRange_SetStart(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* same value */ + hres = ITextRange_SetEnd(txtRge, 5); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = ITextRange_SetEnd(txtRge, 5); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + + /* negative resets to 0 */ + hres = ITextRange_SetEnd(txtRge, -1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + end = -1; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 0, "got %d\n", end); + + start = -1; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + /* greater than initial end, but less than total char count */ + hres = ITextRange_SetStart(txtRge, 3); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = ITextRange_SetEnd(txtRge, 1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 1, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 1, "got %d\n", end); + + /* more than total count */ + hres = ITextRange_SetEnd(txtRge, 50); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 1, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 13, "got %d\n", end); + + /* zero */ + hres = ITextRange_SetEnd(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 0, "got %d\n", end); + ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL);
1
0
0
0
Nikolay Sivov : riched20: Implement SetStart().
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 3a0670ed7e87d4e247060cdd822c4371c5b734ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a0670ed7e87d4e247060cdd8…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:28:41 2015 +0300 riched20: Implement SetStart(). --- dlls/riched20/richole.c | 26 ++++++++++++++++++++--- dlls/riched20/tests/richole.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 39c4bb4f..1cb47c2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -905,14 +905,34 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst) return S_OK; } -static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG cpFirst) +static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG start) { ITextRangeImpl *This = impl_from_ITextRange(me); + int len; + + TRACE("(%p)->(%d)\n", This, start); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (start == This->start) + return S_FALSE; + + if (start < 0) { + This->start = 0; + return S_OK; + } + + len = ME_GetTextLength(This->reOle->editor); + if (start > This->end) + This->end = len; + + if (start > len) + This->start = len; + else + This->start = start; + + return S_OK; } static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 6960c7a..2d46729 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -711,6 +711,54 @@ static void test_ITextRange_GetStart_GetEnd(void) hres = ITextRange_GetEnd(txtRge, &end); ok(hres == S_OK, "ITextRange_GetEnd\n"); ok(end == 12, "got wrong end value: %d\n", end); + + /* SetStart */ + hres = ITextRange_SetStart(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* same value */ + hres = ITextRange_SetStart(txtRge, 0); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + + hres = ITextRange_SetStart(txtRge, 1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* negative resets to 0 */ + hres = ITextRange_SetStart(txtRge, -1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = -1; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + /* greater than initial end, but less than total char count */ + hres = ITextRange_SetStart(txtRge, 10); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 10, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 12, "got %d\n", end); + + hres = ITextRange_SetStart(txtRge, 50); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 12, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 12, "got %d\n", end); + ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL);
1
0
0
0
Nikolay Sivov : riched20: Added stub ITextPara.
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 6d19ac5cb361e2d1b1f839fb06a6be754bde1e51 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6d19ac5cb361e2d1b1f839fb0…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:27:42 2015 +0300 riched20: Added stub ITextPara. --- dlls/riched20/richole.c | 519 +++++++++++++++++++++++++++++++++++++++++- dlls/riched20/tests/richole.c | 51 +++++ 2 files changed, 566 insertions(+), 4 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d19ac5cb361e2d1b1f83…
1
0
0
0
Nikolay Sivov : riched20: Added ITextFont stub.
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: aba1e680f2326bbfc3a6000bd0eecb139a7e4ad4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aba1e680f2326bbfc3a6000bd…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:26:33 2015 +0300 riched20: Added ITextFont stub. --- dlls/riched20/richole.c | 607 ++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/tests/richole.c | 60 +++++ 2 files changed, 648 insertions(+), 19 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=aba1e680f2326bbfc3a60…
1
0
0
0
Christian Faure : kernel32: Fix a crash in GetStringTypeW() on NULL input string.
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 9cffed782fd447445d4de21394815bf944e507f1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9cffed782fd447445d4de2139…
Author: Christian Faure <christian.faurebouvard(a)gmail.com> Date: Sat May 16 16:52:18 2015 +0300 kernel32: Fix a crash in GetStringTypeW() on NULL input string. --- dlls/kernel32/locale.c | 6 ++++++ dlls/kernel32/tests/locale.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bcdcdba..bf4ace5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2732,6 +2732,12 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ }; + if (!src) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (count == -1) count = strlenW(src) + 1; switch(type) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e2ec152..9920dfc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3582,9 +3582,26 @@ static void test_GetStringTypeW(void) static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; WORD types[20]; + BOOL ret; WCHAR ch; int i; + /* NULL src */ + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 0, NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 0, types); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 5, types); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + memset(types,0,sizeof(types)); GetStringTypeW(CT_CTYPE1, blanks, 5, types); for (i = 0; i < 5; i++)
1
0
0
0
Grazvydas Ignotas : kernel32: Don't leak an event handle on errors.
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 2e21381177c4ae5c1abb02cd8db364075f901444 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2e21381177c4ae5c1abb02cd8…
Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat May 16 22:29:42 2015 +0300 kernel32: Don't leak an event handle on errors. --- dlls/kernel32/change.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/change.c b/dlls/kernel32/change.c index f3aec8d..781ccfe 100644 --- a/dlls/kernel32/change.c +++ b/dlls/kernel32/change.c @@ -190,12 +190,14 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL return TRUE; WaitForSingleObjectEx( ov.hEvent, INFINITE, TRUE ); - CloseHandle( ov.hEvent ); if (returned) *returned = ios->Information; status = ios->u.Status; } + if (!overlapped) + CloseHandle( ov.hEvent ); + if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) );
1
0
0
0
Piotr Caban : msvcrt: Fix functions table reallocation in _onexit.
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 70bff7377dbe9bdaaac5e86c49ee45130e65e5d9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=70bff7377dbe9bdaaac5e86c4…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 15 20:44:19 2015 +0200 msvcrt: Fix functions table reallocation in _onexit. --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 0d2992d..3d79a4d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -280,7 +280,7 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) UNLOCK_EXIT; return NULL; } - memcpy (newtable, MSVCRT_atexit_table, MSVCRT_atexit_table_size); + memcpy (newtable, MSVCRT_atexit_table, MSVCRT_atexit_table_size*sizeof(void *)); MSVCRT_atexit_table_size += 32; MSVCRT_free (MSVCRT_atexit_table); MSVCRT_atexit_table = newtable;
1
0
0
0
Nikolay Sivov : quartz: Implement a trivial case of ConvertTimeFormat().
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 5120fa9090cecb705fb8cdd1e5cb81fcabfd3fa8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5120fa9090cecb705fb8cdd1e…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 19:35:25 2015 +0300 quartz: Implement a trivial case of ConvertTimeFormat(). --- dlls/quartz/filtergraph.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fcdd05b..26a4080 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2500,8 +2500,16 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL { IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - FIXME("(%p/%p)->(%p, %p, 0x%s, %p): stub !!!\n", This, iface, pTarget, - pTargetFormat, wine_dbgstr_longlong(Source), pSourceFormat); + TRACE("(%p/%p)->(%p, %s, 0x%s, %s)\n", This, iface, pTarget, + debugstr_guid(pTargetFormat), wine_dbgstr_longlong(Source), debugstr_guid(pSourceFormat)); + + if (!pSourceFormat) + pSourceFormat = &This->timeformatseek; + + if (IsEqualGUID(pTargetFormat, pSourceFormat)) + *pTarget = Source; + else + FIXME("conversion %s->%s not supported\n", debugstr_guid(pSourceFormat), debugstr_guid(pTargetFormat)); return S_OK; }
1
0
0
0
Jacek Caban : mshtml: Removed unneeded argument from ensure_nsevent_handler.
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 4686f3d761eaeeaf14cd25b394fa132043b691fa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4686f3d761eaeeaf14cd25b39…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 15 17:59:35 2015 +0200 mshtml: Removed unneeded argument from ensure_nsevent_handler. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 17 ++++++----------- dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1b72a32..e377d55 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3962,7 +3962,7 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); if(This->window) - update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target, cp); + update_doc_cp_events(This->doc_node, cp); } static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 037010e..897350f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1336,7 +1336,7 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in return TRUE; } -static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *event_target, eventid_t eid) +static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) { nsIDOMNode *nsnode = NULL; @@ -1410,7 +1410,7 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, HTMLDocumentNod data->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); - return ensure_nsevent_handler(doc, data, eid); + return ensure_nsevent_handler(doc, eid); } HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) @@ -1509,7 +1509,7 @@ HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, data->event_table[eid]->handlers[i] = disp; *res = VARIANT_TRUE; - return ensure_nsevent_handler(doc->doc_node, data, eid); + return ensure_nsevent_handler(doc->doc_node, eid); } HRESULT detach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) @@ -1557,18 +1557,13 @@ void bind_target_event(HTMLDocumentNode *doc, EventTarget *event_target, const W set_event_handler_disp(event_target, doc, eid, disp); } -void update_cp_events(HTMLInnerWindow *window, EventTarget *event_target, cp_static_data_t *cp) +void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) { - event_target_t *data; int i; - data = get_event_target_data(event_target, FALSE); - if(!data) - return; /* FIXME */ - for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_nsevent_handler(window->doc, data, i); + ensure_nsevent_handler(doc, i); } } @@ -1617,7 +1612,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) for(i=0; i < EVENTID_LAST; i++) { if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { - hres = ensure_nsevent_handler(doc, NULL, i); + hres = ensure_nsevent_handler(doc, i); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6133737..62e808f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -60,7 +60,7 @@ HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) D HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; -void update_cp_events(HTMLInnerWindow*,EventTarget*,cp_static_data_t*) DECLSPEC_HIDDEN; +void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN;
1
0
0
0
Michael Müller : wininet: Fix memory leak by not calling get_cookie_header twice.
by Alexandre Julliard
18 May '15
18 May '15
Module: wine Branch: master Commit: 81b136fe1cb19230d51e99f19d22c2c124e9aed0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=81b136fe1cb19230d51e99f19…
Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 15 19:55:13 2015 +0200 wininet: Fix memory leak by not calling get_cookie_header twice. --- dlls/wininet/http.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cd2cdcf..45183cf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4244,7 +4244,6 @@ static void HTTP_InsertCookies(http_request_t *request) if(res != ERROR_SUCCESS || !cookies) return; - get_cookie_header(request->server->name, request->path, &cookies); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); heap_free(cookies); }
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
...
43
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
Results per page:
10
25
50
100
200