November 2008 - Wine-commits

David Adam : d3dx8: Add a few tests for MatrixStack.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 42dc7fb1c41e2d3acf7a15cde5e6c56fecb96fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42dc7fb1c41e2d3acf7a15cde… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Nov 16 09:02:27 2008 +0100 d3dx8: Add a few tests for MatrixStack. --- dlls/d3dx8/tests/math.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 3dc0899..b1bfd74 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -1479,6 +1479,18 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); + hr = ID3DXMatrixStack_MultMatrix(stack, NULL); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = ID3DXMatrixStack_RotateAxis(stack, NULL, 2.0f); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = ID3DXMatrixStack_RotateAxisLocal(stack, NULL, 2.0f); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + refcount = ID3DXMatrixStack_Release(stack); ok(!refcount, "Matrix stack has %u references left.\n", refcount); }

1 0

Vladimir Pankratov : shdocvw: Implement go_home function.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: bbaa72de5f6baf007106775ed23c390adda0dfd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbaa72de5f6baf007106775ed… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Nov 28 14:44:42 2008 +0500 shdocvw: Implement go_home function. --- dlls/shdocvw/navigate.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index b5299d5..27276b6 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -776,11 +776,27 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, HRESULT go_home(DocHost *This) { + HKEY hkey; + DWORD res, type, size; + WCHAR wszPageName[MAX_PATH]; static const WCHAR wszAboutBlank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + static const WCHAR wszStartPage[] = {'S','t','a','r','t',' ','P','a','g','e',0}; + static const WCHAR wszSubKey[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', + 'M','a','i','n',0}; + + res = RegOpenKeyW(HKEY_CURRENT_USER, wszSubKey, &hkey); + if (res != ERROR_SUCCESS) + return navigate_url(This, wszAboutBlank, NULL, NULL, NULL, NULL); + + size = sizeof(wszPageName); + res = RegQueryValueExW(hkey, wszStartPage, NULL, &type, (LPBYTE)&wszPageName, &size); + RegCloseKey(hkey); + if (res != ERROR_SUCCESS || type != REG_SZ) + return navigate_url(This, wszAboutBlank, NULL, NULL, NULL, NULL); - FIXME("stub\n"); - - return navigate_url(This, wszAboutBlank, NULL, NULL, NULL, NULL); + return navigate_url(This, wszPageName, NULL, NULL, NULL, NULL); } #define HLINKFRAME_THIS(iface) DEFINE_THIS(WebBrowser, HlinkFrame, iface)

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_Translate.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 809147f825c338019fe3974b3ca6a4e096d7b583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809147f825c338019fe3974b3… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Thu Nov 27 07:42:16 2008 +0100 d3dx8: Implement D3DXMatrixStack_Translate. --- dlls/d3dx8/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 687927f..a989b57 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -845,9 +845,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, F static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + D3DXMatrixTranslation(&temp, x, y, z); + D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], &temp); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_TranslateLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z)

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_TranslateLocal.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: f90881cd36076b57c4e680537627122c8e5353ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90881cd36076b57c4e680537… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Thu Nov 27 07:43:00 2008 +0100 d3dx8: Implement D3DXMatrixStack_TranslateLocal. --- dlls/d3dx8/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index a989b57..bcab3b4 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -858,9 +858,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FL static HRESULT WINAPI ID3DXMatrixStackImpl_TranslateLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + D3DXMatrixTranslation(&temp, x, y, z); + D3DXMatrixMultiply(&This->stack[This->current], &temp,&This->stack[This->current]); + + return D3D_OK; } static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl =

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_Scale.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 75cb8a7ad38844eb58a365f3f249b7efbe9a5c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cb8a7ad38844eb58a365f3f… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Wed Nov 12 09:03:32 2008 +0100 d3dx8: Implement D3DXMatrixStack_Scale. --- dlls/d3dx8/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index c56c1c0..0fc178e 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -818,9 +818,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixSt static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + D3DXMatrixScaling(&temp, x, y, z); + D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], &temp); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z)

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_ScaleLocal.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 230f3e636698ecf69291e6e4df14d4be84d929e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230f3e636698ecf69291e6e4d… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Thu Nov 27 07:40:42 2008 +0100 d3dx8: Implement D3DXMatrixStack_ScaleLocal. --- dlls/d3dx8/math.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 0fc178e..687927f 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -1,5 +1,6 @@ /* * Copyright 2007 David Adam + * Copyright 2008 Jérôme Gardou * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -831,9 +832,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + D3DXMatrixScaling(&temp, x, y, z); + D3DXMatrixMultiply(&This->stack[This->current], &temp, &This->stack[This->current]); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z)

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_RotateYawPitchRollLocal.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 6d27cdc17a3a04bb95e59eb71882a8b56117790a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d27cdc17a3a04bb95e59eb71… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Wed Nov 12 08:59:39 2008 +0100 d3dx8: Implement D3DXMatrixStack_RotateYawPitchRollLocal. --- dlls/d3dx8/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index ccd9009..c56c1c0 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -805,9 +805,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack * static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + D3DXMatrixRotationYawPitchRoll(&temp, x, y, z); + D3DXMatrixMultiply(&This->stack[This->current], &temp, &This->stack[This->current]); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z)

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_RotateYawPitchRoll.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 39e0dc79ef47e8cc32dac3886607e5f1bf32fd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e0dc79ef47e8cc32dac3886… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Wed Nov 12 08:57:18 2008 +0100 d3dx8: Implement D3DXMatrixStack_RotateYawPitchRoll. --- dlls/d3dx8/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 919cfac..ccd9009 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -792,9 +792,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + D3DXMatrixRotationYawPitchRoll(&temp, x, y, z); + D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], &temp); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z)

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_RotateAxisLocal.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: c2f00b3170abefc240df966792824f635128d1c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f00b3170abefc240df96679… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Wed Nov 12 08:54:20 2008 +0100 d3dx8: Implement D3DXMatrixStack_RotateAxisLocal. --- dlls/d3dx8/math.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index e264fff..919cfac 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -778,9 +778,16 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { + D3DXMATRIX temp; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + if (!pv) return D3DERR_INVALIDCALL; + D3DXMatrixRotationAxis(&temp, pv, angle); + D3DXMatrixMultiply(&This->stack[This->current], &temp, &This->stack[This->current]); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z)

1 0

Jérôme Gardou : d3dx8: Implement D3DXMatrixStack_MultMatrixLocal.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: d25fd01bfdae07d91c7e214301ddaad253f36085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25fd01bfdae07d91c7e21430… Author: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: Wed Nov 12 08:47:25 2008 +0100 d3dx8: Implement D3DXMatrixStack_MultMatrixLocal. --- dlls/d3dx8/math.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 34c177a..87c0f7a 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -698,8 +698,13 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + if (!pm) return D3DERR_INVALIDCALL; + D3DXMatrixMultiply(&This->stack[This->current], pm, &This->stack[This->current]); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface)

1 0