May 2019 - Wine-commits - list.winehq.org

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

31 May '19

Module: wine Branch: master Commit: cbe1832f42804e828e97a22af8ca1ab06c4ebf51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbe1832f42804e828e97a22a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:50:02 2019 +0200 dhtmled.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index 17850f8..c483de9 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,6 +1,8 @@ MODULE = dhtmled.ocx IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ edit.c \ main.c

1 0

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

31 May '19

Module: wine Branch: master Commit: 4c08d7289702ae6c164f84513dbf042d1fc1ea87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c08d7289702ae6c164f8451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:50:18 2019 +0200 difxapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/difxapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/difxapi/Makefile.in b/dlls/difxapi/Makefile.in index 3f61fd3..1788bed 100644 --- a/dlls/difxapi/Makefile.in +++ b/dlls/difxapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = difxapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

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

31 May '19

Module: wine Branch: master Commit: 9f9ea116411406fcc9243e9c15e1b37dbfed45bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9ea116411406fcc9243e9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:50:48 2019 +0200 dispdib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispdib.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dispdib.dll16/Makefile.in b/dlls/dispdib.dll16/Makefile.in index b7c924f..1edba86 100644 --- a/dlls/dispdib.dll16/Makefile.in +++ b/dlls/dispdib.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = dispdib.dll16 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = dispdib.c

1 0

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

31 May '19

Module: wine Branch: master Commit: 8029759f254d3da4b7a82da42f645cc7c0355693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8029759f254d3da4b7a82da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:50:58 2019 +0200 dispex: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in index 98a0592..1f960f0b 100644 --- a/dlls/dispex/Makefile.in +++ b/dlls/dispex/Makefile.in @@ -1,6 +1,8 @@ MODULE = dispex.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ usrmarshal.c

1 0

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

31 May '19

Module: wine Branch: master Commit: 2001960868bfe9c965b7b25167aaab305f3aacf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2001960868bfe9c965b7b251… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:51:06 2019 +0200 display.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/display.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in index 533ff36..0d776c2 100644 --- a/dlls/display.drv16/Makefile.in +++ b/dlls/display.drv16/Makefile.in @@ -1,7 +1,7 @@ MODULE = display.drv16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = display.c

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

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 : 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

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

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