February 2007 - Wine-commits

Ken Thomases : wininet: Use "ping -c 1" instead of "ping -w 1" for InternetCheckConnection.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: b33057986a6e842e48a9a090d70277ad99489180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33057986a6e842e48a9a090d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 28 14:04:58 2007 -0600 wininet: Use "ping -c 1" instead of "ping -w 1" for InternetCheckConnection. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 436dd8b..e11fcb7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2699,7 +2699,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe */ BOOL rc = FALSE; - static const CHAR ping[] = "ping -w 1 "; + static const CHAR ping[] = "ping -c 1 "; static const CHAR redirect[] = " >/dev/null 2>/dev/null"; CHAR *command = NULL; WCHAR hostW[1024];

1 0

Ken Thomases : winspool.drv: Use exec() and _exit() instead of system() and exit().
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 1f420967f0cde51288cb5ec332d3aa76dc9c3ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f420967f0cde51288cb5ec33… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 28 14:04:54 2007 -0600 winspool.drv: Use exec() and _exit() instead of system() and exit(). --- dlls/winspool.drv/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9f07f59..a1aeaee 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7224,8 +7224,8 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) signal(SIGPIPE, SIG_DFL); signal(SIGCHLD, SIG_DFL); - system(cmdA); - exit(0); + execl("/bin/sh", "/bin/sh", "-c", cmdA, (char*)0); + _exit(1); } while((no_read = read(file_fd, buf, sizeof(buf))) > 0)

1 0

Ken Thomases : gdi32: Use exec() and _exit() instead of system() and exit() .
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 9ccad53fb981b3161e32120a0ceb8a4376e7f528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccad53fb981b3161e32120a0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 28 14:04:48 2007 -0600 gdi32: Use exec() and _exit() instead of system() and exit(). --- dlls/gdi32/printdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index caf4e14..15bcada 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -505,8 +505,8 @@ static int CreateSpoolFile(LPCSTR pszOutput) signal( SIGPIPE, SIG_DFL ); signal( SIGCHLD, SIG_DFL ); - system(psCmdP); - exit(0); + execl("/bin/sh", "/bin/sh", "-c", psCmdP, (char*)0); + _exit(1); } close (fds[0]);

1 0

Jacek Caban : shdocvw: Remove no longer used resources.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 551b4117c4e0c4f23c5c2cac15a87901b7d06bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=551b4117c4e0c4f23c5c2cac1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 20:28:48 2007 +0100 shdocvw: Remove no longer used resources. --- dlls/shdocvw/Bg.rc | 36 --------------------------- dlls/shdocvw/De.rc | 36 --------------------------- dlls/shdocvw/En.rc | 36 --------------------------- dlls/shdocvw/Es.rc | 36 --------------------------- dlls/shdocvw/Fi.rc | 36 --------------------------- dlls/shdocvw/Fr.rc | 36 --------------------------- dlls/shdocvw/Hu.rc | 36 --------------------------- dlls/shdocvw/Ko.rc | 36 --------------------------- dlls/shdocvw/Nl.rc | 36 --------------------------- dlls/shdocvw/No.rc | 36 --------------------------- dlls/shdocvw/Pt.rc | 61 ----------------------------------------------- dlls/shdocvw/Tr.rc | 36 --------------------------- dlls/shdocvw/shdocvw.rc | 18 -------------- 13 files changed, 0 insertions(+), 475 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=551b4117c4e0c4f23c5c2…

1 0

Stefan Dösinger : wined3d: Leave the fog state handler after disabling fog.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 38d961a7499b341f930e667e6b738b8ed3c431d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d961a7499b341f930e667e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 25 23:58:14 2007 +0100 wined3d: Leave the fog state handler after disabling fog. --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9e5aeb7..efdd05d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -666,6 +666,7 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo /* No fog? Disable it, and we're done :-) */ glDisable(GL_FOG); checkGLcall("glDisable GL_FOG"); + return; } tmpvalue.d = stateblock->renderState[WINED3DRS_FOGSTART];

1 0

Stefan Dösinger : wined3d: Move clip planes to the state table.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 409aa731323638d886a6744f49cb2d6958e256d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409aa731323638d886a6744f4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 28 14:36:36 2007 +0100 wined3d: Move clip planes to the state table. --- dlls/wined3d/device.c | 29 ++++++----------- dlls/wined3d/state.c | 65 +++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 75 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 49dcc93..bd37c51 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2418,6 +2418,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetClipPlane(IWineD3DDevice *iface, DWO This->updateStateBlock->changed.clipplane[Index] = TRUE; This->updateStateBlock->set.clipplane[Index] = TRUE; + + if(This->updateStateBlock->clipplane[Index][0] == pPlane[0] && + This->updateStateBlock->clipplane[Index][1] == pPlane[1] && + This->updateStateBlock->clipplane[Index][2] == pPlane[2] && + This->updateStateBlock->clipplane[Index][3] == pPlane[3]) { + TRACE("Application is setting old values over, nothing to do\n"); + return WINED3D_OK; + } + This->updateStateBlock->clipplane[Index][0] = pPlane[0]; This->updateStateBlock->clipplane[Index][1] = pPlane[1]; This->updateStateBlock->clipplane[Index][2] = pPlane[2]; @@ -2429,25 +2438,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetClipPlane(IWineD3DDevice *iface, DWO return WINED3D_OK; } - /* Apply it */ - - ENTER_GL(); - - /* Clip Plane settings are affected by the model view in OpenGL, the View transform in direct3d */ - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glLoadMatrixf((float *) &This->stateBlock->transforms[WINED3DTS_VIEW].u.m[0][0]); - - TRACE("Clipplane [%f,%f,%f,%f]\n", - This->updateStateBlock->clipplane[Index][0], - This->updateStateBlock->clipplane[Index][1], - This->updateStateBlock->clipplane[Index][2], - This->updateStateBlock->clipplane[Index][3]); - glClipPlane(GL_CLIP_PLANE0 + Index, This->updateStateBlock->clipplane[Index]); - checkGLcall("glClipPlane"); - - glPopMatrix(); - LEAVE_GL(); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_CLIPPLANE(Index)); return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index efdd05d..2fd2804 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2034,6 +2034,29 @@ static void transform_world(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } +static void clipplane(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + UINT index = state - STATE_CLIPPLANE(0); + + if(isStateDirty(context, STATE_TRANSFORM(WINED3DTS_VIEW)) || index > GL_LIMITS(clipplanes)) { + return; + } + + /* Clip Plane settings are affected by the model view in OpenGL, the View transform in direct3d */ + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); + + TRACE("Clipplane [%f,%f,%f,%f]\n", + stateblock->clipplane[index][0], + stateblock->clipplane[index][1], + stateblock->clipplane[index][2], + stateblock->clipplane[index][3]); + glClipPlane(GL_CLIP_PLANE0 + index, stateblock->clipplane[index]); + checkGLcall("glClipPlane"); + + glPopMatrix(); +} + static void transform_view(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { unsigned int k; @@ -2060,10 +2083,11 @@ static void transform_view(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine checkGLcall("glLightfv dirn"); } - /* Reset Clipping Planes if clipping is enabled. TODO: Call clipplane apply func */ + /* Reset Clipping Planes */ for (k = 0; k < GL_LIMITS(clipplanes); k++) { - glClipPlane(GL_CLIP_PLANE0 + k, stateblock->clipplane[k]); - checkGLcall("glClipPlane"); + if(!isStateDirty(context, STATE_CLIPPLANE(k))) { + clipplane(STATE_CLIPPLANE(k), stateblock, context); + } } if(context->last_was_rhw) { @@ -4118,5 +4142,38 @@ const struct StateEntry StateTable[] = { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), light }, { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), light }, - { /* Scissor rect */ STATE_SCISSORRECT, scissorrect } + { /* Scissor rect */ STATE_SCISSORRECT, scissorrect }, + /* Clip planes */ + { /* STATE_CLIPPLANE(0) */ STATE_CLIPPLANE(0), clipplane }, + { /* STATE_CLIPPLANE(1) */ STATE_CLIPPLANE(1), clipplane }, + { /* STATE_CLIPPLANE(2) */ STATE_CLIPPLANE(2), clipplane }, + { /* STATE_CLIPPLANE(3) */ STATE_CLIPPLANE(3), clipplane }, + { /* STATE_CLIPPLANE(4) */ STATE_CLIPPLANE(4), clipplane }, + { /* STATE_CLIPPLANE(5) */ STATE_CLIPPLANE(5), clipplane }, + { /* STATE_CLIPPLANE(6) */ STATE_CLIPPLANE(6), clipplane }, + { /* STATE_CLIPPLANE(7) */ STATE_CLIPPLANE(7), clipplane }, + { /* STATE_CLIPPLANE(8) */ STATE_CLIPPLANE(8), clipplane }, + { /* STATE_CLIPPLANE(9) */ STATE_CLIPPLANE(9), clipplane }, + { /* STATE_CLIPPLANE(10) */ STATE_CLIPPLANE(10), clipplane }, + { /* STATE_CLIPPLANE(11) */ STATE_CLIPPLANE(11), clipplane }, + { /* STATE_CLIPPLANE(12) */ STATE_CLIPPLANE(12), clipplane }, + { /* STATE_CLIPPLANE(13) */ STATE_CLIPPLANE(13), clipplane }, + { /* STATE_CLIPPLANE(14) */ STATE_CLIPPLANE(14), clipplane }, + { /* STATE_CLIPPLANE(15) */ STATE_CLIPPLANE(15), clipplane }, + { /* STATE_CLIPPLANE(16) */ STATE_CLIPPLANE(16), clipplane }, + { /* STATE_CLIPPLANE(17) */ STATE_CLIPPLANE(17), clipplane }, + { /* STATE_CLIPPLANE(18) */ STATE_CLIPPLANE(18), clipplane }, + { /* STATE_CLIPPLANE(19) */ STATE_CLIPPLANE(19), clipplane }, + { /* STATE_CLIPPLANE(20) */ STATE_CLIPPLANE(20), clipplane }, + { /* STATE_CLIPPLANE(21) */ STATE_CLIPPLANE(21), clipplane }, + { /* STATE_CLIPPLANE(22) */ STATE_CLIPPLANE(22), clipplane }, + { /* STATE_CLIPPLANE(23) */ STATE_CLIPPLANE(23), clipplane }, + { /* STATE_CLIPPLANE(24) */ STATE_CLIPPLANE(24), clipplane }, + { /* STATE_CLIPPLANE(25) */ STATE_CLIPPLANE(25), clipplane }, + { /* STATE_CLIPPLANE(26) */ STATE_CLIPPLANE(26), clipplane }, + { /* STATE_CLIPPLANE(27) */ STATE_CLIPPLANE(27), clipplane }, + { /* STATE_CLIPPLANE(28) */ STATE_CLIPPLANE(28), clipplane }, + { /* STATE_CLIPPLANE(29) */ STATE_CLIPPLANE(29), clipplane }, + { /* STATE_CLIPPLANE(30) */ STATE_CLIPPLANE(30), clipplane }, + { /* STATE_CLIPPLANE(31) */ STATE_CLIPPLANE(31), clipplane }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8bcffa3..1a5d3eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -479,7 +479,10 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, #define STATE_SCISSORRECT (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1) + 1) #define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT) -#define STATE_HIGHEST (STATE_SCISSORRECT) +#define STATE_CLIPPLANE(a) (STATE_SCISSORRECT + 1 + (a)) +#define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(MAX_CLIPPLANES - 1)) + +#define STATE_HIGHEST (STATE_CLIPPLANE(MAX_CLIPPLANES - 1)) struct StateEntry {

1 0

Stefan Dösinger : wined3d: Clip planes with vertex shaders.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 5afbfd0359abb3b36648bad1bb7c9ef803a7a46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afbfd0359abb3b36648bad1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 27 23:11:15 2007 +0100 wined3d: Clip planes with vertex shaders. --- dlls/wined3d/state.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2fd2804..0f107c3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -388,6 +388,22 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine DWORD enable = 0xFFFFFFFF; DWORD disable = 0x00000000; + if(stateblock->vertexShader) { + /* The spec says that opengl clipping planes are disabled when using shaders. Direct3D planes aren't, + * so that is an issue. The MacOS ATI driver keeps clipping planes activated with shaders in some + * contitions I got sick of tracking down. The shader state handler disables all clip planes because + * of that - don't do anything here and keep them disabled + */ + if(stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]) { + static BOOL warned = FALSE; + if(!warned) { + FIXME("Clipping not supported with vertex shaders\n"); + warned = TRUE; + } + } + return; + } + /* TODO: Keep track of previously enabled clipplanes to avoid unneccessary resetting * of already set values */ @@ -2924,11 +2940,32 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(!isStateDirty(context, STATE_RENDER(WINED3DRS_COLORVERTEX))) { state_colormat(STATE_RENDER(WINED3DRS_COLORVERTEX), stateblock, context); } + + if(context->last_was_vshader && !isStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPLANEENABLE))) { + state_clipping(STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), stateblock, context); + } } else { /* We compile the shader here because we need the vertex declaration * in order to determine if we need to do any swizzling for D3DCOLOR * registers. If the shader is already compiled this call will do nothing. */ IWineD3DVertexShader_CompileShader(stateblock->vertexShader); + + if(!context->last_was_vshader) { + int i; + static BOOL warned = FALSE; + /* Disable all clip planes to get defined results on all drivers. See comment in the + * state_clipping state handler + */ + for(i = 0; i < GL_LIMITS(clipplanes); i++) { + glDisable(GL_CLIP_PLANE0 + i); + checkGLcall("glDisable(GL_CLIP_PLANE0 + i)"); + } + + if(!warned && stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]) { + FIXME("Clipping not supported with vertex shaders\n"); + warned = TRUE; + } + } } /* Vertex and pixel shaders are applied together for now, so let the last dirty state do the

1 0

Stefan Dösinger : wined3d: Use GL_STATIC_DRAW_ARB instead of GL_STATIC_DRAW.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 7560c8e1d2cbe77d7dcba8839209d120df31bf87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7560c8e1d2cbe77d7dcba8839… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 25 23:10:20 2007 +0100 wined3d: Use GL_STATIC_DRAW_ARB instead of GL_STATIC_DRAW. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 95268fa..49dcc93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -399,7 +399,7 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm /* Use static write only usage for now. Dynamic index buffers stay in sysmem, and due to the sysmem * copy no readback will be needed */ - glUsage = GL_STATIC_DRAW; + glUsage = GL_STATIC_DRAW_ARB; GL_EXTCALL(glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->resource.size, NULL, glUsage)); error = glGetError(); if(error != GL_NO_ERROR) {

1 0

Stefan Dösinger : wined3d: Support for using auxilliary buffers for offscreen rendering.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 8d9a553d89bb5615163761402af2e980e1cbaee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9a553d89bb5615163761402… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 27 21:32:15 2007 +0100 wined3d: Support for using auxilliary buffers for offscreen rendering. OpenGL AUX buffers provide a way for offscreen rendering which is very similar to our back buffer "offscreen" rendering emulation. Not all card support aux buffers, but if they are available they are a nice present which is easy to use. --- dlls/wined3d/context.c | 10 ++++++++++ dlls/wined3d/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/surface.c | 29 ++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ac2ca44..d087a4c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -622,6 +622,14 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && oldRenderOffscreen) { set_render_target_fbo((IWineD3DDevice *) This, 0, target); + } else if(wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { + if(((IWineD3DSwapChainImpl *) swapchain)->backBuffer) { + glDrawBuffer(GL_BACK); + checkGLcall("glDrawBuffer(GL_BACK)"); + } else { + glDrawBuffer(GL_FRONT); + checkGLcall("glDrawBuffer(GL_FRONT)"); + } } IWineD3DSwapChain_Release(swapchain); @@ -685,6 +693,8 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU */ context = ((IWineD3DSwapChainImpl *) This->swapchains[0])->context; } + glDrawBuffer(This->offscreenBuffer); + checkGLcall("glDrawBuffer(This->offscreenBuffer)"); break; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 94c49fa..95268fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1707,6 +1707,28 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR This->contexts[0]->last_was_rhw = 0; glGetIntegerv(GL_MAX_LIGHTS, &This->maxConcurrentLights); checkGLcall("glGetIntegerv(GL_MAX_LIGHTS, &This->maxConcurrentLights)"); + + switch(wined3d_settings.offscreen_rendering_mode) { + case ORM_FBO: + case ORM_PBUFFER: + This->offscreenBuffer = GL_BACK; + break; + + case ORM_BACKBUFFER: + { + GLint auxBuffers; + glGetIntegerv(GL_AUX_BUFFERS, &auxBuffers); + TRACE("Got %d aux buffers\n", auxBuffers); + if(auxBuffers > 0) { + TRACE("Using auxilliary buffer for offscreen rendering\n"); + This->offscreenBuffer = GL_AUX0; + } else { + TRACE("Using back buffer for offscreen rendering\n"); + This->offscreenBuffer = GL_BACK; + } + } + } + TRACE("(%p) All defaults now set up, leaving Init3D with %p\n", This, This); LEAVE_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 00199c8..8e5bd88 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -691,7 +691,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED * Read from the back buffer */ TRACE("Locking offscreen render target\n"); - glReadBuffer(GL_BACK); + glReadBuffer(myDevice->offscreenBuffer); srcIsUpsideDown = TRUE; } else { if(iface == swapchain->frontBuffer) { @@ -1087,8 +1087,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { if(!swapchain) { /* Primary offscreen render target */ TRACE("Offscreen render target\n"); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); + glDrawBuffer(myDevice->offscreenBuffer); + checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); } else { if(iface == swapchain->frontBuffer) { TRACE("Onscreen front buffer\n"); @@ -1118,7 +1118,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { flush_to_framebuffer_texture(This); break; } - if(!swapchain || swapchain->backBuffer) { + if(!swapchain) { + glDrawBuffer(myDevice->offscreenBuffer); + checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); + } else if(swapchain->backBuffer) { glDrawBuffer(GL_BACK); checkGLcall("glDrawBuffer(GL_BACK)"); } else { @@ -1730,7 +1733,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { glGetIntegerv(GL_READ_BUFFER, &prevRead); vcheckGLcall("glGetIntegerv"); - glReadBuffer(GL_BACK); + glReadBuffer(This->resource.wineD3DDevice->offscreenBuffer); vcheckGLcall("glReadBuffer"); glCopyTexImage2D(This->glDescription.target, @@ -1891,7 +1894,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch glGetIntegerv(GL_READ_BUFFER, &prevRead); vcheckGLcall("glGetIntegerv"); - glReadBuffer(GL_BACK); + glReadBuffer(swapChain ? GL_BACK : This->resource.wineD3DDevice->offscreenBuffer); vcheckGLcall("glReadBuffer"); glCopyTexImage2D(GL_TEXTURE_2D, 0, @@ -2179,7 +2182,9 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Bind the target texture */ glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); checkGLcall("glBindTexture"); - if(!swapchain || (swapchain->backBuffer && SrcSurface == swapchain->backBuffer[0])) { + if(!swapchain) { + glReadBuffer(myDevice->offscreenBuffer); + } else if(swapchain->backBuffer && SrcSurface == swapchain->backBuffer[0]) { glReadBuffer(GL_BACK); } else { glReadBuffer(GL_FRONT); @@ -2775,8 +2780,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glDrawBuffer(GL_FRONT); checkGLcall("glDrawBuffer(GL_FRONT)"); } else if(This == (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); + glDrawBuffer(myDevice->offscreenBuffer); + checkGLcall("glDrawBuffer(myDevice->offscreenBuffer3)"); } else { TRACE("Surface is higher back buffer, falling back to software\n"); return WINED3DERR_INVALIDCALL; @@ -2793,10 +2798,12 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * 0 /* Stencil */); /* Restore the original draw buffer */ - if(!dstSwapchain || (dstSwapchain->backBuffer && dstSwapchain->backBuffer[0])) { + if(!dstSwapchain) { + glDrawBuffer(myDevice->offscreenBuffer); + } else if(dstSwapchain->backBuffer && dstSwapchain->backBuffer[0]) { glDrawBuffer(GL_BACK); - vcheckGLcall("glDrawBuffer"); } + vcheckGLcall("glDrawBuffer"); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dbb8364..8bcffa3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -623,6 +623,7 @@ struct IWineD3DDeviceImpl /* X and GL Information */ GLint maxConcurrentLights; + GLenum offscreenBuffer; /* Selected capabilities */ int vs_selected_mode;

1 0

Felix Nawothnig : comctl32: Update header window in listview WM_PAINT handler.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 9badfb50cf38e930372d721450581f4597af86c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9badfb50cf38e930372d72145… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Wed Feb 28 18:07:17 2007 +0100 comctl32: Update header window in listview WM_PAINT handler. --- dlls/comctl32/listview.c | 3 +++ dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e9476ea..f590437 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8798,6 +8798,9 @@ static LRESULT LISTVIEW_Paint(LISTVIEW_INFO *infoPtr, HDC hdc) LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); LISTVIEW_UpdateScroll(infoPtr); } + + UpdateWindow(infoPtr->hwndHeader); + if (hdc) LISTVIEW_Refresh(infoPtr, hdc); else diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4ec1d1d..17d50dc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -573,7 +573,7 @@ static void test_redraw(void) trace("invalidate & update\n"); InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, redraw_listview_seq, "redraw listview", TRUE); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, redraw_listview_seq, "redraw listview", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0