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
July 2016
----- 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
680 discussions
Start a n
N
ew thread
Michael Stefaniuc : maintainers: D3dxof is a D3D helper library too.
by Alexandre Julliard
15 Jul '16
15 Jul '16
Module: wine Branch: master Commit: 919a338947510aada7069761677cdd63895db099 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=919a338947510aada70697616…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:27:32 2016 +0200 maintainers: D3dxof is a D3D helper library too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ac3f515..4a7191c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -85,6 +85,7 @@ F: dlls/d3dcompiler*/ F: dlls/d3dx10*/ F: dlls/d3dx11*/ F: dlls/d3dx9*/ +F: dlls/d3dxof/ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com>
1
0
0
0
Iván Matellanes : msvcirt: Reset the pointers on file sync in most cases.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: 5101a90bca2bd2618b488f37624af43efe17a0e0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5101a90bca2bd2618b488f376…
Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 11 11:34:56 2016 +0100 msvcirt: Reset the pointers on file sync in most cases. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 3adaf74..07aea3e 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1126,8 +1126,8 @@ int __thiscall filebuf_sync(filebuf *this) count = this->base.pptr - this->base.pbase; if (count > 0 && _write(this->fd, this->base.pbase, count) != count) return EOF; - this->base.pbase = this->base.pptr = this->base.epptr = NULL; } + this->base.pbase = this->base.pptr = this->base.epptr = NULL; /* flush input buffer */ if (this->base.egptr != NULL) { offset = this->base.egptr - this->base.gptr; @@ -1143,8 +1143,8 @@ int __thiscall filebuf_sync(filebuf *this) if (_lseek(this->fd, -offset, SEEK_CUR) < 0) return EOF; } - this->base.eback = this->base.gptr = this->base.egptr = NULL; } + this->base.eback = this->base.gptr = this->base.egptr = NULL; return 0; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3e8b548..13b8397 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1419,6 +1419,46 @@ static void test_filebuf(void) ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); ok(_tell(fb1.fd) == 0, "_tell failed\n"); + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + fb1.base.pbase = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.pbase = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); + fb1.base.eback = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.eback); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.gptr); + fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 100; + fb1.base.pbase = fb1.base.base; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fb1.base.gptr == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.egptr == fb1.base.base + 100, "wrong get base, expected %p got %p\n", fb1.base.base + 100, fb1.base.egptr); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.egptr = NULL; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.egptr == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.egptr); ret = (int) call_func1(p_filebuf_sync, &fb2); ok(ret == -1, "wrong return, expected -1 got %d\n", ret); fb3.base.eback = fb3.base.base;
1
0
0
0
Sebastian Lackner : secur32: Define missing gnutls_kx_algorithm_t constants for gnutls versions < 3.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: e6c85e8436ac889c9c0b22ade2a607cdc0e4404d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e6c85e8436ac889c9c0b22ade…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 14 13:09:39 2016 +0200 secur32: Define missing gnutls_kx_algorithm_t constants for gnutls versions < 3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7f2dbd6..da83482 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -82,6 +82,11 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #define GNUTLS_CIPHER_AES_192_CBC 92 #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 + +#define GNUTLS_KX_ANON_ECDH 11 +#define GNUTLS_KX_ECDHE_RSA 12 +#define GNUTLS_KX_ECDHE_ECDSA 13 +#define GNUTLS_KX_ECDHE_PSK 14 #endif static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) @@ -327,7 +332,7 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) } } -static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) +static ALG_ID schannel_get_kx_algid(int kx) { switch (kx) {
1
0
0
0
Piotr Caban : msi: Don' t validate platform while checking if transform is applicable.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: 92defc736e1e538320599655f614a959f71b7ae1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=92defc736e1e538320599655f…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 14 13:47:34 2016 +0200 msi: Don't validate platform while checking if transform is applicable. .Net2.0SP2 64-bit installer uses patches with INTEL platform in x64 package to update 32-bit parts of .Net. Native applies patch even if platform is unknown. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/patch.c | 12 +++--------- dlls/msi/tests/patch.c | 43 ++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index f8f3eaf..eb91e06 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -139,6 +139,9 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform wanted_flags &= 0xffff; /* mask off error condition flags */ TRACE("validation flags 0x%04x\n", wanted_flags); + /* native is not validating platform */ + wanted_flags &= ~MSITRANSFORM_VALIDATE_PLATFORM; + if (wanted_flags & ~supported_flags) { FIXME("unsupported validation flags 0x%04x\n", wanted_flags); @@ -192,15 +195,6 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform } msi_free( product_code_installed ); } - if (wanted_flags & MSITRANSFORM_VALIDATE_PLATFORM) - { - if ((p = strchrW( template, ';' ))) - { - *p = 0; - if (package->platform == parse_platform( template )) - valid_flags |= MSITRANSFORM_VALIDATE_PLATFORM; - } - } msi_free( template ); if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION) { diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 3c23656..b6e990b 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -471,16 +471,16 @@ static const char t1_data3[] = { /* SummaryInformation */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x85, 0x9f, 0xf2, 0xf9, 0x4f, 0x68, 0x10, 0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9, - 0x30, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x9f, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x08, - 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x04, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8c, 0x01, 0x00, - 0x00, 0x10, 0x00, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x00, 0xf7, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x07, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8f, 0x01, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x97, 0x01, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, @@ -492,23 +492,24 @@ static const char t1_data3[] = { /* SummaryInformation */ 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, - 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x41, 0x32, - 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, 0x45, 0x32, 0x43, - 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, 0x30, 0x39, 0x2d, - 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, 0x35, 0x46, 0x34, - 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, - 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, 0x09 + 0x00, 0x1e, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x78, 0x38, + 0x36, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x41, 0x32, 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, + 0x45, 0x32, 0x43, 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, + 0x30, 0x39, 0x2d, 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, + 0x35, 0x46, 0x34, 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, + 0x09 }; static const struct table_data table_transform1_data[] = {
1
0
0
0
Nikolay Sivov : msscript: Implement some connection point methods.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: 4058b68966e6933b83b6164140a32006a5bd8263 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4058b68966e6933b83b616414…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 14:14:28 2016 +0300 msscript: Implement some connection point methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 15 +++++++++++---- dlls/msscript.ocx/tests/msscript.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 5be53da..bc3f5c1 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1282,9 +1282,10 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, iid); + TRACE("(%p)->(%p)\n", This, iid); - return E_NOTIMPL; + *iid = *This->riid; + return S_OK; } static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, @@ -1292,9 +1293,15 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p)\n", This, container); + TRACE("(%p)->(%p)\n", This, container); - return E_NOTIMPL; + if (!container) + return E_POINTER; + + *container = &This->control->IConnectionPointContainer_iface; + IConnectionPointContainer_AddRef(*container); + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *unk_sink, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 714b075..f4e6306 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -782,10 +782,11 @@ if (hr == S_OK) static void test_connectionpoints(void) { - IConnectionPointContainer *container; + IConnectionPointContainer *container, *container2; IConnectionPoint *cp; IScriptControl *sc; HRESULT hr; + IID iid; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); @@ -799,10 +800,42 @@ static void test_connectionpoints(void) hr = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &cp); ok(hr == S_OK, "got 0x%08x\n", hr); + + if (0) /* crashes on win2k3 */ + { + hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + + hr = IConnectionPoint_GetConnectionInterface(cp, &iid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&iid, &IID_IPropertyNotifySink), "got %s\n", wine_dbgstr_guid(&iid)); + + hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container2 == container, "got %p, expected %p\n", container2, container); + IConnectionPointContainer_Release(container2); + IConnectionPoint_Release(cp); hr = IConnectionPointContainer_FindConnectionPoint(container, &DIID_DScriptControlSource, &cp); ok(hr == S_OK, "got 0x%08x\n", hr); + + if (0) /* crashes on win2k3 */ + { + hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + + hr = IConnectionPoint_GetConnectionInterface(cp, &iid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&iid, &DIID_DScriptControlSource), "got %s\n", wine_dbgstr_guid(&iid)); + + hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(container2 == container, "got %p, expected %p\n", container2, container); + IConnectionPointContainer_Release(container2); + IConnectionPoint_Release(cp); IConnectionPointContainer_Release(container);
1
0
0
0
Nikolay Sivov : mshtml: Fix a typo in a trace message.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: 3ea8a700f7d06fa55449d1463e01a6849ae6ebcb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3ea8a700f7d06fa55449d1463…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 11 23:25:24 2016 +0300 mshtml: Fix a typo in a trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 255c37f..f6eb7ea 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -140,7 +140,7 @@ static BOOL init_script_engine(ScriptHost *script_host) hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParse, (void**)&script_host->parse); if(FAILED(hres)) { - WARN("Could not get IActiveScriptHost: %08x\n", hres); + WARN("Could not get IActiveScriptParse: %08x\n", hres); return FALSE; }
1
0
0
0
Michael Stefaniuc : mshtml: Use SetRect() instead of open coding it.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: 9cec2e5936598aa9b3d9482d7a9a0e5daa5077a8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9cec2e5936598aa9b3d9482d7…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:08:52 2016 +0200 mshtml: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 7b1133d..712f7e0 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -124,10 +124,7 @@ static void update_readystate(PluginHost *host) /* FIXME: We shouldn't need this function and we should embed plugin directly in the main document */ static void get_pos_rect(PluginHost *host, RECT *ret) { - ret->top = 0; - ret->left = 0; - ret->bottom = host->rect.bottom - host->rect.top; - ret->right = host->rect.right - host->rect.left; + SetRect(ret, 0, 0, host->rect.right - host->rect.left, host->rect.bottom - host->rect.top); } static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag)
1
0
0
0
Michael Stefaniuc : taskmgr: Use SetRect() instead of open coding it.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: b11b448d7209ce8bd1b639c5c1ecefc929759110 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b11b448d7209ce8bd1b639c5c…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 13 09:52:13 2016 +0200 taskmgr: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/graphctl.c | 16 ++++------------ programs/taskmgr/taskmgr.c | 5 +---- programs/taskmgr/trayicon.c | 5 +---- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 70051eb..214cd75 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -117,10 +117,7 @@ static void GraphCtrl_Resize(TGraphCtrl* this) /* the "left" coordinate and "width" will be modified in */ /* InvalidateCtrl to be based on the width of the y axis scaling */ - this->m_rectPlot.left = 0; - this->m_rectPlot.top = -1; - this->m_rectPlot.right = this->m_rectClient.right-0; - this->m_rectPlot.bottom = this->m_rectClient.bottom-0; + SetRect(&this->m_rectPlot, 0, -1, this->m_rectClient.right, this->m_rectClient.bottom); /* set some member variables to avoid multiple function calls */ this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ @@ -340,19 +337,14 @@ static void GraphCtrl_DrawPoint(TGraphCtrl* this) if ((prevY <= this->m_rectPlot.top) || (currY <= this->m_rectPlot.top)) { RECT rc; - rc.bottom = this->m_rectPlot.top+1; - rc.left = prevX; - rc.right = currX+1; - rc.top = this->m_rectClient.top; + SetRect(&rc, prevX, this->m_rectClient.top, currX + 1, this->m_rectPlot.top + 1); FillRect(this->m_dcPlot, &rc, this->m_brushBack); } if ((prevY >= this->m_rectPlot.bottom) || (currY >= this->m_rectPlot.bottom)) { RECT rc; - rc.bottom = this->m_rectClient.bottom+1; - rc.left = prevX; - rc.right = currX+1; - rc.top = this->m_rectPlot.bottom+1; + SetRect(&rc, prevX, this->m_rectPlot.bottom + 1, currX + 1, + this->m_rectClient.bottom + 1); /* RECT rc(prevX, m_rectPlot.bottom+1, currX+1, m_rectClient.bottom+1); */ FillRect(this->m_dcPlot, &rc, this->m_brushBack); } diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 80dc81c..b280f79 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -65,10 +65,7 @@ static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) RECT rect; SetBkColor(hDC, clr); - rect.left = x; - rect.top = y; - rect.right = x + cx; - rect.bottom = y + cy; + SetRect(&rect, x, y, x + cx, y + cy); ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); } diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 636d3bd..af98474 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -90,10 +90,7 @@ static HICON TrayIcon_GetProcessorUsageIcon(void) * just having 10. */ nLinesToDraw = (ProcessorUsage + (ProcessorUsage / 10)) / 11; - rc.left = 3; - rc.top = 12 - nLinesToDraw; - rc.right = 13; - rc.bottom = 13; + SetRect(&rc, 3, 12 - nLinesToDraw, 13, 13); /* * Now draw the cpu usage
1
0
0
0
Michael Stefaniuc : taskmgr: Remove some old commented out code, mostly C++.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: 4c5e3205eee1653b153494951807e51fd9e59de5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4c5e3205eee1653b153494951…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 13 09:51:26 2016 +0200 taskmgr: Remove some old commented out code, mostly C++. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/applpage.c | 6 --- programs/taskmgr/graphctl.c | 108 -------------------------------------------- programs/taskmgr/graphctl.h | 13 ------ programs/taskmgr/perfpage.c | 24 +--------- programs/taskmgr/procpage.c | 6 --- 5 files changed, 1 insertion(+), 156 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index c7debec..e2874b5 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -49,12 +49,6 @@ static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signa static BOOL bSortAscending = TRUE; static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; -#if 0 -void SwitchToThisWindow ( -HWND hWnd, /* Handle to the window that should be activated */ -BOOL bRestore /* Restore the window if it is minimized */ -); -#endif static void ApplicationPageUpdate(void) { diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 6e83412..70051eb 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -106,21 +106,6 @@ static void GraphCtrl_Init(TGraphCtrl* this) this->m_bitmapOldPlot = NULL; } -#if 0 -TGraphCtrl::~TGraphCtrl(void) -{ - /* just to be picky restore the bitmaps for the two memory dc's */ - /* (these dc's are being destroyed so there shouldn't be any leaks) */ - if (m_bitmapOldGrid != NULL) SelectObject(m_dcGrid, m_bitmapOldGrid); - if (m_bitmapOldPlot != NULL) SelectObject(m_dcPlot, m_bitmapOldPlot); - if (m_bitmapGrid != NULL) DeleteObject(m_bitmapGrid); - if (m_bitmapPlot != NULL) DeleteObject(m_bitmapPlot); - if (m_dcGrid != NULL) DeleteDC(m_dcGrid); - if (m_dcPlot != NULL) DeleteDC(m_dcPlot); - if (m_brushBack != NULL) DeleteObject(m_brushBack); -} -#endif - static void GraphCtrl_Resize(TGraphCtrl* this) { /* NOTE: Resize automatically gets called during the setup of the control */ @@ -132,17 +117,10 @@ static void GraphCtrl_Resize(TGraphCtrl* this) /* the "left" coordinate and "width" will be modified in */ /* InvalidateCtrl to be based on the width of the y axis scaling */ -#if 0 - this->m_rectPlot.left = 20; - this->m_rectPlot.top = 10; - this->m_rectPlot.right = this->m_rectClient.right-10; - this->m_rectPlot.bottom = this->m_rectClient.bottom-25; -#else this->m_rectPlot.left = 0; this->m_rectPlot.top = -1; this->m_rectPlot.right = this->m_rectClient.right-0; this->m_rectPlot.bottom = this->m_rectClient.bottom-0; -#endif /* set some member variables to avoid multiple function calls */ this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ @@ -242,61 +220,6 @@ static void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) } } -#if 0 - /* create some fonts (horizontal and vertical) */ - /* use a height of 14 pixels and 300 weight */ - /* (these may need to be adjusted depending on the display) */ - axisFont = CreateFont (14, 0, 0, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - yUnitFont = CreateFont (14, 0, 900, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - - /* grab the horizontal font */ - oldFont = SelectObject(m_dcGrid, axisFont); - - /* y max */ - SetTextColor(m_dcGrid, m_crGridColor); - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dUpperLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.top, strTemp, _tcslen(strTemp)); - - /* y min */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_BASELINE); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dLowerLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.bottom, strTemp, _tcslen(strTemp)); - - /* x min */ - SetTextAlign(m_dcGrid, TA_LEFT|TA_TOP); - TextOut(m_dcGrid, m_rectPlot.left, m_rectPlot.bottom+4, "0", 1); - - /* x max */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%d", m_nPlotWidth/m_nShiftPixels); - TextOut(m_dcGrid, m_rectPlot.right, m_rectPlot.bottom+4, strTemp, _tcslen(strTemp)); - - /* x units */ - SetTextAlign(m_dcGrid, TA_CENTER|TA_TOP); - TextOut(m_dcGrid, (m_rectPlot.left+m_rectPlot.right)/2, - m_rectPlot.bottom+4, m_strXUnitsString, _tcslen(m_strXUnitsString)); - - /* restore the font */ - SelectObject(m_dcGrid, oldFont); - - /* y units */ - oldFont = SelectObject(m_dcGrid, yUnitFont); - SetTextAlign(m_dcGrid, TA_CENTER|TA_BASELINE); - TextOut(m_dcGrid, (m_rectClient.left+m_rectPlot.left)/2, - (m_rectPlot.bottom+m_rectPlot.top)/2, m_strYUnitsString, _tcslen(m_strYUnitsString)); - SelectObject(m_dcGrid, oldFont); -#endif /* at this point we are done filling the grid bitmap, */ /* no more drawing to this bitmap is needed until the settings are changed */ @@ -329,22 +252,6 @@ void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double dUpper, int nDec GraphCtrl_InvalidateCtrl(this); } -#if 0 -void TGraphCtrl::SetXUnits(const char* string) -{ - lstrcpynA(m_strXUnitsString, string, sizeof(m_strXUnitsString)); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} - -void TGraphCtrl::SetYUnits(const char* string) -{ - lstrcpynA(m_strYUnitsString, string, sizeof(m_strYUnitsString)); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} -#endif - void GraphCtrl_SetGridColor(TGraphCtrl* this, COLORREF color) { this->m_crGridColor = color; @@ -479,12 +386,6 @@ static void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) HBITMAP memBitmap; HBITMAP oldBitmap; /* bitmap originally found in CMemDC */ -/* RECT rcClient; */ -/* GetClientRect(hWnd, &rcClient); */ -/* FillSolidRect(dc, &rcClient, RGB(255, 0, 255)); */ -/* m_nClientWidth = rcClient.right - rcClient.left; */ -/* m_nClientHeight = rcClient.bottom - rcClient.top; */ - /* no real plotting work is performed here, */ /* just putting the existing bitmaps on the client */ @@ -509,15 +410,6 @@ static void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) DeleteDC(memDC); } -#if 0 -void TGraphCtrl::Reset(void) -{ - /* to clear the existing data (in the form of a bitmap) */ - /* simply invalidate the entire control */ - InvalidateCtrl(); -} -#endif - extern TGraphCtrl PerformancePageCpuUsageHistoryGraph; extern TGraphCtrl PerformancePageMemUsageHistoryGraph; extern HWND hPerformancePageCpuUsageHistoryGraph; diff --git a/programs/taskmgr/graphctl.h b/programs/taskmgr/graphctl.h index 2adb494..f9fb967 100644 --- a/programs/taskmgr/graphctl.h +++ b/programs/taskmgr/graphctl.h @@ -30,19 +30,6 @@ extern "C" { #endif -#if 0 - -/* Attributes */ -public: - void SetXUnits(const char* string); - void SetYUnits(const char* string); - - /* Operations */ -public: - BOOL Create(DWORD dwStyle, const RECT& rect, HWND hParentWnd, UINT nID=NULL); - -#endif - typedef struct { int m_nShiftPixels; /* amount to shift with each new point */ diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 5276de7..3969ce4 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -273,9 +273,6 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) int nXDifference; int nYDifference; -/* HDC hdc; */ -/* PAINTSTRUCT ps; */ - switch (message) { case WM_INITDIALOG: @@ -324,11 +321,6 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); /* customize the control */ GraphCtrl_SetRange(&PerformancePageCpuUsageHistoryGraph, 0.0, 100.0, 10); -/* PerformancePageCpuUsageHistoryGraph.SetYUnits("Current") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetXUnits("Samples (Windows Timer: 100 msec)") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetBackgroundColor(RGB(0, 0, 64)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetGridColor(RGB(192, 192, 255)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; */ GraphCtrl_SetBackgroundColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 0, 0)) ; GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(152, 205, 152)) ; GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(255, 0, 0)) ; @@ -356,21 +348,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_COMMAND: break; -#if 0 - case WM_NCPAINT: - hdc = GetDC(hDlg); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - ReleaseDC(hDlg, hdc); - break; - - case WM_PAINT: - hdc = BeginPaint(hDlg, &ps); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - EndPaint(hDlg, &ps); - break; -#endif + case WM_SIZE: do { int cx, cy; diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 1b0aacd..beccd86 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -166,12 +166,6 @@ static void ProcessPageOnNotify(LPARAM lParam) { switch (pnmh->code) { -#if 0 - case LVN_ITEMCHANGED: - ProcessPageUpdate(); - break; -#endif - case LVN_GETDISPINFOW: if (!(pnmdi->item.mask & LVIF_TEXT))
1
0
0
0
Michael Müller : ntdll: Use sysinfo to report correct number of physical pages.
by Alexandre Julliard
14 Jul '16
14 Jul '16
Module: wine Branch: master Commit: d0832cdf428696e2c08b1aa27382baad4d1e376f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d0832cdf428696e2c08b1aa27…
Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 8 05:40:22 2016 +0200 ntdll: Use sysinfo to report correct number of physical pages. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/virtual.c | 14 ++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 19 insertions(+) diff --git a/configure b/configure index 944ff6b..ce49aed 100755 --- a/configure +++ b/configure @@ -6809,6 +6809,7 @@ for ac_header in \ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/configure.ac b/configure.ac index 6e960a1..019d549 100644 --- a/configure.ac +++ b/configure.ac @@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5c43d26..2e63b78 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -38,6 +38,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_SYSINFO_H +# include <sys/sysinfo.h> +#endif #ifdef HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif @@ -1356,11 +1359,22 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { +#ifdef HAVE_SYS_SYSINFO_H + struct sysinfo sinfo; +#endif + info->unknown = 0; info->KeMaximumIncrement = 0; /* FIXME */ info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; +#ifdef HAVE_SYS_SYSINFO_H + if (!sysinfo(&sinfo)) + { + ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; + info->MmHighestPhysicalPage = max(1, total / page_size); + } +#endif info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; info->AllocationGranularity = get_mask(0) + 1; info->LowestUserAddress = (void *)0x10000; diff --git a/include/config.h.in b/include/config.h.in index a4a4bb4..64f56fd 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1119,6 +1119,9 @@ /* Define to 1 if you have the <sys/sysctl.h> header file. */ #undef HAVE_SYS_SYSCTL_H +/* Define to 1 if you have the <sys/sysinfo.h> header file. */ +#undef HAVE_SYS_SYSINFO_H + /* Define to 1 if you have the <sys/thr.h> header file. */ #undef HAVE_SYS_THR_H
1
0
0
0
← Newer
1
...
31
32
33
34
35
36
37
...
68
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Results per page:
10
25
50
100
200