March 2012 - Wine-commits - list.winehq.org

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 49962cd45d864d3bfe72a182066cc720a941db17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49962cd45d864d3bfe72a1820… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 14 22:58:01 2012 +0100 po: Update French translation. --- po/fr.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3a4cbaf..c2c6984 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-11 21:10+0100\n" +"PO-Revision-Date: 2012-03-14 22:57+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -2194,17 +2194,13 @@ msgstr "" "confiance :" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" msgstr "" -"Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)" +"Standard de syntaxe de message cryptographique/Messages PKCS #7 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Échange d'informations personnelles - PKCS #12 (.pfx, .p12)" +msgstr "Échange d'informations personnelles/PKCS #12 (*.pfx ; *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2350,23 +2346,17 @@ msgid "Select the format you want to use:" msgstr "Sélectionnez le format à utiliser :" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" msgstr "Binaire codé &DER X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Binaire codé Ba&se64 X.509 (.cer) :" +msgstr "Binaire codé Ba&se64 X.509 (*.cer) :" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "" -"Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)" +"Standard de syntaxe de message &cryptographique/Messages PKCS #7 (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -2374,10 +2364,8 @@ msgstr "" "&Inclure tous les certificats dans le chemin de certification si possible" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "Échange d'informations &Personnelles - PKCS #12 (.pfx)" +msgstr "Échange d'informations &personnelles/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12843,9 +12831,8 @@ msgid "Select an executable file" msgstr "Sélectionnez un fichier exécutable" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "&Détection automatique" +msgstr "Autodétection" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Christian Costa : strmbase: Allow constructor function to be NULL but display an error saying we don' t implement the CLSID.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 9ee4809dc3dac7a281188ec133b20e79798c003c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee4809dc3dac7a281188ec13… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 15 08:17:10 2012 +0100 strmbase: Allow constructor function to be NULL but display an error saying we don't implement the CLSID. --- dlls/strmbase/dllfunc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 44b115e..34e03e6 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -362,7 +362,12 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * if (i == g_cTemplates) { - FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + ERR("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + else if (!pList->m_lpfnNew) + { + FIXME("%s: class not implemented yet.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Aric Stewart : strmbase: Move the MediaSeekingPassThru functions from quartz into strmbase.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 026037ab699faef6683dcec40cf0835dbe034691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026037ab699faef6683dcec40… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 14 14:45:34 2012 -0500 strmbase: Move the MediaSeekingPassThru functions from quartz into strmbase. --- dlls/quartz/Makefile.in | 1 - dlls/quartz/avisplit.c | 1 - dlls/quartz/control_private.h | 28 -------------- dlls/quartz/dsoundrender.c | 9 ++--- dlls/quartz/main.c | 5 +++ dlls/quartz/mpegsplit.c | 1 - dlls/quartz/nullrenderer.c | 7 +--- dlls/quartz/quartz_private.h | 1 - dlls/quartz/videorenderer.c | 8 +--- dlls/quartz/waveparser.c | 1 - dlls/strmbase/Makefile.in | 1 + dlls/{quartz/control.c => strmbase/pospass.c} | 49 +++++++++++++++++++------ include/wine/strmbase.h | 8 ++++ 13 files changed, 57 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026037ab699faef6683dc…

1 0

Aric Stewart : strmbase: Rename MediaSeekingPassThru to RendererPosPassThru to match standard strmbase naming .
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: cdf9c4f223ee3840c9fd92d0bfffa91005a817f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf9c4f223ee3840c9fd92d0b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 14 14:45:42 2012 -0500 strmbase: Rename MediaSeekingPassThru to RendererPosPassThru to match standard strmbase naming. --- dlls/quartz/dsoundrender.c | 8 ++++---- dlls/quartz/nullrenderer.c | 8 ++++---- dlls/quartz/videorenderer.c | 8 ++++---- dlls/strmbase/pospass.c | 6 +++--- include/wine/strmbase.h | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5e7dcc6..6e51cc4 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -386,7 +386,7 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa } if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) - MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); + RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, tStart); hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) { ERR("Cannot get sample time (%x)\n", hr); @@ -670,7 +670,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) This->writepos = This->buf_size; SetEvent(This->state_change); SetEvent(This->blocked); - MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + RendererPosPassThru_ResetMediaTime(This->seekthru_unk); } LeaveCriticalSection(&This->filter.csFilter); @@ -922,7 +922,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) } hr = DSoundRender_HandleEndOfStream(me); - MediaSeekingPassThru_EOS(me->seekthru_unk); + RendererPosPassThru_EOS(me->seekthru_unk); SetEvent(me->state_change); LeaveCriticalSection(This->pin.pCritSec); @@ -977,7 +977,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface) QualityControlRender_Start(&pFilter->qcimpl, pFilter->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface); LeaveCriticalSection(This->pin.pCritSec); - MediaSeekingPassThru_ResetMediaTime(pFilter->seekthru_unk); + RendererPosPassThru_ResetMediaTime(pFilter->seekthru_unk); return hr; } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index b99624a..dc1bd0f 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -71,7 +71,7 @@ static HRESULT WINAPI NullRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa TRACE("%p %p\n", pin, pSample); if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop))) - MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, start); + RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, start); EnterCriticalSection(&This->filter.csFilter); if (This->pInputPin->flushing || This->pInputPin->end_of_stream) hr = S_FALSE; @@ -308,7 +308,7 @@ static HRESULT WINAPI NullRenderer_Stop(IBaseFilter * iface) EnterCriticalSection(&This->filter.csFilter); { This->filter.state = State_Stopped; - MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + RendererPosPassThru_ResetMediaTime(This->seekthru_unk); } LeaveCriticalSection(&This->filter.csFilter); @@ -428,7 +428,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface) IMediaEventSink_Release(pEventSink); } } - MediaSeekingPassThru_EOS(pNull->seekthru_unk); + RendererPosPassThru_EOS(pNull->seekthru_unk); return hr; } @@ -443,7 +443,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndFlush(IPin * iface) hr = BaseInputPinImpl_EndOfStream(iface); pNull = (NullRendererImpl*)This->pin.pinInfo.pFilter; - MediaSeekingPassThru_ResetMediaTime(pNull->seekthru_unk); + RendererPosPassThru_ResetMediaTime(pNull->seekthru_unk); return hr; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index c064f80..92a0c99 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -390,7 +390,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS } if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) - MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); + RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, tStart); /* Preroll means the sample isn't shown, this is used for key frames and things like that */ if (IMediaSample_IsPreroll(pSample) == S_OK) { @@ -776,7 +776,7 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) This->filter.state = State_Stopped; SetEvent(This->hEvent); SetEvent(This->blocked); - MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + RendererPosPassThru_ResetMediaTime(This->seekthru_unk); if (This->AutoShow) /* Black it out */ RedrawWindow(This->hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); @@ -928,7 +928,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)pFilter); IMediaEventSink_Release(pEventSink); } - MediaSeekingPassThru_EOS(pFilter->seekthru_unk); + RendererPosPassThru_EOS(pFilter->seekthru_unk); This->end_of_stream = 1; out: LeaveCriticalSection(This->pin.pCritSec); @@ -973,7 +973,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface); LeaveCriticalSection(This->pin.pCritSec); - MediaSeekingPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk); + RendererPosPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk); return hr; } diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index cba4b28..90a87e1 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -567,7 +567,7 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPreroll(IMediaSeeking * iface, LON return hr; } -HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start) +HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start) { ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); EnterCriticalSection(&This->time_cs); @@ -577,7 +577,7 @@ HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE return S_OK; } -HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface) +HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface) { ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); EnterCriticalSection(&This->time_cs); @@ -586,7 +586,7 @@ HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface) return S_OK; } -HRESULT WINAPI MediaSeekingPassThru_EOS(IUnknown *iface) +HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface) { ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); REFERENCE_TIME time; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b2319d2..89b1898 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -321,9 +321,9 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); /* PosPassThru */ -HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); -HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface); -HRESULT WINAPI MediaSeekingPassThru_EOS(IUnknown *iface); +HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); +HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); +HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface); HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin, IUnknown **ppPassThru); HRESULT WINAPI PosPassThru_Construct(IUnknown* pUnkOuter, LPVOID *ppPassThru);

1 0

Ken Thomases : gdi.exe16: Eliminate a couple of dead stores.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 96720df53f181a940265967c6ca60a89b4a1a790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96720df53f181a940265967c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 14 15:12:17 2012 -0500 gdi.exe16: Eliminate a couple of dead stores. --- dlls/gdi.exe16/printdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index c1665f5..cab30c7 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -398,7 +398,7 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) INT16 WINAPI CloseJob16(HPJOB16 hJob) { int nRet = SP_ERROR; - PPRINTJOB pPrintJob = NULL; + PPRINTJOB pPrintJob; TRACE("%04x\n", hJob); @@ -418,7 +418,7 @@ INT16 WINAPI CloseJob16(HPJOB16 hJob) INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch) { int nRet = SP_ERROR; - PPRINTJOB pPrintJob = NULL; + PPRINTJOB pPrintJob; TRACE("%04x %p %04x\n", hJob, lpData, cch);

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DVolumeTexture8Impl_QueryInterface ().
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 8c2d44cafeaaeecca73346aaf0f0cbf9614abbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2d44cafeaaeecca73346aaf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:28 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DVolumeTexture8Impl_QueryInterface(). --- dlls/d3d8/volumetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index a713f16..3d51734 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -31,20 +31,20 @@ static inline IDirect3DVolumeTexture8Impl *impl_from_IDirect3DVolumeTexture8(IDi static HRESULT WINAPI IDirect3DVolumeTexture8Impl_QueryInterface(IDirect3DVolumeTexture8 *iface, REFIID riid, void **ppobj) { - IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) - || IsEqualGUID(riid, &IID_IDirect3DVolumeTexture8)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolumeTexture8) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) + || IsEqualGUID(riid, &IID_IDirect3DResource8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DVolume8Impl_QueryInterface ().
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 9193215d41df60ad20fe6eacedff6721c829cc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9193215d41df60ad20fe6eace… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:29 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DVolume8Impl_QueryInterface(). --- dlls/d3d8/volume.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 0e009ee..ea69e12 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -31,18 +31,18 @@ static inline IDirect3DVolume8Impl *impl_from_IDirect3DVolume8(IDirect3DVolume8 static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, void **ppobj) { - IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DVolume8)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolume8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DTexture8Impl_QueryInterface ().
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 42672f6dbe28006d7685d2fa88c5e2db37d4ff16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42672f6dbe28006d7685d2fa8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:30 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DTexture8Impl_QueryInterface(). --- dlls/d3d8/texture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f3f2b20..b1eb69a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -32,20 +32,20 @@ static inline IDirect3DTexture8Impl *impl_from_IDirect3DTexture8(IDirect3DTextur static HRESULT WINAPI IDirect3DTexture8Impl_QueryInterface(IDirect3DTexture8 *iface, REFIID riid, void **ppobj) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) - || IsEqualGUID(riid, &IID_IDirect3DTexture8)) { + if (IsEqualGUID(riid, &IID_IDirect3DTexture8) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) + || IsEqualGUID(riid, &IID_IDirect3DResource8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p) not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DSwapChain8Impl_QueryInterface ().
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: ddfb19e913b145e237ddb4d771bb8e6649c81c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfb19e913b145e237ddb4d77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:31 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DSwapChain8Impl_QueryInterface(). --- dlls/d3d8/swapchain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 3704130..8979519 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -31,18 +31,18 @@ static inline IDirect3DSwapChain8Impl *impl_from_IDirect3DSwapChain8(IDirect3DSw static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(IDirect3DSwapChain8 *iface, REFIID riid, void **ppobj) { - IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DSwapChain8)) { + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DViewportImpl.
by Alexandre Julliard 15 Mar '12

15 Mar '12

Module: wine Branch: master Commit: 0c11c316bbf10432d31af38862f0da3e03b671fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c11c316bbf10432d31af3886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:32 2012 +0100 ddraw: Get rid of IDirect3DViewportImpl. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 19 ++-- dlls/ddraw/device.c | 30 ++-- dlls/ddraw/executebuffer.c | 12 +- dlls/ddraw/viewport.c | 305 +++++++++++++++++++------------------------- 5 files changed, 161 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c11c316bbf10432d31af…

1 0