April 2021 - Wine-Commits - list.winehq.org

Hans Leidekker : wldap32/tests: Add ber_printf/scanf tests.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 842987cd12057cfe757a4a1df03945840b4cf8c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842987cd12057cfe757a4a1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:53 2021 +0200 wldap32/tests: Add ber_printf/scanf tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/tests/Makefile.in | 1 + dlls/wldap32/tests/ber.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index 6df015083e8..05fe5b9af6d 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = wldap32.dll IMPORTS = wldap32 C_SRCS = \ + ber.c \ parse.c diff --git a/dlls/wldap32/tests/ber.c b/dlls/wldap32/tests/ber.c new file mode 100644 index 00000000000..56d54fa6f5a --- /dev/null +++ b/dlls/wldap32/tests/ber.c @@ -0,0 +1,72 @@ +/* + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winldap.h> +#include <winber.h> + +#include "wine/test.h" + +static void test_ber_printf(void) +{ + int ret; + BerElement *ber; + struct berval *bv; + + ber = ber_alloc_t( 0 ); + todo_wine ok( ber == NULL, "ber_alloc_t succeeded\n" ); + + ber = ber_alloc_t( LBER_USE_DER ); + ok( ber != NULL, "ber_alloc_t failed\n" ); + + ret = ber_printf( ber, (char *)"{i}", -1 ); + todo_wine ok( !ret, "got %d\n", ret ); + + ret = ber_flatten( ber, &bv ); + ok( !ret, "got %d\n", ret ); + todo_wine ok( bv->bv_len == 12, "got %d\n", bv->bv_len ); + if (bv->bv_len == 12) ok( !memcmp( bv->bv_val, "0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff", 12 ), "got %s\n", + wine_dbgstr_an(bv->bv_val, 12) ); + ber_bvfree( bv ); + ber_free( ber, 1 ); +} + +static void test_ber_scanf(void) +{ + int ret; + BerElement *ber; + struct berval bv = { 12, (char *)"0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff" }; + int i; + + ber = ber_init( &bv ); + ok( ber != NULL, "ber_init failed\n" ); + + i = 0; + ret = ber_scanf( ber, (char *)"{i}", &i ); + ok( !ret, "got %d\n", ret ); + ok( i == -1, "got %d\n", i ); + ber_free( ber, 1 ); +} + +START_TEST(ber) +{ + test_ber_printf(); + test_ber_scanf(); +}

1 0

Rémi Bernon : user32/tests: Add a test for SetCursorPos / SetWindowPos interactions.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 6d6b42024321e576ae58c3c4e36b34b0902f23c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6b42024321e576ae58c3c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 6 17:47:38 2021 +0200 user32/tests: Add a test for SetCursorPos / SetWindowPos interactions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 63163b7ed01..1fd9383e80a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3186,6 +3186,24 @@ static DWORD WINAPI create_static_win(void *arg) return 0; } +static LRESULT CALLBACK mouse_move_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + static DWORD last_x = 200, expect_x = 210; + + if (msg == WM_MOUSEMOVE) + { + POINT pt = {LOWORD(lparam), HIWORD(lparam)}; + MapWindowPoints(hwnd, NULL, &pt, 1); + + if (pt.x != last_x) todo_wine ok( pt.x == expect_x, "got unexpected WM_MOUSEMOVE x %d, expected %d\n", pt.x, expect_x ); + + expect_x = pt.x == 200 ? 210 : 200; + last_x = pt.x; + } + + return DefWindowProcW(hwnd, msg, wparam, lparam); +} + static void test_Input_mouse(void) { BOOL got_button_down, got_button_up; @@ -3412,6 +3430,36 @@ static void test_Input_mouse(void) CloseHandle(thread_data.start_event); CloseHandle(thread_data.end_event); DestroyWindow(button_win); + + SetCursorPos(200, 200); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + + /* warm up test case by moving cursor and window a bit first */ + SetCursorPos(210, 200); + SetWindowPos(hwnd, NULL, 110, 100, 0, 0, SWP_NOSIZE); + empty_message_queue(); + SetCursorPos(200, 200); + SetWindowPos(hwnd, NULL, 100, 100, 0, 0, SWP_NOSIZE); + empty_message_queue(); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)mouse_move_wndproc); + + SetCursorPos(210, 200); + SetWindowPos(hwnd, NULL, 110, 100, 0, 0, SWP_NOSIZE); + empty_message_queue(); + GetCursorPos(&pt); + todo_wine ok(pt.x == 210 && pt.y == 200, "GetCursorPos returned %dx%d, expected 210x200\n", pt.x, pt.y); + + SetCursorPos(200, 200); + SetWindowPos(hwnd, NULL, 100, 100, 0, 0, SWP_NOSIZE); + empty_message_queue(); + GetCursorPos(&pt); + todo_wine ok(pt.x == 200 && pt.y == 200, "GetCursorPos returned %dx%d, expected 200x200\n", pt.x, pt.y); + + SetCursorPos(pt_org.x, pt_org.y); + empty_message_queue(); + DestroyWindow(hwnd); }

1 0

Hans Leidekker : include: Add winber.h.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 3f25be74fc3a2c8e1cbe6cf980d0e31b617064a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f25be74fc3a2c8e1cbe6cf9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:51 2021 +0200 include: Add winber.h. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winber.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/winber.h b/include/winber.h new file mode 100644 index 00000000000..40ab0f40ed8 --- /dev/null +++ b/include/winber.h @@ -0,0 +1,37 @@ +/* + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#ifndef __WINE_WINBER_H +#define __WINE_WINBER_H + +#define LBER_ERROR (~0L) +#define LBER_DEFAULT (~0L) + +typedef int ber_int_t; +typedef unsigned int ber_tag_t; +typedef unsigned int ber_len_t; + +BerElement * CDECL ber_alloc_t( int ); +void CDECL ber_bvfree( BERVAL * ); +int CDECL ber_flatten( BerElement *, BERVAL ** ); +void CDECL ber_free( BerElement *, int ); +BerElement * CDECL ber_init( BERVAL * ); +int WINAPIV ber_printf( BerElement *, char *, ... ); +ULONG WINAPIV ber_scanf( BerElement *, char *, ... ); + +#endif /* __WINE_WINBER_H */

1 0

Arkadiusz Hiler : msvcp90: Add helpers for creating base class RTTI.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: f3f948a5a39ecff5d83f02e11256a0359624d54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f948a5a39ecff5d83f02e1… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 6 17:05:10 2021 +0300 msvcp90: Add helpers for creating base class RTTI. Suggested by Piotr Caban. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 5052f433875..0c5b83f93f6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -46,7 +46,7 @@ #ifndef __x86_64__ -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -58,7 +58,10 @@ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static const rtti_base_array name ## _rtti_base_array = { \ { \ @@ -122,7 +125,7 @@ static const cxx_exception_type type ## _cxx_type = { \ #else -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -134,7 +137,18 @@ static rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + \ + static void init_ ## name ## _rtti(char *base) \ + { \ + name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \ + } + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static rtti_base_array name ## _rtti_base_array = { \ { \

1 0

Jacek Caban : winegcc: Use paths for found libraries on PE targets when using msvcrt.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: c7a210bc2f2758204e99d6c80544348c21e8703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a210bc2f2758204e99d6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 6 00:36:29 2021 +0200 winegcc: Use paths for found libraries on PE targets when using msvcrt. We use -nodefaultlibs now, so we don't need to worry about GCC additions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9297a9b75bd..ae8f64f099d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1393,7 +1393,7 @@ static void build(struct options* opts) strarray_add(link_args, name); break; case 'a': - if (is_pe && !opts->lib_suffix && strchr(name, '/')) + if (is_pe && !opts->use_msvcrt && !opts->lib_suffix && strchr(name, '/')) { /* turn the path back into -Ldir -lfoo options * this makes sure that we use the specified libs even

1 0

Nikolay Sivov : mfplay: Implement GetCharacteristics().
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 527723bb6dcf7c4c0c4d7ae9fddb4c26d18d5000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=527723bb6dcf7c4c0c4d7ae9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:29 2021 +0300 mfplay: Implement GetCharacteristics(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 854698774a6..5a85d9f0505 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -295,9 +295,20 @@ static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface, static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags) { - FIXME("%p, %p.\n", iface, flags); + struct media_item *item = impl_from_IMFPMediaItem(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + *flags = 0; + + if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, flags))) + { + *flags &= (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | + MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); + } + + return hr; } static HRESULT WINAPI media_item_SetStreamSink(IMFPMediaItem *iface, DWORD index, IUnknown *sink)

1 0

Nikolay Sivov : mfplay: Add support for async user callback.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: ef908ef248237a0b8aee68cbe74d35581bd1f666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef908ef248237a0b8aee68cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:31 2021 +0300 mfplay: Add support for async user callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 216 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef908ef248237a0b8aee…

1 0

Nikolay Sivov : mfplay: Forward some methods to descriptor API.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 4e7f95220a1e47929e2f7d8e5373c2599bce366a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e7f95220a1e47929e2f7d8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:27 2021 +0300 mfplay: Forward some methods to descriptor API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index cef44c8b7ce..bc9e04c91b7 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -229,39 +229,64 @@ static HRESULT WINAPI media_item_GetDuration(IMFPMediaItem *iface, REFGUID forma static HRESULT WINAPI media_item_GetNumberOfStreams(IMFPMediaItem *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, count); + + return IMFPresentationDescriptor_GetStreamDescriptorCount(item->pd, count); } -static HRESULT WINAPI media_item_GetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL *enabled) +static HRESULT WINAPI media_item_GetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL *selected) { - FIXME("%p, %u, %p.\n", iface, index, enabled); + struct media_item *item = impl_from_IMFPMediaItem(iface); + IMFStreamDescriptor *sd; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, selected); + + if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, selected, &sd))) + IMFStreamDescriptor_Release(sd); + + return hr; } -static HRESULT WINAPI media_item_SetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL enabled) +static HRESULT WINAPI media_item_SetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL select) { - FIXME("%p, %u, %d.\n", iface, index, enabled); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %u, %d.\n", iface, index, select); + + return select ? IMFPresentationDescriptor_SelectStream(item->pd, index) : + IMFPresentationDescriptor_DeselectStream(item->pd, index); } static HRESULT WINAPI media_item_GetStreamAttribute(IMFPMediaItem *iface, DWORD index, REFGUID key, PROPVARIANT *value) { - FIXME("%p, %u, %s, %p.\n", iface, index, debugstr_guid(key), value); + struct media_item *item = impl_from_IMFPMediaItem(iface); + IMFStreamDescriptor *sd; + BOOL selected; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %s, %p.\n", iface, index, debugstr_guid(key), value); + + if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, &selected, &sd))) + { + hr = IMFStreamDescriptor_GetItem(sd, key, value); + IMFStreamDescriptor_Release(sd); + } + + return hr; } static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface, REFGUID key, PROPVARIANT *value) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(key), value); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFPresentationDescriptor_GetItem(item->pd, key, value); } static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags)

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Fake success in IDHTMLEdit::NewDocument.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: b87f938c4d68388495ab46bb10be6568c187cfa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b87f938c4d68388495ab46bb… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 3 20:39:50 2021 +0200 dhtmled.ocx: Fake success in IDHTMLEdit::NewDocument. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index e111f0b7979..fc518de7323 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -191,7 +191,7 @@ static HRESULT WINAPI DHTMLEdit_NewDocument(IDHTMLEdit *iface) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); FIXME("(%p)->() stub\n", This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI DHTMLEdit_LoadURL(IDHTMLEdit *iface, BSTR url)

1 0

Nikolay Sivov : mfplay: Implement IsProtected().
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: wine Branch: master Commit: 7bbf8e53fc86b5a7b93b999687c85fcd03b5d859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bbf8e53fc86b5a7b93b9996… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:28 2021 +0300 mfplay: Implement IsProtected(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 91a8e5cc5a6..8f0fb61fe6f 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll IMPORTLIB = mfplay -IMPORTS = mfplat uuid mfuuid +IMPORTS = mfplat mf uuid mfuuid EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index bc9e04c91b7..854698774a6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -215,9 +215,13 @@ static HRESULT WINAPI media_item_HasAudio(IMFPMediaItem *iface, BOOL *has_audio, static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protected) { - FIXME("%p, %p.\n", iface, protected); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, protected); + + *protected = MFRequireProtectedEnvironment(item->pd) == S_OK; + + return S_OK; } static HRESULT WINAPI media_item_GetDuration(IMFPMediaItem *iface, REFGUID format, PROPVARIANT *value)

1 0