July 2008 - Wine-commits - list.winehq.org

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

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

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

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

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

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

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

Francois Gouget : wined3d: Move float_32_to_16() to surface_base. c which is the only place where it's used, and because it needs port. h for isinf().
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 8320d214d470876efb4a7377fa88e5ba91776ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8320d214d470876efb4a7377f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 10 00:23:07 2008 +0200 wined3d: Move float_32_to_16() to surface_base.c which is the only place where it's used, and because it needs port.h for isinf(). --- dlls/wined3d/surface_base.c | 51 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 51 +-------------------------------------- 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 7536706..183cd2b 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -34,6 +34,57 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +/* See also float_16_to_32() in wined3d_private.h */ +static inline unsigned short float_32_to_16(const float *in) +{ + int exp = 0; + float tmp = fabs(*in); + unsigned int mantissa; + unsigned short ret; + + /* Deal with special numbers */ + if(*in == 0.0) return 0x0000; + if(isnan(*in)) return 0x7C01; + if(isinf(*in)) return (*in < 0.0 ? 0xFC00 : 0x7c00); + + if(tmp < pow(2, 10)) { + do + { + tmp = tmp * 2.0; + exp--; + }while(tmp < pow(2, 10)); + } else if(tmp >= pow(2, 11)) { + do + { + tmp /= 2.0; + exp++; + }while(tmp >= pow(2, 11)); + } + + mantissa = (unsigned int) tmp; + if(tmp - mantissa >= 0.5) mantissa++; /* round to nearest, away from zero */ + + exp += 10; /* Normalize the mantissa */ + exp += 15; /* Exponent is encoded with excess 15 */ + + if(exp > 30) { /* too big */ + ret = 0x7c00; /* INF */ + } else if(exp <= 0) { + /* exp == 0: Non-normalized mantissa. Returns 0x0000 (=0.0) for too small numbers */ + while(exp <= 0) { + mantissa = mantissa >> 1; + exp++; + } + ret = mantissa & 0x3ff; + } else { + ret = (exp << 10) | (mantissa & 0x3ff); + } + + ret |= ((*in < 0.0 ? 1 : 0) << 15); /* Add the sign */ + return ret; +} + + /* Do NOT define GLINFO_LOCATION in this file. THIS CODE MUST NOT USE IT */ /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 808d9bf..b11a3f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -126,7 +126,8 @@ void init_type_lookup(WineD3D_GL_Info *gl_info); #define WINED3D_ATR_NORMALIZED(type) GLINFO_LOCATION.glTypeLookup[type].normalized #define WINED3D_ATR_TYPESIZE(type) GLINFO_LOCATION.glTypeLookup[type].typesize -/* The following functions convert 16 bit floats in the FLOAT16 data type +/* float_16_to_32() and float_32_to_16() (see implementation in + * surface_base.c) convert 16 bit floats in the FLOAT16 data type * to standard C floats and vice versa. They do not depend on the encoding * of the C float, so they are platform independent, but slow. On x86 and * other IEEE 754 compliant platforms the conversion can be accelerated by @@ -152,54 +153,6 @@ static inline float float_16_to_32(const unsigned short *in) { } } -static inline unsigned short float_32_to_16(const float *in) { - int exp = 0; - float tmp = fabs(*in); - unsigned int mantissa; - unsigned short ret; - - /* Deal with special numbers */ - if(*in == 0.0) return 0x0000; - if(isnan(*in)) return 0x7C01; - if(isinf(*in)) return (*in < 0.0 ? 0xFC00 : 0x7c00); - - if(tmp < pow(2, 10)) { - do - { - tmp = tmp * 2.0; - exp--; - }while(tmp < pow(2, 10)); - } else if(tmp >= pow(2, 11)) { - do - { - tmp /= 2.0; - exp++; - }while(tmp >= pow(2, 11)); - } - - mantissa = (unsigned int) tmp; - if(tmp - mantissa >= 0.5) mantissa++; /* round to nearest, away from zero */ - - exp += 10; /* Normalize the mantissa */ - exp += 15; /* Exponent is encoded with excess 15 */ - - if(exp > 30) { /* too big */ - ret = 0x7c00; /* INF */ - } else if(exp <= 0) { - /* exp == 0: Non-normalized mantissa. Returns 0x0000 (=0.0) for too small numbers */ - while(exp <= 0) { - mantissa = mantissa >> 1; - exp++; - } - ret = mantissa & 0x3ff; - } else { - ret = (exp << 10) | (mantissa & 0x3ff); - } - - ret |= ((*in < 0.0 ? 1 : 0) << 15); /* Add the sign */ - return ret; -} - /** * Settings */

1 0

Andrew Talbot : comdlg32: Remove unneeded address-of operator from array name.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 468f709cbe19df6919c22d7d480572008cdc15c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=468f709cbe19df6919c22d7d4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:41 2008 +0100 comdlg32: Remove unneeded address-of operator from array name. --- dlls/comdlg32/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 618fc22..dd47528 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1164,7 +1164,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba[0]); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 1, (LPARAM) &tba[1]); - SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSW, 9, (LPARAM) &tbb); + SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSW, 9, (LPARAM) tbb); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0); /* Set the window text with the text specified in the OPENFILENAME structure */

1 0

Andrew Talbot : crypt32: Remove unneeded address-of operator from array name.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 2b8bf17a0831dff9ff962cf4240a24bd35251111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8bf17a0831dff9ff962cf42… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:45 2008 +0100 crypt32: Remove unneeded address-of operator from array name. --- dlls/crypt32/decode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 47b0ba6..3ac3ebb 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3147,7 +3147,7 @@ static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD size = sizeof(buf); blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); - ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, 0, &buf, + ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, 0, buf, &size, pcbDecoded); if (ret) {

1 0