Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 71762: [QEDIT] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:52:21 2016 New Revision: 71762 URL: http://svn.reactos.org/svn/reactos?rev=71762&view=rev Log: [QEDIT] Sync with Wine Staging 1.9.11. CORE-11368 Added: trunk/reactos/dll/directx/wine/qedit/timeline.c (with props) Modified: trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt trunk/reactos/dll/directx/wine/qedit/main.c trunk/reactos/dll/directx/wine/qedit/mediadet.c trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs trunk/reactos/dll/directx/wine/qedit/qedit_private.h trunk/reactos/dll/directx/wine/qedit/samplegrabber.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -7,6 +7,7 @@ main.c mediadet.c samplegrabber.c + timeline.c qedit_private.h) add_library(qedit SHARED Modified: trunk/reactos/dll/directx/wine/qedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/mai… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -56,6 +56,7 @@ static const struct object_creation_info object_creation[] = { + { &CLSID_AMTimeline, AMTimeline_create }, { &CLSID_MediaDet, MediaDet_create }, { &CLSID_SampleGrabber, SampleGrabber_create }, }; Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -102,7 +102,6 @@ { MD_cleanup(This); CoTaskMemFree(This); - return 0; } return ref; @@ -630,7 +629,7 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { MediaDetImpl* obj = NULL; - TRACE("(%p,%p)\n", ppv, pUnkOuter); + TRACE("(%p,%p)\n", pUnkOuter, ppv); obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); if (NULL == obj) { Modified: trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -22,6 +22,12 @@ [ threading(both), + uuid(78530B75-61F9-11D2-8CAD-00A024580902) +] +coclass AMTimeline { interface IAMTimeline; interface IPersistStream; interface IAMSetErrorLog; } + +[ + threading(both), uuid(65bd0711-24d2-4ff7-9324-ed2e5d3abafa) ] coclass MediaDet { interface IMediaDet; } Modified: trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -5,6 +5,10 @@ } NoRemove CLSID { + '{78530B75-61F9-11D2-8CAD-00A024580902}' = s 'AMTimeline' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } '{65BD0711-24D2-4FF7-9324-ED2E5D3ABAFA}' = s 'MediaDet' { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } Modified: trunk/reactos/dll/directx/wine/qedit/qedit_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -39,6 +39,7 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(qedit); +HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -80,7 +80,6 @@ if (This->mtype.pbFormat) CoTaskMemFree(This->mtype.pbFormat); CoTaskMemFree(This); - return 0; } return refCount; } @@ -323,7 +322,6 @@ { SampleGrabber_cleanup(This); CoTaskMemFree(This); - return 0; } return ref; } @@ -755,7 +753,7 @@ TRACE("(%p)->(%p) output = %p, grabber = %p\n", This, sample, This->memOutput, This->grabberIface); if (!sample) return E_POINTER; - if ((This->filter.state != State_Running) || (This->oneShot == OneShot_Past)) + if (This->oneShot == OneShot_Past) return S_FALSE; SampleGrabber_callback(This, sample); hr = This->memOutput ? IMemInputPin_Receive(This->memOutput, sample) : S_OK; @@ -1250,7 +1248,7 @@ ISeekingPassThru *passthru; HRESULT hr; - TRACE("(%p,%p)\n", ppv, pUnkOuter); + TRACE("(%p,%p)\n", pUnkOuter, ppv); obj = CoTaskMemAlloc(sizeof(SG_Impl)); if (NULL == obj) { Added: trunk/reactos/dll/directx/wine/qedit/timeline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/tim… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/timeline.c (added) +++ trunk/reactos/dll/directx/wine/qedit/timeline.c [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -0,0 +1,792 @@ +/* DirectShow Timeline object (QEDIT.DLL) + * + * Copyright 2016 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qedit_private.h" + +typedef struct { + IUnknown IUnknown_inner; + IAMTimeline IAMTimeline_iface; + IUnknown *outer_unk; + LONG ref; +} TimelineImpl; + +static inline TimelineImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, TimelineImpl, IUnknown_inner); +} + +static inline TimelineImpl *impl_from_IAMTimeline(IAMTimeline *iface) +{ + return CONTAINING_RECORD(iface, TimelineImpl, IAMTimeline_iface); +} + +typedef struct { + IAMTimelineObj IAMTimelineObj_iface; + LONG ref; + TIMELINE_MAJOR_TYPE timeline_type; +} TimelineObjImpl; + +static inline TimelineObjImpl *impl_from_IAMTimelineObj(IAMTimelineObj *iface) +{ + return CONTAINING_RECORD(iface, TimelineObjImpl, IAMTimelineObj_iface); +} + +static const IAMTimelineObjVtbl IAMTimelineObj_VTable; + +/* Timeline inner IUnknown */ + +static HRESULT WINAPI Timeline_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + TimelineImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if (IsEqualIID(riid, &IID_IAMTimeline)) + *ppv = &This->IAMTimeline_iface; + else + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + + if (!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI Timeline_AddRef(IUnknown *iface) +{ + TimelineImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI Timeline_Release(IUnknown *iface) +{ + TimelineImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + if (ref == 0) + CoTaskMemFree(This); + + return ref; +} + +static const IUnknownVtbl timeline_vtbl = +{ + Timeline_QueryInterface, + Timeline_AddRef, + Timeline_Release, +}; + +/* IAMTimeline implementation */ + +static HRESULT WINAPI Timeline_IAMTimeline_QueryInterface(IAMTimeline *iface, REFIID riid, void **ppv) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI Timeline_IAMTimeline_AddRef(IAMTimeline *iface) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI Timeline_IAMTimeline_Release(IAMTimeline *iface) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI Timeline_IAMTimeline_CreateEmptyNode(IAMTimeline *iface, IAMTimelineObj **obj, + TIMELINE_MAJOR_TYPE type) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + TimelineObjImpl* obj_impl; + + TRACE("(%p)->(%p,%d)\n", This, obj, type); + + if (!obj) + return E_POINTER; + + switch (type) + { + case TIMELINE_MAJOR_TYPE_COMPOSITE: + case TIMELINE_MAJOR_TYPE_TRACK: + case TIMELINE_MAJOR_TYPE_SOURCE: + case TIMELINE_MAJOR_TYPE_TRANSITION: + case TIMELINE_MAJOR_TYPE_EFFECT: + case TIMELINE_MAJOR_TYPE_GROUP: + break; + default: + return E_INVALIDARG; + } + + obj_impl = CoTaskMemAlloc(sizeof(TimelineObjImpl)); + if (!obj_impl) { + *obj = NULL; + return E_OUTOFMEMORY; + } + + obj_impl->ref = 1; + obj_impl->IAMTimelineObj_iface.lpVtbl = &IAMTimelineObj_VTable; + obj_impl->timeline_type = type; + + *obj = &obj_impl->IAMTimelineObj_iface; + return S_OK; +} + +static HRESULT WINAPI Timeline_IAMTimeline_AddGroup(IAMTimeline *iface, IAMTimelineObj *group) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, group); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_RemGroupFromList(IAMTimeline *iface, IAMTimelineObj *group) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, group); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetGroup(IAMTimeline *iface, IAMTimelineObj **group, LONG index) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p,%d): not implemented!\n", This, group, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetGroupCount(IAMTimeline *iface, LONG *count) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_ClearAllGroups(IAMTimeline *iface) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p): not implemented!\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetInsertMode(IAMTimeline *iface, LONG *mode) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_SetInsertMode(IAMTimeline *iface, LONG mode) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%d): not implemented!\n", This, mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_EnableTransitions(IAMTimeline *iface, BOOL enabled) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%d): not implemented!\n", This, enabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_TransitionsEnabled(IAMTimeline *iface, BOOL *enabled) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, enabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_EnableEffects(IAMTimeline *iface, BOOL enabled) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%d): not implemented!\n", This, enabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_EffectsEnabled(IAMTimeline *iface, BOOL *enabled) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, enabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_SetInterestRange(IAMTimeline *iface, REFERENCE_TIME start, + REFERENCE_TIME stop) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%s,%s): not implemented!\n", This, wine_dbgstr_longlong(start), + wine_dbgstr_longlong(stop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDuration(IAMTimeline *iface, REFERENCE_TIME *duration) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, duration); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDuration2(IAMTimeline *iface, double *duration) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, duration); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_SetDefaultFPS(IAMTimeline *iface, double fps) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%f): not implemented!\n", This, fps); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDefaultFPS(IAMTimeline *iface, double *fps) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, fps); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_IsDirty(IAMTimeline *iface, BOOL *dirty) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, dirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDirtyRange(IAMTimeline *iface, REFERENCE_TIME *start, + REFERENCE_TIME *stop) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetCountOfType(IAMTimeline *iface, LONG group, LONG *value, + LONG *value_with_comps, TIMELINE_MAJOR_TYPE type) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%d,%p,%p,%04x): not implemented!\n", This, group, value, value_with_comps, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_ValidateSourceNames(IAMTimeline *iface, LONG flags, IMediaLocator *override, + LONG_PTR notify_event) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%d,%p,%lx): not implemented!\n", This, flags, override, notify_event); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_SetDefaultTransition(IAMTimeline *iface, GUID *guid) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%s): not implemented!\n", This, wine_dbgstr_guid(guid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDefaultTransition(IAMTimeline *iface, GUID *guid) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%s): not implemented!\n", This, wine_dbgstr_guid(guid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_SetDefaultEffect(IAMTimeline *iface, GUID *guid) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%s): not implemented!\n", This, wine_dbgstr_guid(guid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDefaultEffect(IAMTimeline *iface, GUID *guid) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%s): not implemented!\n", This, wine_dbgstr_guid(guid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_SetDefaultTransitionB(IAMTimeline *iface, BSTR guidb) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, guidb); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDefaultTransitionB(IAMTimeline *iface, BSTR *guidb) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, guidb); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_SetDefaultEffectB(IAMTimeline *iface, BSTR guidb) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, guidb); + return E_NOTIMPL; +} + +static HRESULT WINAPI Timeline_IAMTimeline_GetDefaultEffectB(IAMTimeline *iface, BSTR *guidb) +{ + TimelineImpl *This = impl_from_IAMTimeline(iface); + FIXME("(%p)->(%p): not implemented!\n", This, guidb); + return E_NOTIMPL; +} + +static const IAMTimelineVtbl IAMTimeline_VTable = +{ + Timeline_IAMTimeline_QueryInterface, + Timeline_IAMTimeline_AddRef, + Timeline_IAMTimeline_Release, + Timeline_IAMTimeline_CreateEmptyNode, + Timeline_IAMTimeline_AddGroup, + Timeline_IAMTimeline_RemGroupFromList, + Timeline_IAMTimeline_GetGroup, + Timeline_IAMTimeline_GetGroupCount, + Timeline_IAMTimeline_ClearAllGroups, + Timeline_IAMTimeline_GetInsertMode, + Timeline_IAMTimeline_SetInsertMode, + Timeline_IAMTimeline_EnableTransitions, + Timeline_IAMTimeline_TransitionsEnabled, + Timeline_IAMTimeline_EnableEffects, + Timeline_IAMTimeline_EffectsEnabled, + Timeline_IAMTimeline_SetInterestRange, + Timeline_IAMTimeline_GetDuration, + Timeline_IAMTimeline_GetDuration2, + Timeline_IAMTimeline_SetDefaultFPS, + Timeline_IAMTimeline_GetDefaultFPS, + Timeline_IAMTimeline_IsDirty, + Timeline_IAMTimeline_GetDirtyRange, + Timeline_IAMTimeline_GetCountOfType, + Timeline_IAMTimeline_ValidateSourceNames, + Timeline_IAMTimeline_SetDefaultTransition, + Timeline_IAMTimeline_GetDefaultTransition, + Timeline_IAMTimeline_SetDefaultEffect, + Timeline_IAMTimeline_GetDefaultEffect, + Timeline_IAMTimeline_SetDefaultTransitionB, + Timeline_IAMTimeline_GetDefaultTransitionB, + Timeline_IAMTimeline_SetDefaultEffectB, + Timeline_IAMTimeline_GetDefaultEffectB, +}; + +HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppv) +{ + TimelineImpl* obj = NULL; + + TRACE("(%p,%p)\n", pUnkOuter, ppv); + + obj = CoTaskMemAlloc(sizeof(TimelineImpl)); + if (NULL == obj) { + *ppv = NULL; + return E_OUTOFMEMORY; + } + ZeroMemory(obj, sizeof(TimelineImpl)); + + obj->ref = 1; + obj->IUnknown_inner.lpVtbl = &timeline_vtbl; + obj->IAMTimeline_iface.lpVtbl = &IAMTimeline_VTable; + + if (pUnkOuter) + obj->outer_unk = pUnkOuter; + else + obj->outer_unk = &obj->IUnknown_inner; + + *ppv = &obj->IUnknown_inner; + return S_OK; +} + +/* IAMTimelineObj implementation */ + +static HRESULT WINAPI TimelineObj_QueryInterface(IAMTimelineObj *iface, REFIID riid, void **ppv) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAMTimelineObj)) + *ppv = &This->IAMTimelineObj_iface; + else + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + + if (!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TimelineObj_AddRef(IAMTimelineObj *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI TimelineObj_Release(IAMTimelineObj *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + if (!ref) + CoTaskMemFree(This); + + return ref; +} + +static HRESULT WINAPI TimelineObj_GetStartStop(IAMTimelineObj *iface, REFERENCE_TIME *start, REFERENCE_TIME *stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetStartStop2(IAMTimelineObj *iface, REFTIME *start, REFTIME *stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_FixTimes(IAMTimelineObj *iface, REFERENCE_TIME *start, REFERENCE_TIME *stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_FixTimes2(IAMTimelineObj *iface, REFTIME *start, REFTIME *stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetStartStop(IAMTimelineObj *iface, REFERENCE_TIME start, REFERENCE_TIME stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%s,%s): not implemented!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetStartStop2(IAMTimelineObj *iface, REFTIME start, REFTIME stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%f,%f): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetPropertySetter(IAMTimelineObj *iface, IPropertySetter **setter) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, setter); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetPropertySetter(IAMTimelineObj *iface, IPropertySetter *setter) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, setter); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetSubObject(IAMTimelineObj *iface, IUnknown **obj) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetSubObject(IAMTimelineObj *iface, IUnknown *obj) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetSubObjectGUID(IAMTimelineObj *iface, GUID guid) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%s): not implemented!\n", This, wine_dbgstr_guid(&guid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetSubObjectGUIDB(IAMTimelineObj *iface, BSTR guidb) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%s): not implemented!\n", This, wine_dbgstr_w(guidb)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetSubObjectGUID(IAMTimelineObj *iface, GUID *guid) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, guid); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetSubObjectGUIDB(IAMTimelineObj *iface, BSTR *guidb) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, guidb); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetSubObjectLoaded(IAMTimelineObj *iface, BOOL *loaded) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, loaded); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetTimelineType(IAMTimelineObj *iface, TIMELINE_MAJOR_TYPE *type) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + TRACE("(%p)->(%p)\n", This, type); + if (!type) return E_POINTER; + *type = This->timeline_type; + return S_OK; +} + +static HRESULT WINAPI TimelineObj_SetTimelineType(IAMTimelineObj *iface, TIMELINE_MAJOR_TYPE type) +{ + /* MSDN says that this function is "not supported" */ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + TRACE("(%p)->(%d)\n", This, type); + if (type != This->timeline_type) return E_INVALIDARG; + return S_OK; +} + +static HRESULT WINAPI TimelineObj_GetUserID(IAMTimelineObj *iface, LONG *id) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetUserID(IAMTimelineObj *iface, LONG id) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%d): not implemented!\n", This, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetGenID(IAMTimelineObj *iface, LONG *id) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetUserName(IAMTimelineObj *iface, BSTR *name) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetUserName(IAMTimelineObj *iface, BSTR name) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%s): not implemented!\n", This, wine_dbgstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetUserData(IAMTimelineObj *iface, BYTE *data, LONG *size) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, data, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetUserData(IAMTimelineObj *iface, BYTE *data, LONG size) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%d): not implemented!\n", This, data, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetMuted(IAMTimelineObj *iface, BOOL *muted) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, muted); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetMuted(IAMTimelineObj *iface, BOOL muted) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%d): not implemented!\n", This, muted); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetLocked(IAMTimelineObj *iface, BOOL *locked) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, locked); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetLocked(IAMTimelineObj *iface, BOOL locked) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%d): not implemented!\n", This, locked); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetDirtyRange(IAMTimelineObj *iface, REFERENCE_TIME *start, REFERENCE_TIME *stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetDirtyRange2(IAMTimelineObj *iface, REFTIME *start, REFTIME *stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p,%p): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetDirtyRange(IAMTimelineObj *iface, REFERENCE_TIME start, REFERENCE_TIME stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%s,%s): not implemented!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_SetDirtyRange2(IAMTimelineObj *iface, REFTIME start, REFTIME stop) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%f,%f): not implemented!\n", This, start, stop); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_ClearDirty(IAMTimelineObj *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p): not implemented!\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_Remove(IAMTimelineObj *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p): not implemented!\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_RemoveAll(IAMTimelineObj *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p): not implemented!\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetTimelineNoRef(IAMTimelineObj *iface, IAMTimeline **timeline) +{ + /* MSDN says that this function is "not supported" */ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + TRACE("(%p)->(%p)\n", This, timeline); + if (!timeline) return E_POINTER; + *timeline = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI TimelineObj_GetGroupIBelongTo(IAMTimelineObj *iface, IAMTimelineGroup **group) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, group); + return E_NOTIMPL; +} + +static HRESULT WINAPI TimelineObj_GetEmbedDepth(IAMTimelineObj *iface, LONG *depth) +{ + TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); + FIXME("(%p)->(%p): not implemented!\n", This, depth); + return E_NOTIMPL; +} + +static const IAMTimelineObjVtbl IAMTimelineObj_VTable = +{ + TimelineObj_QueryInterface, + TimelineObj_AddRef, + TimelineObj_Release, + TimelineObj_GetStartStop, + TimelineObj_GetStartStop2, + TimelineObj_FixTimes, + TimelineObj_FixTimes2, + TimelineObj_SetStartStop, + TimelineObj_SetStartStop2, + TimelineObj_GetPropertySetter, + TimelineObj_SetPropertySetter, + TimelineObj_GetSubObject, + TimelineObj_SetSubObject, + TimelineObj_SetSubObjectGUID, + TimelineObj_SetSubObjectGUIDB, + TimelineObj_GetSubObjectGUID, + TimelineObj_GetSubObjectGUIDB, + TimelineObj_GetSubObjectLoaded, + TimelineObj_GetTimelineType, + TimelineObj_SetTimelineType, + TimelineObj_GetUserID, + TimelineObj_SetUserID, + TimelineObj_GetGenID, + TimelineObj_GetUserName, + TimelineObj_SetUserName, + TimelineObj_GetUserData, + TimelineObj_SetUserData, + TimelineObj_GetMuted, + TimelineObj_SetMuted, + TimelineObj_GetLocked, + TimelineObj_SetLocked, + TimelineObj_GetDirtyRange, + TimelineObj_GetDirtyRange2, + TimelineObj_SetDirtyRange, + TimelineObj_SetDirtyRange2, + TimelineObj_ClearDirty, + TimelineObj_Remove, + TimelineObj_RemoveAll, + TimelineObj_GetTimelineNoRef, + TimelineObj_GetGroupIBelongTo, + TimelineObj_GetEmbedDepth, +}; Propchange: trunk/reactos/dll/directx/wine/qedit/timeline.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 15:52:21 2016 @@ -38,7 +38,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71761: [PSDK] Update qedit.idl. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:42:23 2016 New Revision: 71761 URL: http://svn.reactos.org/svn/reactos?rev=71761&view=rev Log: [PSDK] Update qedit.idl. CORE-11368 Modified: trunk/reactos/sdk/include/dxsdk/qedit.idl Modified: trunk/reactos/sdk/include/dxsdk/qedit.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/dxsdk/qedit.id… ============================================================================== --- trunk/reactos/sdk/include/dxsdk/qedit.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/dxsdk/qedit.idl [iso-8859-1] Sat Jul 2 15:42:23 2016 @@ -160,16 +160,658 @@ }; [ - uuid(78530B68-61F9-11D2-8CAD-00A024580902), - version(1.0), -] -library DexterLib -{ - [ - uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), - ] - coclass MediaDet - { - [default] interface IMediaDet; - }; -}; + uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), +] +coclass MediaDet +{ + [default] interface IMediaDet; +}; + +[ + object, + uuid(288581E0-66CE-11d2-918F-00C0DF10D434), + odl, + pointer_default(unique) +] +interface IMediaLocator : IUnknown +{ + HRESULT FindMediaFile( + BSTR input, + BSTR filter, + BSTR * output, + long flags + ); + + HRESULT AddFoundLocation( + BSTR dir + ); +}; + +typedef struct +{ + BSTR name; + DISPID dispID; + LONG nValues; +} DEXTER_PARAM; + +typedef struct +{ + VARIANT v; + REFERENCE_TIME rt; + DWORD dwInterp; +} DEXTER_VALUE; + +[ + object, + uuid(AE9472BD-B0C3-11D2-8D24-00A0C9441E20), + pointer_default(unique) +] +interface IPropertySetter : IUnknown +{ + HRESULT LoadXML( + [in] IUnknown * pxml + ); + + HRESULT PrintXML( + [out] char * xml, + [in] int size, + [out] int * printed, + [in] int indent + ); + + HRESULT CloneProps( + [out] IPropertySetter ** setter, + [in] REFERENCE_TIME start, + [in] REFERENCE_TIME stop + ); + + HRESULT AddProp( + [in] DEXTER_PARAM param, + [in] DEXTER_VALUE * value + ); + + HRESULT GetProps( + [out] LONG * params, + [out] DEXTER_PARAM ** param, + [out] DEXTER_VALUE ** value + ); + + HRESULT FreeProps( + [in] LONG params, + [in] DEXTER_PARAM * param, + [in] DEXTER_VALUE * value + ); + + HRESULT ClearProps(); + + HRESULT SaveToBlob( + [out] LONG * size, + [out] BYTE ** blob + ); + + HRESULT LoadFromBlob( + [in] LONG size, + [in] BYTE * blob + ); + + HRESULT SetProps( + [in] IUnknown * target, + [in] REFERENCE_TIME now + ); +}; + +[ + object, + uuid(E43E73A2-0EFA-11d3-9601-00A0C9441E20), + odl, + pointer_default(unique) +] +interface IAMErrorLog : IUnknown +{ + HRESULT LogError( + long severity, + BSTR error_str, + long error_code, + long hresult, + [in] VARIANT * extra + ); +}; + +[ + object, + uuid(963566DA-BE21-4eaf-88E9-35704F8F52A1), + odl, + pointer_default(unique) +] +interface IAMSetErrorLog : IUnknown +{ + [propget] HRESULT ErrorLog( + [out, retval] IAMErrorLog ** log + ); + + [propput] HRESULT ErrorLog( + [in] IAMErrorLog * log + ); +}; + +interface IAMTimeline; +interface IAMTimelineGroup; +interface IAMTimelineObj; +interface IAMTimelineSrc; + +typedef enum +{ + TIMELINE_MAJOR_TYPE_COMPOSITE = 1, + TIMELINE_MAJOR_TYPE_TRACK = 2, + TIMELINE_MAJOR_TYPE_SOURCE = 4, + TIMELINE_MAJOR_TYPE_TRANSITION = 8, + TIMELINE_MAJOR_TYPE_EFFECT = 16, + TIMELINE_MAJOR_TYPE_GROUP = 128 +} TIMELINE_MAJOR_TYPE; + +[ + object, + uuid(78530B74-61F9-11D2-8CAD-00A024580902), + odl, + pointer_default(unique) +] +interface IAMTimeline : IUnknown +{ + HRESULT CreateEmptyNode( + [out] IAMTimelineObj ** obj, + TIMELINE_MAJOR_TYPE type + ); + + HRESULT AddGroup( + IAMTimelineObj * group + ); + + HRESULT RemGroupFromList( + IAMTimelineObj * group + ); + + HRESULT GetGroup( + [out] IAMTimelineObj ** group, + long index + ); + + HRESULT GetGroupCount( + long * count + ); + + HRESULT ClearAllGroups(); + + HRESULT GetInsertMode( + long * mode + ); + + HRESULT SetInsertMode( + long mode + ); + + HRESULT EnableTransitions( + BOOL enabled + ); + + HRESULT TransitionsEnabled( + BOOL * enabled + ); + + HRESULT EnableEffects( + BOOL enabled + ); + + HRESULT EffectsEnabled( + BOOL * enabled + ); + + HRESULT SetInterestRange( + REFERENCE_TIME start, + REFERENCE_TIME stop + ); + + HRESULT GetDuration( + REFERENCE_TIME * duration + ); + + HRESULT GetDuration2( + double * duration + ); + + HRESULT SetDefaultFPS( + double fps + ); + + HRESULT GetDefaultFPS( + double * fps + ); + + HRESULT IsDirty( + BOOL * dirty + ); + + HRESULT GetDirtyRange( + REFERENCE_TIME * start, + REFERENCE_TIME * stop + ); + + HRESULT GetCountOfType( + long group, + long * value, + long * value_with_comps, + TIMELINE_MAJOR_TYPE type + ); + + HRESULT ValidateSourceNames( + long flags, + IMediaLocator * override, + LONG_PTR notify_event + ); + + HRESULT SetDefaultTransition( + GUID * guid + ); + + HRESULT GetDefaultTransition( + GUID * guid + ); + + HRESULT SetDefaultEffect( + GUID * guid + ); + + HRESULT GetDefaultEffect( + GUID * guid + ); + + HRESULT SetDefaultTransitionB( + BSTR guidb + ); + + HRESULT GetDefaultTransitionB( + [out,retval] BSTR * guidb + ); + + HRESULT SetDefaultEffectB( + BSTR guidb + ); + + HRESULT GetDefaultEffectB( + [out,retval] BSTR * guidb + ); +}; + +[ + uuid(78530B75-61F9-11D2-8CAD-00A024580902) +] +coclass AMTimeline +{ + [default] interface IAMTimeline; + interface IPersistStream; + interface IAMSetErrorLog; +}; + +[ + object, + uuid(9EED4F00-B8A6-11d2-8023-00C0DF10D434), + odl, + pointer_default(unique) +] +interface IAMTimelineGroup : IUnknown +{ + HRESULT SetTimeline( + IAMTimeline * timeline + ); + + HRESULT GetTimeline( + [out] IAMTimeline ** timeline + ); + + HRESULT GetPriority( + long * priority + ); + + HRESULT GetMediaType( + [out] AM_MEDIA_TYPE * + ); + + HRESULT SetMediaType( + [in] AM_MEDIA_TYPE * + ); + + HRESULT SetOutputFPS( + double fps + ); + + HRESULT GetOutputFPS( + double * fps + ); + + HRESULT SetGroupName( + BSTR name + ); + + HRESULT GetGroupName( + [out,retval] BSTR * name + ); + + HRESULT SetPreviewMode( + BOOL preview + ); + + HRESULT GetPreviewMode( + BOOL * preview + ); + + HRESULT SetMediaTypeForVB( + [in] long type + ); + + HRESULT GetOutputBuffering( + [out] int * buffer + ); + + HRESULT SetOutputBuffering( + [in] int buffer + ); + + HRESULT SetSmartRecompressFormat( + long * format + ); + + HRESULT GetSmartRecompressFormat( + long ** format + ); + + HRESULT IsSmartRecompressFormatSet( + BOOL * set + ); + + HRESULT IsRecompressFormatDirty( + BOOL * dirty + ); + + HRESULT ClearRecompressFormatDirty(); + + HRESULT SetRecompFormatFromSource( + IAMTimelineSrc * source + ); +}; + +[ + object, + local, + uuid(78530B77-61F9-11D2-8CAD-00A024580902), + odl, + pointer_default(unique) +] +interface IAMTimelineObj : IUnknown +{ + HRESULT GetStartStop( + REFERENCE_TIME * start, + REFERENCE_TIME * stop + ); + + HRESULT GetStartStop2( + REFTIME * start, REFTIME * stop + ); + + HRESULT FixTimes( + REFERENCE_TIME * start, REFERENCE_TIME * stop + ); + + HRESULT FixTimes2( + REFTIME * start, REFTIME * stop + ); + + HRESULT SetStartStop( + REFERENCE_TIME start, + REFERENCE_TIME stop + ); + + HRESULT SetStartStop2( + REFTIME start, + REFTIME stop + ); + + HRESULT GetPropertySetter( + [out,retval] IPropertySetter ** setter + ); + + HRESULT SetPropertySetter( + IPropertySetter * setter + ); + + HRESULT GetSubObject( + [out,retval] IUnknown ** obj + ); + + HRESULT SetSubObject( + IUnknown * obj + ); + + HRESULT SetSubObjectGUID( + GUID guid + ); + + HRESULT SetSubObjectGUIDB( + BSTR guidb + ); + + HRESULT GetSubObjectGUID( + GUID * guid + ); + + HRESULT GetSubObjectGUIDB( + [out,retval] BSTR * guidb + ); + + HRESULT GetSubObjectLoaded( + BOOL * loaded + ); + + HRESULT GetTimelineType( + TIMELINE_MAJOR_TYPE * type + ); + + HRESULT SetTimelineType( + TIMELINE_MAJOR_TYPE type + ); + + HRESULT GetUserID( + long * id + ); + + HRESULT SetUserID( + long id + ); + + HRESULT GetGenID( + long * id + ); + + HRESULT GetUserName( + [out,retval] BSTR * name + ); + + HRESULT SetUserName( + BSTR name + ); + + HRESULT GetUserData( + BYTE * data, + long * size + ); + + HRESULT SetUserData( + BYTE * data, + long size + ); + + HRESULT GetMuted( + BOOL * muted + ); + + HRESULT SetMuted( + BOOL muted + ); + + HRESULT GetLocked( + BOOL * locked + ); + + HRESULT SetLocked( + BOOL locked + ); + + HRESULT GetDirtyRange( + REFERENCE_TIME * start, + REFERENCE_TIME * stop + ); + + HRESULT GetDirtyRange2( + REFTIME * start, + REFTIME * stop + ); + + HRESULT SetDirtyRange( + REFERENCE_TIME start, + REFERENCE_TIME stop + ); + + HRESULT SetDirtyRange2( + REFTIME start, + REFTIME stop + ); + + HRESULT ClearDirty(); + + HRESULT Remove(); + + HRESULT RemoveAll(); + + HRESULT GetTimelineNoRef( + IAMTimeline ** timeline + ); + + HRESULT GetGroupIBelongTo( + [out] IAMTimelineGroup ** group + ); + + HRESULT GetEmbedDepth( + long * depth + ); +}; + +[ + object, + uuid(78530B79-61F9-11D2-8CAD-00A024580902), + odl, + pointer_default(unique) +] +interface IAMTimelineSrc : IUnknown +{ + HRESULT GetMediaTimes( + REFERENCE_TIME * start, + REFERENCE_TIME * stop + ); + + HRESULT GetMediaTimes2( + REFTIME * start, + REFTIME * stop + ); + + HRESULT ModifyStopTime( + REFERENCE_TIME stop + ); + + HRESULT ModifyStopTime2( + REFTIME stop + ); + + HRESULT FixMediaTimes( + REFERENCE_TIME * start, + REFERENCE_TIME * stop + ); + + HRESULT FixMediaTimes2( + REFTIME * start, + REFTIME * stop + ); + + HRESULT SetMediaTimes( + REFERENCE_TIME Start, + REFERENCE_TIME Stop + ); + + HRESULT SetMediaTimes2( + REFTIME Start, + REFTIME Stop + ); + + HRESULT SetMediaLength( + REFERENCE_TIME length + ); + + HRESULT SetMediaLength2( + REFTIME length + ); + + HRESULT GetMediaLength( + REFERENCE_TIME * length + ); + + HRESULT GetMediaLength2( + REFTIME * length + ); + + HRESULT GetMediaName( + [out,retval] BSTR * name + ); + + HRESULT SetMediaName( + BSTR name + ); + + HRESULT SpliceWithNext( + IAMTimelineObj * next + ); + + HRESULT GetStreamNumber( + long * num + ); + + HRESULT SetStreamNumber( + long num + ); + + HRESULT IsNormalRate( + BOOL * normal + ); + + HRESULT GetDefaultFPS( + double * fps + ); + + HRESULT SetDefaultFPS( + double fps + ); + + HRESULT GetStretchMode( + int * mode + ); + + HRESULT SetStretchMode( + int mode + ); +}; + +enum +{ + E_NOTINTREE = 0x80040400, + E_RENDER_ENGINE_IS_BROKEN = 0x80040401, + E_MUST_INIT_RENDERER = 0x80040402, + E_NOTDETERMINED = 0x80040403, + E_NO_TIMELINE = 0x80040404, + S_WARN_OUTPUTRESET = 40404 +};

1 0

[akhaldi] 71760: [DMUSIC] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:40:22 2016 New Revision: 71760 URL: http://svn.reactos.org/svn/reactos?rev=71760&view=rev Log: [DMUSIC] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h trunk/reactos/dll/directx/wine/dmusic/port.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/bu… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] Sat Jul 2 15:40:22 2016 @@ -132,8 +132,25 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + DWORD new_write_pos = This->write_pos + sizeof(DMUS_EVENTHEADER) + cb; + DMUS_EVENTHEADER header; FIXME("(%p, 0x%s, %d, %d, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb); + + if (new_write_pos > This->size) + return DMUS_E_BUFFER_FULL; + + if (!This->write_pos) + This->start_time = rt; + + header.cbEvent = cb; + header.dwChannelGroup = dwChannelGroup; + header.rtDelta = rt - This->start_time; + header.dwFlags = 0; + + memcpy(This->data + This->write_pos, &header, sizeof(header)); + memcpy(This->data + This->write_pos + sizeof(header), lpb, cb); + This->write_pos = new_write_pos; return S_OK; } Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] Sat Jul 2 15:40:22 2016 @@ -37,6 +37,7 @@ #include <objbase.h> #include <dmusici.h> #include <dmusics.h> +#include <dmksctrl.h> #include <wine/debug.h> #include <wine/list.h> @@ -171,6 +172,7 @@ IDirectMusicPort IDirectMusicPort_iface; IDirectMusicPortDownload IDirectMusicPortDownload_iface; IDirectMusicThru IDirectMusicThru_iface; + IKsControl IKsControl_iface; LONG ref; /* IDirectMusicPort fields */ Modified: trunk/reactos/dll/directx/wine/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] Sat Jul 2 15:40:22 2016 @@ -43,6 +43,11 @@ return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface); } +static inline SynthPortImpl *impl_from_SynthPortImpl_IKsControl(IKsControl *iface) +{ + return CONTAINING_RECORD(iface, SynthPortImpl, IKsControl_iface); +} + /* IDirectMusicDownloadedInstrument IUnknown part follows: */ static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface) { @@ -140,6 +145,10 @@ } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) { *ret_iface = &This->IDirectMusicThru_iface; IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface); + return S_OK; + } else if (IsEqualGUID(riid, &IID_IKsControl)) { + *ret_iface = &This->IKsControl_iface; + IKsControl_AddRef((IKsControl*)*ret_iface); return S_OK; } @@ -671,6 +680,75 @@ SynthPortImpl_IDirectMusicThru_ThruChannel }; +static HRESULT WINAPI SynthPortImpl_IKsControl_QueryInterface(IKsControl* iface, REFIID riid, LPVOID *ppobj) +{ + SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface); + + return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ppobj); +} + +static ULONG WINAPI SynthPortImpl_IKsControl_AddRef(IKsControl* iface) +{ + SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface); + + return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); +} + +static ULONG WINAPI SynthPortImpl_IKsControl_Release(IKsControl* iface) +{ + SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface); + + return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); +} + +static HRESULT WINAPI SynthPortImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, + ULONG DataLength, ULONG* BytesReturned) +{ + TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + + TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); + + if (Property->Flags != KSPROPERTY_TYPE_GET) + { + FIXME("Property flags %u not yet supported\n", Property->Flags); + return S_FALSE; + } + + if (DataLength < sizeof(DWORD)) + return E_NOT_SUFFICIENT_BUFFER; + + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + + return S_OK; +} + +static HRESULT WINAPI SynthPortImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static HRESULT WINAPI SynthPortImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData, + ULONG DataLength, ULONG* BytesReturned) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); + + return E_NOTIMPL; +} + +static const IKsControlVtbl SynthPortImpl_IKsControl_Vtbl = { + SynthPortImpl_IKsControl_QueryInterface, + SynthPortImpl_IKsControl_AddRef, + SynthPortImpl_IKsControl_Release, + SynthPortImpl_IKsControl_KsProperty, + SynthPortImpl_IKsControl_KsMethod, + SynthPortImpl_IKsControl_KsEvent +}; + HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { SynthPortImpl *obj; @@ -688,6 +766,7 @@ obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; + obj->IKsControl_iface.lpVtbl = &SynthPortImpl_IKsControl_Vtbl; obj->ref = 0; /* Will be inited by QueryInterface */ obj->fActive = FALSE; obj->params = *port_params; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 15:40:22 2016 @@ -32,7 +32,7 @@ reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29

1 0

[akhaldi] 71759: [DINPUT] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:38:59 2016 New Revision: 71759 URL: http://svn.reactos.org/svn/reactos?rev=71759&view=rev Log: [DINPUT] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/directx/wine/dinput/device.c trunk/reactos/dll/directx/wine/dinput/device_private.h trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c trunk/reactos/dll/directx/wine/dinput/joystick_linux.c trunk/reactos/dll/directx/wine/dinput/joystick_osx.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] Sat Jul 2 15:38:59 2016 @@ -764,7 +764,6 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, LPCDIDATAFORMAT df) { - static const WCHAR emptyW[] = { 0 }; IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); DIDATAFORMAT data_format; DIOBJECTDATAFORMAT *obj_df = NULL; @@ -855,7 +854,10 @@ dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); dps.diph.dwObj = 0; dps.diph.dwHow = DIPH_DEVICE; - lstrcpynW(dps.wsz, (dwFlags & DIDSAM_NOUSER) ? emptyW : username, sizeof(dps.wsz)/sizeof(WCHAR)); + if (dwFlags & DIDSAM_NOUSER) + dps.wsz[0] = '\0'; + else + lstrcpynW(dps.wsz, username, sizeof(dps.wsz)/sizeof(WCHAR)); IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); /* Save the settings to disk */ @@ -1095,9 +1097,6 @@ /* Free action mapping */ HeapFree(GetProcessHeap(), 0, This->action_map); - /* Free username */ - HeapFree(GetProcessHeap(), 0, This->username); - EnterCriticalSection( &This->dinput->crit ); list_remove( &This->entry ); LeaveCriticalSection( &This->dinput->crit ); @@ -1255,9 +1254,7 @@ if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - ps->wsz[0] = 0; - if (This->username) - lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); + lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); break; } case (DWORD_PTR) DIPROP_VIDPID: @@ -1339,14 +1336,7 @@ if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - if (!This->username) - This->username = HeapAlloc(GetProcessHeap(), 0, sizeof(ps->wsz)); - if (!This->username) - return DIERR_OUTOFMEMORY; - - This->username[0] = 0; - if (ps->wsz) - lstrcpynW(This->username, ps->wsz, sizeof(ps->wsz)/sizeof(WCHAR)); + lstrcpynW(This->username, ps->wsz, sizeof(This->username)/sizeof(WCHAR)); break; } default: Modified: trunk/reactos/dll/directx/wine/dinput/device_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] Sat Jul 2 15:38:59 2016 @@ -73,7 +73,7 @@ /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ - WCHAR *username; /* set by 'SetActionMap' */ + WCHAR username[MAX_PATH]; }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/ef… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c [iso-8859-1] Sat Jul 2 15:38:59 2016 @@ -67,6 +67,11 @@ return CONTAINING_RECORD(iface, LinuxInputEffectImpl, IDirectInputEffect_iface); } +static double ff_effect_direction_to_rad(unsigned int dir) +{ + return (dir & 0xffff) * M_PI / 0x8000; +} + /****************************************************************************** * LinuxInputEffectImpl */ @@ -172,8 +177,10 @@ return diErr; else { if (peff->dwFlags & DIEFF_CARTESIAN) { - peff->rglDirection[0] = sin(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000; - peff->rglDirection[1] = cos(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000; + /* rotate so 0 points right */ + double angle = ff_effect_direction_to_rad(This->effect.direction + 0xc000); + peff->rglDirection[0] = sin(angle) * 1000; + peff->rglDirection[1] = -cos(angle) * 1000; } else { /* Polar and spherical coordinates are the same for two or less * axes. @@ -505,9 +512,11 @@ /* One condition block. This needs to be rotated to direction, * and expanded to separate x and y conditions. */ int i; - double factor[2]; - factor[0] = asin((This->effect.direction * 3.0 * M_PI) / 0x7FFF); - factor[1] = acos((This->effect.direction * 3.0 * M_PI) / 0x7FFF); + double factor[2], angle; + /* rotate so 0 points right */ + angle = ff_effect_direction_to_rad(This->effect.direction + 0xc000); + factor[0] = sin(angle); + factor[1] = -cos(angle); for (i = 0; i < 2; ++i) { This->effect.u.condition[i].center = (int)(factor[i] * (tsp->lOffset / 10) * 32); This->effect.u.condition[i].right_coeff = (int)(factor[i] * (tsp->lPositiveCoefficient / 10) * 32); Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] Sat Jul 2 15:38:59 2016 @@ -143,7 +143,7 @@ #ifdef JSIOCGAXES if (ioctl(fd, JSIOCGAXES, &joydev.axis_count) < 0) { - WARN("ioctl(%s,JSIOCGAXES) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); + WARN("ioctl(%s,JSIOCGAXES) failed: %s, defaulting to 2\n", joydev.device, strerror(errno)); joydev.axis_count = 2; } #else @@ -153,7 +153,7 @@ #ifdef JSIOCGBUTTONS if (ioctl(fd, JSIOCGBUTTONS, &joydev.button_count) < 0) { - WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); + WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defaulting to 2\n", joydev.device, strerror(errno)); joydev.button_count = 2; } #else Modified: trunk/reactos/dll/directx/wine/dinput/joystick_osx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_osx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_osx.c [iso-8859-1] Sat Jul 2 15:38:59 2016 @@ -1474,7 +1474,7 @@ TRACE("%p %s %p\n", This, debugstr_guid(guid), out); - if(IsEqualIID(guid, &IID_IDirectInputEffect)){ + if(IsEqualIID(guid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){ *out = iface; IDirectInputEffect_AddRef(iface); return S_OK; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 15:38:59 2016 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71758: [D3DRM_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:34:17 2016 New Revision: 71758 URL: http://svn.reactos.org/svn/reactos?rev=71758&view=rev Log: [D3DRM_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/d3drm/d3drm.c Modified: trunk/rostests/winetests/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/d3drm/d3drm.c?r… ============================================================================== --- trunk/rostests/winetests/d3drm/d3drm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/d3drm/d3drm.c [iso-8859-1] Sat Jul 2 15:34:17 2016 @@ -994,6 +994,8 @@ ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); CHECK_REFCOUNT(pFrameP1, 2); + IDirect3DRMFrame_Release(pFrameTmp); + CHECK_REFCOUNT(pFrameP1, 1); /* Add child to second parent */ hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2); @@ -1037,6 +1039,8 @@ ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp); CHECK_REFCOUNT(pFrameP2, 2); CHECK_REFCOUNT(pFrameC, 2); + IDirect3DRMFrame_Release(pFrameTmp); + CHECK_REFCOUNT(pFrameP2, 1); /* Add child again */ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); @@ -1088,7 +1092,7 @@ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1); ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); frame_array = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array); @@ -1111,11 +1115,11 @@ /* [Add/Delete]Visual with NULL pointer */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); /* Create Visual */ hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder); @@ -1125,7 +1129,7 @@ /* Add Visual to first parent */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); CHECK_REFCOUNT(visual1, 2); visual_array = NULL; @@ -1145,17 +1149,17 @@ /* Delete Visual */ hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); IDirect3DRMMeshBuilder_Release(mesh_builder); /* [Add/Delete]Light with NULL pointer */ hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); /* Create Light */ hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1); @@ -1164,7 +1168,7 @@ /* Add Light to first parent */ hr = IDirect3DRMFrame_AddLight(pFrameP1, light1); ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); CHECK_REFCOUNT(light1, 2); light_array = NULL; @@ -1184,7 +1188,7 @@ /* Delete Light */ hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1); ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); IDirect3DRMLight_Release(light1); /* Test SceneBackground on first parent */ @@ -1203,13 +1207,258 @@ /* Cleanup */ IDirect3DRMFrame_Release(pFrameP2); - CHECK_REFCOUNT(pFrameC, 2); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameC, 1); + CHECK_REFCOUNT(pFrameP1, 1); IDirect3DRMFrame_Release(pFrameC); IDirect3DRMFrame_Release(pFrameP1); IDirect3DRM_Release(d3drm); +} + +struct destroy_context +{ + IDirect3DRMObject *obj; + unsigned int test_idx; + int called; +}; + +struct callback_order +{ + void *callback; + void *context; +} corder[3], d3drm_corder[3]; + +static void CDECL destroy_callback(IDirect3DRMObject *obj, void *arg) +{ + struct destroy_context *ctxt = arg; + ok(ctxt->called == 1 || ctxt->called == 2, "got called counter %d\n", ctxt->called); + ok(obj == ctxt->obj, "called with %p, expected %p\n", obj, ctxt->obj); + d3drm_corder[ctxt->called].callback = &destroy_callback; + d3drm_corder[ctxt->called++].context = ctxt; +} + +static void CDECL destroy_callback1(IDirect3DRMObject *obj, void *arg) +{ + struct destroy_context *ctxt = (struct destroy_context*)arg; + ok(ctxt->called == 0, "got called counter %d\n", ctxt->called); + ok(obj == ctxt->obj, "called with %p, expected %p\n", obj, ctxt->obj); + d3drm_corder[ctxt->called].callback = &destroy_callback1; + d3drm_corder[ctxt->called++].context = ctxt; +} + +static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID iid) +{ + struct destroy_context context; + IDirect3DRMObject *obj; + IUnknown *unknown; + IDirect3DRM *d3drm; + HRESULT hr; + int i; + + hr = Direct3DRMCreate(&d3drm); + ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr); + + hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown); + ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr); + hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + IUnknown_Release(unknown); + + context.called = 0; + context.test_idx = test_idx; + context.obj = obj; + + hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr); + + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + corder[2].callback = &destroy_callback; + corder[2].context = &context; + + /* same callback added twice */ + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + corder[1].callback = &destroy_callback; + corder[1].context = &context; + + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + + /* add one more */ + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + corder[0].callback = &destroy_callback1; + corder[0].context = &context; + + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr); + + context.called = 0; + IDirect3DRMObject_Release(obj); + ok(context.called == 3, "Test %u: got %d, expected 3.\n", test_idx, context.called); + for (i = 0; i < context.called; i++) + { + ok(corder[i].callback == d3drm_corder[i].callback + && corder[i].context == d3drm_corder[i].context, + "Expected callback = %p, context = %p. Got callback = %p, context = %p.\n", d3drm_corder[i].callback, + d3drm_corder[i].context, corder[i].callback, corder[i].context); + } + + /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */ + hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown); + ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr); + hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + IUnknown_Release(unknown); + + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + corder[1].callback = &destroy_callback; + corder[1].context = &context; + + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + corder[0].callback = &destroy_callback1; + corder[0].context = &context; + + hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + + hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + + context.called = 0; + hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj); + ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr); + IDirect3DRMObject_Release(context.obj); + IUnknown_Release(unknown); + ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called); + for (i = 0; i < context.called; i++) + { + ok(corder[i].callback == d3drm_corder[i].callback + && corder[i].context == d3drm_corder[i].context, + "Expected callback = %p, context = %p. Got callback = %p, context = %p.\n", d3drm_corder[i].callback, + d3drm_corder[i].context, corder[i].callback, corder[i].context); + } +} + +static void test_object(void) +{ + static const struct + { + REFCLSID clsid; + REFIID iid; + BOOL todo; + } + tests[] = + { + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice, TRUE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3, FALSE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport, TRUE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2, TRUE }, + }; + IDirect3DRM *d3drm1; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IUnknown *unknown = (IUnknown *)0xdeadbeef; + HRESULT hr; + ULONG ref1, ref2, ref3, ref4; + int i; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown); + ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + unknown = (IUnknown *)0xdeadbeef; + hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + unknown = (IUnknown *)0xdeadbeef; + hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + + hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); + todo_wine_if(tests[i].todo) + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + if (SUCCEEDED(hr)) + { + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + IUnknown_Release(unknown); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + + /* test Add/Destroy callbacks */ + test_destroy_callback(i, tests[i].clsid, tests[i].iid); + + hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + IUnknown_Release(unknown); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + + hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + IUnknown_Release(unknown); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + } + } + + IDirect3DRM_Release(d3drm1); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM3_Release(d3drm3); } static void test_Viewport(void) @@ -1220,10 +1469,12 @@ IDirect3DRMDevice *device; IDirect3DRMFrame *frame; IDirect3DRMViewport *viewport; + IDirect3DRMViewport2 *viewport2; + IDirect3DRMObject *obj, *obj2; GUID driver; HWND window; RECT rc; - DWORD size; + DWORD size, data; CHAR cname[64] = {0}; window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); @@ -1247,6 +1498,22 @@ hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj); + ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2); + + IDirect3DRMViewport2_Release(viewport2); + IDirect3DRMObject_Release(obj); + IDirect3DRMObject_Release(obj2); hr = IDirect3DRMViewport_GetClassName(viewport, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); @@ -1261,7 +1528,26 @@ ok(size == sizeof("Viewport"), "wrong size: %u\n", size); ok(!strcmp(cname, "Viewport"), "Expected cname to be \"Viewport\", but got \"%s\"\n", cname); - IDirect3DRMViewport_Release(viewport); + /* AppData */ + hr = IDirect3DRMViewport_SetAppData(viewport, 0); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 0); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 1); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 1); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + data = IDirect3DRMViewport2_GetAppData(viewport2); + ok(data == 1, "got %x\n", data); + IDirect3DRMViewport2_Release(viewport2); + IDirect3DRMFrame_Release(frame); IDirect3DRMDevice_Release(device); IDirectDrawClipper_Release(pClipper); @@ -1408,40 +1694,403 @@ static void test_Texture(void) { HRESULT hr; - IDirect3DRM *d3drm; - IDirect3DRMTexture *texture; - D3DRMIMAGE initimg = { + IDirect3DRM *d3drm1; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMTexture *texture1; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture3 *texture3; + + D3DRMIMAGE initimg = + { 2, 2, 1, 1, 32, TRUE, 2 * sizeof(DWORD), NULL, NULL, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL - }; + }, + testimg = + { + 0, 0, 0, 0, 0, + TRUE, 0, (void *)0xcafebabe, NULL, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL + }, + *d3drm_img = NULL; + DWORD pixel[4] = { 20000, 30000, 10000, 0 }; DWORD size; CHAR cname[64] = {0}; - - hr = Direct3DRMCreate(&d3drm); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + ULONG ref1, ref2, ref3, ref4; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + /* Test NULL params */ + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_CreateTexture(d3drm1, NULL, &texture1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1); + hr = IDirect3DRM_CreateTexture(d3drm1, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, &texture2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2); + hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, &texture3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3); + hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + /* Tests for validation of D3DRMIMAGE struct */ + hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + IDirect3DRMTexture_Release(texture1); + IDirect3DRMTexture2_Release(texture2); + IDirect3DRMTexture3_Release(texture3); + + testimg.rgb = 0; + testimg.palette = (void *)0xdeadbeef; + testimg.palette_size = 0x39; + hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + IDirect3DRMTexture_Release(texture1); + IDirect3DRMTexture2_Release(texture2); + IDirect3DRMTexture3_Release(texture3); + + initimg.rgb = 0; + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture1, "Expected texture == NULL, got %p.\n", texture1); + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture2, "Expected texture == NULL, got %p.\n", texture2); + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture3, "Expected texture == NULL, got %p.\n", texture3); + initimg.rgb = 1; + initimg.red_mask = 0; + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + initimg.red_mask = 0x000000ff; + initimg.green_mask = 0; + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + initimg.green_mask = 0x0000ff00; + initimg.blue_mask = 0; + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + initimg.blue_mask = 0x00ff0000; + initimg.buffer1 = NULL; + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); initimg.buffer1 = &pixel; - hr = IDirect3DRM_CreateTexture(d3drm, &initimg, &texture); - ok(hr == D3DRM_OK, "Cannot get IDirect3DRMTexture interface (hr = %x)\n", hr); - - hr = IDirect3DRMTexture_GetClassName(texture, NULL, cname); + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + + /* Test all failures together */ + hr = IDirect3DRMTexture_GetClassName(texture1, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); - hr = IDirect3DRMTexture_GetClassName(texture, NULL, NULL); + hr = IDirect3DRMTexture_GetClassName(texture1, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture2_GetClassName(texture2, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture2_GetClassName(texture2, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture3_GetClassName(texture3, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture3_GetClassName(texture3, NULL, NULL); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = 1; - hr = IDirect3DRMTexture_GetClassName(texture, &size, cname); + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof("Texture") - 1; + strcpy(cname, "test"); + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + ok(size == sizeof("Texture") - 1, "wrong size: %u\n", size); + ok(!strcmp(cname, "test"), "Expected cname to be \"test\", but got \"%s\"\n", cname); + hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + ok(size == sizeof("Texture") - 1, "wrong size: %u\n", size); + ok(!strcmp(cname, "test"), "Expected cname to be \"test\", but got \"%s\"\n", cname); + hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + ok(size == sizeof("Texture") - 1, "wrong size: %u\n", size); + ok(!strcmp(cname, "test"), "Expected cname to be \"test\", but got \"%s\"\n", cname); + + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + size = sizeof(cname); - hr = IDirect3DRMTexture_GetClassName(texture, &size, cname); - ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); ok(size == sizeof("Texture"), "wrong size: %u\n", size); ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); - - IDirect3DRMTexture_Release(texture); - - IDirect3DRM_Release(d3drm); + size = sizeof("Texture"); + hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + + d3drm_img = NULL; + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + + size = sizeof(cname); + hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname); + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + size = sizeof("Texture"); + hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname); + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + + d3drm_img = NULL; + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + + size = sizeof(cname); + hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname); + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + size = sizeof("Texture"); + hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname); + ok(SUCCEEDED(hr), "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + + IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + + /* InitFromImage tests */ + /* Tests for validation of D3DRMIMAGE struct */ + testimg.rgb = 1; + testimg.palette = NULL; + testimg.palette_size = 0; + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, + (void **)&texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr); + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, + (void **)&texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr); + hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg); + ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg); + ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + IDirect3DRMTexture2_Release(texture2); + IDirect3DRMTexture3_Release(texture3); + + testimg.rgb = 0; + testimg.palette = (void *)0xdeadbeef; + testimg.palette_size = 0x39; + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, + (void **)&texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr); + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, + (void **)&texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr); + hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg); + ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg); + ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + IDirect3DRMTexture2_Release(texture2); + IDirect3DRMTexture3_Release(texture3); + + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, + (void **)&texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr); + ref2 = get_refcount((IUnknown *)texture2); + hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ref3 = get_refcount((IUnknown *)texture2); + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, + (void **)&texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr); + ref2 = get_refcount((IUnknown *)texture3); + hr = IDirect3DRMTexture3_InitFromImage(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + ref3 = get_refcount((IUnknown *)texture3); + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); + + initimg.rgb = 0; + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + initimg.rgb = 1; + initimg.red_mask = 0; + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + initimg.red_mask = 0x000000ff; + initimg.green_mask = 0; + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + initimg.green_mask = 0x0000ff00; + initimg.blue_mask = 0; + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + initimg.blue_mask = 0x00ff0000; + initimg.buffer1 = NULL; + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + initimg.buffer1 = &pixel; + + d3drm_img = NULL; + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image (hr = %#x).\n", hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + /* Release leaked reference to d3drm1 */ + IDirect3DRM_Release(d3drm1); + + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + + d3drm_img = NULL; + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image (hr = %#x).\n", hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + IDirect3DRM_Release(d3drm1); + + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); } static void test_Device(void) @@ -4100,6 +4749,7 @@ test_Face(); test_Frame(); test_Device(); + test_object(); test_Viewport(); test_Light(); test_Material2();

1 0

[akhaldi] 71757: [D3DRM] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:33:46 2016 New Revision: 71757 URL: http://svn.reactos.org/svn/reactos?rev=71757&view=rev Log: [D3DRM] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.c trunk/reactos/dll/directx/wine/d3drm/d3drm_main.c trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c trunk/reactos/dll/directx/wine/d3drm/texture.c trunk/reactos/dll/directx/wine/d3drm/viewport.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/d3drm.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/d3drm.c [iso-8859-1] Sat Jul 2 15:33:46 2016 @@ -3,6 +3,7 @@ * * Copyright 2010, 2012 Christian Costa * Copyright 2011 AndrÃ© Hentschel + * Copyright 2016 Aaryaman Vasishta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -127,10 +128,12 @@ static HRESULT WINAPI d3drm1_CreateObject(IDirect3DRM *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm1_CreateFrame(IDirect3DRM *iface, @@ -181,9 +184,25 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, D3DRMIMAGE *image, IDirect3DRMTexture **texture) { - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); + IDirect3DRMTexture3 *texture3; + HRESULT hr; + + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); + + if (!texture) + return D3DRMERR_BADVALUE; + + if (FAILED(hr = IDirect3DRM3_CreateTexture(&d3drm->IDirect3DRM3_iface, image, &texture3))) + { + *texture = NULL; + return hr; + } + + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)texture); + IDirect3DRMTexture3_Release(texture3); + + return hr; } static HRESULT WINAPI d3drm1_CreateLight(IDirect3DRM *iface, @@ -391,17 +410,33 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, const char *filename, IDirect3DRMTexture **texture) { + struct d3drm_texture *object; + HRESULT hr; + FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); + if (FAILED(hr = d3drm_texture_create(&object, iface))) + return hr; + + *texture = &object->IDirect3DRMTexture_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm1_LoadTextureFromResource(IDirect3DRM *iface, HRSRC resource, IDirect3DRMTexture **texture) { + struct d3drm_texture *object; + HRESULT hr; + FIXME("iface %p, resource %p, texture %p stub!\n", iface, resource, texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)texture); + if (FAILED(hr = d3drm_texture_create(&object, iface))) + return hr; + + *texture = &object->IDirect3DRMTexture_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm1_SetSearchPath(IDirect3DRM *iface, const char *path) @@ -567,10 +602,12 @@ static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm2_CreateFrame(IDirect3DRM2 *iface, @@ -621,9 +658,25 @@ static HRESULT WINAPI d3drm2_CreateTexture(IDirect3DRM2 *iface, D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) { - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + IDirect3DRMTexture3 *texture3; + HRESULT hr; + + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); + + if (!texture) + return D3DRMERR_BADVALUE; + + if (FAILED(hr = IDirect3DRM3_CreateTexture(&d3drm->IDirect3DRM3_iface, image, &texture3))) + { + *texture = NULL; + return hr; + } + + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture2, (void **)texture); + IDirect3DRMTexture3_Release(texture3); + + return hr; } static HRESULT WINAPI d3drm2_CreateLight(IDirect3DRM2 *iface, @@ -809,18 +862,36 @@ static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, const char *filename, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + struct d3drm_texture *object; + HRESULT hr; + FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *texture = &object->IDirect3DRMTexture2_iface; + + return hr; } static HRESULT WINAPI d3drm2_LoadTextureFromResource(IDirect3DRM2 *iface, HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + struct d3drm_texture *object; + HRESULT hr; + FIXME("iface %p, resource_name %s, resource_type %s, texture %p stub!\n", iface, debugstr_a(resource_name), debugstr_a(resource_type), texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)texture); + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *texture = &object->IDirect3DRMTexture2_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm2_SetSearchPath(IDirect3DRM2 *iface, const char *path) @@ -994,10 +1065,51 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + IUnknown *object; + HRESULT hr; + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + if (!out) + return D3DRMERR_BADVALUE; + + if (!clsid || !iid) + { + *out = NULL; + return D3DRMERR_BADVALUE; + } + + if (outer) + { + FIXME("COM aggregation for outer IUnknown (%p) not implemented. Returning E_NOTIMPL.\n", outer); + *out = NULL; + return E_NOTIMPL; + } + + if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) + { + struct d3drm_texture *texture; + if (FAILED(hr = d3drm_texture_create(&texture, &d3drm->IDirect3DRM_iface))) + { + *out = NULL; + return hr; + } + object = (IUnknown *)&texture->IDirect3DRMTexture3_iface; + } + else + { + FIXME("%s not implemented. Returning CLASSFACTORY_E_FIRST.\n", debugstr_guid(clsid)); + *out = NULL; + return CLASSFACTORY_E_FIRST; + } + + if (FAILED(hr = IUnknown_QueryInterface(object, iid, out))) + *out = NULL; + IUnknown_Release(object); + + return hr; } static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, @@ -1046,9 +1158,28 @@ static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) { - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)texture); + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_texture *object; + HRESULT hr; + + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); + + if (!texture) + return D3DRMERR_BADVALUE; + + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *texture = &object->IDirect3DRMTexture3_iface; + + if (FAILED(IDirect3DRMTexture3_InitFromImage(*texture, image))) + { + IDirect3DRMTexture3_Release(*texture); + *texture = NULL; + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm3_CreateLight(IDirect3DRM3 *iface, @@ -1284,18 +1415,36 @@ static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, const char *filename, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_texture *object; + HRESULT hr; + FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)texture); + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *texture = &object->IDirect3DRMTexture3_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm3_LoadTextureFromResource(IDirect3DRM3 *iface, HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_texture *object; + HRESULT hr; + FIXME("iface %p, module %p, resource_name %s, resource_type %s, texture %p stub!\n", iface, module, debugstr_a(resource_name), debugstr_a(resource_type), texture); - return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)texture); + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *texture = &object->IDirect3DRMTexture3_iface; + + return D3DRM_OK; } static HRESULT WINAPI d3drm3_SetSearchPath(IDirect3DRM3 *iface, const char *path) Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/d3drm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/d3drm_main.c [iso-8859-1] Sat Jul 2 15:33:46 2016 @@ -34,3 +34,67 @@ } return TRUE; } + +void d3drm_object_init(struct d3drm_object *object) +{ + object->ref = 1; + object->appdata = 0; + list_init(&object->destroy_callbacks); +} + +struct destroy_callback +{ + struct list entry; + D3DRMOBJECTCALLBACK cb; + void *ctx; +}; + +HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) +{ + struct destroy_callback *callback; + + if (!cb) + return D3DRMERR_BADVALUE; + + callback = HeapAlloc(GetProcessHeap(), 0, sizeof(*callback)); + if (!callback) + return E_OUTOFMEMORY; + + callback->cb = cb; + callback->ctx = ctx; + + list_add_head(&object->destroy_callbacks, &callback->entry); + return D3DRM_OK; +} + +HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) +{ + struct destroy_callback *callback; + + if (!cb) + return D3DRMERR_BADVALUE; + + LIST_FOR_EACH_ENTRY(callback, &object->destroy_callbacks, struct destroy_callback, entry) + { + if (callback->cb == cb && callback->ctx == ctx) + { + list_remove(&callback->entry); + HeapFree(GetProcessHeap(), 0, callback); + break; + } + } + + return D3DRM_OK; +} + +void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) +{ + struct destroy_callback *callback, *callback2; + + LIST_FOR_EACH_ENTRY_SAFE(callback, callback2, &object->destroy_callbacks, struct destroy_callback, entry) + { + callback->cb(iface, callback->ctx); + list_remove(&callback->entry); + HeapFree(GetProcessHeap(), 0, callback); + } +} Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h [iso-8859-1] Sat Jul 2 15:33:46 2016 @@ -38,9 +38,33 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +#include "wine/list.h" + struct d3drm_device; +struct d3drm_object +{ + LONG ref; + DWORD appdata; + struct list destroy_callbacks; +}; + +struct d3drm_texture +{ + struct d3drm_object obj; + IDirect3DRMTexture IDirect3DRMTexture_iface; + IDirect3DRMTexture2 IDirect3DRMTexture2_iface; + IDirect3DRMTexture3 IDirect3DRMTexture3_iface; + IDirect3DRM *d3drm; + D3DRMIMAGE *image; +}; + +void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; +HRESULT d3drm_object_add_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; +HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) DECLSPEC_HIDDEN; +void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; +HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; @@ -51,7 +75,6 @@ HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; -HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mes… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c [iso-8859-1] Sat Jul 2 15:33:46 2016 @@ -1056,7 +1056,7 @@ return hr; } - TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + TRACE("Mesh name is %s\n", debugstr_a(This->name)); This->nb_normals = 0; @@ -1149,6 +1149,7 @@ IDirectXFileObject *child; DWORD i = 0; float* values; + struct d3drm_texture *texture_object; TRACE("Process MeshMaterialList\n"); @@ -1286,13 +1287,12 @@ if (file != INVALID_HANDLE_VALUE) { CloseHandle(file); - - hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown**)&This->materials[i].texture); - if (FAILED(hr)) + if (FAILED(hr = d3drm_texture_create(&texture_object, NULL))) { IDirectXFileData_Release(data); goto end; } + This->materials[i].texture = &texture_object->IDirect3DRMTexture3_iface; } } } Modified: trunk/reactos/dll/directx/wine/d3drm/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/tex… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/texture.c [iso-8859-1] Sat Jul 2 15:33:46 2016 @@ -20,15 +20,6 @@ #include "d3drm_private.h" -struct d3drm_texture -{ - IDirect3DRMTexture IDirect3DRMTexture_iface; - IDirect3DRMTexture2 IDirect3DRMTexture2_iface; - IDirect3DRMTexture3 IDirect3DRMTexture3_iface; - LONG ref; - DWORD app_data; -}; - static inline struct d3drm_texture *impl_from_IDirect3DRMTexture(IDirect3DRMTexture *iface) { return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture_iface); @@ -42,6 +33,31 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTexture3 *iface) { return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); +} + +static void d3drm_texture_destroy(struct d3drm_texture *texture) +{ + TRACE("texture %p is being destroyed.\n", texture); + + d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); + if (texture->image) + IDirect3DRM_Release(texture->d3drm); + HeapFree(GetProcessHeap(), 0, texture); +} + +static BOOL d3drm_validate_image(D3DRMIMAGE *image) +{ + if (!image + || !image->red_mask + || !image->green_mask + || !image->blue_mask + || !image->buffer1 + || !(image->rgb || (image->palette && image->palette_size))) + { + return FALSE; + } + + return TRUE; } static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out) @@ -84,17 +100,21 @@ static HRESULT WINAPI d3drm_texture1_AddDestroyCallback(IDirect3DRMTexture *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture1_DeleteDestroyCallback(IDirect3DRMTexture *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_DeleteDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture1_SetAppData(IDirect3DRMTexture *iface, DWORD data) @@ -380,17 +400,21 @@ static HRESULT WINAPI d3drm_texture2_AddDestroyCallback(IDirect3DRMTexture2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture2_DeleteDestroyCallback(IDirect3DRMTexture2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMTexture3_DeleteDestroyCallback(&texture->IDirect3DRMTexture3_iface, cb, ctx); } static HRESULT WINAPI d3drm_texture2_SetAppData(IDirect3DRMTexture2 *iface, DWORD data) @@ -604,9 +628,11 @@ static HRESULT WINAPI d3drm_texture2_InitFromImage(IDirect3DRMTexture2 *iface, D3DRMIMAGE *image) { - FIXME("iface %p, image %p stub!\n", iface, image); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture2(iface); + + TRACE("iface %p, image %p.\n", iface, image); + + return IDirect3DRMTexture3_InitFromImage(&texture->IDirect3DRMTexture3_iface, image); } static HRESULT WINAPI d3drm_texture2_InitFromResource2(IDirect3DRMTexture2 *iface, @@ -699,7 +725,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedIncrement(&texture->ref); + ULONG refcount = InterlockedIncrement(&texture->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -709,12 +735,12 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedDecrement(&texture->ref); + ULONG refcount = InterlockedDecrement(&texture->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, texture); + d3drm_texture_destroy(texture); return refcount; } @@ -730,17 +756,21 @@ static HRESULT WINAPI d3drm_texture3_AddDestroyCallback(IDirect3DRMTexture3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&texture->obj, cb, ctx); } static HRESULT WINAPI d3drm_texture3_DeleteDestroyCallback(IDirect3DRMTexture3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&texture->obj, cb, ctx); } static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWORD data) @@ -749,7 +779,7 @@ TRACE("iface %p, data %#x.\n", iface, data); - texture->app_data = data; + texture->obj.appdata = data; return D3DRM_OK; } @@ -760,7 +790,7 @@ TRACE("iface %p.\n", iface); - return texture->app_data; + return texture->obj.appdata; } static HRESULT WINAPI d3drm_texture3_SetName(IDirect3DRMTexture3 *iface, const char *name) @@ -781,7 +811,7 @@ { TRACE("iface %p, size %p, name %p.\n", iface, size, name); - if (!size || *size < strlen("Texture") || !name) + if (!size || *size < sizeof("Texture") || !name) return E_INVALIDARG; strcpy(name, "Texture"); @@ -885,51 +915,66 @@ static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface) { + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + + TRACE("iface %p.\n", iface); + + return texture->image; +} + +static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface) +{ FIXME("iface %p stub!\n", iface); - return NULL; -} - -static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface) + return 0; +} + +static DWORD WINAPI d3drm_texture3_GetColors(IDirect3DRMTexture3 *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static DWORD WINAPI d3drm_texture3_GetColors(IDirect3DRMTexture3 *iface) +static DWORD WINAPI d3drm_texture3_GetDecalScale(IDirect3DRMTexture3 *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static DWORD WINAPI d3drm_texture3_GetDecalScale(IDirect3DRMTexture3 *iface) +static BOOL WINAPI d3drm_texture3_GetDecalTransparency(IDirect3DRMTexture3 *iface) { FIXME("iface %p stub!\n", iface); + return FALSE; +} + +static D3DCOLOR WINAPI d3drm_texture3_GetDecalTransparentColor(IDirect3DRMTexture3 *iface) +{ + FIXME("iface %p stub!\n", iface); + return 0; } -static BOOL WINAPI d3drm_texture3_GetDecalTransparency(IDirect3DRMTexture3 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return FALSE; -} - -static D3DCOLOR WINAPI d3drm_texture3_GetDecalTransparentColor(IDirect3DRMTexture3 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return 0; -} - static HRESULT WINAPI d3drm_texture3_InitFromImage(IDirect3DRMTexture3 *iface, D3DRMIMAGE *image) { - FIXME("iface %p, image %p stub!\n", iface, image); - - return E_NOTIMPL; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + + TRACE("iface %p, image %p.\n", iface, image); + + if (!d3drm_validate_image(image)) + return D3DRMERR_BADOBJECT; + + /* d3drm intentionally leaks a reference to IDirect3DRM here if texture has already been initialized. */ + IDirect3DRM_AddRef(texture->d3drm); + + if (texture->image) + return D3DRMERR_BADOBJECT; + + texture->image = image; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_texture3_InitFromResource2(IDirect3DRMTexture3 *iface, @@ -1029,12 +1074,11 @@ d3drm_texture3_SetValidationCallback, }; -HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown **out) +HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) { struct d3drm_texture *object; - HRESULT hr; - - TRACE("riid %s, out %p.\n", debugstr_guid(riid), out); + + TRACE("texture %p.\n", texture); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1042,10 +1086,11 @@ object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; - object->ref = 1; - - hr = IDirect3DRMTexture3_QueryInterface(&object->IDirect3DRMTexture3_iface, riid, (void **)out); - IDirect3DRMTexture3_Release(&object->IDirect3DRMTexture3_iface); - - return hr; -} + object->d3drm = d3drm; + + d3drm_object_init(&object->obj); + + *texture = object; + + return D3DRM_OK; +} Modified: trunk/reactos/dll/directx/wine/d3drm/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/vie… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/viewport.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/viewport.c [iso-8859-1] Sat Jul 2 15:33:46 2016 @@ -22,9 +22,9 @@ struct d3drm_viewport { + struct d3drm_object obj; IDirect3DRMViewport IDirect3DRMViewport_iface; IDirect3DRMViewport2 IDirect3DRMViewport2_iface; - LONG ref; D3DVALUE back; D3DVALUE front; D3DVALUE field; @@ -48,6 +48,7 @@ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMViewport) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &viewport->IDirect3DRMViewport_iface; @@ -70,7 +71,7 @@ static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - ULONG refcount = InterlockedIncrement(&viewport->ref); + ULONG refcount = InterlockedIncrement(&viewport->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -80,12 +81,15 @@ static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - ULONG refcount = InterlockedDecrement(&viewport->ref); + ULONG refcount = InterlockedDecrement(&viewport->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + d3drm_object_cleanup((IDirect3DRMObject*)iface, &viewport->obj); HeapFree(GetProcessHeap(), 0, viewport); + } return refcount; } @@ -101,31 +105,39 @@ static HRESULT WINAPI d3drm_viewport1_AddDestroyCallback(IDirect3DRMViewport *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMViewport2_AddDestroyCallback(&viewport->IDirect3DRMViewport2_iface, cb, ctx); } static HRESULT WINAPI d3drm_viewport1_DeleteDestroyCallback(IDirect3DRMViewport *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return IDirect3DRMViewport2_DeleteDestroyCallback(&viewport->IDirect3DRMViewport2_iface, cb, ctx); } static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWORD data) { - FIXME("iface %p, data %#x stub!\n", iface, data); - - return E_NOTIMPL; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p, data %#x\n", iface, data); + + return IDirect3DRMViewport2_SetAppData(&viewport->IDirect3DRMViewport2_iface, data); } static DWORD WINAPI d3drm_viewport1_GetAppData(IDirect3DRMViewport *iface) { - FIXME("iface %p.\n", iface); - - return 0; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p.\n", iface); + + return IDirect3DRMViewport2_GetAppData(&viewport->IDirect3DRMViewport2_iface); } static HRESULT WINAPI d3drm_viewport1_SetName(IDirect3DRMViewport *iface, const char *name) @@ -454,31 +466,40 @@ static HRESULT WINAPI d3drm_viewport2_AddDestroyCallback(IDirect3DRMViewport2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&viewport->obj, cb, ctx); } static HRESULT WINAPI d3drm_viewport2_DeleteDestroyCallback(IDirect3DRMViewport2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); - - return E_NOTIMPL; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + + TRACE("iface %p, cb %p, ctx %p\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&viewport->obj, cb, ctx); } static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DWORD data) { - FIXME("iface %p, data %#x stub!\n", iface, data); - - return E_NOTIMPL; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + + TRACE("iface %p, data %#x\n", iface, data); + + viewport->obj.appdata = data; + return S_OK; } static DWORD WINAPI d3drm_viewport2_GetAppData(IDirect3DRMViewport2 *iface) { - FIXME("iface %p stub!\n", iface); - - return 0; + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + + TRACE("iface %p\n", iface); + + return viewport->obj.appdata; } static HRESULT WINAPI d3drm_viewport2_SetName(IDirect3DRMViewport2 *iface, const char *name) @@ -810,7 +831,7 @@ object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &d3drm_viewport2_vtbl; - object->ref = 1; + d3drm_object_init(&object->obj); if (IsEqualGUID(riid, &IID_IDirect3DRMViewport2)) *out = (IUnknown *)&object->IDirect3DRMViewport2_iface; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 15:33:46 2016 @@ -25,7 +25,7 @@ reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71756: [PSDK] Update d3drm.h. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:33:00 2016 New Revision: 71756 URL: http://svn.reactos.org/svn/reactos?rev=71756&view=rev Log: [PSDK] Update d3drm.h. CORE-11368 Modified: trunk/reactos/sdk/include/psdk/d3drm.h Modified: trunk/reactos/sdk/include/psdk/d3drm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/d3drm.h?r… ============================================================================== --- trunk/reactos/sdk/include/psdk/d3drm.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/d3drm.h [iso-8859-1] Sat Jul 2 15:33:00 2016 @@ -110,7 +110,7 @@ #define IDirect3DRM_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM methods ***/ -#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -148,7 +148,7 @@ #define IDirect3DRM_AddRef(p) (p)->AddRef() #define IDirect3DRM_Release(p) (p)->Release() /*** IDirect3DRM methods ***/ -#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a) @@ -251,7 +251,7 @@ #define IDirect3DRM2_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM2_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM2 methods ***/ -#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM2_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM2_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM2_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -290,7 +290,7 @@ #define IDirect3DRM2_AddRef(p) (p)->AddRef() #define IDirect3DRM2_Release(p) (p)->Release() /*** IDirect3DRM2 methods ***/ -#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM2_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM2_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM2_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a) @@ -399,7 +399,7 @@ #define IDirect3DRM3_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM3_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM3 methods ***/ -#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM3_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM3_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM3_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -443,7 +443,7 @@ #define IDirect3DRM3_AddRef(p) (p)->AddRef() #define IDirect3DRM3_Release(p) (p)->Release() /*** IDirect3DRM3 methods ***/ -#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM3_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM3_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM3_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a)

1 0

[akhaldi] 71755: [WINDOWSCODECS_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:29:06 2016 New Revision: 71755 URL: http://svn.reactos.org/svn/reactos?rev=71755&view=rev Log: [WINDOWSCODECS_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/windowscodecs/bitmap.c trunk/rostests/winetests/windowscodecs/converter.c trunk/rostests/winetests/windowscodecs/metadata.c Modified: trunk/rostests/winetests/windowscodecs/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/b… ============================================================================== --- trunk/rostests/winetests/windowscodecs/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/bitmap.c [iso-8859-1] Sat Jul 2 15:29:06 2016 @@ -829,13 +829,8 @@ hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - { - if (data[i] != data_8bpp_pal_wic[i]) -todo_wine + todo_wine_if (data[i] != data_8bpp_pal_wic[i]) ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); - else - ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); - } IWICBitmap_Release(bitmap); DeleteObject(hbmp); Modified: trunk/rostests/winetests/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/c… ============================================================================== --- trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] Sat Jul 2 15:29:06 2016 @@ -48,6 +48,11 @@ const bitmap_data *data; } BitmapTestSrc; +static BOOL near_equal(float a, float b) +{ + return fabsf(a - b) < 0.001; +} + static inline BitmapTestSrc *impl_from_IWICBitmapSource(IWICBitmapSource *iface) { return CONTAINING_RECORD(iface, BitmapTestSrc, IWICBitmapSource_iface); @@ -201,6 +206,14 @@ HeapFree(GetProcessHeap(), 0, This); } +/* XP and 2003 use linear color conversion, later versions use sRGB gamma */ +static const float bits_32bppGrayFloat_xp[] = { + 0.114000f,0.587000f,0.299000f,0.000000f, + 0.886000f,0.413000f,0.701000f,1.000000f}; +static const BYTE bits_8bppGray_xp[] = { + 29,150,76,0, + 226,105,179,255}; + static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSource *source, const char *name) { BYTE *converted_bits; @@ -250,6 +263,33 @@ } ok(equal, "unexpected pixel data (%s)\n", name); } + else if (IsEqualGUID(expect->format, &GUID_WICPixelFormat32bppGrayFloat)) + { + BOOL equal=TRUE; + UINT i; + const float *a=(const float*)expect->bits, *b=(const float*)converted_bits; + for (i=0; i<(buffersize/4); i++) + if (!near_equal(a[i], b[i]) && !near_equal(bits_32bppGrayFloat_xp[i], b[i])) + { + equal = FALSE; + break; + } + + ok(equal, "unexpected pixel data (%s)\n", name); + } + else if (IsEqualGUID(expect->format, &GUID_WICPixelFormat8bppGray)) + { + UINT i; + BOOL equal=TRUE; + const BYTE *a=(const BYTE*)expect->bits, *b=(const BYTE*)converted_bits; + for (i=0; i<buffersize; i++) + if (a[i] != b[i] && bits_8bppGray_xp[i] != b[i]) + { + equal = FALSE; + break; + } + ok(equal, "unexpected pixel data (%s)\n", name); + } else ok(memcmp(expect->bits, converted_bits, buffersize) == 0, "unexpected pixel data (%s)\n", name); @@ -270,6 +310,33 @@ } ok(equal, "unexpected pixel data with rc=NULL (%s)\n", name); } + else if (IsEqualGUID(expect->format, &GUID_WICPixelFormat32bppGrayFloat)) + { + BOOL equal=TRUE; + UINT i; + const float *a=(const float*)expect->bits, *b=(const float*)converted_bits; + for (i=0; i<(buffersize/4); i++) + if (!near_equal(a[i], b[i]) && !near_equal(bits_32bppGrayFloat_xp[i], b[i])) + { + equal = FALSE; + break; + } + + ok(equal, "unexpected pixel data (%s)\n", name); + } + else if (IsEqualGUID(expect->format, &GUID_WICPixelFormat8bppGray)) + { + UINT i; + BOOL equal=TRUE; + const BYTE *a=(const BYTE*)expect->bits, *b=(const BYTE*)converted_bits; + for (i=0; i<buffersize; i++) + if (a[i] != b[i] && bits_8bppGray_xp[i] != b[i]) + { + equal = FALSE; + break; + } + ok(equal, "unexpected pixel data (%s)\n", name); + } else ok(memcmp(expect->bits, converted_bits, buffersize) == 0, "unexpected pixel data with rc=NULL (%s)\n", name); @@ -300,6 +367,24 @@ static const struct bitmap_data testdata_32bppBGRA = { &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGRA, 4, 2, 96.0, 96.0}; +static const float bits_32bppGrayFloat[] = { + 0.072200f,0.715200f,0.212600f,0.000000f, + 0.927800f,0.284800f,0.787400f,1.000000f}; +static const struct bitmap_data testdata_32bppGrayFloat = { + &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat, 4, 2, 96.0, 96.0}; + +static const BYTE bits_8bppGray[] = { + 76,220,127,0, + 247,145,230,255}; +static const struct bitmap_data testdata_8bppGray = { + &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray, 4, 2, 96.0, 96.0}; + +static const BYTE bits_24bppBGR_gray[] = { + 76,76,76, 220,220,220, 127,127,127, 0,0,0, + 247,247,247, 145,145,145, 230,230,230, 255,255,255}; +static const struct bitmap_data testdata_24bppBGR_gray = { + &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR_gray, 4, 2, 96.0, 96.0}; + static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { BitmapTestSrc *src_obj; @@ -309,9 +394,7 @@ CreateTestBitmap(src, &src_obj); hr = WICConvertBitmapSource(dst->format, &src_obj->IWICBitmapSource_iface, &dst_bitmap); - if (todo) - todo_wine ok(SUCCEEDED(hr), "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); - else + todo_wine_if (todo) ok(SUCCEEDED(hr), "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); if (SUCCEEDED(hr)) @@ -500,7 +583,7 @@ if (FAILED(hr)) return; - ok(cProperties == cProperties2, "Missmatch of property count (IPropertyBag2::CountProperties=%i, IPropertyBag2::GetPropertyInfo=%i)\n", + ok(cProperties == cProperties2, "Mismatch of property count (IPropertyBag2::CountProperties=%i, IPropertyBag2::GetPropertyInfo=%i)\n", (int)cProperties, (int)cProperties2); } @@ -741,6 +824,14 @@ test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", FALSE); test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_32bppGrayFloat, "24bppRGB -> 32bppGrayFloat", FALSE); + test_conversion(&testdata_32bppBGR, &testdata_32bppGrayFloat, "32bppBGR -> 32bppGrayFloat", FALSE); + + test_conversion(&testdata_24bppBGR, &testdata_8bppGray, "24bppBGR -> 8bppGray", FALSE); + test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); + test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); + test_conversion(&testdata_32bppGrayFloat, &testdata_8bppGray, "32bppGrayFloat -> 8bppGray", FALSE); + test_invalid_conversion(); test_default_converter(); Modified: trunk/rostests/winetests/windowscodecs/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/m… ============================================================================== --- trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] Sat Jul 2 15:29:06 2016 @@ -969,6 +969,8 @@ IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *blockreader; IWICMetadataReader *reader; + IWICMetadataQueryReader *queryreader; + IWICComponentFactory *factory; GUID containerformat; HRESULT hr; UINT count=0xdeadbeef; @@ -1039,7 +1041,32 @@ hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); todo_wine ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "GetReaderByIndex failed, hr=%x\n", hr); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, NULL, &queryreader); + ok(hr == E_INVALIDARG, "CreateQueryReaderFromBlockReader should have failed: %08x\n", hr); + + hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, blockreader, NULL); + ok(hr == E_INVALIDARG, "CreateQueryReaderFromBlockReader should have failed: %08x\n", hr); + + hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, blockreader, &queryreader); + ok(hr == S_OK, "CreateQueryReaderFromBlockReader failed: %08x\n", hr); + + IWICMetadataQueryReader_Release(queryreader); + + IWICComponentFactory_Release(factory); + IWICMetadataBlockReader_Release(blockreader); + } + + hr = IWICBitmapFrameDecode_GetMetadataQueryReader(frame, &queryreader); + ok(hr == S_OK, "GetMetadataQueryReader failed: %08x\n", hr); + + if (SUCCEEDED(hr)) + { + IWICMetadataQueryReader_Release(queryreader); } IWICBitmapFrameDecode_Release(frame); @@ -1131,6 +1158,7 @@ IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *blockreader; IWICMetadataReader *reader; + IWICMetadataQueryReader *queryreader; GUID format; HRESULT hr; UINT count; @@ -1451,6 +1479,16 @@ ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); IWICMetadataBlockReader_Release(blockreader); + } + + hr = IWICBitmapFrameDecode_GetMetadataQueryReader(frame, &queryreader); + ok(hr == S_OK || + broken(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION) /* before Vista */, + "GetMetadataQueryReader failed: %08x\n", hr); + + if (SUCCEEDED(hr)) + { + IWICMetadataQueryReader_Release(queryreader); } IWICBitmapFrameDecode_Release(frame);

1 0

[akhaldi] 71754: [WINDOWSCODECS] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:28:24 2016 New Revision: 71754 URL: http://svn.reactos.org/svn/reactos?rev=71754&view=rev Log: [WINDOWSCODECS] Sync with Wine Staging 1.9.11. CORE-11368 Added: trunk/reactos/dll/win32/windowscodecs/metadataquery.c (with props) trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c (with props) trunk/reactos/dll/win32/windowscodecs/msvc.h (with props) Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/bitmap.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/guid.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/scaler.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/dll/win32/windowscodecs/windowscodecs.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -23,7 +23,6 @@ add_rpcproxy_files(windowscodecs_wincodec.idl) list(APPEND SOURCE - bitmap.c bmpdecode.c bmpencode.c clipper.c @@ -40,6 +39,7 @@ jpegformat.c main.c metadatahandler.c + metadataquery.c palette.c pngformat.c propertybag.c @@ -52,8 +52,17 @@ ungif.c wincodecs_private.h) -add_library(windowscodecs SHARED - ${SOURCE} +if(MSVC) + if(ARCH STREQUAL "i386") + list(APPEND SOURCE msvc-thiscall.c) + endif() + set_source_files_properties(bitmap.c PROPERTIES COMPILE_FLAGS "/FImsvc.h") + list(APPEND ADDITIONAL_SOURCE bitmap.c) +else() + list(APPEND SOURCE bitmap.c) +endif() + +list(APPEND ADDITIONAL_SOURCE guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c @@ -61,6 +70,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c) +add_library(windowscodecs SHARED + ${SOURCE} + ${ADDITIONAL_SOURCE}) + set_module_type(windowscodecs win32dll) target_link_libraries(windowscodecs wine uuid ${PSEH_LIB}) add_importlibs(windowscodecs ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 advapi32_vista msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/windowscodecs/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -31,6 +31,7 @@ int palette_set; LONG lock; /* 0 if not locked, -1 if locked for writing, count if locked for reading */ BYTE *data; + BOOL is_section; /* TRUE if data is a section created by an application */ UINT width, height; UINT stride; UINT bpp; @@ -121,6 +122,7 @@ } else { + FIXME("unknown interface %s\n", debugstr_guid(iid)); *ppv = NULL; return E_NOINTERFACE; } @@ -234,12 +236,14 @@ { *ppv = &This->IWICBitmap_iface; } - else if (IsEqualIID(&IID_IMILBitmapSource, iid)) + else if (IsEqualIID(&IID_IMILBitmap, iid) || + IsEqualIID(&IID_IMILBitmapSource, iid)) { *ppv = &This->IMILBitmapSource_iface; } else { + FIXME("unknown interface %s\n", debugstr_guid(iid)); *ppv = NULL; return E_NOINTERFACE; } @@ -270,7 +274,10 @@ if (This->palette) IWICPalette_Release(This->palette); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->data); + if (This->is_section) + UnmapViewOfFile(This->data); + else + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); } @@ -465,13 +472,22 @@ if (!ppv) return E_INVALIDARG; if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IMILBitmap, iid) || IsEqualIID(&IID_IMILBitmapSource, iid)) { IUnknown_AddRef(&This->IMILBitmapSource_iface); *ppv = &This->IMILBitmapSource_iface; return S_OK; } - + else if (IsEqualIID(&IID_IWICBitmap, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid)) + { + IUnknown_AddRef(&This->IWICBitmap_iface); + *ppv = &This->IWICBitmap_iface; + return S_OK; + } + + FIXME("unknown interface %s\n", debugstr_guid(iid)); *ppv = NULL; return E_NOINTERFACE; } @@ -492,6 +508,7 @@ UINT *width, UINT *height) { BitmapImpl *This = impl_from_IMILBitmapSource(iface); + TRACE("(%p,%p,%p)\n", iface, width, height); return IWICBitmap_GetSize(&This->IWICBitmap_iface, width, height); } @@ -545,6 +562,7 @@ } } + TRACE("=> %u\n", *format); return S_OK; } @@ -552,6 +570,7 @@ double *dpix, double *dpiy) { BitmapImpl *This = impl_from_IMILBitmapSource(iface); + TRACE("(%p,%p,%p)\n", iface, dpix, dpiy); return IWICBitmap_GetResolution(&This->IWICBitmap_iface, dpix, dpiy); } @@ -559,6 +578,7 @@ IWICPalette *palette) { BitmapImpl *This = impl_from_IMILBitmapSource(iface); + TRACE("(%p,%p)\n", iface, palette); return IWICBitmap_CopyPalette(&This->IWICBitmap_iface, palette); } @@ -566,10 +586,11 @@ const WICRect *rc, UINT stride, UINT size, BYTE *buffer) { BitmapImpl *This = impl_from_IMILBitmapSource(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, rc, stride, size, buffer); return IWICBitmap_CopyPixels(&This->IWICBitmap_iface, rc, stride, size, buffer); } -static HRESULT WINAPI IMILBitmapImpl_UnknownMethod1(IMILBitmapSource *iface, void **ppv) +static HRESULT WINAPI IMILBitmapImpl_unknown1(IMILBitmapSource *iface, void **ppv) { BitmapImpl *This = impl_from_IMILBitmapSource(iface); @@ -577,10 +598,44 @@ if (!ppv) return E_INVALIDARG; - IUnknown_AddRef(&This->IMILUnknown1_iface); + /* reference count is not incremented here */ *ppv = &This->IMILUnknown1_iface; return S_OK; +} + +static HRESULT WINAPI IMILBitmapImpl_Lock(IMILBitmapSource *iface, const WICRect *rc, DWORD flags, IWICBitmapLock **lock) +{ + BitmapImpl *This = impl_from_IMILBitmapSource(iface); + TRACE("(%p,%p,%08x,%p)\n", iface, rc, flags, lock); + return IWICBitmap_Lock(&This->IWICBitmap_iface, rc, flags, lock); +} + +static HRESULT WINAPI IMILBitmapImpl_Unlock(IMILBitmapSource *iface, IWICBitmapLock *lock) +{ + TRACE("(%p,%p)\n", iface, lock); + IWICBitmapLock_Release(lock); + return S_OK; +} + +static HRESULT WINAPI IMILBitmapImpl_SetPalette(IMILBitmapSource *iface, IWICPalette *palette) +{ + BitmapImpl *This = impl_from_IMILBitmapSource(iface); + TRACE("(%p,%p)\n", iface, palette); + return IWICBitmap_SetPalette(&This->IWICBitmap_iface, palette); +} + +static HRESULT WINAPI IMILBitmapImpl_SetResolution(IMILBitmapSource *iface, double dpix, double dpiy) +{ + BitmapImpl *This = impl_from_IMILBitmapSource(iface); + TRACE("(%p,%f,%f)\n", iface, dpix, dpiy); + return IWICBitmap_SetResolution(&This->IWICBitmap_iface, dpix, dpiy); +} + +static HRESULT WINAPI IMILBitmapImpl_AddDirtyRect(IMILBitmapSource *iface, const WICRect *rc) +{ + FIXME("(%p,%p): stub\n", iface, rc); + return E_NOTIMPL; } static const IMILBitmapSourceVtbl IMILBitmapImpl_Vtbl = @@ -593,26 +648,20 @@ IMILBitmapImpl_GetResolution, IMILBitmapImpl_CopyPalette, IMILBitmapImpl_CopyPixels, - IMILBitmapImpl_UnknownMethod1, + IMILBitmapImpl_unknown1, + IMILBitmapImpl_Lock, + IMILBitmapImpl_Unlock, + IMILBitmapImpl_SetPalette, + IMILBitmapImpl_SetResolution, + IMILBitmapImpl_AddDirtyRect }; static HRESULT WINAPI IMILUnknown1Impl_QueryInterface(IMILUnknown1 *iface, REFIID iid, void **ppv) { - BitmapImpl *This = impl_from_IMILUnknown1(iface); - - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid)) - { - IUnknown_AddRef(&This->IMILUnknown1_iface); - *ppv = iface; - return S_OK; - } - - return IWICBitmap_QueryInterface(&This->IWICBitmap_iface, iid, ppv); + FIXME("(%p,%s,%p): stub\n", iface, debugstr_guid(iid), ppv); + *ppv = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IMILUnknown1Impl_AddRef(IMILUnknown1 *iface) @@ -626,48 +675,109 @@ BitmapImpl *This = impl_from_IMILUnknown1(iface); return IWICBitmap_Release(&This->IWICBitmap_iface); } + +DECLSPEC_HIDDEN void WINAPI IMILUnknown1Impl_unknown1(IMILUnknown1 *iface, void *arg) +{ + FIXME("(%p,%p): stub\n", iface, arg); +} + +static HRESULT WINAPI IMILUnknown1Impl_unknown2(IMILUnknown1 *iface, void *arg1, void *arg2) +{ + FIXME("(%p,%p,%p): stub\n", iface, arg1, arg2); + return E_NOTIMPL; +} + +DECLSPEC_HIDDEN HRESULT WINAPI IMILUnknown1Impl_unknown3(IMILUnknown1 *iface, void *arg) +{ + FIXME("(%p,%p): stub\n", iface, arg); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMILUnknown1Impl_unknown4(IMILUnknown1 *iface, void *arg) +{ + FIXME("(%p,%p): stub\n", iface, arg); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMILUnknown1Impl_unknown5(IMILUnknown1 *iface, void *arg) +{ + FIXME("(%p,%p): stub\n", iface, arg); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMILUnknown1Impl_unknown6(IMILUnknown1 *iface, DWORD64 arg) +{ + FIXME("(%p,%s): stub\n", iface, wine_dbgstr_longlong(arg)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMILUnknown1Impl_unknown7(IMILUnknown1 *iface, void *arg) +{ + FIXME("(%p,%p): stub\n", iface, arg); + return E_NOTIMPL; +} + +DECLSPEC_HIDDEN HRESULT WINAPI IMILUnknown1Impl_unknown8(IMILUnknown1 *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(IMILUnknown1Impl_unknown1, 8) +DEFINE_THISCALL_WRAPPER(IMILUnknown1Impl_unknown3, 8) +DEFINE_THISCALL_WRAPPER(IMILUnknown1Impl_unknown8, 4) static const IMILUnknown1Vtbl IMILUnknown1Impl_Vtbl = { IMILUnknown1Impl_QueryInterface, IMILUnknown1Impl_AddRef, IMILUnknown1Impl_Release, + THISCALL(IMILUnknown1Impl_unknown1), + IMILUnknown1Impl_unknown2, + THISCALL(IMILUnknown1Impl_unknown3), + IMILUnknown1Impl_unknown4, + IMILUnknown1Impl_unknown5, + IMILUnknown1Impl_unknown6, + IMILUnknown1Impl_unknown7, + THISCALL(IMILUnknown1Impl_unknown8) }; static HRESULT WINAPI IMILUnknown2Impl_QueryInterface(IMILUnknown2 *iface, REFIID iid, void **ppv) { - BitmapImpl *This = impl_from_IMILUnknown2(iface); - - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid)) - { - IUnknown_AddRef(&This->IMILUnknown2_iface); - *ppv = iface; - return S_OK; - } - - return IWICBitmap_QueryInterface(&This->IWICBitmap_iface, iid, ppv); + FIXME("(%p,%s,%p): stub\n", iface, debugstr_guid(iid), ppv); + *ppv = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IMILUnknown2Impl_AddRef(IMILUnknown2 *iface) { - BitmapImpl *This = impl_from_IMILUnknown2(iface); - return IWICBitmap_AddRef(&This->IWICBitmap_iface); + FIXME("(%p): stub\n", iface); + return 0; } static ULONG WINAPI IMILUnknown2Impl_Release(IMILUnknown2 *iface) { - BitmapImpl *This = impl_from_IMILUnknown2(iface); - return IWICBitmap_Release(&This->IWICBitmap_iface); -} - -static HRESULT WINAPI IMILUnknown2Impl_UnknownMethod1(IMILUnknown2 *iface, void *arg1, void *arg2) + FIXME("(%p): stub\n", iface); + return 0; +} + +static HRESULT WINAPI IMILUnknown2Impl_unknown1(IMILUnknown2 *iface, void *arg1, void **arg2) { FIXME("(%p,%p,%p): stub\n", iface, arg1, arg2); + if (arg2) *arg2 = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI IMILUnknown2Impl_unknown2(IMILUnknown2 *iface, void *arg1, void *arg2) +{ + FIXME("(%p,%p,%p): stub\n", iface, arg1, arg2); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMILUnknown2Impl_unknown3(IMILUnknown2 *iface, void *arg1) +{ + FIXME("(%p,%p): stub\n", iface, arg1); return E_NOTIMPL; } @@ -676,17 +786,18 @@ IMILUnknown2Impl_QueryInterface, IMILUnknown2Impl_AddRef, IMILUnknown2Impl_Release, - IMILUnknown2Impl_UnknownMethod1, + IMILUnknown2Impl_unknown1, + IMILUnknown2Impl_unknown2, + IMILUnknown2Impl_unknown3 }; HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, - UINT stride, UINT datasize, BYTE *bits, + UINT stride, UINT datasize, BYTE *data, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { HRESULT hr; BitmapImpl *This; - BYTE *data; UINT bpp; hr = get_pixelformat_bpp(pixelFormat, &bpp); @@ -699,14 +810,20 @@ if (stride < ((bpp*uiWidth)+7)/8) return E_INVALIDARG; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); - if (!This || !data) - { - HeapFree(GetProcessHeap(), 0, This); - HeapFree(GetProcessHeap(), 0, data); - return E_OUTOFMEMORY; - } - if (bits) memcpy(data, bits, datasize); + if (!This) return E_OUTOFMEMORY; + + if (!data) + { + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); + if (!data) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + This->is_section = FALSE; + } + else + This->is_section = TRUE; This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->IMILBitmapSource_iface.lpVtbl = &IMILBitmapImpl_Vtbl; Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,8 @@ #include "wincodecs_private.h" +#include <math.h> + struct FormatConverter; enum pixelformat { @@ -35,6 +38,7 @@ format_16bppBGRA5551, format_24bppBGR, format_24bppRGB, + format_32bppGrayFloat, format_32bppBGR, format_32bppBGRA, format_32bppPBGRA, @@ -62,6 +66,55 @@ WICBitmapPaletteType palette_type; CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; + +/* https://www.w3.org/Graphics/Color/srgb */ +static inline float from_sRGB_component(float f) +{ + if (f <= 0.04045f) return f / 12.92f; + return powf((f + 0.055f) / 1.055f, 2.4f); +} + +static inline float to_sRGB_component(float f) +{ + if (f <= 0.0031308f) return 12.92f * f; + return 1.055f * powf(f, 1.0f/2.4f) - 0.055f; +} + +#if 0 /* FIXME: enable once needed */ +static void from_sRGB(BYTE *bgr) +{ + float r, g, b; + + r = bgr[2] / 255.0f; + g = bgr[1] / 255.0f; + b = bgr[0] / 255.0f; + + r = from_sRGB_component(r); + g = from_sRGB_component(g); + g = from_sRGB_component(b); + + bgr[2] = (BYTE)(r * 255.0f); + bgr[1] = (BYTE)(g * 255.0f); + bgr[0] = (BYTE)(b * 255.0f); +} + +static void to_sRGB(BYTE *bgr) +{ + float r, g, b; + + r = bgr[2] / 255.0f; + g = bgr[1] / 255.0f; + b = bgr[0] / 255.0f; + + r = to_sRGB_component(r); + g = to_sRGB_component(g); + g = to_sRGB_component(b); + + bgr[2] = (BYTE)(r * 255.0f); + bgr[1] = (BYTE)(g * 255.0f); + bgr[0] = (BYTE)(b * 255.0f); +} +#endif static inline FormatConverter *impl_from_IWICFormatConverter(IWICFormatConverter *iface) { @@ -903,6 +956,49 @@ return res; } return S_OK; + + case format_32bppGrayFloat: + if (prc) + { + BYTE *srcdata; + UINT srcstride, srcdatasize; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + float *gray_float = (float *)src; + BYTE *bgr = dst; + + for (x = 0; x < prc->Width; x++) + { + BYTE gray = (BYTE)floorf(to_sRGB_component(gray_float[x]) * 255.0f + 0.51f); + *bgr++ = gray; + *bgr++ = gray; + *bgr++ = gray; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return hr; + } + return S_OK; + default: FIXME("Unimplemented conversion path!\n"); return WINCODEC_ERR_UNSUPPORTEDOPERATION; @@ -979,6 +1075,102 @@ } } +static HRESULT copypixels_to_32bppGrayFloat(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppBGR: + case format_32bppBGRA: + case format_32bppPBGRA: + case format_32bppGrayFloat: + if (prc) + { + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + break; + } + return S_OK; + + default: + hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + break; + } + + if (SUCCEEDED(hr) && prc && source_format != format_32bppGrayFloat) + { + INT x, y; + BYTE *p = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = p; + for (x = 0; x < prc->Width; x++) + { + float gray = (bgr[2] * 0.2126f + bgr[1] * 0.7152f + bgr[0] * 0.0722f) / 255.0f; + *(float *)bgr = gray; + bgr += 4; + } + p += cbStride; + } + } + return hr; +} + +static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + UINT srcstride, srcdatasize; + + if (source_format == format_8bppGray) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + float gray = (bgr[2] * 0.2126f + bgr[1] * 0.7152f + bgr[0] * 0.0722f) / 255.0f; + + /* conversion from 32bppGrayFloat to 24bppBGR has already applied sRGB gamma */ + if (source_format == format_32bppGrayFloat) + gray *= 255.0f; + else + gray = to_sRGB_component(gray) * 255.0f; + + dst[x] = (BYTE)floorf(gray + 0.51f); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, @@ -987,13 +1179,14 @@ {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, - {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, + {format_8bppGray, &GUID_WICPixelFormat8bppGray, copypixels_to_8bppGray}, {format_16bppGray, &GUID_WICPixelFormat16bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_16bppBGRA5551, &GUID_WICPixelFormat16bppBGRA5551, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, copypixels_to_24bppBGR}, {format_24bppRGB, &GUID_WICPixelFormat24bppRGB, copypixels_to_24bppRGB}, + {format_32bppGrayFloat, &GUID_WICPixelFormat32bppGrayFloat, copypixels_to_32bppGrayFloat}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -236,7 +236,7 @@ MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct graphic_control_extenstion + struct graphic_control_extension { BYTE packed; /* reservred: 3; @@ -314,7 +314,7 @@ MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct application_extenstion + struct application_extension { BYTE extension_introducer; BYTE extension_label; @@ -421,7 +421,7 @@ MetadataItem **items, DWORD *count) { #include "pshpack1.h" - struct gif_extenstion + struct gif_extension { BYTE extension_introducer; BYTE extension_label; @@ -801,8 +801,14 @@ static HRESULT WINAPI GifFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { + GifFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + if (!ppIMetadataQueryReader) + return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); } static HRESULT WINAPI GifFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, Modified: trunk/reactos/dll/win32/windowscodecs/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gu… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -16,6 +16,11 @@ DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22); DEFINE_GUID(GUID_VendorWine, 0xddf46da1,0x7dc1,0x404e,0x98,0xf2,0xef,0xa4,0x8d,0xfc,0x95,0x0a); -DEFINE_GUID(IID_IMILBitmapSource,0x7543696a,0xbc8d,0x46b0,0x5f,0x81,0x8d,0x95,0x72,0x89,0x72,0xbe); +DEFINE_GUID(IID_IMILBitmap, 0xb1784d3f,0x8115,0x4763,0x13,0xaa,0x32,0xed,0xdb,0x68,0x29,0x4a); +DEFINE_GUID(IID_IMILBitmapSource, 0x7543696a,0xbc8d,0x46b0,0x5f,0x81,0x8d,0x95,0x72,0x89,0x72,0xbe); +DEFINE_GUID(IID_IMILBitmapLock, 0xa67b2b53,0x8fa1,0x4155,0x8f,0x64,0x0c,0x24,0x7a,0x8f,0x84,0xcd); +DEFINE_GUID(IID_IMILBitmapScaler, 0xa767b0f0,0x1c8c,0x4aef,0x56,0x8f,0xad,0xf9,0x6d,0xcf,0xd5,0xcb); +DEFINE_GUID(IID_IMILFormatConverter, 0x7e2a746f,0x25c5,0x4851,0xb3,0xaf,0x44,0x3b,0x79,0x63,0x9e,0xc0); +DEFINE_GUID(IID_IMILPalette, 0xca8e206f,0xf22c,0x4af7,0x6f,0xba,0x7b,0xed,0x5e,0xb1,0xc9,0x2f); /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -579,12 +579,36 @@ UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, UINT size, BYTE *buffer, IWICBitmap **bitmap) { + HRESULT hr; + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, debugstr_guid(format), stride, size, buffer, bitmap); if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; - return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); + hr = BitmapImpl_Create(width, height, stride, size, NULL, format, WICBitmapCacheOnLoad, bitmap); + if (SUCCEEDED(hr)) + { + IWICBitmapLock *lock; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (SUCCEEDED(hr)) + { + UINT buffersize; + BYTE *data; + + IWICBitmapLock_GetDataPointer(lock, &buffersize, &data); + memcpy(data, buffer, buffersize); + + IWICBitmapLock_Release(lock); + } + else + { + IWICBitmap_Release(*bitmap); + *bitmap = NULL; + } + } + return hr; } static BOOL get_16bpp_format(HBITMAP hbm, WICPixelFormatGUID *format) @@ -1080,8 +1104,12 @@ static HRESULT WINAPI ComponentFactory_CreateQueryReaderFromBlockReader(IWICComponentFactory *iface, IWICMetadataBlockReader *block_reader, IWICMetadataQueryReader **query_reader) { - FIXME("%p,%p,%p: stub\n", iface, block_reader, query_reader); - return E_NOTIMPL; + TRACE("%p,%p,%p\n", iface, block_reader, query_reader); + + if (!block_reader || !query_reader) + return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(block_reader, query_reader); } static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComponentFactory *iface, @@ -1156,3 +1184,50 @@ return ret; } + +HRESULT WINAPI WICCreateBitmapFromSectionEx(UINT width, UINT height, + REFWICPixelFormatGUID format, HANDLE section, UINT stride, + UINT offset, WICSectionAccessLevel wicaccess, IWICBitmap **bitmap) +{ + DWORD access; + void *buffer; + HRESULT hr; + + TRACE("%u,%u,%s,%p,%u,%#x,%#x,%p\n", width, height, debugstr_guid(format), + section, stride, offset, wicaccess, bitmap); + + if (!width || !height || !section || !bitmap) return E_INVALIDARG; + + switch (wicaccess) + { + case WICSectionAccessLevelReadWrite: + access = FILE_MAP_READ | FILE_MAP_WRITE; + break; + + case WICSectionAccessLevelRead: + access = FILE_MAP_READ; + break; + + default: + FIXME("unsupported access %#x\n", wicaccess); + return E_INVALIDARG; + } + + buffer = MapViewOfFile(section, access, 0, offset, 0); + if (!buffer) return HRESULT_FROM_WIN32(GetLastError()); + + hr = BitmapImpl_Create(width, height, stride, 0, buffer, format, WICBitmapCacheOnLoad, bitmap); + if (FAILED(hr)) UnmapViewOfFile(buffer); + return hr; +} + +HRESULT WINAPI WICCreateBitmapFromSection(UINT width, UINT height, + REFWICPixelFormatGUID format, HANDLE section, + UINT stride, UINT offset, IWICBitmap **bitmap) +{ + TRACE("%u,%u,%s,%p,%u,%u,%p\n", width, height, debugstr_guid(format), + section, stride, offset, bitmap); + + return WICCreateBitmapFromSectionEx(width, height, format, section, + stride, offset, WICSectionAccessLevelRead, bitmap); +} Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -121,6 +121,7 @@ typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; BOOL initialized; BOOL cinfo_initialized; @@ -146,6 +147,11 @@ static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) { return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); +} + +static inline JpegDecoder *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, JpegDecoder, IWICMetadataBlockReader_iface); } static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, @@ -664,8 +670,14 @@ static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) + return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); } static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, @@ -696,6 +708,73 @@ JpegDecoder_Frame_GetThumbnail }; +static HRESULT WINAPI JpegDecoder_Block_QueryInterface(IWICMetadataBlockReader *iface, REFIID iid, + void **ppv) +{ + JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); +} + +static ULONG WINAPI JpegDecoder_Block_AddRef(IWICMetadataBlockReader *iface) +{ + JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); +} + +static ULONG WINAPI JpegDecoder_Block_Release(IWICMetadataBlockReader *iface) +{ + JpegDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); +} + +static HRESULT WINAPI JpegDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *pguidContainerFormat) +{ + TRACE("%p,%p\n", iface, pguidContainerFormat); + + if (!pguidContainerFormat) return E_INVALIDARG; + + memcpy(pguidContainerFormat, &GUID_ContainerFormatJpeg, sizeof(GUID)); + + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *pcCount) +{ + FIXME("%p,%p\n", iface, pcCount); + + if (!pcCount) return E_INVALIDARG; + + *pcCount = 0; + + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, + UINT nIndex, IWICMetadataReader **ppIMetadataReader) +{ + FIXME("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); + return E_INVALIDARG; +} + +static HRESULT WINAPI JpegDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **ppIEnumMetadata) +{ + FIXME("%p,%p\n", iface, ppIEnumMetadata); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl JpegDecoder_Block_Vtbl = { + JpegDecoder_Block_QueryInterface, + JpegDecoder_Block_AddRef, + JpegDecoder_Block_Release, + JpegDecoder_Block_GetContainerFormat, + JpegDecoder_Block_GetCount, + JpegDecoder_Block_GetReaderByIndex, + JpegDecoder_Block_GetEnumerator, +}; + HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) { JpegDecoder *This; @@ -716,6 +795,7 @@ This->IWICBitmapDecoder_iface.lpVtbl = &JpegDecoder_Vtbl; This->IWICBitmapFrameDecode_iface.lpVtbl = &JpegDecoder_Frame_Vtbl; + This->IWICMetadataBlockReader_iface.lpVtbl = &JpegDecoder_Block_Vtbl; This->ref = 1; This->initialized = FALSE; This->cinfo_initialized = FALSE; Added: trunk/reactos/dll/win32/windowscodecs/metadataquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/metadataquery.c (added) +++ trunk/reactos/dll/win32/windowscodecs/metadataquery.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -0,0 +1,136 @@ +/* + * Copyright 2016 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wincodecs_private.h" + +typedef struct { + IWICMetadataQueryReader IWICMetadataQueryReader_iface; + + LONG ref; + + IWICMetadataBlockReader *block; +} QueryReader; + +static inline QueryReader *impl_from_IWICMetadataQueryReader(IWICMetadataQueryReader *iface) +{ + return CONTAINING_RECORD(iface, QueryReader, IWICMetadataQueryReader_iface); +} + +static HRESULT WINAPI mqr_QueryInterface(IWICMetadataQueryReader *iface, REFIID riid, + void **ppvObject) +{ + QueryReader *This = impl_from_IWICMetadataQueryReader(iface); + + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IWICMetadataQueryReader)) + *ppvObject = &This->IWICMetadataQueryReader_iface; + else + *ppvObject = NULL; + + if (*ppvObject) + { + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI mqr_AddRef(IWICMetadataQueryReader *iface) +{ + QueryReader *This = impl_from_IWICMetadataQueryReader(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) refcount=%u\n", This, ref); + return ref; +} + +static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) +{ + QueryReader *This = impl_from_IWICMetadataQueryReader(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) refcount=%u\n", This, ref); + if (!ref) + { + IWICMetadataBlockReader_Release(This->block); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, + GUID *pguidContainerFormat) +{ + QueryReader *This = impl_from_IWICMetadataQueryReader(iface); + FIXME("(%p,%p)\n", This, pguidContainerFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, + UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength) +{ + QueryReader *This = impl_from_IWICMetadataQueryReader(iface); + FIXME("(%p,%u,%p,%p)\n", This, cchMaxLength, wzNamespace, pcchActualLength); + return E_NOTIMPL; +} + +static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, + LPCWSTR wzName, PROPVARIANT *pvarValue) +{ + QueryReader *This = impl_from_IWICMetadataQueryReader(iface); + FIXME("(%p,%s,%p)\n", This, wine_dbgstr_w(wzName), pvarValue); + return E_NOTIMPL; +} + +static HRESULT WINAPI mqr_GetEnumerator(IWICMetadataQueryReader *iface, + IEnumString **ppIEnumString) +{ + QueryReader *This = impl_from_IWICMetadataQueryReader(iface); + FIXME("(%p,%p)\n", This, ppIEnumString); + return E_NOTIMPL; +} + +static IWICMetadataQueryReaderVtbl mqr_vtbl = { + mqr_QueryInterface, + mqr_AddRef, + mqr_Release, + mqr_GetContainerFormat, + mqr_GetLocation, + mqr_GetMetadataByName, + mqr_GetEnumerator +}; + +HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) +{ + QueryReader *obj; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + if (!obj) + return E_OUTOFMEMORY; + + obj->IWICMetadataQueryReader_iface.lpVtbl = &mqr_vtbl; + obj->ref = 1; + + IWICMetadataBlockReader_AddRef(mbr); + obj->block = mbr; + + *out = &obj->IWICMetadataQueryReader_iface; + + return S_OK; +} Propchange: trunk/reactos/dll/win32/windowscodecs/metadataquery.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ms… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c (added) +++ trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -0,0 +1,16 @@ +#include "wincodecs_private.h" + +#define DEFINE_THISCALL_WRAPPER(func,args) \ + typedef struct {int x[args/4];} _tag_##func; \ + void __stdcall func(_tag_##func p1); \ + __declspec(naked) void __stdcall __thiscall_##func(_tag_##func p1) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } + +DEFINE_THISCALL_WRAPPER(IMILUnknown1Impl_unknown1, 8) +DEFINE_THISCALL_WRAPPER(IMILUnknown1Impl_unknown3, 8) +DEFINE_THISCALL_WRAPPER(IMILUnknown1Impl_unknown8, 4) Propchange: trunk/reactos/dll/win32/windowscodecs/msvc-thiscall.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/windowscodecs/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ms… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/msvc.h (added) +++ trunk/reactos/dll/win32/windowscodecs/msvc.h [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -0,0 +1,18 @@ + +#define __ASM_STDCALL_FUNC(name,args,code) + +#define typeof(X_) __typeof_ ## X_ + +struct IMILUnknown1; + +#define WINAPI __stdcall +#define HRESULT int +#define IMILUnknown1 struct IMILUnknown1 + +typedef void (WINAPI typeof(IMILUnknown1Impl_unknown1))(IMILUnknown1 *iface, void *arg); +typedef HRESULT (WINAPI typeof(IMILUnknown1Impl_unknown3))(IMILUnknown1 *iface, void *arg); +typedef HRESULT (WINAPI typeof(IMILUnknown1Impl_unknown8))(IMILUnknown1 *iface); + +#undef WINAPI +#undef HRESULT +#undef IMILUnknown1 Propchange: trunk/reactos/dll/win32/windowscodecs/msvc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -515,7 +515,7 @@ } This->end_info = ppng_create_info_struct(This->png_ptr); - if (!This->info_ptr) + if (!This->end_info) { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); This->png_ptr = NULL; @@ -647,7 +647,7 @@ /* read the image data */ This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); - This->stride = This->width * This->bpp; + This->stride = (This->width * This->bpp + 7) / 8; image_size = This->stride * This->height; This->image_bits = HeapAlloc(GetProcessHeap(), 0, image_size); @@ -1001,8 +1001,14 @@ static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) + return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); } static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -1435,6 +1435,7 @@ &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, + &GUID_WICPixelFormat32bppGrayFloat, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat32bppCMYK, Modified: trunk/reactos/dll/win32/windowscodecs/scaler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/sc… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -21,6 +21,7 @@ typedef struct BitmapScaler { IWICBitmapScaler IWICBitmapScaler_iface; LONG ref; + IMILBitmapScaler IMILBitmapScaler_iface; IWICBitmapSource *source; UINT width, height; UINT src_width, src_height; @@ -36,6 +37,11 @@ return CONTAINING_RECORD(iface, BitmapScaler, IWICBitmapScaler_iface); } +static inline BitmapScaler *impl_from_IMILBitmapScaler(IMILBitmapScaler *iface) +{ + return CONTAINING_RECORD(iface, BitmapScaler, IMILBitmapScaler_iface); +} + static HRESULT WINAPI BitmapScaler_QueryInterface(IWICBitmapScaler *iface, REFIID iid, void **ppv) { @@ -50,8 +56,13 @@ { *ppv = &This->IWICBitmapScaler_iface; } + else if (IsEqualIID(&IID_IMILBitmapScaler, iid)) + { + *ppv = &This->IMILBitmapScaler_iface; + } else { + FIXME("unknown interface %s\n", debugstr_guid(iid)); *ppv = NULL; return E_NOINTERFACE; } @@ -360,6 +371,163 @@ BitmapScaler_Initialize }; +static HRESULT WINAPI IMILBitmapScaler_QueryInterface(IMILBitmapScaler *iface, REFIID iid, + void **ppv) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IMILBitmapScaler, iid) || + IsEqualIID(&IID_IMILBitmapSource, iid)) + { + IUnknown_AddRef(&This->IMILBitmapScaler_iface); + *ppv = &This->IMILBitmapScaler_iface; + return S_OK; + } + else if (IsEqualIID(&IID_IWICBitmapScaler, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid)) + { + IUnknown_AddRef(&This->IWICBitmapScaler_iface); + *ppv = &This->IWICBitmapScaler_iface; + return S_OK; + } + + FIXME("unknown interface %s\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI IMILBitmapScaler_AddRef(IMILBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + return IWICBitmapScaler_AddRef(&This->IWICBitmapScaler_iface); +} + +static ULONG WINAPI IMILBitmapScaler_Release(IMILBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + return IWICBitmapScaler_Release(&This->IWICBitmapScaler_iface); +} + +static HRESULT WINAPI IMILBitmapScaler_GetSize(IMILBitmapScaler *iface, + UINT *width, UINT *height) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p,%p)\n", iface, width, height); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_GetSize(&This->IWICBitmapScaler_iface, width, height); +} + +static HRESULT WINAPI IMILBitmapScaler_GetPixelFormat(IMILBitmapScaler *iface, + int *format) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + IMILBitmapSource *source; + HRESULT hr; + + TRACE("(%p,%p)\n", iface, format); + + if (!format) return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + hr = IWICBitmapSource_QueryInterface(This->source, &IID_IMILBitmapSource, (void **)&source); + if (hr == S_OK) + { + hr = source->lpVtbl->GetPixelFormat(source, format); + source->lpVtbl->Release(source); + } + return hr; +} + +static HRESULT WINAPI IMILBitmapScaler_GetResolution(IMILBitmapScaler *iface, + double *dpix, double *dpiy) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p,%p)\n", iface, dpix, dpiy); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_GetResolution(&This->IWICBitmapScaler_iface, dpix, dpiy); +} + +static HRESULT WINAPI IMILBitmapScaler_CopyPalette(IMILBitmapScaler *iface, + IWICPalette *palette) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_CopyPalette(&This->IWICBitmapScaler_iface, palette); +} + +static HRESULT WINAPI IMILBitmapScaler_CopyPixels(IMILBitmapScaler *iface, + const WICRect *rc, UINT stride, UINT size, BYTE *buffer) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + + TRACE("(%p,%p,%u,%u,%p)\n", iface, rc, stride, size, buffer); + + if (!This->source) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICBitmapScaler_CopyPixels(&This->IWICBitmapScaler_iface, rc, stride, size, buffer); +} + +static HRESULT WINAPI IMILBitmapScaler_unknown1(IMILBitmapScaler *iface, void **ppv) +{ + TRACE("(%p,%p)\n", iface, ppv); + return E_NOINTERFACE; +} + +static HRESULT WINAPI IMILBitmapScaler_Initialize(IMILBitmapScaler *iface, + IMILBitmapSource *mil_source, UINT width, UINT height, + WICBitmapInterpolationMode mode) +{ + BitmapScaler *This = impl_from_IMILBitmapScaler(iface); + IWICBitmapSource *wic_source; + HRESULT hr; + + TRACE("(%p,%p,%u,%u,%u)\n", iface, mil_source, width, height, mode); + + if (!mil_source) return E_INVALIDARG; + + hr = mil_source->lpVtbl->QueryInterface(mil_source, &IID_IWICBitmapSource, (void **)&wic_source); + if (hr == S_OK) + { + hr = IWICBitmapScaler_Initialize(&This->IWICBitmapScaler_iface, wic_source, width, height, mode); + IWICBitmapSource_Release(wic_source); + } + return hr; +} + +static const IMILBitmapScalerVtbl IMILBitmapScaler_Vtbl = { + IMILBitmapScaler_QueryInterface, + IMILBitmapScaler_AddRef, + IMILBitmapScaler_Release, + IMILBitmapScaler_GetSize, + IMILBitmapScaler_GetPixelFormat, + IMILBitmapScaler_GetResolution, + IMILBitmapScaler_CopyPalette, + IMILBitmapScaler_CopyPixels, + IMILBitmapScaler_unknown1, + IMILBitmapScaler_Initialize +}; + HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) { BitmapScaler *This; @@ -368,6 +536,7 @@ if (!This) return E_OUTOFMEMORY; This->IWICBitmapScaler_iface.lpVtbl = &BitmapScaler_Vtbl; + This->IMILBitmapScaler_iface.lpVtbl = &IMILBitmapScaler_Vtbl; This->ref = 1; This->source = NULL; This->width = 0; Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -1150,8 +1150,14 @@ static HRESULT WINAPI TiffFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TiffFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) + return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); } static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -38,6 +38,7 @@ #include <winreg.h> #include <objbase.h> #include <oleauto.h> +#include <wincodec.h> #include <wincodecsdk.h> #include <wine/debug.h> @@ -54,7 +55,13 @@ DEFINE_GUID(GUID_VendorWine, 0xddf46da1,0x7dc1,0x404e,0x98,0xf2,0xef,0xa4,0x8d,0xfc,0x95,0x0a); +DEFINE_GUID(IID_IMILBitmap,0xb1784d3f,0x8115,0x4763,0x13,0xaa,0x32,0xed,0xdb,0x68,0x29,0x4a); DEFINE_GUID(IID_IMILBitmapSource,0x7543696a,0xbc8d,0x46b0,0x5f,0x81,0x8d,0x95,0x72,0x89,0x72,0xbe); +DEFINE_GUID(IID_IMILBitmapLock,0xa67b2b53,0x8fa1,0x4155,0x8f,0x64,0x0c,0x24,0x7a,0x8f,0x84,0xcd); +DEFINE_GUID(IID_IMILBitmapScaler,0xa767b0f0,0x1c8c,0x4aef,0x56,0x8f,0xad,0xf9,0x6d,0xcf,0xd5,0xcb); +DEFINE_GUID(IID_IMILFormatConverter,0x7e2a746f,0x25c5,0x4851,0xb3,0xaf,0x44,0x3b,0x79,0x63,0x9e,0xc0); +DEFINE_GUID(IID_IMILPalette,0xca8e206f,0xf22c,0x4af7,0x6f,0xba,0x7b,0xed,0x5e,0xb1,0xc9,0x2f); + #define INTERFACE IMILBitmapSource DECLARE_INTERFACE_(IMILBitmapSource,IUnknown) { @@ -62,15 +69,57 @@ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IWICBitmapSource methods ***/ + STDMETHOD_(HRESULT,GetSize)(THIS_ UINT *,UINT *) PURE; + STDMETHOD_(HRESULT,GetPixelFormat)(THIS_ int *) PURE; + STDMETHOD_(HRESULT,GetResolution)(THIS_ double *,double *) PURE; + STDMETHOD_(HRESULT,CopyPalette)(THIS_ IWICPalette *) PURE; + STDMETHOD_(HRESULT,CopyPixels)(THIS_ const WICRect *,UINT,UINT,BYTE *) PURE; /*** IMILBitmapSource methods ***/ - STDMETHOD_(HRESULT,GetSize)(THIS_ UINT *,UINT *); - STDMETHOD_(HRESULT,GetPixelFormat)(THIS_ int *); - STDMETHOD_(HRESULT,GetResolution)(THIS_ double *,double *); - STDMETHOD_(HRESULT,CopyPalette)(THIS_ IWICPalette *); - STDMETHOD_(HRESULT,CopyPixels)(THIS_ const WICRect *,UINT,UINT,BYTE *); - STDMETHOD_(HRESULT,UnknownMethod1)(THIS_ void **); -}; -#undef INTERFACE + STDMETHOD_(HRESULT,unknown1)(THIS_ void **) PURE; + STDMETHOD_(HRESULT,Lock)(THIS_ const WICRect *,DWORD,IWICBitmapLock **) PURE; + STDMETHOD_(HRESULT,Unlock)(THIS_ IWICBitmapLock *) PURE; + STDMETHOD_(HRESULT,SetPalette)(THIS_ IWICPalette *) PURE; + STDMETHOD_(HRESULT,SetResolution)(THIS_ double,double) PURE; + STDMETHOD_(HRESULT,AddDirtyRect)(THIS_ const WICRect *) PURE; +}; +#undef INTERFACE + +#define INTERFACE IMILBitmapScaler +DECLARE_INTERFACE_(IMILBitmapScaler,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IWICBitmapSource methods ***/ + STDMETHOD_(HRESULT,GetSize)(THIS_ UINT *,UINT *) PURE; + STDMETHOD_(HRESULT,GetPixelFormat)(THIS_ int *) PURE; + STDMETHOD_(HRESULT,GetResolution)(THIS_ double *,double *) PURE; + STDMETHOD_(HRESULT,CopyPalette)(THIS_ IWICPalette *) PURE; + STDMETHOD_(HRESULT,CopyPixels)(THIS_ const WICRect *,UINT,UINT,BYTE *) PURE; + /*** IMILBitmapScaler methods ***/ + STDMETHOD_(HRESULT,unknown1)(THIS_ void **) PURE; + STDMETHOD_(HRESULT,Initialize)(THIS_ IMILBitmapSource *,UINT,UINT,WICBitmapInterpolationMode); +}; +#undef INTERFACE + +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern typeof(func) THISCALL(func); \ + __ASM_STDCALL_FUNC(__thiscall_ ## func, args, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#else /* __i386__ */ + +#define THISCALL(func) func +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#endif /* __i386__ */ #define INTERFACE IMILUnknown1 DECLARE_INTERFACE_(IMILUnknown1,IUnknown) @@ -79,6 +128,19 @@ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** thiscall method ***/ + STDMETHOD_(void,unknown1)(THIS_ void*) PURE; + /*** stdcall ***/ + STDMETHOD_(HRESULT,unknown2)(THIS_ void*, void*) PURE; + /*** thiscall method ***/ + STDMETHOD_(HRESULT,unknown3)(THIS_ void*) PURE; + /*** stdcall ***/ + STDMETHOD_(HRESULT,unknown4)(THIS_ void*) PURE; + STDMETHOD_(HRESULT,unknown5)(THIS_ void*) PURE; + STDMETHOD_(HRESULT,unknown6)(THIS_ DWORD64) PURE; + STDMETHOD_(HRESULT,unknown7)(THIS_ void*) PURE; + /*** thiscall method ***/ + STDMETHOD_(HRESULT,unknown8)(THIS) PURE; }; #undef INTERFACE @@ -90,7 +152,9 @@ STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** unknown methods ***/ - STDMETHOD_(HRESULT,UnknownMethod1)(THIS_ void *, void *) PURE; + STDMETHOD_(HRESULT,unknown1)(THIS_ void *,void **) PURE; + STDMETHOD_(HRESULT,unknown2)(THIS_ void *,void *) PURE; + STDMETHOD_(HRESULT,unknown3)(THIS_ void *) PURE; }; #undef INTERFACE @@ -186,6 +250,8 @@ extern HRESULT APEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) DECLSPEC_HIDDEN; + extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */ Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/windowscodecs.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/windowscodecs.spec [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -105,7 +105,8 @@ @ stdcall IWICStream_InitializeFromIStream_Proxy(ptr ptr) IWICStream_InitializeFromIStream_Proxy_W @ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) -@ stub WICCreateBitmapFromSection +@ stdcall WICCreateBitmapFromSection(long long ptr long long long ptr) +@ stdcall WICCreateBitmapFromSectionEx(long long ptr long long long long ptr) @ stdcall WICCreateColorContext_Proxy(ptr ptr) @ stdcall WICCreateImagingFactory_Proxy(long ptr) @ stub WICGetMetadataContentSize Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 15:28:24 2016 @@ -200,7 +200,7 @@ reactos/dll/win32/vssapi # Synced to WineStaging-1.9.4 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4 reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.11 -reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.4 +reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.11 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.4 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.4 reactos/dll/win32/wing32 # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71753: [DEVENUM] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 15:24:22 2016 New Revision: 71753 URL: http://svn.reactos.org/svn/reactos?rev=71753&view=rev Log: [DEVENUM] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] Sat Jul 2 15:24:22 2016 @@ -97,6 +97,8 @@ TRACE("\n"); res = __wine_register_resources( DEVENUM_hInstance ); + if (FAILED(res)) + return res; #ifdef __REACTOS__ /* Quartz is needed for IFilterMapper2 */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 15:24:22 2016 @@ -29,7 +29,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.4

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs