June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Move the keyed event functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: f1276b25ae72e81cf044134bae92db6ef73be3a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1276b25ae72e81cf044134b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:27:22 2020 +0200 ntdll: Move the keyed event functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 57 ++------------------------ dlls/ntdll/unix/loader.c | 4 ++ dlls/ntdll/unix/sync.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 10 ++++- 6 files changed, 109 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1276b25ae72e81cf044…

1 0

Rémi Bernon : msvcirt/tests: Fix signed integral cast warning.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: e8fbc6c90b03de2b9936537fa22cf78ffd0b9d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8fbc6c90b03de2b9936537f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:34 2020 +0200 msvcirt/tests: Fix signed integral cast warning. Assign the char field separately. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 70fbb6afb4..6440bc0dab 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -7373,16 +7373,20 @@ static void test_std_streams(void) ok(*p_ios_sunk_with_stdio == 0, "expected 0 got %d\n", *p_ios_sunk_with_stdio); p_cin->extract_delim = p_cin->count = 0xabababab; p_cin->base_ios.state = 0xabababab; - p_cin->base_ios.precision = p_cin->base_ios.fill = p_cin->base_ios.width = 0xabababab; + p_cin->base_ios.fill = 0xab; + p_cin->base_ios.precision = p_cin->base_ios.width = 0xabababab; p_cout->unknown = 0xabababab; p_cout->base_ios.state = 0xabababab; - p_cout->base_ios.precision = p_cout->base_ios.fill = p_cout->base_ios.width = 0xabababab; + p_cout->base_ios.fill = 0xab; + p_cout->base_ios.precision = p_cout->base_ios.width = 0xabababab; p_cerr->unknown = 0xabababab; p_cerr->base_ios.state = 0xabababab; - p_cerr->base_ios.precision = p_cerr->base_ios.fill = p_cerr->base_ios.width = 0xabababab; + p_cerr->base_ios.fill = 0xab; + p_cerr->base_ios.precision = p_cerr->base_ios.width = 0xabababab; p_clog->unknown = 0xabababab; p_clog->base_ios.state = 0xabababab; - p_clog->base_ios.precision = p_clog->base_ios.fill = p_clog->base_ios.width = 0xabababab; + p_clog->base_ios.fill = 0xab; + p_clog->base_ios.precision = p_clog->base_ios.width = 0xabababab; p_ios_sync_with_stdio(); ok(*p_ios_sunk_with_stdio == 1, "expected 1 got %d\n", *p_ios_sunk_with_stdio);

1 0

Rémi Bernon : msvcp120/tests: Fix signed integral cast warning.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: d276cf7112aa15aac102b03e519cc133da8ec1c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d276cf7112aa15aac102b03e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:35 2020 +0200 msvcp120/tests: Fix signed integral cast warning. First cast to int, then to enum file_type. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 7a382ac6fa..ed632a27df 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1774,7 +1774,7 @@ static void test_tr2_sys__dir_operation(void) memset(first_file_name, 0xff, MAX_PATH); memset(dest, 0, MAX_PATH); - err = type = 0xdeadbeef; + type = err = 0xdeadbeef; result_handle = NULL; result_handle = p_tr2_sys__Open_dir(first_file_name, "tr2_test_dir", &err, &type); ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); @@ -1804,7 +1804,7 @@ static void test_tr2_sys__dir_operation(void) ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); memset(first_file_name, 0xff, MAX_PATH); - err = type = 0xdeadbeef; + type = err = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); @@ -1814,7 +1814,7 @@ static void test_tr2_sys__dir_operation(void) CreateDirectoryA("empty_dir", NULL); memset(first_file_name, 0xff, MAX_PATH); - err = type = 0xdeadbeef; + type = err = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle);

1 0

Daniel Lehman : vcruntime140_1: Don't terminate on -1 trylevel.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: a9d916cfecea5b2213d33ac9004a908653c7c649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9d916cfecea5b2213d33ac9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 19:51:50 2020 -0700 vcruntime140_1: Don't terminate on -1 trylevel. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 4203373294..b4b7bd2348 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -426,7 +426,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, TRACE("current level: %d, last level: %d\n", trylevel, last_level); - if (trylevel<-1 || trylevel>=descr->unwind_count) + if (trylevel<-1 || trylevel>=(int)descr->unwind_count) { ERR("invalid trylevel %d\n", trylevel); terminate();

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: d1e7ea346f30ded1ea36573c3ecd134cfa7d06e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e7ea346f30ded1ea36573c… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Jun 4 01:07:11 2020 +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 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9235cbebac..2cabfbbe17 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ 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-12 00:24+0300\n" +"PO-Revision-Date: 2020-06-04 01: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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.3.1\n" "X-Project-Style: default\n" #: appwiz.rc:58 @@ -3768,16 +3768,12 @@ msgid "JScript object expected" msgstr "Tikėtasi JScript objekto" #: jscript.rc:62 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Tikėtasi masyvo objekto" +msgstr "Tikėtasi enumeratoriaus objekto" #: jscript.rc:63 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Tikėtasi loginio objekto" +msgstr "Tikėtasi reguliariojo reiškinio objekto" #: jscript.rc:64 msgid "Syntax error in regular expression"

1 0

Zebediah Figura : amstream/tests: Define and use a global variable holding an audio media type.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 3d92885390513d28532c2926f2cb1041ead3a5a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d92885390513d28532c2926… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 20:52:32 2020 -0500 amstream/tests: Define and use a global variable holding an audio media type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 220 +++++++++-------------------------------- 1 file changed, 44 insertions(+), 176 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d92885390513d28532c…

1 0

Akihiro Sagawa : gdi32: Handle vertical faces in the fontconfig fallback.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: f3c682edb9931960a87e7fba4462e81cfcb1f21b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3c682edb9931960a87e7fba… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 4 10:43:14 2020 +0100 gdi32: Handle vertical faces in the fontconfig fallback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48440 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f68198df8b..9801c32d65 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5261,7 +5261,7 @@ done: } #ifdef SONAME_LIBFONTCONFIG -static Family* get_fontconfig_family(DWORD pitch_and_family, const CHARSETINFO *csi) +static Family* get_fontconfig_family(DWORD pitch_and_family, const CHARSETINFO *csi, BOOL want_vertical) { const char *name; WCHAR nameW[LF_FACESIZE]; @@ -5305,8 +5305,17 @@ static Family* get_fontconfig_family(DWORD pitch_and_family, const CHARSETINFO * const SYSTEM_LINKS *font_link; const struct list *face_list; - ret = MultiByteToWideChar(CP_UTF8, 0, (const char*)str, -1, - nameW, ARRAY_SIZE(nameW)); + if (!want_vertical) + { + ret = MultiByteToWideChar(CP_UTF8, 0, (const char*)str, -1, + nameW, ARRAY_SIZE(nameW)); + } + else + { + nameW[0] = '@'; + ret = MultiByteToWideChar(CP_UTF8, 0, (const char*)str, -1, + nameW + 1, ARRAY_SIZE(nameW) - 1); + } if (!ret) continue; family = find_family_from_any_name(nameW); if (!family) continue; @@ -5726,7 +5735,7 @@ static HFONT CDECL freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags #ifdef SONAME_LIBFONTCONFIG /* Try FontConfig substitutions if the face isn't found */ - family = get_fontconfig_family(lf.lfPitchAndFamily, &csi); + family = get_fontconfig_family(lf.lfPitchAndFamily, &csi, want_vertical); if (family) goto found; #endif

1 0

Alex Henrie : kernel32/tests: Fix GetNLSVersion test failure on Windows Server 2003.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: e851e747bb2a4e8a32061c3893f1000fd76153ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=e851e747bb2a4e8a32061c38… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 3 23:04:28 2020 -0600 kernel32/tests: Fix GetNLSVersion test failure on Windows Server 2003. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c73c4a3f21..5b2f4c2d94 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6743,7 +6743,9 @@ static void test_NLSVersion(void) info.dwNLSVersionInfoSize = sizeof(info); ret = pGetNLSVersion( 2, LOCALE_USER_DEFAULT, (NLSVERSIONINFO *)&info ); ok( !ret, "GetNLSVersion succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_FLAGS, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_FLAGS || + broken( GetLastError() == ERROR_INSUFFICIENT_BUFFER ), /* win2003 */ + "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); info.dwNLSVersionInfoSize = sizeof(info);

1 0

Akihiro Sagawa : gdi32: Add a vertical font replacement if it's a DBCS font.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 9aec1ef3c19b8728d5a2d7356c0de80b17afedd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aec1ef3c19b8728d5a2d735… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 4 10:43:15 2020 +0100 gdi32: Add a vertical font replacement if it's a DBCS font. For example, if one maps MS Gothic to a font, also map @MS Gothic to that font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9801c32d65..f82a8c1641 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -288,6 +288,8 @@ typedef struct tagFace { struct enum_data *cached_enum_data; } Face; +#define FS_DBCS_MASK (FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB) + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -618,6 +620,7 @@ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N' static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; static BOOL use_default_fallback = FALSE; +static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl); static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph, BOOL *vert); static BOOL get_outline_text_metrics(GdiFont *font); static BOOL get_bitmap_text_metrics(GdiFont *font); @@ -2270,7 +2273,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { - const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; FONTSIGNATURE fs; ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); @@ -2360,6 +2362,30 @@ static void DumpFontList(void) } } +static BOOL map_vertical_font_family(const WCHAR *orig, const WCHAR *repl, const Family *family) +{ + Face *face; + BOOL ret = FALSE; + WCHAR *at_orig, *at_repl = NULL; + + face = LIST_ENTRY(list_head(&family->faces), Face, entry); + if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK)) + return FALSE; + + at_orig = prepend_at(strdupW(orig)); + if (at_orig && !find_family_from_any_name(at_orig)) + { + at_repl = prepend_at(strdupW(repl)); + if (at_repl) + ret = map_font_family(at_orig, at_repl); + } + + HeapFree(GetProcessHeap(), 0, at_orig); + HeapFree(GetProcessHeap(), 0, at_repl); + + return ret; +} + static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) { Family *family = find_family_from_any_name(repl); @@ -2374,6 +2400,10 @@ static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) list_init(&new_family->faces); new_family->replacement = &family->faces; list_add_tail(&font_list, &new_family->entry); + + if (repl[0] != '@') + map_vertical_font_family(orig, repl, family); + return TRUE; } }

1 0

Nikolay Sivov : mfmediaengine: Implement error property.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 4d56ed9d02bafd0fd4f7438c5dd78714a00b1e9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d56ed9d02bafd0fd4f7438c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 13:41:45 2020 +0300 mfmediaengine: Implement error property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 39 ++++++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 32 ++++++++++++++------------ 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d77b1e4afe..dba55bb937 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -84,6 +84,7 @@ struct media_engine double default_playback_rate; double volume; double duration; + MF_MEDIA_ENGINE_ERR error_code; IMFMediaSession *session; IMFSourceResolver *resolver; CRITICAL_SECTION cs; @@ -512,16 +513,44 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError **error) { - FIXME("(%p, %p): stub.\n", iface, error); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, error); + + *error = NULL; + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->error_code) + { + if (SUCCEEDED(hr = create_media_error(error))) + IMFMediaError_SetErrorCode(*error, engine->error_code); + } + LeaveCriticalSection(&engine->cs); + + return hr; } -static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR error) +static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR code) { - FIXME("(%p, %d): stub.\n", iface, error); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u.\n", iface, code); + + if ((unsigned int)code > MF_MEDIA_ENGINE_ERR_ENCRYPTED) + return E_INVALIDARG; + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + engine->error_code = code; + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngine *iface, IMFMediaEngineSrcElements *elements) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 2f114db7e9..660e5b9533 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -503,45 +503,47 @@ static void test_error(void) eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!eo, "Unexpected instance.\n"); -} + hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ABORTED); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); eo = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!eo, "Unexpected instance.\n"); -} + eo2 = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo2); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(eo2 != eo, "Unexpected instance.\n"); -} - if (eo2) - IMFMediaError_Release(eo2); - if (eo) - IMFMediaError_Release(eo); + + IMFMediaError_Release(eo2); + IMFMediaError_Release(eo); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!eo, "Unexpected instance.\n"); -} + + hr = IMFMediaEngine_Shutdown(media_engine); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + eo = (void *)0xdeadbeef; + hr = IMFMediaEngine_GetError(media_engine, &eo); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(!eo, "Unexpected instance.\n"); + + hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaEngine_Release(media_engine); /* Error object. */

1 0