ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmp: Stub IWMPNetwork get download/buffering progress. 

Signed-off-by: Anton Romanov <theli.ua@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Anton Romanov 2018-04-19 22:45:31 -07:00 committed by Alexandre Julliard
parent a7124722aa
commit 6e2c611870
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/wmp/player.c
View File

@ -1150,8 +1150,17 @@ static HRESULT WINAPI WMPNetwork_get_bufferingCount(IWMPNetwork *iface, LONG *pl
static HRESULT WINAPI WMPNetwork_get_bufferingProgress(IWMPNetwork *iface, LONG *plBufferingProgress)
{
WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface);
FIXME("(%p)->(%p)\n", This, plBufferingProgress);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, plBufferingProgress);
if (!This->filter_graph) {
return S_FALSE;
}
/* Ideally we would use IAMOpenProgress for URL reader but we don't have it in wine (yet)
* For file sources FileAsyncReader->Length should work
* */
FIXME("stub: Returning buffering progress 100\n");
*plBufferingProgress = 100;
return S_OK;
}
static HRESULT WINAPI WMPNetwork_get_bufferingTime(IWMPNetwork *iface, LONG *plBufferingTime)
@ -1276,8 +1285,18 @@ static HRESULT WINAPI WMPNetwork_put_maxBandwidth(IWMPNetwork *iface, LONG lMaxB
static HRESULT WINAPI WMPNetwork_get_downloadProgress(IWMPNetwork *iface, LONG *plDownloadProgress)
{
WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface);
FIXME("(%p)->(%p)\n", This, plDownloadProgress);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, plDownloadProgress);
if (!This->filter_graph) {
return S_FALSE;
}
/* Ideally we would use IAMOpenProgress for URL reader but we don't have it in wine (yet)
* For file sources FileAsyncReader->Length could work or it should just be
* 100
* */
FIXME("stub: Returning download progress 100\n");
*plDownloadProgress = 100;
return S_OK;
}
static HRESULT WINAPI WMPNetwork_get_encodedFrameRate(IWMPNetwork *iface, LONG *plFrameRate)

16
dlls/wmp/tests/media.c
View File

@ -303,8 +303,10 @@ static BOOL test_wmp(void)
static DWORD dw = 100;
IWMPSettings *settings;
BOOL test_ran = TRUE;
IWMPNetwork *network;
DOUBLE duration;
VARIANT_BOOL vbool;
LONG progress;
IWMPMedia *media;
static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0};
BSTR bstrcurrentPosition = SysAllocString(currentPosition);
@ -416,6 +418,20 @@ static BOOL test_wmp(void)
ok(round(duration) == 3, "unexpected value: %f\n", duration);
IWMPMedia_Release(media);
network = NULL;
hres = IWMPPlayer4_get_network(player4, &network);
ok(hres == S_OK, "get_network failed: %08x\n", hres);
ok(network != NULL, "network = NULL\n");
progress = 0;
hres = IWMPNetwork_get_bufferingProgress(network, &progress);
ok(hres == S_OK || broken(hres == S_FALSE), "IWMPNetwork_get_bufferingProgress failed: %08x\n", hres);
ok(progress == 100, "unexpected value: %d\n", progress);
progress = 0;
hres = IWMPNetwork_get_downloadProgress(network, &progress);
ok(hres == S_OK, "IWMPNetwork_get_downloadProgress failed: %08x\n", hres);
ok(progress == 100, "unexpected value: %d\n", progress);
IWMPNetwork_Release(network);
SET_EXPECT(PLAYSTATE, wmppsStopped);
/* The following happens on wine only since we close media on stop */
SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia);