[PATCH 3/7] wmp: Add OPEN/PLAY state change notifications
Anton Romanov
theli.ua at gmail.com
Mon Mar 12 23:34:51 CDT 2018
Signed-off-by: Anton Romanov <theli.ua at gmail.com>
---
dlls/wmp/events.c | 11 ++++
dlls/wmp/oleobj.c | 2 +-
dlls/wmp/player.c | 44 ++++++++++++++
dlls/wmp/tests/media.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++--
dlls/wmp/wmp_main.c | 1 +
dlls/wmp/wmp_private.h | 3 +-
include/wmpids.h | 63 ++++++++++++++++++++
7 files changed, 269 insertions(+), 7 deletions(-)
create mode 100644 include/wmpids.h
diff --git a/dlls/wmp/events.c b/dlls/wmp/events.c
index a908834010..412eb307d1 100644
--- a/dlls/wmp/events.c
+++ b/dlls/wmp/events.c
@@ -400,3 +400,14 @@ void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp)
{
ConnectionPoint_Destroy(wmp->wmpocx);
}
+
+void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams)
+{
+ DWORD i;
+
+ for(i=0; i<This->sinks_size; i++) {
+ if(This->sinks[i])
+ IDispatch_Invoke(This->sinks[i], dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT,
+ DISPATCH_METHOD, dispparams, NULL, NULL, NULL);
+ }
+}
diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c
index cc0e9a9d98..cbf183c1f6 100644
--- a/dlls/wmp/oleobj.c
+++ b/dlls/wmp/oleobj.c
@@ -307,8 +307,8 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface)
if(!ref) {
release_client_site(This);
- ConnectionPointContainer_Destroy(This);
destroy_player(This);
+ ConnectionPointContainer_Destroy(This);
heap_free(This);
}
diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c
index a36fa36eed..81ce9f2969 100644
--- a/dlls/wmp/player.c
+++ b/dlls/wmp/player.c
@@ -20,9 +20,12 @@
#include "wine/debug.h"
#include <nserror.h>
+#include "wmpids.h"
WINE_DEFAULT_DEBUG_CHANNEL(wmp);
+static void update_state(WindowsMediaPlayer *wmp, LONG type, LONG state);
+
static inline WMPMedia *impl_from_IWMPMedia(IWMPMedia *iface)
{
return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface);
@@ -125,14 +128,20 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url)
if(url == NULL) {
return E_POINTER;
}
+
hres = create_media_from_url(url, &media);
+
if (SUCCEEDED(hres)) {
+ update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, WMP_PLAY_STATE_TRANSITIONING);
hres = IWMPPlayer4_put_currentMedia(iface, media);
IWMPMedia_Release(media); /* put will addref */
+
+ update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, WMP_PLAY_STATE_READY);
}
if (SUCCEEDED(hres) && This->auto_start) {
hres = IWMPControls_play(&This->IWMPControls_iface);
}
+
return hres;
}
@@ -191,9 +200,13 @@ static HRESULT WINAPI WMPPlayer4_put_currentMedia(IWMPPlayer4 *iface, IWMPMedia
if(pMedia == NULL) {
return E_POINTER;
}
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, WMP_OPEN_STATE_PLAYLIST_CHANGING);
if(This->wmpmedia != NULL) {
IWMPMedia_Release(This->wmpmedia);
}
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, WMP_OPEN_STATE_PLAYLIST_CHANGED);
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, WMP_OPEN_STATE_PLAYLIST_OPEN_NO_MEDIA);
+
This->wmpmedia = pMedia;
IWMPMedia_AddRef(This->wmpmedia);
return S_OK;
@@ -1380,12 +1393,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface)
CLSCTX_INPROC_SERVER,
&IID_IGraphBuilder,
(void **)&This->pFilterGraph);
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, WMP_OPEN_STATE_OPENING_UNKNOWN_URL);
+
if (SUCCEEDED(hres))
hres = IGraphBuilder_RenderFile(This->pFilterGraph, media->url, NULL);
if (SUCCEEDED(hres))
hres = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl,
(void**)&This->media_control);
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, WMP_OPEN_STATE_MEDIA_OPEN);
}
+ update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, WMP_PLAY_STATE_TRANSITIONING);
hres = IMediaControl_Run(This->media_control);
if (hres == S_FALSE) {
OAFilterState fs;
@@ -1394,6 +1411,12 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface)
hres = S_FALSE;
}
}
+ if (SUCCEEDED(hres)) {
+ update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, WMP_PLAY_STATE_PLAYING);
+ } else {
+ update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, WMP_PLAY_STATE_UNDEFINED);
+ }
+
return hres;
}
@@ -1405,6 +1428,8 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface)
if (!This->pFilterGraph) {
return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE;
}
+ update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, WMP_PLAY_STATE_TRANSITIONING);
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, WMP_OPEN_STATE_MEDIA_CHANGING);
hres = IMediaControl_Stop(This->media_control);
if(This->pFilterGraph)
IGraphBuilder_Release(This->pFilterGraph);
@@ -1412,6 +1437,8 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface)
IMediaControl_Release(This->media_control);
This->pFilterGraph = NULL;
This->media_control = NULL;
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, WMP_OPEN_STATE_PLAYLIST_OPEN_NO_MEDIA);
+ update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, WMP_PLAY_STATE_STOPPED);
return hres;
}
@@ -1807,3 +1834,20 @@ HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia)
IWMPMedia_Release(&media->IWMPMedia_iface);
return E_OUTOFMEMORY;
}
+
+static void update_state(WindowsMediaPlayer *wmp, LONG type, LONG state)
+{
+ DISPPARAMS dispparams;
+ VARIANTARG params[1];
+
+ dispparams.cArgs = 1;
+ dispparams.cNamedArgs = 0;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = params;
+
+ V_VT(params) = VT_UI4;
+ V_UI4(params) = state;
+
+ call_sink(wmp->wmpocx, type,
+ &dispparams);
+}
diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c
index 191ed6547e..a6ed14b316 100644
--- a/dlls/wmp/tests/media.c
+++ b/dlls/wmp/tests/media.c
@@ -19,9 +19,31 @@
#include <wmp.h>
#include <olectl.h>
#include <nserror.h>
+#include <wmpids.h>
#include "wine/test.h"
+#define DEFINE_EXPECT(func) \
+ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE
+
+#define SET_EXPECT(func) \
+ expect_ ## func = TRUE
+
+#define CHECK_EXPECT(func) \
+ do { \
+ ok(expect_ ##func, "unexpected call " #func "\n"); \
+ called_ ## func = TRUE; \
+ }while(0)
+
+#define CHECK_CALLED(func) \
+ do { \
+ ok(called_ ## func, "expected " #func "\n"); \
+ expect_ ## func = called_ ## func = FALSE; \
+ }while(0)
+
+DEFINE_EXPECT(PLAYSTATE_CHANGE);
+DEFINE_EXPECT(OPENSTATE_CHANGE);
+
static const WCHAR mp4file[] = {'a','v','.','m','p','4',0};
static inline WCHAR *load_resource(const WCHAR *name)
{
@@ -48,14 +70,101 @@ static inline WCHAR *load_resource(const WCHAR *name)
return pathW;
}
+static ULONG WINAPI Dispatch_AddRef(IDispatch *iface)
+{
+ return 2;
+}
+
+static ULONG WINAPI Dispatch_Release(IDispatch *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid,
+ ITypeInfo **ppTInfo)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames,
+ UINT cNames, LCID lcid, DISPID *rgDispId)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI WMPOCXEvents_QueryInterface(IDispatch *iface, REFIID riid, void **ppv)
+{
+ *ppv = NULL;
+
+ if(IsEqualGUID(&IID__WMPOCXEvents, riid) || IsEqualGUID(&IID_IDispatch, riid)) {
+ *ppv = iface;
+ return S_OK;
+ }
+
+ ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid));
+ return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI WMPOCXEvents_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid,
+ LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
+ EXCEPINFO *pExcepInfo, UINT *puArgErr)
+{
+ switch(dispIdMember) {
+ /* Uncomment below traces to debug wmp events */
+ case DISPID_WMPCOREEVENT_OPENSTATECHANGE:
+ CHECK_EXPECT(OPENSTATE_CHANGE);
+ /*trace("DISPID_WMPCOREEVENT_OPENSTATECHANGE, %d\n", V_UI4(pDispParams->rgvarg));*/
+ break;
+ case DISPID_WMPCOREEVENT_PLAYSTATECHANGE:
+ CHECK_EXPECT(PLAYSTATE_CHANGE);
+ /*trace("DISPID_WMPCOREEVENT_PLAYSTATECHANGE, %d\n", V_UI4(pDispParams->rgvarg));*/
+ break;
+ case DISPID_WMPCOREEVENT_MEDIACHANGE:
+ /*trace("DISPID_WMPCOREEVENT_MEDIACHANGE\n");*/
+ break;
+ case DISPID_WMPCOREEVENT_CURRENTITEMCHANGE:
+ /*trace("DISPID_WMPCOREEVENT_CURRENTITEMCHANGE\n");*/
+ break;
+ default:
+ /*trace("event: %d\n", dispIdMember);*/
+ break;
+ }
+
+ return E_NOTIMPL;
+}
+
+static IDispatchVtbl WMPOcxEventsVtbl = {
+ WMPOCXEvents_QueryInterface,
+ Dispatch_AddRef,
+ Dispatch_Release,
+ Dispatch_GetTypeInfoCount,
+ Dispatch_GetTypeInfo,
+ Dispatch_GetIDsOfNames,
+ WMPOCXEvents_Invoke,
+};
+
+static IDispatch WMPOCXEvents = { &WMPOcxEventsVtbl };
+
+
static void test_wmp(void)
{
IWMPPlayer4 *player4;
IWMPControls *controls;
HRESULT hres;
BSTR filename;
-
+ IConnectionPointContainer *container;
+ IConnectionPoint *point;
IOleObject *oleobj;
+ static DWORD dw = 100;
+ IWMPSettings *settings;
hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj);
if(hres == REGDB_E_CLASSNOTREG) {
@@ -64,9 +173,30 @@ static void test_wmp(void)
}
ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres);
+ hres = IOleObject_QueryInterface(oleobj, &IID_IConnectionPointContainer, (void**)&container);
+ ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres);
+ if(FAILED(hres))
+ return;
+
+ hres = IConnectionPointContainer_FindConnectionPoint(container, &IID__WMPOCXEvents, &point);
+ IConnectionPointContainer_Release(container);
+ ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres);
+
+ hres = IConnectionPoint_Advise(point, (IUnknown*)&WMPOCXEvents, &dw);
+ ok(hres == S_OK, "Advise failed: %08x\n", hres);
+
hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4);
ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres);
+ settings = NULL;
+ hres = IWMPPlayer4_get_settings(player4, &settings);
+ ok(hres == S_OK, "get_settings failed: %08x\n", hres);
+ ok(settings != NULL, "settings = NULL\n");
+
+ hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE);
+ ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres);
+ IWMPSettings_Release(settings);
+
controls = NULL;
hres = IWMPPlayer4_get_controls(player4, &controls);
ok(hres == S_OK, "get_controls failed: %08x\n", hres);
@@ -77,23 +207,35 @@ static void test_wmp(void)
filename = SysAllocString(load_resource(mp4file));
+ SET_EXPECT(OPENSTATE_CHANGE);
+ SET_EXPECT(PLAYSTATE_CHANGE);
hres = IWMPPlayer4_put_URL(player4, filename);
ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres);
+ CHECK_CALLED(OPENSTATE_CHANGE);
+ CHECK_CALLED(PLAYSTATE_CHANGE);
+ SET_EXPECT(OPENSTATE_CHANGE);
+ SET_EXPECT(PLAYSTATE_CHANGE);
hres = IWMPControls_play(controls);
- todo_wine
- ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres);
+ ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres);
+ CHECK_CALLED(OPENSTATE_CHANGE);
+ CHECK_CALLED(PLAYSTATE_CHANGE);
+ SET_EXPECT(OPENSTATE_CHANGE);
+ SET_EXPECT(PLAYSTATE_CHANGE);
hres = IWMPControls_stop(controls);
ok(hres == S_OK, "IWMPControls_stop failed: %08x\n", hres);
+ CHECK_CALLED(OPENSTATE_CHANGE);
+ CHECK_CALLED(PLAYSTATE_CHANGE);
/* Already Stopped */
hres = IWMPControls_stop(controls);
ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_stop is available: %08x\n", hres);
- hres = IWMPControls_play(controls);
- ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres);
+ hres = IConnectionPoint_Unadvise(point, dw);
+ ok(hres == S_OK, "Unadvise failed: %08x\n", hres);
+ IConnectionPoint_Release(point);
IWMPControls_Release(controls);
IWMPPlayer4_Release(player4);
IOleObject_Release(oleobj);
diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c
index 29b096f7fd..9a33b2762b 100644
--- a/dlls/wmp/wmp_main.c
+++ b/dlls/wmp/wmp_main.c
@@ -25,6 +25,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(wmp);
HINSTANCE wmp_instance;
+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
{
diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h
index 240a91803c..b2077fe77d 100644
--- a/dlls/wmp/wmp_private.h
+++ b/dlls/wmp/wmp_private.h
@@ -79,9 +79,10 @@ struct WindowsMediaPlayer {
void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN;
void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN;
-HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia);
+HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) 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;
HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
diff --git a/include/wmpids.h b/include/wmpids.h
new file mode 100644
index 0000000000..2b47f7fc55
--- /dev/null
+++ b/include/wmpids.h
@@ -0,0 +1,63 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+/* play state */
+#define WMP_PLAY_STATE_UNDEFINED 0
+#define WMP_PLAY_STATE_STOPPED 1
+#define WMP_PLAY_STATE_PAUSED 2
+#define WMP_PLAY_STATE_PLAYING 3
+#define WMP_PLAY_STATE_SCAN_FORWARD 4
+#define WMP_PLAY_STATE_SCAN_REVERSE 5
+#define WMP_PLAY_STATE_BUFFERING 6
+#define WMP_PLAY_STATE_WAITING 7
+#define WMP_PLAY_STATE_MEDIA_ENDED 8
+#define WMP_PLAY_STATE_TRANSITIONING 9
+#define WMP_PLAY_STATE_READY 10
+#define WMP_PLAY_STATE_RECONNECTING 11
+
+/* open state */
+#define WMP_OPEN_STATE_UNDEFINED 0
+#define WMP_OPEN_STATE_PLAYLIST_CHANGING 1
+#define WMP_OPEN_STATE_PLAYLIST_LOCATING 2
+#define WMP_OPEN_STATE_PLAYLIST_CONNECTING 3
+#define WMP_OPEN_STATE_PLAYLIST_LOADING 4
+#define WMP_OPEN_STATE_PLAYLIST_OPENGING 5
+#define WMP_OPEN_STATE_PLAYLIST_OPEN_NO_MEDIA 6
+#define WMP_OPEN_STATE_PLAYLIST_CHANGED 7
+#define WMP_OPEN_STATE_MEDIA_CHANGING 8
+#define WMP_OPEN_STATE_MEDIA_LOCATING 9
+#define WMP_OPEN_STATE_MEDIA_CONNECTING 10
+#define WMP_OPEN_STATE_MEDIA_LOADING 11
+#define WMP_OPEN_STATE_MEDIA_OPENING 12
+#define WMP_OPEN_STATE_MEDIA_OPEN 13
+#define WMP_OPEN_STATE_BEGIN_CODEC_ACQUISITION 14
+#define WMP_OPEN_STATE_END_CODEC_ACQUISITION 15
+#define WMP_OPEN_STATE_BEGIN_LICENSE_ACQUISITION 16
+#define WMP_OPEN_STATE_END_LICENSE_ACQUISITION 17
+#define WMP_OPEN_STATE_BEGIN_INDIVIDUALIZATION 18
+#define WMP_OPEN_STATE_END_INDIVIDUALIZATION 19
+#define WMP_OPEN_STATE_MEDIA_WAITING 20
+#define WMP_OPEN_STATE_OPENING_UNKNOWN_URL 21
+
+/* WMPCoreEvents */
+#define DISPID_WMPCOREEVENT_OPENSTATECHANGE 5001
+#define DISPID_WMPCOREEVENT_STATUSCHANGE 5002
+
+#define DISPID_WMPCOREEVENT_PLAYSTATECHANGE 5101
+
+#define DISPID_WMPCOREEVENT_MEDIACHANGE 5802
+#define DISPID_WMPCOREEVENT_CURRENTITEMCHANGE 5806
--
2.16.2
More information about the wine-devel
mailing list