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
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
June 2017
----- 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
595 discussions
Start a n
N
ew thread
Vincent Povirk : gdiplus: Set flatness more appropriately in GdipDrawPath.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: 6ec3cd9434488ba5bc0fd271a47b7d46827477c5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6ec3cd9434488ba5bc0fd271a…
Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 29 13:41:05 2017 -0500 gdiplus: Set flatness more appropriately in GdipDrawPath. If the path is going to be scaled before rendering, 1.0 does not make sense as an error value. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 815ffb0..a6df52c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3715,6 +3715,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * GpStatus stat; GpPath *wide_path; GpMatrix *transform=NULL; + REAL flatness=1.0; /* Check if the final pen thickness in pixels is too thin. */ if (pen->unit == UnitPixel) @@ -3756,9 +3757,24 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * stat = get_graphics_transform(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, transform); } + else + { + /* Set flatness based on the final coordinate space */ + GpMatrix t; + + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, &t); + + if (stat != Ok) + return stat; + + flatness = 1.0/sqrt(fmax( + t.matrix[0] * t.matrix[0] + t.matrix[1] * t.matrix[1], + t.matrix[2] * t.matrix[2] + t.matrix[3] * t.matrix[3])); + } if (stat == Ok) - stat = GdipWidenPath(wide_path, pen, transform, 1.0); + stat = GdipWidenPath(wide_path, pen, transform, flatness); if (pen->unit == UnitPixel) {
1
0
0
0
Dmitry Timoshkov : windowscodecs: Fix a memory leak.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: 2eeef78e8d9a8b3cd4b1272e5bce05d7c27d5f6a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2eeef78e8d9a8b3cd4b1272e5…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 29 12:03:59 2017 +0800 windowscodecs: Fix a memory leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 473836f..e338848 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -212,7 +212,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc hr = get_token(&next_elem, id, schema, idx); if (hr != S_OK) { - TRACE("parse_elem error %#x\n", hr); + TRACE("get_token error %#x\n", hr); return hr; } elem->len = (end - start) + next_elem.len; @@ -248,7 +248,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc if (*end == '\\') end++; *bstr++ = *end++; } - if (!*end || *end != '}') + if (*end != '}') { PropVariantClear(&next_token); return WINCODEC_ERR_INVALIDQUERYREQUEST; @@ -260,7 +260,11 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc { id->vt = VT_CLSID; id->u.puuid = CoTaskMemAlloc(sizeof(GUID)); - if (!id->u.puuid) return E_OUTOFMEMORY; + if (!id->u.puuid) + { + PropVariantClear(&next_token); + return E_OUTOFMEMORY; + } hr = UuidFromStringW(next_token.u.bstrVal, id->u.puuid); }
1
0
0
0
Huw Davies : winemac: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: 97546cfbb7abc63fe75048f82da5a63cdba3d9cf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=97546cfbb7abc63fe75048f82…
Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:37 2017 +0100 winemac: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index bdd623d..2e24405 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1837,7 +1837,7 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; - RECT rect; + RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; @@ -1899,11 +1899,13 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * surface->funcs->unlock(surface); PatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); } + src_rect = rect; + if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); + DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + if (!(ret = GdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, blend))) goto done;
1
0
0
0
Hugh McMaster : regedit/tests: Correct out of sequence test numbering.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: 817cd2ac593a8d9c2ce65bf8a4c59e2159421d3d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=817cd2ac593a8d9c2ce65bf8a…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 29 13:32:43 2017 +0000 regedit/tests: Correct out of sequence test numbering. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 968b09b..4eaaeb3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1032,8 +1032,8 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine62b\"=hex(7):4c,69,6e,65,20\\"); - verify_reg_nonexist(hkey, "Wine62b"); + "\"Wine31\"=hex(7):4c,69,6e,65,20\\"); + verify_reg_nonexist(hkey, "Wine31"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
1
0
0
0
Hugh McMaster : regedit/tests: Test comma placement when parsing hex data.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: a905b4d6ba4ac81e3d41f419b0c683d8dd108c4e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a905b4d6ba4ac81e3d41f419b…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 29 13:32:35 2017 +0000 regedit/tests: Test comma placement when parsing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index fec6e3e..968b09b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1035,6 +1035,15 @@ static void test_invalid_import(void) "\"Wine62b\"=hex(7):4c,69,6e,65,20\\"); verify_reg_nonexist(hkey, "Wine62b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine32a\"=hex(7):4c,69,6e,65,20,\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine32b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Wine32a"); + verify_reg_nonexist(hkey, "Wine32b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
1
0
0
0
Hugh McMaster : reg/tests: Test comma placement when parsing hex data.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: 60c0372223f419650e1e6fcf7d2156a23fcebcfd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=60c0372223f419650e1e6fcf7…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 29 13:32:26 2017 +0000 reg/tests: Test comma placement when parsing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8d9dbfa..9a974b4 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2089,6 +2089,16 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine62b"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine63a\"=hex(7):4c,69,6e,65,20,\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine63b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine63a"); + todo_wine verify_reg_nonexist(hkey, "Wine63b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3363,6 +3373,22 @@ static void test_unicode_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine62b"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine63a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " ,63,00,6f,00,6e,00,\\\n" + " 63,00,61,00,74,00,\\\n" + " 65,00,6e,00,\\\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine63b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,,00,6f,00,6e,00,\\\n" + " 63,00,61,00,74,00,\\\n" + " 65,00,6e,00,\\\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine63a"); + todo_wine verify_reg_nonexist(hkey, "Wine63b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);
1
0
0
0
Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: ecfe83265abebc945b184820f9dcf6438bfb534a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ecfe83265abebc945b184820f…
Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 29 17:04:42 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 281 +++++++++++++++++++++++---------------------------------------- 1 file changed, 100 insertions(+), 181 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecfe83265abebc945b184…
1
0
0
0
Hans Leidekker : webservices: Handle text records with implicit end element.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: 28dd2e11d4837bbb9ec9abdd160540eb6f0d34e4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=28dd2e11d4837bbb9ec9abdd1…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:05 2017 +0200 webservices: Handle text records with implicit end element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 11 +++++++---- dlls/webservices/webservices_private.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index aec0d37..1024c85 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2171,6 +2171,7 @@ static HRESULT read_text_bin( struct reader *reader ) } } + if (type & 1) node->flags |= NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT; read_insert_node( reader, parent, node ); reader->state = READER_STATE_TEXT; reader->text_conv_offset = 0; @@ -2349,9 +2350,11 @@ static HRESULT read_endelement_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; - if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; - + if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT)) + { + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; + } if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; reader->current = LIST_ENTRY( list_tail( &parent->children ), struct node, entry ); @@ -2559,7 +2562,7 @@ static HRESULT read_node_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT) + if (reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT) { reader->current = LIST_ENTRY( list_tail( &reader->current->parent->children ), struct node, entry ); reader->last = reader->current; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 4894223..1938587 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -81,6 +81,7 @@ HRESULT read_output_params( WS_XML_READER *, WS_HEAP *, const WS_ELEMENT_DESCRIP enum node_flag { NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT = 0x1, + NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT = 0x2, }; struct node
1
0
0
0
Hans Leidekker : webservices: Fix the empty text case for a couple of data types.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: d29c0e2bdffb704cf6c8339b8ddcca6c7e21ad5f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d29c0e2bdffb704cf6c8339b8…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:04 2017 +0200 webservices: Fix the empty text case for a couple of data types. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 130 ++++++++--------- dlls/webservices/tests/reader.c | 307 ++++++++++++++++++++++++++++++++++------ 2 files changed, 330 insertions(+), 107 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=d29c0e2bdffb704cf6c83…
1
0
0
0
Hans Leidekker : webservices/tests: Add more dictionary tests.
by Alexandre Julliard
29 Jun '17
29 Jun '17
Module: wine Branch: master Commit: 5a0b3ff301af0417f5c49310a90d5acdb089d4d4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5a0b3ff301af0417f5c49310a…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:03 2017 +0200 webservices/tests: Add more dictionary tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 57 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index cf8ab61..0a8d753 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3666,6 +3666,11 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo *found = TRUE; break; + case 'z': + *id = 3; + *found = TRUE; + break; + case 'v': *found = FALSE; return WS_E_OTHER; @@ -3693,6 +3698,12 @@ static void test_dictionary(void) {0x40,0x01,0x75,0x0a,0x05,0x01}; static const char res7[] = {0x40,0x01,0x76,0x0a,0x05,0x01}; + static const char res8[] = + {0x42,0x03,0x0a,0x05,0x01}; + static const char res9[] = + {0x42,0x07,0x0a,0x05,0x01}; + static const char res10[] = + {0x42,0xd6,0x03,0x0a,0x05,0x01}; static const char res100[] = {0x42,0x06,0x06,0x06,0x98,0x00,0x01}; static const char res101[] = @@ -3703,7 +3714,7 @@ static void test_dictionary(void) WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; WS_XML_STRING prefix, localname, ns, strings[6]; const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; - WS_XML_DICTIONARY dict; + WS_XML_DICTIONARY dict, *dict_builtin; WS_XML_WRITER *writer; HRESULT hr; ULONG i, call_count; @@ -3851,6 +3862,50 @@ static void test_dictionary(void) ok( call_count == 2, "got %u\n", call_count ); check_output_bin( writer, res7, sizeof(res7), __LINE__ ); + /* dictionary and callback */ + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict_builtin, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + bin.staticDictionary = dict_builtin; + + /* string in dictionary, no string dictionary set */ + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + init_xmlstring( "t", &localname ); + init_xmlstring( "ns", &ns ); + call_count = 0; + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( call_count == 2, "got %u\n", call_count ); + check_output_bin( writer, res8, sizeof(res8), __LINE__ ); + + /* string not in dictionary, no string dictionary set */ + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + init_xmlstring( "z", &localname ); + init_xmlstring( "ns", &ns ); + call_count = 0; + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( call_count == 2, "got %u\n", call_count ); + check_output_bin( writer, res9, sizeof(res9), __LINE__ ); + + /* string in dictionary, string dictionary set */ + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + init_xmlstring_dict( dict_builtin, 235, &localname ); + init_xmlstring( "ns", &ns ); + call_count = 0; + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( call_count == 1, "got %u\n", call_count ); + check_output_bin( writer, res10, sizeof(res10), __LINE__ ); + WsFreeWriter( writer ); }
1
0
0
0
← Newer
1
2
3
4
...
60
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
Results per page:
10
25
50
100
200