January 2011 - Wine-commits

Michael Stefaniuc : mstask: Use ifaces instead of vtbl pointers in TaskImpl .
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 591b59420dd25478c0d00aa44fd9609e37721888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=591b59420dd25478c0d00aa44… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:17:58 2011 +0100 mstask: Use ifaces instead of vtbl pointers in TaskImpl. --- dlls/mstask/mstask_private.h | 13 --------- dlls/mstask/task.c | 58 +++++++++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index ac965e2..28c579d 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -36,19 +36,6 @@ extern ClassFactoryImpl MSTASK_ClassFactory; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj); extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj); - -typedef struct -{ - const ITaskVtbl *lpVtbl; - const IPersistFileVtbl *persistVtbl; - LONG ref; - LPWSTR taskName; - LPWSTR applicationName; - LPWSTR parameters; - LPWSTR comment; - DWORD maxRunTime; - LPWSTR accountName; -} TaskImpl; extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 3815b19..97ae8b7 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -21,9 +21,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +typedef struct +{ + ITask ITask_iface; + IPersistFile IPersistFile_iface; + LONG ref; + LPWSTR taskName; + LPWSTR applicationName; + LPWSTR parameters; + LPWSTR comment; + DWORD maxRunTime; + LPWSTR accountName; +} TaskImpl; + +static inline TaskImpl *impl_from_ITask(ITask *iface) +{ + return CONTAINING_RECORD(iface, TaskImpl, ITask_iface); +} + static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) { - return (TaskImpl*) ((char*)(iface) - FIELD_OFFSET(TaskImpl, persistVtbl)); + return CONTAINING_RECORD(iface, TaskImpl, IPersistFile_iface); } static void TaskDestructor(TaskImpl *This) @@ -42,7 +60,7 @@ static HRESULT WINAPI MSTASK_ITask_QueryInterface( REFIID riid, void **ppvObject) { - TaskImpl * This = (TaskImpl *)iface; + TaskImpl * This = impl_from_ITask(iface); TRACE("IID: %s\n", debugstr_guid(riid)); if (ppvObject == NULL) @@ -51,13 +69,13 @@ static HRESULT WINAPI MSTASK_ITask_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ITask)) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->ITask_iface; ITask_AddRef(iface); return S_OK; } else if (IsEqualGUID(riid, &IID_IPersistFile)) { - *ppvObject = &This->persistVtbl; + *ppvObject = &This->IPersistFile_iface; ITask_AddRef(iface); return S_OK; } @@ -70,7 +88,7 @@ static HRESULT WINAPI MSTASK_ITask_QueryInterface( static ULONG WINAPI MSTASK_ITask_AddRef( ITask* iface) { - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); ULONG ref; TRACE("\n"); ref = InterlockedIncrement(&This->ref); @@ -80,7 +98,7 @@ static ULONG WINAPI MSTASK_ITask_AddRef( static ULONG WINAPI MSTASK_ITask_Release( ITask* iface) { - TaskImpl * This = (TaskImpl *)iface; + TaskImpl * This = impl_from_ITask(iface); ULONG ref; TRACE("\n"); ref = InterlockedDecrement(&This->ref); @@ -222,7 +240,7 @@ static HRESULT WINAPI MSTASK_ITask_SetComment( LPCWSTR pwszComment) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_comment; TRACE("(%p, %s)\n", iface, debugstr_w(pwszComment)); @@ -252,7 +270,7 @@ static HRESULT WINAPI MSTASK_ITask_GetComment( LPWSTR *ppwszComment) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, ppwszComment); @@ -357,7 +375,7 @@ static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( LPCWSTR pwszPassword) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_account_name; TRACE("(%p, %s, %s): partial stub\n", iface, debugstr_w(pwszAccountName), @@ -381,7 +399,7 @@ static HRESULT WINAPI MSTASK_ITask_GetAccountInformation( LPWSTR *ppwszAccountName) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p): partial stub\n", iface, ppwszAccountName); @@ -403,7 +421,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName( LPCWSTR pwszApplicationName) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_name; TRACE("(%p, %s)\n", iface, debugstr_w(pwszApplicationName)); @@ -450,7 +468,7 @@ static HRESULT WINAPI MSTASK_ITask_GetApplicationName( LPWSTR *ppwszApplicationName) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, ppwszApplicationName); @@ -472,7 +490,7 @@ static HRESULT WINAPI MSTASK_ITask_SetParameters( LPCWSTR pwszParameters) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_parameters; TRACE("(%p, %s)\n", iface, debugstr_w(pwszParameters)); @@ -501,7 +519,7 @@ static HRESULT WINAPI MSTASK_ITask_GetParameters( LPWSTR *ppwszParameters) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, ppwszParameters); @@ -570,7 +588,7 @@ static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( ITask* iface, DWORD dwMaxRunTime) { - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %d)\n", iface, dwMaxRunTime); @@ -582,7 +600,7 @@ static HRESULT WINAPI MSTASK_ITask_GetMaxRunTime( ITask* iface, DWORD *pdwMaxRunTime) { - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, pdwMaxRunTime); @@ -597,7 +615,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_QueryInterface( { TaskImpl *This = impl_from_IPersistFile(iface); TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppvObject); - return ITask_QueryInterface((ITask *) This, riid, ppvObject); + return ITask_QueryInterface(&This->ITask_iface, riid, ppvObject); } static ULONG WINAPI MSTASK_IPersistFile_AddRef( @@ -746,8 +764,8 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MSTASK_ITaskVtbl; - This->persistVtbl = &MSTASK_IPersistFileVtbl; + This->ITask_iface.lpVtbl = &MSTASK_ITaskVtbl; + This->IPersistFile_iface.lpVtbl = &MSTASK_IPersistFileVtbl; This->ref = 1; n = (lstrlenW(pwszTaskName) + 1) * sizeof(WCHAR); This->taskName = HeapAlloc(GetProcessHeap(), 0, n); @@ -765,7 +783,7 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; - *ppObj = &This->lpVtbl; + *ppObj = &This->ITask_iface; InterlockedIncrement(&dll_ref); return S_OK; }

1 0

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

24 Jan '11

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: Rename impl_from_dd4() to impl_from_IDirectDraw4().
by Alexandre Julliard 24 Jan '11

24 Jan '11

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 IDirectDraw4 iface.
by Alexandre Julliard 24 Jan '11

24 Jan '11

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 : d3d8: COM cleanup for the IDirect3D8 iface.
by Alexandre Julliard 24 Jan '11

24 Jan '11

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 : avifil32: Use ifaces instead of vtbl pointers in IAVIEditStreamImpl.
by Alexandre Julliard 24 Jan '11

24 Jan '11

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

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

24 Jan '11

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

Alexander Morozov : shell32/tests: Add tests for IShellDispatch::NameSpace.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 38f85c37cc66e8f62e8397694c08f6e779988bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f85c37cc66e8f62e8397694… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jan 21 18:28:40 2011 +0300 shell32/tests: Add tests for IShellDispatch::NameSpace. --- dlls/shell32/tests/Makefile.in | 3 +- dlls/shell32/tests/shelldispatch.c | 208 ++++++++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index d6a942c..53f33b1 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shell32.dll -IMPORTS = shell32 ole32 oleaut32 user32 advapi32 +IMPORTS = shell32 ole32 oleaut32 shlwapi user32 advapi32 C_SRCS = \ appbar.c \ @@ -8,6 +8,7 @@ C_SRCS = \ ebrowser.c \ generated.c \ progman_dde.c \ + shelldispatch.c \ shelllink.c \ shellole.c \ shellpath.c \ diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c new file mode 100644 index 0000000..9375d40 --- /dev/null +++ b/dlls/shell32/tests/shelldispatch.c @@ -0,0 +1,208 @@ +/* + * Unit tests for IShellDispatch + * + * Copyright 2010 Alexander Morozov for Etersoft + * + * 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 + */ + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "shldisp.h" +#include "shlobj.h" +#include "shlwapi.h" +#include "wine/test.h" + +static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); +static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); +static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); + +static void init_function_pointers(void) +{ + HMODULE hmod; + + hmod = GetModuleHandleA("shell32.dll"); + pSHGetFolderPathW = (void*)GetProcAddress(hmod, "SHGetFolderPathW"); + pSHGetNameFromIDList = (void*)GetProcAddress(hmod, "SHGetNameFromIDList"); + pSHGetSpecialFolderLocation = (void*)GetProcAddress(hmod, + "SHGetSpecialFolderLocation"); +} + +static void test_namespace(void) +{ + static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; + static const WCHAR backslashW[] = {'\\',0}; + + static WCHAR tempW[MAX_PATH], curW[MAX_PATH]; + HRESULT r; + IShellDispatch *sd; + Folder *folder; + VARIANT var; + BSTR title; + int len; + + r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (LPVOID*)&sd); + if (r == REGDB_E_CLASSNOTREG) /* NT4 */ + { + win_skip("skipping IShellDispatch tests\n"); + return; + } + ok(SUCCEEDED(r), "CoCreateInstance failed: %08x\n", r); + if (FAILED(r)) + return; + + VariantInit(&var); + folder = (void*)0xdeadbeef; + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + ok(folder == NULL, "expected NULL, got %p\n", folder); + + V_VT(&var) = VT_I4; + V_I4(&var) = -1; + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + + V_VT(&var) = VT_I4; + V_I4(&var) = ssfPROGRAMFILES; + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + if (r == S_OK) + { + r = Folder_get_Title(folder, &title); + todo_wine + ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); + if (r == S_OK) + { + /* On Win2000-2003 title is equal to program files directory name in + HKLM\Software\Microsoft\Windows\CurrentVersion\ProgramFilesDir. + On newer Windows it seems constant and is not changed + if the program files directory name is changed */ + if (pSHGetSpecialFolderLocation && pSHGetNameFromIDList) + { + LPITEMIDLIST pidl; + PWSTR name; + + r = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidl); + ok(r == S_OK, "SHGetSpecialFolderLocation failed: %08x\n", r); + r = pSHGetNameFromIDList(pidl, SIGDN_NORMALDISPLAY, &name); + ok(r == S_OK, "SHGetNameFromIDList failed: %08x\n", r); + todo_wine + ok(!lstrcmpW(title, name), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(title)); + CoTaskMemFree(name); + CoTaskMemFree(pidl); + } + else if (pSHGetFolderPathW) + { + static WCHAR path[MAX_PATH]; + WCHAR *p; + + r = pSHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, + SHGFP_TYPE_CURRENT, path); + ok(r == S_OK, "SHGetFolderPath failed: %08x\n", r); + p = PathFindFileNameW(path); + ok(!lstrcmpW(title, p), "expected %s, got %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(title)); + } + else skip("skipping Folder::get_Title test\n"); + SysFreeString(title); + } + Folder_Release(folder); + } + + GetTempPathW(MAX_PATH, tempW); + GetCurrentDirectoryW(MAX_PATH, curW); + SetCurrentDirectoryW(tempW); + CreateDirectoryW(winetestW, NULL); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(winetestW); + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + SysFreeString(V_BSTR(&var)); + + GetFullPathNameW(winetestW, MAX_PATH, tempW, NULL); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(tempW); + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + if (r == S_OK) + { + r = Folder_get_Title(folder, &title); + todo_wine + ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); + if (r == S_OK) + { + todo_wine + ok(!lstrcmpW(title, winetestW), "bad title: %s\n", + wine_dbgstr_w(title)); + SysFreeString(title); + } + Folder_Release(folder); + } + SysFreeString(V_BSTR(&var)); + + len = lstrlenW(tempW); + if (len < MAX_PATH - 1) + { + lstrcatW(tempW, backslashW); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(tempW); + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + if (r == S_OK) + { + r = Folder_get_Title(folder, &title); + todo_wine + ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); + if (r == S_OK) + { + todo_wine + ok(!lstrcmpW(title, winetestW), "bad title: %s\n", + wine_dbgstr_w(title)); + SysFreeString(title); + } + Folder_Release(folder); + } + SysFreeString(V_BSTR(&var)); + } + + RemoveDirectoryW(winetestW); + SetCurrentDirectoryW(curW); + IShellDispatch_Release(sd); +} + +START_TEST(shelldispatch) +{ + HRESULT r; + + r = CoInitialize(NULL); + ok(SUCCEEDED(r), "CoInitialize failed: %08x\n", r); + if (FAILED(r)) + return; + + init_function_pointers(); + test_namespace(); + + CoUninitialize(); +}

1 0

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

24 Jan '11

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 IClassFactory iface.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 3799ad3482754e56b625dcc923de4a94e54ab859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3799ad3482754e56b625dcc92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:01:44 2011 +0100 ddrawex: COM cleanup for the IClassFactory iface. --- dlls/ddrawex/ddrawex_private.h | 10 ------- dlls/ddrawex/main.c | 52 +++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 3e7a0e2..079b26c 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -43,16 +43,6 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) #define IDirectDrawFactory_DirectDrawEnumerate(p,a,b) (p)->lpVtbl->_DirectDrawEnumerate(p,a,b) #endif -/****************************************************************************** - * DirectDraw ClassFactory implementation - incomplete - ******************************************************************************/ -typedef struct -{ - const IClassFactoryVtbl *lpVtbl; - LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); -} IClassFactoryImpl; - /****************************************************************************** * DirectDrawFactory implementation diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index c93d8eb..b5923e2 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -39,16 +39,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddrawex); static HINSTANCE instance; +/****************************************************************************** + * 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 * *******************************************************************************/ -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("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); @@ -68,10 +81,9 @@ IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, * IDirectDrawClassFactory::AddRef * *******************************************************************************/ -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)->() incrementing from %d.\n", This, ref - 1); @@ -83,11 +95,11 @@ IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) * IDirectDrawClassFactory::Release * *******************************************************************************/ -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)->() decrementing from %d.\n", This, ref+1); if (ref == 0) @@ -101,13 +113,10 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) * IDirectDrawClassFactory::CreateInstance * *******************************************************************************/ -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("(%p)->(%p,%s,%p)\n",This,UnkOuter,debugstr_guid(riid),obj); @@ -118,11 +127,12 @@ IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, * IDirectDrawClassFactory::LockServer * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface,BOOL dolock) +static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl*) iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d),stub!\n",This,dolock); + return S_OK; } @@ -287,7 +297,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 = CreateDirectDrawFactory;

1 0