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
April 2020
----- 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
1016 discussions
Start a n
N
ew thread
Alexandre Julliard : vbscript: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: 6d2df2328f745e20e09f0a5588be09246b9c7837 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6d2df2328f745e20e09f0a55…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:47 2019 +0100 vbscript: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 003a5f7c981fafe31c1b218df50259ba4131804b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 52c98fca59..704eeef83d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -80,7 +80,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start Program %union {
1
0
0
0
Alexandre Julliard : msxml3: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: 0cc00dfb4e1a92930cce4172cb519c8b0e2fce79 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0cc00dfb4e1a92930cce4172…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:39 2019 +0100 msxml3: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 096eda01cce80fe3338aa26b00dacade504c7c4c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/xslpattern.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 0cefe59168..4a2aad215c 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -70,7 +70,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons %start XSLPattern -%pure-parser +%define api.pure %parse-param {parser_param* p} %parse-param {void* scanner} %lex-param {yyscan_t* scanner}
1
0
0
0
Alexandre Julliard : msi: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: 3b50c56fd3189a0ae69e9a0404745d499241e18f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3b50c56fd3189a0ae69e9a04…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:05 2019 +0100 msi: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d977c55bb4b9c564f376c22b43c60c9be7dc782d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/sql.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 2e252be5f4..8ba6916af1 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -117,7 +117,7 @@ static void value_free( struct value val ) %lex-param { COND_input *info } %parse-param { COND_input *info } -%pure-parser +%define api.pure %union { diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 2101c680eb..2cc280c9cf 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -62,7 +62,7 @@ static struct expr * EXPR_wildcard( void *info ); %lex-param { SQL_input *info } %parse-param { SQL_input *info } -%pure-parser +%define api.pure %union {
1
0
0
0
Rémi Bernon : opencl: Define CL_TARGET_OPENCL_VERSION 220 to fix a header warning.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: 55d1a591efadc0d24f031ee06f7840f3ad832fab URL:
https://source.winehq.org/git/wine.git/?a=commit;h=55d1a591efadc0d24f031ee0…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:24 2019 +0100 opencl: Define CL_TARGET_OPENCL_VERSION 220 to fix a header warning. This is going to be the value used anyway, as we didn't specify it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 97e47fe0668add38dbcee327a4a0a26e20be4891) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 2d145bf25c..7e680ba057 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #define CL_USE_DEPRECATED_OPENCL_1_1_APIS #define CL_USE_DEPRECATED_OPENCL_1_2_APIS #define CL_USE_DEPRECATED_OPENCL_2_0_APIS +#define CL_TARGET_OPENCL_VERSION 220 #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h>
1
0
0
0
Paul Gofman : d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: 9d42b179a9c917e4e2c8504921d44c48f5682dc9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9d42b179a9c917e4e2c85049…
Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jan 14 18:18:19 2020 +0100 d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate. Manual testing shows that the backward compatible compilation is used in d3dx9 versions below 37. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=48302
Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13880f8e6a0a972382de7de04b56bd1a414bef67) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e8ce3dd796..10c75d556b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -426,6 +426,9 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile), flags, shader, error_msgs, constant_table); + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); @@ -506,6 +509,9 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO return D3DXERR_INVALIDDATA; } + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(buffer, len, filename_a, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_messages);
1
0
0
0
Ethan Lee : wined3d: Add Intel HD 615 PCI id and device description.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: fc274645cfde22d99c6fb88b8ce43b1420df3600 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=fc274645cfde22d99c6fb88b…
Author: Ethan Lee <elee(a)codeweavers.com> Date: Fri Nov 29 12:46:56 2019 -0500 wined3d: Add Intel HD 615 PCI id and device description. Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46556c2f8c0a94263e87af2d9d0ba20d54e0e2ca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a4f2eef905..21a183430c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -481,6 +481,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD620, "Intel(R) UHD Graphics 620", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD615, "Intel(R) HD Graphics 615", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db199ea513..7b6667b6e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2533,6 +2533,7 @@ enum wined3d_pci_device CARD_INTEL_IPP580_2 = 0x193d, CARD_INTEL_UHD617 = 0x87c0, CARD_INTEL_UHD620 = 0x3ea0, + CARD_INTEL_HD615 = 0x591e, CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b,
1
0
0
0
Andrew Sheldon : wined3d: Add Navi 10 PCI id and device description.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: 0355ca9e2b1aba5e2ffe8c272bdfa5f929615a0a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0355ca9e2b1aba5e2ffe8c27…
Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Mon Nov 11 18:07:12 2019 +1100 wined3d: Add Navi 10 PCI id and device description. Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit da5a80879f165e773f0c9f3d87929c9d9c6f01d7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 06677c3ba3..383873e9dd 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1633,6 +1633,8 @@ cards_intel[] = * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { + /* Navi 10 */ + {"NAVI10", CARD_AMD_RADEON_RX_NAVI_10}, /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 57e8ac4811..a4f2eef905 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -398,6 +398,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19e294fe51..db199ea513 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2315,6 +2315,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, + CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,
1
0
0
0
Patrick Hibbs : wtsapi32: Make WTSRegisterSessionNotificationEx's return consistent with WTSRegisterSessionNotification.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: 4d18a7f237fc47d347861a9254a8b8b6b59847f1 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4d18a7f237fc47d347861a92…
Author: Patrick Hibbs <hibbsncc1701(a)gmail.com> Date: Sat Dec 7 03:06:14 2019 -0500 wtsapi32: Make WTSRegisterSessionNotificationEx's return consistent with WTSRegisterSessionNotification. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=47433
Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f870aa4988fa8e980919c144682da72865364ff0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 3edf9215fd..02ca0d2723 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -303,7 +303,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) { FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); - return FALSE; + return TRUE; }
1
0
0
0
Rémi Bernon : dinput: Increase device buffer size to 1024.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: e11718fba0d4cdbebe973ef85f50c84aa43b4ba9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e11718fba0d4cdbebe973ef8…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 14 11:01:39 2020 +0100 dinput: Increase device buffer size to 1024. The buffer size was previously limited to 20 in: 8d052561724f9c8d9e7770964bfaebdd01e98e60 Testing shows that it is somewhere around 1024 on Windows, and using a smaller buffer causes some input data to be lost with high polling rate mouses. It can be spotted in Wolfenstein II: New Colossus menus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 50440e28bb1611377df841ee267c0fa7bef515cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b9e67c01d8..e170b1c123 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1396,7 +1396,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( EnterCriticalSection(&This->crit); This->buffersize = pd->dwData; - This->queue_len = min(This->buffersize, 20); + This->queue_len = min(This->buffersize, 1024); HeapFree(GetProcessHeap(), 0, This->data_queue); This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0,
1
0
0
0
Alistair Leslie-Hughes : dinput: Cap the buffer size to 20.
by Alexandre Julliard
20 Apr '20
20 Apr '20
Module: wine Branch: oldstable Commit: b37845dbcc20bb3534db63ba08b9b73d044578e2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b37845dbcc20bb3534db63ba…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 12 22:33:24 2020 +0000 dinput: Cap the buffer size to 20. When a program calls SetProperty with DIPROP_BUFFERSIZE, dinput records this value for GetProperty but only uses it when the device can support that number of buffers otherwise a max value. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=45732
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d052561724f9c8d9e7770964bfaebdd01e98e60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/device.c | 10 ++++++---- dlls/dinput/device_private.h | 3 ++- dlls/dinput/tests/device.c | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6c446163d1..b9e67c01d8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1305,7 +1305,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - pd->dwData = This->queue_len; + pd->dwData = This->buffersize; TRACE("buffersize = %d\n", pd->dwData); break; } @@ -1394,12 +1394,14 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( TRACE("buffersize = %d\n", pd->dwData); EnterCriticalSection(&This->crit); + + This->buffersize = pd->dwData; + This->queue_len = min(This->buffersize, 20); HeapFree(GetProcessHeap(), 0, This->data_queue); - This->data_queue = !pd->dwData ? NULL : HeapAlloc(GetProcessHeap(), 0, - pd->dwData * sizeof(DIDEVICEOBJECTDATA)); + This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0, + This->queue_len * sizeof(DIDEVICEOBJECTDATA)); This->queue_head = This->queue_tail = This->overflow = 0; - This->queue_len = pd->dwData; LeaveCriticalSection(&This->crit); break; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index d9e2997eaa..64bdfeb8c7 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -71,10 +71,11 @@ struct IDirectInputDeviceImpl DI_EVENT_PROC event_proc; /* function to receive mouse & keyboard events */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ - int queue_len; /* size of the queue - set in 'SetProperty' */ + int queue_len; /* valid size of the queue */ int queue_head; /* position to write new event into queue */ int queue_tail; /* next event to read from queue */ BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ + DWORD buffersize; /* size of the queue - set in 'SetProperty' */ DataFormat data_format; /* user data format and wine to user format converter */ diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index fa9b6f1436..b036be102b 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -25,6 +25,8 @@ #include "windef.h" #include "dinput.h" +#include <limits.h> + static const DIOBJECTDATAFORMAT obj_data_format[] = { { &GUID_YAxis, 16, DIDFT_OPTIONAL|DIDFT_AXIS |DIDFT_MAKEINSTANCE(1), 0}, { &GUID_Button,15, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3), 0}, @@ -106,8 +108,22 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; + dp.dwData = UINT_MAX; + + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == 0, "got %d\n", dp.dwData); + + dp.dwData = UINT_MAX; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + dp.dwData = 0; + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == UINT_MAX, "got %d\n", dp.dwData); + dp.dwData = 0; hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; @@ -166,6 +182,15 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) hr = IDirectInputDevice_Unacquire(device); ok(hr == DI_OK, "Unacquire() failed: %08x\n", hr); } + + /* Reset buffer size */ + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 0; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); } struct enum_data
1
0
0
0
← Newer
1
...
37
38
39
40
41
42
43
...
102
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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
Results per page:
10
25
50
100
200