wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: b074c677d1b8bc8d45a9a141640f472e7d27a1dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b074c677d1b8bc8d45a9a141… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Apr 3 00:07:16 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1f560063c37..6b629509105 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-03-26 11:29+0200\n" +"PO-Revision-Date: 2021-04-03 00:06+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3963,7 +3963,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Negalima apibrėžti savybės „|“: objektas nėra išplečiamas" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14495,10 +14495,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Operacija sėkmingai įvykdyta\n" +msgstr "reg: Operacija sėkmingai įvykdyta\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14513,11 +14511,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Nepavyko prieiti prie nuotolinio kompiuterio\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" +msgstr "reg: Nepavyko rasti nurodytos registro reikšmės\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14540,10 +14535,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "Registro reikšmė „%1“ jau egzistuoja. Ar norite ją perrašyti?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Registro operacija buvo nutraukta\n" +msgstr "reg: Registro operacija buvo nutraukta\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14700,17 +14693,12 @@ msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Failas „%1“ jau egzistuoja. Ar norite jį perrašyti?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" +msgstr "reg: Nepavyko rasti nurodyto registro rakto\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Nepavyko atverti registro rakto „%1“.\n" +msgstr "reg: Nepavyko importuoti registro rakto „%1“.\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 0dca1ff560d227dff6ff6447b7272acbeb666f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dca1ff560d227dff6ff6447… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Apr 5 10:09:58 2021 +0200 po: Update Polish translation. Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 432 +++++++++++++++++++++------------------------------------------ 1 file changed, 143 insertions(+), 289 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dca1ff560d227dff6ff…

1 0

Nikolay Sivov : mfplay: Implement creating media items from URLs.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: bd8b4baf1dd9330afc9791b585fe441c69a4d093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd8b4baf1dd9330afc9791b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 5 09:11:00 2021 +0300 mfplay: Implement creating media items from URLs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 383 ++++++++++++++++++++++++++++++++++++++++++++++++++- include/mfplay.idl | 90 ++++++++++++ 2 files changed, 470 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd8b4baf1dd9330afc97…

1 0

Nikolay Sivov : mfplay: Add IPropertyStore support to media player object.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 6a389d14a6732c58183c9a82add7707d2e5bfce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a389d14a6732c58183c9a82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 5 09:10:59 2021 +0300 mfplay: Add IPropertyStore support to media player object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 120 ++++++++++++++++++++++++++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 36 ++++++++++++++ 2 files changed, 148 insertions(+), 8 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0305f663924..e729a863da9 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -47,8 +47,10 @@ static void platform_shutdown(void) struct media_player { IMFPMediaPlayer IMFPMediaPlayer_iface; + IPropertyStore IPropertyStore_iface; LONG refcount; IMFPMediaPlayerCallback *callback; + IPropertyStore *propstore; }; static struct media_player *impl_from_IMFPMediaPlayer(IMFPMediaPlayer *iface) @@ -56,22 +58,36 @@ static struct media_player *impl_from_IMFPMediaPlayer(IMFPMediaPlayer *iface) return CONTAINING_RECORD(iface, struct media_player, IMFPMediaPlayer_iface); } +static struct media_player *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, struct media_player, IPropertyStore_iface); +} + static HRESULT WINAPI media_player_QueryInterface(IMFPMediaPlayer *iface, REFIID riid, void **obj) { + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFPMediaPlayer) || IsEqualIID(riid, &IID_IUnknown)) { - *obj = iface; - IMFPMediaPlayer_AddRef(iface); - return S_OK; + *obj = &player->IMFPMediaPlayer_iface; + } + else if (IsEqualIID(riid, &IID_IPropertyStore)) + { + *obj = &player->IPropertyStore_iface; } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; - WARN("Unsupported interface %s.\n", debugstr_guid(riid)); - *obj = NULL; + return E_NOINTERFACE; + } - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI media_player_AddRef(IMFPMediaPlayer *iface) @@ -95,6 +111,8 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) { if (player->callback) IMFPMediaPlayerCallback_Release(player->callback); + if (player->propstore) + IPropertyStore_Release(player->propstore); heap_free(player); platform_shutdown(); @@ -406,25 +424,111 @@ static const IMFPMediaPlayerVtbl media_player_vtbl = media_player_Shutdown, }; +static HRESULT WINAPI media_player_propstore_QueryInterface(IPropertyStore *iface, + REFIID riid, void **obj) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + return IMFPMediaPlayer_QueryInterface(&player->IMFPMediaPlayer_iface, riid, obj); +} + +static ULONG WINAPI media_player_propstore_AddRef(IPropertyStore *iface) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + return IMFPMediaPlayer_AddRef(&player->IMFPMediaPlayer_iface); +} + +static ULONG WINAPI media_player_propstore_Release(IPropertyStore *iface) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + return IMFPMediaPlayer_Release(&player->IMFPMediaPlayer_iface); +} + +static HRESULT WINAPI media_player_propstore_GetCount(IPropertyStore *iface, DWORD *count) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + + TRACE("%p, %p.\n", iface, count); + + return IPropertyStore_GetCount(player->propstore, count); +} + +static HRESULT WINAPI media_player_propstore_GetAt(IPropertyStore *iface, DWORD prop, PROPERTYKEY *key) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + + TRACE("%p, %u, %p.\n", iface, prop, key); + + return IPropertyStore_GetAt(player->propstore, prop, key); +} + +static HRESULT WINAPI media_player_propstore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *value) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + + TRACE("%p, %p, %p.\n", iface, key, value); + + return IPropertyStore_GetValue(player->propstore, key, value); +} + +static HRESULT WINAPI media_player_propstore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT value) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + + TRACE("%p, %p, %p.\n", iface, key, value); + + return IPropertyStore_SetValue(player->propstore, key, value); +} + +static HRESULT WINAPI media_player_propstore_Commit(IPropertyStore *iface) +{ + struct media_player *player = impl_from_IPropertyStore(iface); + + TRACE("%p.\n", iface); + + return IPropertyStore_Commit(player->propstore); +} + +static const IPropertyStoreVtbl media_player_propstore_vtbl = +{ + media_player_propstore_QueryInterface, + media_player_propstore_AddRef, + media_player_propstore_Release, + media_player_propstore_GetCount, + media_player_propstore_GetAt, + media_player_propstore_GetValue, + media_player_propstore_SetValue, + media_player_propstore_Commit, +}; + HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) { struct media_player *object; + HRESULT hr; TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, hwnd, player); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + platform_startup(); + object->IMFPMediaPlayer_iface.lpVtbl = &media_player_vtbl; + object->IPropertyStore_iface.lpVtbl = &media_player_propstore_vtbl; object->refcount = 1; object->callback = callback; if (object->callback) IMFPMediaPlayerCallback_AddRef(object->callback); - - platform_startup(); + if (FAILED(hr = CreatePropertyStore(&object->propstore))) + goto failed; *player = &object->IMFPMediaPlayer_iface; return S_OK; + +failed: + + IMFPMediaPlayer_Release(&object->IMFPMediaPlayer_iface); + + return hr; } diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index ef8aaddc76f..64347265c40 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -26,6 +26,21 @@ #include "wine/test.h" +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static HRESULT WINAPI test_callback_QueryInterface(IMFPMediaPlayerCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFPMediaPlayerCallback) || @@ -65,11 +80,32 @@ static const IMFPMediaPlayerCallbackVtbl test_callback_vtbl = static void test_create_player(void) { IMFPMediaPlayerCallback callback = { &test_callback_vtbl }; + IPropertyStore *propstore; IMFPMediaPlayer *player; + IUnknown *unk, *unk2; HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(player, &IID_IMFPMediaPlayer, TRUE); + check_interface(player, &IID_IPropertyStore, TRUE); + + hr = IMFPMediaPlayer_QueryInterface(player, &IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(propstore, &IID_IMFPMediaPlayer, TRUE); + + hr = IPropertyStore_QueryInterface(propstore, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_QueryInterface(player, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == unk2, "Unexpected interface.\n"); + IUnknown_Release(unk); + IUnknown_Release(unk2); + + IPropertyStore_Release(propstore); + IMFPMediaPlayer_Release(player); hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, NULL, &player);

1 0

Nikolay Sivov : mfplay: Automatically initialize Media Foundation.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 2efb464bab2752bf63453244a63c4243e66d154f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2efb464bab2752bf63453244… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 5 09:10:58 2021 +0300 mfplay: Automatically initialize Media Foundation. 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 | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index b21ce0e2161..91a8e5cc5a6 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll IMPORTLIB = mfplay -IMPORTS = uuid mfuuid +IMPORTS = mfplat uuid mfuuid EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6905812835a..0305f663924 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "mfapi.h" #include "mfplay.h" #include "wine/debug.h" @@ -29,6 +30,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static LONG startup_refcount; + +static void platform_startup(void) +{ + if (InterlockedIncrement(&startup_refcount) == 1) + MFStartup(MF_VERSION, MFSTARTUP_FULL); +} + +static void platform_shutdown(void) +{ + if (InterlockedDecrement(&startup_refcount) == 0) + MFShutdown(); +} + struct media_player { IMFPMediaPlayer IMFPMediaPlayer_iface; @@ -81,6 +96,8 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) if (player->callback) IMFPMediaPlayerCallback_Release(player->callback); heap_free(player); + + platform_shutdown(); } return refcount; @@ -405,6 +422,8 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C if (object->callback) IMFPMediaPlayerCallback_AddRef(object->callback); + platform_startup(); + *player = &object->IMFPMediaPlayer_iface; return S_OK;

1 0

Nikolay Sivov : mfplay: Keep user callback reference.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 97ed08cb523632b487cd3cdb8141333cebf059e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97ed08cb523632b487cd3cdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 5 09:10:57 2021 +0300 mfplay: Keep user callback reference. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 8 ++++++++ dlls/mfplay/tests/Makefile.in | 2 +- dlls/mfplay/tests/mfplay.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 1e2a3a8f189..6905812835a 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -33,6 +33,7 @@ struct media_player { IMFPMediaPlayer IMFPMediaPlayer_iface; LONG refcount; + IMFPMediaPlayerCallback *callback; }; static struct media_player *impl_from_IMFPMediaPlayer(IMFPMediaPlayer *iface) @@ -76,7 +77,11 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + { + if (player->callback) + IMFPMediaPlayerCallback_Release(player->callback); heap_free(player); + } return refcount; } @@ -396,6 +401,9 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C object->IMFPMediaPlayer_iface.lpVtbl = &media_player_vtbl; object->refcount = 1; + object->callback = callback; + if (object->callback) + IMFPMediaPlayerCallback_AddRef(object->callback); *player = &object->IMFPMediaPlayer_iface; diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index ca08c65ce24..43c7ec26240 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplay.dll -IMPORTS = mfplay +IMPORTS = mfplay uuid mfuuid C_SRCS = \ mfplay.c diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index e9b5df95039..ef8aaddc76f 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -26,14 +26,55 @@ #include "wine/test.h" +static HRESULT WINAPI test_callback_QueryInterface(IMFPMediaPlayerCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFPMediaPlayerCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFPMediaPlayerCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_callback_AddRef(IMFPMediaPlayerCallback *iface) +{ + return 2; +} + +static ULONG WINAPI test_callback_Release(IMFPMediaPlayerCallback *iface) +{ + return 1; +} + +static void WINAPI test_callback_OnMediaPlayerEvent(IMFPMediaPlayerCallback *iface, MFP_EVENT_HEADER *event_header) +{ +} + +static const IMFPMediaPlayerCallbackVtbl test_callback_vtbl = +{ + test_callback_QueryInterface, + test_callback_AddRef, + test_callback_Release, + test_callback_OnMediaPlayerEvent, +}; + static void test_create_player(void) { + IMFPMediaPlayerCallback callback = { &test_callback_vtbl }; IMFPMediaPlayer *player; HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFPMediaPlayer_Release(player); + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFPMediaPlayer_Release(player); } START_TEST(mfplay)

1 0

Nikolay Sivov : mf: Add MFRequireProtectedEnvironment().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: c3c0e2a440fab099a81461b24fc19f2b223e525a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c0e2a440fab099a81461b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 5 09:10:56 2021 +0300 mf: Add MFRequireProtectedEnvironment(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 19 +++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 39 +++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index bf7066ad032..b59ad466c73 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1460,3 +1460,22 @@ HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler) return S_OK; } + +HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd) +{ + BOOL selected, protected = FALSE; + unsigned int i = 0, value; + IMFStreamDescriptor *sd; + + TRACE("%p.\n", pd); + + while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, i++, &selected, &sd))) + { + value = 0; + protected = SUCCEEDED(IMFStreamDescriptor_GetUINT32(sd, &MF_SD_PROTECTED, &value)) && value; + IMFStreamDescriptor_Release(sd); + if (protected) break; + } + + return protected ? S_OK : S_FALSE; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 2927d9f8a88..8f340243fc2 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -77,7 +77,7 @@ @ stdcall MFGetSupportedSchemes(ptr) @ stdcall MFGetTopoNodeCurrentType(ptr long long ptr) @ stub MFReadSequencerSegmentOffset -@ stub MFRequireProtectedEnvironment +@ stdcall MFRequireProtectedEnvironment(ptr) @ stdcall MFShutdownObject(ptr) @ stub MFTranscodeGetAudioOutputAvailableTypes @ stub MergePropertyStore diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 40d8561bb06..df286db6385 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5185,6 +5185,44 @@ static void init_functions(void) #undef X } +static void test_MFRequireProtectedEnvironment(void) +{ + IMFPresentationDescriptor *pd; + IMFMediaType *mediatype; + IMFStreamDescriptor *sd; + HRESULT hr; + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); + ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); + + hr = MFCreatePresentationDescriptor(1, &sd, &pd); + ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_SelectStream(pd, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_SetUINT32(sd, &MF_SD_PROTECTED, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_DeselectStream(pd, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(pd); +} + START_TEST(mf) { init_functions(); @@ -5216,4 +5254,5 @@ START_TEST(mf) test_sample_copier(); test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); + test_MFRequireProtectedEnvironment(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 46c715a3752..138b899ffdb 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -698,6 +698,7 @@ cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") cpp_quote("HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample);") +cpp_quote("HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd);") typedef enum _MFMEDIASOURCE_CHARACTERISTICS {

1 0

Nikolay Sivov : ole32: Add support for writing VT_BLOB properties.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: ade78855293c9a9a853f76ff79864bc4a0cda1bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade78855293c9a9a853f76ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 5 09:06:00 2021 +0300 ole32: Add support for writing VT_BLOB properties. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50917 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 63e93c0b8c9..cd30dad8c99 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2267,6 +2267,16 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count; break; } + case VT_BLOB: + { + StorageUtl_WriteDWord(&dwTemp, 0, var->blob.cbSize); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (FAILED(hr)) + goto end; + hr = IStream_Write(This->stm, var->blob.pBlobData, var->blob.cbSize, &count); + bytesWritten = count + sizeof(DWORD); + break; + } default: FIXME("unsupported type: %d\n", var->vt); return STG_E_INVALIDPARAMETER;

1 0

Esme Povirk : bcrypt: Don't try to unload gnutls if loading failed.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 3db37dc5ae4e8b701c26f96fec97822b8b4da80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3db37dc5ae4e8b701c26f96f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 3 13:53:32 2021 -0500 bcrypt: Don't try to unload gnutls if loading failed. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index efab65b8315..2f0c62bc6da 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1908,7 +1908,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p *(const struct key_funcs **)ptr_out = &key_funcs; break; case DLL_PROCESS_DETACH: - gnutls_uninitialize(); + if (libgnutls_handle) gnutls_uninitialize(); break; } return STATUS_SUCCESS;

1 0

Alexandre Julliard : ntdll: Stop exporting wine_server_send_fd() and wine_server_release_fd().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 2330a5860aef9d767afe4db48ab42cf3155abb55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2330a5860aef9d767afe4db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 13:18:39 2021 +0200 ntdll: Stop exporting wine_server_send_fd() and wine_server_release_fd(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 -- dlls/ntdll/unix/server.c | 11 +---------- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ws2_32/socket.c | 12 ++++++------ include/wine/server.h | 2 -- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cbb45f50dff..881b57eb80a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1603,8 +1603,6 @@ @ cdecl -syscall -norelay wine_server_call(ptr) @ cdecl -syscall wine_server_fd_to_handle(long long long ptr) @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) -@ cdecl -syscall wine_server_release_fd(long long) -@ cdecl -syscall wine_server_send_fd(long) @ cdecl -syscall __wine_make_process_system() # Unix interface diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 50d89f79c0d..65863f54c4b 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -797,7 +797,7 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a * * Send a file descriptor to the server. */ -void CDECL wine_server_send_fd( int fd ) +void wine_server_send_fd( int fd ) { struct send_fd data; struct msghdr msghdr; @@ -1120,15 +1120,6 @@ NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int } -/*********************************************************************** - * wine_server_release_fd - */ -void CDECL wine_server_release_fd( HANDLE handle, int unix_fd ) -{ - close( unix_fd ); -} - - /*********************************************************************** * server_pipe * diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c02a8f50b24..257566ce976 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -164,7 +164,8 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * apc_result_t *result ) DECLSPEC_HIDDEN; extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; -extern void process_exit_wrapper( int status ) DECLSPEC_HIDDEN; +extern void wine_server_send_fd( int fd ) DECLSPEC_HIDDEN; +extern void process_exit_wrapper( int status ) DECLSPEC_HIDDEN; extern size_t server_init_process(void) DECLSPEC_HIDDEN; extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 715c96097fc..4f26d6475aa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1298,7 +1298,7 @@ static inline int get_sock_fd( SOCKET s, DWORD access, unsigned int *options ) static inline void release_sock_fd( SOCKET s, int fd ) { - wine_server_release_fd( SOCKET2HANDLE(s), fd ); + close( fd ); } static void _enable_event( HANDLE s, unsigned int event, @@ -2450,7 +2450,7 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS stat break; result = WS2_recv( fd, wsa, convert_flags(wsa->flags) ); - wine_server_release_fd( wsa->hSocket, fd ); + close( fd ); if (result >= 0) { status = STATUS_SUCCESS; @@ -2581,7 +2581,7 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS stat /* check to see if the data is ready (non-blocking) */ result = WS2_send( fd, wsa, convert_flags(wsa->flags) ); - wine_server_release_fd( wsa->hSocket, fd ); + close( fd ); if (result >= 0) { @@ -2633,7 +2633,7 @@ static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS case ASYNC_TYPE_WRITE: err = shutdown( fd, 1 ); break; } status = err ? wsaErrStatus() : STATUS_SUCCESS; - wine_server_release_fd( wsa->hSocket, fd ); + close( fd ); break; } iosb->u.Status = status; @@ -2804,7 +2804,7 @@ static NTSTATUS WS2_ReadFile(HANDLE hFile, PIO_STATUS_BLOCK io_status, char* buf else status = STATUS_PENDING; - wine_server_release_fd( hFile, unix_handle ); + close( unix_handle ); TRACE("= 0x%08x (%d)\n", status, result); if (status == STATUS_SUCCESS || status == STATUS_END_OF_FILE) { @@ -2929,7 +2929,7 @@ static NTSTATUS WS2_async_transmitfile( void *user, IO_STATUS_BLOCK *iosb, NTSTA if (!(status = wine_server_handle_to_fd( wsa->write.hSocket, FILE_WRITE_DATA, &fd, NULL ))) { status = WS2_transmitfile_base( fd, wsa ); - wine_server_release_fd( wsa->write.hSocket, fd ); + close( fd ); } if (status == STATUS_PENDING) return status; diff --git a/include/wine/server.h b/include/wine/server.h index ac5dcc6f8bc..57bcdbbb00d 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -50,10 +50,8 @@ struct __server_request_info }; extern unsigned int CDECL wine_server_call( void *req_ptr ); -extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); -extern void CDECL wine_server_release_fd( HANDLE handle, int unix_fd ); /* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr )

1 0

← Newer
1
...
78
79
80
81
82
83
84
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021