September 2020 - Wine-Commits

Jacek Caban : dwrite.idl: Use DEFINE_ENUM_FLAG_OPERATORS for enums that need it.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: eb0c19e89b6ec9a0b7a231410aaa7464fcfd5957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb0c19e89b6ec9a0b7a23141… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 7 12:49:53 2020 +0200 dwrite.idl: Use DEFINE_ENUM_FLAG_OPERATORS for enums that need it. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dwrite.idl b/include/dwrite.idl index d5ce849386..64cb5ee488 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -147,6 +147,7 @@ typedef enum DWRITE_FONT_SIMULATIONS DWRITE_FONT_SIMULATIONS_BOLD, DWRITE_FONT_SIMULATIONS_OBLIQUE } DWRITE_FONT_SIMULATIONS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DWRITE_FONT_SIMULATIONS);") typedef enum DWRITE_PIXEL_GEOMETRY { @@ -328,6 +329,7 @@ typedef enum DWRITE_SCRIPT_SHAPES DWRITE_SCRIPT_SHAPES_DEFAULT = 0, DWRITE_SCRIPT_SHAPES_NO_VISUAL = 1 } DWRITE_SCRIPT_SHAPES; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DWRITE_SCRIPT_SHAPES);") typedef enum DWRITE_NUMBER_SUBSTITUTION_METHOD {

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: 0713b754f0392791b16ec8ce7909badca54a03be URL: https://source.winehq.org/git/wine.git/?a=commit;h=0713b754f0392791b16ec8ce… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 7 23:17:05 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2f9a0a4eb5..b992960a28 100644 --- a/po/ja.po +++ b/po/ja.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: 2020-05-10 19:59+0900\n" +"PO-Revision-Date: 2020-09-07 22:53+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -3606,7 +3606,7 @@ msgstr "ゲームコントローラ" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "ゲームコントローラのテストと設定をします。" #: jscript.rc:28 msgid "Error converting object to primitive type" @@ -3614,17 +3614,15 @@ msgstr "オブジェクトを基本型に変換できません" #: jscript.rc:29 msgid "Invalid procedure call or argument" -msgstr "手続き呼び出しまたは引数が無効です" +msgstr "使用できない手続き呼び出しまたは引数です" #: jscript.rc:30 msgid "Subscript out of range" msgstr "添字が範囲外です" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "用紙切れ - " +msgstr "スタックスペースが不足しています" #: jscript.rc:32 msgid "Object required" @@ -3672,7 +3670,7 @@ msgstr "'='を期待していました" #: jscript.rc:43 msgid "Invalid character" -msgstr "無効な文字です" +msgstr "使用できない文字です" #: jscript.rc:44 msgid "Unterminated string constant" @@ -3763,16 +3761,12 @@ msgid "JScript object expected" msgstr "JScript オブジェクトを期待していました" #: jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "配列オブジェクトを期待していました" +msgstr "列挙子オブジェクトを期待していました" #: jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Boolean オブジェクトを期待していました" +msgstr "正規表現オブジェクトを期待していました" #: jscript.rc:65 msgid "Syntax error in regular expression" @@ -3784,7 +3778,7 @@ msgstr "例外が送出されましたが捕捉されませんでした" #: jscript.rc:68 msgid "URI to be encoded contains invalid characters" -msgstr "エンコードされる URI に無効な文字が含まれています" +msgstr "エンコードされる URI に使用できない文字が含まれています" #: jscript.rc:67 msgid "URI to be decoded is incorrect" @@ -3841,7 +3835,7 @@ msgstr "処理は成功しました。\n" #: winerror.mc:33 msgid "Invalid function.\n" -msgstr "ファンクションが正しくありません。\n" +msgstr "使用できないファンクションです。\n" #: winerror.mc:38 msgid "File not found.\n" @@ -6797,10 +6791,8 @@ msgid "Connection reset by peer.\n" msgstr "相手側により接続がリセットされました。\n" #: winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未実装" +msgstr "未実装です。\n" #: winerror.mc:3760 msgid "No Signature found in file.\n" @@ -8402,7 +8394,7 @@ msgstr "接続をテスト(&T)" #: version.rc:92 msgid "Advanced" -msgstr "中級" +msgstr "高度" #: version.rc:95 msgid "Network settings" @@ -12504,6 +12496,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- サポートしているコマンド -\n" +"\n" +"hardlink ハードリンクの管理\n" #: fsutil.mc:35 msgid "" @@ -12511,10 +12506,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - サポートしているコマンド -\n" +"\n" +"create ハードリンクを作成する\n" #: fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "構文: fsutil hardlink create <新規> <既存>\n" #: hostname.rc:30 msgid "Usage: hostname\n" @@ -12526,7 +12524,7 @@ msgstr "エラー: 無効なオプション '%c'。\n" #: hostname.rc:32 msgid "Error: Could not get hostname: %u.\n" -msgstr "エラー: ホスト名が得られません: %u\n" +msgstr "エラー: ホスト名が得られません: %u。\n" #: hostname.rc:33 msgid "" @@ -16519,10 +16517,8 @@ msgid "&Beginner" msgstr "初級(&B)" #: winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "インターフェイス" +msgstr "中級(&I)" #: winemine.rc:46 msgid "&Expert" @@ -16553,10 +16549,8 @@ msgid "Beginner" msgstr "初級" #: winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "インターフェイス" +msgstr "中級" #: winemine.rc:66 msgid "Expert"

1 0

Derek Lesho : mfplat: Remove fallback media source.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: c58bb881a08a7abd175466f648ac9c9f4e09e4cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c58bb881a08a7abd175466f6… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 2 14:25:58 2020 -0500 mfplat: Remove fallback media source. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 207 +-------------------------------------------- dlls/mfplat/tests/mfplat.c | 106 +++++++++++++---------- 2 files changed, 64 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c58bb881a08a7abd1754…

1 0

Arkadiusz Hiler : msvcirt: Implement _mtlock() and _mtunlock().
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: d25e7429ccd7ddd30cdfc29cd565b9160e90101d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25e7429ccd7ddd30cdfc29c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Sep 4 17:16:19 2020 +0300 msvcirt: Implement _mtlock() and _mtunlock(). Looks like they are just cdecl wrappers around stdcall EnterCriticalSection() and LeaveCriticalSection(). The game TRON 2.0 was crashing on the stubs. Now it makes it a bit further. 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/msvcirt/msvcirt.c | 12 +++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6bd910e9a8..b5fd19c39e 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4723,6 +4723,18 @@ DEFINE_VTBL_WRAPPER(56); void* (__cdecl *MSVCRT_operator_new)(SIZE_T); void (__cdecl *MSVCRT_operator_delete)(void*); +void __cdecl _mtlock(CRITICAL_SECTION *crit) +{ + TRACE("(%p)\n", crit); + EnterCriticalSection(crit); +} + +void __cdecl _mtunlock(CRITICAL_SECTION *crit) +{ + TRACE("(%p)\n", crit); + LeaveCriticalSection(crit); +} + static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index c2b4b9d30e..4e8f221b2c 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -786,5 +786,5 @@ @ thiscall -arch=win32 ?xsputn(a)streambuf@@UAEHPBDH(a)Z(ptr ptr long) streambuf_xsputn @ cdecl -arch=win64 ?xsputn(a)streambuf@@UEAAHPEBDH(a)Z(ptr ptr long) streambuf_xsputn @ stub __dummy_export -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) +@ cdecl _mtunlock(ptr) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e1a6296783..b87bd42266 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -447,6 +447,10 @@ static const char* (*__thiscall p_exception_what)(exception*); static logic_error* (*__thiscall p_logic_error_ctor)(logic_error*, const char**); static void (*__thiscall p_logic_error_dtor)(logic_error*); +/* locking */ +static void (*__cdecl p__mtlock)(CRITICAL_SECTION *); +static void (*__cdecl p__mtunlock)(CRITICAL_SECTION *); + /* Predefined streams */ static istream *p_cin; static ostream *p_cout, *p_cerr, *p_clog; @@ -1005,6 +1009,9 @@ static BOOL init(void) SET(p_cerr, "?cerr@@3Vostream_withassign@@A"); SET(p_clog, "?clog@@3Vostream_withassign@@A"); + SET(p__mtlock, "_mtlock"); + SET(p__mtunlock, "_mtunlock"); + init_thiscall_thunk(); return TRUE; } @@ -7957,6 +7964,47 @@ static void test_exception(void) call_func1(p_logic_error_dtor, (void*) &le); } +static DWORD WINAPI _try_enter_critical(void *crit) +{ + BOOL ret = TryEnterCriticalSection(crit); + + if (ret) + LeaveCriticalSection(crit); + + return ret; +} + +static void test_mtlock_mtunlock(void) +{ + CRITICAL_SECTION crit; + HANDLE thread; + DWORD exit_code, ret; + + InitializeCriticalSection(&crit); + + p__mtlock(&crit); + + thread = CreateThread(NULL, 0, _try_enter_critical, &crit, 0, NULL); + ok(thread != NULL, "failed to create a thread, error: %x\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "failed to wait for the thread, ret: %d, error: %x\n", ret, GetLastError()); + ok(GetExitCodeThread(thread, &exit_code), "failed to get exit code of the thread\n"); + ok(exit_code == FALSE, "the thread entered critical section\n"); + ret = CloseHandle(thread); + ok(ret, "failed to close thread's handle, error: %x\n", GetLastError()); + + p__mtunlock(&crit); + + thread = CreateThread(NULL, 0, _try_enter_critical, &crit, 0, NULL); + ok(thread != NULL, "failed to create a thread, error: %x\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "failed to wait for the thread, ret: %d, error: %x\n", ret, GetLastError()); + ok(GetExitCodeThread(thread, &exit_code), "failed to get exit code of the thread\n"); + ok(exit_code == TRUE, "the thread was not able to enter critical section\n"); + ret = CloseHandle(thread); + ok(ret, "failed to close thread's handle, error: %x\n", GetLastError()); +} + START_TEST(msvcirt) { if(!init()) @@ -7984,6 +8032,7 @@ START_TEST(msvcirt) test_Iostream_init(); test_std_streams(); test_exception(); + test_mtlock_mtunlock(); FreeLibrary(msvcrt); FreeLibrary(msvcirt); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2ce72c6b13..b791202470 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1072,8 +1072,8 @@ @ cdecl _mkdir(str) msvcrt._mkdir @ cdecl _mktemp(str) msvcrt._mktemp @ cdecl _msize(ptr) msvcrt._msize -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) msvcirt._mtlock +@ cdecl _mtunlock(ptr) msvcirt._mtunlock @ cdecl _nextafter(double double) msvcrt._nextafter @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index efa3e3251d..3f4f2f90e1 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1163,8 +1163,8 @@ @ cdecl _mkdir(str) msvcrt._mkdir @ cdecl _mktemp(str) msvcrt._mktemp @ cdecl _msize(ptr) msvcrt._msize -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) msvcirt._mtlock +@ cdecl _mtunlock(ptr) msvcirt._mtunlock @ cdecl _nextafter(double double) msvcrt._nextafter @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::Shutdown.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: e7b8911695d42ddb826c941dcd9c26da5c3312b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b8911695d42ddb826c941d… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 2 14:26:02 2020 -0500 winegstreamer: Implement IMFMediaSource::Shutdown. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 4 ++-- dlls/winegstreamer/media_source.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 94fdf9e6f3..309f7b669a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -673,14 +673,14 @@ todo_wine IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); +skip_source_tests: + hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -skip_source_tests: - IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index cbe51fa957..84ecf305d4 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -39,6 +39,12 @@ struct media_source IMFMediaSource IMFMediaSource_iface; LONG ref; IMFMediaEventQueue *event_queue; + enum + { + SOURCE_OPENING, + SOURCE_STOPPED, + SOURCE_SHUTDOWN, + } state; }; static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *iface) @@ -88,6 +94,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) if (!ref) { + IMFMediaSource_Shutdown(&source->IMFMediaSource_iface); IMFMediaEventQueue_Release(source->event_queue); heap_free(source); } @@ -138,6 +145,9 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO FIXME("(%p)->(%p): stub\n", source, characteristics); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -147,6 +157,9 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * FIXME("(%p)->(%p): stub\n", source, descriptor); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -157,6 +170,9 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD FIXME("(%p)->(%p, %p, %p): stub\n", source, descriptor, time_format, start_position); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -166,6 +182,9 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) FIXME("(%p): stub\n", source); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -175,6 +194,9 @@ static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) FIXME("(%p): stub\n", source); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -182,9 +204,17 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p): stub\n", source); + TRACE("(%p)\n", source); - return E_NOTIMPL; + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + + source->state = SOURCE_SHUTDOWN; + + if (source->event_queue) + IMFMediaEventQueue_Shutdown(source->event_queue); + + return S_OK; } static const IMFMediaSourceVtbl IMFMediaSource_vtbl = @@ -215,6 +245,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; + object->state = SOURCE_STOPPED; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->ref = 1;

1 0

Nikolay Sivov : mf/evr: Actually use custom mixer when available.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: c1c4856205c78a9c8c153cbec2907e8b392b9838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c4856205c78a9c8c153cbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:34 2020 +0300 mf/evr: Actually use custom mixer when available. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 8a4aa3c350..fe73f6a4a0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -734,7 +734,7 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA CLSID clsid; HRESULT hr; - if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, + if (SUCCEEDED(hr = IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, &IID_IMFActivate, (void **)&activate))) { IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags); @@ -744,23 +744,31 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA return hr; } - if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) - memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + /* Activation object failed, use class activation. */ + if (FAILED(hr)) + { + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); + } - if (SUCCEEDED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out))) + if (FAILED(hr)) { - if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, - (void **)&lookup_client))) + WARN("Failed to create a mixer object, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) { - renderer->flags |= EVR_INIT_SERVICES; - if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, - &renderer->IMFTopologyServiceLookup_iface))) - { - renderer->flags |= EVR_MIXER_INITED_SERVICES; - } - renderer->flags &= ~EVR_INIT_SERVICES; - IMFTopologyServiceLookupClient_Release(lookup_client); + renderer->flags |= EVR_MIXER_INITED_SERVICES; } + renderer->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); } return hr;

1 0

Nikolay Sivov : mf/session: Add support for MR_VIDEO_RENDER_SERVICE service.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: 2ff7160cb7fc2f566237e0cb755d4b76a6882d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff7160cb7fc2f566237e0cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:37 2020 +0300 mf/session: Add support for MR_VIDEO_RENDER_SERVICE service. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e2a6b868ca..a1b54b7080 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "mfidl.h" +#include "evr.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1794,6 +1795,57 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } + else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) + { + IMFStreamSink *stream_sink; + IMFTopologyNode *node; + IUnknown *vr, *object; + IMFCollection *nodes; + IMFMediaSink *sink; + unsigned int i = 0; + HRESULT hr; + + EnterCriticalSection(&session->cs); + + /* Use first sink to support IMFVideoRenderer. */ + if (session->presentation.current_topology) + { + if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, + &nodes))) + { + while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) + { + if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + { + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + { + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + { + if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) + { + if (FAILED(hr = MFGetService(vr, service, riid, obj))) + WARN("Failed to get service from video renderer %#x.\n", hr); + IUnknown_Release(vr); + } + } + IMFStreamSink_Release(stream_sink); + } + + IUnknown_Release(object); + } + + IMFTopologyNode_Release(node); + + if (*obj) + break; + } + + IMFCollection_Release(nodes); + } + } + + LeaveCriticalSection(&session->cs); + } else FIXME("Unsupported service %s.\n", debugstr_guid(service));

1 0

Rémi Bernon : widl: Support fully qualified names in WinRT mode.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: 280932536f9c05bf09f2010eb14ca552a762e6e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=280932536f9c05bf09f2010e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 3 14:42:01 2020 +0200 widl: Support fully qualified names in WinRT mode. Interfaces are going to reference each other across namespaces, so this implements a type lookup with the full name. It supports the following idl syntax in WinRT mode: #ifdef __WIDL__ #pragma winrt ns_prefix #endif import "wtypes.idl"; namespace Windows { namespace Foo { [object] interface IFoo {} } namespace Bar { [object] interface IBar { HRESULT DoBar([in] Windows.Foo.IFoo *foo); } } } That was previously failing to parse the Windows.Foo.IFoo part and to lookup the corresponding type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.h | 1 + tools/widl/parser.l | 2 +- tools/widl/parser.y | 60 +++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index a67b160d48..a6dc94ae6b 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -38,6 +38,7 @@ void pop_import(void); #define parse_only import_stack_ptr int is_type(const char *name); +int is_namespace(const char *name); int do_warning(char *toggle, warning_list_t *wnum); int is_warning_enabled(int warning); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3cbf4ff2d2..925265d00d 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -451,7 +451,7 @@ static int kw_token(const char *kw) return kwp->token; } parser_lval.str = xstrdup(kw); - return is_type(kw) ? aKNOWNTYPE : aIDENTIFIER; + return is_type(kw) ? aKNOWNTYPE : is_namespace(kw) ? aNAMESPACE : aIDENTIFIER; } static int attr_token(const char *kw) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 91c5b809bb..7d5aaebf33 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -81,6 +81,8 @@ static var_t *reg_const(var_t *var); static void push_namespace(const char *name); static void pop_namespace(const char *name); +static void init_lookup_namespace(const char *name); +static void push_lookup_namespace(const char *name); static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); @@ -122,6 +124,7 @@ static struct namespace global_namespace = { }; static struct namespace *current_namespace = &global_namespace; +static struct namespace *lookup_namespace = &global_namespace; static typelib_t *current_typelib; @@ -156,7 +159,7 @@ static typelib_t *current_typelib; } %token <str> aIDENTIFIER aPRAGMA -%token <str> aKNOWNTYPE +%token <str> aKNOWNTYPE aNAMESPACE %token <num> aNUM aHEXNUM %token <dbl> aDOUBLE %token <str> aSTRING aWSTRING aSQSTRING @@ -271,7 +274,7 @@ static typelib_t *current_typelib; %type <str> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl -%type <type> type +%type <type> type qualified_seq qualified_type %type <ifref> coclass_int %type <ifref_list> coclass_ints %type <var> arg ne_union_field union_field s_field case enum declaration @@ -817,6 +820,16 @@ int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } | tINT3264 { $$ = type_new_int(TYPE_BASIC_INT3264, 0); } ; +qualified_seq: + aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + | aIDENTIFIER '.' { push_lookup_namespace($1); } qualified_seq { $$ = $4; } + ; + +qualified_type: + aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + | aNAMESPACE '.' { init_lookup_namespace($1); } qualified_seq { $$ = $4; } + ; + coclass: tCOCLASS aIDENTIFIER { $$ = type_new_coclass($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, NULL, 0); if (type_get_type_detect_alias($$) != TYPE_COCLASS) @@ -837,6 +850,7 @@ coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt ; namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } + | tNAMESPACE aNAMESPACE { $$ = $2; } ; coclass_ints: { $$ = NULL; } @@ -881,7 +895,7 @@ dispinterfacedef: dispinterfacehdr '{' ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } + | ':' qualified_type { $$ = $2; } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } @@ -1096,7 +1110,7 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, current_nam ; type: tVOID { $$ = type_new_void(); } - | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + | qualified_type { $$ = $1; } | base_type { $$ = $1; } | enumdef { $$ = $1; } | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } @@ -1848,6 +1862,20 @@ static void pop_namespace(const char *name) current_namespace = current_namespace->parent; } +static void init_lookup_namespace(const char *name) +{ + if (!(lookup_namespace = find_sub_namespace(&global_namespace, name))) + error_loc("namespace '%s' not found\n", name); +} + +static void push_lookup_namespace(const char *name) +{ + struct namespace *namespace; + if (!(namespace = find_sub_namespace(lookup_namespace, name))) + error_loc("namespace '%s' not found\n", name); + lookup_namespace = namespace; +} + struct rtype { const char *name; type_t *type; @@ -1959,12 +1987,14 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) static type_t *find_type_or_error(const char *name, int t) { - type_t *type = find_type(name, current_namespace, t); - if (!type) { - error_loc("type '%s' not found\n", name); - return NULL; - } - return type; + type_t *type; + if (!(type = find_type(name, current_namespace, t)) && + !(type = find_type(name, lookup_namespace, t))) + { + error_loc("type '%s' not found\n", name); + return NULL; + } + return type; } static type_t *find_type_or_error2(char *name, int t) @@ -1976,7 +2006,15 @@ static type_t *find_type_or_error2(char *name, int t) int is_type(const char *name) { - return find_type(name, current_namespace, 0) != NULL; + return find_type(name, current_namespace, 0) != NULL || + find_type(name, lookup_namespace, 0) != NULL; +} + +int is_namespace(const char *name) +{ + if (!winrt_mode) return 0; + return find_sub_namespace(current_namespace, name) != NULL || + find_sub_namespace(&global_namespace, name) != NULL; } type_t *get_type(enum type_type type, char *name, struct namespace *namespace, int t)

1 0

Nikolay Sivov : mf/evr: Add events support for video stream sinks.
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: 951240cb138af421610fc96a349ed89713368677 URL: https://source.winehq.org/git/wine.git/?a=commit;h=951240cb138af421610fc96a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:36 2020 +0300 mf/evr: Add events support for video stream sinks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 86242611a4..93ad06b949 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -40,6 +40,7 @@ struct video_stream LONG refcount; unsigned int id; struct video_renderer *parent; + IMFMediaEventQueue *event_queue; }; struct video_renderer @@ -167,6 +168,8 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) if (!refcount) { + if (stream->event_queue) + IMFMediaEventQueue_Release(stream->event_queue); heap_free(stream); } @@ -175,32 +178,40 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) static HRESULT WINAPI video_stream_sink_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("%p, %#x, %p.\n", iface, flags, event); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } static HRESULT WINAPI video_stream_sink_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, callback, state); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } static HRESULT WINAPI video_stream_sink_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("%p, %p, %p.\n", iface, result, event); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } static HRESULT WINAPI video_stream_sink_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, - REFGUID exttype, HRESULT hr_status, const PROPVARIANT *value) + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(exttype), hr_status, value); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI video_stream_sink_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) @@ -289,12 +300,17 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns struct video_stream **ret) { struct video_stream *stream; + HRESULT hr; if (!(stream = heap_alloc_zero(sizeof(*stream)))) return E_OUTOFMEMORY; stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; stream->refcount = 1; + + if (FAILED(hr = MFCreateEventQueue(&stream->event_queue))) + return hr; + stream->parent = renderer; IMFMediaSink_AddRef(&stream->parent->IMFMediaSink_iface); stream->id = id; @@ -628,6 +644,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) { IMFMediaSink_Release(&renderer->streams[i]->parent->IMFMediaSink_iface); renderer->streams[i]->parent = NULL; + IMFMediaEventQueue_Shutdown(renderer->streams[i]->event_queue); IMFStreamSink_Release(&renderer->streams[i]->IMFStreamSink_iface); renderer->streams[i] = NULL; }

1 0

Nikolay Sivov : evr/mixer: Use same max input count symbol for GetStreamLimits().
by Alexandre Julliard Sept. 7, 2020

Sept. 7, 2020

Module: wine Branch: master Commit: cc66d5de6ad78fff756dd254c0482773f5f005bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc66d5de6ad78fff756dd254… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:33 2020 +0300 evr/mixer: Use same max input count symbol for GetStreamLimits(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d9f86a7fc9..7e08beae35 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -284,7 +284,7 @@ static HRESULT WINAPI video_mixer_transform_GetStreamLimits(IMFTransform *iface, TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); *input_minimum = 1; - *input_maximum = 16; + *input_maximum = MAX_MIXER_INPUT_STREAMS; *output_minimum = 1; *output_maximum = 1;

1 0