February 2009 - Wine-commits

Alistair Leslie-Hughes : mshtml: Do a case-insensitive compare of type.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 87ce5275bb876149ccc4df7567b96516453bf769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ce5275bb876149ccc4df756… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 13 21:38:13 2008 +1100 mshtml: Do a case-insensitive compare of type. --- dlls/mshtml/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4b1a240..fb90b46 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -640,7 +640,7 @@ static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; /* FIXME: Handle more types */ - if(!strcmpW(type, text_javascriptW)) { + if(!strcmpiW(type, text_javascriptW)) { *guid = CLSID_JScript; }else { FIXME("Unknown type %s\n", debugstr_w(type));

1 0

Stefano Guidoni : msadp32: MSDN suggests "wfx.nBlockAlign * 2 / wfx. nChannels - 12" as the formula for calculating wSamplesPerBlock.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: d6ae9f8800292ecfc766c69d4408ec852b63f1b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ae9f8800292ecfc766c69d4… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Mon Feb 9 22:06:30 2009 +0100 msadp32: MSDN suggests "wfx.nBlockAlign * 2 / wfx.nChannels - 12" as the formula for calculating wSamplesPerBlock. --- dlls/msadp32.acm/msadp32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 863335c..dfb42bf 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -171,7 +171,7 @@ static void init_wfx_adpcm(ADPCMWAVEFORMAT* awfx) pwfx->cbSize = 2 * sizeof(WORD) + 7 * sizeof(ADPCMCOEFSET); /* 7 is the size of the block head (which contains two samples) */ - awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (7 * pwfx->nChannels)) * (2 / pwfx->nChannels) + 2; + awfx->wSamplesPerBlock = pwfx->nBlockAlign * 2 / pwfx->nChannels - 12; pwfx->nAvgBytesPerSec = (pwfx->nSamplesPerSec * pwfx->nBlockAlign) / awfx->wSamplesPerBlock; awfx->wNumCoef = 7; memcpy(awfx->aCoef, MSADPCM_CoeffSet, 7 * sizeof(ADPCMCOEFSET));

1 0

Stefano Guidoni : msadp32: ADPCM_FormatSuggest compare source format tag with destination format tag.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 7fb434838c9830e05ff1ce610c6b822612238575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb434838c9830e05ff1ce610… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Mon Feb 9 22:09:17 2009 +0100 msadp32: ADPCM_FormatSuggest compare source format tag with destination format tag. --- dlls/msadp32.acm/msadp32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index dfb42bf..7a66207 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -472,6 +472,7 @@ static LRESULT ADPCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) /* some tests ... */ if (adfs->cbwfxSrc < sizeof(PCMWAVEFORMAT) || adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) || + adfs->pwfxSrc->wFormatTag == adfs->pwfxDst->wFormatTag || ADPCM_GetFormatIndex(adfs->pwfxSrc) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; /* FIXME: should do those tests against the real size (according to format tag */

1 0

Stefano Guidoni : msadp32: Block align size is proportional to the number of channels.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 279e797cb2e431d057278eaaaea6c0a6559c230f URL: http://source.winehq.org/git/wine.git/?a=commit;h=279e797cb2e431d057278eaaa… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Mon Feb 9 21:56:19 2009 +0100 msadp32: Block align size is proportional to the number of channels. --- dlls/msadp32.acm/msadp32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index a60dab0..863335c 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -162,10 +162,10 @@ static void init_wfx_adpcm(ADPCMWAVEFORMAT* awfx) switch (pwfx->nSamplesPerSec) { - case 8000: pwfx->nBlockAlign = 256; break; - case 11025: pwfx->nBlockAlign = 256; break; - case 22050: pwfx->nBlockAlign = 512; break; - case 44100: pwfx->nBlockAlign = 1024; break; + case 8000: pwfx->nBlockAlign = 256 * pwfx->nChannels; break; + case 11025: pwfx->nBlockAlign = 256 * pwfx->nChannels; break; + case 22050: pwfx->nBlockAlign = 512 * pwfx->nChannels; break; + case 44100: pwfx->nBlockAlign = 1024 * pwfx->nChannels; break; default: break; } pwfx->cbSize = 2 * sizeof(WORD) + 7 * sizeof(ADPCMCOEFSET);

1 0

Stefano Guidoni : msadp32: ADPCM allows other sample rates other than 8000, 11025, 22050 and 44100.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: c262d5b649e14b436e3b8efd8ce9543af4cf3a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c262d5b649e14b436e3b8efd8… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Mon Feb 9 21:34:13 2009 +0100 msadp32: ADPCM allows other sample rates other than 8000, 11025, 22050 and 44100. --- dlls/msadp32.acm/msadp32.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index c3205e9..a60dab0 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -128,6 +128,25 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX* wfx) return i; } + switch (wfx->wFormatTag) + { + case WAVE_FORMAT_PCM: + if(3 > wfx->nChannels && + wfx->nChannels > 0 && + wfx->nAvgBytesPerSec == 2 * wfx->nSamplesPerSec * wfx->nChannels && + wfx->nBlockAlign == 2 * wfx->nChannels && + wfx->wBitsPerSample == 16) + return hi; + break; + case WAVE_FORMAT_ADPCM: + if(3 > wfx->nChannels && + wfx->nChannels > 0 && + wfx->wBitsPerSample == 4 && + wfx->cbSize == 32) + return hi; + break; + } + return 0xFFFFFFFF; } @@ -146,8 +165,8 @@ static void init_wfx_adpcm(ADPCMWAVEFORMAT* awfx) case 8000: pwfx->nBlockAlign = 256; break; case 11025: pwfx->nBlockAlign = 256; break; case 22050: pwfx->nBlockAlign = 512; break; - default: case 44100: pwfx->nBlockAlign = 1024; break; + default: break; } pwfx->cbSize = 2 * sizeof(WORD) + 7 * sizeof(ADPCMCOEFSET); /* 7 is the size of the block head (which contains two samples) */ @@ -477,18 +496,19 @@ static LRESULT ADPCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->wFormatTag = WAVE_FORMAT_PCM; } - /* check if result is ok */ - if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; - /* recompute other values */ switch (adfs->pwfxDst->wFormatTag) { case WAVE_FORMAT_PCM: adfs->pwfxDst->nBlockAlign = (adfs->pwfxDst->nChannels * adfs->pwfxDst->wBitsPerSample) / 8; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; + /* check if result is ok */ + if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; case WAVE_FORMAT_ADPCM: init_wfx_adpcm((ADPCMWAVEFORMAT*)adfs->pwfxDst); + /* check if result is ok */ + if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; default: FIXME("\n");

1 0

Marcus Meissner : winegcc: Added some strarray_free() (Coverity).
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: fbcc18754dd9294d23cc23b528b522c41bdefe88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcc18754dd9294d23cc23b52… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Feb 10 19:33:32 2009 +0100 winegcc: Added some strarray_free() (Coverity). --- tools/winegcc/winegcc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 08929a3..d216d9b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -438,6 +438,7 @@ no_compat_defines: strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) ); spawn(opts->prefix, comp_args, 0); + strarray_free(comp_args); } static const char* compile_to_object(struct options* opts, const char* file, const char* lang) @@ -692,6 +693,7 @@ static void build(struct options* opts) } spawn(opts->prefix, spec_args, 0); + strarray_free (spec_args); /* link everything together now */ link_args = strarray_alloc(); @@ -755,6 +757,7 @@ static void build(struct options* opts) } spawn(opts->prefix, link_args, 0); + strarray_free (link_args); /* set the base address */ if (opts->image_base) @@ -792,6 +795,7 @@ static void forward(int argc, char **argv, struct options* opts) strarray_add(args, argv[j]); spawn(opts->prefix, args, 0); + strarray_free (args); } /*

1 0

David Adam : d3dx9_36: Implement D3DXGetFVFVertexSize.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: ca469499bbbcf2c69afdf6ff96a34cdd33b30206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca469499bbbcf2c69afdf6ff9… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Feb 10 15:44:24 2009 +0100 d3dx9_36: Implement D3DXGetFVFVertexSize. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 39 +++++++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 3 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 6ce5643..8a5082d 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -150,7 +150,7 @@ @ stub D3DXGetDeclLength @ stub D3DXGetDeclVertexSize @ stdcall D3DXGetDriverLevel(ptr) -@ stub D3DXGetFVFVertexSize +@ stdcall D3DXGetFVFVertexSize(long) @ stdcall D3DXGetImageInfoFromFileA(ptr ptr) d3dx8.D3DXGetImageInfoFromFileA @ stdcall D3DXGetImageInfoFromFileInMemory(ptr long ptr) d3dx8.D3DXGetImageInfoFromFileInMemory @ stdcall D3DXGetImageInfoFromFileW(ptr ptr) d3dx8.D3DXGetImageInfoFromFileW diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 521d694..0d3eb2c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -89,6 +89,45 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR } /************************************************************************* + * D3DXGetFVFVertexSize + */ +static UINT Get_TexCoord_Size_From_FVF(DWORD FVF, int tex_num) +{ + return (((((FVF) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1); +} + +UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF) +{ + DWORD size = 0; + UINT i; + UINT numTextures = (FVF & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT; + + if (FVF & D3DFVF_NORMAL) size += sizeof(D3DXVECTOR3); + if (FVF & D3DFVF_DIFFUSE) size += sizeof(DWORD); + if (FVF & D3DFVF_SPECULAR) size += sizeof(DWORD); + if (FVF & D3DFVF_PSIZE) size += sizeof(DWORD); + + switch (FVF & D3DFVF_POSITION_MASK) + { + case D3DFVF_XYZ: size += sizeof(D3DXVECTOR3); break; + case D3DFVF_XYZRHW: size += 4 * sizeof(FLOAT); break; + case D3DFVF_XYZB1: size += 4 * sizeof(FLOAT); break; + case D3DFVF_XYZB2: size += 5 * sizeof(FLOAT); break; + case D3DFVF_XYZB3: size += 6 * sizeof(FLOAT); break; + case D3DFVF_XYZB4: size += 7 * sizeof(FLOAT); break; + case D3DFVF_XYZB5: size += 8 * sizeof(FLOAT); break; + case D3DFVF_XYZW: size += 4 * sizeof(FLOAT); break; + } + + for (i = 0; i < numTextures; i++) + { + size += Get_TexCoord_Size_From_FVF(FVF, i) * sizeof(FLOAT); + } + + return size; +} + +/************************************************************************* * D3DXIntersectTri */ BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST D3DXVECTOR3 *p2, CONST D3DXVECTOR3 *praypos, CONST D3DXVECTOR3 *praydir, FLOAT *pu, FLOAT *pv, FLOAT *pdist) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index a85f80d..72ea607 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -31,6 +31,7 @@ BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); +UINT WINAPI D3DXGetFVFVertexSize(DWORD); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); #ifdef __cplusplus

1 0

David Adam : d3dx9_36: Implement D3DXComputeBoundingBox.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 00d14355db19699991b1be9ecc84a8b24b7bb46c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d14355db19699991b1be9ec… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Feb 10 16:06:41 2009 +0100 d3dx9_36: Implement D3DXComputeBoundingBox. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 30 ++++++++++++++++++++++++++++++ include/d3dx9.h | 1 + include/d3dx9mesh.h | 1 + 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 64ebd58..2534acf 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -16,7 +16,7 @@ @ stub D3DXCompileShaderFromFileW @ stub D3DXCompileShaderFromResourceA @ stub D3DXCompileShaderFromResourceW -@ stub D3DXComputeBoundingBox +@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stub D3DXComputeBoundingSphere @ stub D3DXComputeIMTFromPerTexelSignal @ stub D3DXComputeIMTFromPerVertexSignal diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c8637d8..08d6e2f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -25,6 +25,36 @@ /************************************************************************* + * D3DXComputeBoundingBox + */ +HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *pfirstposition, DWORD numvertices, DWORD dwstride, D3DXVECTOR3 *pmin, D3DXVECTOR3 *pmax) +{ + D3DXVECTOR3 vec; + unsigned int i; + + if( !pfirstposition || !pmin || !pmax ) return D3DERR_INVALIDCALL; + + *pmin = *pfirstposition; + *pmax = *pmin; + + for(i=0; i<numvertices; i++) + { + vec = *( (D3DXVECTOR3*)((char*)pfirstposition + dwstride * i) ); + + if ( vec.x < pmin->x ) pmin->x = vec.x; + if ( vec.x > pmax->x ) pmax->x = vec.x; + + if ( vec.y < pmin->y ) pmin->y = vec.y; + if ( vec.y > pmax->y ) pmax->y = vec.y; + + if ( vec.z < pmin->z ) pmin->z = vec.z; + if ( vec.z > pmax->z ) pmax->z = vec.z; + } + + return D3D_OK; +} + +/************************************************************************* * D3DXIntersectTri */ BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST D3DXVECTOR3 *p2, CONST D3DXVECTOR3 *praypos, CONST D3DXVECTOR3 *praydir, FLOAT *pu, FLOAT *pv, FLOAT *pdist) diff --git a/include/d3dx9.h b/include/d3dx9.h index b551eba..6b3bdf6 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -24,6 +24,7 @@ #include "d3d9.h" #include "d3dx9math.h" #include "d3dx9core.h" +#include "d3dx9mesh.h" #include "d3dx9shader.h" #include "d3dx9tex.h" diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index c337ad2..5cfc25e 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -29,6 +29,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); UINT WINAPI D3DXGetFVFVertexSize(DWORD); BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *); BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); +HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); #ifdef __cplusplus

1 0

David Adam : d3dx9_36: Implement D3DXComputeBoundingSphere.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: e5425fc17bfc7e358d114e93d9a4d557ab85ef54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5425fc17bfc7e358d114e93d… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Feb 10 15:43:36 2009 +0100 d3dx9_36: Implement D3DXComputeBoundingSphere. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 34 ++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 3 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 2534acf..6ce5643 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -17,7 +17,7 @@ @ stub D3DXCompileShaderFromResourceA @ stub D3DXCompileShaderFromResourceW @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) -@ stub D3DXComputeBoundingSphere +@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stub D3DXComputeIMTFromPerTexelSignal @ stub D3DXComputeIMTFromPerVertexSignal @ stub D3DXComputeIMTFromSignal diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 08d6e2f..521d694 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -55,6 +55,40 @@ HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *pfirstposition, DWORD n } /************************************************************************* + * D3DXComputeBoundingSphere + */ +HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWORD numvertices, DWORD dwstride, D3DXVECTOR3 *pcenter, FLOAT *pradius) +{ + D3DXVECTOR3 temp, temp1; + FLOAT d; + unsigned int i; + + if( !pfirstposition || !pcenter || !pradius ) return D3DERR_INVALIDCALL; + + temp.x = 0.0f; + temp.y = 0.0f; + temp.z = 0.0f; + temp1 = temp; + d = 0.0f; + *pradius = 0.0f; + + for(i=0; i<numvertices; i++) + { + D3DXVec3Add(&temp1, &temp, (D3DXVECTOR3*)((char*)pfirstposition + dwstride * i)); + temp = temp1; + } + + D3DXVec3Scale(pcenter, &temp, 1.0f/((FLOAT)numvertices)); + + for(i=0; i<numvertices; i++) + { + d = D3DXVec3Length(D3DXVec3Subtract(&temp, (D3DXVECTOR3*)((char*)pfirstposition + dwstride * i), pcenter)); + if ( d > *pradius ) *pradius = d; + } + return D3D_OK; +} + +/************************************************************************* * D3DXIntersectTri */ BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST D3DXVECTOR3 *p2, CONST D3DXVECTOR3 *praypos, CONST D3DXVECTOR3 *praydir, FLOAT *pu, FLOAT *pv, FLOAT *pdist) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 5cfc25e..a85f80d 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -30,6 +30,7 @@ UINT WINAPI D3DXGetFVFVertexSize(DWORD); BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *); BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); +HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); #ifdef __cplusplus

1 0

Paul Vriens : fusion/tests: Fix some typos.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 283e7842a2aad8b1f127a5ee47a97d3a8f9c84a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283e7842a2aad8b1f127a5ee4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 11 11:09:04 2009 +0100 fusion/tests: Fix some typos. --- dlls/fusion/tests/asmname.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 37579a3..b63e6b2 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -413,7 +413,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, NULL, CANOF_SET_DEFAULT_VALUES, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -443,7 +443,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, empty, CANOF_SET_DEFAULT_VALUES, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -474,7 +474,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_SET_DEFAULT_VALUES, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -508,7 +508,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -540,7 +540,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -571,7 +571,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -603,7 +603,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -635,7 +635,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -667,7 +667,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -742,7 +742,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL);

1 0