wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Akihiro Sagawa : quartz: Ensure error text is terminated with NUL character.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: fc4ef8692e82b3e480b76daf088f099897a790e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc4ef8692e82b3e480b76daf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 30 22:58:09 2019 +0900 quartz: Ensure error text is terminated with NUL character. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 08287a7..282104e 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -313,7 +313,13 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) return 0; res = AMGetErrorTextW(hr, errorW, ARRAY_SIZE(errorW)); - return WideCharToMultiByte(CP_ACP, 0, errorW, res, buffer, maxlen, 0, 0); + if (!res) + return 0; + + res = WideCharToMultiByte(CP_ACP, 0, errorW, -1, NULL, 0, 0, 0); + if (res > maxlen || !res) + return 0; + return WideCharToMultiByte(CP_ACP, 0, errorW, -1, buffer, maxlen, 0, 0) - 1; } /***********************************************************************

1 0

Andrey Gusev : advapi32: Implement LookupAccountSidLocalA/W.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 7b8554b3b861563b7d23c8bc1881c162b666e79a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8554b3b861563b7d23c8bc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 30 13:52:36 2019 +0300 advapi32: Implement LookupAccountSidLocalA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47286 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 ++ dlls/advapi32/security.c | 30 ++++++++++++++++++++++ .../api-ms-win-security-lsalookup-l1-1-0.spec | 4 +-- .../api-ms-win-security-lsalookup-l1-1-1.spec | 4 +-- include/winbase.h | 3 +++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a97161f..06c4f8f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -430,6 +430,8 @@ @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8027434..2030ebf 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2316,6 +2316,21 @@ LookupAccountSidA( } /****************************************************************************** + * LookupAccountSidLocalA [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalA( + PSID sid, + LPSTR account, + LPDWORD accountSize, + LPSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidA(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * LookupAccountSidW [ADVAPI32.@] * * PARAMS @@ -2492,6 +2507,21 @@ LookupAccountSidW( } /****************************************************************************** + * LookupAccountSidLocalW [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalW( + PSID sid, + LPWSTR account, + LPDWORD accountSize, + LPWSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidW(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * SetFileSecurityA [ADVAPI32.@] * * See SetFileSecurityW. diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec index 9b45265..6e9e6ed 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec index 215c7b7..35a79f1 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec @@ -4,8 +4,8 @@ @ stub GetIdentityProviderInfoByName @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/include/winbase.h b/include/winbase.h index 8b2eb2c..44bfe98 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2430,6 +2430,9 @@ WINADVAPI BOOL WINAPI LookupAccountNameW(LPCWSTR,LPCWSTR,PSID,LPDWORD,LP WINADVAPI BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); WINADVAPI BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); #define LookupAccountSid WINELIB_NAME_AW(LookupAccountSid) +WINADVAPI BOOL WINAPI LookupAccountSidLocalA(PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); +WINADVAPI BOOL WINAPI LookupAccountSidLocalW(PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); +#define LookupAccountSidLocal WINELIB_NAME_AW(LookupAccountSidLocal) WINBASEAPI BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME); WINBASEAPI BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);

1 0

Zebediah Figura : quartz/dsoundrender: Use BaseFilterImpl_QueryInterface() .
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: fd3c80b873aa675d7221ebec19e25a44b8cbff72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3c80b873aa675d7221ebec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:37 2019 -0500 quartz/dsoundrender: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 59 +++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 2b50eae..4c339f8 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -611,6 +611,23 @@ static void dsound_render_destroy(BaseRenderer *iface) CoTaskMemFree(filter); } +static HRESULT dsound_render_query_interface(BaseRenderer *iface, REFIID iid, void **out) +{ + DSoundRenderImpl *filter = impl_from_BaseRenderer(iface); + + if (IsEqualGUID(iid, &IID_IBasicAudio)) + *out = &filter->basicAudio.IBasicAudio_iface; + else if (IsEqualGUID(iid, &IID_IReferenceClock)) + *out = &filter->IReferenceClock_iface; + else if (IsEqualGUID(iid, &IID_IAMDirectSound)) + *out = &filter->IAMDirectSound_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CheckMediaType, DSoundRender_DoRenderSample, @@ -632,6 +649,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_BeginFlush, DSoundRender_EndFlush, dsound_render_destroy, + dsound_render_query_interface, }; HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -705,39 +723,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p, %p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IBasicAudio)) - *ppv = &This->basicAudio.IBasicAudio_iface; - else if (IsEqualIID(riid, &IID_IReferenceClock)) - *ppv = &This->IReferenceClock_iface; - else if (IsEqualIID(riid, &IID_IAMDirectSound)) - *ppv = &This->IAMDirectSound_iface; - else - { - HRESULT hr; - hr = BaseRendererImpl_QueryInterface(iface, riid, ppv); - if (SUCCEEDED(hr)) - return hr; - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); - - return E_NOINTERFACE; -} - static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) { DSoundRenderImpl *This = impl_from_IBaseFilter(iface); @@ -770,7 +755,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) static const IBaseFilterVtbl DSoundRender_Vtbl = { - DSoundRender_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -795,7 +780,7 @@ static HRESULT WINAPI Basicaudio_QueryInterface(IBasicAudio *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI Basicaudio_AddRef(IBasicAudio *iface) { @@ -989,7 +974,7 @@ static HRESULT WINAPI ReferenceClock_QueryInterface(IReferenceClock *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI ReferenceClock_AddRef(IReferenceClock *iface) @@ -1157,7 +1142,7 @@ static HRESULT WINAPI AMDirectSound_QueryInterface(IAMDirectSound *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI AMDirectSound_AddRef(IAMDirectSound *iface)

1 0

Zebediah Figura : strmbase/renderer: Add a QueryInterface() callback.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: d930dff4a860455fef775409586e4406df5d1efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d930dff4a860455fef775409… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:36 2019 -0500 strmbase/renderer: Add a QueryInterface() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 24 +++++++++++++++++++++++- include/wine/strmbase.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7a69d98..5308cd3 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -200,10 +200,32 @@ static void renderer_destroy(BaseFilter *iface) filter->pFuncsTable->renderer_destroy(filter); } -static const BaseFilterFuncTable RendererBaseFilterFuncTable = +static HRESULT renderer_query_interface(BaseFilter *iface, REFIID iid, void **out) { + BaseRenderer *filter = impl_from_BaseFilter(iface); + HRESULT hr; + + if (filter->pFuncsTable->renderer_query_interface + && SUCCEEDED(hr = filter->pFuncsTable->renderer_query_interface(filter, iid, out))) + { + return hr; + } + + if (IsEqualIID(iid, &IID_IMediaSeeking) || IsEqualIID(iid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(filter->pPosition, iid, out); + else if (IsEqualIID(iid, &IID_IQualityControl)) + { + *out = &filter->qcimpl->IQualityControl_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + return E_NOINTERFACE; +} + +static const BaseFilterFuncTable RendererBaseFilterFuncTable = { .filter_get_pin = renderer_get_pin, .filter_destroy = renderer_destroy, + .filter_query_interface = renderer_query_interface, }; static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE * pmt) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1d36f13..e192e98 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -606,6 +606,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_BeginFlush pfnBeginFlush; BaseRenderer_EndFlush pfnEndFlush; void (*renderer_destroy)(BaseRenderer *iface); + HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface().
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: c15b457379d35fb891a6b07306ffc5852ca7d2f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c15b457379d35fb891a6b073… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:35 2019 -0500 winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 64b8dcf..81c6168 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1307,34 +1307,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) return obj; } -static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) -{ - GSTImpl *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || - IsEqualIID(riid, &IID_IBaseFilter)) - { - *ppv = &This->filter.IBaseFilter_iface; - } - - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && - !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static HRESULT WINAPI GST_Stop(IBaseFilter *iface) { GSTImpl *This = impl_from_IBaseFilter(iface); @@ -1456,7 +1428,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, } static const IBaseFilterVtbl GST_Vtbl = { - GST_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID,

1 0

Zebediah Figura : qcap/avimux: Use BaseFilterImpl_QueryInterface().
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 1df475674f6a1d61c17a5bbdd74a8e634d419bae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1df475674f6a1d61c17a5bbd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:34 2019 -0500 qcap/avimux: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 53 +++++++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index bf10fe3..6a3a40b 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -155,9 +155,31 @@ static void avi_mux_destroy(BaseFilter *iface) ObjectRefCount(FALSE); } +static HRESULT avi_mux_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + AviMux *filter = impl_from_BaseFilter(iface); + + if (IsEqualGUID(iid, &IID_IConfigAviMux)) + *out = &filter->IConfigAviMux_iface; + else if (IsEqualGUID(iid, &IID_IConfigInterleaving)) + *out = &filter->IConfigInterleaving_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IPersistMediaPropertyBag)) + *out = &filter->IPersistMediaPropertyBag_iface; + else if (IsEqualGUID(iid, &IID_ISpecifyPropertyPages)) + *out = &filter->ISpecifyPropertyPages_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseFilterFuncTable filter_func_table = { .filter_get_pin = avi_mux_get_pin, .filter_destroy = avi_mux_destroy, + .filter_query_interface = avi_mux_query_interface, }; static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) @@ -166,35 +188,6 @@ static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) return impl_from_BaseFilter(filter); } -static HRESULT WINAPI AviMux_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - AviMux *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = &This->filter.IBaseFilter_iface; - else if(IsEqualIID(riid, &IID_IConfigAviMux)) - *ppv = &This->IConfigAviMux_iface; - else if(IsEqualIID(riid, &IID_IConfigInterleaving)) - *ppv = &This->IConfigInterleaving_iface; - else if(IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->IMediaSeeking_iface; - else if(IsEqualIID(riid, &IID_IPersistMediaPropertyBag)) - *ppv = &This->IPersistMediaPropertyBag_iface; - else if(IsEqualIID(riid, &IID_ISpecifyPropertyPages)) - *ppv = &This->ISpecifyPropertyPages_iface; - else { - FIXME("no interface for %s\n", debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - static HRESULT out_flush(AviMux *This) { ULONG written; @@ -710,7 +703,7 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) } static const IBaseFilterVtbl AviMuxVtbl = { - AviMux_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID,

1 0

Zebediah Figura : quartz/mpegsplit: Use BaseFilterImpl_QueryInterface().
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 144e97bbd5517f1961d2567204a1d183a3139b68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=144e97bbd5517f1961d25672… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:33 2019 -0500 quartz/mpegsplit: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 0afdcbd..25e1b0d 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -764,36 +764,9 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) return hr; } -static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - MPEGSplitterImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); - - *ppv = NULL; - - if ( IsEqualIID(riid, &IID_IUnknown) - || IsEqualIID(riid, &IID_IPersist) - || IsEqualIID(riid, &IID_IMediaFilter) - || IsEqualIID(riid, &IID_IBaseFilter) ) - *ppv = iface; - else if ( IsEqualIID(riid, &IID_IAMStreamSelect) ) - *ppv = &This->IAMStreamSelect_iface; - - if (*ppv) - { - IBaseFilter_AddRef(iface); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IBaseFilterVtbl MPEGSplitter_Vtbl = { - MPEGSplitter_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -874,10 +847,25 @@ static void mpeg_splitter_destroy(BaseFilter *iface) Parser_Destroy(&filter->Parser); } +static HRESULT mpeg_splitter_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + MPEGSplitterImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + + if (IsEqualGUID(iid, &IID_IAMStreamSelect)) + { + *out = &filter->IAMStreamSelect_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static const BaseFilterFuncTable mpeg_splitter_func_table = { .filter_get_pin = parser_get_pin, .filter_destroy = mpeg_splitter_destroy, + .filter_query_interface = mpeg_splitter_query_interface, }; HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

Alexandre Julliard : dmime: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 9cb66f8dfef5ead8376605aa50e8953b5b9d4c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb66f8dfef5ead8376605aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:59:56 2019 +0200 dmime: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/Makefile.in | 2 ++ dlls/dmime/dmime_private.h | 1 - dlls/dmime/dmutils.c | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index e3abdd7..0785176 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmime.dll IMPORTS = dxguid uuid dsound ole32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audiopath.c \ dmime_main.c \ diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index b6e4264..983db7f 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index cb5fd32..121e6dc 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -20,8 +20,6 @@ #define COBJMACROS -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> @@ -34,7 +32,6 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "objbase.h" #include "dmusici.h"

1 0

Alexandre Julliard : dmcompos: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 7aa616761a1ef1a95a5f1d7223d4ee51ba4270eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa616761a1ef1a95a5f1d72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:59:41 2019 +0200 dmcompos: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/Makefile.in | 2 ++ dlls/dmcompos/dmcompos_main.c | 2 -- dlls/dmcompos/dmcompos_private.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in index d1e9b5e..75662cb 100644 --- a/dlls/dmcompos/Makefile.in +++ b/dlls/dmcompos/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmcompos.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ chordmap.c \ chordmaptrack.c \ diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index bcd6662..21e896c 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index a74c1fb..1958c27 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h"

1 0

Alexandre Julliard : dmband: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 1ee20cf33b52b6c75f4ed908cd476a4b2ad75770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ee20cf33b52b6c75f4ed908… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:59:28 2019 +0200 dmband: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/Makefile.in | 2 ++ dlls/dmband/dmband_private.h | 1 - dlls/dmband/dmutils.c | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 6fa1502..8d755fb 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmband.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ band.c \ bandtrack.c \ diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 4c8fa0b..b618b9b 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index e04e9dd..c76bde1 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -20,8 +20,6 @@ #define COBJMACROS -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> @@ -34,7 +32,6 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "objbase.h" #include "initguid.h"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019