March 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Reduce the number of checkGLcall' s in tex_coordindex() a bit.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 3234a4af2dee40b5f590f86d100fe8ddfac3b897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3234a4af2dee40b5f590f86d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:26 2009 +0100 wined3d: Reduce the number of checkGLcall's in tex_coordindex() a bit. --- dlls/wined3d/state.c | 62 +++++++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2757c64..e17816b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3127,14 +3127,13 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine glDisable(GL_TEXTURE_GEN_T); glDisable(GL_TEXTURE_GEN_R); glDisable(GL_TEXTURE_GEN_Q); - checkGLcall("glDisable(GL_TEXTURE_GEN_S,T,R,Q)"); + checkGLcall("WINED3DTSS_TCI_PASSTHRU - Disable texgen."); break; case WINED3DTSS_TCI_CAMERASPACEPOSITION: /* CameraSpacePosition means use the vertex position, transformed to camera space, * as the input texture coordinates for this stage's texture transformation. This * equates roughly to EYE_LINEAR */ - TRACE("WINED3DTSS_TCI_CAMERASPACEPOSITION - Set eye plane\n"); glMatrixMode(GL_MODELVIEW); glPushMatrix(); @@ -3144,20 +3143,18 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine glTexGenfv(GL_R, GL_EYE_PLANE, r_plane); glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane); glPopMatrix(); + checkGLcall("WINED3DTSS_TCI_CAMERASPACEPOSITION - Set eye plane."); - TRACE("WINED3DTSS_TCI_CAMERASPACEPOSITION - Set GL_TEXTURE_GEN_x and GL_x, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR\n"); - glEnable(GL_TEXTURE_GEN_S); - checkGLcall("glEnable(GL_TEXTURE_GEN_S)"); glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR)"); - glEnable(GL_TEXTURE_GEN_T); - checkGLcall("glEnable(GL_TEXTURE_GEN_T)"); glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR)"); - glEnable(GL_TEXTURE_GEN_R); - checkGLcall("glEnable(GL_TEXTURE_GEN_R)"); glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR)"); + checkGLcall("WINED3DTSS_TCI_CAMERASPACEPOSITION - Set texgen mode."); + + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); + checkGLcall("WINED3DTSS_TCI_CAMERASPACEPOSITION - Enable texgen."); + break; case WINED3DTSS_TCI_CAMERASPACENORMAL: @@ -3169,8 +3166,6 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine break; } - TRACE("WINED3DTSS_TCI_CAMERASPACENORMAL - Set eye plane\n"); - glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); @@ -3179,19 +3174,17 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine glTexGenfv(GL_R, GL_EYE_PLANE, r_plane); glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane); glPopMatrix(); + checkGLcall("WINED3DTSS_TCI_CAMERASPACENORMAL - Set eye plane."); - glEnable(GL_TEXTURE_GEN_S); - checkGLcall("glEnable(GL_TEXTURE_GEN_S)"); glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); - checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); - glEnable(GL_TEXTURE_GEN_T); - checkGLcall("glEnable(GL_TEXTURE_GEN_T)"); glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); - checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); - glEnable(GL_TEXTURE_GEN_R); - checkGLcall("glEnable(GL_TEXTURE_GEN_R)"); glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); - checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); + checkGLcall("WINED3DTSS_TCI_CAMERASPACENORMAL - Set texgen mode."); + + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); + checkGLcall("WINED3DTSS_TCI_CAMERASPACENORMAL - Enable texgen."); break; @@ -3204,8 +3197,6 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine break; } - TRACE("WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR - Set eye plane\n"); - glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); @@ -3214,28 +3205,29 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine glTexGenfv(GL_R, GL_EYE_PLANE, r_plane); glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane); glPopMatrix(); + checkGLcall("WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR - Set eye plane."); - glEnable(GL_TEXTURE_GEN_S); - checkGLcall("glEnable(GL_TEXTURE_GEN_S)"); glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV); - checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV)"); - glEnable(GL_TEXTURE_GEN_T); - checkGLcall("glEnable(GL_TEXTURE_GEN_T)"); glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV); - checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV)"); - glEnable(GL_TEXTURE_GEN_R); - checkGLcall("glEnable(GL_TEXTURE_GEN_R)"); glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV); - checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV)"); + checkGLcall("WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR - Set texgen mode."); + + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); + checkGLcall("WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR - Enable texgen."); break; default: + FIXME("Unhandled WINED3DTSS_TEXCOORDINDEX %#x\n", + stateblock->textureState[stage][WINED3DTSS_TEXCOORDINDEX]); glDisable(GL_TEXTURE_GEN_S); glDisable(GL_TEXTURE_GEN_T); glDisable(GL_TEXTURE_GEN_R); glDisable(GL_TEXTURE_GEN_Q); - FIXME("Unhandled WINED3DTSS_TEXCOORDINDEX %x\n", stateblock->textureState[stage][WINED3DTSS_TEXCOORDINDEX]); + checkGLcall("Disable texgen."); + break; }

1 0

Henri Verbeet : wined3d: Implement WINED3DTSS_TCI_SPHEREMAP.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 771fe7fd8a7d32861225a20607c66c4c53a1e187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=771fe7fd8a7d32861225a2060… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:26 2009 +0100 wined3d: Implement WINED3DTSS_TCI_SPHEREMAP. --- dlls/wined3d/state.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e17816b..1d2cda5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3219,6 +3219,18 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine break; + case WINED3DTSS_TCI_SPHEREMAP: + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); + checkGLcall("WINED3DTSS_TCI_SPHEREMAP - Set texgen mode."); + + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glDisable(GL_TEXTURE_GEN_R); + checkGLcall("WINED3DTSS_TCI_SPHEREMAP - Enable texgen."); + + break; + default: FIXME("Unhandled WINED3DTSS_TEXCOORDINDEX %#x\n", stateblock->textureState[stage][WINED3DTSS_TEXCOORDINDEX]);

1 0

Henri Verbeet : wined3d: Make the texunit field in struct stb_const_desc unsigned.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 59c5962828b0aecba9c1423a9dd81850acfadcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c5962828b0aecba9c1423a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:27 2009 +0100 wined3d: Make the texunit field in struct stb_const_desc unsigned. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2125366..c90a77d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -438,7 +438,7 @@ enum vertexprocessing_mode { #define WINED3D_CONST_NUM_UNUSED ~0U struct stb_const_desc { - char texunit; + unsigned char texunit; UINT const_num; };

1 0

Henri Verbeet : wined3d: Fix a few sign compare warnings.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 42e31a42426692154f54e04f7995a36bdde8f6ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e31a42426692154f54e04f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:27 2009 +0100 wined3d: Fix a few sign compare warnings. --- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 40 ++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 46 +++++++++++++++++++------------------ dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/state.c | 6 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/volumetexture.c | 4 +- dlls/wined3d/wined3d_private.h | 2 +- 10 files changed, 54 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e31a42426692154f54e…

1 0

Henri Verbeet : wined3d: Add a more convenient way to check if a surface is on a swapchain.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 899df56ebeb431d24cadf79719f43edf74345558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899df56ebeb431d24cadf7971… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:27 2009 +0100 wined3d: Add a more convenient way to check if a surface is on a swapchain. This won't help if we actually need the swapchain, of course. --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/surface.c | 29 +++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7bf6b57..9c7e6ca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1730,6 +1730,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, object->presentParms.MultiSampleQuality, TRUE /* Lockable */, &object->frontBuffer); if (SUCCEEDED(hr)) { IWineD3DSurface_SetContainer(object->frontBuffer, (IWineD3DBase *)object); + ((IWineD3DSurfaceImpl *)object->frontBuffer)->Flags |= SFLAG_SWAPCHAIN; if(surface_type == SURFACE_OPENGL) { IWineD3DSurface_ModifyLocation(object->frontBuffer, SFLAG_INDRAWABLE, TRUE); } @@ -1812,6 +1813,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, object->presentParms.MultiSampleQuality, TRUE /* Lockable */, &object->backBuffer[i]); if(SUCCEEDED(hr)) { IWineD3DSurface_SetContainer(object->backBuffer[i], (IWineD3DBase *)object); + ((IWineD3DSurfaceImpl *)object->backBuffer[i])->Flags |= SFLAG_SWAPCHAIN; } else { ERR("Cannot create new back buffer\n"); goto error; @@ -6618,11 +6620,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa TRACE("Changing the front buffer from %p to %p\n", Swapchain->frontBuffer, Front); if(Swapchain->frontBuffer) + { IWineD3DSurface_SetContainer(Swapchain->frontBuffer, NULL); + ((IWineD3DSurfaceImpl *)Swapchain->frontBuffer)->Flags &= ~SFLAG_SWAPCHAIN; + } Swapchain->frontBuffer = Front; if(Swapchain->frontBuffer) { IWineD3DSurface_SetContainer(Swapchain->frontBuffer, (IWineD3DBase *) Swapchain); + ((IWineD3DSurfaceImpl *)Swapchain->frontBuffer)->Flags |= SFLAG_SWAPCHAIN; } } @@ -6660,11 +6666,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa LEAVE_GL(); if(Swapchain->backBuffer[0]) + { IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], NULL); + ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags &= ~SFLAG_SWAPCHAIN; + } Swapchain->backBuffer[0] = Back; if(Swapchain->backBuffer[0]) { IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], (IWineD3DBase *) Swapchain); + ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags |= SFLAG_SWAPCHAIN; } else { HeapFree(GetProcessHeap(), 0, Swapchain->backBuffer); Swapchain->backBuffer = NULL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ecca666..b0c6511 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1120,7 +1120,6 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; - IWineD3DSwapChain *swapchain = NULL; TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); @@ -1157,8 +1156,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED * Use the render target readback if the surface is on a swapchain(=onscreen render target) or the current primary target * Offscreen targets which are not active at the moment or are higher targets(FBOs) can be locked with the texture path */ - IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain); - if(swapchain || iface == myDevice->render_targets[0]) { + if ((This->Flags & SFLAG_SWAPCHAIN) || iface == myDevice->render_targets[0]) + { const RECT *pass_rect = pRect; /* IWineD3DSurface_LoadLocation does not check if the rectangle specifies the full surfaces @@ -1194,8 +1193,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED case RTL_DISABLE: break; } - if(swapchain) IWineD3DSwapChain_Release(swapchain); - } else if(iface == myDevice->stencilBufferTarget) { /** the depth stencil in openGL has a format of GL_FLOAT * which should be good for WINED3DFMT_D16_LOCKABLE @@ -1376,7 +1373,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; - IWineD3DSwapChainImpl *swapchain = NULL; BOOL fullsurface; if (!(This->Flags & SFLAG_LOCKED)) { @@ -1403,10 +1399,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { goto unlock_end; } - IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain); - if(swapchain || (myDevice->render_targets && iface == myDevice->render_targets[0])) { - if(swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - + if ((This->Flags & SFLAG_SWAPCHAIN) || (myDevice->render_targets && iface == myDevice->render_targets[0])) + { if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { static BOOL warned = FALSE; if(!warned) { @@ -4220,12 +4214,9 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW persistent ? "TRUE" : "FALSE"); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - IWineD3DSwapChain *swapchain = NULL; - - if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { + if (This->Flags & SFLAG_SWAPCHAIN) + { TRACE("Surface %p is an onscreen surface\n", iface); - - IWineD3DSwapChain_Release(swapchain); } else { /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ if (flag & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) flag |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); @@ -4478,7 +4469,6 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - IWineD3DSwapChain *swapchain = NULL; GLenum format, internal, type; CONVERT_TYPES convert; int bpp; @@ -4487,10 +4477,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D BOOL drawable_read_ok = TRUE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { + if (This->Flags & SFLAG_SWAPCHAIN) + { TRACE("Surface %p is an onscreen surface\n", iface); - - IWineD3DSwapChain_Release(swapchain); } else { /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. * Prefer SFLAG_INTEXTURE. */ @@ -4691,7 +4680,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D This->Flags |= flag; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !swapchain + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !(This->Flags & SFLAG_SWAPCHAIN) && (This->Flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) { /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ This->Flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 87947ee..d53f2d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1643,6 +1643,7 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back); #define SFLAG_DS_ONSCREEN 0x00200000 /* Is a depth stencil, last modified onscreen */ #define SFLAG_DS_OFFSCREEN 0x00400000 /* Is a depth stencil, last modified offscreen */ #define SFLAG_INOVERLAYDRAW 0x00800000 /* Overlay drawing is in progress. Recursion prevention */ +#define SFLAG_SWAPCHAIN 0x01000000 /* The surface is part of a swapchain */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

Henri Verbeet : wined3d: Don' t use rtInternal for surfaces that are on a swapchain.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 4469fbd43d959cfa306c32c87339c03355135664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4469fbd43d959cfa306c32c87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:27 2009 +0100 wined3d: Don't use rtInternal for surfaces that are on a swapchain. These surfaces won't be attached to an FBO anyway, so avoid the cost of a potential format conversion when blitting from a non-RT surface. This is mostly an issue for ddraw applications with 16 bit render targets. --- dlls/wined3d/surface.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b0c6511..35ba9a4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1621,7 +1621,10 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(srgb_mode) { *internal = glDesc->glGammaInternal; - } else if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { + } + else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET + && !(This->Flags & SFLAG_SWAPCHAIN)) + { *internal = glDesc->rtInternal; } else { *internal = glDesc->glInternal;

1 0

Henri Verbeet : wined3d: Do the ffp_valid check before even trying to use the element.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 25b60e168a5ed4e484bb5f2676a250aebd918c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b60e168a5ed4e484bb5f267… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:28 2009 +0100 wined3d: Do the ffp_valid check before even trying to use the element. --- dlls/wined3d/drawprim.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 804e65b..3f61b8a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -162,10 +162,23 @@ void primitiveDeclarationConvertToStridedData( TRACE("Offset %d Stream %d UsageIndex %d\n", element->Offset, element->Stream, element->UsageIndex); if (useVertexShaderFunction) + { stride_used = vshader_get_input(This->stateBlock->vertexShader, element->Usage, element->UsageIndex, &idx); + } else - stride_used = fixed_get_input(element->Usage, element->UsageIndex, &idx); + { + if (!vertexDeclaration->ffp_valid[i]) + { + WARN("Skipping unsupported fixed function element of type %s and usage %s\n", + debug_d3ddecltype(element->Type), debug_d3ddeclusage(element->Usage)); + stride_used = FALSE; + } + else + { + stride_used = fixed_get_input(element->Usage, element->UsageIndex, &idx); + } + } if (stride_used) { TRACE("Load %s array %u [usage=%s, usage_idx=%u, " @@ -174,21 +187,16 @@ void primitiveDeclarationConvertToStridedData( debug_d3ddeclusage(element->Usage), element->UsageIndex, element->Stream, element->Offset, stride, debug_d3ddecltype(element->Type), streamVBO); - if (!useVertexShaderFunction && !vertexDeclaration->ffp_valid[i]) { - WARN("Skipping unsupported fixed function element of type %s and usage %s\n", - debug_d3ddecltype(element->Type), debug_d3ddeclusage(element->Usage)); - } else { - strided->u.input[idx].lpData = data; - strided->u.input[idx].dwType = element->Type; - strided->u.input[idx].dwStride = stride; - strided->u.input[idx].VBO = streamVBO; - strided->u.input[idx].streamNo = element->Stream; - if (!GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) && element->Type == WINED3DDECLTYPE_D3DCOLOR) - { - strided->swizzle_map |= 1 << idx; - } - strided->use_map |= 1 << idx; + strided->u.input[idx].lpData = data; + strided->u.input[idx].dwType = element->Type; + strided->u.input[idx].dwStride = stride; + strided->u.input[idx].VBO = streamVBO; + strided->u.input[idx].streamNo = element->Stream; + if (!GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) && element->Type == WINED3DDECLTYPE_D3DCOLOR) + { + strided->swizzle_map |= 1 << idx; } + strided->use_map |= 1 << idx; } } /* Now call PreLoad on all the vertex buffers. In the very rare case

1 0

Alexandre Julliard : wininet/tests: Fix the http tests for the new winehq. org behavior.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 8d2ce074bbc75c9efab6070544f4eb831a3db339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d2ce074bbc75c9efab607054… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 11:55:17 2009 +0100 wininet/tests: Fix the http tests for the new winehq.org behavior. --- dlls/wininet/tests/http.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 193c446..27e393b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -84,7 +84,8 @@ static BOOL first_connection_to_test_url = TRUE; #define CHECK_NOTIFIED2(status, num) \ do { \ - ok(notified[status] == (num), "expected status %d (%s) %d times, received %d times\n", \ + ok(notified[status] + optional[status] == (num), \ + "expected status %d (%s) %d times, received %d times\n", \ status, status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ status_string[status] : "unknown", (num), notified[status]); \ CLEAR_NOTIFIED(status); \ @@ -349,12 +350,12 @@ static void InternetReadFile_test(int flags) if (flags & INTERNET_FLAG_ASYNC) WaitForSingleObject(hCompleteEvent, INFINITE); - todo_wine if (first_connection_to_test_url) + if (first_connection_to_test_url) { CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); } - else + else todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); @@ -446,8 +447,8 @@ static void InternetReadFile_test(int flags) if (length == 0) break; } - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); abort: trace("aborting\n"); SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); @@ -754,8 +755,12 @@ abort: Sleep(100); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); } + /* to enable once Wine is fixed to never send it CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + */ + CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; }

1 0

Aric Stewart : msctf: ThreadMgr sink framework.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: f723e4ca0862137d6e4ad8adc22d0ee64d38e904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f723e4ca0862137d6e4ad8adc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 24 08:21:28 2009 -0500 msctf: ThreadMgr sink framework. --- dlls/msctf/threadmgr.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 76c1fd6..eb5918e 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -34,18 +34,41 @@ #include "objbase.h" #include "wine/unicode.h" +#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); +typedef struct tagThreadMgrSink { + struct list entry; + union { + /* ThreadMgr Sinks */ + IUnknown *pIUnknown; + /* ITfActiveLanguageProfileNotifySink *pITfActiveLanguageProfileNotifySink; */ + /* ITfDisplayAttributeNotifySink *pITfDisplayAttributeNotifySink; */ + /* ITfKeyTraceEventSink *pITfKeyTraceEventSink; */ + /* ITfPreservedKeyNotifySink *pITfPreservedKeyNotifySink; */ + /* ITfThreadFocusSink *pITfThreadFocusSink; */ + /* ITfThreadMgrEventSink *pITfThreadMgrEventSink; */ + } interfaces; +} ThreadMgrSink; + typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; LONG refCount; ITfDocumentMgr *focus; + + /* kept as separate lists to reduce unnecessary iterations */ + struct list ActiveLanguageProfileNotifySink; + struct list DisplayAttributeNotifySink; + struct list KeyTraceEventSink; + struct list PreservedKeyNotifySink; + struct list ThreadFocusSink; + struct list ThreadMgrEventSink; } ThreadMgr; static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) @@ -53,12 +76,59 @@ static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); } +static void free_sink(ThreadMgrSink *sink) +{ + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(),0,sink); +} + static void ThreadMgr_Destructor(ThreadMgr *This) { + struct list *cursor, *cursor2; + TlsSetValue(tlsIndex,NULL); TRACE("destroying %p\n", This); if (This->focus) ITfDocumentMgr_Release(This->focus); + + /* free sinks */ + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + HeapFree(GetProcessHeap(),0,This); } @@ -303,6 +373,13 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TlsSetValue(tlsIndex,This); + list_init(&This->ActiveLanguageProfileNotifySink); + list_init(&This->DisplayAttributeNotifySink); + list_init(&This->KeyTraceEventSink); + list_init(&This->PreservedKeyNotifySink); + list_init(&This->ThreadFocusSink); + list_init(&This->ThreadMgrEventSink); + TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; return S_OK;

1 0

Alexandre Julliard : avifil32: Make avifile. dll into a stand-alone 16-bit module.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: b91cf321eaf53634bcee959ee6823d487e544e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91cf321eaf53634bcee959ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 16:56:58 2009 +0100 avifil32: Make avifile.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++ configure.ac | 1 + dlls/Makefile.in | 4 -- dlls/avifil32/Makefile.in | 2 - dlls/avifil32/api.c | 32 -------------------- dlls/avifile.dll16/Makefile.in | 13 ++++++++ .../avifile.dll16.spec} | 0 8 files changed, 23 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91cf321eaf53634bcee9…

1 0