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

Nikolay Sivov : dwrite: Add recent script properties.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: cd7dd5e8959fb5190d1417d9033be9d009169b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd7dd5e8959fb5190d1417d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 5 13:59:02 2019 +0300 dwrite: Add recent script properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 +++++++ dlls/dwrite/scripts.h | 9 ++++++++- tools/make_unicode | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8e58e61..7fc955e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -187,6 +187,13 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Nshu */ { 0x7568734e, 499, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, { _OT('n','s','h','u') } }, { /* Soyo */ { 0x6f796f53, 329, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','y','o') } }, { /* Zanb */ { 0x626e615a, 339, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('z','a','n','b') } }, + { /* Dogr */ { 0x72676f44, 328, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('d','o','g','r') } }, + { /* Gong */ { 0x676e6f47, 312, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('g','o','n','g') } }, + { /* Rohg */ { 0x67686f52, 167, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 }, { _OT('r','o','h','g') } }, + { /* Maka */ { 0x616b614d, 366, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','a','k','a') } }, + { /* Medf */ { 0x6664654d, 265, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','e','d','f') } }, + { /* Sogo */ { 0x6f676f53, 142, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','g','o') } }, + { /* Sogd */ { 0x64676f53, 141, 8, 0x0020, 1, 1, 0, 0, 0, 1, 1 }, { _OT('s','o','g','d') } }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index ebf97f3..b3cc8fc 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -145,5 +145,12 @@ enum unicode_script_id { Script_Nushu = 139, Script_Soyombo = 140, Script_Zanabazar_Square = 141, - Script_LastId = 141 + Script_Dogra = 142, + Script_Gunjala_Gondi = 143, + Script_Hanifi_Rohingya = 144, + Script_Makasar = 145, + Script_Medefaidrin = 146, + Script_Old_Sogdian = 147, + Script_Sogdian = 148, + Script_LastId = 148 }; diff --git a/tools/make_unicode b/tools/make_unicode index 4b79668..8f99be2 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1547,6 +1547,14 @@ my %scripts = "Nushu" => 139, "Soyombo" => 140, "Zanabazar_Square" => 141, + # Win10 1903 + "Dogra" => 142, + "Gunjala_Gondi" => 143, + "Hanifi_Rohingya" => 144, + "Makasar" => 145, + "Medefaidrin" => 146, + "Old_Sogdian" => 147, + "Sogdian" => 148, ); ################################################################

1 0

Zebediah Figura : qcap: Share source with strmbase.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 4c2c98934154e2587348d45b1d4b05e66f253830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c2c98934154e2587348d45b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:55 2019 -0500 qcap: Share source with strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index e161e06..12cc917 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,13 +1,19 @@ MODULE = qcap.dll -IMPORTS = strmiids strmbase uuid ole32 oleaut32 gdi32 advapi32 +IMPORTS = strmiids uuid ole32 oleaut32 gdi32 advapi32 DELAYIMPORTS = msvfw32 +PARENTSRC = ../strmbase C_SRCS = \ audiorecord.c \ avico.c \ avimux.c \ capturegraph.c \ + dllfunc.c \ enummedia.c \ + enumpins.c \ + filter.c \ + mediatype.c \ + pin.c \ qcap_main.c \ smartteefilter.c \ v4l.c \

1 0

Zebediah Figura : winegstreamer: Share source with strmbase.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: abdaa6f21f672c882ab60583d822789154cefecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=abdaa6f21f672c882ab60583… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:56 2019 -0500 winegstreamer: Share source with strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 437915f..08adb2b 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,14 +1,23 @@ MODULE = winegstreamer.dll -IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid +IMPORTS = strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) +PARENTSRC = ../strmbase C_SRCS = \ + dllfunc.c \ + enumpins.c \ + filter.c \ gst_cbs.c \ gstdemux.c \ gsttffilter.c \ main.c \ - mfplat.c + mediatype.c \ + mfplat.c \ + pin.c \ + qualitycontrol.c \ + seeking.c \ + transform.c IDL_SRCS = mfplat.idl

1 0

Zebediah Figura : wineqtdecoder: Share source with strmbase.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 0e55edaac5314ced74142a128ac1b8f38e02a01d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e55edaac5314ced74142a12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:57 2019 -0500 wineqtdecoder: Share source with strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index c49d3f6..1b97740 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -1,13 +1,22 @@ MODULE = wineqtdecoder.dll -IMPORTS = strmiids strmbase uuid ole32 advapi32 +IMPORTS = strmiids uuid ole32 advapi32 EXTRALIBS = $(QUICKTIME_LIBS) +PARENTSRC = ../strmbase C_SRCS = \ + dllfunc.c \ + enumpins.c \ + filter.c \ main.c \ + mediatype.c \ + pin.c \ qtdatahandler.c \ qtsplitter.c \ qtutils.c \ - qtvdecoder.c + qtvdecoder.c \ + qualitycontrol.c \ + seeking.c \ + transform.c RC_SRCS = \ rsrc.rc

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

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

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

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