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
December 2021
----- 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
569 discussions
Start a n
N
ew thread
Alexandre Julliard : c2man: Add support for running on an entire git checkout.
by Alexandre Julliard
20 Dec '21
20 Dec '21
Module: tools Branch: master Commit: ba6b317c028ad07db085238993166091e7578737 URL:
https://source.winehq.org/git/tools.git/?a=commit;h=ba6b317c028ad07db085238…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:53:53 2021 +0100 c2man: Add support for running on an entire git checkout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/c2man.pl b/c2man.pl index c736c84..0fe9e78 100755 --- a/c2man.pl +++ b/c2man.pl @@ -95,6 +95,12 @@ sub process_comment($); sub process_extra_comment($); +sub basedir_name($) +{ + (my $file = shift) =~ s/^dlls\/([^\/]*)\/.*/$1/; + return $file +} + # Generate the list of exported entries for the dll sub process_spec_file($) { @@ -106,6 +112,7 @@ sub process_spec_file($) my $spec_details = { + FILE => $spec_name, NAME => $basename, DLL_NAME => $dll_name, DLL_EXT => $dll_ext, @@ -229,6 +236,7 @@ sub process_source_file($) my $source_file = shift; my $source_details = { + FILE => $source_file, CONTRIBUTORS => [ ], DEBUG_CHANNEL => "", }; @@ -1080,7 +1088,7 @@ sub output_comment($) # Write out an index file for each .spec processed sub process_index_files() { - foreach my $spec_file (keys %spec_files) + foreach my $spec_file (sort keys %spec_files) { my $spec_details = $spec_files{$spec_file}[0]; if (defined ($spec_details->{DLL_NAME})) @@ -1129,7 +1137,7 @@ sub output_spec($) } $percent_implemented = int($percent_implemented); my $percent_documented = 0; - if ($spec_details->{NUM_DOCS}) + if ($spec_details->{NUM_FUNCS}) { # Treat forwards and data as documented funcs for statistics $percent_documented = $spec_details->{NUM_DOCS} / $spec_details->{NUM_FUNCS} * 100; @@ -1138,15 +1146,16 @@ sub output_spec($) # Make a list of the contributors to this DLL. my @contributors; + my $files = 0; foreach my $source_file (keys %source_files) { my $source_details = $source_files{$source_file}[0]; - for (@{$source_details->{CONTRIBUTORS}}) - { - push (@contributors, $_); - } + next unless basedir_name($source_details->{FILE}) eq basedir_name($spec_details->{FILE}); + $files++; + push @contributors, @{$source_details->{CONTRIBUTORS}}; } + return unless $files > 0; my %saw; @contributors = grep(!$saw{$_}++, @contributors); # remove dups, from perlfaq4 manpage @@ -2317,6 +2326,18 @@ while(defined($_ = shift @ARGV)) } } +unless (@opt_source_file_list) +{ + # assume we are running from a git checkout + foreach my $f (split /\0/, `git ls-files -c -z`) + { + next unless $f =~ /^dlls\//; + next if $f =~ /\/tests\//; + push @opt_spec_file_list, $f if $f =~ /\.spec$/; + push @opt_source_file_list, $f if $f =~ /\.c$/; + } +} + # Remove duplicate include directories my %htmp; @opt_header_file_list = grep(!$htmp{$_}++, @opt_header_file_list);
1
0
0
0
Alexandre Julliard : Import c2man.pl from the Wine tree.
by Alexandre Julliard
20 Dec '21
20 Dec '21
Module: tools Branch: master Commit: fcc613fc13c2174e6114d144c7c288d304672a38 URL:
https://source.winehq.org/git/tools.git/?a=commit;h=fcc613fc13c2174e6114d14…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:52:46 2021 +0100 Import c2man.pl from the Wine tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 2380 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2380 insertions(+) Diff:
https://source.winehq.org/git/tools.git/?a=commitdiff;h=fcc613fc13c2174e611…
1
0
0
0
Alexandre Julliard : Wine release 7.0-rc2
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: website Branch: master Commit: 593809230c5faa7e769affd1ee7c4357dabdbcfb URL:
https://source.winehq.org/git/website.git/?a=commit;h=593809230c5faa7e769af…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:15:13 2021 +0100 Wine release 7.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021121701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2021121701.xml b/news/en/2021121701.xml new file mode 100644 index 00000000..152adfac --- /dev/null +++ b/news/en/2021121701.xml @@ -0,0 +1,13 @@ +<news> +<date>December 17, 2021</date> +<title>Wine 7.0-rc2 Released</title> +<body> +<p> The Wine development release 7.0-rc2 is now available.</p> +<p> <a href="{$root}/announce/7.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +</p> +<p>The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>
1
0
0
0
Tag wine-7.0-rc2 : Alexandre Julliard : Release 7.0-rc2
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: wine Branch: refs/tags/wine-7.0-rc2 Tag: 4361b9ac6bb238f1088ee28719bd0b4cbb622416 URL:
https://source.winehq.org/git/wine.git/?a=tag;h=4361b9ac6bb238f1088ee28719b…
Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:13:07 2021 +0100 Release 7.0-rc2
1
0
0
0
Alexandre Julliard : Release 7.0-rc2.
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: wine Branch: master Commit: 2f5f8b4bd4cb5771223d1ee96a55002d18ad01eb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=2f5f8b4bd4cb5771223d1ee9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:13:07 2021 +0100 Release 7.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 486 ++++++++++++++++++++------------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 169 insertions(+), 338 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f5f8b4bd4cb5771223d…
1
0
0
0
Paul Gofman : ntdll: Don't set socket IO status after queuing async.
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: wine Branch: master Commit: 652dc005787c2ddc486010dffac6803e296a8d73 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=652dc005787c2ddc486010df…
Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 16 23:55:38 2021 +0300 ntdll: Don't set socket IO status after queuing async. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + dlls/ntdll/unix/socket.c | 135 +++++++++++++++++++++++++++-------------------- 2 files changed, 79 insertions(+), 57 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=652dc005787c2ddc4860…
1
0
0
0
Andrey Gusev : wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format.
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: wine Branch: master Commit: b006a4c5acbc5704210a3b2bc55ec4c6dcef31ef URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b006a4c5acbc5704210a3b2b…
Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 17 18:33:48 2021 +0200 wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format. Used by Dark Souls: Remastered. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 5 files changed, 9 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a4729f9d2d3..a1c4be46b7f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12370,6 +12370,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -13649,6 +13650,7 @@ static void test_format_support(void) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT}, + {DXGI_FORMAT_R11G11B10_FLOAT}, {DXGI_FORMAT_R16_FLOAT}, }; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 154221e405c..a76e5fa1295 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18549,6 +18549,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -20623,6 +20624,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R11G11B10_FLOAT, D3D_FEATURE_LEVEL_10_0}, {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6cc2f0cd9a8..5511a70a8ff 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -159,6 +159,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, + {"GL_ARB_vertex_type_10f_11f_11f_rev", ARB_VERTEX_TYPE_10F_11F_11F_REV}, {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, {"GL_ARB_texture_barrier", ARB_TEXTURE_BARRIER }, @@ -3385,6 +3386,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, {ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, MAKEDWORD_VERSION(4, 4)}, + {ARB_VERTEX_TYPE_10F_11F_11F_REV, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef2e28b545a..5e375f43a48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -709,6 +709,8 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, GL_SHORT}, {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R11G11B10_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_10F_11F_11F_REV, + ARB_VERTEX_TYPE_10F_11F_11F_REV}, {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, GL_UNSIGNED_SHORT}, {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2dbc56ab79d..7b6fa50c5f0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -143,6 +143,7 @@ enum wined3d_gl_extension ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, + ARB_VERTEX_TYPE_10F_11F_11F_REV, ARB_VERTEX_TYPE_2_10_10_10_REV, ARB_VIEWPORT_ARRAY, ARB_TEXTURE_BARRIER,
1
0
0
0
Eric Pouech : server/console: Ensure conhost has created the TTY input stream before waiting.
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: wine Branch: master Commit: 751a3325a6ac93d11f08088c40b45a9ae05b52de URL:
https://source.winehq.org/git/wine.git/?a=commit;h=751a3325a6ac93d11f08088c…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 17 17:18:51 2021 +0100 server/console: Ensure conhost has created the TTY input stream before waiting. Some PE executables (like mingw's gdb port) just do something like: - WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), INFINITE) and hang for ever (the read operations are done *after* the wait operation succeeds) (of course, the real wait operation is more complex, but the problematic part boils down to that) This hangs for ever because conhost's main input thread hasn't been started yet. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/server/console.c b/server/console.c index 977c428cf9f..136c14862e3 100644 --- a/server/console.c +++ b/server/console.c @@ -71,13 +71,14 @@ static struct object *console_lookup_name( struct object *obj, struct unicode_st unsigned int attr, struct object *root ); static struct object *console_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); +static int console_add_queue( struct object *obj, struct wait_queue_entry *entry ); static const struct object_ops console_ops = { sizeof(struct console), /* size */ &file_type, /* type */ console_dump, /* dump */ - add_queue, /* add_queue */ + console_add_queue, /* add_queue */ remove_queue, /* remove_queue */ console_signaled, /* signaled */ no_satisfied, /* satisfied */ @@ -129,14 +130,15 @@ struct console_host_ioctl struct console_server { - struct object obj; /* object header */ - struct fd *fd; /* pseudo-fd for ioctls */ - struct console *console; /* attached console */ - struct list queue; /* ioctl queue */ - struct list read_queue; /* blocking read queue */ - int busy; /* flag if server processing an ioctl */ - int term_fd; /* UNIX terminal fd */ - struct termios termios; /* original termios */ + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ + struct console *console; /* attached console */ + struct list queue; /* ioctl queue */ + struct list read_queue; /* blocking read queue */ + unsigned int busy : 1; /* flag if server processing an ioctl */ + unsigned int once_input : 1; /* flag if input thread has already been requested */ + int term_fd; /* UNIX terminal fd */ + struct termios termios; /* original termios */ }; static void console_server_dump( struct object *obj, int verbose ); @@ -462,6 +464,23 @@ static const struct fd_ops console_connection_fd_ops = static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); +static int queue_host_ioctl( struct console_server *server, unsigned int code, unsigned int output, + struct async *async, struct async_queue *queue ); + +static int console_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct console *console = (struct console*)obj; + assert( obj->ops == &console_ops ); + /* before waiting, ensure conhost's input thread has been started */ + if (console->server && !console->server->once_input) + { + console->server->once_input = 1; + if (console->server->term_fd == -1) + queue_host_ioctl( console->server, IOCTL_CONDRV_PEEK, 0, NULL, NULL ); + } + return add_queue( &console->obj, entry ); +} + static int console_signaled( struct object *obj, struct wait_queue_entry *entry ) { struct console *console = (struct console*)obj; @@ -889,9 +908,10 @@ static struct object *create_console_server( void ) struct console_server *server; if (!(server = alloc_object( &console_server_ops ))) return NULL; - server->console = NULL; - server->busy = 0; - server->term_fd = -1; + server->console = NULL; + server->busy = 0; + server->once_input = 0; + server->term_fd = -1; list_init( &server->queue ); list_init( &server->read_queue ); server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ); @@ -1315,7 +1335,7 @@ static int console_input_add_queue( struct object *obj, struct wait_queue_entry set_error( STATUS_ACCESS_DENIED ); return 0; } - return add_queue( ¤t->process->console->obj, entry ); + return console_add_queue( ¤t->process->console->obj, entry ); } static struct fd *console_input_get_fd( struct object *obj )
1
0
0
0
Henri Verbeet : wined3d: Release the allocator lock on error in wined3d_allocator_chunk_vk_map().
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: wine Branch: master Commit: 44cb2ba942fe930eb2a467416da86dacdb5baf41 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=44cb2ba942fe930eb2a46741…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 17 17:42:17 2021 +0100 wined3d: Release the allocator lock on error in wined3d_allocator_chunk_vk_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 06162d0c0e8..fd6d810f0e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -273,6 +273,7 @@ void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) { ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_allocator_chunk_vk_unlock(chunk_vk); return NULL; }
1
0
0
0
Bernhard Übelacker : inetmib1: Fix endianess issue with dwLocalAddr and dwLocalPort.
by Alexandre Julliard
17 Dec '21
17 Dec '21
Module: wine Branch: master Commit: 9145b551b2ebe17c1e310790db5c09da24a1beb5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9145b551b2ebe17c1e310790…
Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Thu Dec 16 11:27:19 2021 +0100 inetmib1: Fix endianess issue with dwLocalAddr and dwLocalPort. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52224
Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 6345573350e..31dc4d5e8e2 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" +#include "winsock2.h" #include "snmp.h" #include "iphlpapi.h" #include "wine/debug.h" @@ -1217,7 +1218,7 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) assert(oid && oid->idLength >= 5); row->dwLocalAddr = oidToIpAddr(oid); - row->dwLocalPort = oid->ids[4]; + row->dwLocalPort = htons(oid->ids[4]); } static int __cdecl compareUdpRow(const void *a, const void *b) @@ -1225,9 +1226,9 @@ static int __cdecl compareUdpRow(const void *a, const void *b) const MIB_UDPROW *key = a, *value = b; int ret; - ret = key->dwLocalAddr - value->dwLocalAddr; + ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); if (ret == 0) - ret = key->dwLocalPort - value->dwLocalPort; + ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); return ret; } @@ -1269,8 +1270,9 @@ static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, udpTable->table[tableIndex - 1].dwLocalAddr); if (ret) { + UINT id = ntohs(udpTable->table[tableIndex - 1].dwLocalPort); oid.idLength = 1; - oid.ids = &udpTable->table[tableIndex - 1].dwLocalPort; + oid.ids = &id; ret = SnmpUtilOidAppend(&pVarBind->name, &oid); } }
1
0
0
0
← Newer
1
...
9
10
11
12
13
14
15
...
57
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
Results per page:
10
25
50
100
200