May 2012 - Wine-Commits - list.winehq.org

Christian Costa : d3drm: Display new ref in trace for AddRef and Release for IDirect3DRMMesh.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 2dbbecbb9e23d9cde7d48eb11af3675fffff51c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbbecbb9e23d9cde7d48eb11… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 17 10:09:48 2012 +0200 d3drm: Display new ref in trace for AddRef and Release for IDirect3DRMMesh. --- dlls/d3drm/meshbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c84ccb8..38a38e8 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2149,7 +2149,7 @@ static ULONG WINAPI IDirect3DRMMeshImpl_AddRef(IDirect3DRMMesh* iface) IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p)->(): new ref = %d\n", This, ref); return ref; } @@ -2159,7 +2159,7 @@ static ULONG WINAPI IDirect3DRMMeshImpl_Release(IDirect3DRMMesh* iface) IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Christian Costa : d3drm: Hande parent when creating a new frame.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 22856e9c96758d3f676f1502e6a9472c390ffaab URL: http://source.winehq.org/git/wine.git/?a=commit;h=22856e9c96758d3f676f1502e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 17 10:10:07 2012 +0200 d3drm: Hande parent when creating a new frame. --- dlls/d3drm/d3drm.c | 33 +++++++++++---------------------- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/frame.c | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index a96ff52..8dc9523 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -137,16 +137,13 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateObject(IDirect3DRM* iface, REFCLSID return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateFrame(IDirect3DRM* iface, LPDIRECT3DRMFRAME pFrameParent, LPDIRECT3DRMFRAME * ppFrame) +static HRESULT WINAPI IDirect3DRMImpl_CreateFrame(IDirect3DRM* iface, LPDIRECT3DRMFRAME parent_frame, LPDIRECT3DRMFRAME * frame) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - TRACE("(%p/%p)->(%p,%p)\n", iface, This, pFrameParent, ppFrame); + TRACE("(%p/%p)->(%p,%p)\n", iface, This, parent_frame, frame); - if (pFrameParent) - FIXME("(%p/%p): Parent frame not yet supported\n", iface, This); - - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame, (IUnknown**)ppFrame); + return Direct3DRMFrame_create(&IID_IDirect3DRMFrame, (IUnknown*)parent_frame, (IUnknown**)frame); } static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM* iface, LPDIRECT3DRMMESH * ppMesh) @@ -507,18 +504,14 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateObject(IDirect3DRM2* iface, REFCLSI return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateFrame(IDirect3DRM2* iface, - LPDIRECT3DRMFRAME pFrameParent, - LPDIRECT3DRMFRAME2 * ppFrame) +static HRESULT WINAPI IDirect3DRM2Impl_CreateFrame(IDirect3DRM2* iface, LPDIRECT3DRMFRAME parent_frame, + LPDIRECT3DRMFRAME2 * frame) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - TRACE("(%p/%p)->(%p,%p)\n", iface, This, pFrameParent, ppFrame); - - if (pFrameParent) - FIXME("(%p/%p): Parent frame not yet supported\n", iface, This); + TRACE("(%p/%p)->(%p,%p)\n", iface, This, parent_frame, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame2, (IUnknown**)ppFrame); + return Direct3DRMFrame_create(&IID_IDirect3DRMFrame2, (IUnknown*)parent_frame, (IUnknown**)frame); } static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2* iface, LPDIRECT3DRMMESH * ppMesh) @@ -936,18 +929,14 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateObject(IDirect3DRM3* iface, REFCLSI return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateFrame(IDirect3DRM3* iface, - LPDIRECT3DRMFRAME3 FrameParent, - LPDIRECT3DRMFRAME3* Frame) +static HRESULT WINAPI IDirect3DRM3Impl_CreateFrame(IDirect3DRM3* iface, LPDIRECT3DRMFRAME3 parent_frame, + LPDIRECT3DRMFRAME3* frame) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - TRACE("(%p/%p)->(%p,%p)\n", iface, This, FrameParent, Frame); - - if (FrameParent) - FIXME("(%p/%p): Parent frame not yet supported\n", iface, This); + TRACE("(%p/%p)->(%p,%p)\n", iface, This, parent_frame, frame); - return Direct3DRMFrame_create(&IID_IDirect3DRMFrame3, (IUnknown**)Frame); + return Direct3DRMFrame_create(&IID_IDirect3DRMFrame3, (IUnknown*)parent_frame, (IUnknown**)frame); } static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3* iface, LPDIRECT3DRMMESH* Mesh) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 18d8e0a..aabb878 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -26,7 +26,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index e530dcd..574e2f8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2274,11 +2274,11 @@ static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3D return impl_from_IDirect3DRMFrame3(iface); } -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) +HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_iface) { IDirect3DRMFrameImpl* object; - TRACE("(%p)\n", ppObj); + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), parent, ret_iface); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl)); if (!object) @@ -2294,9 +2294,17 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D)); if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) - *ppObj = (IUnknown*)&object->IDirect3DRMFrame3_iface; + { + if (parent) + IDirect3DRMFrame3_AddChild((IDirect3DRMFrame3*)parent, &object->IDirect3DRMFrame3_iface); + *ret_iface = (IUnknown*)&object->IDirect3DRMFrame3_iface; + } else - *ppObj = (IUnknown*)&object->IDirect3DRMFrame2_iface; + { + if (parent) + IDirect3DRMFrame2_AddChild((IDirect3DRMFrame2*)parent, (IDirect3DRMFrame*)&object->IDirect3DRMFrame2_iface); + *ret_iface = (IUnknown*)&object->IDirect3DRMFrame2_iface; + } return S_OK; }

1 0

Vincent Povirk : winemono: Add script for Wine Mono download.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: tools Branch: master Commit: 6a3cb99bcbbaf812b9d75fafbb85feaee3250959 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6a3cb99bcbbaf812b9d75faf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 17 08:41:36 2012 -0500 winemono: Add script for Wine Mono download. --- winemono.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/winemono.php b/winemono.php new file mode 100644 index 0000000..86cd977 --- /dev/null +++ b/winemono.php @@ -0,0 +1,45 @@ +<?php +/** + * Redirects to a URL for the Wine Mono installer + */ + +// Default version if none given +$sVersion = '0.0.4'; + +// Suffix appended to base name of file +$sFileSuffix = ''; + +// Folder which contains files +$sFolder = 'Wine%20Mono'; + +// Check if a specific version was passed +if(isset($_GET['v'])) { + $sVersion = $_GET['v']; +} + +if(!$sFileSuffix) + $sFileSuffix = $sVersion; + +$sExt = 'msi'; + +// Name of the file +$sFileName = sprintf('%s/%s/wine-mono-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); + +// Size array +$aFileSizes = array( + '0.0.4'=>44408320 +); + +// Exact size of the file: +$iFileSize = $aFileSizes[$sFileSuffix]; +if(!$iFileSize) { + header("HTTP/1.0 404 Not Found"); + exit; +} + +// List of additional locations (commonly used locations are already in download.inc.php) +$aList = array(); + +// Common code for Wine downloader scripts +require("download.inc.php"); +?>

1 0

Christian Costa : d3drm: Load all sub-objects when a frame is found.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 6d47694bdf1383553b17e8cfc78a36022be14e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d47694bdf1383553b17e8cfc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:40 2012 +0200 d3drm: Load all sub-objects when a frame is found. --- dlls/d3drm/d3drm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7ea0b2a..b014369 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1,7 +1,7 @@ /* * Implementation of IDirect3DRM Interface * - * Copyright 2010 Christian Costa + * Copyright 2010, 2012 Christian Costa * Copyright 2011 André Hentschel * * This library is free software; you can redistribute it and/or @@ -1310,7 +1310,11 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI { hr = load_mesh_data(meshbuilder, data_object); if (SUCCEEDED(hr)) - LoadProc(object, GUIDs[i], ArgLP); + { + /* Only top level objects are notified */ + if (!parent_frame) + LoadProc(object, GUIDs[i], ArgLP); + } IDirect3DRMObject_Release(object); } IDirect3DRMMeshBuilder3_Release(meshbuilder); @@ -1337,9 +1341,9 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI { LPDIRECT3DRMFRAME3 frame; - FIXME("Fake frame data and notify application\n"); + TRACE("Load frame data and notify application\n"); - hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); + hr = IDirect3DRM3_CreateFrame(iface, parent_frame, &frame); if (SUCCEEDED(hr)) { LPDIRECT3DRMOBJECT object; @@ -1347,7 +1351,53 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); if (SUCCEEDED(hr)) { - LoadProc(object, GUIDs[i], ArgLP); + LPDIRECTXFILEOBJECT child; + + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(data_object, &child))) + { + LPDIRECTXFILEDATA data; + LPDIRECTXFILEDATAREFERENCE reference; + LPDIRECTXFILEBINARY binary; + + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); + if (SUCCEEDED(hr)) + { + FIXME("Binary Object not supported yet\n"); + IDirectXFileBinary_Release(binary); + continue; + } + + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); + if (SUCCEEDED(hr)) + { + TRACE("Found Data Object\n"); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + continue; + } + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + if (SUCCEEDED(hr)) + { + TRACE("Found Data Object Reference\n"); + IDirectXFileDataReference_Resolve(reference, &data); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + IDirectXFileDataReference_Release(reference); + continue; + } + } + + if (hr != DXFILEERR_NOMOREOBJECTS) + { + IDirect3DRMObject_Release(object); + IDirect3DRMFrame3_Release(frame); + goto end; + } + hr = S_OK; + + /* Only top level objects are notified */ + if (!parent_frame) + LoadProc(object, GUIDs[i], ArgLP); IDirect3DRMObject_Release(object); } IDirect3DRMFrame3_Release(frame);

1 0

Frédéric Delanoy : cmd: Improve WCMD_parameter documentation.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 0f032203f58f8b41d3cc5d3a66244deb9c54fde0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f032203f58f8b41d3cc5d3a6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue May 15 15:03:35 2012 +0200 cmd: Improve WCMD_parameter documentation. --- programs/cmd/batch.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 05314f4..7a735cf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -114,26 +114,23 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * * PARAMS * s [I] input string, non NULL - * n [I] # of the (possibly double quotes-delimited) parameter to return - * Starts at 0 - * start [O] if non NULL, pointer to the start of the nth parameter in s, - * potentially a " character - * end [O] if non NULL, pointer to the last char of - * the nth parameter in s, potentially a " character + * n [I] # of the parameter to return, counted from 0 + * start [O] Optional. Pointer to the first char of param n in s + * end [O] Optional. Pointer to the last char of param n in s * * RETURNS - * Success: Returns the nth delimited parameter found in s. - * *start points to the start of the param, possibly a starting - * double quotes character - * Failure: Returns an empty string if the param is not found. - * *start is set to NULL + * Success: The nth delimited parameter found in s, with any surrounding quotes removed + * if start != NULL, *start points to the start of the param + * if end != NULL, *end points to the end of the param + * Failure: An empty string if the param is not found. + * *start == *end == NULL * * NOTES - * Return value is stored in static storage, hence is overwritten - * after each call. - * Doesn't include any potentially delimiting double quotes + * Return value is stored in static storage (i.e. overwritten after each call). + * Specify 'start' and/or 'end' to include delimiting double quotes as well, if any. */ -WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end) { +WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end) +{ int curParamNb = 0; static WCHAR param[MAX_PATH]; WCHAR *p = s, *q;

1 0

Christian Costa : d3drm: Free visual and light resources when releasing frame.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 20bf183726ae09160f22952a61acb37d4b056f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bf183726ae09160f22952a6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:56 2012 +0200 d3drm: Free visual and light resources when releasing frame. --- dlls/d3drm/frame.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index d02cba8..fc15339 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -140,6 +140,12 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) for (i = 0; i < This->nb_children; i++) IDirect3DRMFrame3_Release(This->children[i]); HeapFree(GetProcessHeap(), 0, This->children); + for (i = 0; i < This->nb_visuals; i++) + IDirect3DRMVisual_Release(This->visuals[i]); + HeapFree(GetProcessHeap(), 0, This->visuals); + for (i = 0; i < This->nb_lights; i++) + IDirect3DRMLight_Release(This->lights[i]); + HeapFree(GetProcessHeap(), 0, This->lights); HeapFree(GetProcessHeap(), 0, This); }

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrame2Impl_GetVisuals and IDirect3DRMVisualArray interface .
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 37c427f54ad8829e1a135611622d4da51b10624e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c427f54ad8829e1a1356116… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:31 2012 +0200 d3drm: Implement IDirect3DRMFrame2Impl_GetVisuals and IDirect3DRMVisualArray interface. --- dlls/d3drm/frame.c | 155 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 154 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 60e8966..d02cba8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2,6 +2,7 @@ * Implementation of IDirect3DRMFrame Interface * * Copyright 2011, 2012 André Hentschel + * Copyright 2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,7 +64,15 @@ typedef struct { LPDIRECT3DRMFRAME* frames; } IDirect3DRMFrameArrayImpl; +typedef struct { + IDirect3DRMVisualArray IDirect3DRMVisualArray_iface; + LONG ref; + ULONG size; + LPDIRECT3DRMVISUAL* visuals; +} IDirect3DRMVisualArrayImpl; + HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj); +HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface); static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { @@ -460,10 +469,36 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2* iface, LPDIRECT3DRMVISUALARRAY *visuals) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMVisualArrayImpl* obj; + HRESULT hr; - FIXME("(%p/%p)->(%p): stub\n", iface, This, visuals); + TRACE("(%p/%p)->(%p)\n", iface, This, visuals); - return E_NOTIMPL; + if (!visuals) + return D3DRMERR_BADVALUE; + + hr = Direct3DRMVisualArray_create(visuals); + + if (hr != D3DRM_OK) + return hr; + + obj = (IDirect3DRMVisualArrayImpl*)*visuals; + + obj->size = This->nb_visuals; + if (This->nb_visuals) + { + ULONG i; + obj->visuals = HeapAlloc(GetProcessHeap(), 0, This->nb_visuals * sizeof(LPDIRECT3DRMVISUAL)); + if (!obj->visuals) + return E_OUTOFMEMORY; + for (i = 0; i < This->nb_visuals; i++) + { + obj->visuals[i] = This->visuals[i]; + IDirect3DRMVisual_AddRef(This->visuals[i]); + } + } + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTextureTopology(IDirect3DRMFrame2* iface, @@ -2360,3 +2395,119 @@ HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) return S_OK; } + +/*** IUnknown methods ***/ +static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray* iface, + REFIID riid, void** ret_iface) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirect3DRMFrameArray)) + { + *ret_iface = iface; + IDirect3DRMVisualArray_AddRef(iface); + return S_OK; + } + + *ret_iface = NULL; + + WARN("Interface %s not implemented\n", debugstr_guid(riid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* iface) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* iface) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + { + for (i = 0; i < This->size; i++) + IDirect3DRMVisual_Release(This->visuals[i]); + HeapFree(GetProcessHeap(), 0, This->visuals); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IDirect3DRMArray methods ***/ +static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* iface) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + + TRACE("(%p)->() = %d\n", iface, This->size); + + return This->size; +} + +/*** IDirect3DRMVisualArray methods ***/ +static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray* iface, DWORD index, LPDIRECT3DRMVISUAL* visual) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + + TRACE("(%p)->(%u, %p)\n", iface, index, visual); + + if (!visual) + return D3DRMERR_BADVALUE; + + *visual = NULL; + + if (index >= This->size) + return D3DRMERR_BADVALUE; + + IDirect3DRMVisual_AddRef(This->visuals[index]); + *visual = This->visuals[index]; + + return D3DRM_OK; +} + +static const struct IDirect3DRMVisualArrayVtbl Direct3DRMVisualArray_Vtbl = +{ + /*** IUnknown methods ***/ + IDirect3DRMVisualArrayImpl_QueryInterface, + IDirect3DRMVisualArrayImpl_AddRef, + IDirect3DRMVisualArrayImpl_Release, + /*** IDirect3DRMArray methods ***/ + IDirect3DRMVisualArrayImpl_GetSize, + /*** IDirect3DRMVisualArray methods ***/ + IDirect3DRMVisualArrayImpl_GetElement +}; + +HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) +{ + IDirect3DRMVisualArrayImpl* object; + + TRACE("(%p)\n", ret_iface); + + *ret_iface = NULL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMVisualArrayImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMVisualArray_iface.lpVtbl = &Direct3DRMVisualArray_Vtbl; + object->ref = 1; + + *ret_iface = &object->IDirect3DRMVisualArray_iface; + + return S_OK; +} diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8a8968e..3126fbd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -662,7 +662,7 @@ static void test_Frame(void) pVisualArray = NULL; hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &pVisualArray); - todo_wine ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr); if (pVisualArray) { count = IDirect3DRMVisualArray_GetSize(pVisualArray);

1 0

Christian Costa : d3drm: Attach mesh to the parent frame if any.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 3447f172301b0a709272eae1ae5ffd90613d65f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447f172301b0a709272eae1a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:48 2012 +0200 d3drm: Attach mesh to the parent frame if any. --- dlls/d3drm/d3drm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index b014369..ba666dc 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1298,7 +1298,7 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI { LPDIRECT3DRMMESHBUILDER3 meshbuilder; - FIXME("Load mesh data and notify application\n"); + TRACE("Load mesh data and notify application\n"); hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) @@ -1312,7 +1312,9 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI if (SUCCEEDED(hr)) { /* Only top level objects are notified */ - if (!parent_frame) + if (parent_frame) + IDirect3DRMFrame3_AddVisual(parent_frame, (IUnknown*)meshbuilder); + else LoadProc(object, GUIDs[i], ArgLP); } IDirect3DRMObject_Release(object);

1 0

Francois Gouget : wordpad: Tweak the spelling of a couple of menus.
by Alexandre Julliard May 16, 2012

May 16, 2012

1 0

Francois Gouget : mpr: Tweak a label so it matches the one in wininet.
by Alexandre Julliard May 16, 2012

May 16, 2012

1 0