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
October 2019
----- 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
614 discussions
Start a n
N
ew thread
Zebediah Figura : strmbase: Get rid of the unused BaseWindowImpl_GetDefaultRect() function.
by Alexandre Julliard
16 Oct '19
16 Oct '19
Module: wine Branch: master Commit: 0854f67d0936ecc09082e19e10e53a5ab455dc4f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0854f67d0936ecc09082e19e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 16:00:16 2019 -0500 strmbase: Get rid of the unused BaseWindowImpl_GetDefaultRect() function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 6 ------ include/wine/strmbase.h | 1 - 2 files changed, 7 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 7f4dd40248..a7c2201c64 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -147,12 +147,6 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) return S_OK; } -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This) -{ - static RECT defRect = {0, 0, 800, 600}; - return defRect; -} - BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam) { BaseControlWindow* pControlWindow = impl_from_BaseWindow(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index de5c875105..518db8de3f 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -391,7 +391,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This); LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width);
1
0
0
0
Piotr Caban : msvcrt/tests: Add overlapped memory move sprintf test.
by Alexandre Julliard
16 Oct '19
16 Oct '19
Module: wine Branch: master Commit: 70b3e2b0e8af02232b003e8e57edde1c0a1bf89a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=70b3e2b0e8af02232b003e8e…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 11:37:30 2019 +0200 msvcrt/tests: Add overlapped memory move sprintf test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 5e15989d1c..6f7ebde512 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -802,6 +802,11 @@ static void test_sprintf( void ) ok(r==2, "r = %d\n", r); ok(!strcmp(buffer, "\x82\xa0"), "failed: \"%s\"\n", buffer); + strcpy(buffer, " string to copy"); + r = p_sprintf(buffer, buffer+1); + ok(r==14, "r = %d\n", r); + ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); + setlocale(LC_ALL, "C"); }
1
0
0
0
Dmitry Timoshkov : wineps.drv: Don't clear DM_PAPERWIDTH | DM_PAPERLENGTH flags.
by Alexandre Julliard
16 Oct '19
16 Oct '19
Module: wine Branch: master Commit: 8d6183c832478d392ea5e9102539f76a05562cd5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8d6183c832478d392ea5e910…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 10 17:01:31 2019 +0800 wineps.drv: Don't clear DM_PAPERWIDTH | DM_PAPERLENGTH flags. dmFields should indicate that DEVMODE has dmPaperWidth and dmPaperLength set. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 173f6db7bd..c3d22cec1a 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -110,8 +110,7 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERI dm1->dmPublic.u1.s1.dmPaperSize = dm2->dmPublic.u1.s1.dmPaperSize; dm1->dmPublic.u1.s1.dmPaperWidth = paper_size_from_points( page->PaperDimension->x ); dm1->dmPublic.u1.s1.dmPaperLength = paper_size_from_points( page->PaperDimension->y ); - dm1->dmPublic.dmFields &= ~(DM_PAPERLENGTH | DM_PAPERWIDTH); - dm1->dmPublic.dmFields |= DM_PAPERSIZE; + dm1->dmPublic.dmFields |= DM_PAPERSIZE | DM_PAPERWIDTH | DM_PAPERLENGTH; TRACE("Changing page to %s %d x %d\n", page->FullName, dm1->dmPublic.u1.s1.dmPaperWidth, dm1->dmPublic.u1.s1.dmPaperLength );
1
0
0
0
Alistair Leslie-Hughes : wshom.ocx: Correct out parameter for _NewEnum.
by Alexandre Julliard
16 Oct '19
16 Oct '19
Module: wine Branch: master Commit: 46dcaa5b93f264a75b0c924eb72d86574b6fdd64 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=46dcaa5b93f264a75b0c924e…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 16 10:06:11 2019 +0000 wshom.ocx: Correct out parameter for _NewEnum. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d423856ce7..543d951ea0 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -698,7 +698,7 @@ static HRESULT WINAPI WshCollection_get_length(IWshCollection *iface, LONG *coun return E_NOTIMPL; } -static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown *Enum) +static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown **Enum) { WshCollection *This = impl_from_IWshCollection(iface); FIXME("(%p)->(%p): stub\n", This, Enum); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 039938c82b..00391d5283 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [ diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index d936721589..8d4a8f03e1 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [
1
0
0
0
Felix Hädicke : msvcrt: Use memmove() instead of memcpy() puts_clbk_str().
by Alexandre Julliard
16 Oct '19
16 Oct '19
Module: wine Branch: master Commit: 90e520b418dcedae6fbfdd56b791ba50652f2ee6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=90e520b418dcedae6fbfdd56…
Author: Felix Hädicke <felixhaedicke(a)web.de> Date: Thu Oct 10 23:39:35 2019 +0200 msvcrt: Use memmove() instead of memcpy() puts_clbk_str(). memcpy() must not be used here, because results are undefined if the memory areas overlap. This can cause problems, particularly if particular compiler optimisations are enabled. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=47918
Signed-off-by: Felix Hädicke <felixhaedicke(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/wcs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a0d75401c4..346fb5ac5d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -52,13 +52,13 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len*sizeof(APICHAR)); + memmove(out->buf, str, out->len*sizeof(APICHAR)); out->buf += out->len; out->len = 0; return -1; } - memcpy(out->buf, str, len*sizeof(APICHAR)); + memmove(out->buf, str, len*sizeof(APICHAR)); out->buf += len; out->len -= len; return len; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f84963ce2e..3e5bb512ff 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -781,13 +781,13 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len); + memmove(out->buf, str, out->len); out->buf += out->len; out->len = 0; return len; } - memcpy(out->buf, str, len); + memmove(out->buf, str, len); out->buf += len; out->len -= len; return len;
1
0
0
0
Vijay Kiran Kamuju : msvcrt: Implement %n and %t formats for strftime.
by Alexandre Julliard
16 Oct '19
16 Oct '19
Module: wine Branch: master Commit: c583c4afaaac539359fb513c3e6e010d9cd6f99d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c583c4afaaac539359fb513c…
Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Oct 11 22:35:23 2019 +0200 msvcrt: Implement %n and %t formats for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 10 ++++++++++ dlls/msvcrt/time.c | 8 ++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 7eea78367d..beba796317 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -633,11 +633,21 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%n", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%t", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%T", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 6108ad17cc..78f4602972 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1225,6 +1225,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) return 0; break; +#if _MSVCR_VER>=140 + case 'n': + str[ret++] = '\n'; + break; +#endif case 'p': if(mstm->tm_hour<0 || mstm->tm_hour>23) goto einval_error; @@ -1247,6 +1252,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; #if _MSVCR_VER>=140 + case 't': + str[ret++] = '\t'; + break; case 'T': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 0d865fdcb8..9747d8b21a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -942,6 +942,14 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%n", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "\t"), "got %s\n", bufA); } static LONG* get_failures_counter(HANDLE *map)
1
0
0
0
Francois Gouget : testbot: Increase the job retention time to 30 days.
by Alexandre Julliard
16 Oct '19
16 Oct '19
Module: tools Branch: master Commit: e4fe313b335a5d7c224b2fc2f5e6d5fd7ae4abd4 URL:
https://source.winehq.org/git/tools.git/?a=commit;h=e4fe313b335a5d7c224b2fc…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 16 14:33:32 2019 +0200 testbot: Increase the job retention time to 30 days. The patches website points to TestBot jobs so it makes sense for the retention times to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 56971b7..d59233f 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -146,7 +146,7 @@ $LDAPSearchFilter = undef; $LDAPRealNameAttribute = undef; $LDAPEMailAttribute = undef; -$JobPurgeDays = 7; +$JobPurgeDays = 30; if (!$::BuildEnv) {
1
0
0
0
Dmitry Timoshkov : wininet: Fix off by 1 error when parsing time.
by Alexandre Julliard
15 Oct '19
15 Oct '19
Module: wine Branch: master Commit: 6a976801b1117d95128b4c098be1d5e60d4eab83 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6a976801b1117d95128b4c09…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 14 12:44:13 2019 +0800 wininet: Fix off by 1 error when parsing time. This patch makes HTTP_ParseRfc1123Date() work for dates without space before "GMT". Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fc412849eb..cf156a9eb5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4375,8 +4375,7 @@ static BOOL HTTP_ParseTime(SYSTEMTIME *st, LPCWSTR *str) ERR("unexpected second in time format %s\n", debugstr_w(ptr)); return FALSE; } - ptr = nextPtr + 1; - *str = ptr; + *str = nextPtr; st->wSecond = (WORD)num; return TRUE; }
1
0
0
0
Zebediah Figura : wininet/tests: Handle ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE on newer 11.x versions.
by Alexandre Julliard
15 Oct '19
15 Oct '19
Module: wine Branch: master Commit: 1283f3807e21a380e4fb8e84de9787f0a92d3790 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1283f3807e21a380e4fb8e84…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 10:29:47 2019 -0500 wininet/tests: Handle ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE on newer 11.x versions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7889e40ea8..13b2930988 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1555,14 +1555,11 @@ static void test_InternetErrorDlg(void) /* Handle some special cases */ switch(i) { - case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: - case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: + case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: /* later 9.x versions */ + case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: /* later 9.x versions */ + case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: /* later 11.x versions */ if(res == ERROR_CANCELLED) - { - /* Some windows XP, w2k3 x64, W2K8 */ - win_skip("Skipping some tests for %d\n", i); - continue; - } + expected = ERROR_CANCELLED; break; case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: if(res != expected)
1
0
0
0
Zebediah Figura : include: Add more wininet error codes.
by Alexandre Julliard
15 Oct '19
15 Oct '19
Module: wine Branch: master Commit: 8efa72d1a325a59dd8ae7a8a9e0bb53b4217bcdb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8efa72d1a325a59dd8ae7a8a…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 10:29:46 2019 -0500 include: Add more wininet error codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wininet.h | 6 +++++- include/winineti.h | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wininet.h b/include/wininet.h index e9126de4ba..ce5aebdca8 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1463,6 +1463,8 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_SEC_CERT_ERRORS (INTERNET_ERROR_BASE + 55) #define ERROR_INTERNET_SEC_CERT_NO_REV (INTERNET_ERROR_BASE + 56) #define ERROR_INTERNET_SEC_CERT_REV_FAILED (INTERNET_ERROR_BASE + 57) +#define ERROR_HTTP_HSTS_REDIRECT_REQUIRED (INTERNET_ERROR_BASE + 60) +#define ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE (INTERNET_ERROR_BASE + 62) #define ERROR_FTP_TRANSFER_IN_PROGRESS (INTERNET_ERROR_BASE + 110) #define ERROR_FTP_DROPPED (INTERNET_ERROR_BASE + 111) #define ERROR_FTP_NO_PASSIVE_MODE (INTERNET_ERROR_BASE + 112) @@ -1501,7 +1503,9 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173) #define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174) #define ERROR_INTERNET_DECODING_FAILED (INTERNET_ERROR_BASE + 175) -#define INTERNET_ERROR_LAST ERROR_INTERNET_DECODING_FAILED +#define ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED_PROXY (INTERNET_ERROR_BASE + 187) +#define ERROR_INTERNET_SECURE_FAILURE_PROXY (INTERNET_ERROR_BASE + 188) +#define INTERNET_ERROR_LAST ERROR_INTERNET_SECURE_FAILURE_PROXY #define NORMAL_CACHE_ENTRY 0x00000001 diff --git a/include/winineti.h b/include/winineti.h index 5e38424fa3..812ff79331 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -106,6 +106,17 @@ typedef enum { #define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 #define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 +#define ERROR_INTERNET_NO_NEW_CONTAINERS (INTERNET_ERROR_BASE + 51) +#define ERROR_INTERNET_SOURCE_PORT_IN_USE (INTERNET_ERROR_BASE + 58) +#define ERROR_INTERNET_INSECURE_FALLBACK_REQUIRED (INTERNET_ERROR_BASE + 59) +#define ERROR_INTERNET_PROXY_ALERT (INTERNET_ERROR_BASE + 61) +#define ERROR_INTERNET_NO_CM_CONNECTION (INTERNET_ERROR_BASE + 80) +#define ERROR_HTTP_PUSH_STATUS_CODE_NOT_SUPPORTED (INTERNET_ERROR_BASE + 147) +#define ERROR_HTTP_PUSH_RETRY_NOT_SUPPORTED (INTERNET_ERROR_BASE + 148) +#define ERROR_HTTP_PUSH_ENABLE_FAILED (INTERNET_ERROR_BASE + 149) + +#define ERROR_INTERNET_OFFLINE ERROR_INTERNET_DISCONNECTED + #ifdef __cplusplus extern "C" { #endif
1
0
0
0
← Newer
1
...
37
38
39
40
41
42
43
...
62
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
Results per page:
10
25
50
100
200