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
August 2017
----- 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
351 discussions
Start a n
N
ew thread
Nikolay Sivov : kernel32/nls: Added LOCALE_SNAN entries.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: 5afac01eecb39b70fec24af689bb0674ec19eadf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5afac01eecb39b70fec24af68…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 17 13:36:36 2017 +0300 kernel32/nls: Added LOCALE_SNAN entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/afk.nls | 1 + dlls/kernel32/nls/ara.nls | 1 + dlls/kernel32/nls/arb.nls | 1 + dlls/kernel32/nls/are.nls | 1 + dlls/kernel32/nls/arg.nls | 1 + dlls/kernel32/nls/arh.nls | 1 + dlls/kernel32/nls/ari.nls | 1 + dlls/kernel32/nls/arj.nls | 1 + dlls/kernel32/nls/ark.nls | 1 + dlls/kernel32/nls/arl.nls | 1 + dlls/kernel32/nls/arm.nls | 1 + dlls/kernel32/nls/aro.nls | 1 + dlls/kernel32/nls/arq.nls | 1 + dlls/kernel32/nls/ars.nls | 1 + dlls/kernel32/nls/art.nls | 1 + dlls/kernel32/nls/aru.nls | 1 + dlls/kernel32/nls/ary.nls | 1 + dlls/kernel32/nls/aze.nls | 1 + dlls/kernel32/nls/azl.nls | 1 + dlls/kernel32/nls/bel.nls | 1 + dlls/kernel32/nls/ben.nls | 1 + dlls/kernel32/nls/bgr.nls | 1 + dlls/kernel32/nls/brf.nls | 1 + dlls/kernel32/nls/cat.nls | 1 + dlls/kernel32/nls/chs.nls | 1 + dlls/kernel32/nls/cht.nls | 1 + dlls/kernel32/nls/cor.nls | 1 + dlls/kernel32/nls/csy.nls | 1 + dlls/kernel32/nls/cym.nls | 1 + dlls/kernel32/nls/dan.nls | 1 + dlls/kernel32/nls/dea.nls | 1 + dlls/kernel32/nls/dec.nls | 1 + dlls/kernel32/nls/del.nls | 1 + dlls/kernel32/nls/des.nls | 1 + dlls/kernel32/nls/deu.nls | 1 + dlls/kernel32/nls/div.nls | 1 + dlls/kernel32/nls/ell.nls | 1 + dlls/kernel32/nls/ena.nls | 1 + dlls/kernel32/nls/enb.nls | 1 + dlls/kernel32/nls/enc.nls | 1 + dlls/kernel32/nls/eng.nls | 1 + dlls/kernel32/nls/eni.nls | 1 + dlls/kernel32/nls/enj.nls | 1 + dlls/kernel32/nls/enl.nls | 1 + dlls/kernel32/nls/enp.nls | 1 + dlls/kernel32/nls/ens.nls | 1 + dlls/kernel32/nls/ent.nls | 1 + dlls/kernel32/nls/enu.nls | 1 + dlls/kernel32/nls/enw.nls | 1 + dlls/kernel32/nls/enz.nls | 1 + dlls/kernel32/nls/eox.nls | 1 + dlls/kernel32/nls/esa.nls | 1 + dlls/kernel32/nls/esb.nls | 1 + dlls/kernel32/nls/esc.nls | 1 + dlls/kernel32/nls/esd.nls | 1 + dlls/kernel32/nls/ese.nls | 1 + dlls/kernel32/nls/esf.nls | 1 + dlls/kernel32/nls/esg.nls | 1 + dlls/kernel32/nls/esh.nls | 1 + dlls/kernel32/nls/esi.nls | 1 + dlls/kernel32/nls/esl.nls | 1 + dlls/kernel32/nls/esm.nls | 1 + dlls/kernel32/nls/esn.nls | 1 + dlls/kernel32/nls/eso.nls | 1 + dlls/kernel32/nls/esp.nls | 1 + dlls/kernel32/nls/esr.nls | 1 + dlls/kernel32/nls/ess.nls | 1 + dlls/kernel32/nls/esu.nls | 1 + dlls/kernel32/nls/esv.nls | 1 + dlls/kernel32/nls/esy.nls | 1 + dlls/kernel32/nls/esz.nls | 1 + dlls/kernel32/nls/eti.nls | 1 + dlls/kernel32/nls/euq.nls | 1 + dlls/kernel32/nls/far.nls | 1 + dlls/kernel32/nls/fin.nls | 1 + dlls/kernel32/nls/fos.nls | 1 + dlls/kernel32/nls/fra.nls | 1 + dlls/kernel32/nls/frb.nls | 1 + dlls/kernel32/nls/frc.nls | 1 + dlls/kernel32/nls/frl.nls | 1 + dlls/kernel32/nls/frm.nls | 1 + dlls/kernel32/nls/frs.nls | 1 + dlls/kernel32/nls/gae.nls | 1 + dlls/kernel32/nls/gdh.nls | 1 + dlls/kernel32/nls/gdv.nls | 1 + dlls/kernel32/nls/glc.nls | 1 + dlls/kernel32/nls/guj.nls | 1 + dlls/kernel32/nls/heb.nls | 1 + dlls/kernel32/nls/hin.nls | 1 + dlls/kernel32/nls/hrv.nls | 1 + dlls/kernel32/nls/hun.nls | 1 + dlls/kernel32/nls/hye.nls | 1 + dlls/kernel32/nls/ind.nls | 1 + dlls/kernel32/nls/isl.nls | 1 + dlls/kernel32/nls/ita.nls | 1 + dlls/kernel32/nls/its.nls | 1 + dlls/kernel32/nls/ivl.nls | 1 + dlls/kernel32/nls/jpn.nls | 1 + dlls/kernel32/nls/kan.nls | 1 + dlls/kernel32/nls/kat.nls | 1 + dlls/kernel32/nls/kkz.nls | 1 + dlls/kernel32/nls/knk.nls | 1 + dlls/kernel32/nls/kor.nls | 1 + dlls/kernel32/nls/kyr.nls | 1 + dlls/kernel32/nls/lth.nls | 1 + dlls/kernel32/nls/lvi.nls | 1 + dlls/kernel32/nls/mar.nls | 1 + dlls/kernel32/nls/mki.nls | 1 + dlls/kernel32/nls/mon.nls | 1 + dlls/kernel32/nls/msb.nls | 1 + dlls/kernel32/nls/msl.nls | 1 + dlls/kernel32/nls/nep.nls | 1 + dlls/kernel32/nls/nlb.nls | 1 + dlls/kernel32/nls/nld.nls | 1 + dlls/kernel32/nls/nls.nls | 1 + dlls/kernel32/nls/non.nls | 1 + dlls/kernel32/nls/nor.nls | 1 + dlls/kernel32/nls/pan.nls | 1 + dlls/kernel32/nls/plk.nls | 1 + dlls/kernel32/nls/ptb.nls | 1 + dlls/kernel32/nls/ptg.nls | 1 + dlls/kernel32/nls/rmc.nls | 1 + dlls/kernel32/nls/rom.nls | 1 + dlls/kernel32/nls/rus.nls | 1 + dlls/kernel32/nls/san.nls | 1 + dlls/kernel32/nls/sky.nls | 1 + dlls/kernel32/nls/slv.nls | 1 + dlls/kernel32/nls/sqi.nls | 1 + dlls/kernel32/nls/srb.nls | 1 + dlls/kernel32/nls/srl.nls | 1 + dlls/kernel32/nls/sve.nls | 1 + dlls/kernel32/nls/svf.nls | 1 + dlls/kernel32/nls/swk.nls | 1 + dlls/kernel32/nls/syr.nls | 1 + dlls/kernel32/nls/tam.nls | 1 + dlls/kernel32/nls/tel.nls | 1 + dlls/kernel32/nls/tha.nls | 1 + dlls/kernel32/nls/trk.nls | 1 + dlls/kernel32/nls/ttt.nls | 1 + dlls/kernel32/nls/ukr.nls | 1 + dlls/kernel32/nls/urd.nls | 1 + dlls/kernel32/nls/uzb.nls | 1 + dlls/kernel32/nls/uzl.nls | 1 + dlls/kernel32/nls/vit.nls | 1 + dlls/kernel32/nls/wal.nls | 1 + dlls/kernel32/nls/zhh.nls | 1 + dlls/kernel32/nls/zhi.nls | 1 + dlls/kernel32/nls/zhm.nls | 1 + 148 files changed, 148 insertions(+) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=5afac01eecb39b70fec24…
1
0
0
0
Nikolay Sivov : bcrypt: Support BCRYPT_KEY_LENGTHS property for AES.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: a71062b95c856fbc1ebe3dc472faa54741afda37 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a71062b95c856fbc1ebe3dc47…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 17 13:36:39 2017 +0200 bcrypt: Support BCRYPT_KEY_LENGTHS property for AES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 13 +++++++++++++ dlls/bcrypt/tests/bcrypt.c | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7a93515..b631128 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -474,6 +474,19 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, return STATUS_BUFFER_TOO_SMALL; } } + if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 128; + key_lengths->dwMaxLength = 256; + key_lengths->dwIncrement = 64; + } + return STATUS_SUCCESS; + } break; default: diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 05d85d0..7ac0c11 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -700,6 +700,7 @@ static void test_rng(void) static void test_aes(void) { + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; BCRYPT_ALG_HANDLE alg; ULONG size, len; UCHAR mode[64]; @@ -733,6 +734,15 @@ static void test_aes(void) ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", mode); ok(size == 64, "got %u\n", size); + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = BCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + test_alg_name(alg, "AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); @@ -962,6 +972,7 @@ static void test_BCryptDecrypt(void) {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, 0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb, 0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4}; + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; UCHAR *buf, plaintext[48], ivbuf[16]; @@ -971,6 +982,15 @@ static void test_BCryptDecrypt(void) ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = BCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + len = 0xdeadbeef; size = sizeof(len); ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
1
0
0
0
Hans Leidekker : include: Add BCRYPT_KEY_LENGTHS_STRUCT declaration.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: ab575f3d2bddd52affbe083b9e543fb66af61ab9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ab575f3d2bddd52affbe083b9…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 17 13:36:38 2017 +0200 include: Add BCRYPT_KEY_LENGTHS_STRUCT declaration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bcrypt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 9e193da..c71b1e8 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -82,6 +82,13 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; +typedef struct __BCRYPT_KEY_LENGTHS_STRUCT +{ + ULONG dwMinLength; + ULONG dwMaxLength; + ULONG dwIncrement; +} BCRYPT_KEY_LENGTHS_STRUCT; + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE;
1
0
0
0
Andrew Eikum : gdiplus: GdipCreateMetafileFromWmfFile will also load EMFs.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: a4ab858a960800f3bc7c1ff7571c78d93196f8be URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a4ab858a960800f3bc7c1ff75…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 16 14:32:00 2017 -0500 gdiplus: GdipCreateMetafileFromWmfFile will also load EMFs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 13 ++++++++++--- dlls/gdiplus/tests/metafile.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 41355bc..0bd3033 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2361,13 +2361,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) { - HMETAFILE hmf = GetMetaFileW(file); + HMETAFILE hmf; + HENHMETAFILE emf; TRACE("(%s, %p, %p)\n", debugstr_w(file), placeable, metafile); - if(!hmf) return InvalidParameter; + hmf = GetMetaFileW(file); + if(hmf) + return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); - return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); + emf = GetEnhMetaFileW(file); + if(emf) + return GdipCreateMetafileFromEmf(emf, TRUE, metafile); + + return GenericError; } GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 1d36d9e..9770a8f 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2702,6 +2702,7 @@ static void test_fillpath(void) { static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR winetestemfW[] = {'w','i','n','e','t','e','s','t','.','e','m','f',0}; GpMetafile *metafile; GpGraphics *graphics; @@ -2745,10 +2746,26 @@ static void test_fillpath(void) expect(Ok, stat); check_emfplus(hemf, fill_path_records, "fill path"); + + /* write to disk */ + DeleteEnhMetaFile(CopyEnhMetaFileW(hemf, winetestemfW)); + DeleteEnhMetaFile(hemf); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + /* should succeed when given path to an EMF */ + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + DeleteFileW(winetestemfW); + + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(GenericError, stat); } START_TEST(metafile)
1
0
0
0
Andrew Eikum : gdiplus: Implement transform matrix for line gradient brushes.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: aac33dab2a7a3ff7e7ffd1bcbe432b8d4507d73b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aac33dab2a7a3ff7e7ffd1bcb…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 16 13:28:59 2017 -0500 gdiplus: Implement transform matrix for line gradient brushes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 127 ++++++++---- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 22 +- dlls/gdiplus/tests/brush.c | 443 +++++++++++++++++++++++++++++++++-------- include/gdiplusflat.h | 1 + 5 files changed, 450 insertions(+), 144 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=aac33dab2a7a3ff7e7ffd…
1
0
0
0
Henri Verbeet : wined3d: Explicitly check for "Radeon" and "FirePro" in wined3d_guess_card_vendor().
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: 57c0d98d11a31f85bb3265c630220508eb82af2e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=57c0d98d11a31f85bb3265c63…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:27 2017 +0200 wined3d: Explicitly check for "Radeon" and "FirePro" in wined3d_guess_card_vendor(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 919b997..e30430a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1813,6 +1813,8 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "X.Org R300 Project") || strstr(gl_renderer, "AMD") + || strstr(gl_renderer, "FirePro") + || strstr(gl_renderer, "Radeon") || strstr(gl_renderer, "R100") || strstr(gl_renderer, "R200") || strstr(gl_renderer, "R300")
1
0
0
0
Henri Verbeet : d2d1: Split overlapping bezier control triangles.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: 2187a1edb394dac7cfbb0f23b6b7d58d59c49333 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2187a1edb394dac7cfbb0f23b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:26 2017 +0200 d2d1: Split overlapping bezier control triangles. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 2 +- 2 files changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8796323..8c66881 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2641,9 +2641,138 @@ static BOOL d2d_geometry_get_next_bezier_segment_idx(struct d2d_geometry *geomet return d2d_geometry_get_bezier_segment_idx(geometry, idx, TRUE); } +static BOOL d2d_geometry_check_bezier_overlap(struct d2d_geometry *geometry, + const struct d2d_segment_idx *idx_p, const struct d2d_segment_idx *idx_q) +{ + const D2D1_POINT_2F *a[3], *b[3], *p[2], *q; + const struct d2d_figure *figure; + D2D1_POINT_2F v_q[3], v_p, v_qp; + unsigned int i, j, score; + float det, t; + + figure = &geometry->u.path.figures[idx_p->figure_idx]; + a[0] = &figure->vertices[idx_p->vertex_idx]; + a[1] = &figure->bezier_controls[idx_p->control_idx]; + if (idx_p->vertex_idx == figure->vertex_count - 1) + a[2] = &figure->vertices[0]; + else + a[2] = &figure->vertices[idx_p->vertex_idx + 1]; + + figure = &geometry->u.path.figures[idx_q->figure_idx]; + b[0] = &figure->vertices[idx_q->vertex_idx]; + b[1] = &figure->bezier_controls[idx_q->control_idx]; + if (idx_q->vertex_idx == figure->vertex_count - 1) + b[2] = &figure->vertices[0]; + else + b[2] = &figure->vertices[idx_q->vertex_idx + 1]; + + if (d2d_point_ccw(a[0], a[1], a[2]) == 0.0f || d2d_point_ccw(b[0], b[1], b[2]) == 0.0f) + return FALSE; + + d2d_point_subtract(&v_q[0], b[1], b[0]); + d2d_point_subtract(&v_q[1], b[2], b[0]); + d2d_point_subtract(&v_q[2], b[1], b[2]); + + /* Check for intersections between the edges. Strictly speaking we'd only + * need to check 8 of the 9 possible intersections, since if there's any + * intersection there has to be a second intersection as well. */ + for (i = 0; i < 3; ++i) + { + d2d_point_subtract(&v_p, a[(i & 1) + 1], a[i & 2]); + for (j = 0; j < 3; ++j) + { + det = v_p.x * v_q[j].y - v_p.y * v_q[j].x; + if (det == 0.0f) + continue; + + d2d_point_subtract(&v_qp, a[i & 2], b[j & 2]); + t = (v_q[j].x * v_qp.y - v_q[j].y * v_qp.x) / det; + if (t <= 0.0f || t >= 1.0f) + continue; + + t = (v_p.x * v_qp.y - v_p.y * v_qp.x) / det; + if (t <= 0.0f || t >= 1.0f) + continue; + + return TRUE; + } + } + + /* Check if one triangle is contained within the other. */ + for (j = 0, score = 0, q = a[1], p[0] = b[2]; j < 3; ++j) + { + p[1] = b[j]; + d2d_point_subtract(&v_p, p[1], p[0]); + d2d_point_subtract(&v_qp, q, p[0]); + + if ((q->y < p[0]->y) != (q->y < p[1]->y) && v_qp.x < v_p.x * (v_qp.y / v_p.y)) + ++score; + + p[0] = p[1]; + } + + if (score & 1) + return TRUE; + + for (j = 0, score = 0, q = b[1], p[0] = a[2]; j < 3; ++j) + { + p[1] = a[j]; + d2d_point_subtract(&v_p, p[1], p[0]); + d2d_point_subtract(&v_qp, q, p[0]); + + if ((q->y < p[0]->y) != (q->y < p[1]->y) && v_qp.x < v_p.x * (v_qp.y / v_p.y)) + ++score; + + p[0] = p[1]; + } + + return score & 1; +} + +static float d2d_geometry_bezier_ccw(struct d2d_geometry *geometry, const struct d2d_segment_idx *idx) +{ + const struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; + size_t next = idx->vertex_idx + 1; + + if (next == figure->vertex_count) + next = 0; + + return d2d_point_ccw(&figure->vertices[idx->vertex_idx], + &figure->bezier_controls[idx->control_idx], &figure->vertices[next]); +} + +static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struct d2d_segment_idx *idx) +{ + const D2D1_POINT_2F *p[3]; + struct d2d_figure *figure; + D2D1_POINT_2F q[3]; + size_t next; + + figure = &geometry->u.path.figures[idx->figure_idx]; + p[0] = &figure->vertices[idx->vertex_idx]; + p[1] = &figure->bezier_controls[idx->control_idx]; + next = idx->vertex_idx + 1; + if (next == figure->vertex_count) + next = 0; + p[2] = &figure->vertices[next]; + + d2d_point_lerp(&q[0], p[0], p[1], 0.5f); + d2d_point_lerp(&q[1], p[1], p[2], 0.5f); + d2d_point_lerp(&q[2], &q[0], &q[1], 0.5f); + + figure->bezier_controls[idx->control_idx] = q[0]; + if (!(d2d_figure_insert_bezier_control(figure, idx->control_idx + 1, &q[1]))) + return FALSE; + if (!(d2d_figure_insert_vertex(figure, idx->vertex_idx + 1, q[2]))) + return FALSE; + figure->vertex_types[idx->vertex_idx + 1] = D2D_VERTEX_TYPE_SPLIT_BEZIER; + + return TRUE; +} + static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { - struct d2d_segment_idx idx_p; + struct d2d_segment_idx idx_p, idx_q; struct d2d_bezier_vertex *b; const D2D1_POINT_2F *p[3]; struct d2d_figure *figure; @@ -2652,6 +2781,34 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) if (!d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p)) return S_OK; + /* Split overlapping bezier control triangles. */ + while (d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_p)) + { + d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_q); + while (idx_q.figure_idx < idx_p.figure_idx || idx_q.vertex_idx < idx_p.vertex_idx) + { + while (d2d_geometry_check_bezier_overlap(geometry, &idx_p, &idx_q)) + { + if (fabsf(d2d_geometry_bezier_ccw(geometry, &idx_q)) > fabsf(d2d_geometry_bezier_ccw(geometry, &idx_p))) + { + if (!d2d_geometry_split_bezier(geometry, &idx_q)) + return E_OUTOFMEMORY; + if (idx_p.figure_idx == idx_q.figure_idx) + { + ++idx_p.vertex_idx; + ++idx_p.control_idx; + } + } + else + { + if (!d2d_geometry_split_bezier(geometry, &idx_p)) + return E_OUTOFMEMORY; + } + } + d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_q); + } + } + for (i = 0; i < geometry->u.path.figure_count; ++i) { geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; @@ -2666,6 +2823,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) } bezier_idx = 0; + d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p); for (;;) { float sign = -1.0f; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ade5743..c1ca98d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5696,7 +5696,7 @@ static void test_bezier_intersect(void) "sQGRAbEBkAGyAZABsgGPAbMBjwG0AY4BtAGNAbUBjQG2AYwBtgGLAbgBigG4AYoBuQGJAboBhwG7" "AYcBvAGGAb0BhQG+AYQBvwGDAcABggHBAYIBwgGAAcMBf8QBfsYBfMgBe8gBesoBeMwBd80BddAB" "c9EBcdQBb9YBbNkBatsBaN0BZeEBYuQBX+gBW+0BVvEBUvUBTvwBR4QCQIoCOZgCK6oCGQIA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt);
1
0
0
0
Henri Verbeet : d2d1: Use segment indices in d2d_geometry_resolve_beziers( ).
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: 3895f07c4b45dae038d4d8424abc31c1030ebaf1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3895f07c4b45dae038d4d8424…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:25 2017 +0200 d2d1: Use segment indices in d2d_geometry_resolve_beziers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 105 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 34 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 537f57f..8796323 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2603,9 +2603,54 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry) geometry->u.path.figures_size = 0; } +static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx, BOOL next) +{ + if (next) + { + ++idx->vertex_idx; + ++idx->control_idx; + } + + for (; idx->figure_idx < geometry->u.path.figure_count; ++idx->figure_idx, idx->vertex_idx = idx->control_idx = 0) + { + struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; + + if (!figure->bezier_control_count) + continue; + + for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) + { + if (figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_BEZIER + || figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + return TRUE; + } + } + + return FALSE; +} + +static BOOL d2d_geometry_get_first_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx) +{ + memset(idx, 0, sizeof(*idx)); + + return d2d_geometry_get_bezier_segment_idx(geometry, idx, FALSE); +} + +static BOOL d2d_geometry_get_next_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx) +{ + return d2d_geometry_get_bezier_segment_idx(geometry, idx, TRUE); +} + static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { - size_t bezier_idx, control_idx, i, j; + struct d2d_segment_idx idx_p; + struct d2d_bezier_vertex *b; + const D2D1_POINT_2F *p[3]; + struct d2d_figure *figure; + size_t bezier_idx, i; + + if (!d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p)) + return S_OK; for (i = 0; i < geometry->u.path.figure_count; ++i) { @@ -2620,45 +2665,37 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) return E_OUTOFMEMORY; } - for (i = 0, bezier_idx = 0; i < geometry->u.path.figure_count; ++i) + bezier_idx = 0; + for (;;) { - struct d2d_figure *figure = &geometry->u.path.figures[i]; - if (figure->bezier_control_count) - { - for (j = 0, control_idx = 0; j < figure->vertex_count; ++j) - { - const D2D1_POINT_2F *p0, *p1, *p2; - struct d2d_bezier_vertex *b; - float sign = -1.0f; + float sign = -1.0f; - if (figure->vertex_types[j] != D2D_VERTEX_TYPE_BEZIER - && figure->vertex_types[j] != D2D_VERTEX_TYPE_SPLIT_BEZIER) - continue; + figure = &geometry->u.path.figures[idx_p.figure_idx]; + p[0] = &figure->vertices[idx_p.vertex_idx]; + p[1] = &figure->bezier_controls[idx_p.control_idx]; - b = &geometry->fill.bezier_vertices[bezier_idx * 3]; - p0 = &figure->vertices[j]; - p1 = &figure->bezier_controls[control_idx++]; + i = idx_p.vertex_idx + 1; + if (d2d_path_geometry_point_inside(geometry, p[1], FALSE)) + { + sign = 1.0f; + d2d_figure_insert_vertex(figure, i, *p[1]); + /* Inserting a vertex potentially invalidates p[0]. */ + p[0] = &figure->vertices[idx_p.vertex_idx]; + ++i; + } - if (d2d_path_geometry_point_inside(geometry, p1, FALSE)) - { - sign = 1.0f; - d2d_figure_insert_vertex(figure, j + 1, *p1); - /* Inserting a vertex potentially invalidates p0. */ - p0 = &figure->vertices[j]; - ++j; - } + if (i == figure->vertex_count) + i = 0; + p[2] = &figure->vertices[i]; - if (j == figure->vertex_count - 1) - p2 = &figure->vertices[0]; - else - p2 = &figure->vertices[j + 1]; + b = &geometry->fill.bezier_vertices[bezier_idx * 3]; + d2d_bezier_vertex_set(&b[0], p[0], 0.0f, 0.0f, sign); + d2d_bezier_vertex_set(&b[1], p[1], 0.5f, 0.0f, sign); + d2d_bezier_vertex_set(&b[2], p[2], 1.0f, 1.0f, sign); - d2d_bezier_vertex_set(&b[0], p0, 0.0f, 0.0f, sign); - d2d_bezier_vertex_set(&b[1], p1, 0.5f, 0.0f, sign); - d2d_bezier_vertex_set(&b[2], p2, 1.0f, 1.0f, sign); - ++bezier_idx; - } - } + if (!d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_p)) + break; + ++bezier_idx; } return S_OK;
1
0
0
0
Henri Verbeet : d2d1: Implement bezier/bezier intersections.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: 00fafb27e3f544ea5b4902c45bc746c9d56e1f05 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=00fafb27e3f544ea5b4902c45…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:24 2017 +0200 d2d1: Implement bezier/bezier intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 8 +-- 2 files changed, 137 insertions(+), 12 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=00fafb27e3f544ea5b490…
1
0
0
0
Henri Verbeet : d2d1: Implement bezier/line intersections.
by Alexandre Julliard
17 Aug '17
17 Aug '17
Module: wine Branch: master Commit: a4f23ea1488e840dfceec4036b19e6beb235cda1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a4f23ea1488e840dfceec4036…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:23 2017 +0200 d2d1: Implement bezier/line intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 264 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/d2d1/tests/d2d1.c | 2 +- 2 files changed, 243 insertions(+), 23 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4f23ea1488e840dfceec…
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
...
36
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
Results per page:
10
25
50
100
200