July 2009 - Wine-Commits - list.winehq.org

David Adam : d3dx9: Remove the useless d3dx8 import.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 5dfa6955eead20de0288a3e7b37e450b39ade14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfa6955eead20de0288a3e7b… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:09:40 2009 +0200 d3dx9: Remove the useless d3dx8 import. --- dlls/d3dx9_36/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index d64257d..88ac1d7 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dx8 gdi32 user32 kernel32 +IMPORTS = d3d9 gdi32 user32 kernel32 C_SRCS = \ core.c \

1 0

David Adam : d3dx9: Merge d3dx8 math tests into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: e5753acee533e25ffd0f1bfa97667aac1f903059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5753acee533e25ffd0f1bfa9… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:08:31 2009 +0200 d3dx9: Merge d3dx8 math tests into d3dx9. --- dlls/d3dx9_36/tests/math.c | 1475 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1462 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5753acee533e25ffd0f1…

1 0

David Adam : d3dx9: Clean-up the spec file.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 39fdb9ffde366c0172af1daa6381da16c75683ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fdb9ffde366c0172af1daa6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:07:57 2009 +0200 d3dx9: Clean-up the spec file. --- dlls/d3dx9_36/d3dx9_36.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8dca4b8..d3fe3ac 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -23,7 +23,7 @@ @ stub D3DXComputeIMTFromSignal @ stub D3DXComputeIMTFromTexture @ stub D3DXComputeNormalMap -@ stdcall D3DXComputeNormals(ptr ptr) d3dx8.D3DXComputeNormals +@ stub D3DXComputeNormals @ stub D3DXComputeTangent @ stub D3DXComputeTangentFrame @ stub D3DXComputeTangentFrameEx @@ -83,7 +83,7 @@ @ stub D3DXCreatePRTEngine @ stub D3DXCreateRenderToEnvMap @ stub D3DXCreateRenderToSurface -@ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx8.D3DXCreateSPMesh +@ stub D3DXCreateSPMesh @ stub D3DXCreateSkinInfo @ stub D3DXCreateSkinInfoFromBlendedMesh @ stub D3DXCreateSkinInfoFVF @@ -146,7 +146,7 @@ @ stub D3DXGatherFragmentsFromResourceA @ stub D3DXGatherFragmentsFromResourceW @ stub D3DXGenerateOutputDecl -@ stdcall D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) d3dx8.D3DXGeneratePMesh +@ stub D3DXGeneratePMesh @ stub D3DXGetDeclLength @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @@ -165,8 +165,8 @@ @ stdcall D3DXGetShaderSize(ptr) @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) -@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersect -@ stdcall D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersectSubset +@ stub D3DXIntersect +@ stub D3DXIntersectSubset @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub D3DXLoadMeshFromXA @ stub D3DXLoadMeshFromXInMemory @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionRotationYawPitchRoll(ptr long long long) @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long) -@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXQuaternionSquadSetup +@ stub D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize @ stub D3DXSaveMeshHierarchyToFileA @@ -290,17 +290,17 @@ @ stub D3DXSHRotate @ stub D3DXSHRotateZ @ stub D3DXSHScale -@ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx8.D3DXSimplifyMesh +@ stub D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) -@ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx8.D3DXSplitMesh -@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx8.D3DXTessellateNPatches +@ stub D3DXSplitMesh +@ stub D3DXTessellateNPatches @ stub D3DXTessellateRectPatch @ stub D3DXTessellateTriPatch @ stub D3DXTriPatchSize @ stub D3DXUVAtlasCreate @ stub D3DXUVAtlasPack @ stub D3DXUVAtlasPartition -@ stdcall D3DXValidMesh(ptr ptr ptr) d3dx8.D3DXValidMesh +@ stub D3DXValidMesh @ stub D3DXValidPatchMesh @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr long)

1 0

David Adam : d3dx9: Merge d3dx8 math into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: d1c2d2a4f8cfed3550b7a853e65fec6c5626ea6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c2d2a4f8cfed3550b7a853e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:06:44 2009 +0200 d3dx9: Merge d3dx8 math into d3dx9. --- dlls/d3dx9_36/d3dx9_36.spec | 144 ++-- dlls/d3dx9_36/d3dx9_36_private.h | 13 + dlls/d3dx9_36/math.c | 1586 +++++++++++++++++++++++++++++++++++--- include/d3dx9math.h | 69 ++ 4 files changed, 1651 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1c2d2a4f8cfed3550b7a…

1 0

David Adam : d3dx9: Merge d3dx8 mesh tests into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 35ada0dc2d372df2be25fad4f56027535c5d15c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ada0dc2d372df2be25fad4f… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:03:46 2009 +0200 d3dx9: Merge d3dx8 mesh tests into d3dx9. --- dlls/d3dx9_36/tests/mesh.c | 368 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 368 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35ada0dc2d372df2be25f…

1 0

David Adam : d3dx9: Merge d3dx8 mesh into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 40c6cf77ce6a6302f13f5ad8492e77518a2cd65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c6cf77ce6a6302f13f5ad84… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:01:59 2009 +0200 d3dx9: Merge d3dx8 mesh into d3dx9. --- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/mesh.c | 93 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 30926c2..a0f092f 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -3,7 +3,7 @@ @ stub D3DXAssembleShaderFromFileW @ stub D3DXAssembleShaderFromResourceA @ stub D3DXAssembleShaderFromResourceW -@ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx8.D3DXBoxBoundProbe +@ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) @ stub D3DXCheckCubeTextureRequirements @ stub D3DXCheckTextureRequirements @ stdcall D3DXCheckVersion(long long) @@ -291,7 +291,7 @@ @ stub D3DXSHRotateZ @ stub D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx8.D3DXSimplifyMesh -@ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) d3dx8.D3DXSphereBoundProbe +@ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx8.D3DXSplitMesh @ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx8.D3DXTessellateNPatches @ stub D3DXTessellateRectPatch diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9b54ce0..251bb40 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -28,6 +28,79 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /************************************************************************* + * D3DXBoxBoundProbe + */ +BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *pmin, CONST D3DXVECTOR3 *pmax, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) + +/* Algorithm taken from the article: An Efficient and Robust Ray-Box Intersection Algoritm +Amy Williams University of Utah +Steve Barrus University of Utah +R. Keith Morley University of Utah +Peter Shirley University of Utah + +International Conference on Computer Graphics and Interactive Techniques archive +ACM SIGGRAPH 2005 Courses +Los Angeles, California + +This algorithm is free of patents or of copyrights, as confirmed by Peter Shirley himself. + +Algorithm: Consider the box as the intersection of three slabs. Clip the ray +against each slab, if there's anything left of the ray after we're +done we've got an intersection of the ray with the box. +*/ + +{ + FLOAT div, tmin, tmax, tymin, tymax, tzmin, tzmax; + + div = 1.0f / praydirection->x; + if ( div >= 0.0f ) + { + tmin = ( pmin->x - prayposition->x ) * div; + tmax = ( pmax->x - prayposition->x ) * div; + } + else + { + tmin = ( pmax->x - prayposition->x ) * div; + tmax = ( pmin->x - prayposition->x ) * div; + } + + if ( tmax < 0.0f ) return FALSE; + + div = 1.0f / praydirection->y; + if ( div >= 0.0f ) + { + tymin = ( pmin->y - prayposition->y ) * div; + tymax = ( pmax->y - prayposition->y ) * div; + } + else + { + tymin = ( pmax->y - prayposition->y ) * div; + tymax = ( pmin->y - prayposition->y ) * div; + } + + if ( ( tymax < 0.0f ) || ( tmin > tymax ) || ( tymin > tmax ) ) return FALSE; + + if ( tymin > tmin ) tmin = tymin; + if ( tymax < tmax ) tmax = tymax; + + div = 1.0f / praydirection->z; + if ( div >= 0.0f ) + { + tzmin = ( pmin->z - prayposition->z ) * div; + tzmax = ( pmax->z - prayposition->z ) * div; + } + else + { + tzmin = ( pmax->z - prayposition->z ) * div; + tzmax = ( pmin->z - prayposition->z ) * div; + } + + if ( (tzmax < 0.0f ) || ( tmin > tzmax ) || ( tzmin > tmax ) ) return FALSE; + + return TRUE; +} + +/************************************************************************* * D3DXComputeBoundingBox */ HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *pfirstposition, DWORD numvertices, DWORD dwstride, D3DXVECTOR3 *pmin, D3DXVECTOR3 *pmax) @@ -131,7 +204,7 @@ UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF) } /************************************************************************* - * D3DXGetFVFVertexSize + * D3DXGetDeclVertexSize */ UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx) { @@ -223,3 +296,21 @@ BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST return FALSE; } + +/************************************************************************* + * D3DXSphereBoundProbe + */ +BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) +{ + D3DXVECTOR3 difference; + FLOAT a, b, c, d; + + a = D3DXVec3LengthSq(praydirection); + if (!D3DXVec3Subtract(&difference, prayposition, pcenter)) return FALSE; + b = D3DXVec3Dot(&difference, praydirection); + c = D3DXVec3LengthSq(&difference) - radius * radius; + d = b * b - a * c; + + if ( ( d <= 0.0f ) || ( sqrt(d) <= b ) ) return FALSE; + return TRUE; +}

1 0

David Adam : d3dx9: Merge d3dx8 core into d3dx9.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: de5090c51c2b372e8b5193bda6c0be6b0758b83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5090c51c2b372e8b5193bda… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 18:00:20 2009 +0200 d3dx9: Merge d3dx8 core into d3dx9. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/core.c | 120 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 15 +++++ 4 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 1c6195b..d64257d 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dx8 gdi32 user32 kernel32 C_SRCS = \ + core.c \ d3dx9_36_main.c \ font.c \ math.c \ diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c new file mode 100644 index 0000000..3b63e9e --- /dev/null +++ b/dlls/d3dx9_36/core.c @@ -0,0 +1,120 @@ +/* + * + * Copyright 2002 Raphael Junqueira + * + * 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> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +/* ID3DXBuffer IUnknown parts follow: */ +static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID riid, LPVOID* ppobj) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXBuffer)) + { + IUnknown_AddRef(iface); + *ppobj = This; + return D3D_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) : AddRef from %d\n", This, ref - 1); + + return ref; +} + +static ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) : ReleaseRef to %d\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This->buffer); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +/* ID3DXBuffer Interface follow: */ +static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + return This->buffer; +} + +static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) +{ + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + return This->bufferSize; +} + +const ID3DXBufferVtbl D3DXBuffer_Vtbl = +{ + ID3DXBufferImpl_QueryInterface, + ID3DXBufferImpl_AddRef, + ID3DXBufferImpl_Release, + ID3DXBufferImpl_GetBufferPointer, + ID3DXBufferImpl_GetBufferSize +}; + +HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) +{ + ID3DXBufferImpl *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl)); + if (object == NULL) + { + *ppBuffer = NULL; + return E_OUTOFMEMORY; + } + object->lpVtbl = &D3DXBuffer_Vtbl; + object->ref = 1; + object->bufferSize = NumBytes; + object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); + if (object->buffer == NULL) + { + HeapFree(GetProcessHeap(), 0, object); + *ppBuffer = NULL; + return E_OUTOFMEMORY; + } + + *ppBuffer = (LPD3DXBUFFER)object; + return D3D_OK; +} diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8a7cdf7..30926c2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -32,7 +32,7 @@ @ stub D3DXConvertMeshSubsetToStrips @ stub D3DXCreateAnimationController @ stub D3DXCreateBox -@ stdcall D3DXCreateBuffer(long ptr) d3dx8.D3DXCreateBuffer +@ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet @ stub D3DXCreateCubeTexture @ stub D3DXCreateCubeTextureFromFileA diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index cf3e176..a1ff7bc 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -1,4 +1,5 @@ /* + * Copyright (C) 2002 Raphael Junqueira * Copyright (C) 2008 Tony Wasserka * * This library is free software; you can redistribute it and/or @@ -32,6 +33,20 @@ HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length); HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length); +extern const ID3DXBufferVtbl D3DXBuffer_Vtbl; + +/* ID3DXBUFFER */ +typedef struct ID3DXBufferImpl +{ + /* IUnknown fields */ + const ID3DXBufferVtbl *lpVtbl; + LONG ref; + + /* ID3DXBuffer fields */ + DWORD *buffer; + DWORD bufferSize; +} ID3DXBufferImpl; + /* ID3DXFont */ typedef struct ID3DXFontImpl

1 0

David Adam : d3dx9: Add d3dx9.h in dxguid.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: 3871fb34d17ce1609e33270094358d68899c0fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3871fb34d17ce1609e3327009… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 17:59:27 2009 +0200 d3dx9: Add d3dx9.h in dxguid. --- dlls/dxguid/dx9guid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxguid/dx9guid.c b/dlls/dxguid/dx9guid.c index 2ab60ad..d64e690 100644 --- a/dlls/dxguid/dx9guid.c +++ b/dlls/dxguid/dx9guid.c @@ -31,4 +31,4 @@ #include "olectl.h" #include "initguid.h" -#include "d3d9.h" +#include "d3dx9.h"

1 0

David Adam : d3dx9: Fix the prototype of some functions.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: bd7421cd6db2f0270bdbf51822380d8af3b0ddd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7421cd6db2f0270bdbf5182… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Jul 11 17:58:54 2009 +0200 d3dx9: Fix the prototype of some functions. --- dlls/d3dx9_36/math.c | 2 +- include/d3dx9math.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index e735303..2cf22d7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -87,7 +87,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D( /************************************************************************* * D3DXMatrixDecompose */ -HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, D3DXMATRIX *pm) +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, CONST D3DXMATRIX *pm) { D3DXMATRIX normalized; D3DXVECTOR3 vec; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 83b8749..a033796 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -266,9 +266,9 @@ extern "C" { D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); -D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation); +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR3 *rotationcenter, CONST D3DXQUATERNION *rotation, CONST D3DXVECTOR3 *translation); D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *pout, FLOAT scaling, CONST D3DXVECTOR2 *protationcenter, FLOAT rotation, CONST D3DXVECTOR2 *ptranslation); -HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, D3DXMATRIX *pm); +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, CONST D3DXMATRIX *pm); FLOAT WINAPI D3DXMatrixDeterminant(CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);

1 0

Yuri Khan : winex11.drv: Handle clipboard on an auxiliary thread for windowless apps.
by Alexandre Julliard July 13, 2009

July 13, 2009

Module: wine Branch: master Commit: f1c131ba2731cca5139d2ffef628fd340e51617b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c131ba2731cca5139d2ffef… Author: Yuri Khan <yurivkhan(a)gmail.com> Date: Fri Jul 10 07:53:00 2009 +0700 winex11.drv: Handle clipboard on an auxiliary thread for windowless apps. --- dlls/winex11.drv/clipboard.c | 87 +++++++++++++++++++++++++++++------------- 1 files changed, 60 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 3806080..82928a2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2504,6 +2504,52 @@ INT CDECL X11DRV_GetClipboardFormatName(UINT wFormat, LPWSTR retStr, INT maxlen) return strlenW(retStr); } +static void selection_acquire(void) +{ + Window owner; + Display *display; + + owner = thread_selection_wnd(); + display = thread_display(); + + wine_tsx11_lock(); + + selectionAcquired = 0; + selectionWindow = 0; + + /* Grab PRIMARY selection if not owned */ + if (use_primary_selection) + XSetSelectionOwner(display, XA_PRIMARY, owner, CurrentTime); + + /* Grab CLIPBOARD selection if not owned */ + XSetSelectionOwner(display, x11drv_atom(CLIPBOARD), owner, CurrentTime); + + if (use_primary_selection && XGetSelectionOwner(display, XA_PRIMARY) == owner) + selectionAcquired |= S_PRIMARY; + + if (XGetSelectionOwner(display,x11drv_atom(CLIPBOARD)) == owner) + selectionAcquired |= S_CLIPBOARD; + + wine_tsx11_unlock(); + + if (selectionAcquired) + { + selectionWindow = owner; + TRACE("Grabbed X selection, owner=(%08x)\n", (unsigned) owner); + } +} + +static DWORD WINAPI selection_thread_proc(LPVOID unused) +{ + selection_acquire(); + + while (selectionAcquired) + { + MsgWaitForMultipleObjectsEx(0, NULL, INFINITE, QS_SENDMESSAGE, 0); + } + + return 0; +} /************************************************************************** * AcquireClipboard (X11DRV.@) @@ -2511,8 +2557,7 @@ INT CDECL X11DRV_GetClipboardFormatName(UINT wFormat, LPWSTR retStr, INT maxlen) int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) { DWORD procid; - Window owner; - Display *display; + HANDLE selectionThread; TRACE(" %p\n", hWndClipWindow); @@ -2540,33 +2585,21 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) } } - owner = thread_selection_wnd(); - display = thread_display(); - - wine_tsx11_lock(); - - selectionAcquired = 0; - selectionWindow = 0; - - /* Grab PRIMARY selection if not owned */ - if (use_primary_selection) - XSetSelectionOwner(display, XA_PRIMARY, owner, CurrentTime); - - /* Grab CLIPBOARD selection if not owned */ - XSetSelectionOwner(display, x11drv_atom(CLIPBOARD), owner, CurrentTime); - - if (use_primary_selection && XGetSelectionOwner(display, XA_PRIMARY) == owner) - selectionAcquired |= S_PRIMARY; - - if (XGetSelectionOwner(display,x11drv_atom(CLIPBOARD)) == owner) - selectionAcquired |= S_CLIPBOARD; + if (hWndClipWindow) + { + selection_acquire(); + } + else + { + selectionThread = CreateThread(NULL, 0, &selection_thread_proc, NULL, 0, NULL); - wine_tsx11_unlock(); + if (!selectionThread) + { + WARN("Could not start clipboard thread\n"); + return 0; + } - if (selectionAcquired) - { - selectionWindow = owner; - TRACE("Grabbed X selection, owner=(%08x)\n", (unsigned) owner); + CloseHandle(selectionThread); } return 1;

1 0