wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

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

01 Dec '11

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 : kernel32: No need to reset SIGCHLD because we' re not changing it anymore.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: f658feb70f0d430575ea412c29b5782f6cfd1ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f658feb70f0d430575ea412c2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:48:47 2011 -0600 kernel32: No need to reset SIGCHLD because we're not changing it anymore. --- dlls/kernel32/process.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b6c0b9d..ae3bbb2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1544,7 +1544,6 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); - signal( SIGCHLD, SIG_DFL ); if (newdir) chdir(newdir); @@ -1835,7 +1834,6 @@ static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); - signal( SIGCHLD, SIG_DFL ); sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd ); sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx",

1 0

Ken Thomases : libport: No need to reset SIGCHLD because we' re not changing it anymore.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 87805716987f6d4ecb794b4cce3363e81d0a7056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87805716987f6d4ecb794b4cc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:48:33 2011 -0600 libport: No need to reset SIGCHLD because we're not changing it anymore. --- libs/port/spawn.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 38c2944..40efebb 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -37,7 +37,6 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) { #ifndef HAVE__SPAWNVP int pid = 0, status, wret; - struct sigaction dfl_act, old_act; if (mode == _P_OVERLAY) { @@ -49,16 +48,10 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) return -1; } - dfl_act.sa_handler = SIG_DFL; - dfl_act.sa_flags = 0; - sigemptyset( &dfl_act.sa_mask ); - - if (mode == _P_WAIT) sigaction( SIGCHLD, &dfl_act, &old_act ); - pid = fork(); if (pid == 0) { - sigaction( SIGPIPE, &dfl_act, NULL ); + signal( SIGPIPE, SIG_DFL ); execvp(cmdname, (char **)argv); _exit(1); } @@ -74,7 +67,6 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) else pid = 255; /* abnormal exit with an abort or an interrupt */ } - if (mode == _P_WAIT) sigaction( SIGCHLD, &old_act, NULL ); return pid; #else /* HAVE__SPAWNVP */ return _spawnvp(mode, cmdname, argv);

1 0

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

01 Dec '11

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

Ken Thomases : gdi.exe16: Don't double-close the spool file.
by Alexandre Julliard 01 Dec '11

01 Dec '11

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

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_RESOURCEMANAGER.
by Alexandre Julliard 01 Dec '11

01 Dec '11

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: Get rid of WINED3DDEVINFO_STAGETIMINGS.
by Alexandre Julliard 01 Dec '11

01 Dec '11

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: Create a PBO in surface_load_location() even if SFLAG_INSYSMEM is already set.
by Alexandre Julliard 01 Dec '11

01 Dec '11

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 01 Dec '11

01 Dec '11

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

Henri Verbeet : wined3d: Move the surface map counting code to wined3d_surface_map().
by Alexandre Julliard 01 Dec '11

01 Dec '11

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011