wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Henri Verbeet : wined3d: IWineD3DVolume_GetDesc() should never fail.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 955858e97d215016d8a865a17aa1f246903eacdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=955858e97d215016d8a865a17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:48 2010 +0200 wined3d: IWineD3DVolume_GetDesc() should never fail. --- dlls/d3d8/volume.c | 26 +++++++++++--------------- dlls/d3d9/volume.c | 24 ++++++++++-------------- dlls/wined3d/volume.c | 4 +--- dlls/wined3d/volumetexture.c | 4 +++- include/wine/wined3d.idl | 2 +- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index c2b7417..1705822 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -177,28 +177,24 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - HRESULT hr; - WINED3DVOLUME_DESC wined3ddesc; + WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); - pDesc->Type = wined3ddesc.Type; - pDesc->Usage = wined3ddesc.Usage; - pDesc->Pool = wined3ddesc.Pool; - pDesc->Size = wined3ddesc.Size; - pDesc->Width = wined3ddesc.Width; - pDesc->Height = wined3ddesc.Height; - pDesc->Depth = wined3ddesc.Depth; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Size = wined3ddesc.Size; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0d87b86..1ecd2b2 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -182,29 +182,25 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_DESC* pDesc) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - WINED3DVOLUME_DESC wined3ddesc; - HRESULT hr; + WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); - pDesc->Type = wined3ddesc.Type; - pDesc->Usage = wined3ddesc.Usage; - pDesc->Pool = wined3ddesc.Pool; - pDesc->Width = wined3ddesc.Width; - pDesc->Height = wined3ddesc.Height; - pDesc->Depth = wined3ddesc.Depth; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 94ea319..8c596fb 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -187,7 +187,7 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa return resource_get_type((IWineD3DResource *)iface); } -static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) +static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) { IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface; @@ -201,8 +201,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DV desc->Width = volume->currentDesc.Width; desc->Height = volume->currentDesc.Height; desc->Depth = volume->currentDesc.Depth; - - return WINED3D_OK; } static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DLOCKED_BOX* pLockedVolume, CONST WINED3DBOX* pBox, DWORD Flags) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 6abba41..2e9fec9 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,7 +273,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu return WINED3DERR_INVALIDCALL; } - return IWineD3DVolume_GetDesc(volume, desc); + IWineD3DVolume_GetDesc(volume, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTexture *iface, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 36a82a5..80dabac 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2486,7 +2486,7 @@ interface IWineD3DSurface : IWineD3DResource ] interface IWineD3DVolume : IWineD3DResource { - HRESULT GetDesc( + void GetDesc( [out] WINED3DVOLUME_DESC *desc ); HRESULT LockBox(

1 0

Henri Verbeet : wined3d: IWineD3DSurface_GetDesc() should never fail.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 53183b4cf356b28c79cd3d51307a429f8b673413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53183b4cf356b28c79cd3d513… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:47 2010 +0200 wined3d: IWineD3DSurface_GetDesc() should never fail. --- dlls/d3d8/surface.c | 24 ++++++++++-------------- dlls/d3d9/surface.c | 24 ++++++++++-------------- dlls/ddraw/ddraw.c | 3 +-- dlls/ddraw/surface.c | 8 +------- dlls/wined3d/cubetexture.c | 4 +++- dlls/wined3d/surface_base.c | 4 +--- dlls/wined3d/texture.c | 4 +++- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 2 +- 9 files changed, 31 insertions(+), 44 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index a71ab12..6e59bd6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -190,27 +190,23 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 ifac static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFACE_DESC *pDesc) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); - pDesc->Type = wined3ddesc.resource_type; - pDesc->Usage = wined3ddesc.usage; - pDesc->Pool = wined3ddesc.pool; - pDesc->Size = wined3ddesc.size; - pDesc->MultiSampleType = wined3ddesc.multisample_type; - pDesc->Width = wined3ddesc.width; - pDesc->Height = wined3ddesc.height; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); + pDesc->Type = wined3ddesc.resource_type; + pDesc->Usage = wined3ddesc.usage; + pDesc->Pool = wined3ddesc.pool; + pDesc->Size = wined3ddesc.size; + pDesc->MultiSampleType = wined3ddesc.multisample_type; + pDesc->Width = wined3ddesc.width; + pDesc->Height = wined3ddesc.height; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index c7dc895..de3fb77 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -246,27 +246,23 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 ifac static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3DSURFACE_DESC* pDesc) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); - pDesc->Type = wined3ddesc.resource_type; - pDesc->Usage = wined3ddesc.usage; - pDesc->Pool = wined3ddesc.pool; - pDesc->MultiSampleType = wined3ddesc.multisample_type; - pDesc->MultiSampleQuality = wined3ddesc.multisample_quality; - pDesc->Width = wined3ddesc.width; - pDesc->Height = wined3ddesc.height; - } + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format); + pDesc->Type = wined3ddesc.resource_type; + pDesc->Usage = wined3ddesc.usage; + pDesc->Pool = wined3ddesc.pool; + pDesc->MultiSampleType = wined3ddesc.multisample_type; + pDesc->MultiSampleQuality = wined3ddesc.multisample_quality; + pDesc->Width = wined3ddesc.width; + pDesc->Height = wined3ddesc.height; - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 865d5d0..cb942d4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2389,8 +2389,7 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE IWineD3DSurface_GetClipper(wineD3DSurface, &clipper); /* Get the surface properties */ - hr = IWineD3DSurface_GetDesc(wineD3DSurface, &Desc); - if(hr != D3D_OK) return hr; + IWineD3DSurface_GetDesc(wineD3DSurface, &Desc); Format = Desc.format; Usage = Desc.usage; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a433913..badd46b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3588,13 +3588,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr } surface->surface_desc.dwFlags |= DDSD_PIXELFORMAT; - hr = IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc); - if (FAILED(hr)) - { - ERR("Failed to get wined3d surface desc, hr %#x.\n", hr); - IWineD3DSurface_Release(surface->WineD3DSurface); - return hr; - } + IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc); format = wined3d_desc.format; if (format == WINED3DFMT_UNKNOWN) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 519efbd..13ec3a8 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -337,7 +337,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetLevelDesc(IWineD3DCubeTexture * return WINED3DERR_INVALIDCALL; } - return IWineD3DSurface_GetDesc(surface, desc); + IWineD3DSurface_GetDesc(surface, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DCubeTextureImpl_GetCubeMapSurface(IWineD3DCubeTexture *iface, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index eb64804..172b8a8 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -146,7 +146,7 @@ void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface) return ((IWineD3DSurfaceImpl *)iface)->resource.parent; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) +void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) { IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; @@ -161,8 +161,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSU desc->multisample_quality = surface->currentDesc.MultiSampleQuality; desc->width = surface->currentDesc.Width; desc->height = surface->currentDesc.Height; - - return WINED3D_OK; } HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8e285f7..a52d7c4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -353,7 +353,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, U return WINED3DERR_INVALIDCALL; } - return IWineD3DSurface_GetDesc(surface, desc); + IWineD3DSurface_GetDesc(surface, desc); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30a5ea5..d9e6e83 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2151,7 +2151,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN; +void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 942ecdc..36a82a5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2373,7 +2373,7 @@ interface IWineD3DClipper : IUnknown ] interface IWineD3DSurface : IWineD3DResource { - HRESULT GetDesc( + void GetDesc( [out] WINED3DSURFACE_DESC *desc ); HRESULT LockRect(

1 0

Henri Verbeet : wined3d: GL_DRAW_FRAMEBUFFER depends on either ARB_framebuffer_object or EXT_framebuffer_blit .
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: f49028d91c1f23109fdb521a48b32877275f4fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49028d91c1f23109fdb521a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:46 2010 +0200 wined3d: GL_DRAW_FRAMEBUFFER depends on either ARB_framebuffer_object or EXT_framebuffer_blit. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 455eb47..3326411 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -165,7 +165,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * gl_filter = GL_NEAREST; ENTER_GL(); - context_bind_fbo(context2, GL_DRAW_FRAMEBUFFER, NULL); + context_bind_fbo(context2, GL_FRAMEBUFFER, NULL); /* Set up the texture. The surface is not in a IWineD3D*Texture container, * so there are no d3d texture settings to dirtify

1 0

Alistair Leslie-Hughes : mshtml: Correct test for unknown dispID.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 168fc942f6add495e75d9c4d6d7e40e7dc433128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=168fc942f6add495e75d9c4d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 8 14:39:53 2010 +1000 mshtml: Correct test for unknown dispID. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 65451b1..d1d02f0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -834,6 +834,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D CHECK_EXPECT(OnChanged_1012); return S_OK; case 1030: + case 3000028: case 3000029: case 3000030: /* TODO */

1 0

Misha Koshelev : d3dx9_36: Fix the D3DXCreateMesh() prototype.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: b9b9d7ccca84a7d7a25ea5895f18fb6c2e73ca80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b9d7ccca84a7d7a25ea5895… Author: Misha Koshelev <misha680(a)gmail.com> Date: Tue Sep 7 19:33:22 2010 -0500 d3dx9_36: Fix the D3DXCreateMesh() prototype. --- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 12 ++++++------ include/d3dx9mesh.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 28cf9d2..12e26da 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -583,7 +583,7 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST return TRUE; } -HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST LPD3DVERTEXELEMENT9 *declaration, +HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST D3DVERTEXELEMENT9 *declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) { FIXME("(%d, %d, %d, %p, %p, %p): stub\n", numfaces, numvertices, options, declaration, device, mesh); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 488515d..619d667 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1006,7 +1006,7 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(0, 0, 0, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, NULL, &d3dxmesh); + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl, NULL, &d3dxmesh); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); @@ -1035,13 +1035,13 @@ static void D3DXCreateMeshTest(void) return; } - hr = D3DXCreateMesh(0, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(0, 3, D3DXMESH_MANAGED, decl, device, &d3dxmesh); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 0, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(1, 0, D3DXMESH_MANAGED, decl, device, &d3dxmesh); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, 0, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(1, 3, 0, decl, device, &d3dxmesh); todo_wine ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); if (hr == D3D_OK) @@ -1052,10 +1052,10 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, 0, device, &d3dxmesh); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, NULL); + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl, device, NULL); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl, device, &d3dxmesh); todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); if (hr == D3D_OK) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index bc3dd81..32d3947 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -150,7 +150,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) extern "C" { #endif -HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST LPD3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); +HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx); UINT WINAPI D3DXGetFVFVertexSize(DWORD);

1 0

Vincent Povirk : ole32: Don't fail if the file ends during a big block.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 2752c3bcd07806a84894eaad5b2c2299d139b1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2752c3bcd07806a84894eaad5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 7 19:17:43 2010 -0500 ole32: Don't fail if the file ends during a big block. Apparently, it's valid for the last block in a file to be incomplete. --- dlls/ole32/storage32.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8b6a3af..5c58201 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3875,13 +3875,20 @@ static BOOL StorageImpl_ReadBigBlock( void* buffer) { ULARGE_INTEGER ulOffset; - DWORD read; + DWORD read=0; ulOffset.u.HighPart = 0; ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read); - return (read == This->bigBlockSize); + + if (read && read < This->bigBlockSize) + { + /* File ends during this block; fill the rest with 0's. */ + memset((LPBYTE)buffer+read, 0, This->bigBlockSize-read); + } + + return (read != 0); } static BOOL StorageImpl_ReadDWordFromBigBlock(

1 0

André Hentschel : ntdll: Remove an unused function from signal_powerpc.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 053be78e39205bd247ce274e9b7fd6150fe0a24c URL: http://source.winehq.org/git/wine.git/?a=commit;h=053be78e39205bd247ce274e9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 8 01:49:19 2010 +0200 ntdll: Remove an unused function from signal_powerpc. --- dlls/ntdll/signal_powerpc.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 662d97b..f6de65f 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -574,31 +574,6 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) /********************************************************************** - * get_fpu_code - * - * Get the FPU exception code from the FPU status. - */ -static inline DWORD get_fpu_code( const CONTEXT *context ) -{ - DWORD status = context->Fpscr; - - if (status & 0x01) /* IE */ - { - if (status & 0x40) /* SF */ - return EXCEPTION_FLT_STACK_CHECK; - else - return EXCEPTION_FLT_INVALID_OPERATION; - } - if (status & 0x02) return EXCEPTION_FLT_DENORMAL_OPERAND; /* DE flag */ - if (status & 0x04) return EXCEPTION_FLT_DIVIDE_BY_ZERO; /* ZE flag */ - if (status & 0x08) return EXCEPTION_FLT_OVERFLOW; /* OE flag */ - if (status & 0x10) return EXCEPTION_FLT_UNDERFLOW; /* UE flag */ - if (status & 0x20) return EXCEPTION_FLT_INEXACT_RESULT; /* PE flag */ - return EXCEPTION_FLT_INVALID_OPERATION; /* generic error */ -} - - -/********************************************************************** * call_stack_handlers * * Call the stack handlers chain.

1 0

Frédéric Delanoy : ipconfig: Update French translation.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: e270fccb809f8e2317d05ad33016990b4db0adf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e270fccb809f8e2317d05ad33… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 8 00:36:23 2010 +0200 ipconfig: Update French translation. --- programs/ipconfig/Fr.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Fr.rc b/programs/ipconfig/Fr.rc index af3b557..f1cd12c 100644 --- a/programs/ipconfig/Fr.rc +++ b/programs/ipconfig/Fr.rc @@ -44,4 +44,6 @@ STRINGTABLE STRING_DESCRIPTION, "Description" STRING_PHYS_ADDR, "Adresse physique" STRING_DHCP_ENABLED, "DHCP activé" + STRING_YES, "Oui" + STRING_NO, "Non" }

1 0

Roderick Colenbrander : wined3d: Return generic info for unhandled devices/ drivers.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d7472026a0ea37a9c9f7b11b820efa700ef3f19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7472026a0ea37a9c9f7b11b8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Sep 8 00:20:11 2010 +0200 wined3d: Return generic info for unhandled devices/drivers. --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bf75ca6..f51f968 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1103,7 +1103,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, OSVERSIONINFOW os_version; WORD driver_os_version; unsigned int i; - enum wined3d_display_driver driver = DRIVER_NVIDIA_TNT; + enum wined3d_display_driver driver = DRIVER_UNKNOWN; enum wined3d_driver_model driver_model; const struct driver_version_information *version_info; @@ -1220,6 +1220,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, else { driver_info->description = "Direct3D HAL"; + driver_info->name = "Display"; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec989fd..30a5ea5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1244,7 +1244,8 @@ enum wined3d_display_driver DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX, - DRIVER_NVIDIA_GEFORCE6 + DRIVER_NVIDIA_GEFORCE6, + DRIVER_UNKNOWN }; enum wined3d_driver_model

1 0

Michael Stefaniuc : urlmon: Remove superfluous NULL check before heap_free (Smatch).
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: de9f0b98d432cbee69b9137ab78d10b53bc0b581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9f0b98d432cbee69b9137ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 7 23:10:56 2010 +0200 urlmon: Remove superfluous NULL check before heap_free (Smatch). --- dlls/urlmon/uri.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 94be29b..dbe6d72 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3310,8 +3310,7 @@ static HRESULT get_builder_component(LPWSTR *component, DWORD *component_len, static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LPCWSTR new_value, WCHAR prefix, DWORD *flags, DWORD success_flag) { - if(*component) - heap_free(*component); + heap_free(*component); if(!new_value) { *component = NULL;

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
86
Older →

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 September 2010