October 2008 - Wine-Commits

Nicolas Le Cam : shell32/tests: Fix a test on several platforms.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 8619ccf251c30ccd7bae812f97008a9ee3de9ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8619ccf251c30ccd7bae812f9… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Wed Oct 29 23:05:52 2008 +0100 shell32/tests: Fix a test on several platforms. --- dlls/shell32/tests/shellpath.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4d87e8d..e62b695 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -338,7 +338,9 @@ static void testSHGetFolderPathInvalidArgs(void) /* expect 2's a bogus handle, especially since we didn't open it */ hr = pSHGetFolderPathA(NULL, CSIDL_DESKTOP, (HANDLE)2, SHGFP_TYPE_DEFAULT, path); - ok(hr == E_FAIL, + ok(hr == E_FAIL || + hr == E_HANDLE || /* Windows Vista and 2008 */ + broken(hr == S_OK), /* Windows 2000 and Me */ "SHGetFolderPathA(NULL, CSIDL_DESKTOP, 2, SHGFP_TYPE_DEFAULT, path) returned 0x%08x, expected E_FAIL\n", hr); hr = pSHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path); ok(hr == E_INVALIDARG,

1 0

Alistair Leslie-Hughes : mshtml: Supply a default value for get_designMode.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 3a0a3453ffd75d132ea2a2563e70d22321a117c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0a3453ffd75d132ea2a2563… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 30 20:46:39 2008 +1100 mshtml: Supply a default value for get_designMode. --- dlls/mshtml/htmldoc.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 01d52a2..07d2fc6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -440,8 +440,15 @@ static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_designMode(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + static WCHAR szOff[] = {'O','f','f',0}; + FIXME("(%p)->(%p) always returning Off\n", This, p); + + if(!p) + return E_INVALIDARG; + + *p = SysAllocString(szOff); + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_selection(IHTMLDocument2 *iface, IHTMLSelectionObject **p)

1 0

Juan Lang : crypt32: Fix frequency with which chains are checked for cycles .
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 39a7d40413ce5864a27eccaa47c24f31cdabad38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a7d40413ce5864a27eccaa4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 29 12:24:31 2008 -0700 crypt32: Fix frequency with which chains are checked for cycles. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index cd70d49..f52ac0c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -304,7 +304,7 @@ static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, chain->rgpElement[chain->cElement - 2]->TrustStatus.dwInfoStatus = subjectInfoStatus; /* FIXME: initialize the rest of element */ - if (chain->cElement % engine->CycleDetectionModulus) + if (!(chain->cElement % engine->CycleDetectionModulus)) CRYPT_CheckSimpleChainForCycles(chain); CRYPT_CombineTrustStatus(&chain->TrustStatus, &element->TrustStatus);

1 0

James Hawkins : msi: Allow private properties from the AdminProperties property list.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: ca71e5aff06899ffe23fd6f8378216e444a3e4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca71e5aff06899ffe23fd6f83… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 30 04:03:07 2008 -0500 msi: Allow private properties from the AdminProperties property list. --- dlls/msi/action.c | 10 +++++++--- dlls/msi/msipriv.h | 3 ++- dlls/msi/package.c | 2 +- dlls/msi/tests/install.c | 5 +++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 707bc75..09a4915 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -288,7 +288,8 @@ static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, msiobj_release(&row->hdr); } -UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ) +UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, + BOOL preserve_case ) { LPCWSTR ptr,ptr2; BOOL quote; @@ -323,7 +324,10 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ) prop = msi_alloc((len+1)*sizeof(WCHAR)); memcpy(prop,ptr,len*sizeof(WCHAR)); prop[len]=0; - struprW(prop); + + if (!preserve_case) + struprW(prop); + ptr2++; len = 0; @@ -728,7 +732,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_set_sourcedir_props(package, FALSE); } - msi_parse_command_line( package, szCommandLine ); + msi_parse_command_line( package, szCommandLine, FALSE ); msi_apply_transforms( package ); msi_apply_patches( package ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f174c47..a283820 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -683,7 +683,8 @@ extern UINT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR); extern UINT ACTION_ForceReboot(MSIPACKAGE *package); extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMode ); extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ); -extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ); +extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, + BOOL preserve_case ); /* record internals */ extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index cc47236..f6ef199 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -754,7 +754,7 @@ static UINT msi_load_admin_properties(MSIPACKAGE *package) if (r != ERROR_SUCCESS) return r; - r = msi_parse_command_line(package, (WCHAR *)data); + r = msi_parse_command_line(package, (WCHAR *)data, TRUE); msi_free(data); return r; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ee10f36..6ae2a51 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -504,7 +504,7 @@ static const CHAR adm_admin_exec_seq_dat[] = "Action\tCondition\tSequence\n" static const CHAR amp_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\tMYPROP=2718\taugustus\n"; + "augustus\t\tMSITESTDIR\t0\tMYPROP=2718 and MyProp=42\taugustus\n"; static const CHAR rem_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -4240,7 +4240,8 @@ static void set_admin_property_stream(LPCSTR file) /* AdminProperties */ static const WCHAR stmname[] = {0x41ca,0x4330,0x3e71,0x44b5,0x4233,0x45f5,0x422c,0x4836,0}; - static const WCHAR data[] = {'M','Y','P','R','O','P','=','2','7','1','8',0}; + static const WCHAR data[] = {'M','Y','P','R','O','P','=','2','7','1','8',' ', + 'M','y','P','r','o','p','=','4','2',0}; MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, MAX_PATH);

1 0

Juan Lang : crypt32: Fix failing test.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 307d7b965ffd8425d112f74e674d4ca5b6fa2380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307d7b965ffd8425d112f74e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 29 11:32:11 2008 -0700 crypt32: Fix failing test. --- dlls/crypt32/tests/chain.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5bfc58c..7c13878 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1402,8 +1402,10 @@ static CONST_DATA_BLOB chain9[] = { { sizeof(chain7_1), chain7_1 }, }; static const CERT_TRUST_STATUS elementStatus9[] = { - { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_NO_ERROR, + CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_INVALID_BASIC_CONSTRAINTS, + CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, };

1 0

David Adam : d3dx8: Implement ID3DXMatrixStack_GetTop().
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: c5da8d4c3bbd9c078d7b8bcab087c2d1e15fe176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5da8d4c3bbd9c078d7b8bcab… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Oct 29 16:34:21 2008 +0100 d3dx8: Implement ID3DXMatrixStack_GetTop(). --- dlls/d3dx8/math.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 631f0a1..eedc115 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -654,8 +654,10 @@ static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return NULL; + + TRACE("iface %p\n", iface); + + return &This->stack[This->current]; } static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface)

1 0

Henri Verbeet : d3dx8: Implement ID3DXMatrixStack_Push() and ID3DXMatrixStack_Pop().
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 32d7bebf7cb85a61b2915fb7c237503245f50358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d7bebf7cb85a61b2915fb7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 29 16:34:21 2008 +0100 d3dx8: Implement ID3DXMatrixStack_Push() and ID3DXMatrixStack_Pop(). Based on a patchset by David Adam. --- dlls/d3dx8/math.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index eedc115..20d6364 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -691,15 +691,56 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + /* Popping the last element on the stack returns D3D_OK, but does nothing. */ + if (!This->current) return D3D_OK; + + if (This->current <= This->stack_size / 4 && This->stack_size >= INITIAL_STACK_SIZE * 2) + { + unsigned int new_size; + D3DXMATRIX *new_stack; + + new_size = This->stack_size / 2; + new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(D3DXMATRIX)); + if (new_stack) + { + This->stack_size = new_size; + This->stack = new_stack; + } + } + + --This->current; + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + if (This->current == This->stack_size - 1) + { + unsigned int new_size; + D3DXMATRIX *new_stack; + + if (This->stack_size > UINT_MAX / 2) return E_OUTOFMEMORY; + + new_size = This->stack_size * 2; + new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(D3DXMATRIX)); + if (!new_stack) return E_OUTOFMEMORY; + + This->stack_size = new_size; + This->stack = new_stack; + } + + ++This->current; + This->stack[This->current] = This->stack[This->current - 1]; + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle)

1 0

Henri Verbeet : d3dx8: Initialize the matrix stack in D3DXCreateMatrixStack ().
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: bd6a8870e2528244c3cfd5f1d22b411d56dc9bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6a8870e2528244c3cfd5f1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 29 16:34:21 2008 +0100 d3dx8: Initialize the matrix stack in D3DXCreateMatrixStack(). Based on a patchset by David Adam. --- dlls/d3dx8/d3dx8_private.h | 3 ++- dlls/d3dx8/math.c | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8_private.h b/dlls/d3dx8/d3dx8_private.h index 923f285..01174dc 100644 --- a/dlls/d3dx8/d3dx8_private.h +++ b/dlls/d3dx8/d3dx8_private.h @@ -86,7 +86,8 @@ struct ID3DXMatrixStackImpl LONG ref; /* ID3DXMatrixStack fields */ - int current; + unsigned int current; + unsigned int stack_size; D3DXMATRIX *stack; }; diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 54a17c2..631f0a1 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -581,10 +581,14 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) /*_________________D3DXMatrixStack____________________*/ +static const unsigned int INITIAL_STACK_SIZE = 32; + HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) { ID3DXMatrixStackImpl* object; + TRACE("flags %#x, ppstack %p\n", flags, ppstack); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMatrixStackImpl)); if ( object == NULL ) { @@ -593,7 +597,21 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) } object->lpVtbl = &ID3DXMatrixStack_Vtbl; object->ref = 1; + + object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(D3DXMATRIX)); + if (!object->stack) + { + HeapFree(GetProcessHeap(), 0, object); + *ppstack = NULL; + return E_OUTOFMEMORY; + } + object->current = 0; + object->stack_size = INITIAL_STACK_SIZE; + D3DXMatrixIdentity(&object->stack[0]); + + TRACE("Created matrix stack %p\n", object); + *ppstack = (LPD3DXMATRIXSTACK)object; return D3D_OK; } @@ -624,7 +642,11 @@ static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - if ( !ref ) HeapFree(GetProcessHeap(), 0, This); + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->stack); + HeapFree(GetProcessHeap(), 0, This); + } TRACE("(%p) : ReleaseRef to %d\n", This, ref); return ref; }

1 0

Henri Verbeet : d3dx8: Correct some ID3DXMatrixStack prototypes.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 3eac8afba505b3e1f98f1a62606b54e532ab5a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eac8afba505b3e1f98f1a626… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 29 16:34:21 2008 +0100 d3dx8: Correct some ID3DXMatrixStack prototypes. --- dlls/d3dx8/math.c | 10 +++++----- include/d3dx8math.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 58f8166..54a17c2 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -643,21 +643,21 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) +static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); return E_NOTIMPL; } -static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) +static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); return E_NOTIMPL; } -static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) +static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); @@ -678,14 +678,14 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle) +static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); return E_NOTIMPL; } -static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle) +static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 2ee783f..88da2b0 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -359,11 +359,11 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) STDMETHOD(Pop)(THIS) PURE; STDMETHOD(Push)(THIS) PURE; STDMETHOD(LoadIdentity)(THIS) PURE; - STDMETHOD(LoadMatrix)(THIS_ CONST LPD3DXMATRIX) PURE; - STDMETHOD(MultMatrix)(THIS_ CONST LPD3DXMATRIX) PURE; - STDMETHOD(MultMatrixLocal)(THIS_ CONST LPD3DXMATRIX) PURE; - STDMETHOD(RotateAxis)(THIS_ CONST LPD3DXVECTOR3, FLOAT) PURE; - STDMETHOD(RotateAxisLocal)(THIS_ CONST LPD3DXVECTOR3, FLOAT) PURE; + STDMETHOD(LoadMatrix)(THIS_ CONST D3DXMATRIX *) PURE; + STDMETHOD(MultMatrix)(THIS_ CONST D3DXMATRIX *) PURE; + STDMETHOD(MultMatrixLocal)(THIS_ CONST D3DXMATRIX *) PURE; + STDMETHOD(RotateAxis)(THIS_ CONST D3DXVECTOR3 *, FLOAT) PURE; + STDMETHOD(RotateAxisLocal)(THIS_ CONST D3DXVECTOR3 *, FLOAT) PURE; STDMETHOD(RotateYawPitchRoll)(THIS_ FLOAT, FLOAT, FLOAT) PURE; STDMETHOD(RotateYawPitchRollLocal)(THIS_ FLOAT, FLOAT, FLOAT) PURE; STDMETHOD(Scale)(THIS_ FLOAT, FLOAT, FLOAT) PURE;

1 0

Henri Verbeet : d3dx8: Return E_NOTIMPL from ID3DXMatrixStack stubs.
by Alexandre Julliard Oct. 30, 2008

Oct. 30, 2008

Module: wine Branch: master Commit: 4df40efe7c03d47a8d742e8766a2cfd20e83d736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df40efe7c03d47a8d742e876… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 29 16:34:21 2008 +0100 d3dx8: Return E_NOTIMPL from ID3DXMatrixStack stubs. --- dlls/d3dx8/math.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 3bc171f..58f8166 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -640,98 +640,98 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, LPD3DXMATRIX pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXMatrixStackImpl_TranslateLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; FIXME("(%p) : stub\n",This); - return D3D_OK; + return E_NOTIMPL; } static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl =

1 0