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

Stefan Dösinger : d3d8: Hold the lock in IDirect3DVolumeTexture8 methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: e980058f5808b4c321ef3b8a3c64fe6ecc649b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e980058f5808b4c321ef3b8a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 02:49:26 2007 +0200 d3d8: Hold the lock in IDirect3DVolumeTexture8 methods. --- dlls/d3d8/volumetexture.c | 104 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 90 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 0b01fb2..fc35f3d 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DVolumeTexture_Destroy(This->wineD3DVolumeTexture, D3D8CB_DestroyVolume); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -67,69 +69,122 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 /* IDirect3DVolumeTexture8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + + EnterCriticalSection(&d3d8_cs); + hr = IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_SetPrivateData(This->wineD3DVolumeTexture, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_SetPrivateData(This->wineD3DVolumeTexture, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetPrivateData(This->wineD3DVolumeTexture, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_GetPrivateData(This->wineD3DVolumeTexture, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_FreePrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_FreePrivateData(This->wineD3DVolumeTexture, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_FreePrivateData(This->wineD3DVolumeTexture, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetPriority(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD PriorityNew) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_SetPriority(This->wineD3DVolumeTexture, PriorityNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_SetPriority(This->wineD3DVolumeTexture, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetPriority(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_GetPriority(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); IWineD3DVolumeTexture_PreLoad(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetType(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + type = IWineD3DVolumeTexture_GetType(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DVolumeTexture8 IDirect3DBaseTexture8 Interface follow: */ static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD LODNew) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_SetLOD(This->wineD3DVolumeTexture, LODNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_SetLOD(This->wineD3DVolumeTexture, LODNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetLOD(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_GetLOD(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLevelCount(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetLevelCount(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_GetLevelCount(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } /* IDirect3DVolumeTexture8 Interface follow: */ @@ -137,6 +192,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMET IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; UINT tmpInt = -1; + HRESULT hr; TRACE("(%p) Relay\n", This); @@ -150,7 +206,10 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMET wined3ddesc.Height = &pDesc->Height; wined3ddesc.Depth = &pDesc->Depth; - return IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, IDirect3DVolume8 **ppVolumeLevel) { @@ -160,30 +219,47 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUM TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DVolumeTexture_GetVolumeLevel(This->wineD3DVolumeTexture, Level, &myVolume); if (hrc == D3D_OK && NULL != ppVolumeLevel) { IWineD3DVolumeTexture_GetParent(myVolume, (IUnknown **)ppVolumeLevel); IWineD3DVolumeTexture_Release(myVolume); } + LeaveCriticalSection(&d3d8_cs); return hrc; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay %p %p %p %d\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); - return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay %p %d\n", This, This->wineD3DVolumeTexture, Level); - return IWineD3DVolumeTexture_UnlockBox(This->wineD3DVolumeTexture, Level); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_UnlockBox(This->wineD3DVolumeTexture, Level); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE8 iface, CONST D3DBOX *pDirtyBox) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (CONST WINED3DBOX *) pDirtyBox); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (CONST WINED3DBOX *) pDirtyBox); + LeaveCriticalSection(&d3d8_cs); + return hr; }

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3Dtexture8 methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 00c8dbe2aa8ce9e751d954df9922d9b5e5029b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c8dbe2aa8ce9e751d954df9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 14:30:07 2007 +0200 d3d8: Hold the lock in IDirect3Dtexture8 methods. --- dlls/d3d8/texture.c | 103 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 8965735..03f26d5 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DTexture_Destroy(This->wineD3DTexture, D3D8CB_DestroySurface); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -67,74 +69,127 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { /* IDirect3DTexture8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + EnterCriticalSection(&d3d8_cs); + hr = IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DTexture8Impl_SetPriority(LPDIRECT3DTEXTURE8 iface, DWORD PriorityNew) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetPriority(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_GetPriority(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); IWineD3DTexture_PreLoad(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetType(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + type = IWineD3DTexture_GetType(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DTexture8 IDirect3DBaseTexture8 Interface follow: */ static DWORD WINAPI IDirect3DTexture8Impl_SetLOD(LPDIRECT3DTEXTURE8 iface, DWORD LODNew) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DTexture8Impl_GetLOD(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetLOD(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_GetLOD(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DTexture8Impl_GetLevelCount(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetLevelCount(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_GetLevelCount(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } /* IDirect3DTexture8 Interface follow: */ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 iface, UINT Level, D3DSURFACE_DESC *pDesc) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; WINED3DSURFACE_DESC wined3ddesc; TRACE("(%p) Relay\n", This); @@ -150,7 +205,10 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 ifac wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; - return IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 iface, UINT Level, IDirect3DSurface8 **ppSurfaceLevel) { @@ -159,30 +217,47 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 i IWineD3DSurface *mySurface = NULL; TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DTexture_GetSurfaceLevel(This->wineD3DTexture, Level, &mySurface); if (hrc == D3D_OK && NULL != ppSurfaceLevel) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppSurfaceLevel); IWineD3DSurface_Release(mySurface); } + LeaveCriticalSection(&d3d8_cs); return hrc; } static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(LPDIRECT3DTEXTURE8 iface, UINT Level, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_LockRect(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_LockRect(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(LPDIRECT3DTEXTURE8 iface, UINT Level) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTURE8 iface, CONST RECT *pDirtyRect) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect); + LeaveCriticalSection(&d3d8_cs); + return hr; } const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl =

1 0

appdb/include distribution.php
by WineHQ 13 Jun '07

13 Jun '07

ChangeSet ID: 31192 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/12 22:13:06 Modified files: include : distribution.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix minor indenting issue Patch: http://cvs.winehq.org/patch.py?id=31192 Old revision New revision Changes Path 1.33 1.34 +3 -3 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.33 appdb/include/distribution.php:1.34 --- appdb/include/distribution.php:1.33 13 Jun 2007 3:13: 6 -0000 +++ appdb/include/distribution.php 13 Jun 2007 3:13: 6 -0000 @@ -388,9 +388,9 @@ class distribution { if($bRejected) return FALSE; - $hResult = query_parameters("SELECT count(distributionId) as num_dists FROM - distributions WHERE queued='?'", - $bQueued ? "true" : "false"); + $hResult = query_parameters("SELECT count(distributionId) as num_dists FROM + distributions WHERE queued='?'", + $bQueued ? "true" : "false"); if($hResult) {

1 0

Rob Shearman : uuid: Add hlink CLSIDs.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 846bc878140e9aef68ddc4df0aabe7dfa119a38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=846bc878140e9aef68ddc4df0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 12 10:09:05 2007 +0100 uuid: Add hlink CLSIDs. --- dlls/hlink/hlink_main.c | 2 -- dlls/uuid/uuid.c | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 3a4632f..91ecb77 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -33,8 +33,6 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "hlink.h" - -#include "initguid.h" #include "hlguids.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 5ee4074..4e9be90 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -67,6 +67,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "indexsrv.h" #include "htiframe.h" #include "urlhist.h" +#include "hlguids.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Rob Shearman : mshtml: Add some error handling to hlink_frame_navigate.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 2211b6e5d0a31dfea39e27335eed5bb63cb16c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2211b6e5d0a31dfea39e27335… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 12 10:09:44 2007 +0100 mshtml: Add some error handling to hlink_frame_navigate. --- dlls/mshtml/navigate.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2303baf..459cc63 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -744,6 +744,7 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, IBindCtx *bindctx; IMoniker *mon; IHlink *hlink; + HRESULT hr; callback = create_bscallback(NULL); @@ -754,24 +755,35 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, debugstr_an(callback->post_data, callback->post_data_len)); } - CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); + hr = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); + if (FAILED(hr)) { + IBindStatusCallback_Release(STATUSCLB(callback)); + return; + } hlink = Hlink_Create(); + if (!hlink) { + IBindCtx_Release(bindctx); + IBindStatusCallback_Release(STATUSCLB(callback)); + return; + } - CreateURLMoniker(NULL, uri, &mon); - IHlink_SetMonikerReference(hlink, 0, mon, NULL); + hr = CreateURLMoniker(NULL, uri, &mon); + if (SUCCEEDED(hr)) { + IHlink_SetMonikerReference(hlink, 0, mon, NULL); - if(hlnf & HLNF_OPENINNEWWINDOW) { - static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0}; - IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ - } + if(hlnf & HLNF_OPENINNEWWINDOW) { + static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0}; + IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ + } + + IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); - IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); + IMoniker_Release(mon); + } IBindCtx_Release(bindctx); IBindStatusCallback_Release(STATUSCLB(callback)); - IMoniker_Release(mon); - } HRESULT start_binding(BSCallback *bscallback)

1 0

Evan Stade : gdiplus: Added first GDI+ graphics implementation.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: d50be49775ce850e9f045e9c4272d3e8137e3159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50be49775ce850e9f045e9c4… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jun 11 11:54:03 2007 -0700 gdiplus: Added first GDI+ graphics implementation. --- dlls/gdiplus/Makefile.in | 3 +- dlls/gdiplus/gdiplus.spec | 6 ++-- dlls/gdiplus/gdiplus_private.h | 5 +++ dlls/gdiplus/graphics.c | 67 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index a4edb46..d1089af 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -4,10 +4,11 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = gdiplus.dll IMPORTLIB = libgdiplus.$(IMPLIBEXT) -IMPORTS = gdi32 advapi32 kernel32 ntdll +IMPORTS = user32 gdi32 advapi32 kernel32 ntdll C_SRCS = \ gdiplus.c \ + graphics.c \ pen.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2bb3ba9..c80fbbb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -81,8 +81,8 @@ @ stub GdipCreateFontFromLogfontA @ stub GdipCreateFontFromLogfontW @ stub GdipCreateFromHDC2 -@ stub GdipCreateFromHDC -@ stub GdipCreateFromHWND +@ stdcall GdipCreateFromHDC(long ptr) +@ stdcall GdipCreateFromHWND(long ptr) @ stub GdipCreateFromHWNDICM @ stub GdipCreateHBITMAPFromBitmap @ stub GdipCreateHICONFromBitmap @@ -132,7 +132,7 @@ @ stub GdipDeleteCustomLineCap @ stub GdipDeleteFont @ stub GdipDeleteFontFamily -@ stub GdipDeleteGraphics +@ stdcall GdipDeleteGraphics(ptr) @ stub GdipDeleteMatrix @ stub GdipDeletePath @ stub GdipDeletePathIter diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2d3a179..f6e238a 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -35,4 +35,9 @@ struct GpPen{ HPEN gdipen; }; +struct GpGraphics{ + HDC hdc; + HWND hwnd; +}; + #endif diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c new file mode 100644 index 0000000..37af012 --- /dev/null +++ b/dlls/gdiplus/graphics.c @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <math.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "gdiplus.h" +#include "gdiplus_private.h" +#include "wine/debug.h" + +GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) +{ + if(hdc == NULL) + return OutOfMemory; + + if(graphics == NULL) + return InvalidParameter; + + *graphics = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(GpGraphics)); + (*graphics)->hdc = hdc; + (*graphics)->hwnd = NULL; + + return Ok; +} + +GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) +{ + GpStatus ret; + + if((ret = GdipCreateFromHDC(GetDC(hwnd), graphics)) != Ok) + return ret; + + (*graphics)->hwnd = hwnd; + + return Ok; +} + +GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) +{ + if(!graphics) return InvalidParameter; + if(graphics->hwnd) + ReleaseDC(graphics->hwnd, graphics->hdc); + + HeapFree(GetProcessHeap(), 0, graphics); + + return Ok; +}

1 0

Evan Stade : gdiplus: First pen test.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: fcd7a62e930f9ed55cbb31a18efd011845c646bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd7a62e930f9ed55cbb31a18… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jun 11 11:52:26 2007 -0700 gdiplus: First pen test. --- .gitignore | 4 ++ Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/gdiplus/tests/Makefile.in | 13 ++++++ dlls/gdiplus/tests/pen.c | 92 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 120 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index d700570..15c7492 100644 --- a/.gitignore +++ b/.gitignore @@ -240,6 +240,9 @@ dlls/gdi32/tests/testlist.c dlls/gdi32/version.res dlls/gdi32/version16.res dlls/gdiplus/libgdiplus.def +dlls/gdiplus/tests/*.ok +dlls/gdiplus/tests/gdiplus_crosstest.exe +dlls/gdiplus/tests/testlist.c dlls/glu32/libglu32.def dlls/gphoto2.ds/rsrc.res dlls/hhctrl.ocx/hhctrl.res @@ -845,6 +848,7 @@ programs/winetest/dnsapi_test.exe programs/winetest/dplayx_test.exe programs/winetest/dsound_test.exe programs/winetest/gdi32_test.exe +programs/winetest/gdiplus_test.exe programs/winetest/hlink_test.exe programs/winetest/infosoft_test.exe programs/winetest/iphlpapi_test.exe diff --git a/Makefile.in b/Makefile.in index 36d950d..fbf9268 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,6 +234,7 @@ ALL_MAKEFILES = \ dlls/gdi32/Makefile \ dlls/gdi32/tests/Makefile \ dlls/gdiplus/Makefile \ + dlls/gdiplus/tests/Makefile \ dlls/glu32/Makefile \ dlls/gphoto2.ds/Makefile \ dlls/hal/Makefile \ @@ -586,6 +587,7 @@ dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules +dlls/gdiplus/tests/Makefile: dlls/gdiplus/tests/Makefile.in dlls/Maketest.rules dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules dlls/hal/Makefile: dlls/hal/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index dd092b2..2353f9f 100755 --- a/configure +++ b/configure @@ -20532,6 +20532,8 @@ ac_config_files="$ac_config_files dlls/gdi32/tests/Makefile" ac_config_files="$ac_config_files dlls/gdiplus/Makefile" +ac_config_files="$ac_config_files dlls/gdiplus/tests/Makefile" + ac_config_files="$ac_config_files dlls/glu32/Makefile" ac_config_files="$ac_config_files dlls/gphoto2.ds/Makefile" @@ -21696,6 +21698,7 @@ do "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;; + "dlls/gdiplus/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/tests/Makefile" ;; "dlls/glu32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glu32/Makefile" ;; "dlls/gphoto2.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gphoto2.ds/Makefile" ;; "dlls/hal/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hal/Makefile" ;; diff --git a/configure.ac b/configure.ac index 81fd87a..72359fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1517,6 +1517,7 @@ AC_CONFIG_FILES([dlls/dxguid/Makefile]) AC_CONFIG_FILES([dlls/gdi32/Makefile]) AC_CONFIG_FILES([dlls/gdi32/tests/Makefile]) AC_CONFIG_FILES([dlls/gdiplus/Makefile]) +AC_CONFIG_FILES([dlls/gdiplus/tests/Makefile]) AC_CONFIG_FILES([dlls/glu32/Makefile]) AC_CONFIG_FILES([dlls/gphoto2.ds/Makefile]) AC_CONFIG_FILES([dlls/hal/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index c1b7058..9a56e3b 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -246,6 +246,7 @@ TESTSUBDIRS = \ dplayx/tests \ dsound/tests \ gdi32/tests \ + gdiplus/tests \ hlink/tests \ infosoft/tests \ iphlpapi/tests \ diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in new file mode 100644 index 0000000..8cb6810 --- /dev/null +++ b/dlls/gdiplus/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = gdiplus.dll +IMPORTS = gdiplus kernel32 + +CTESTS = \ + pen.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c new file mode 100644 index 0000000..3615d9a --- /dev/null +++ b/dlls/gdiplus/tests/pen.c @@ -0,0 +1,92 @@ +/* + * Unit test suite for pens (and init) + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_startup(void) +{ + GpPen *pen; + Status status; + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + expect(Ok, status); + GdiplusShutdown(gdiplusToken); + + gdiplusStartupInput.GdiplusVersion = 2; + + status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + expect(UnsupportedGdiplusVersion, status); + GdiplusShutdown(gdiplusToken); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + + todo_wine + expect(GdiplusNotInitialized, status); + + GdipDeletePen(pen); +} + +static void test_constructor_destructor(void) +{ + GpStatus status; + GpPen *pen = NULL; + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized"); + + status = GdipDeletePen(NULL); + expect(InvalidParameter, status); + + status = GdipDeletePen(pen); + expect(Ok, status); +} + +START_TEST(pen) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + test_startup(); + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor_destructor(); + + GdiplusShutdown(gdiplusToken); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index c5afe48..bf2fd4a 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -40,6 +40,7 @@ TESTBINS = \ dplayx_test.exe \ dsound_test.exe \ gdi32_test.exe \ + gdiplus_test.exe \ hlink_test.exe \ infosoft_test.exe \ iphlpapi_test.exe \ @@ -121,6 +122,8 @@ dsound_test.exe: $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) cp $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) $@ && $(STRIP) $@ gdi32_test.exe: $(DLLDIR)/gdi32/tests/gdi32_test.exe$(DLLEXT) cp $(DLLDIR)/gdi32/tests/gdi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +gdiplus_test.exe: $(DLLDIR)/gdiplus/tests/gdiplus_test.exe$(DLLEXT) + cp $(DLLDIR)/gdiplus/tests/gdiplus_test.exe$(DLLEXT) $@ && $(STRIP) $@ hlink_test.exe: $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT) cp $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT) $@ && $(STRIP) $@ infosoft_test.exe: $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 103a037..e8a0772 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -163,6 +163,7 @@ dnsapi_test.exe TESTRES "dnsapi_test.exe" dplayx_test.exe TESTRES "dplayx_test.exe" dsound_test.exe TESTRES "dsound_test.exe" gdi32_test.exe TESTRES "gdi32_test.exe" +gdiplus_test.exe TESTRES "gdiplus_test.exe" hlink_test.exe TESTRES "hlink_test.exe" infosoft_test.exe TESTRES "infosoft_test.exe" iphlpapi_test.exe TESTRES "iphlpapi_test.exe"

1 0

Evan Stade : gdiplus: First pen implementation.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 63bfd40f6177ca6bd54ac5497f84377e914e818b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63bfd40f6177ca6bd54ac5497… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jun 11 11:51:15 2007 -0700 gdiplus: First pen implementation. --- dlls/gdiplus/Makefile.in | 3 +- dlls/gdiplus/gdiplus.c | 14 ++++++++ dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 38 +++++++++++++++++++++ dlls/gdiplus/pen.c | 72 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index f1d5040..a4edb46 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -7,7 +7,8 @@ IMPORTLIB = libgdiplus.$(IMPLIBEXT) IMPORTS = gdi32 advapi32 kernel32 ntdll C_SRCS = \ - gdiplus.c + gdiplus.c \ + pen.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 2cb04a6..6b2683a 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -79,3 +79,17 @@ void WINGDIPAPI GdipFree(void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } + +COLORREF ARGB2COLORREF(ARGB color) +{ + /* + Packing of these color structures: + COLORREF: 00bbggrr + ARGB: aarrggbb + FIXME:doesn't handle alpha channel + */ + return (COLORREF) + ((color & 0x0000ff) << 16) + + (color & 0x00ff00) + + ((color & 0xff0000) >> 16); +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 99b56b8..2bb3ba9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -111,7 +111,7 @@ @ stub GdipCreatePathGradientFromPath @ stub GdipCreatePathGradientI @ stub GdipCreatePathIter -@ stub GdipCreatePen1 +@ stdcall GdipCreatePen1(long long long ptr) @ stub GdipCreatePen2 @ stub GdipCreateRegion @ stub GdipCreateRegionHrgn @@ -136,7 +136,7 @@ @ stub GdipDeleteMatrix @ stub GdipDeletePath @ stub GdipDeletePathIter -@ stub GdipDeletePen +@ stdcall GdipDeletePen(ptr) @ stub GdipDeletePrivateFontCollection @ stub GdipDeleteRegion @ stub GdipDeleteStringFormat diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h new file mode 100644 index 0000000..2d3a179 --- /dev/null +++ b/dlls/gdiplus/gdiplus_private.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_GP_PRIVATE_H_ +#define __WINE_GP_PRIVATE_H_ + +#include "windef.h" +#include "winbase.h" +#include "gdiplus.h" + +#define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_ENDCAP_FLAT) + +COLORREF ARGB2COLORREF(ARGB color); + +struct GpPen{ + UINT style; + COLORREF color; + GpUnit unit; + REAL width; + HPEN gdipen; +}; + +#endif diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c new file mode 100644 index 0000000..2128d3b --- /dev/null +++ b/dlls/gdiplus/pen.c @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "gdiplus.h" +#include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + +GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, + GpPen **pen) +{ + LOGBRUSH lb; + GpPen *gp_pen; + + gp_pen = GdipAlloc(sizeof(GpPen)); + if(!pen) return OutOfMemory; + + gp_pen->style = GP_DEFAULT_PENSTYLE; + gp_pen->color = ARGB2COLORREF(color); + gp_pen->width = width; + gp_pen->unit = unit; + + /* FIXME: Currently only solid lines supported. */ + lb.lbStyle = BS_SOLID; + lb.lbColor = gp_pen->color; + lb.lbHatch = 0; + + if((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel)) { + gp_pen->gdipen = ExtCreatePen(gp_pen->style, (INT) gp_pen->width, &lb, + 0, NULL); + } else { + FIXME("UnitWorld, UnitPixel only supported units"); + return NotImplemented; + } + + if(!gp_pen) + return GenericError; + + *pen = gp_pen; + + return Ok; +} + +GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) +{ + if(!pen) return InvalidParameter; + DeleteObject(pen->gdipen); + GdipFree(pen); + + return Ok; +}

1 0

Andrew Talbot : msi: Constify a variable.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 58c55881bec3618f48c2cee6ec5336e8344c2c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c55881bec3618f48c2cee6e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jun 11 23:04:49 2007 +0100 msi: Constify a variable. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 1bcfa6e..4b5edc4 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -45,7 +45,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, BOOL* in_group); -static LPWSTR build_default_format(MSIRECORD* record) +static LPWSTR build_default_format(const MSIRECORD* record) { int i; int count;

1 0

Maarten Lankhorst : dsound: Unset variable on failure in IKsBufferPropertySetImpl_Create.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: faa29e92380867b083080d2c93381cc58ddc3bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa29e92380867b083080d2c9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jun 6 21:53:26 2007 +0200 dsound: Unset variable on failure in IKsBufferPropertySetImpl_Create. --- dlls/dsound/propset.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 7bb7f4f..4017f07 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -200,6 +200,7 @@ HRESULT IKsBufferPropertySetImpl_Create( PIDSDRIVERPROPERTYSET ps = NULL; IKsBufferPropertySetImpl *iks; TRACE("(%p,%p)\n",dsb,piks); + *piks = NULL; if (!dsb->hwbuf) return DSERR_INVALIDPARAM;

1 0