April 2007 - Wine-Commits - list.winehq.org

Felix Nawothnig : wined3d: Issue an error when the render target is read back without SFLAG_INDRAWABLE being set .
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: e600f7d0822c58ed557fe4b3aaa729f67ce01f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e600f7d0822c58ed557fe4b3a… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sun Apr 8 00:56:45 2007 +0200 wined3d: Issue an error when the render target is read back without SFLAG_INDRAWABLE being set. --- dlls/wined3d/surface.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index af90b61..526c311 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1788,6 +1788,7 @@ static BOOL palette9_changed(IWineD3DSurfaceImpl *This) { static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; GLenum format, internal, type; CONVERT_TYPES convert; int bpp; @@ -1862,7 +1863,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { TRACE("Updated target %d\n", This->glDescription.target); } return WINED3D_OK; - } + } else + /* The only place where LoadTexture() might get called when isInDraw=1 + * is ActivateContext where lastActiveRenderTarget is preloaded. + */ + if(iface == device->lastActiveRenderTarget && device->isInDraw) + ERR("Reading back render target but SFLAG_INDRAWABLE not set\n"); + /* Otherwise: System memory copy must be most up to date */ if(This->CKeyFlags & DDSD_CKSRCBLT) {

1 0

Chris Robinson : winedbg: Align module addresses to 8 characters.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: 449aacc125bec09b003352cbf20073fccc132d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449aacc125bec09b003352cbf… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Apr 8 04:18:23 2007 -0700 winedbg: Align module addresses to 8 characters. --- programs/winedbg/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 3c67865..b3aefd9 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -153,7 +153,7 @@ struct info_module static void module_print_info(const IMAGEHLP_MODULE64* mi, BOOL is_embedded) { - dbg_printf("%s-%s\t%-16s%s\n", + dbg_printf("%8s-%8s\t%-16s%s\n", wine_dbgstr_longlong(mi->BaseOfImage), wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize), is_embedded ? "\\" : get_symtype_str(mi), mi->ModuleName);

1 0

Andrew Talbot : d3d9: Void functions should not return a value.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: 43155227d66b1c6225f91f1076aa903fe7874eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=43155227d66b1c6225f91f107… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 7 21:58:48 2007 +0100 d3d9: Void functions should not return a value. --- dlls/d3d9/basetexture.c | 2 +- dlls/d3d9/cubetexture.c | 4 ++-- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/indexbuffer.c | 2 +- dlls/d3d9/texture.c | 4 ++-- dlls/d3d9/volumetexture.c | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c index 1dff756..f80eb78 100644 --- a/dlls/d3d9/basetexture.c +++ b/dlls/d3d9/basetexture.c @@ -147,7 +147,7 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DBaseTexture9Impl_GetAutoGenFilterTyp static void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPDIRECT3DBASETEXTURE9 iface) { IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; TRACE("(%p) Relay\n" , This); - return IWineD3DBaseTexture_GenerateMipSubLevels(This->wineD3DBaseTexture); + IWineD3DBaseTexture_GenerateMipSubLevels(This->wineD3DBaseTexture); } const IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl = diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index c372314..747aedc 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -107,7 +107,7 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_GetPriority(LPDIRECT3DCUBETEXTURE9 static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture); + IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture); } static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(LPDIRECT3DCUBETEXTURE9 iface) { @@ -150,7 +150,7 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DCubeTexture9Impl_GetAutoGenFilterTyp static void WINAPI IDirect3DCubeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_GenerateMipSubLevels(This->wineD3DCubeTexture); + IWineD3DCubeTexture_GenerateMipSubLevels(This->wineD3DCubeTexture); } /* IDirect3DCubeTexture9 Interface follow: */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 162df0f..e9c4078 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -163,7 +163,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC static void WINAPI IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9 iface, int XScreenSpace, int YScreenSpace, DWORD Flags) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetCursorPosition(This->WineD3DDevice, XScreenSpace, YScreenSpace, Flags); + IWineD3DDevice_SetCursorPosition(This->WineD3DDevice, XScreenSpace, YScreenSpace, Flags); } static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9 iface, BOOL bShow) { @@ -256,7 +256,7 @@ static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UI TRACE("(%p) Relay\n", This); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ - return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (CONST WINED3DGAMMARAMP *)pRamp); + IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (CONST WINED3DGAMMARAMP *)pRamp); } static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { @@ -264,7 +264,7 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UI TRACE("(%p) Relay\n", This); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ - return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, (WINED3DGAMMARAMP *) pRamp); + IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, iSwapChain, (WINED3DGAMMARAMP *) pRamp); } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index c15df38..6c18867 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -104,7 +104,7 @@ static DWORD WINAPI IDirect3DIndexBuffer9Impl_GetPriority(LPDIRECT3DINDEXBUFFER9 static void WINAPI IDirect3DIndexBuffer9Impl_PreLoad(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer); + IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer); } static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer9Impl_GetType(LPDIRECT3DINDEXBUFFER9 iface) { diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 7eecacd..3adf4df 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -106,7 +106,7 @@ static DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) static void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_PreLoad(This->wineD3DTexture); + IWineD3DTexture_PreLoad(This->wineD3DTexture); } static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 iface) { @@ -149,7 +149,7 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LP static void WINAPI IDirect3DTexture9Impl_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture); + IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture); } /* IDirect3DTexture9 Interface follow: */ diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index d45ca0e..cf73f7a 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -105,7 +105,7 @@ static DWORD WINAPI IDirect3DVolumeTexture9Impl_GetPriority(LPDIRECT3DVOLUMETEXT static void WINAPI IDirect3DVolumeTexture9Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE9 iface) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_PreLoad(This->wineD3DVolumeTexture); + IWineD3DVolumeTexture_PreLoad(This->wineD3DVolumeTexture); } static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture9Impl_GetType(LPDIRECT3DVOLUMETEXTURE9 iface) { @@ -148,7 +148,7 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DVolumeTexture9Impl_GetAutoGenFilterT static void WINAPI IDirect3DVolumeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DVOLUMETEXTURE9 iface) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GenerateMipSubLevels(This->wineD3DVolumeTexture); + IWineD3DVolumeTexture_GenerateMipSubLevels(This->wineD3DVolumeTexture); } /* IDirect3DVolumeTexture9 Interface follow: */

1 0

Felix Nawothnig : wined3d: Allow np2 textures to be loaded for SFLAG_INDRAWABLE.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: c0782603d09807c6ca506948bb4a814a73430184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0782603d09807c6ca506948b… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sat Apr 7 23:37:41 2007 +0200 wined3d: Allow np2 textures to be loaded for SFLAG_INDRAWABLE. --- dlls/wined3d/surface.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1684d1a..af90b61 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1825,6 +1825,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { return WINED3DERR_INVALIDCALL; } + d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp); + if (This->Flags & SFLAG_INDRAWABLE) { if (This->glDescription.level != 0) FIXME("Surface in texture is only supported for level 0\n"); @@ -1842,16 +1844,16 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { glReadBuffer(This->resource.wineD3DDevice->offscreenBuffer); vcheckGLcall("glReadBuffer"); - glCopyTexImage2D(This->glDescription.target, - This->glDescription.level, - This->glDescription.glFormatInternal, - 0, - 0, - This->currentDesc.Width, - This->currentDesc.Height, - 0); + surface_allocate_surface(This, internal, This->pow2Width, + This->pow2Height, format, type); + + glCopyTexSubImage2D(This->glDescription.target, + This->glDescription.level, + 0, 0, 0, 0, + This->currentDesc.Width, + This->currentDesc.Height); + checkGLcall("glCopyTexSubImage2D"); - checkGLcall("glCopyTexImage2D"); glReadBuffer(prevRead); vcheckGLcall("glReadBuffer"); @@ -1869,8 +1871,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { } else This->Flags &= ~SFLAG_GLCKEY; - d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp); - /* The width is in 'length' not in bytes */ width = This->currentDesc.Width; pitch = IWineD3DSurface_GetPitch(iface);

1 0

Felix Nawothnig : wined3d: Preload target in ActivateContext() for ORM_BACKBUFFER/ORM_PBUFFER.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: 2d0016c5bc872afb562727278cfd341cea182600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d0016c5bc872afb562727278… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Sun Apr 8 02:46:40 2007 +0200 wined3d: Preload target in ActivateContext() for ORM_BACKBUFFER/ORM_PBUFFER. --- dlls/wined3d/context.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d21f5b8..d3424fd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -712,6 +712,13 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU break; } + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) { + /* Make sure we have a OpenGL texture name so the PreLoad() used to read the buffer + * back when we are done won't mark us dirty. + */ + IWineD3DSurface_PreLoad(target); + } + if(!oldRenderOffscreen) { Context_MarkStateDirty(context, WINED3DRS_CULLMODE); Context_MarkStateDirty(context, WINED3DTS_PROJECTION);

1 0

Chris Robinson : quartz: Fix error with operator precedence.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: e6e4056e1e1f444eab7063a1000d99a7e3fe9a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e4056e1e1f444eab7063a10… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Apr 7 05:42:54 2007 -0700 quartz: Fix error with operator precedence. --- dlls/quartz/memallocator.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 3cabe12..f9c64ac 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -683,7 +683,10 @@ static HRESULT WINAPI StdMediaSample2_SetDiscontinuity(IMediaSample2 * iface, BO TRACE("(%s)\n", bIsDiscontinuity ? "TRUE" : "FALSE"); - This->props.dwSampleFlags = (This->props.dwSampleFlags & ~AM_SAMPLE_DATADISCONTINUITY) | bIsDiscontinuity ? AM_SAMPLE_DATADISCONTINUITY : 0; + if (bIsDiscontinuity) + This->props.dwSampleFlags |= AM_SAMPLE_DATADISCONTINUITY; + else + This->props.dwSampleFlags &= ~AM_SAMPLE_DATADISCONTINUITY; return S_OK; }

1 0

Andrew Talbot : d3d8: Void functions should not return a value.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: fb367f813af8dc24b88dcbe5121fe0503e06ca06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb367f813af8dc24b88dcbe51… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 7 21:27:55 2007 +0100 d3d8: Void functions should not return a value. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/indexbuffer.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 49006b5..71daf34 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -104,7 +104,7 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetPriority(LPDIRECT3DCUBETEXTURE8 static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture); + IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture); } static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(LPDIRECT3DCUBETEXTURE8 iface) { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 87d31d0..9e05a51 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -208,7 +208,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 static void WINAPI IDirect3DDevice8Impl_SetCursorPosition(LPDIRECT3DDEVICE8 iface, UINT XScreenSpace, UINT YScreenSpace, DWORD Flags) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetCursorPosition(This->WineD3DDevice, XScreenSpace, YScreenSpace, Flags); + IWineD3DDevice_SetCursorPosition(This->WineD3DDevice, XScreenSpace, YScreenSpace, Flags); } static BOOL WINAPI IDirect3DDevice8Impl_ShowCursor(LPDIRECT3DDEVICE8 iface, BOOL bShow) { @@ -359,7 +359,7 @@ static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DW TRACE("(%p) Relay\n", This); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ - return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, (CONST WINED3DGAMMARAMP *) pRamp); + IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, (CONST WINED3DGAMMARAMP *) pRamp); } static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) { @@ -367,7 +367,7 @@ static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3 TRACE("(%p) Relay\n", This); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ - return IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, 0, (WINED3DGAMMARAMP *) pRamp); + IWineD3DDevice_GetGammaRamp(This->WineD3DDevice, 0, (WINED3DGAMMARAMP *) pRamp); } static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 8f0ec74..ad92cf4 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -103,7 +103,7 @@ static DWORD WINAPI IDirect3DIndexBuffer8Impl_GetPriority(LPDIRECT3DINDEXBUFFER8 static void WINAPI IDirect3DIndexBuffer8Impl_PreLoad(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer); + IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer); } static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(LPDIRECT3DINDEXBUFFER8 iface) { diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 17af4ee..8965735 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -104,7 +104,7 @@ static DWORD WINAPI IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 iface) static void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_PreLoad(This->wineD3DTexture); + IWineD3DTexture_PreLoad(This->wineD3DTexture); } static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 iface) { diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 430f0b4..0b01fb2 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -104,7 +104,7 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMETEXT static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_PreLoad(This->wineD3DVolumeTexture); + IWineD3DVolumeTexture_PreLoad(This->wineD3DVolumeTexture); } static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(LPDIRECT3DVOLUMETEXTURE8 iface) {

1 0

Chris Robinson : quartz: Pass the media sample to the individual transform filter callbacks.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: eda96fa7f978ec4aa48d36afd6dd4e625fb5708b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda96fa7f978ec4aa48d36afd… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Apr 7 02:32:45 2007 -0700 quartz: Pass the media sample to the individual transform filter callbacks. This is so the filters can pass on and use timing, discontinuity, and other information stored in the sample as needed. --- dlls/quartz/acmwrapper.c | 43 +++++++++++++++++++++++++++---------------- dlls/quartz/avidec.c | 37 ++++++++++++++++++++++++------------- dlls/quartz/transform.c | 34 +--------------------------------- dlls/quartz/transform.h | 2 +- 4 files changed, 53 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 1142a90..0258e9c 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -59,21 +59,32 @@ typedef struct ACMWrapperImpl BOOL reinit_codec; /* FIXME: Should use sync points instead */ } ACMWrapperImpl; -static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilter, LPBYTE data, DWORD size) +static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) { ACMWrapperImpl* This = (ACMWrapperImpl*)pTransformFilter; AM_MEDIA_TYPE amt; - HRESULT hr; - IMediaSample* pSample = NULL; + IMediaSample* pOutSample = NULL; DWORD cbDstStream; LPBYTE pbDstStream; + DWORD cbSrcStream = 0; + LPBYTE pbSrcStream = NULL; ACMSTREAMHEADER ash; DWORD offset = 0; BOOL stop = FALSE; BOOL unprepare_header = FALSE; MMRESULT res; + HRESULT hr; + + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); + if (FAILED(hr)) + { + ERR("Cannot get pointer to sample data (%x)\n", hr); + return hr; + } + + cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("(%p)->(%p,%d)\n", This, data, size); + TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { @@ -84,33 +95,33 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte while(hr == S_OK && !stop) { DWORD rem_buf = This->max_size - This->current_size; - DWORD rem_smp = size - offset; + DWORD rem_smp = cbSrcStream - offset; DWORD copy_size = min(rem_buf, rem_smp); - memcpy(This->buffer + This->current_size, data + offset, copy_size); + memcpy(This->buffer + This->current_size, pbSrcStream + offset, copy_size); This->current_size += copy_size; offset += copy_size; - if (offset >= size) + if (offset >= cbSrcStream) stop = TRUE; if (This->current_size < This->max_size) break; - hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0); + hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); return hr; } - hr = IMediaSample_SetActualDataLength(pSample, 0); + hr = IMediaSample_SetActualDataLength(pOutSample, 0); assert(hr == S_OK); - hr = IMediaSample_GetPointer(pSample, &pbDstStream); + hr = IMediaSample_GetPointer(pOutSample, &pbDstStream); if (FAILED(hr)) { ERR("Unable to get pointer to buffer (%x)\n", hr); goto error; } - cbDstStream = IMediaSample_GetSize(pSample); + cbDstStream = IMediaSample_GetSize(pOutSample); ash.cbStruct = sizeof(ash); ash.fdwStatus = 0; @@ -135,7 +146,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte TRACE("used in %u, used out %u\n", ash.cbSrcLengthUsed, ash.cbDstLengthUsed); - hr = IMediaSample_SetActualDataLength(pSample, ash.cbDstLengthUsed); + hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); assert(hr == S_OK); if (ash.cbSrcLengthUsed < ash.cbSrcLength) { @@ -145,7 +156,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte else This->current_size = 0; - hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pSample); + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { ERR("Error sending sample (%x)\n", hr); goto error; @@ -156,9 +167,9 @@ error: ERR("Cannot unprepare header %d\n", res); unprepare_header = FALSE; - if (pSample) - IMediaSample_Release(pSample); - pSample = NULL; + if (pOutSample) + IMediaSample_Release(pOutSample); + pOutSample = NULL; } return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index aa80800..0225d38 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -72,19 +72,30 @@ static HRESULT AVIDec_ProcessBegin(TransformFilterImpl* pTransformFilter) return S_OK; } -static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, LPBYTE data, DWORD size) +static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) { AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; VIDEOINFOHEADER* format; AM_MEDIA_TYPE amt; HRESULT hr; DWORD res; - IMediaSample* pSample = NULL; + IMediaSample* pOutSample = NULL; DWORD cbDstStream; LPBYTE pbDstStream; + DWORD cbSrcStream; + LPBYTE pbSrcStream; + + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); + if (FAILED(hr)) + { + ERR("Cannot get pointer to sample data (%x)\n", hr); + return hr; + } + + cbSrcStream = IMediaSample_GetActualDataLength(pSample); + + TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); - TRACE("(%p)->(%p,%d)\n", This, data, size); - hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { ERR("Unable to retrieve media type\n"); @@ -93,42 +104,42 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, L format = (VIDEOINFOHEADER*)amt.pbFormat; /* Update input size to match sample size */ - This->pBihIn->biSizeImage = size; + This->pBihIn->biSizeImage = cbSrcStream; - hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0); + hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); goto error; } - hr = IMediaSample_SetActualDataLength(pSample, 0); + hr = IMediaSample_SetActualDataLength(pOutSample, 0); assert(hr == S_OK); - hr = IMediaSample_GetPointer(pSample, &pbDstStream); + hr = IMediaSample_GetPointer(pOutSample, &pbDstStream); if (FAILED(hr)) { ERR("Unable to get pointer to buffer (%x)\n", hr); goto error; } - cbDstStream = IMediaSample_GetSize(pSample); + cbDstStream = IMediaSample_GetSize(pOutSample); if (cbDstStream < This->pBihOut->biSizeImage) { ERR("Sample size is too small %d < %d\n", cbDstStream, This->pBihOut->biSizeImage); hr = E_FAIL; goto error; } - res = ICDecompress(This->hvid, 0, This->pBihIn, data, This->pBihOut, pbDstStream); + res = ICDecompress(This->hvid, 0, This->pBihIn, pbSrcStream, This->pBihOut, pbDstStream); if (res != ICERR_OK) ERR("Error occurred during the decompression (%x)\n", res); - hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pSample); + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { ERR("Error sending sample (%x)\n", hr); goto error; } error: - if (pSample) - IMediaSample_Release(pSample); + if (pOutSample) + IMediaSample_Release(pOutSample); return hr; } diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 2c2c0bf..13bd308 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -57,42 +57,10 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl; static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) { TransformFilterImpl *This = (TransformFilterImpl *)iface; - LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; - REFERENCE_TIME tStart, tStop; - HRESULT hr; TRACE("%p %p\n", iface, pSample); - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); - if (FAILED(hr)) - { - ERR("Cannot get pointer to sample data (%x)\n", hr); - return hr; - } - - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); - if (FAILED(hr)) - ERR("Cannot get sample time (%x)\n", hr); - - cbSrcStream = IMediaSample_GetActualDataLength(pSample); - - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); - -#if 0 /* For debugging purpose */ - { - int i; - for(i = 0; i < cbSrcStream; i++) - { - if ((i!=0) && !(i%16)) - TRACE("\n"); - TRACE("%02x ", pbSrcStream[i]); - } - TRACE("\n"); - } -#endif - - return This->pFuncsTable->pfnProcessSampleData(This, pbSrcStream, cbSrcStream); + return This->pFuncsTable->pfnProcessSampleData(This, pSample); } static HRESULT TransformFilter_Input_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index c967dd4..209225e 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -22,7 +22,7 @@ typedef struct TransformFilterImpl TransformFilterImpl; typedef struct TransformFuncsTable { HRESULT (*pfnProcessBegin) (TransformFilterImpl* This); - HRESULT (*pfnProcessSampleData) (TransformFilterImpl* This, LPBYTE data, DWORD size); + HRESULT (*pfnProcessSampleData) (TransformFilterImpl* This, IMediaSample *pSample); HRESULT (*pfnProcessEnd) (TransformFilterImpl* This); HRESULT (*pfnQueryConnect) (TransformFilterImpl* This, const AM_MEDIA_TYPE * pmt); HRESULT (*pfnConnectInput) (TransformFilterImpl* This, const AM_MEDIA_TYPE * pmt);

1 0

Chris Robinson : quartz: Fix ALIGN macros.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: d9f755875bb52d454dbfb843ba132ede9aa4dea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f755875bb52d454dbfb843b… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Apr 7 07:05:33 2007 -0700 quartz: Fix ALIGN macros. --- dlls/quartz/pin.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 48cedfc..b7d9a52 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -34,8 +34,8 @@ static const IPinVtbl OutputPin_Vtbl; static const IMemInputPinVtbl MemInputPin_Vtbl; static const IPinVtbl PullPin_Vtbl; -#define ALIGNDOWN(value,boundary) ((value) & ~(boundary-1)) -#define ALIGNUP(value,boundary) (ALIGNDOWN(value - 1, boundary) + boundary) +#define ALIGNDOWN(value,boundary) ((value)/(boundary)*(boundary)) +#define ALIGNUP(value,boundary) (ALIGNDOWN((value)+(boundary)-1, (boundary))) static inline InputPin *impl_from_IMemInputPin( IMemInputPin *iface ) {

1 0

appdb/include application.php
by WineHQ April 9, 2007

April 9, 2007

ChangeSet ID: 31038 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/08 20:24:34 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use absolute path in application::objectMakeUrl(), otherwise mail links won't work Patch: http://cvs.winehq.org/patch.py?id=31038 Old revision New revision Changes Path 1.100 1.101 +1 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.100 appdb/include/application.php:1.101 --- appdb/include/application.php:1.100 9 Apr 2007 1:24:34 -0000 +++ appdb/include/application.php 9 Apr 2007 1:24:34 -0000 @@ -826,7 +826,7 @@ class Application { function objectMakeUrl() { - $sUrl = BASE."appview.php?iAppId=$this->iAppId"; + $sUrl = APPDB_ROOT."appview.php?iAppId=$this->iAppId"; return $sUrl; }

1 0