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

Paul Vriens : mscms/tests: Don't crash on Vista.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: 688623d3cb68f28344e5c1b4dd226a385ca7e8e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688623d3cb68f28344e5c1b4d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 22 16:40:30 2007 +0200 mscms/tests: Don't crash on Vista. --- dlls/mscms/tests/profile.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 3cf1073..cdc6ea4 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -394,8 +394,11 @@ static void test_GetColorProfileHeader(void) ret = pGetColorProfileHeader( NULL, &header ); ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); - ret = pGetColorProfileHeader( handle, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + if (0) /* Crashes on Vista */ + { + ret = pGetColorProfileHeader( handle, NULL ); + ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + } /* Functional checks */

1 0

Stefan Dösinger : wined3d: Move material applying to the state table.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: 2f4b9e42bc9e773db25aa03ab7157e67be89194f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4b9e42bc9e773db25aa03ab… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 15 21:33:54 2007 +0200 wined3d: Move material applying to the state table. --- dlls/wined3d/device.c | 32 +------------------------------- dlls/wined3d/state.c | 23 +++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ac418d9..f7d9042 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2697,37 +2697,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONS return WINED3D_OK; } - ENTER_GL(); - TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, - pMaterial->Diffuse.b, pMaterial->Diffuse.a); - TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, - pMaterial->Ambient.b, pMaterial->Ambient.a); - TRACE("(%p) : Specular (%f,%f,%f,%f)\n", This, pMaterial->Specular.r, pMaterial->Specular.g, - pMaterial->Specular.b, pMaterial->Specular.a); - TRACE("(%p) : Emissive (%f,%f,%f,%f)\n", This, pMaterial->Emissive.r, pMaterial->Emissive.g, - pMaterial->Emissive.b, pMaterial->Emissive.a); - TRACE("(%p) : Power (%f)\n", This, pMaterial->Power); - - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*) &This->updateStateBlock->material.Ambient); - checkGLcall("glMaterialfv(GL_AMBIENT)"); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*) &This->updateStateBlock->material.Diffuse); - checkGLcall("glMaterialfv(GL_DIFFUSE)"); - - /* Only change material color if specular is enabled, otherwise it is set to black */ - if (This->stateBlock->renderState[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &This->updateStateBlock->material.Specular); - checkGLcall("glMaterialfv(GL_SPECULAR"); - } else { - float black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]); - checkGLcall("glMaterialfv(GL_SPECULAR"); - } - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*) &This->updateStateBlock->material.Emissive); - checkGLcall("glMaterialfv(GL_EMISSION)"); - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, This->updateStateBlock->material.Power); - checkGLcall("glMaterialf(GL_SHININESS"); - - LEAVE_GL(); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_MATERIAL); return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3b7c5c9..d83e7f7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -505,11 +505,12 @@ state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon * whether WINED3DRS_SPECULARENABLE is enabled or not. */ - TRACE("Setting specular enable state\n"); - /* TODO: Add to the material setting functions */ + TRACE("Setting specular enable state and materials\n"); if (stateblock->renderState[WINED3DRS_SPECULARENABLE]) { glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &stateblock->material.Specular); checkGLcall("glMaterialfv"); + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->material.Power); + checkGLcall("glMaterialf(GL_SHININESS"); if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { glEnable(GL_COLOR_SUM_EXT); } else { @@ -541,6 +542,22 @@ state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon checkGLcall("glFinalCombinerInputNV()"); } } + + TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", stateblock->wineD3DDevice, stateblock->material.Diffuse.r, stateblock->material.Diffuse.g, + stateblock->material.Diffuse.b, stateblock->material.Diffuse.a); + TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", stateblock->wineD3DDevice, stateblock->material.Ambient.r, stateblock->material.Ambient.g, + stateblock->material.Ambient.b, stateblock->material.Ambient.a); + TRACE("(%p) : Specular (%f,%f,%f,%f)\n", stateblock->wineD3DDevice, stateblock->material.Specular.r, stateblock->material.Specular.g, + stateblock->material.Specular.b, stateblock->material.Specular.a); + TRACE("(%p) : Emissive (%f,%f,%f,%f)\n", stateblock->wineD3DDevice, stateblock->material.Emissive.r, stateblock->material.Emissive.g, + stateblock->material.Emissive.b, stateblock->material.Emissive.a); + + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*) &stateblock->material.Ambient); + checkGLcall("glMaterialfv(GL_AMBIENT)"); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*) &stateblock->material.Diffuse); + checkGLcall("glMaterialfv(GL_DIFFUSE)"); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*) &stateblock->material.Emissive); + checkGLcall("glMaterialfv(GL_EMISSION)"); } static void state_texfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -4517,4 +4534,6 @@ const struct StateEntry StateTable[] = { /* STATE_CLIPPLANE(29) */ STATE_CLIPPLANE(29), clipplane }, { /* STATE_CLIPPLANE(30) */ STATE_CLIPPLANE(30), clipplane }, { /* STATE_CLIPPLANE(31) */ STATE_CLIPPLANE(31), clipplane }, + + { /* STATE_MATERIAL */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c0dfee..458e7ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -473,7 +473,9 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, #define STATE_CLIPPLANE(a) (STATE_SCISSORRECT + 1 + (a)) #define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(MAX_CLIPPLANES - 1)) -#define STATE_HIGHEST (STATE_CLIPPLANE(MAX_CLIPPLANES - 1)) +#define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIPPLANES)) + +#define STATE_HIGHEST (STATE_MATERIAL) struct StateEntry {

1 0

Stefan Dösinger : d3d9: Hold the lock in VertexShader methods.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: e84158f510a724e101950c92366ad663a709a4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84158f510a724e101950c923… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 14 21:49:18 2007 +0200 d3d9: Hold the lock in VertexShader methods. --- dlls/d3d9/vertexshader.c | 60 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index d66c12c..8c73d3f 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3DVertexShader_Release(This->wineD3DVertexShader); + LeaveCriticalSection(&d3d9_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -70,21 +72,27 @@ static HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADE HRESULT hr = D3D_OK; TRACE("(%p) : Relay\n", This); + EnterCriticalSection(&d3d9_cs); if (D3D_OK == (hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice) && myDevice != NULL)) { hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); } else { *ppDevice = NULL; } + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) returning (%p)\n", This, *ppDevice); return hr; } static HRESULT WINAPI IDirect3DVertexShader9Impl_GetFunction(LPDIRECT3DVERTEXSHADER9 iface, VOID* pData, UINT* pSizeOfData) { IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; - + HRESULT hr; TRACE("(%p) : Relay\n", This); - return IWineD3DVertexShader_GetFunction(This->wineD3DVertexShader, pData, pSizeOfData); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexShader_GetFunction(This->wineD3DVertexShader, pData, pSizeOfData); + LeaveCriticalSection(&d3d9_cs); + return hr; } @@ -116,7 +124,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9 iface, object->ref = 1; object->lpVtbl = &Direct3DVertexShader9_Vtbl; + EnterCriticalSection(&d3d9_cs); hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, &object->wineD3DVertexShader, (IUnknown *)object); + LeaveCriticalSection(&d3d9_cs); if (FAILED(hrc)) { @@ -139,7 +149,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9 iface, IDi HRESULT hrc = D3D_OK; TRACE("(%p) : Relay\n", This); + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_SetVertexShader(This->WineD3DDevice, pShader==NULL?NULL:((IDirect3DVertexShader9Impl *)pShader)->wineD3DVertexShader); + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) : returning hr(%u)\n", This, hrc); return hrc; @@ -151,6 +163,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9 iface, IDi HRESULT hrc = D3D_OK; TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader); if(hrc == D3D_OK && pShader != NULL){ hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); @@ -158,42 +171,73 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9 iface, IDi } else { WARN("(%p) : Call to IWineD3DDevice_GetVertexShader failed %u (device %p)\n", This, hrc, This->WineD3DDevice); } + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) : returning %p\n", This, *ppShader); return hrc; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, CONST float* pConstantData, UINT Vector4fCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) : Relay\n", This); - return IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, float* pConstantData, UINT Vector4fCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; + TRACE("(%p) : Relay\n", This); - return IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, CONST int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) : Relay\n", This); - return IWineD3DDevice_SetVertexShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetVertexShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) : Relay\n", This); - return IWineD3DDevice_GetVertexShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_GetVertexShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, CONST BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) : Relay\n", This); - return IWineD3DDevice_SetVertexShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetVertexShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) : Relay\n", This); - return IWineD3DDevice_GetVertexShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_GetVertexShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + LeaveCriticalSection(&d3d9_cs); + return hr; }

1 0

Stefan Dösinger : d3d9: Hold the lock in VertexDeclaration methods.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: 57acd1d9a6a9dab49e3e927eb60e52fd8977f1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=57acd1d9a6a9dab49e3e927eb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 14 21:45:15 2007 +0200 d3d9: Hold the lock in VertexDeclaration methods. --- dlls/d3d9/vertexdeclaration.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index ab7d484..3973c98 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -66,6 +66,7 @@ HRESULT vdecl_convert_fvf( (fvf & D3DFVF_LASTBETA_UBYTE4)); BOOL has_normal = (fvf & D3DFVF_NORMAL) != 0; BOOL has_psize = (fvf & D3DFVF_PSIZE) != 0; + BOOL has_diffuse = (fvf & D3DFVF_DIFFUSE) != 0; BOOL has_specular = (fvf & D3DFVF_SPECULAR) !=0; @@ -216,7 +217,9 @@ void IDirect3DVertexDeclaration9Impl_Destroy(LPDIRECT3DVERTEXDECLARATION9 iface) /* Should not happen unless wine has a bug or the application releases references it does not own */ ERR("Destroying vdecl with ref != 0\n"); } + EnterCriticalSection(&d3d9_cs); IWineD3DVertexDeclaration_Release(This->wineD3DVertexDeclaration); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, This->elements); HeapFree(GetProcessHeap(), 0, This); } @@ -246,11 +249,13 @@ static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDevice(LPDIRECT3DVERTEX TRACE("(%p) : Relay\n", iface); + EnterCriticalSection(&d3d9_cs); hr = IWineD3DVertexDeclaration_GetDevice(This->wineD3DVertexDeclaration, &myDevice); if (hr == D3D_OK && myDevice != NULL) { hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); } + LeaveCriticalSection(&d3d9_cs); return hr; } @@ -354,7 +359,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 CopyMemory(object->elements, pVertexElements, element_count * sizeof(D3DVERTEXELEMENT9)); object->element_count = element_count; + EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wineD3DVertexDeclaration, (IUnknown *)object, wined3d_elements, element_count); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, wined3d_elements); @@ -380,7 +387,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 ifa TRACE("(%p) : Relay\n", iface); + EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, pDeclImpl == NULL ? NULL : pDeclImpl->wineD3DVertexDeclaration); + LeaveCriticalSection(&d3d9_cs); return hr; } @@ -396,6 +405,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9 ifa } *ppDecl = NULL; + EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_GetVertexDeclaration(This->WineD3DDevice, &pTest); if (hr == D3D_OK && NULL != pTest) { IWineD3DVertexDeclaration_GetParent(pTest, (IUnknown **)ppDecl); @@ -403,6 +413,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9 ifa } else { *ppDecl = NULL; } + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) : returning %p\n", This, *ppDecl); return hr; }

1 0

Stefan Dösinger : d3d9: Hold the lock in Vertexbuffer methods.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: d9583c6c589af766af5105352ea0c2356b13da07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9583c6c589af766af5105352… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 14 21:40:07 2007 +0200 d3d9: Hold the lock in Vertexbuffer methods. --- dlls/d3d9/vertexbuffer.c | 70 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 61 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index fe34eef..6238fdd 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -58,7 +58,9 @@ static ULONG WINAPI IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d9_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -68,8 +70,13 @@ static ULONG WINAPI IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 i /* IDirect3DVertexBuffer9 IDirect3DResource9 Interface follow: */ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDevice(LPDIRECT3DVERTEXBUFFER9 iface, IDirect3DDevice9** ppDevice) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + + EnterCriticalSection(&d3d9_cs); + hr = IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer9Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { @@ -80,58 +87,101 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_SetPrivateData(LPDIRECT3DVERTEX static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetPrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetPrivateData(This->wineD3DVertexBuffer, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexBuffer_GetPrivateData(This->wineD3DVertexBuffer, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer9Impl_FreePrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_FreePrivateData(This->wineD3DVertexBuffer, refguid); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexBuffer_FreePrivateData(This->wineD3DVertexBuffer, refguid); + LeaveCriticalSection(&d3d9_cs); + return hr; } static DWORD WINAPI IDirect3DVertexBuffer9Impl_SetPriority(LPDIRECT3DVERTEXBUFFER9 iface, DWORD PriorityNew) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); + LeaveCriticalSection(&d3d9_cs); + return hr; } static DWORD WINAPI IDirect3DVertexBuffer9Impl_GetPriority(LPDIRECT3DVERTEXBUFFER9 iface) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetPriority(This->wineD3DVertexBuffer); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexBuffer_GetPriority(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d9_cs); + return hr; } static void WINAPI IDirect3DVertexBuffer9Impl_PreLoad(LPDIRECT3DVERTEXBUFFER9 iface) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); IWineD3DVertexBuffer_PreLoad(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d9_cs); return ; } static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer9Impl_GetType(LPDIRECT3DVERTEXBUFFER9 iface) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + D3DRESOURCETYPE ret; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetType(This->wineD3DVertexBuffer); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3DVertexBuffer_GetType(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d9_cs); + return ret; } /* IDirect3DVertexBuffer9 Interface follow: */ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_Lock(LPDIRECT3DVERTEXBUFFER9 iface, UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer9Impl_Unlock(LPDIRECT3DVERTEXBUFFER9 iface) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 iface, D3DVERTEXBUFFER_DESC* pDesc) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); + LeaveCriticalSection(&d3d9_cs); + return hr; } static const IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl = @@ -174,7 +224,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9 iface, object->lpVtbl = &Direct3DVertexBuffer9_Vtbl; object->ref = 1; + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), pSharedHandle, (IUnknown *)object); + LeaveCriticalSection(&d3d9_cs); if (hrc != D3D_OK) {

1 0

Stefan Dösinger : d3d9: Hold the lock in Texture methods.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: 99a3d76e8d869c7302f2f625f33ea7366fcb2dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a3d76e8d869c7302f2f625f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 14 11:57:59 2007 +0200 d3d9: Hold the lock in Texture methods. --- dlls/d3d9/texture.c | 123 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 107 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99a3d76e8d869c7302f2f…

1 0

Huw Davies : oleaut32: Implement marshaling of VT_BYREF interfaces.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: 3c8534f0133679a5bd390cb1ce6ce5fc1403d430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8534f0133679a5bd390cb1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 22 14:40:36 2007 +0100 oleaut32: Implement marshaling of VT_BYREF interfaces. --- dlls/oleaut32/tests/usrmarshal.c | 50 +++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 60 +++++++++++++++++++++++-------------- 2 files changed, 87 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c8534f0133679a5bd390…

1 0

Huw Davies : oleaut32: Handle marshaling of VARTYPE-less FADF_VARIANT safearrays.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: da98b1cb61fac63b5c1c088443264e8350738bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da98b1cb61fac63b5c1c08844… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 22 15:10:04 2007 +0100 oleaut32: Handle marshaling of VARTYPE-less FADF_VARIANT safearrays. --- dlls/oleaut32/tests/usrmarshal.c | 25 +++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 2 ++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 5989c1d..21714c4 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -49,6 +49,8 @@ static inline SF_TYPE get_union_type(SAFEARRAY *psa) hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) { + if(psa->fFeatures & FADF_VARIANT) return SF_VARIANT; + switch(psa->cbElements) { case 1: vt = VT_I1; break; @@ -264,6 +266,29 @@ static void test_marshal_LPSAFEARRAY(void) HeapFree(GetProcessHeap(), 0, buffer); SafeArrayDestroyData(lpsa); SafeArrayDestroyDescriptor(lpsa); + + /* VARTYPE-less arrays with FADF_VARIANT */ + hr = SafeArrayAllocDescriptor(1, &lpsa); + ok(hr == S_OK, "saad failed %08x\n", hr); + lpsa->cbElements = 16; + lpsa->fFeatures = FADF_VARIANT; + lpsa->rgsabound[0].lLbound = 2; + lpsa->rgsabound[0].cElements = 48; + hr = SafeArrayAllocData(lpsa); + ok(hr == S_OK, "saad failed %08x\n", hr); + + hr = SafeArrayGetVartype(lpsa, &vt); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); + todo_wine + ok(size == 1388, "size %ld\n", size); + buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); + LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + check_safearray(buffer, lpsa); + HeapFree(GetProcessHeap(), 0, buffer); + SafeArrayDestroyData(lpsa); + SafeArrayDestroyDescriptor(lpsa); } static void check_bstr(void *buffer, BSTR b) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 25f831a..67faf20 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -711,6 +711,8 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) { + if(psa->fFeatures & FADF_VARIANT) return SF_VARIANT; + switch(psa->cbElements) { case 1: vt = VT_I1; break;

1 0

Huw Davies : oleaut32: Extend _invoke to cope with more args.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: ec35568970aa6c4f44e1434c2330afc1e327ce89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec35568970aa6c4f44e1434c2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 22 15:14:56 2007 +0100 oleaut32: Extend _invoke to cope with more args. --- dlls/oleaut32/typelib.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d57a3a2..b55599f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5256,6 +5256,27 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { case 23: res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22]); break; + case 24: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23]); + break; + case 25: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24]); + break; + case 26: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25]); + break; + case 27: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26]); + break; + case 28: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26],args[27]); + break; + case 29: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26],args[27],args[28]); + break; + case 30: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26],args[27],args[28],args[29]); + break; default: FIXME("unsupported number of arguments %d in stdcall\n",nrargs); res = -1;

1 0

Huw Davies : oleaut32: Interfaces that derive from IDispatch should be marshaled as VT_DISPATCH.
by Alexandre Julliard June 25, 2007

June 25, 2007

Module: wine Branch: master Commit: 17fca45d41e06a1da2f3b0e7609604fcc2e78f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fca45d41e06a1da2f3b0e76… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 22 14:38:50 2007 +0100 oleaut32: Interfaces that derive from IDispatch should be marshaled as VT_DISPATCH. --- dlls/oleaut32/tests/tmarshal.c | 24 +++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 13 +++++++++++++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + dlls/oleaut32/typelib.c | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index cc2632f..f7400e4 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -515,6 +515,15 @@ HRESULT WINAPI Widget_Error( return E_NOTIMPL; } +HRESULT WINAPI Widget_CloneInterface( + IWidget __RPC_FAR * iface, + ISomethingFromDispatch **ppVal) +{ + trace("CloneInterface()\n"); + *ppVal = 0; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -540,7 +549,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_VariantArrayPtr, Widget_Variant, Widget_VarArg, - Widget_Error + Widget_Error, + Widget_CloneInterface }; @@ -914,6 +924,18 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_DISPATCH, "vt %x\n", V_VT(&varresult)); + VariantClear(&varresult); + + /* call CloneInterface */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONEINTERFACE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_DISPATCH, "vt %x\n", V_VT(&varresult)); VariantClear(&varresult); /* call CloneDispatch with automatic value getting */ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index ff7a00a..9b94843 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -39,6 +39,15 @@ library TestTypelib [ odl, + uuid(12345678-1234-4321-1234-121212121212) + ] + interface ISomethingFromDispatch : IDispatch + { + HRESULT anotherfn(void); + } + + [ + odl, uuid(a1f8cae3-c947-4c5f-b57d-c87b9b5f3586), oleautomation, dual @@ -93,6 +102,10 @@ library TestTypelib [id(DISPID_TM_ERROR)] HRESULT Error(); + + [propget, id(DISPID_TM_CLONEINTERFACE)] + HRESULT CloneInterface([out, retval] ISomethingFromDispatch **ppVal); + } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index bfeca29..4bf47cd 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -31,5 +31,6 @@ #define DISPID_TM_VARIANT 12 #define DISPID_TM_VARARG 13 #define DISPID_TM_ERROR 14 +#define DISPID_TM_CLONEINTERFACE 15 #define DISPID_NOA_BSTRRET 1 diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5a6fc16..d57a3a2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5307,7 +5307,7 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, break; case TKIND_INTERFACE: - if (IsEqualIID(&IID_IDispatch, &tattr->guid)) + if (tattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE) *vt |= VT_DISPATCH; else *vt |= VT_UNKNOWN;

1 0