December 2011 - Wine-Commits

Ken Thomases : gdi.exe16: No need to reset SIGCHLD because we' re not changing it anymore.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 10705f6e3d5fa79df61fbddcbc544ad346a85697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10705f6e3d5fa79df61fbddcb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:48:54 2011 -0600 gdi.exe16: No need to reset SIGCHLD because we're not changing it anymore. --- dlls/gdi.exe16/printdrv.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index 6beb996..3bd0605 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -274,7 +274,6 @@ static int CreateSpoolFile(LPCSTR pszOutput) /* reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); - signal( SIGCHLD, SIG_DFL ); execl("/bin/sh", "/bin/sh", "-c", psCmdP, NULL); _exit(1);

1 0

Ken Thomases : secur32: Reap child process to avoid leaving a zombie.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 3de1c713647ced81675e4041beb9b254db45585e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de1c713647ced81675e4041b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:27 2011 -0600 secur32: Reap child process to avoid leaving a zombie. --- dlls/secur32/dispatcher.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index ba59231..88e81ba 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -28,7 +28,10 @@ #include <sys/types.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -#endif +#endif +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif #include <stdlib.h> #include <fcntl.h> #include "windef.h" @@ -276,7 +279,7 @@ void cleanup_helper(PNegoHelper helper) { TRACE("Killing helper %p\n", helper); - if( (helper == NULL) || (helper->helper_pid == 0)) + if(helper == NULL) return; HeapFree(GetProcessHeap(), 0, helper->com_buf); @@ -285,6 +288,16 @@ void cleanup_helper(PNegoHelper helper) close(helper->pipe_out); close(helper->pipe_in); +#ifdef HAVE_FORK + if (helper->helper_pid > 0) /* reap child */ + { + pid_t wret; + do { + wret = waitpid(helper->helper_pid, NULL, 0); + } while (wret < 0 && errno == EINTR); + } +#endif + HeapFree(GetProcessHeap(), 0, helper); }

1 0

Ken Thomases : netapi32: Wait for and reap smbpasswd child process.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 9979725211ecd3c6cdcb53b9c2501dca95978f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9979725211ecd3c6cdcb53b9c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:20 2011 -0600 netapi32: Wait for and reap smbpasswd child process. --- dlls/netapi32/access.c | 45 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 7cd05fc..d3b9063 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -21,6 +21,12 @@ #include "config.h" #include <stdarg.h> #include <fcntl.h> +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -872,7 +878,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } -static int fork_smbpasswd( char * const argv[] ) +static int fork_smbpasswd( char * const argv[], pid_t *pid ) { #ifdef HAVE_FORK int pipe_out[2]; @@ -881,7 +887,7 @@ static int fork_smbpasswd( char * const argv[] ) fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); - switch (fork()) + switch ((*pid = fork())) { case -1: close( pipe_out[0] ); @@ -893,7 +899,7 @@ static int fork_smbpasswd( char * const argv[] ) close( pipe_out[1] ); execvp( "smbpasswd", argv ); ERR( "can't execute smbpasswd, is it installed?\n" ); - return -1; + _exit(1); default: close( pipe_out[0] ); break; @@ -917,12 +923,14 @@ static char *strdup_unixcp( const WCHAR *str ) static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, LPCWSTR oldpassword, LPCWSTR newpassword ) { + NET_API_STATUS ret = NERR_Success; static char option_silent[] = "-s"; static char option_user[] = "-U"; static char option_remote[] = "-r"; static char smbpasswd[] = "smbpasswd"; int pipe_out; - char *server = NULL, *user, *argv[7], *old, *new; + pid_t pid; + char *server = NULL, *user, *argv[7], *old, *new = NULL; if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; if (!(user = strdup_unixcp( username ))) @@ -942,21 +950,20 @@ static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, } else argv[4] = NULL; - pipe_out = fork_smbpasswd( argv ); + pipe_out = fork_smbpasswd( argv, &pid ); HeapFree( GetProcessHeap(), 0, server ); HeapFree( GetProcessHeap(), 0, user ); if (pipe_out == -1) return NERR_InternalError; if (!(old = strdup_unixcp( oldpassword ))) { - close( pipe_out ); - return ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; + goto end; } if (!(new = strdup_unixcp( newpassword ))) { - close( pipe_out ); - HeapFree( GetProcessHeap(), 0, old ); - return ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; + goto end; } write( pipe_out, old, strlen( old ) ); write( pipe_out, "\n", 1 ); @@ -965,10 +972,26 @@ static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, write( pipe_out, new, strlen( new ) ); write( pipe_out, "\n", 1 ); +end: close( pipe_out ); + +#ifdef HAVE_FORK + { + pid_t wret; + int status; + + do { + wret = waitpid(pid, &status, 0); + } while (wret < 0 && errno == EINTR); + if (ret == NERR_Success && + (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) + ret = NERR_InternalError; + } +#endif + HeapFree( GetProcessHeap(), 0, old ); HeapFree( GetProcessHeap(), 0, new ); - return NERR_Success; + return ret; } /******************************************************************************

1 0

Ken Thomases : ntdll: Don't change SIGCHLD disposition; no automatic reaping of child processes.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 35302a643a36e99505616b56b68c9cd694feb3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35302a643a36e99505616b56b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:48:22 2011 -0600 ntdll: Don't change SIGCHLD disposition; no automatic reaping of child processes. --- dlls/ntdll/server.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3243f9f..8a01d22 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1076,11 +1076,6 @@ size_t server_init_thread( void *entry_point ) /* ignore SIGPIPE so that we get an EPIPE error instead */ sigaction( SIGPIPE, &sig_act, NULL ); - /* automatic child reaping to avoid zombies */ -#ifdef SA_NOCLDWAIT - sig_act.sa_flags |= SA_NOCLDWAIT; -#endif - sigaction( SIGCHLD, &sig_act, NULL ); /* create the server->client communication pipes */ if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" );

1 0

Henri Verbeet : wined3d: Move the surface map counting code to wined3d_surface_map().
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 4a7cbba0ea4eafc1b648529d917f9c4dffe651ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7cbba0ea4eafc1b648529d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:39 2011 +0100 wined3d: Move the surface map counting code to wined3d_surface_map(). --- dlls/wined3d/surface.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ec4daa..b74e8d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -527,19 +527,6 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - /* Performance optimization: Count how often a surface is locked, if it is - * locked regularly do not throw away the system memory copy. This avoids - * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK)) - { - if (++surface->lockCount > MAXLOCKCOUNT) - { - TRACE("Surface is locked regularly, not freeing the system memory copy any more.\n"); - surface->flags |= SFLAG_DYNLOCK; - } - } - /* Create a PBO for dynamically locked surfaces but don't do it for * converted or NPOT surfaces. Also don't create a PBO for systemmem * surfaces. */ @@ -3718,6 +3705,19 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!(surface->flags & SFLAG_LOCKABLE)) WARN("Trying to lock unlockable surface.\n"); + /* Performance optimization: Count how often a surface is mapped, if it is + * mapped regularly do not throw away the system memory copy. This avoids + * the need to download the surface from OpenGL all the time. The surface + * is still downloaded if the OpenGL texture is changed. */ + if (!(surface->flags & SFLAG_DYNLOCK)) + { + if (++surface->lockCount > MAXLOCKCOUNT) + { + TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); + surface->flags |= SFLAG_DYNLOCK; + } + } + surface->surface_ops->surface_map(surface, rect, flags); if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH)

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_STAGETIMINGS.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: b3b686d9e83d38a352076b9081ec5e7bc2bcfdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b686d9e83d38a352076b908… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:42 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_STAGETIMINGS. --- include/wine/wined3d.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index edab31b..7a15759 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,12 +1696,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_STAGETIMINGS -{ - float MemoryProcessingPercent; - float ComputationProcessingPercent; -} WINED3DDEVINFO_STAGETIMINGS; - typedef struct _WINED3DRASTER_STATUS { BOOL InVBlank;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_RESOURCEMANAGER.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 990786eef5af3ce5c3f063ccc0fae61ebf7d8f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=990786eef5af3ce5c3f063ccc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:43 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_RESOURCEMANAGER. --- include/wine/wined3d.h | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7a15759..89acd0f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1702,26 +1702,6 @@ typedef struct _WINED3DRASTER_STATUS UINT ScanLine; } WINED3DRASTER_STATUS; -typedef struct WINED3DRESOURCESTATS -{ - BOOL bThrashing; - DWORD ApproxBytesDownloaded; - DWORD NumEvicts; - DWORD NumVidCreates; - DWORD LastPri; - DWORD NumUsed; - DWORD NumUsedInVidMem; - DWORD WorkingSet; - DWORD WorkingSetBytes; - DWORD TotalManaged; - DWORD TotalBytes; -} WINED3DRESOURCESTATS; - -typedef struct _WINED3DDEVINFO_RESOURCEMANAGER -{ - WINED3DRESOURCESTATS stats[WINED3DRTYPECOUNT]; -} WINED3DDEVINFO_RESOURCEMANAGER; - typedef struct _WINED3DDEVINFO_VERTEXSTATS { DWORD NumRenderedTriangles;

1 0

Henri Verbeet : wined3d: Create a PBO in surface_load_location() even if SFLAG_INSYSMEM is already set.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 94c0da184e18252ca2df7f9f462e9a4df9c5f2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c0da184e18252ca2df7f9f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:41 2011 +0100 wined3d: Create a PBO in surface_load_location() even if SFLAG_INSYSMEM is already set. In the longer term, sysmem and pbo should be separate resource locations. --- dlls/wined3d/surface.c | 73 ++++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 373b443..d5b73e3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -534,49 +534,51 @@ static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct return TRUE; } -static void surface_prepare_system_memory(struct wined3d_surface *surface) +static void surface_load_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_context *context; + GLenum error; - TRACE("surface %p.\n", surface); + context = context_acquire(surface->resource.device, NULL); + ENTER_GL(); - if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - { - struct wined3d_context *context; - GLenum error; + GL_EXTCALL(glGenBuffersARB(1, &surface->pbo)); + error = glGetError(); + if (!surface->pbo || error != GL_NO_ERROR) + ERR("Failed to create a PBO with error %s (%#x).\n", debug_glerror(error), error); - context = context_acquire(device, NULL); - ENTER_GL(); + TRACE("Binding PBO %u.\n", surface->pbo); - GL_EXTCALL(glGenBuffersARB(1, &surface->pbo)); - error = glGetError(); - if (!surface->pbo || error != GL_NO_ERROR) - ERR("Failed to create a PBO with error %s (%#x).\n", debug_glerror(error), error); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + checkGLcall("glBindBufferARB"); - TRACE("Binding PBO %u.\n", surface->pbo); + GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4, + surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB)); + checkGLcall("glBufferDataARB"); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); - GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4, - surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB)); - checkGLcall("glBufferDataARB"); + /* We don't need the system memory anymore and we can't even use it for PBOs. */ + if (!(surface->flags & SFLAG_CLIENT)) + { + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.heapMemory = NULL; + } + surface->resource.allocatedMemory = NULL; + surface->flags |= SFLAG_PBO; + LEAVE_GL(); + context_release(context); +} - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); +static void surface_prepare_system_memory(struct wined3d_surface *surface) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - /* We don't need the system memory anymore and we can't even use it for PBOs. */ - if (!(surface->flags & SFLAG_CLIENT)) - { - HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); - surface->resource.heapMemory = NULL; - } - surface->resource.allocatedMemory = NULL; - surface->flags |= SFLAG_PBO; - LEAVE_GL(); - context_release(context); - } + TRACE("surface %p.\n", surface); + + if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) + surface_load_pbo(surface, gl_info); else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated @@ -6136,6 +6138,11 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c if (surface->flags & location) { TRACE("Location already up to date.\n"); + + if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) + && surface_need_pbo(surface, gl_info)) + surface_load_pbo(surface, gl_info); + return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Introduce a separate function to determine if a surface needs a PBO.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 39ebb992f7f961333e0dff796abd8166744629db URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ebb992f7f961333e0dff796… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:40 2011 +0100 wined3d: Introduce a separate function to determine if a surface needs a PBO. --- dlls/wined3d/surface.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b74e8d5..373b443 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -520,6 +520,20 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) return WINED3D_OK; } +static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +{ + if (surface->resource.pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + if (!(surface->flags & SFLAG_DYNLOCK)) + return FALSE; + if (surface->flags & (SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) + return FALSE; + if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) + return FALSE; + + return TRUE; +} + static void surface_prepare_system_memory(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; @@ -527,12 +541,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - /* Create a PBO for dynamically locked surfaces but don't do it for - * converted or NPOT surfaces. Also don't create a PBO for systemmem - * surfaces. */ - if (gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && (surface->flags & SFLAG_DYNLOCK) - && !(surface->flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) - && (surface->resource.pool != WINED3DPOOL_SYSTEMMEM)) + if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) { struct wined3d_context *context; GLenum error;

1 0

Ken Thomases : gdi.exe16: Don't double-close the spool file.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: b035b0bad71ed9003f2984267fcfd3b92cf4cdbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b035b0bad71ed9003f2984267… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 10:06:00 2011 -0600 gdi.exe16: Don't double-close the spool file. FreePrintJob() closes the file descriptor. --- dlls/gdi.exe16/printdrv.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index f00eaa1..6beb996 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -388,8 +388,6 @@ INT16 WINAPI CloseJob16(HPJOB16 hJob) pPrintJob = FindPrintJobFromHandle(hJob); if (pPrintJob != NULL) { - /* Close the spool file */ - close(pPrintJob->fd); FreePrintJob(hJob); nRet = 1; }

1 0