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 2008
----- 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
3 participants
1114 discussions
Start a n
N
ew thread
Stefan Dösinger : wined3d: Move a few more odd states to the misc state table.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: de1b0a5c04e868780588e8833e0fc67a277434bc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=de1b0a5c04e868780588e8833…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 21:42:49 2008 -0500 wined3d: Move a few more odd states to the misc state table. --- dlls/wined3d/state.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4f9a5a3..f8dfd6f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3860,19 +3860,19 @@ const struct StateEntry FFPStateTable[] = { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), NULL }, - { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, + { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), NULL }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 42, undefined */ 0, state_undefined }, { /* 43, WINED3DRS_BORDERCOLOR */ STATE_RENDER(WINED3DRS_BORDERCOLOR), NULL }, { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined }, { /* 45, WINED3DRS_TEXTUREADDRESSV */ 0, /* Handled in ddraw */ state_undefined }, - { /* 46, WINED3DRS_MIPMAPLODBIAS */ STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_mipmaplodbias }, + { /* 46, WINED3DRS_MIPMAPLODBIAS */ STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), NULL }, { /* 47, WINED3DRS_ZBIAS */ STATE_RENDER(WINED3DRS_ZBIAS), NULL }, { /* 48, WINED3DRS_RANGEFOGENABLE */ STATE_RENDER(WINED3DRS_RANGEFOGENABLE), NULL }, - { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), state_anisotropy }, - { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), state_flushbatch }, - { /* 51, WINED3DRS_TRANSLUCENTSORTINDEPENDENT */ STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), state_translucentsi }, + { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), NULL }, + { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), NULL }, + { /* 51, WINED3DRS_TRANSLUCENTSORTINDEPENDENT */ STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), NULL }, { /* 52, WINED3DRS_STENCILENABLE */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /* 53, WINED3DRS_STENCILFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /* 54, WINED3DRS_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, @@ -4939,6 +4939,11 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_SUBPIXELX), { STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }}, { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }}, { STATE_RENDER(WINED3DRS_ZBIAS), { STATE_RENDER(WINED3DRS_ZBIAS), state_zbias }}, + { STATE_RENDER(WINED3DRS_STIPPLEENABLE), { STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }}, + { STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), { STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_mipmaplodbias }}, + { STATE_RENDER(WINED3DRS_ANISOTROPY), { STATE_RENDER(WINED3DRS_ANISOTROPY), state_anisotropy }}, + { STATE_RENDER(WINED3DRS_FLUSHBATCH), { STATE_RENDER(WINED3DRS_FLUSHBATCH), state_flushbatch }}, + { STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), { STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), state_translucentsi }}, {0 /* Terminate */, { 0, 0 }}, };
1
0
0
0
Stefan Dösinger : wined3d: WINED3DRS_ZBIAS -> misc states.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: e988c8bd60a820540cbfe3768c65b96d686bde63 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e988c8bd60a820540cbfe3768…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 21:25:42 2008 -0500 wined3d: WINED3DRS_ZBIAS -> misc states. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bb5b0a7..4f9a5a3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3868,7 +3868,7 @@ const struct StateEntry FFPStateTable[] = { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined }, { /* 45, WINED3DRS_TEXTUREADDRESSV */ 0, /* Handled in ddraw */ state_undefined }, { /* 46, WINED3DRS_MIPMAPLODBIAS */ STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_mipmaplodbias }, - { /* 47, WINED3DRS_ZBIAS */ STATE_RENDER(WINED3DRS_ZBIAS), state_zbias }, + { /* 47, WINED3DRS_ZBIAS */ STATE_RENDER(WINED3DRS_ZBIAS), NULL }, { /* 48, WINED3DRS_RANGEFOGENABLE */ STATE_RENDER(WINED3DRS_RANGEFOGENABLE), NULL }, { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), state_anisotropy }, { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), state_flushbatch }, @@ -4938,6 +4938,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_SUBPIXEL), { STATE_RENDER(WINED3DRS_SUBPIXEL), state_subpixel }}, { STATE_RENDER(WINED3DRS_SUBPIXELX), { STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }}, { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }}, + { STATE_RENDER(WINED3DRS_ZBIAS), { STATE_RENDER(WINED3DRS_ZBIAS), state_zbias }}, {0 /* Terminate */, { 0, 0 }}, };
1
0
0
0
Stefan Dösinger : wined3d: Move the bordercolor to the fragment states.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: 1df66c38939fc35d840f569814dadbca7d6e85b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1df66c38939fc35d840f56981…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 21:11:21 2008 -0500 wined3d: Move the bordercolor to the fragment states. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b54da6e..bb5b0a7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3864,7 +3864,7 @@ const struct StateEntry FFPStateTable[] = { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 42, undefined */ 0, state_undefined }, - { /* 43, WINED3DRS_BORDERCOLOR */ STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }, + { /* 43, WINED3DRS_BORDERCOLOR */ STATE_RENDER(WINED3DRS_BORDERCOLOR), NULL }, { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined }, { /* 45, WINED3DRS_TEXTUREADDRESSV */ 0, /* Handled in ddraw */ state_undefined }, { /* 46, WINED3DRS_MIPMAPLODBIAS */ STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_mipmaplodbias }, @@ -5415,6 +5415,7 @@ const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG), { STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }}, { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT), { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }}, { STATE_PIXELSHADER, { STATE_PIXELSHADER, pixelshader }}, + { STATE_RENDER(WINED3DRS_BORDERCOLOR), { STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }}, {0 /* Terminate */, { 0, 0 }}, };
1
0
0
0
Stefan Dösinger : wined3d: Move more fog stuff to the vertex states.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: 340272bc26aab59dca9163eefacbe9f08e93ff9e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=340272bc26aab59dca9163eef…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 21:18:52 2008 -0500 wined3d: Move more fog stuff to the vertex states. --- dlls/wined3d/state.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ea4a5c4..b54da6e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3855,11 +3855,11 @@ const struct StateEntry FFPStateTable[] = { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), NULL }, { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), NULL }, { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), NULL }, - { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, + { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), NULL }, { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, - { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, + { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), NULL }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, @@ -3869,7 +3869,7 @@ const struct StateEntry FFPStateTable[] = { /* 45, WINED3DRS_TEXTUREADDRESSV */ 0, /* Handled in ddraw */ state_undefined }, { /* 46, WINED3DRS_MIPMAPLODBIAS */ STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_mipmaplodbias }, { /* 47, WINED3DRS_ZBIAS */ STATE_RENDER(WINED3DRS_ZBIAS), state_zbias }, - { /* 48, WINED3DRS_RANGEFOGENABLE */ STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, + { /* 48, WINED3DRS_RANGEFOGENABLE */ STATE_RENDER(WINED3DRS_RANGEFOGENABLE), NULL }, { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), state_anisotropy }, { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), state_flushbatch }, { /* 51, WINED3DRS_TRANSLUCENTSORTINDEPENDENT */ STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), state_translucentsi }, @@ -5271,6 +5271,9 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, { STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }}, + { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }}, + { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }}, {0 /* Terminate */, { 0, 0 }}, };
1
0
0
0
Alexandre Julliard : kernel32: Set the stdin/ stdout file descriptors to match the specified Win32 handles when possible.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: 5861612e86815115495d7ad3238ec58f1015320b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5861612e86815115495d7ad32…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 10 12:20:56 2008 +0200 kernel32: Set the stdin/stdout file descriptors to match the specified Win32 handles when possible. --- dlls/kernel32/process.c | 65 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3a97c16..759612b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1232,10 +1232,10 @@ static char **build_envp( const WCHAR *envW ) * * Fork and exec a new Unix binary, checking for errors. */ -static int fork_and_exec( const char *filename, const WCHAR *cmdline, - const WCHAR *env, const char *newdir, DWORD flags ) +static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHAR *env, + const char *newdir, DWORD flags, STARTUPINFOW *startup ) { - int fd[2]; + int fd[2], stdin_fd = -1, stdout_fd = -1; int pid, err; if (!env) env = GetEnvironmentStringsW(); @@ -1246,6 +1246,28 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, return -1; } fcntl( fd[1], F_SETFD, 1 ); /* set close on exec */ + + if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) + { + HANDLE hstdin, hstdout; + + if (startup->dwFlags & STARTF_USESTDHANDLES) + { + hstdin = startup->hStdInput; + hstdout = startup->hStdOutput; + } + else + { + hstdin = GetStdHandle(STD_INPUT_HANDLE); + hstdout = GetStdHandle(STD_OUTPUT_HANDLE); + } + + if (is_console_handle( hstdin )) hstdin = console_handle_unmap( hstdin ); + if (is_console_handle( hstdout )) hstdout = console_handle_unmap( hstdout ); + wine_server_handle_to_fd( hstdin, FILE_READ_DATA, &stdin_fd, NULL ); + wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); + } + if (!(pid = fork())) /* child */ { char **argv = build_argv( cmdline, 0 ); @@ -1269,6 +1291,19 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, } else if (pid != -1) _exit(0); /* parent */ } + else + { + if (stdin_fd != -1) + { + dup2( stdin_fd, 0 ); + close( stdin_fd ); + } + if (stdout_fd != -1) + { + dup2( stdout_fd, 1 ); + close( stdout_fd ); + } + } /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); @@ -1281,6 +1316,8 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, write( fd[1], &err, sizeof(err) ); _exit(1); } + if (stdin_fd != -1) close( stdin_fd ); + if (stdout_fd != -1) close( stdout_fd ); close( fd[1] ); if ((pid != -1) && (read( fd[0], &err, sizeof(err) ) > 0)) /* exec failed */ { @@ -1388,11 +1425,11 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW void *res_start, void *res_end, int exec_only ) { BOOL ret, success = FALSE; - HANDLE process_info; + HANDLE process_info, hstdin, hstdout; WCHAR *env_end; char *winedebug = NULL; RTL_USER_PROCESS_PARAMETERS *params; - int socketfd[2]; + int socketfd[2], stdin_fd = -1, stdout_fd = -1; pid_t pid; int err; @@ -1452,12 +1489,15 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (is_console_handle(req->hstdin)) req->hstdin = INVALID_HANDLE_VALUE; if (is_console_handle(req->hstdout)) req->hstdout = INVALID_HANDLE_VALUE; if (is_console_handle(req->hstderr)) req->hstderr = INVALID_HANDLE_VALUE; + hstdin = hstdout = 0; } else { if (is_console_handle(req->hstdin)) req->hstdin = console_handle_unmap(req->hstdin); if (is_console_handle(req->hstdout)) req->hstdout = console_handle_unmap(req->hstdout); if (is_console_handle(req->hstderr)) req->hstderr = console_handle_unmap(req->hstderr); + hstdin = req->hstdin; + hstdout = req->hstdout; } wine_server_add_data( req, params, params->Size ); @@ -1482,6 +1522,9 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW return FALSE; } + if (hstdin) wine_server_handle_to_fd( hstdin, FILE_READ_DATA, &stdin_fd, NULL ); + if (hstdout) wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); + /* create the child process */ if (exec_only || !(pid = fork())) /* child */ @@ -1505,6 +1548,14 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW } else if (pid != -1) _exit(0); /* parent */ } + else + { + if (stdin_fd != -1) dup2( stdin_fd, 0 ); + if (stdout_fd != -1) dup2( stdout_fd, 1 ); + } + + if (stdin_fd != -1) close( stdin_fd ); + if (stdout_fd != -1) close( stdout_fd ); /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); @@ -1525,6 +1576,8 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW /* this is the parent */ + if (stdin_fd != -1) close( stdin_fd ); + if (stdout_fd != -1) close( stdout_fd ); close( socketfd[0] ); HeapFree( GetProcessHeap(), 0, winedebug ); if (pid == -1) @@ -1878,7 +1931,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB if ((unix_name = wine_get_unix_file_name( name ))) { - retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir, flags ) != -1); + retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir, flags, startup_info ) != -1); HeapFree( GetProcessHeap(), 0, unix_name ); } }
1
0
0
0
Andrew Talbot : dplayx: Remove unneeded address-of operator from array name .
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: 4110e61f37d4290471c8a2ec6e4534667c745514 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4110e61f37d4290471c8a2ec6…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:37:01 2008 +0100 dplayx: Remove unneeded address-of operator from array name. --- dlls/dplayx/dplayx_global.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index f15c65f..f70335b 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -128,7 +128,7 @@ LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) { /* Set the area used */ lpMemArea[ uBlockUsed ].used = 1; - lpvArea = &(lpMemArea[ uBlockUsed ].data); + lpvArea = lpMemArea[ uBlockUsed ].data; } else {
1
0
0
0
Andrew Talbot : dmstyle: Remove unneeded address-of operators from array names.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: 3a7d43c55a99cd56958e003fc72e697964b6d9d5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a7d43c55a99cd56958e003fc…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:57 2008 +0100 dmstyle: Remove unneeded address-of operators from array names. --- dlls/dmstyle/dmutils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index ae9638a..ce3de46 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -75,13 +75,13 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p case DMUS_FOURCC_NAME_CHUNK: { TRACE_(dmfile)(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, &pDesc->wszName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { TRACE_(dmfile)(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; - IStream_Read (pStm, &pDesc->wszFileName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: {
1
0
0
0
Andrew Talbot : dmime: Remove unneeded address-of operators from array names.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: f8f758f747da7a5ba11897b890f4a4e11c2e99ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f8f758f747da7a5ba11897b89…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:54 2008 +0100 dmime: Remove unneeded address-of operators from array names. --- dlls/dmime/dmutils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index edcd121..1a822ba 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -78,13 +78,13 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p case DMUS_FOURCC_NAME_CHUNK: { TRACE_(dmfile)(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, &pDesc->wszName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { TRACE_(dmfile)(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; - IStream_Read (pStm, &pDesc->wszFileName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: {
1
0
0
0
Andrew Talbot : dmband: Remove unneeded address-of operators from array names.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: 32a21e2e7165ef6849a06147e542dd6f14514bc0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=32a21e2e7165ef6849a06147e…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:51 2008 +0100 dmband: Remove unneeded address-of operators from array names. --- dlls/dmband/dmutils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index a126513..bfec1f1 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -180,13 +180,13 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p case DMUS_FOURCC_NAME_CHUNK: { TRACE_(dmfile)(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, &pDesc->wszName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { TRACE_(dmfile)(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; - IStream_Read (pStm, &pDesc->wszFileName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: {
1
0
0
0
Andrew Talbot : dinput: Remove unneeded address-of operators from array names.
by Alexandre Julliard
10 Jul '08
10 Jul '08
Module: wine Branch: master Commit: 0993244b08df3edbc849fadd35b120c2c9526fe6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0993244b08df3edbc849fadd3…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:48 2008 +0100 dinput: Remove unneeded address-of operators from array names. --- dlls/dinput/effect_linuxinput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 1fef4cd..9b1cb1b 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -875,7 +875,7 @@ HRESULT linuxinput_get_info_A( info->dwDynamicParams = info->dwStaticParams; /* yes, this is windows behavior (print the GUID_Name for name) */ - strcpy((char*)&(info->tszName), _dump_dinput_GUID(rguid)); + strcpy((char*)info->tszName, _dump_dinput_GUID(rguid)); return DI_OK; } @@ -910,7 +910,7 @@ HRESULT linuxinput_get_info_W( /* yes, this is windows behavior (print the GUID_Name for name) */ MultiByteToWideChar(CP_ACP, 0, _dump_dinput_GUID(rguid), -1, - (WCHAR*)&(info->tszName), MAX_PATH); + (WCHAR*)info->tszName, MAX_PATH); return DI_OK; }
1
0
0
0
← Newer
1
...
67
68
69
70
71
72
73
...
112
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
103
104
105
106
107
108
109
110
111
112
Results per page:
10
25
50
100
200