December 2010 - Wine-commits

Henri Verbeet : wined3d: Store an IWineD3DDeviceImpl pointer in IWineD3DBaseShaderClass.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: b5637a934ec44acdc20ee5a7a805711fe80a552e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5637a934ec44acdc20ee5a7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 7 18:47:08 2010 +0100 wined3d: Store an IWineD3DDeviceImpl pointer in IWineD3DBaseShaderClass. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 20 ++++++++++---------- dlls/wined3d/shader.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 35 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5637a934ec44acdc20ee…

1 0

Anders Jonsson : appwiz.cpl: Update Swedish translation.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 973a25a066f3c2298d2680e7d1614daff160c354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=973a25a066f3c2298d2680e7d… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Dec 7 19:54:26 2010 +0100 appwiz.cpl: Update Swedish translation. --- dlls/appwiz.cpl/Sv.rc | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/Sv.rc b/dlls/appwiz.cpl/Sv.rc index 75aa17a..f9f852b 100644 --- a/dlls/appwiz.cpl/Sv.rc +++ b/dlls/appwiz.cpl/Sv.rc @@ -42,7 +42,13 @@ STRINGTABLE IDS_INSTALL_FILTER, "Installationsprogram\0*instal*.exe;*setup*.exe;*.msi\0Program (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0\0" IDS_REMOVE, "&Ta bort..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Ändra/Ta bort..." +} + +STRINGTABLE +{ + IDS_DOWNLOADING "Hämtar..." + IDS_INSTALLING "Installerar..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -86,3 +92,18 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Installationsprogram" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine kunde inte hitta paketet Gecko vilket krävs för att program med inbäddad HTML " \ + "ska fungera korrekt. Wine kan hämta och installera det automatiskt åt dig.\n\n" \ + "Obs: Du rekommenderas att använda din distributions paket i stället. " \ + "Se http://wiki.winehq.org/Gecko för mer information.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Förlopp", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Installera", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbryt", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +}

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLPluginsCollection.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 5a3c146d0ae0e3e3480249f69bc928cbac0ad8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3c146d0ae0e3e3480249f69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 01:09:32 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLPluginsCollection. --- dlls/mshtml/omnavigator.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 99cc142..66bfd87 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -49,27 +49,28 @@ static inline OmNavigator *impl_from_IOmNavigator(IOmNavigator *iface) struct HTMLPluginsCollection { DispatchEx dispex; - const IHTMLPluginsCollectionVtbl *lpIHTMLPluginsCollectionVtbl; + IHTMLPluginsCollection IHTMLPluginsCollection_iface; LONG ref; OmNavigator *navigator; }; -#define HTMLPLUGINSCOL(x) ((IHTMLPluginsCollection*) &(x)->lpIHTMLPluginsCollectionVtbl) - -#define HTMLPLUGINCOL_THIS(iface) DEFINE_THIS(HTMLPluginsCollection, IHTMLPluginsCollection, iface) +static inline HTMLPluginsCollection *impl_from_IHTMLPluginsCollection(IHTMLPluginsCollection *iface) +{ + return CONTAINING_RECORD(iface, HTMLPluginsCollection, IHTMLPluginsCollection_iface); +} static HRESULT WINAPI HTMLPluginsCollection_QueryInterface(IHTMLPluginsCollection *iface, REFIID riid, void **ppv) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLPLUGINSCOL(This); + *ppv = &This->IHTMLPluginsCollection_iface; }else if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) { TRACE("(%p)->(IID_IHTMLPluginCollection %p)\n", This, ppv); - *ppv = HTMLPLUGINSCOL(This); + *ppv = &This->IHTMLPluginsCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -84,7 +85,7 @@ static HRESULT WINAPI HTMLPluginsCollection_QueryInterface(IHTMLPluginsCollectio static ULONG WINAPI HTMLPluginsCollection_AddRef(IHTMLPluginsCollection *iface) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -94,7 +95,7 @@ static ULONG WINAPI HTMLPluginsCollection_AddRef(IHTMLPluginsCollection *iface) static ULONG WINAPI HTMLPluginsCollection_Release(IHTMLPluginsCollection *iface) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -111,21 +112,21 @@ static ULONG WINAPI HTMLPluginsCollection_Release(IHTMLPluginsCollection *iface) static HRESULT WINAPI HTMLPluginsCollection_GetTypeInfoCount(IHTMLPluginsCollection *iface, UINT *pctinfo) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLPluginsCollection_GetTypeInfo(IHTMLPluginsCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLPluginsCollection_GetIDsOfNames(IHTMLPluginsCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -133,27 +134,25 @@ static HRESULT WINAPI HTMLPluginsCollection_Invoke(IHTMLPluginsCollection *iface REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLPluginsCollection_get_length(IHTMLPluginsCollection *iface, LONG *p) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLPluginsCollection_refresh(IHTMLPluginsCollection *iface, VARIANT_BOOL reload) { - HTMLPluginsCollection *This = HTMLPLUGINCOL_THIS(iface); + HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); FIXME("(%p)->(%x)\n", This, reload); return E_NOTIMPL; } -#undef HTMLPLUGINSCOL_THIS - static const IHTMLPluginsCollectionVtbl HTMLPluginsCollectionVtbl = { HTMLPluginsCollection_QueryInterface, HTMLPluginsCollection_AddRef, @@ -185,11 +184,12 @@ static HRESULT create_plugins_collection(OmNavigator *navigator, HTMLPluginsColl if(!col) return E_OUTOFMEMORY; - col->lpIHTMLPluginsCollectionVtbl = &HTMLPluginsCollectionVtbl; + col->IHTMLPluginsCollection_iface.lpVtbl = &HTMLPluginsCollectionVtbl; col->ref = 1; col->navigator = navigator; - init_dispex(&col->dispex, (IUnknown*)HTMLPLUGINSCOL(col), &HTMLPluginsCollection_dispex); + init_dispex(&col->dispex, (IUnknown*)&col->IHTMLPluginsCollection_iface, + &HTMLPluginsCollection_dispex); *ret = col; return S_OK; @@ -240,7 +240,7 @@ static ULONG WINAPI OmNavigator_Release(IOmNavigator *iface) if(!ref) { if(This->plugins) { This->plugins->navigator = NULL; - IHTMLPluginsCollection_Release(HTMLPLUGINSCOL(This->plugins)); + IHTMLPluginsCollection_Release(&This->plugins->IHTMLPluginsCollection_iface); } release_dispex(&This->dispex); heap_free(This); @@ -399,10 +399,10 @@ static HRESULT WINAPI OmNavigator_get_plugins(IOmNavigator *iface, IHTMLPluginsC if(FAILED(hres)) return hres; }else { - IHTMLPluginsCollection_AddRef(HTMLPLUGINSCOL(This->plugins)); + IHTMLPluginsCollection_AddRef(&This->plugins->IHTMLPluginsCollection_iface); } - *p = HTMLPLUGINSCOL(This->plugins); + *p = &This->plugins->IHTMLPluginsCollection_iface; return S_OK; }

1 0

Michael Stefaniuc : wineoss.drv: Standardize the COM usage in dscapture.c.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 22d645ab4d8174afffebeaf1b0db12582aaad7f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d645ab4d8174afffebeaf1b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 01:10:42 2010 +0100 wineoss.drv: Standardize the COM usage in dscapture.c. --- dlls/wineoss.drv/dscapture.c | 92 +++++++++++++++++++++++++---------------- 1 files changed, 56 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22d645ab4d8174afffebe…

1 0

Michael Stefaniuc : winealsa.drv: Standardize the COM usage in dsoutput.c.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 820f37698542ff573c3dd5b361903aa20a8952ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=820f37698542ff573c3dd5b36… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 01:09:45 2010 +0100 winealsa.drv: Standardize the COM usage in dsoutput.c. --- dlls/winealsa.drv/dsoutput.c | 52 +++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 8a277de..98fb5bb 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -68,7 +68,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl; struct IDsDriverImpl { /* IUnknown fields */ - const IDsDriverVtbl *lpVtbl; + IDsDriver IDsDriver_iface; LONG ref; /* IDsDriverImpl fields */ @@ -78,7 +78,7 @@ struct IDsDriverImpl struct IDsDriverBufferImpl { - const IDsDriverBufferVtbl *lpVtbl; + IDsDriverBuffer IDsDriverBuffer_iface; LONG ref; IDsDriverImpl* drv; @@ -93,6 +93,16 @@ struct IDsDriverBufferImpl snd_pcm_uframes_t mmap_buflen_frames, mmap_pos, mmap_commitahead; }; +static inline IDsDriverImpl *impl_from_IDsDriver(IDsDriver *iface) +{ + return CONTAINING_RECORD(iface, IDsDriverImpl, IDsDriver_iface); +} + +static inline IDsDriverBufferImpl *impl_from_IDsDriverBuffer(IDsDriverBuffer *iface) +{ + return CONTAINING_RECORD(iface, IDsDriverBufferImpl, IDsDriverBuffer_iface); +} + /** Fill buffers, for starting and stopping * Alsa won't start playing until everything is filled up * This also updates mmap_pos @@ -281,7 +291,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -291,7 +301,7 @@ static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) static ULONG WINAPI IDsDriverBufferImpl_Release(PIDSDRIVERBUFFER iface) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); @@ -324,7 +334,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, DWORD dwWritePosition,DWORD dwWriteLen, DWORD dwFlags) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); snd_pcm_uframes_t writepos; TRACE("%d bytes from %d\n", dwWriteLen, dwWritePosition); @@ -382,7 +392,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, LPVOID pvAudio1,DWORD dwLen1, LPVOID pvAudio2,DWORD dwLen2) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); snd_pcm_uframes_t writepos; if (!dwLen1) @@ -569,7 +579,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx) static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, LPWAVEFORMATEX pwfx) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); HRESULT hr = S_OK; TRACE("(%p, %p)\n", iface, pwfx); @@ -594,7 +604,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, D static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, PDSVOLUMEPAN pVolPan) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); FIXME("(%p,%p): stub\n",This,pVolPan); /* TODO: Bring volume control back */ return DS_OK; @@ -611,7 +621,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DW static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, LPDWORD lpdwPlay, LPDWORD lpdwWrite) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); snd_pcm_uframes_t hw_pptr, hw_wptr; snd_pcm_state_t state; @@ -676,7 +686,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwRes1, DWORD dwRes2, DWORD dwFlags) { - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); TRACE("(%p,%x,%x,%x)\n",iface,dwRes1,dwRes2,dwFlags); /* **** */ @@ -692,7 +702,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) const snd_pcm_channel_area_t *areas; snd_pcm_uframes_t avail; snd_pcm_format_t format; - IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; + IDsDriverBufferImpl *This = impl_from_IDsDriverBuffer(iface); TRACE("(%p)\n",iface); /* **** */ @@ -745,7 +755,7 @@ static HRESULT WINAPI IDsDriverImpl_QueryInterface(PIDSDRIVER iface, REFIID riid static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) { - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -755,7 +765,7 @@ static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) { - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); @@ -769,7 +779,7 @@ static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDESC pDesc) { - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); TRACE("(%p,%p)\n",iface,pDesc); *pDesc = WOutDev[This->wDevID].ds_desc; pDesc->dwFlags = DSDDESC_DONTNEEDSECONDARYLOCK | DSDDESC_DONTNEEDWRITELEAD; @@ -790,7 +800,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) { HRESULT hr = S_OK; - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); int err=0; snd_pcm_t *pcm = NULL; snd_pcm_hw_params_t *hw_params; @@ -833,14 +843,14 @@ static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) { - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); TRACE("(%p) stub, harmless\n",This); return DS_OK; } static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCaps) { - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); TRACE("(%p,%p)\n",iface,pCaps); *pCaps = WOutDev[This->wDevID].ds_caps; return DS_OK; @@ -853,7 +863,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, LPBYTE *ppbBuffer, LPVOID *ppvObj) { - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; HRESULT err; @@ -876,7 +886,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, HeapFree(GetProcessHeap(), 0, (*ippdsdb)->hw_params); return DSERR_OUTOFMEMORY; } - (*ippdsdb)->lpVtbl = &dsdbvt; + (*ippdsdb)->IDsDriverBuffer_iface.lpVtbl = &dsdbvt; (*ippdsdb)->ref = 1; (*ippdsdb)->drv = This; InitializeCriticalSection(&(*ippdsdb)->pcm_crst); @@ -912,7 +922,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, PIDSDRIVERBUFFER pBuffer, LPVOID *ppvObj) { - IDsDriverImpl *This = (IDsDriverImpl *)iface; + IDsDriverImpl *This = impl_from_IDsDriver(iface); FIXME("(%p,%p): stub\n",This,pBuffer); return DSERR_INVALIDCALL; } @@ -939,7 +949,7 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) *idrv = HeapAlloc(GetProcessHeap(),0,sizeof(IDsDriverImpl)); if (!*idrv) return MMSYSERR_NOMEM; - (*idrv)->lpVtbl = &dsdvt; + (*idrv)->IDsDriver_iface.lpVtbl = &dsdvt; (*idrv)->ref = 1; (*idrv)->wDevID = wDevID;

1 0

Alexandre Julliard : avifil32: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 735d075b7fc93ad8f34eb57a8fd4736f99a35c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735d075b7fc93ad8f34eb57a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 11:51:15 2010 +0100 avifil32: Convert dll registration to the IRegistrar mechanism. --- dlls/avifil32/Makefile.in | 3 +- dlls/avifil32/avifil32.idl | 54 +++++ dlls/avifil32/avifile.rgs | 11 + dlls/avifil32/factory.c | 17 ++ dlls/avifil32/regsvr.c | 516 -------------------------------------------- dlls/avifil32/rsrc.rc | 3 + 6 files changed, 87 insertions(+), 517 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=735d075b7fc93ad8f34eb…

1 0

Henri Verbeet : wined3d: Don't leak heapMemory in surface_remove_pbo().
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 46f3cc9df640c7d8eb33fffe035bc3ebf1424735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f3cc9df640c7d8eb33fffe0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 7 18:47:05 2010 +0100 wined3d: Don't leak heapMemory in surface_remove_pbo(). --- dlls/wined3d/surface.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c54f6ae..f7f0679 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1119,9 +1119,12 @@ static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) /* Context activation is done by the caller. */ static void surface_remove_pbo(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info) { - This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); - This->resource.allocatedMemory = - (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + if (!This->resource.heapMemory) + { + This->resource.heapMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size + RESOURCE_ALIGNMENT); + This->resource.allocatedMemory = + (BYTE *)(((ULONG_PTR)This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + } ENTER_GL(); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo));

1 0

Henri Verbeet : wined3d: Pass a wined3d_buffer structure to buffer_get_memory().
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 5fc53941efc82cee0d6ec2beddb1fd31e7eb5f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc53941efc82cee0d6ec2bed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 7 18:47:06 2010 +0100 wined3d: Pass a wined3d_buffer structure to buffer_get_memory(). --- dlls/wined3d/buffer.c | 23 +++++++++++------------ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 09c07fe..3048834 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -4,7 +4,7 @@ * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber * Copyright 2007-2010 Stefan Dösinger for CodeWeavers - * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2009-2010 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -611,24 +611,23 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_memory(IWineD3DBuffer *iface, const struct wined3d_gl_info *gl_info, GLuint *buffer_object) +const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, + const struct wined3d_gl_info *gl_info, GLuint *buffer_object) { - struct wined3d_buffer *This = (struct wined3d_buffer *)iface; - - *buffer_object = This->buffer_object; - if (!This->buffer_object) + *buffer_object = buffer->buffer_object; + if (!buffer->buffer_object) { - if (This->flags & WINED3D_BUFFER_CREATEBO) + if (buffer->flags & WINED3D_BUFFER_CREATEBO) { - buffer_create_buffer_object(This, gl_info); - This->flags &= ~WINED3D_BUFFER_CREATEBO; - if (This->buffer_object) + buffer_create_buffer_object(buffer, gl_info); + buffer->flags &= ~WINED3D_BUFFER_CREATEBO; + if (buffer->buffer_object) { - *buffer_object = This->buffer_object; + *buffer_object = buffer->buffer_object; return NULL; } } - return This->resource.allocatedMemory; + return buffer->resource.allocatedMemory; } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c9920e8..ec50693 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -213,7 +213,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, else { TRACE("Stream %u isn't UP, %p\n", element->input_slot, buffer); - data = buffer_get_memory((IWineD3DBuffer *)buffer, &This->adapter->gl_info, &buffer_object); + data = buffer_get_memory(buffer, &This->adapter->gl_info, &buffer_object); /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8165f18..310fa87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2545,7 +2545,7 @@ struct wined3d_buffer UINT *conversion_shift; /* NULL if no shifted conversion */ }; -const BYTE *buffer_get_memory(IWineD3DBuffer *iface, const struct wined3d_gl_info *gl_info, +const BYTE *buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, GLuint *buffer_object) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device,

1 0

Henri Verbeet : wined3d: Remove a redundant SetDirty() call from IWineD3DSurfaceImpl_Map().
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 018a48493be0dfc785de968f11d2c27ae9df222e URL: http://source.winehq.org/git/wine.git/?a=commit;h=018a48493be0dfc785de968f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 7 18:47:07 2010 +0100 wined3d: Remove a redundant SetDirty() call from IWineD3DSurfaceImpl_Map(). The surface_add_dirty_rect() call already does this. --- dlls/wined3d/surface.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f7f0679..91cc880 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1724,20 +1724,8 @@ lock_end: } if (!(flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY))) - { surface_add_dirty_rect(This, pRect); - if (This->container.type == WINED3D_CONTAINER_TEXTURE) - { - TRACE("Making container dirty.\n"); - IWineD3DBaseTexture_SetDirty((IWineD3DBaseTexture *)This->container.u.texture, TRUE); - } - else - { - TRACE("Surface is standalone, no need to dirty the container\n"); - } - } - return IWineD3DBaseSurfaceImpl_Map(iface, pLockedRect, pRect, flags); }

1 0

Michael Stefaniuc : shell32: Use an iface instead of a vtbl pointer in IDefClFImpl.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 151b3516792764c3a11b14b706d9817dcadc35af URL: http://source.winehq.org/git/wine.git/?a=commit;h=151b3516792764c3a11b14b70… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 7 11:09:48 2010 +0100 shell32: Use an iface instead of a vtbl pointer in IDefClFImpl. --- dlls/shell32/shellole.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index d678276..41b9711 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -358,7 +358,7 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; LONG ref; CLSID *rclsid; LPFNCREATEINSTANCE lpfnCI; @@ -366,6 +366,11 @@ typedef struct LONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */ } IDefClFImpl; +static inline IDefClFImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IDefClFImpl, IClassFactory_iface); +} + static const IClassFactoryVtbl dclfvt; /************************************************************************** @@ -378,7 +383,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc lpclf = HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl)); lpclf->ref = 1; - lpclf->lpVtbl = &dclfvt; + lpclf->IClassFactory_iface.lpVtbl = &dclfvt; lpclf->lpfnCI = lpfnCI; lpclf->pcRefDll = pcRefDll; @@ -394,7 +399,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc static HRESULT WINAPI IDefClF_fnQueryInterface( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%s)\n",This,shdebugstr_guid(riid)); @@ -414,7 +419,7 @@ static HRESULT WINAPI IDefClF_fnQueryInterface( */ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -426,9 +431,9 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) */ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); ULONG refCount = InterlockedDecrement(&This->ref); - + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) @@ -447,7 +452,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) static HRESULT WINAPI IDefClF_fnCreateInstance( LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); TRACE("%p->(%p,%s,%p)\n",This,pUnkOuter,shdebugstr_guid(riid),ppvObject); @@ -468,7 +473,7 @@ static HRESULT WINAPI IDefClF_fnCreateInstance( */ static HRESULT WINAPI IDefClF_fnLockServer(LPCLASSFACTORY iface, BOOL fLock) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); TRACE("%p->(0x%x), not implemented\n",This, fLock); return E_NOTIMPL; }

1 0