January 2011 - Wine-Commits

Michael Stefaniuc : mstask: COM cleanup for the ITaskTrigger iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 73b6d21ab68d63eed8e207ed8261a09c752e2859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b6d21ab68d63eed8e207ed8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:11:57 2011 +0100 mstask: COM cleanup for the ITaskTrigger iface. --- dlls/mstask/mstask_private.h | 6 ------ dlls/mstask/task_trigger.c | 28 ++++++++++++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index a5f7d90..d159b8e 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -34,12 +34,6 @@ extern LONG dll_ref; typedef struct ClassFactoryImpl ClassFactoryImpl; extern ClassFactoryImpl MSTASK_ClassFactory; -typedef struct -{ - const ITaskTriggerVtbl *lpVtbl; - LONG ref; - TASK_TRIGGER triggerCond; -} TaskTriggerImpl; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj); typedef struct diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 3823ee7..307a605 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -23,12 +23,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +typedef struct +{ + ITaskTrigger ITaskTrigger_iface; + LONG ref; + TASK_TRIGGER triggerCond; +} TaskTriggerImpl; + +static inline TaskTriggerImpl *impl_from_ITaskTrigger(ITaskTrigger *iface) +{ + return CONTAINING_RECORD(iface, TaskTriggerImpl, ITaskTrigger_iface); +} + static HRESULT WINAPI MSTASK_ITaskTrigger_QueryInterface( ITaskTrigger* iface, REFIID riid, void **ppvObject) { - TaskTriggerImpl *This = (TaskTriggerImpl *)iface; + TaskTriggerImpl *This = impl_from_ITaskTrigger(iface); TRACE("IID: %s\n", debugstr_guid(riid)); if (ppvObject == NULL) @@ -37,7 +49,7 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ITaskTrigger)) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->ITaskTrigger_iface; ITaskTrigger_AddRef(iface); return S_OK; } @@ -50,7 +62,7 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_QueryInterface( static ULONG WINAPI MSTASK_ITaskTrigger_AddRef( ITaskTrigger* iface) { - TaskTriggerImpl *This = (TaskTriggerImpl *)iface; + TaskTriggerImpl *This = impl_from_ITaskTrigger(iface); ULONG ref; TRACE("\n"); ref = InterlockedIncrement(&This->ref); @@ -60,7 +72,7 @@ static ULONG WINAPI MSTASK_ITaskTrigger_AddRef( static ULONG WINAPI MSTASK_ITaskTrigger_Release( ITaskTrigger* iface) { - TaskTriggerImpl *This = (TaskTriggerImpl *)iface; + TaskTriggerImpl *This = impl_from_ITaskTrigger(iface); ULONG ref; TRACE("\n"); ref = InterlockedDecrement(&This->ref); @@ -76,7 +88,7 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( ITaskTrigger* iface, const PTASK_TRIGGER pTrigger) { - TaskTriggerImpl * This = (TaskTriggerImpl *)iface; + TaskTriggerImpl * This = impl_from_ITaskTrigger(iface); TIME_FIELDS field_time; LARGE_INTEGER sys_time; TASK_TRIGGER tmp_trigger_cond; @@ -187,7 +199,7 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger( ITaskTrigger* iface, PTASK_TRIGGER pTrigger) { - TaskTriggerImpl * This = (TaskTriggerImpl *)iface; + TaskTriggerImpl * This = impl_from_ITaskTrigger(iface); TRACE("(%p, %p)\n", iface, pTrigger); @@ -274,7 +286,7 @@ HRESULT TaskTriggerConstructor(LPVOID *ppObj) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MSTASK_ITaskTriggerVtbl; + This->ITaskTrigger_iface.lpVtbl = &MSTASK_ITaskTriggerVtbl; This->ref = 1; /* Most fields of triggerCond default to zero. Initialize other @@ -291,7 +303,7 @@ HRESULT TaskTriggerConstructor(LPVOID *ppObj) This->triggerCond.TriggerType = TASK_TIME_TRIGGER_DAILY, This->triggerCond.Type.Daily.DaysInterval = 1; - *ppObj = &This->lpVtbl; + *ppObj = &This->ITaskTrigger_iface; InterlockedIncrement(&dll_ref); return S_OK; }

1 0

Michael Stefaniuc : avifil32: Use ifaces instead of vtbl pointers in IAVIEditStreamImpl.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 2a14c4e84602ee87490d9c3ced996143bd082a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a14c4e84602ee87490d9c3ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:04:36 2011 +0100 avifil32: Use ifaces instead of vtbl pointers in IAVIEditStreamImpl. --- dlls/avifil32/editstream.c | 66 +++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index a175b38..edabb09 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -122,11 +122,10 @@ static const struct IAVIStreamVtbl ieditstast = { typedef struct _IAVIEditStreamImpl IAVIEditStreamImpl; struct _IAVIEditStreamImpl { - /* IUnknown stuff */ - const IAVIEditStreamVtbl *lpVtbl; - const IAVIStreamVtbl *lpVtblAVIStream; + IAVIEditStream IAVIEditStream_iface; + IAVIStream IAVIStream_iface; - LONG ref; + LONG ref; AVISTREAMINFOW sInfo; @@ -140,14 +139,14 @@ struct _IAVIEditStreamImpl { LPBITMAPINFOHEADER lpFrame; /* frame of pCurStream */ }; -static inline IAVIEditStreamImpl *impl_from_IAVIStream( IAVIStream *iface ) +static inline IAVIEditStreamImpl *impl_from_IAVIEditStream(IAVIEditStream *iface) { - return (IAVIEditStreamImpl *)((char*)iface - FIELD_OFFSET(IAVIEditStreamImpl, lpVtblAVIStream)); + return CONTAINING_RECORD(iface, IAVIEditStreamImpl, IAVIEditStream_iface); } -static inline IAVIStream *IAVIStream_from_impl( IAVIEditStreamImpl *impl ) +static inline IAVIEditStreamImpl *impl_from_IAVIStream(IAVIStream *iface) { - return (IAVIStream *)&impl->lpVtblAVIStream; + return CONTAINING_RECORD(iface, IAVIEditStreamImpl, IAVIStream_iface); } /***********************************************************************/ @@ -160,11 +159,11 @@ PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) if (pedit == NULL) return NULL; - pedit->lpVtbl = &ieditstream; - pedit->lpVtblAVIStream = &ieditstast; + pedit->IAVIEditStream_iface.lpVtbl = &ieditstream; + pedit->IAVIStream_iface.lpVtbl = &ieditstast; pedit->ref = 1; - IAVIStream_Create( IAVIStream_from_impl( pedit ),(LPARAM)pstream,0); + IAVIStream_Create(&pedit->IAVIStream_iface, (LPARAM)pstream, 0); return (PAVIEDITSTREAM)pedit; } @@ -316,7 +315,7 @@ static BOOL AVIFILE_FormatsEqual(PAVISTREAM avi1, PAVISTREAM avi2) static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFIID refiid,LPVOID *obj) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); @@ -328,7 +327,7 @@ static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFII return S_OK; } else if (IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = IAVIStream_from_impl( This ); + *obj = &This->IAVIStream_iface; IAVIEditStream_AddRef(iface); return S_OK; @@ -339,7 +338,7 @@ static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFII static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -349,7 +348,7 @@ static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface) static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); DWORD i; ULONG ref = InterlockedDecrement(&This->ref); @@ -376,7 +375,7 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart, LONG*plLength,PAVISTREAM*ppResult) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); PAVISTREAM stream; DWORD start, len, streamPos, streamNr; HRESULT hr; @@ -460,7 +459,7 @@ static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart, static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart, LONG*plLength,PAVISTREAM*ppResult) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); IAVIEditStreamImpl* pEdit; HRESULT hr; LONG start = 0; @@ -490,14 +489,13 @@ static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart, if (pEdit == NULL) return AVIERR_MEMORY; - hr = IAVIEditStream_Paste((PAVIEDITSTREAM)pEdit,&start,plLength, - IAVIStream_from_impl( This ),*plStart, - *plStart + *plLength); + hr = IAVIEditStream_Paste((PAVIEDITSTREAM)pEdit, &start, plLength, &This->IAVIStream_iface, + *plStart, *plStart + *plLength); *plStart = start; if (FAILED(hr)) IAVIEditStream_Release((PAVIEDITSTREAM)pEdit); else - *ppResult = IAVIStream_from_impl( This ); + *ppResult = &This->IAVIStream_iface; return hr; } @@ -506,7 +504,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, LONG*plLength,PAVISTREAM pSource, LONG lStart,LONG lLength) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); AVISTREAMINFOW srcInfo; IAVIEditStreamImpl *pEdit = NULL; PAVISTREAM pStream; @@ -552,7 +550,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, if (size != This->sInfo.rcFrame.bottom - This->sInfo.rcFrame.top) return AVIERR_UNSUPPORTED; /* FIXME: Can't GetFrame convert it? */ } else if (srcInfo.fccType == streamtypeAUDIO) { - if (! AVIFILE_FormatsEqual(IAVIStream_from_impl( This ), pSource)) + if (!AVIFILE_FormatsEqual(&This->IAVIStream_iface, pSource)) return AVIERR_UNSUPPORTED; } else { /* FIXME: streamtypeMIDI and streamtypeTEXT */ @@ -561,7 +559,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, /* try to get an IEditStreamInternal interface */ if (SUCCEEDED(IAVIStream_QueryInterface(pSource, &IID_IEditStreamInternal, (LPVOID*)&pEdit))) - IAVIEditStream_Release( (IAVIEditStream *)pEdit ); /* pSource holds a reference */ + IAVIEditStream_Release(&pEdit->IAVIEditStream_iface); /* pSource holds a reference */ /* for video must check for change of format */ if (This->sInfo.fccType == streamtypeVIDEO) { @@ -574,8 +572,8 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, */ if ((pEdit != NULL && pEdit->bDecompress) || AVIStreamNearestKeyFrame(pSource, lStart) != lStart || - AVIStreamNearestKeyFrame(IAVIStream_from_impl( This ), *plStart) != *plStart || - (This->nStreams > 0 && !AVIFILE_FormatsEqual(IAVIStream_from_impl( This ), pSource))) { + AVIStreamNearestKeyFrame(&This->IAVIStream_iface, *plStart) != *plStart || + (This->nStreams > 0 && !AVIFILE_FormatsEqual(&This->IAVIStream_iface, pSource))) { /* Use first stream part to get format to convert everything to */ AVIFILE_ReadFrame(This, This->pStreams[0].pStream, This->pStreams[0].dwStart); @@ -693,7 +691,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, PAVISTREAM*ppResult) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); IAVIEditStreamImpl* pEdit; DWORD i; @@ -722,7 +720,7 @@ static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, IAVIStream_AddRef(pEdit->pStreams[i].pStream); } - *ppResult = IAVIStream_from_impl( This ); + *ppResult = &This->IAVIStream_iface; return AVIERR_OK; } @@ -730,7 +728,7 @@ static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, LPAVISTREAMINFOW asi,LONG size) { - IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface; + IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); TRACE("(%p,%p,%d)\n",iface,asi,size); @@ -755,19 +753,19 @@ static HRESULT WINAPI IEditAVIStream_fnQueryInterface(IAVIStream*iface, REFIID refiid,LPVOID*obj) { IAVIEditStreamImpl *This = impl_from_IAVIStream( iface ); - return IAVIEditStream_QueryInterface((IAVIEditStream *)This,refiid,obj); + return IAVIEditStream_QueryInterface(&This->IAVIEditStream_iface,refiid,obj); } static ULONG WINAPI IEditAVIStream_fnAddRef(IAVIStream*iface) { IAVIEditStreamImpl *This = impl_from_IAVIStream( iface ); - return IAVIEditStream_AddRef((IAVIEditStream*)This); + return IAVIEditStream_AddRef(&This->IAVIEditStream_iface); } static ULONG WINAPI IEditAVIStream_fnRelease(IAVIStream*iface) { IAVIEditStreamImpl *This = impl_from_IAVIStream( iface ); - return IAVIEditStream_Release((IAVIEditStream*)This); + return IAVIEditStream_Release(&This->IAVIEditStream_iface); } static HRESULT WINAPI IEditAVIStream_fnCreate(IAVIStream*iface, @@ -1021,7 +1019,7 @@ static HRESULT WINAPI IEditAVIStream_fnDelete(IAVIStream*iface,LONG start, TRACE("(%p,%d,%d)\n",iface,start,samples); - return IAVIEditStream_Cut((IAVIEditStream*)This,&start,&samples,NULL); + return IAVIEditStream_Cut(&This->IAVIEditStream_iface,&start,&samples,NULL); } static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc, @@ -1063,5 +1061,5 @@ static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface, TRACE("(%p,%p,%d)\n",iface,info,len); - return IAVIEditStream_SetInfo((IAVIEditStream*)This,info,len); + return IAVIEditStream_SetInfo(&This->IAVIEditStream_iface,info,len); }

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3D8 iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 6ad10335a00bbf2b7518ebc2101085f91a318bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad10335a00bbf2b7518ebc21… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:49:42 2011 +0100 d3d8: COM cleanup for the IDirect3D8 iface. --- dlls/d3d8/d3d8_main.c | 6 +- dlls/d3d8/d3d8_private.h | 7 +-- dlls/d3d8/directx.c | 100 +++++++++++++++++++++++++++------------------ 3 files changed, 66 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad10335a00bbf2b7518e…

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDraw4 iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 3a95fe8476fc7e00de36aeef4cbcb09a1e104cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a95fe8476fc7e00de36aeef4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:48:10 2011 +0100 ddrawex: COM cleanup for the IDirectDraw4 iface. --- dlls/ddrawex/ddraw.c | 139 +++++++++++++++++++++------------------- dlls/ddrawex/ddrawex_private.h | 2 +- 2 files changed, 73 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a95fe8476fc7e00de36a…

1 0

Michael Stefaniuc : ddrawex: Rename impl_from_dd4() to impl_from_IDirectDraw4().
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: eb850bf5227e59c344e4dac2016c5e8a160d1297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb850bf5227e59c344e4dac20… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:44:35 2011 +0100 ddrawex: Rename impl_from_dd4() to impl_from_IDirectDraw4(). --- dlls/ddrawex/ddraw.c | 210 ++++++++++++++++++-------------------------------- 1 files changed, 75 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb850bf5227e59c344e4d…

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDraw3 iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 3f7a060c376057667f8f7c466cca68cc00f6f73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7a060c376057667f8f7c466… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:13:49 2011 +0100 ddrawex: COM cleanup for the IDirectDraw3 iface. --- dlls/ddrawex/ddraw.c | 224 +++++++++++++++------------------------- dlls/ddrawex/ddrawex_private.h | 2 +- 2 files changed, 83 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f7a060c376057667f8f7…

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDraw2 iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 9b77bdff545ab82cf8122eedf7ae98ff7dc38792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b77bdff545ab82cf8122eedf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:05:51 2011 +0100 ddrawex: COM cleanup for the IDirectDraw2 iface. --- dlls/ddrawex/ddraw.c | 192 ++++++++++++++-------------------------- dlls/ddrawex/ddrawex_private.h | 2 +- 2 files changed, 68 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b77bdff545ab82cf8122…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 68d5d33e5ef68f722dad90bccfcc819cd11a5ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d5d33e5ef68f722dad90bcc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:00:00 2011 +0100 ddraw: COM cleanup for the IClassFactory iface. --- dlls/ddraw/ddraw_private.h | 11 ---------- dlls/ddraw/main.c | 46 ++++++++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ca15817..56df02d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -439,17 +439,6 @@ struct IDirectDrawPaletteImpl HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN; -/****************************************************************************** - * DirectDraw ClassFactory implementation - incomplete - ******************************************************************************/ -typedef struct -{ - const IClassFactoryVtbl *lpVtbl; - - LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); -} IClassFactoryImpl; - /* Helper structures */ struct object_creation_info { diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 189729f..89a8680 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -528,6 +528,23 @@ static const struct object_creation_info object_creation[] = { &CLSID_DirectDrawClipper, CF_CreateDirectDrawClipper } }; + +/****************************************************************************** + * DirectDraw ClassFactory implementation + ******************************************************************************/ +typedef struct +{ + IClassFactory IClassFactory_iface; + + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + /******************************************************************************* * IDirectDrawClassFactory::QueryInterface * @@ -542,12 +559,10 @@ static const struct object_creation_info object_creation[] = * Failure: E_NOINTERFACE * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, - REFIID riid, - void **obj) +static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, + void **obj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); @@ -572,10 +587,9 @@ IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, * The new refcount * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) +static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", This, ref); @@ -593,10 +607,9 @@ IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) * The new refcount * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) +static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -620,13 +633,10 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) * ??? * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, - IUnknown *UnkOuter, - REFIID riid, - void **obj) +static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, + IUnknown *UnkOuter, REFIID riid, void **obj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("iface %p, outer_unknown %p, riid %s, object %p.\n", iface, UnkOuter, debugstr_guid(riid), obj); @@ -709,7 +719,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->lpVtbl = &IClassFactory_Vtbl; + factory->IClassFactory_iface.lpVtbl = &IClassFactory_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance;

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDraw iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 8003b4842143673266ffda18add64f40edb1a823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8003b4842143673266ffda18a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:04:56 2011 +0100 ddrawex: COM cleanup for the IDirectDraw iface. --- dlls/ddrawex/ddraw.c | 184 ++++++++++++++-------------------------- dlls/ddrawex/ddrawex_private.h | 2 +- 2 files changed, 66 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8003b4842143673266ffd…

1 0

Vitaliy Margolen : dinput: Combine ASCII and Unicode device create callbacks. Add tests.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 0ac5c60374208624c2993138bb7f57f9ed285a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac5c60374208624c2993138b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 23 12:44:20 2011 -0700 dinput: Combine ASCII and Unicode device create callbacks. Add tests. --- dlls/dinput/dinput_main.c | 8 ++-- dlls/dinput/dinput_private.h | 3 +- dlls/dinput/joystick_linux.c | 78 +++++++++++++------------------- dlls/dinput/joystick_linuxinput.c | 88 ++++++++++++++---------------------- dlls/dinput/joystick_osx.c | 82 +++++++++++++-------------------- dlls/dinput/keyboard.c | 91 ++++++++++++++++++------------------- dlls/dinput/mouse.c | 91 +++++++++++++++++------------------- dlls/dinput/tests/device.c | 33 +++++++++++--- 8 files changed, 218 insertions(+), 256 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ac5c60374208624c2993…

1 0