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

Rico Schüller : d3dx9: Fix light range spelling.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: f37302ed8a82f7e07e9d38e667e1e16160e22334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37302ed8a82f7e07e9d38e66… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:11 2011 +0200 d3dx9: Fix light range spelling. --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3265037..4b320fd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -337,7 +337,7 @@ state_table[] = {SC_LIGHT, LT_AMBIENT, "LightAmbient"}, {SC_LIGHT, LT_POSITION, "LightPosition"}, {SC_LIGHT, LT_DIRECTION, "LightDirection"}, - {SC_LIGHT, LT_RANGE, "LighRange"}, + {SC_LIGHT, LT_RANGE, "LightRange"}, {SC_LIGHT, LT_FALLOFF, "LightFallOff"}, {SC_LIGHT, LT_ATTENUATION0, "LightAttenuation0"}, {SC_LIGHT, LT_ATTENUATION1, "LightAttenuation1"},

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect::Begin().
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: a63be635fcceed3b08bec53963b5daddb93586f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63be635fcceed3b08bec5396… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:20 2011 +0200 d3dx9: Implement ID3DXEffect::Begin(). --- dlls/d3dx9_36/effect.c | 32 +++++++++++++++++++++++++++++--- include/d3dx9effect.h | 6 ++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4b320fd..a1bdc5d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -165,6 +165,7 @@ struct ID3DXEffectImpl LPD3DXEFFECTSTATEMANAGER manager; LPDIRECT3DDEVICE9 device; LPD3DXEFFECTPOOL pool; + D3DXHANDLE active_technique; ID3DXBaseEffect *base_effect; }; @@ -2790,13 +2791,32 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL return FALSE; } -static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect* iface, UINT *passes, DWORD flags) +static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = get_technique_struct(This->active_technique); - FIXME("(%p)->(%p, %#x): stub\n", This, passes, flags); + FIXME("iface %p, passes %p, flags %#x partial stub\n", This, passes, flags); - return E_NOTIMPL; + if (passes && technique) + { + if (This->manager || flags & D3DXFX_DONOTSAVESTATE) + { + TRACE("State capturing disabled.\n"); + } + else + { + FIXME("State capturing not supported, yet!\n"); + } + + *passes = technique->pass_count; + + return D3D_OK; + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect* iface, UINT pass) @@ -4988,6 +5008,12 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC effect->base_effect = &object->ID3DXBaseEffect_iface; + /* initialize defaults - check because of unsupported ascii effects */ + if (object->technique_handles) + { + effect->active_technique = object->technique_handles[0]; + } + return D3D_OK; err_out: diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index e0d1de5..035f4d6 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -21,6 +21,12 @@ #ifndef __D3DX9EFFECT_H__ #define __D3DX9EFFECT_H__ +#define D3DXFX_DONOTSAVESTATE (1 << 0) +#define D3DXFX_DONOTSAVESHADERSTATE (1 << 1) +#define D3DXFX_DONOTSAVESAMPLERSTATE (1 << 2) +#define D3DXFX_NOT_CLONEABLE (1 << 11) +#define D3DXFX_LARGEADDRESSAWARE (1 << 17) + #define D3DX_PARAMETER_SHARED 1 #define D3DX_PARAMETER_LITERAL 2 #define D3DX_PARAMETER_ANNOTATION 4

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: BeginPass().
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: fb6c973b4be113d4a1cf72329820b37422f68e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6c973b4be113d4a1cf72329… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:24 2011 +0200 d3dx9: Implement ID3DXEffect::BeginPass(). --- dlls/d3dx9_36/effect.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a1bdc5d..79b53b1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -166,6 +166,7 @@ struct ID3DXEffectImpl LPDIRECT3DDEVICE9 device; LPD3DXEFFECTPOOL pool; D3DXHANDLE active_technique; + D3DXHANDLE active_pass; ID3DXBaseEffect *base_effect; }; @@ -2819,13 +2820,25 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect* iface, UINT pass) +static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = get_technique_struct(This->active_technique); - FIXME("(%p)->(%u): stub\n", This, pass); + TRACE("iface %p, pass %u\n", This, pass); - return E_NOTIMPL; + if (technique && pass < technique->pass_count && !This->active_pass) + { + This->active_pass = technique->pass_handles[pass]; + + FIXME("No states applied, yet!\n"); + + return D3D_OK; + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) @@ -5012,6 +5025,7 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC if (object->technique_handles) { effect->active_technique = object->technique_handles[0]; + effect->active_pass = NULL; } return D3D_OK;

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: GetCurrentTechnique().
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 69c3b4baf6736550a6936cfdc386729eabf16367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c3b4baf6736550a6936cfdc… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:30 2011 +0200 d3dx9: Implement ID3DXEffect::GetCurrentTechnique(). --- dlls/d3dx9_36/effect.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 79b53b1..0f9d413 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2756,13 +2756,13 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect* iface, D3DXHANDL return E_NOTIMPL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect* iface) +static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p\n", This); - return NULL; + return This->active_technique; } static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DXHANDLE technique)

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: SetTechnique().
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: b7919e65fdcf3c266a95898376660fa934635dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7919e65fdcf3c266a9589837… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:35 2011 +0200 d3dx9: Implement ID3DXEffect::SetTechnique(). --- dlls/d3dx9_36/effect.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0f9d413..b11d3d1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2747,13 +2747,36 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPO return S_OK; } -static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect* iface, D3DXHANDLE technique) +static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(This->base_effect); + struct d3dx_technique *tech = is_valid_technique(base, technique); - FIXME("(%p)->(%p): stub\n", This, technique); + TRACE("iface %p, technique %p\n", This, technique); - return E_NOTIMPL; + if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); + + if (tech) + { + UINT i; + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *t = get_technique_struct(base->technique_handles[i]); + + if (tech == t) + { + This->active_technique = get_technique_handle(t); + TRACE("Technique %u (%p)\n", i, tech); + return D3D_OK; + } + } + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; } static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface)

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect::EndPass( ).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: bc59705acac5f67a834c6e4ed4338c1db8b1f532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc59705acac5f67a834c6e4ed… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:38 2011 +0200 d3dx9: Implement ID3DXEffect::EndPass(). --- dlls/d3dx9_36/effect.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b11d3d1..756163a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2873,13 +2873,21 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect* iface) +static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p\n", This); - return E_NOTIMPL; + if (This->active_pass) + { + This->active_pass = NULL; + return D3D_OK; + } + + WARN("Invalid call.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface)

1 0

John Edmonds : ddraw: Warning message about an invalid structure size will now print the structure 's size.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: ed1788bad0eb7bb2a41eb832f1197fadda4d8db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1788bad0eb7bb2a41eb832f… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Sun Jun 26 13:52:27 2011 -0400 ddraw: Warning message about an invalid structure size will now print the structure's size. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1b70d7e..102aa55 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -863,7 +863,7 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, if(DDSD->dwSize != sizeof(DDSURFACEDESC) && DDSD->dwSize != sizeof(DDSURFACEDESC2)) { - WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDERR_INVALIDPARAMS); + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDSD->dwSize); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; }

1 0

Marcus Meissner : dmstyle: Reverse NULL check and deref (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: e4d63f77114466ca808bbec3eba3821dd940b23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d63f77114466ca808bbec3e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:57:51 2011 +0200 dmstyle: Reverse NULL check and deref (Coverity). --- dlls/dmstyle/style.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index eb6e77c..547025e 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -730,11 +730,11 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ pNewMotif = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_MOTIF)); - list_add_tail (&This->Motifs, &pNewMotif->entry); if (NULL == pNewMotif) { ERR(": no more memory\n"); return E_OUTOFMEMORY; } + list_add_tail (&This->Motifs, &pNewMotif->entry); IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL); /** TODO trace pattern */

1 0

Marcus Meissner : ddrawex: Remove superflous NULL checks, add error skips ( Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: a6b714d082cd165f41f6a693a14bd3438bb41d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b714d082cd165f41f6a693a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:08:36 2011 +0200 ddrawex: Remove superflous NULL checks, add error skips (Coverity). --- dlls/ddrawex/tests/surface.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index fb3def9..4dcae02 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -422,8 +422,17 @@ START_TEST(surface) hr = pDllGetClassObject(&CLSID_DirectDrawFactory, &IID_IClassFactory, (void **) &classfactory); ok(hr == S_OK, "Failed to create a IClassFactory\n"); + if (!SUCCEEDED(hr)) { + skip("Failed to get DirectDrawFactory\n"); + return; + } hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IDirectDrawFactory, (void **) &factory); ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n"); + if (!SUCCEEDED(hr)) { + IClassFactory_Release(classfactory); + skip("Failed to get a DirectDrawFactory\n"); + return; + } GetDCTest(); CapsTest(); @@ -431,12 +440,8 @@ START_TEST(surface) test_surface_from_dc3(); test_surface_from_dc4(); - if(factory) { - ref = IDirectDrawFactory_Release(factory); - ok(ref == 0, "IDirectDrawFactory not cleanly released\n"); - } - if(classfactory) { - ref = IClassFactory_Release(classfactory); - todo_wine ok(ref == 1, "IClassFactory refcount wrong, ref = %u\n", ref); - } + ref = IDirectDrawFactory_Release(factory); + ok(ref == 0, "IDirectDrawFactory not cleanly released\n"); + ref = IClassFactory_Release(classfactory); + todo_wine ok(ref == 1, "IClassFactory refcount wrong, ref = %u\n", ref); }

1 0

Marcus Meissner : d3d9: Remove superflous NULL checks (Coverity).
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 8e5c79e439420c09973c923fd93661eb1ec073a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5c79e439420c09973c923fd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:12:42 2011 +0200 d3d9: Remove superflous NULL checks (Coverity). --- dlls/d3d9/tests/visual.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 98a658b..5328447 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11618,11 +11618,8 @@ static void clip_planes_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); IDirect3DSurface9_Release(original_rt); - if (offscreen) - { - IDirect3DSurface9_Release(offscreen_surface); - IDirect3DTexture9_Release(offscreen); - } + IDirect3DSurface9_Release(offscreen_surface); + IDirect3DTexture9_Release(offscreen); } static void fp_special_test(IDirect3DDevice9 *device)

1 0