wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Vincent Povirk : mscoree: Update Wine Mono to 4.9.2.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: d593a80bb6359f9cbcd47dd243e0bf5d08387cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d593a80bb6359f9cbcd47dd2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 5 10:17:18 2019 -0500 mscoree: Update Wine Mono to 4.9.2. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a05ca46..8be579d 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.0" -#define MONO_SHA "8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713" +#define MONO_VERSION "4.9.2" +#define MONO_SHA "b91f4656fca72d036934c2a9e845b2dfadad291e48e0b013fb2b08698200ff74" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7420b4b..bcad7f4 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.0" +#define WINE_MONO_VERSION "4.9.2" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Conor McCarthy : wldap32: Use ldap_memvfree() to free array allocated by libldap.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 02feb30b0ef0cc4f31cd885f5659026711b79c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02feb30b0ef0cc4f31cd885f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 16 23:08:57 2019 +1000 wldap32: Use ldap_memvfree() to free array allocated by libldap. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 62ffdba..e83e6d2 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -258,7 +258,7 @@ ULONG CDECL ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result, ldap_memfree( matchedU ); ldap_memfree( errorU ); - strarrayfreeU( referralsU ); + ldap_memvfree( (void **)referralsU ); ldap_controls_free( serverctrlsU ); #endif

1 0

Peter Dons Tychsen : msvcrt: Do not use casting in min/max constants.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: b72d6d1d86fccae000241809a0da37269c9d5632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72d6d1d86fccae000241809… Author: Peter Dons Tychsen <pdt(a)dontech.dk> Date: Sun Jul 21 23:38:02 2019 +0200 msvcrt: Do not use casting in min/max constants. Signed-off-by: Peter Dons Tychsen <pdt(a)dontech.dk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/limits.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index 13bab86..7f32f08 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -30,13 +30,13 @@ #define LONG_MAX 0x7fffffffL #define ULONG_MAX 0xffffffffUL -#define LLONG_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) +#define LLONG_MAX 0x7fffffffffffffffLL #define LLONG_MIN (-LLONG_MAX-1) -#define ULLONG_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define ULLONG_MAX 0xffffffffffffffffULL -#define _I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) +#define _I64_MAX 0x7fffffffffffffffLL #define _I64_MIN (-_I64_MAX-1) -#define _UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define _UI64_MAX 0xffffffffffffffffULL #define I64_MIN _I64_MIN #define I64_MAX _I64_MAX

1 0

Gijs Vermeulen : wmp/tests: Add some IWMPPlaylist tests.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 2384e497bae1ef2206827fa139077d7921976005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2384e497bae1ef2206827fa1… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:58 2019 +0200 wmp/tests: Add some IWMPPlaylist tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 7e76aee..fee18fd 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -666,6 +666,78 @@ static void test_player_url(void) IWMPPlayer4_Release(player); } +static void test_playlist(void) +{ + IWMPPlayer4 *player; + IWMPPlaylist *playlist, *playlist2; + HRESULT hr; + BSTR str, str2; + LONG count; + static const WCHAR nameW[] = {'P','l','a','y','l','i','s','t','1',0}; + + hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); + return; + } + ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + + playlist = NULL; + hr = IWMPPlayer4_get_currentPlaylist(player, &playlist); + ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hr); + ok(playlist != NULL, "playlist == NULL\n"); + + if (0) /* fails on non-English locales */ + { + hr = IWMPPlaylist_get_name(playlist, &str); + ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + ok(!lstrcmpW(str, nameW), "Expected %s, got %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(str)); + SysFreeString(str); + } + + hr = IWMPPlaylist_get_count(playlist, NULL); + ok(hr == E_POINTER, "Failed to get count, hr %#x.\n", hr); + + count = -1; + hr = IWMPPlaylist_get_count(playlist, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(count == 0, "Expected 0, got %d\n", count); + + IWMPPlaylist_Release(playlist); + + /* newPlaylist doesn't change current playlist */ + hr = IWMPPlayer4_newPlaylist(player, NULL, NULL, &playlist); + ok(hr == S_OK, "Failed to create a playlist, hr %#x.\n", hr); + + playlist2 = NULL; + hr = IWMPPlayer4_get_currentPlaylist(player, &playlist2); + ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hr); + ok(playlist2 != NULL && playlist2 != playlist, "Unexpected playlist instance\n"); + + IWMPPlaylist_Release(playlist2); + + /* different playlists can have the same name */ + str = SysAllocString(nameW); + hr = IWMPPlaylist_put_name(playlist, str); + ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + + playlist2 = NULL; + hr = IWMPPlayer4_newPlaylist(player, str, NULL, &playlist2); + ok(hr == S_OK, "Failed to create a playlist, hr %#x.\n", hr); + hr = IWMPPlaylist_get_name(playlist2, &str2); + ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + ok(playlist != playlist2, "Expected playlists to be different"); + ok(!lstrcmpW(str, str2), "Expected names to be the same\n"); + SysFreeString(str); + SysFreeString(str2); + + IWMPPlaylist_Release(playlist2); + + IWMPPlaylist_Release(playlist); + IWMPPlayer4_Release(player); +} + START_TEST(media) { CoInitialize(NULL); @@ -674,6 +746,7 @@ START_TEST(media) playing_event = CreateEventW(NULL, FALSE, FALSE, NULL); completed_event = CreateEventW(NULL, FALSE, FALSE, NULL); + test_playlist(); test_media_item(); test_player_url(); if (test_wmp()) {

1 0

Gijs Vermeulen : wmp: Implement IWMPPlaylist::[get|put]_name.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: a3fe1f20c6c38d7525622a57a6e0578787d88d80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3fe1f20c6c38d7525622a57… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:57 2019 +0200 wmp: Implement IWMPPlaylist::[get|put]_name. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f846760..03a7d26 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -2049,15 +2049,22 @@ static HRESULT WINAPI WMPPlaylist_get_count(IWMPPlaylist *iface, LONG *count) static HRESULT WINAPI WMPPlaylist_get_name(IWMPPlaylist *iface, BSTR *name) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%p)\n", This, name); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, name); + + return return_bstr(This->name, name); } static HRESULT WINAPI WMPPlaylist_put_name(IWMPPlaylist *iface, BSTR name) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(name)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(name)); + + if (!name) return E_POINTER; + + This->name = heap_strdupW(name); + return S_OK; } static HRESULT WINAPI WMPPlaylist_get_attributeCount(IWMPPlaylist *iface, LONG *count)

1 0

Gijs Vermeulen : wmp: Fake success in IWMPPlaylist::appendItem.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 8f1d707737284a409a6240b4a8c1768f427f04d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1d707737284a409a6240b4… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:56 2019 +0200 wmp: Fake success in IWMPPlaylist::appendItem. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index cd729cb..f846760 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -2120,7 +2120,7 @@ static HRESULT WINAPI WMPPlaylist_appendItem(IWMPPlaylist *iface, IWMPMedia *med { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); FIXME("(%p)->(%p)\n", This, media); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WMPPlaylist_removeItem(IWMPPlaylist *iface, IWMPMedia *media)

1 0

Gijs Vermeulen : wmp: Implement IWMPPlaylist::get_count.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 188992a1d263afb83fb442547f34b465d3eeac33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=188992a1d263afb83fb44254… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:55 2019 +0200 wmp: Implement IWMPPlaylist::get_count. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 19 +++++++++++++------ dlls/wmp/wmp_private.h | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 9437124..cd729cb 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -297,7 +297,7 @@ static HRESULT WINAPI WMPPlayer4_get_currentPlaylist(IWMPPlayer4 *iface, IWMPPla if (This->playlist == NULL) return S_FALSE; - return create_playlist(This->playlist->name, This->playlist->url, playlist); + return create_playlist(This->playlist->name, This->playlist->url, This->playlist->count, playlist); } static HRESULT WINAPI WMPPlayer4_put_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist *pPL) @@ -355,7 +355,8 @@ static HRESULT WINAPI WMPPlayer4_newPlaylist(IWMPPlayer4 *iface, BSTR name, BSTR TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(name), debugstr_w(url), playlist); - return create_playlist(name, url, playlist); + /* FIXME: count should be the number of items in the playlist */ + return create_playlist(name, url, 0, playlist); } static HRESULT WINAPI WMPPlayer4_newMedia(IWMPPlayer4 *iface, BSTR url, IWMPMedia **media) @@ -2036,8 +2037,13 @@ static HRESULT WINAPI WMPPlaylist_Invoke(IWMPPlaylist *iface, DISPID dispIdMembe static HRESULT WINAPI WMPPlaylist_get_count(IWMPPlaylist *iface, LONG *count) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_POINTER; + *count = This->count; + + return S_OK; } static HRESULT WINAPI WMPPlaylist_get_name(IWMPPlaylist *iface, BSTR *name) @@ -2226,7 +2232,7 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->IWMPNetwork_iface.lpVtbl = &WMPNetworkVtbl; name = SysAllocString(nameW); - if (SUCCEEDED(create_playlist(name, NULL, &playlist))) + if (SUCCEEDED(create_playlist(name, NULL, 0, &playlist))) wmp->playlist = unsafe_impl_from_IWMPPlaylist(playlist); else wmp->playlist = NULL; @@ -2325,7 +2331,7 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) return E_OUTOFMEMORY; } -HRESULT create_playlist(BSTR name, BSTR url, IWMPPlaylist **ppPlaylist) +HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist) { WMPPlaylist *playlist; @@ -2337,6 +2343,7 @@ HRESULT create_playlist(BSTR name, BSTR url, IWMPPlaylist **ppPlaylist) playlist->url = url ? heap_strdupW(url) : heap_strdupW(emptyW); playlist->name = name ? heap_strdupW(name) : heap_strdupW(emptyW); playlist->ref = 1; + playlist->count = count; if (playlist->url) { diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 32b4e1f..e1a1e03 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -65,6 +65,7 @@ typedef struct { IWMPPlaylist IWMPPlaylist_iface; LONG ref; + LONG count; WCHAR *url; WCHAR *name; @@ -116,7 +117,7 @@ void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; WMPPlaylist *unsafe_impl_from_IWMPPlaylist(IWMPPlaylist *iface) DECLSPEC_HIDDEN; HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; -HRESULT create_playlist(BSTR name, BSTR url, IWMPPlaylist **ppPlaylist) DECLSPEC_HIDDEN; +HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) DECLSPEC_HIDDEN;

1 0

Gijs Vermeulen : wmp: Improve playlist creation.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 649e294886ec452afd99d43b764f67680ebce2ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=649e294886ec452afd99d43b… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:54 2019 +0200 wmp: Improve playlist creation. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 19 +++++++++++++++---- dlls/wmp/tests/oleobj.c | 4 +--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index de0f15b..9437124 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -286,11 +286,18 @@ static HRESULT WINAPI WMPPlayer4_get_network(IWMPPlayer4 *iface, IWMPNetwork **p return S_OK; } -static HRESULT WINAPI WMPPlayer4_get_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist **ppPL) +static HRESULT WINAPI WMPPlayer4_get_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist **playlist) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppPL); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, playlist); + + *playlist = NULL; + + if (This->playlist == NULL) + return S_FALSE; + + return create_playlist(This->playlist->name, This->playlist->url, playlist); } static HRESULT WINAPI WMPPlayer4_put_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist *pPL) @@ -2197,6 +2204,8 @@ void unregister_player_msg_class(void) { BOOL init_player(WindowsMediaPlayer *wmp) { IWMPPlaylist *playlist; + BSTR name; + static const WCHAR nameW[] = {'P','l','a','y','l','i','s','t','1',0}; InitOnceExecuteOnce(&class_init_once, register_player_msg_class, NULL, NULL); wmp->msg_window = CreateWindowW( MAKEINTRESOURCEW(player_msg_class), NULL, 0, 0, @@ -2216,10 +2225,12 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; wmp->IWMPNetwork_iface.lpVtbl = &WMPNetworkVtbl; - if (SUCCEEDED(create_playlist(NULL, NULL, &playlist))) + name = SysAllocString(nameW); + if (SUCCEEDED(create_playlist(name, NULL, &playlist))) wmp->playlist = unsafe_impl_from_IWMPPlaylist(playlist); else wmp->playlist = NULL; + SysFreeString(name); wmp->invoke_urls = VARIANT_TRUE; wmp->auto_start = VARIANT_TRUE; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index dbd9e93..db466bf 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -945,12 +945,10 @@ static void test_wmp_ifaces(IOleObject *oleobj) playlist = NULL; hres = IWMPPlayer4_get_currentPlaylist(player4, &playlist); -todo_wine { ok(hres == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hres); ok(playlist != NULL, "playlist != NULL\n"); -} - if (playlist) IWMPPlaylist_Release(playlist); + IWMPPlaylist_Release(playlist); media = NULL; hres = IWMPPlayer4_QueryInterface(player4, &IID_IWMPMedia, (void**)&media);

1 0

Alexandre Julliard : makefiles: Default to an msvcrt build for static libraries.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 2477aa7a1060837919a09da1ac0cd35ae06ea435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2477aa7a1060837919a09da1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 5 18:57:47 2019 +0200 makefiles: Default to an msvcrt build for static libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 2 -- dlls/winecrt0/Makefile.in | 2 -- tools/makedep.c | 4 +++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index d22e986..c58a359 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,7 +1,5 @@ MODULE = libstrmbase.a -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = \ dispatch.c \ dllfunc.c \ diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6edbd04..79ba92f 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,7 +1,5 @@ MODULE = libwinecrt0.a -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = \ debug.c \ delay_load.c \ diff --git a/tools/makedep.c b/tools/makedep.c index 24866b3..e37bd8d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4160,7 +4160,9 @@ static void load_sources( struct makefile *make ) make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; - if (make->testdll) strarray_add( &make->extradllflags, "-mno-cygwin" ); + + if ((make->module && make->staticlib) || make->testdll) + strarray_add( &make->extradllflags, "-mno-cygwin" ); strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" )); make->disabled = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir );

1 0

Zebediah Figura : strmbase: Build with msvcrt.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: fb504baaa80ae5f9af88a5a6c690668359ddb4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb504baaa80ae5f9af88a5a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:58 2019 -0500 strmbase: Build with msvcrt. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/Makefile.in | 2 + dlls/evr/Makefile.in | 2 + dlls/evr/evr.c | 1 - dlls/evr/main.c | 2 - dlls/qedit/Makefile.in | 2 + dlls/quartz/Makefile.in | 2 + dlls/quartz/acmwrapper.c | 3 -- dlls/quartz/avidec.c | 3 -- dlls/quartz/avisplit.c | 1 - dlls/quartz/dsoundrender.c | 3 -- dlls/quartz/enumregfilters.c | 9 ++-- dlls/quartz/filesource.c | 39 ++++++++------- dlls/quartz/filtergraph.c | 12 ++--- dlls/quartz/filtermapper.c | 101 +++++++++++++++++++-------------------- dlls/quartz/main.c | 4 +- dlls/quartz/mpegsplit.c | 1 - dlls/quartz/parser.c | 1 - dlls/quartz/pin.c | 3 +- dlls/quartz/quartz_private.h | 1 + dlls/quartz/regsvr.c | 1 - dlls/quartz/systemclock.c | 1 - dlls/quartz/videorenderer.c | 3 -- dlls/quartz/vmr9.c | 3 -- dlls/quartz/waveparser.c | 1 - dlls/strmbase/Makefile.in | 2 + dlls/strmbase/strmbase_private.h | 1 - 26 files changed, 91 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb504baaa80ae5f9af88…

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
71
Older →

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 August 2019