September 2009 - Wine-commits

Tag wine-1.1.30 : Alexandre Julliard : Release 1.1.30
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: refs/tags/wine-1.1.30 Tag: 817d338a3960ba18da375ce109358236045ce3d5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=817d338a3960ba18da375ce10935… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 18:53:43 2009 +0200 Release 1.1.30

1 0

Alexandre Julliard : Release 1.1.30.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: f3b9fb554dd116c881422098738a1f0223087cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b9fb554dd116c8814220987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 18:53:43 2009 +0200 Release 1.1.30. --- ANNOUNCE | 1366 ++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 823 insertions(+), 563 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3b9fb554dd116c881422…

1 0

Alexandre Julliard : user32/tests: Add missing flush_events in ScrollWindow test.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 50573f424a6a6e148107848bb5d08d1392d5c40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=50573f424a6a6e148107848bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 16:08:50 2009 +0200 user32/tests: Add missing flush_events in ScrollWindow test. --- dlls/user32/tests/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 94e1d2b..2a62400 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3226,6 +3226,7 @@ static void test_scrollwindow( HWND hwnd) ShowWindow( hwnd, SW_SHOW); UpdateWindow( hwnd); + flush_events( TRUE ); GetClientRect( hwnd, &rc); hdc = GetDC( hwnd); /* test ScrollWindow(Ex) with no clip rectangle */

1 0

Alexandre Julliard : windowscodecs: Fix incorrect overflow check caused by test mistake.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 77c3997e905d4e9abfc9b4767294aa8eca309e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c3997e905d4e9abfc9b4767… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 15:57:41 2009 +0200 windowscodecs: Fix incorrect overflow check caused by test mistake. --- dlls/windowscodecs/stream.c | 3 +-- dlls/windowscodecs/tests/stream.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 5672ff5..c59a9d2 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -129,13 +129,12 @@ static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface, LARGE_INTEGER NewPosition; TRACE("(%p)\n", This); - if (dlibMove.QuadPart > 0xFFFFFFFF) return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); - if (dwOrigin == STREAM_SEEK_SET) NewPosition.QuadPart = dlibMove.QuadPart; else if (dwOrigin == STREAM_SEEK_CUR) NewPosition.QuadPart = This->dwCurPos + dlibMove.QuadPart; else if (dwOrigin == STREAM_SEEK_END) NewPosition.QuadPart = This->dwMemsize + dlibMove.QuadPart; else return E_INVALIDARG; + if (NewPosition.u.HighPart) return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); if (NewPosition.QuadPart > This->dwMemsize) return E_INVALIDARG; if (NewPosition.QuadPart < 0) return E_INVALIDARG; This->dwCurPos = NewPosition.u.LowPart; diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 197712e..6eff70a 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -107,9 +107,10 @@ static void test_StreamOnMemory(void) ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == sizeof(Memory) - 1, "bSeek cursor moved to position (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart); IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, &uNewPos); /* reset seek pointer */ - LargeInt.QuadPart = -sizeof(Memory) - 5; + LargeInt.QuadPart = -(LONGLONG)sizeof(Memory) - 5; hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); - ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); + ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), + "Seek returned with %#x, expected %#x\n", hr, HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)); ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 0, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 0); /* remains unchanged */ IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL);

1 0

Henri Verbeet : ddraw: The ddraw surface is now always the wined3d surface' s parent.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 33bfcdd04452accf40256e1693b6a934e817dec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33bfcdd04452accf40256e169… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:51 2009 +0200 ddraw: The ddraw surface is now always the wined3d surface's parent. This GetParent() trick would now cause infinite recursion. --- dlls/ddraw/surface.c | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a3f39ef..3d41d18 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -365,43 +365,6 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) */ TRACE("(%p) D3D unloaded\n", This); } - else if(This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | - DDSCAPS_3DDEVICE | - DDSCAPS_TEXTURE ) ) - { - /* It's a render target, but no swapchain was created. - * The IParent interfaces have to be released manually. - * The same applies for textures without an - * IWineD3DTexture object attached - */ - IParent *Parent; - - for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) - { - if(This->complex_array[i]) - { - /* Only the topmost level can have more than 1 surfaces in the complex - * attachment array(Cube texture roots), for all others there is only - * one - */ - surf = This->complex_array[i]; - while(surf) - { - IWineD3DSurface_GetParent(surf->WineD3DSurface, - (IUnknown **) &Parent); - IParent_Release(Parent); /* For the getParent */ - IParent_Release(Parent); /* To release it */ - surf = surf->complex_array[0]; - } - } - } - - /* Now the top-level surface */ - IWineD3DSurface_GetParent(This->WineD3DSurface, - (IUnknown **) &Parent); - IParent_Release(Parent); /* For the getParent */ - IParent_Release(Parent); /* To release it */ - } /* The refcount test shows that the palette is detached when the surface is destroyed */ IDirectDrawSurface7_SetPalette((IDirectDrawSurface7 *)This, NULL);

1 0

Henri Verbeet : wined3d: Release the stateblock before destroying the GL context.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: cd96c6e355599d7b5bb230d276bd18602ff6c2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd96c6e355599d7b5bb230d27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:50 2009 +0200 wined3d: Release the stateblock before destroying the GL context. --- dlls/wined3d/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c6ebb7..70656b7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7057,6 +7057,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE else IWineD3DDevice_SetDepthStencilSurface(iface, NULL); + TRACE("Resetting stateblock\n"); + IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock); + IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->stateBlock); + delete_opengl_contexts(iface, (IWineD3DSwapChain *) swapchain); if(pPresentationParameters->Windowed) { @@ -7131,10 +7135,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->exStyle = exStyle; } - TRACE("Resetting stateblock\n"); - IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock); - IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->stateBlock); - /* Note: No parent needed for initial internal stateblock */ hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock, NULL); if (FAILED(hr)) ERR("Resetting the stateblock failed with error 0x%08x\n", hr);

1 0

Henri Verbeet : wined3d: Use the DXGI naming convention for all formats.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 47c84f4f7f919629b182136f0576f5371dd8bc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c84f4f7f919629b182136f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:49 2009 +0200 wined3d: Use the DXGI naming convention for all formats. --- dlls/d3d8/device.c | 96 ++++---- dlls/d3d8/vertexdeclaration.c | 2 +- dlls/d3d9/device.c | 116 ++++---- dlls/d3d9/vertexdeclaration.c | 2 +- dlls/ddraw/ddraw.c | 54 ++-- dlls/ddraw/device.c | 52 ++-- dlls/ddraw/direct3d.c | 10 +- dlls/ddraw/utils.c | 96 ++++---- dlls/wined3d/buffer.c | 4 +- dlls/wined3d/context.c | 16 +- dlls/wined3d/cubetexture.c | 4 +- dlls/wined3d/device.c | 56 ++-- dlls/wined3d/directx.c | 151 ++++++----- dlls/wined3d/drawprim.c | 6 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 84 +++--- dlls/wined3d/surface_base.c | 26 +- dlls/wined3d/surface_gdi.c | 6 +- dlls/wined3d/swapchain.c | 3 +- dlls/wined3d/texture.c | 8 +- dlls/wined3d/utils.c | 539 +++++++++++++++++++------------------- dlls/wined3d/vertexdeclaration.c | 5 +- include/wine/wined3d.idl | 56 ++--- 23 files changed, 698 insertions(+), 696 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47c84f4f7f919629b1821…

1 0

Henri Verbeet : wined3d: Add a state handler for WINED3DRS_SOFTWAREVERTEXPROCESSING.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: a25ac586c6c960c6391dc9ced86b48bae028e215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25ac586c6c960c6391dc9ced… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:48 2009 +0200 wined3d: Add a state handler for WINED3DRS_SOFTWAREVERTEXPROCESSING. --- dlls/wined3d/state.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2df21ad..cab45b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -8,6 +8,7 @@ * Copyright 2005 Oliver Stieber * Copyright 2006 Henri Verbeet * Copyright 2006-2008 Stefan Dösinger for CodeWeavers + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1842,6 +1843,14 @@ static void state_ckeyblend(DWORD state, IWineD3DStateBlockImpl *stateblock, str } } +static void state_swvp(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + if (stateblock->renderState[WINED3DRS_SOFTWAREVERTEXPROCESSING]) + { + FIXME("Software vertex processing not implemented.\n"); + } +} + /* Set texture operations up - The following avoids lots of ifdefs in this routine!*/ #if defined (GL_VERSION_1_3) # define useext(A) A @@ -4964,6 +4973,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_WRAP15), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_EXTENTS), { STATE_RENDER(WINED3DRS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3DRS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), { STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_patchedgestyle}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_PATCHSEGMENTS), { STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_patchsegments }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_POSITIONDEGREE), { STATE_RENDER(WINED3DRS_POSITIONDEGREE), state_positiondegree}, WINED3D_GL_EXT_NONE },

1 0

Henri Verbeet : d3d8: It' s not an error to have a NULL texture bound to a stage.
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: 906071aa9ffb3bef34af512b006e00493053a082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=906071aa9ffb3bef34af512b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:47 2009 +0200 d3d8: It's not an error to have a NULL texture bound to a stage. --- dlls/d3d8/device.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9bdd016..2a9babf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1471,8 +1471,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(LPDIRECT3DDEVICE8 iface static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage,IDirect3DBaseTexture8** ppTexture) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - IWineD3DBaseTexture *retTexture = NULL; - HRESULT rc = D3D_OK; + IWineD3DBaseTexture *retTexture; + HRESULT hr; TRACE("(%p) Relay\n" , This); @@ -1481,17 +1481,27 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, D } wined3d_mutex_lock(); - rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture); - if (rc == D3D_OK && NULL != retTexture) { + hr = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture); + if (FAILED(hr)) + { + WARN("Failed to get texture for stage %u, hr %#x.\n", Stage, hr); + wined3d_mutex_unlock(); + *ppTexture = NULL; + return hr; + } + + if (retTexture) + { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); IWineD3DBaseTexture_Release(retTexture); - } else { - FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture); + } + else + { *ppTexture = NULL; } wined3d_mutex_unlock(); - return rc; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage, IDirect3DBaseTexture8* pTexture) {

1 0

Henri Verbeet : wined3d: Rename IWineD3DDevice::GetIndices() to IWineD3DDevice::GetIndexBuffer().
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: wine Branch: master Commit: c64da00de75840073d202f79dc8bdc552aa27f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64da00de75840073d202f79d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 25 13:31:46 2009 +0200 wined3d: Rename IWineD3DDevice::GetIndices() to IWineD3DDevice::GetIndexBuffer(). --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 5 +++-- include/wine/wined3d.idl | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1076b4e..9bdd016 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2082,7 +2082,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I /* The case from UINT to INT is safe because d3d8 will never set negative values */ wined3d_mutex_lock(); IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, (INT *) pBaseVertexIndex); - rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); + rc = IWineD3DDevice_GetIndexBuffer(This->WineD3DDevice, &retIndexData); if (SUCCEEDED(rc) && retIndexData) { IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DBuffer_Release(retIndexData); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2ab4c4b..b0e7bbc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1954,7 +1954,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9EX ifac } wined3d_mutex_lock(); - rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); + rc = IWineD3DDevice_GetIndexBuffer(This->WineD3DDevice, &retIndexData); if (SUCCEEDED(rc) && retIndexData) { IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DBuffer_Release(retIndexData); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 736d91f..9a8a594 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3100,7 +3100,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetIndexBuffer(IWineD3DDevice *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWineD3DBuffer** ppIndexData) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetIndexBuffer(IWineD3DDevice *iface, IWineD3DBuffer **ppIndexData) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; *ppIndexData = This->stateBlock->pIndexData; @@ -7396,7 +7397,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_SetGammaRamp, IWineD3DDeviceImpl_GetGammaRamp, IWineD3DDeviceImpl_SetIndexBuffer, - IWineD3DDeviceImpl_GetIndices, + IWineD3DDeviceImpl_GetIndexBuffer, IWineD3DDeviceImpl_SetBaseVertexIndex, IWineD3DDeviceImpl_GetBaseVertexIndex, IWineD3DDeviceImpl_SetLight, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 854ce37..079f9f3 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3122,7 +3122,7 @@ interface IWineD3DDevice : IWineD3DBase [in] IWineD3DBuffer *index_buffer, [in] WINED3DFORMAT format ); - HRESULT GetIndices( + HRESULT GetIndexBuffer( [out] IWineD3DBuffer **index_buffer ); HRESULT SetBaseVertexIndex(

1 0