April 2018 - Wine-devel - list.winehq.org

[PATCH v12 REBASE 1/2] wmp: Stub IWMPNetwork get download/buffering progress
by Anton Romanov 20 Apr '18

20 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wmp/player.c | 27 +++++++++++++++++++++++---- dlls/wmp/tests/media.c | 16 ++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 0a6d598dc2..df395cb7c7 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -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) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 2372763d25..fbbd329add 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -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); -- 2.17.0

1 1

[PATCH] include/winuser.h: add tagDROPSTRUCT struct
by Austin English 20 Apr '18

20 Apr '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45026 Note: it doesn't yet build. I plan to submit more fixes over the next few weeks as time permits. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- include/winuser.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 86cdbf6a15..3501af53f6 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2148,6 +2148,16 @@ typedef struct tagCBTACTIVATESTRUCT } CBTACTIVATESTRUCT, *LPCBTACTIVATESTRUCT; +typedef struct tagDROPSTRUCT +{ + HWND hwndSource; + HWND hwndSink; + DWORD wFmt; + ULONG_PTR dwData; + POINT ptDrop; + DWORD dwControlData; +} DROPSTRUCT, *PDROPSTRUCT, *LPDROPSTRUCT; + /* modifiers for RegisterHotKey */ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002 -- 2.16.1

1 0

[PATCH] include/roapi.h: Add further typedefs.
by Alistair Leslie-Hughes 19 Apr '18

19 Apr '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/roapi.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/roapi.h b/include/roapi.h index 0421fe9..f4154f8 100644 --- a/include/roapi.h +++ b/include/roapi.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Martin Storsjo + * Copyright (C) 2016 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +21,7 @@ #define __WINE_ROAPI_H #include <windef.h> +#include <activation.h> typedef enum { @@ -27,6 +29,11 @@ typedef enum RO_INIT_MULTITHREADED = 1, } RO_INIT_TYPE; +DECLARE_HANDLE(APARTMENT_SHUTDOWN_REGISTRATION_COOKIE); + +typedef struct {} *RO_REGISTRATION_COOKIE; +typedef HRESULT (WINAPI *PFNGETACTIVATIONFACTORY)(HSTRING, IActivationFactory **); + #ifdef __cplusplus extern "C" { #endif -- 1.9.1

1 0

[PATCH] include: Add more constants to SYSTEM_INFORMATION_CLASS.
by Alistair Leslie-Hughes 19 Apr '18

19 Apr '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winternl.h | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index ed54229..c84e6d7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -929,26 +929,34 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemVerifierInformation = 51, SystemAddVerifier = 52, SystemSessionProcessesInformation = 53, - Unknown54, - Unknown55, - Unknown56, - Unknown57, + SystemLoadGdiDriverInSystemSpace = 54, + SystemNumaProcessorMap = 55, + SystemPrefetcherInformation = 56, + SystemExtendedProcessInformation = 57, SystemRecommendedSharedDataAlignment = 58, - Unknown59, - Unknown60, - Unknown61, - Unknown62, - Unknown63, - Unknown64, - Unknown65, - Unknown66, - Unknown67, - Unknown68, - Unknown69, - Unknown70, - Unknown71, - Unknown72, + SystemComPlusPackage = 59, + SystemNumaAvailableMemory = 60, + SystemProcessorPowerInformation = 61, + SystemEmulationBasicInformation = 62, + SystemEmulationProcessorInformation = 63, + SystemExtendedHandleInformation = 64, + SystemLostDelayedWriteInformation = 65, + SystemBigPoolInformation = 66, + SystemSessionPoolTagInformation = 67, + SystemSessionMappedViewInformation = 68, + SystemHotpatchInformation = 69, + SystemObjectSecurityMode = 70, + SystemWatchdogTimerHandler = 71, + SystemWatchdogTimerInformation = 72, SystemLogicalProcessorInformation = 73, + SystemWow64SharedInformation = 74, + SystemRegisterFirmwareTableInformationHandler = 75, + SystemFirmwareTableInformation = 76, + SystemModuleInformationEx = 77, + SystemVerifierTriageInformation = 78, + SystemSuperfetchInformation = 79, + SystemMemoryListInformation = 80, + SystemFileCacheInformationEx = 81, SystemLogicalProcessorInformationEx = 107, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- 1.9.1

1 0

[PATCH 7/7] wsdapi: Add MetadataVersion to Hello message.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 7 +++++++ dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

2 1

[PATCH 6/7] wsdapi/tests: Add tests for Scopes and XAddrs lists.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)

2 1

[PATCH 4/7] wsdapi/tests: Add tests for Types list.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)

2 1

[PATCH 2/7] wsdapi/tests: Add test for endpoint reference "any" parameter.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

2 1

[PATCH 1/7] wsdapi: Write EndPointReference section in Hello message body.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 21 +++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-)

2 1

[PATCH 5/7] wsdapi: Build and write Scopes and XAddrs lists for Hello message.
by Owen Rudge 19 Apr '18

19 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)

1 0