wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Huw Davies : msdaps: Implement IDBAsynchNotify_OnProgress and OnStop proxies and stubs.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 1e9e76e05699c8da519c9e8baf16219ee32ea7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9e76e05699c8da519c9e8ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 5 14:44:07 2010 +0000 msdaps: Implement IDBAsynchNotify_OnProgress and OnStop proxies and stubs. --- dlls/msdaps/usrmarshal.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index f08f9fc..b2517d1 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -906,32 +906,35 @@ HRESULT CALLBACK IDBAsynchNotify_OnProgress_Proxy(IDBAsynchNotify* This, HCHAPTE DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, LPOLESTR pwszStatusText) { - FIXME("(%p)->(%lx, %d, %d, %d, %d, %s): stub\n", This, hChapter, eOperation, ulProgress, ulProgressMax, + TRACE("(%p)->(%lx, %d, %d, %d, %d, %s)\n", This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase, debugstr_w(pwszStatusText)); - return E_NOTIMPL; + + return IDBAsynchNotify_RemoteOnProgress_Proxy(This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase, + pwszStatusText); } HRESULT __RPC_STUB IDBAsynchNotify_OnProgress_Stub(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, LPOLESTR pwszStatusText) { - FIXME("(%p)->(%lx, %d, %d, %d, %d, %s): stub\n", This, hChapter, eOperation, ulProgress, ulProgressMax, + TRACE("(%p)->(%lx, %d, %d, %d, %d, %s)\n", This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase, debugstr_w(pwszStatusText)); - return E_NOTIMPL; + return IDBAsynchNotify_OnProgress(This, hChapter, eOperation, ulProgress, ulProgressMax, eAsynchPhase, + pwszStatusText); } HRESULT CALLBACK IDBAsynchNotify_OnStop_Proxy(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, HRESULT hrStatus, LPOLESTR pwszStatusText) { - FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); - return E_NOTIMPL; + TRACE("(%p)->(%lx, %d, %08x, %s)\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); + return IDBAsynchNotify_RemoteOnStop_Proxy(This, hChapter, eOperation, hrStatus, pwszStatusText); } HRESULT __RPC_STUB IDBAsynchNotify_OnStop_Stub(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, HRESULT hrStatus, LPOLESTR pwszStatusText) { - FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); - return E_NOTIMPL; + TRACE("(%p)->(%lx, %d, %08x, %s)\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); + return IDBAsynchNotify_OnStop(This, hChapter, eOperation, hrStatus, pwszStatusText); } HRESULT CALLBACK IDBAsynchStatus_Abort_Proxy(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation)

1 0

Huw Davies : msdaps: Add support for remoting IRowChange_SetColumns.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 559a7c8fc06e0e65a387aaa89bec362a1147192c URL: http://source.winehq.org/git/wine.git/?a=commit;h=559a7c8fc06e0e65a387aaa89… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 5 13:29:32 2010 +0000 msdaps: Add support for remoting IRowChange_SetColumns. --- dlls/msdaps/row_server.c | 74 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index a9f7a45..f443155 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -270,8 +270,43 @@ static HRESULT WINAPI server_SetColumns(IWineRowServer* iface, DBORDINAL num_col wine_setcolumns_in *in_data, DBSTATUS *status) { server *This = impl_from_IWineRowServer(iface); - FIXME("(%p)->(%d, %p, %p): stub\n", This, num_cols, in_data, status); - return E_NOTIMPL; + HRESULT hr; + DBORDINAL i; + DBCOLUMNACCESS *cols; + IRowChange *row_change; + + TRACE("(%p)->(%d, %p, %p)\n", This, num_cols, in_data, status); + hr = IUnknown_QueryInterface(This->inner_unk, &IID_IRowChange, (void**)&row_change); + if(FAILED(hr)) return hr; + + cols = CoTaskMemAlloc(num_cols * sizeof(cols[0])); + + for(i = 0; i < num_cols; i++) + { + TRACE("%d:\ttype %04x\n", i, in_data[i].type); + cols[i].pData = CoTaskMemAlloc(db_type_size(in_data[i].type, in_data[i].max_len)); + memcpy(cols[i].pData, &V_I1(&in_data[i].v), db_type_size(in_data[i].type, in_data[i].max_len)); + cols[i].columnid = in_data[i].columnid; + cols[i].cbDataLen = in_data[i].data_len; + cols[i].dwStatus = in_data[i].status; + cols[i].cbMaxLen = in_data[i].max_len; + cols[i].wType = in_data[i].type; + cols[i].bPrecision = in_data[i].precision; + cols[i].bScale = in_data[i].scale; + } + + hr = IRowChange_SetColumns(row_change, num_cols, cols); + IRowChange_Release(row_change); + + for(i = 0; i < num_cols; i++) + { + CoTaskMemFree(cols[i].pData); + status[i] = cols[i].dwStatus; + } + + CoTaskMemFree(cols); + + return hr; } static HRESULT WINAPI server_AddRefRows(IWineRowServer* iface, DBCOUNTITEM cRows, @@ -743,8 +778,39 @@ static HRESULT WINAPI row_change_SetColumns(IRowChange *iface, DBORDINAL cColumn DBCOLUMNACCESS rgColumns[]) { row_proxy *This = impl_from_IRowChange(iface); - FIXME("(%p)->(%d, %p)\n", This, cColumns, rgColumns); - return E_NOTIMPL; + HRESULT hr; + wine_setcolumns_in *in_data; + DBSTATUS *status; + DBORDINAL i; + + TRACE("(%p)->(%d, %p)\n", This, cColumns, rgColumns); + + in_data = CoTaskMemAlloc(cColumns * sizeof(in_data[0])); + status = CoTaskMemAlloc(cColumns * sizeof(status[0])); + + for(i = 0; i < cColumns; i++) + { + TRACE("%d: wtype %04x max %08x len %08x\n", i, rgColumns[i].wType, rgColumns[i].cbMaxLen, rgColumns[i].cbDataLen); + V_VT(&in_data[i].v) = rgColumns[i].wType; + memcpy(&V_I1(&in_data[i].v), rgColumns[i].pData, db_type_size(rgColumns[i].wType, rgColumns[i].cbDataLen)); + in_data[i].columnid = rgColumns[i].columnid; + in_data[i].data_len = rgColumns[i].cbDataLen; + in_data[i].status = rgColumns[i].dwStatus; + in_data[i].max_len = rgColumns[i].cbMaxLen; + in_data[i].type = rgColumns[i].wType; + in_data[i].precision = rgColumns[i].bPrecision; + in_data[i].scale = rgColumns[i].bScale; + } + + hr = IWineRowServer_SetColumns(This->server, cColumns, in_data, status); + + for(i = 0; i < cColumns; i++) + rgColumns[i].dwStatus = status[i]; + + CoTaskMemFree(status); + CoTaskMemFree(in_data); + + return hr; } static const IRowChangeVtbl row_change_vtbl =

1 0

Vladimir Pankratov : wordpad: Update Russian translation.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 5af24c31ecf3e69ad34357bd4ce913072c778253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af24c31ecf3e69ad34357bd4… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sun Feb 7 21:42:50 2010 +0500 wordpad: Update Russian translation. --- programs/wordpad/Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 6abd976..61bf555 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -221,8 +221,8 @@ BEGIN STRING_PREVIEW_PREVPAGE, "Предыдущая страница" STRING_PREVIEW_TWOPAGES, "Две страницы" STRING_PREVIEW_ONEPAGE, "Одна страница" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" + STRING_PREVIEW_ZOOMIN, "Приблизить" + STRING_PREVIEW_ZOOMOUT, "Отдалить" STRING_PREVIEW_CLOSE, "Закрыть" END

1 0

Christian Costa : quartz: Add stubbed IAMDirectSound interface to DSoundRenderer.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: b47091a4885974b5fc00d6d97cc98885543b47fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47091a4885974b5fc00d6d97… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 7 21:17:59 2010 +0100 quartz: Add stubbed IAMDirectSound interface to DSoundRenderer. --- dlls/quartz/dsoundrender.c | 124 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/dsoundrender.c | 4 +- 2 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index edb170d..1d87a7f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -32,6 +32,7 @@ #include "evcode.h" #include "strmif.h" #include "dsound.h" +#include "amaudio.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -45,12 +46,14 @@ static const IPinVtbl DSoundRender_InputPin_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; static const IMediaSeekingVtbl IMediaSeeking_Vtbl; +static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; typedef struct DSoundRenderImpl { const IBaseFilterVtbl * lpVtbl; const IBasicAudioVtbl *IBasicAudio_vtbl; const IReferenceClockVtbl *IReferenceClock_vtbl; + const IAMDirectSoundVtbl *IAMDirectSound_vtbl; LONG refCount; CRITICAL_SECTION csFilter; @@ -404,6 +407,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) pDSoundRender->lpVtbl = &DSoundRender_Vtbl; pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl; pDSoundRender->IReferenceClock_vtbl = &IReferenceClock_Vtbl; + pDSoundRender->IAMDirectSound_vtbl = &IAMDirectSound_Vtbl; pDSoundRender->refCount = 1; InitializeCriticalSection(&pDSoundRender->csFilter); pDSoundRender->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"); @@ -473,6 +477,8 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = &This->IReferenceClock_vtbl; else if (IsEqualIID(riid, &IID_IMediaSeeking)) *ppv = &This->mediaSeeking.lpVtbl; + else if (IsEqualIID(riid, &IID_IAMDirectSound)) + *ppv = &This->IAMDirectSound_vtbl; if (*ppv) { @@ -1328,3 +1334,121 @@ static const IMediaSeekingVtbl IMediaSeeking_Vtbl = MediaSeekingImpl_GetRate, MediaSeekingImpl_GetPreroll }; + +/*** IUnknown methods ***/ +static HRESULT WINAPI AMDirectSound_QueryInterface(IAMDirectSound *iface, + REFIID riid, + LPVOID*ppvObj) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + + return DSoundRender_QueryInterface((IBaseFilter*)This, riid, ppvObj); +} + +static ULONG WINAPI AMDirectSound_AddRef(IAMDirectSound *iface) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return DSoundRender_AddRef((IBaseFilter*)This); +} + +static ULONG WINAPI AMDirectSound_Release(IAMDirectSound *iface) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return DSoundRender_Release((IBaseFilter*)This); +} + +/*** IAMDirectSound methods ***/ +static HRESULT WINAPI AMDirectSound_GetDirectSoundInterface(IAMDirectSound *iface, IDirectSound **ds) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub\n", This, iface, ds); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMDirectSound_GetPrimaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer **buf) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub\n", This, iface, buf); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMDirectSound_GetSecondaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer **buf) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub\n", This, iface, buf); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMDirectSound_ReleaseDirectSoundInterface(IAMDirectSound *iface, IDirectSound *ds) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub\n", This, iface, ds); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMDirectSound_ReleasePrimaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer *buf) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub\n", This, iface, buf); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMDirectSound_ReleaseSecondaryBufferInterface(IAMDirectSound *iface, IDirectSoundBuffer *buf) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub\n", This, iface, buf); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMDirectSound_SetFocusWindow(IAMDirectSound *iface, HWND hwnd, BOOL bgsilent) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p,%d): stub\n", This, iface, hwnd, bgsilent); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMDirectSound_GetFocusWindow(IAMDirectSound *iface, HWND hwnd) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IAMDirectSound_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub\n", This, iface, hwnd); + + return E_NOTIMPL; +} + +static const IAMDirectSoundVtbl IAMDirectSound_Vtbl = +{ + AMDirectSound_QueryInterface, + AMDirectSound_AddRef, + AMDirectSound_Release, + AMDirectSound_GetDirectSoundInterface, + AMDirectSound_GetPrimaryBufferInterface, + AMDirectSound_GetSecondaryBufferInterface, + AMDirectSound_ReleaseDirectSoundInterface, + AMDirectSound_ReleasePrimaryBufferInterface, + AMDirectSound_ReleaseSecondaryBufferInterface, + AMDirectSound_SetFocusWindow, + AMDirectSound_GetFocusWindow +}; diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 4490984..e5dcac7 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -135,6 +135,8 @@ static void test_query_interface(void) RELEASE_EXPECT(pMediaSeeking, 1); QI_SUCCEED(pDSRender, IID_IReferenceClock, clock); RELEASE_EXPECT(clock, 1); + QI_SUCCEED(pDSRender, IID_IAMDirectSound, pAMDirectSound); + RELEASE_EXPECT( pAMDirectSound, 1); todo_wine { QI_SUCCEED(pDSRender, IID_IDirectSound3DBuffer, ds3dbuf); RELEASE_EXPECT(ds3dbuf, 1); @@ -150,8 +152,6 @@ static void test_query_interface(void) RELEASE_EXPECT(pMediaPosition, 1); QI_SUCCEED(pDSRender, IID_IQualityControl, pQualityControl); RELEASE_EXPECT(pQualityControl, 1); - QI_SUCCEED(pDSRender, IID_IAMDirectSound, pAMDirectSound); - RELEASE_EXPECT( pAMDirectSound, 1); } }

1 0

Christian Costa : quartz/tests: Add test for querying IAMDirectSound from DSoundRenderer.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: f48d3c8eab849e8d51002fcbce99a44d636eb8b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48d3c8eab849e8d51002fcbc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 7 21:17:53 2010 +0100 quartz/tests: Add test for querying IAMDirectSound from DSoundRenderer. --- dlls/quartz/tests/dsoundrender.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 2d33dc2..4490984 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -26,6 +26,7 @@ #include "dshow.h" #include "initguid.h" #include "dsound.h" +#include "amaudio.h" #define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ @@ -124,6 +125,7 @@ static void test_query_interface(void) IPersistPropertyBag *ppb = NULL; IDirectSound3DBuffer *ds3dbuf = NULL; IReferenceClock *clock = NULL; + IAMDirectSound *pAMDirectSound = NULL; QI_SUCCEED(pDSRender, IID_IBaseFilter, pBaseFilter); RELEASE_EXPECT(pBaseFilter, 1); @@ -148,6 +150,8 @@ static void test_query_interface(void) RELEASE_EXPECT(pMediaPosition, 1); QI_SUCCEED(pDSRender, IID_IQualityControl, pQualityControl); RELEASE_EXPECT(pQualityControl, 1); + QI_SUCCEED(pDSRender, IID_IAMDirectSound, pAMDirectSound); + RELEASE_EXPECT( pAMDirectSound, 1); } }

1 0

Christian Costa : quartz: Fix IAMDirectSound interface definition.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 28acc8398c58f0326d2e3bb21dd9406b9f480529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28acc8398c58f0326d2e3bb21… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 7 21:17:47 2010 +0100 quartz: Fix IAMDirectSound interface definition. --- include/amaudio.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/amaudio.h b/include/amaudio.h index 21892c6..ed3a832 100644 --- a/include/amaudio.h +++ b/include/amaudio.h @@ -34,11 +34,11 @@ DECLARE_INTERFACE_(IAMDirectSound,IUnknown) /*** IAMDirectSound methods ***/ STDMETHOD(GetDirectSoundInterface)(THIS_ IDirectSound **ds) PURE; - STDMETHOD(GetPrimaryBufferInterface(THIS_ IDirectSoundBuffer **buf) PURE; + STDMETHOD(GetPrimaryBufferInterface)(THIS_ IDirectSoundBuffer **buf) PURE; STDMETHOD(GetSecondaryBufferInterface)(THIS_ IDirectSoundBuffer **buf) PURE; - STDMETHOD(ReleaseDirectSoundInterface(THIS_ IDirectSound *ds) PURE; - STDMETHOD(ReleasePrimaryBufferInterface(THIS_ IDirectSoundBuffer *buf) PURE; - STDMETHOD(ReleaseSecondaryBufferInterface(THIS_ IDirectSoundBuffer *buf) PURE; + STDMETHOD(ReleaseDirectSoundInterface)(THIS_ IDirectSound *ds) PURE; + STDMETHOD(ReleasePrimaryBufferInterface)(THIS_ IDirectSoundBuffer *buf) PURE; + STDMETHOD(ReleaseSecondaryBufferInterface)(THIS_ IDirectSoundBuffer *buf) PURE; STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgsilent) PURE; STDMETHOD(GetFocusWindow)(THIS_ HWND hwnd) PURE; };

1 0

Christian Costa : d3drm: Beginning of Mesh info retrieval.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: a4b622d81afc53682b44085735ffad6686376771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b622d81afc53682b4408573… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 7 21:17:24 2010 +0100 d3drm: Beginning of Mesh info retrieval. --- dlls/d3drm/meshbuilder.c | 77 ++++++++++++++++++++++++++++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 25 ++++++++++++++- 2 files changed, 94 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 0848920..e5d1307 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -37,6 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { const IDirect3DRMMeshBuilderVtbl *lpVtbl; LONG ref; + DWORD nb_vertices; + D3DVECTOR* pVertices; + DWORD nb_normals; + D3DVECTOR* pNormals; + DWORD nb_faces; + DWORD face_data_size; + LPVOID pFaceData; } IDirect3DRMMeshBuilderImpl; typedef struct { @@ -328,7 +335,12 @@ static ULONG WINAPI IDirect3DRMMeshBuilderImpl_Release(IDirect3DRMMeshBuilder* i TRACE("(%p)\n", This); if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->pVertices); + HeapFree(GetProcessHeap(), 0, This->pNormals); + HeapFree(GetProcessHeap(), 0, This->pFaceData); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -417,11 +429,20 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if const GUID* pGuid; DWORD size; Header* pHeader; + LPBYTE ptr; HRESULT hr; HRESULT ret = D3DRMERR_BADOBJECT; FIXME("(%p)->(%p,%p,%x,%p,%p): partial stub\n", This, filename, name, loadflags, cb, pArg); + /* First free allocated buffers of previous mesh data */ + HeapFree(GetProcessHeap(), 0, This->pVertices); + This->pVertices = NULL; + HeapFree(GetProcessHeap(), 0, This->pNormals); + This->pNormals = NULL; + HeapFree(GetProcessHeap(), 0, This->pFaceData); + This->pFaceData = NULL; + if (loadflags == D3DRMLOAD_FROMMEMORY) { DXFILELOADMEMORY info; @@ -499,6 +520,22 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if goto end; } + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + This->nb_vertices = *(DWORD*)ptr; + This->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR)); + This->face_data_size = size - sizeof(DWORD) - This->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD); + + TRACE("Mesh: nb_vertices = %d, nb_faces = %d, face_data_size = %d\n", This->nb_vertices, This->nb_faces, This->face_data_size); + + This->pVertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DVECTOR)); + memcpy(This->pVertices, ptr + sizeof(DWORD), This->nb_vertices * sizeof(D3DVECTOR)); + + This->pFaceData = HeapAlloc(GetProcessHeap(), 0, This->face_data_size); + memcpy(This->pFaceData, ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD), This->face_data_size); + ret = D3DRM_OK; end: @@ -509,6 +546,21 @@ end: if (pDXFile) IDirectXFile_Release(pDXFile); + if (hr != D3DRM_OK) + { + /* Clean mesh data */ + This->nb_vertices = 0; + This->nb_normals = 0; + This->nb_faces = 0; + This->face_data_size = 0; + HeapFree(GetProcessHeap(), 0, This->pVertices); + This->pVertices = NULL; + HeapFree(GetProcessHeap(), 0, This->pNormals); + This->pNormals = NULL; + HeapFree(GetProcessHeap(), 0, This->pFaceData); + This->pFaceData = NULL; + } + return ret; } @@ -750,9 +802,22 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_GetVertices(IDirect3DRMMeshBuil { IDirect3DRMMeshBuilderImpl *This = (IDirect3DRMMeshBuilderImpl *)iface; - FIXME("(%p)->(%p,%p,%p,%p,%p,%p): stub\n", This, vcount, vertices, ncount, normals, face_data_size, face_data); + TRACE("(%p)->(%p,%p,%p,%p,%p,%p)\n", This, vcount, vertices, ncount, normals, face_data_size, face_data); - return E_NOTIMPL; + if (vcount) + *vcount = This->nb_vertices; + if (vertices && This->nb_vertices) + memcpy(vertices, This->pVertices, This->nb_vertices * sizeof(D3DVECTOR)); + if (ncount) + *ncount = This->nb_normals; + if (normals && This->nb_normals) + memcpy(normals, This->pNormals, This->nb_normals * sizeof(D3DVECTOR)); + if (face_data_size) + *face_data_size = This->face_data_size; + if (face_data && This->face_data_size) + memcpy(face_data, This->pFaceData, This->face_data_size); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_GetTextureCoordinates(IDirect3DRMMeshBuilder* iface, DWORD index, D3DVALUE *u, D3DVALUE *v) @@ -813,18 +878,18 @@ static int WINAPI IDirect3DRMMeshBuilderImpl_GetFaceCount(IDirect3DRMMeshBuilder { IDirect3DRMMeshBuilderImpl *This = (IDirect3DRMMeshBuilderImpl *)iface; - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return 0; + return This->nb_faces; } static int WINAPI IDirect3DRMMeshBuilderImpl_GetVertexCount(IDirect3DRMMeshBuilder* iface) { IDirect3DRMMeshBuilderImpl *This = (IDirect3DRMMeshBuilderImpl *)iface; - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return 0; + return This->nb_vertices; } static D3DCOLOR WINAPI IDirect3DRMMeshBuilderImpl_GetVertexColor(IDirect3DRMMeshBuilder* iface, DWORD index) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d5fb645..aa1193b 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -69,8 +69,15 @@ char data_ok[] = "}\n" "Mesh Object\n" "{\n" -"0;\n" -"0;\n" +"4;\n" +"1.0; 0.0; 0.0;,\n" +"0.0; 1.0; 0.0;,\n" +"0.0; 0.0; 1.0;,\n" +"1.0; 1.0; 1.0;;\n" +"3;\n" +"3; 0, 1, 2;,\n" +"3; 1, 2, 3;,\n" +"3; 3, 1, 2;;\n" "}\n"; static void MeshBuilderTest(void) @@ -79,6 +86,8 @@ static void MeshBuilderTest(void) LPDIRECT3DRM pD3DRM; LPDIRECT3DRMMESHBUILDER pMeshBuilder; D3DRMLOADMEMORY info; + int val; + DWORD val1, val2, val3; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -101,6 +110,18 @@ static void MeshBuilderTest(void) hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); + ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); + + val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder); + ok(val == 3, "Wrong number of faces %d (must be 3)\n", val); + + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); + todo_wine ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + IDirect3DRMMeshBuilder_Release(pMeshBuilder); IDirect3DRM_Release(pD3DRM);

1 0

Christian Costa : d3dxof: Fix data buffer deallocation on error.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 497be4f83c438f95bb1bdd65d707ed234315438c URL: http://source.winehq.org/git/wine.git/?a=commit;h=497be4f83c438f95bb1bdd65d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 7 21:16:33 2010 +0100 d3dxof: Fix data buffer deallocation on error. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index aac10c4..0f800bf 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1101,7 +1101,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: HeapFree(GetProcessHeap(), 0, This->buf.pxo_tab); - HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); + HeapFree(GetProcessHeap(), 0, This->buf.pdata); HeapFree(GetProcessHeap(), 0, pstrings); return hr;

1 0

Christian Costa : d3dxof: Fix typo in comment.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: ff6eccdabfbd752bbb065402fefffcff43ae869a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6eccdabfbd752bbb065402f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Feb 7 21:15:43 2010 +0100 d3dxof: Fix typo in comment. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b1df558..aac10c4 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -722,7 +722,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface if (This->from_ref && (This->level >= 1)) { - /* Only 2 levels can enumerated if the object is obtained from a reference */ + /* Only 2 levels can be enumerated if the object is obtained from a reference */ return DXFILEERR_NOMOREOBJECTS; }

1 0

André Hentschel : oleaut32: Fix formula.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 1dc896eb52e17130673262524f00ef8e79b2fee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc896eb52e17130673262524… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 7 18:59:15 2010 +0100 oleaut32: Fix formula. --- dlls/oleaut32/variant.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 55d0935..450856f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1148,13 +1148,13 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) if (iYear > 0 && iYear < 100) iYear += 1900; - iMinute += (iSecond - (iSecond % 60)) / 60; - iSecond = iSecond % 60; - iHour += (iMinute - (iMinute % 60)) / 60; - iMinute = iMinute % 60; - iDay += (iHour - (iHour % 24)) / 24; - iHour = iHour % 24; - iYear += (iMonth - (iMonth % 12)) / 12; + iMinute += iSecond / 60; + iSecond = iSecond % 60; + iHour += iMinute / 60; + iMinute = iMinute % 60; + iDay += iHour / 24; + iHour = iHour % 24; + iYear += iMonth / 12; iMonth = iMonth % 12; if (iMonth<=0) {iMonth+=12; iYear--;} while (iDay > days[iMonth]) @@ -1164,7 +1164,7 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) else iDay -= days[iMonth]; iMonth++; - iYear += (iMonth - (iMonth % 12)) / 12; + iYear += iMonth / 12; iMonth = iMonth % 12; } while (iDay <= 0)

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010