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

Jacek Caban : mshtml: Add window.requestAnimationFrame semi-stub implementation.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 101822c04b4f3f5e22cc6cb4655df64a70e13505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=101822c04b4f3f5e22cc6cb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:52:53 2021 +0200 mshtml: Add window.requestAnimationFrame semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 29 +++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/task.c | 30 +++++++++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/dom.js | 10 ++++++++++ 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e535cd54bd6..4c57d457e41 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3170,6 +3170,9 @@ HRESULT search_window_props(HTMLInnerWindow *This, BSTR bstrName, DWORD grfdex, return DISP_E_UNKNOWNNAME; } +/* DISPIDs not exposed by interfaces */ +#define DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME 1300 + static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { HTMLWindow *This = impl_from_IDispatchEx(iface); @@ -3186,6 +3189,13 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; + if(dispex_compat_mode(&window->event_target.dispex) >= COMPAT_MODE_IE10 && + !wcscmp(bstrName, L"requestAnimationFrame")) { + TRACE("requestAnimationFrame\n"); + *pid = DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME; + return S_OK; + } + if(This->outer_window) { HTMLOuterWindow *frame; @@ -3272,6 +3282,25 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, &dp, pvarRes, pei, pspCaller); } + case DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME: { + HRESULT hres; + LONG r; + + FIXME("requestAnimationFrame: semi-stub\n"); + + if(!(wFlags & DISPATCH_METHOD) || pdp->cArgs != 1 || pdp->cNamedArgs) { + FIXME("unsupported args\n"); + return E_INVALIDARG; + } + + hres = window_set_timer(window, pdp->rgvarg, 50, NULL, TIMER_ANIMATION_FRAME, &r); + if(SUCCEEDED(hres) && pvarRes) { + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = r; + } + + return hres; + } } return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9d1737cc81f..7bc645e549f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1217,6 +1217,7 @@ ULONGLONG get_time_stamp(void) DECLSPEC_HIDDEN; enum timer_type { TIMER_TIMEOUT, TIMER_INTERVAL, + TIMER_ANIMATION_FRAME, }; HRESULT set_task_timer(HTMLInnerWindow*,LONG,enum timer_type,IDispatch*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index b7616058461..28cb88ab5f1 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -218,9 +218,20 @@ HRESULT clear_task_timer(HTMLInnerWindow *window, DWORD id) return S_OK; } -static void call_timer_disp(IDispatch *disp) +static const char *debugstr_timer_type(enum timer_type type) +{ + switch(type) { + case TIMER_TIMEOUT: return "timeout"; + case TIMER_INTERVAL: return "interval"; + case TIMER_ANIMATION_FRAME: return "animation-frame"; + DEFAULT_UNREACHABLE; + } +} + +static void call_timer_disp(IDispatch *disp, enum timer_type timer_type) { DISPPARAMS dp = {NULL, NULL, 0, 0}; + VARIANT timestamp; EXCEPINFO ei; VARIANT res; HRESULT hres; @@ -228,12 +239,19 @@ static void call_timer_disp(IDispatch *disp) V_VT(&res) = VT_EMPTY; memset(&ei, 0, sizeof(ei)); - TRACE(">>>\n"); + if(timer_type == TIMER_ANIMATION_FRAME) { + dp.cArgs = 1; + dp.rgvarg = &timestamp; + V_VT(&timestamp) = VT_R8; + V_R8(&timestamp) = get_time_stamp(); + } + + TRACE("%p %s >>>\n", disp, debugstr_timer_type(timer_type)); hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL); if(hres == S_OK) - TRACE("<<<\n"); + TRACE("%p %s <<<\n", disp, debugstr_timer_type(timer_type)); else - WARN("<<< %08x\n", hres); + WARN("%p %s <<< %08x\n", disp, debugstr_timer_type(timer_type), hres); VariantClear(&res); } @@ -241,6 +259,7 @@ static void call_timer_disp(IDispatch *disp) static LRESULT process_timer(void) { thread_data_t *thread_data; + enum timer_type timer_type; IDispatch *disp; DWORD tc; task_timer_t *timer=NULL, *last_timer; @@ -273,6 +292,7 @@ static LRESULT process_timer(void) disp = timer->disp; IDispatch_AddRef(disp); + timer_type = timer->type; if(timer->interval) { timer->time += timer->interval; @@ -281,7 +301,7 @@ static LRESULT process_timer(void) release_task_timer(thread_data->thread_hwnd, timer); } - call_timer_disp(disp); + call_timer_disp(disp, timer_type); IDispatch_Release(disp); }while(!list_empty(&thread_data->timer_list)); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 35b4a001fed..7074b1f62f2 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -115,6 +115,7 @@ sync_test("window_props", function() { test_exposed("getSelection", v >= 9); test_exposed("onfocusout", v >= 9); test_exposed("getComputedStyle", v >= 9); + test_exposed("requestAnimationFrame", v >= 10); test_exposed("Set", v >= 11); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f5e4f393b58..b30d1a8fbed 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -448,3 +448,13 @@ sync_test("elem_props", function() { elem.accessKey = "q"; ok(elem.accessKey === "q", "accessKey = " + elem.accessKey + " expected q"); }); + +async_test("animation_frame", function() { + var id = requestAnimationFrame(function(x) { + ok(this === window, "this != window"); + ok(typeof(x) === "number", "x = " + x); + ok(arguments.length === 1, "arguments.lenght = " + arguments.length); + next_test(); + }); + ok(typeof(id) === "number", "id = " + id); +});

1 0

Zebediah Figura : evr: Stub IEVRFilterConfig.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 8c59a0467776ac2387686b477d2fa8089bd529fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c59a0467776ac2387686b47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:23:44 2021 -0500 evr: Stub IEVRFilterConfig. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50415 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 1 + 2 files changed, 67 insertions(+) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 94239417794..1965fd247de 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct evr { struct strmbase_renderer renderer; + IEVRFilterConfig IEVRFilterConfig_iface; }; static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -40,6 +41,19 @@ static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) return CONTAINING_RECORD(iface, struct evr, renderer); } +static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (IsEqualGUID(iid, &IID_IEVRFilterConfig)) + *out = &filter->IEVRFilterConfig_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static void evr_destroy(struct strmbase_renderer *iface) { struct evr *filter = impl_from_strmbase_renderer(iface); @@ -64,9 +78,60 @@ static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = evr_query_accept, .renderer_render = evr_render, + .renderer_query_interface = evr_query_interface, .renderer_destroy = evr_destroy, }; +static struct evr *impl_from_IEVRFilterConfig(IEVRFilterConfig *iface) +{ + return CONTAINING_RECORD(iface, struct evr, IEVRFilterConfig_iface); +} + +static HRESULT WINAPI filter_config_QueryInterface(IEVRFilterConfig *iface, REFIID iid, void **out) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI filter_config_AddRef(IEVRFilterConfig *iface) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_config_Release(IEVRFilterConfig *iface) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI filter_config_SetNumberOfStreams(IEVRFilterConfig *iface, DWORD count) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + + FIXME("filter %p, count %u, stub!\n", filter, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_config_GetNumberOfStreams(IEVRFilterConfig *iface, DWORD *count) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + + FIXME("filter %p, count %p, stub!\n", filter, count); + + return E_NOTIMPL; +} + +static const IEVRFilterConfigVtbl filter_config_vtbl = +{ + filter_config_QueryInterface, + filter_config_AddRef, + filter_config_Release, + filter_config_SetNumberOfStreams, + filter_config_GetNumberOfStreams, +}; + HRESULT evr_filter_create(IUnknown *outer, void **out) { struct evr *object; @@ -76,6 +141,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) strmbase_renderer_init(&object->renderer, outer, &CLSID_EnhancedVideoRenderer, L"EVR Input0", &renderer_ops); + object->IEVRFilterConfig_iface.lpVtbl = &filter_config_vtbl; TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fb4a2130f37..bcea437db4c 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -253,6 +253,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IEVRFilterConfig, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE); check_interface(filter, &IID_IMediaSeeking, TRUE);

1 0

Zebediah Figura : dbghelp: Link directly to __unDName.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: b70f9680c40d9726e39f75cf1b21e150c45e8975 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70f9680c40d9726e39f75cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:25:00 2021 -0500 dbghelp: Link directly to __unDName. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 706d088aec0..2ca85a6d6e8 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1782,25 +1782,8 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName UNDNAME_COMPLETE) != 0; } -static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static void CDECL und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } - -static char *und_name(char *buffer, const char *mangled, int buflen, unsigned short flags) -{ - /* undocumented from msvcrt */ - static HANDLE hMsvcrt; - static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); - static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; - - if (!p_undname) - { - if (!hMsvcrt) hMsvcrt = LoadLibraryW(szMsvcrt); - if (hMsvcrt) p_undname = (void*)GetProcAddress(hMsvcrt, "__unDName"); - if (!p_undname) return NULL; - } - - return p_undname(buffer, mangled, buflen, und_alloc, und_free, flags); -} +extern char * CDECL __unDName(char *buffer, const char *mangled, int len, + void * (CDECL *pfn_alloc)(size_t), void (CDECL *pfn_free)(void *), unsigned short flags); /*********************************************************************** * UnDecorateSymbolName (DBGHELP.@) @@ -1813,7 +1796,7 @@ DWORD WINAPI UnDecorateSymbolName(const char *decorated_name, char *undecorated_ if (!undecorated_name || !undecorated_length) return 0; - if (!und_name(undecorated_name, decorated_name, undecorated_length, flags)) + if (!__unDName(undecorated_name, decorated_name, undecorated_length, malloc, free, flags)) return 0; return strlen(undecorated_name); } @@ -1837,12 +1820,12 @@ DWORD WINAPI UnDecorateSymbolNameW(const WCHAR *decorated_name, WCHAR *undecorat if ((buf = HeapAlloc(GetProcessHeap(), 0, len))) { WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, buf, len, NULL, NULL); - if ((ptr = und_name(NULL, buf, 0, flags))) + if ((ptr = __unDName(NULL, buf, 0, malloc, free, flags))) { MultiByteToWideChar(CP_ACP, 0, ptr, -1, undecorated_name, undecorated_length); undecorated_name[undecorated_length - 1] = 0; ret = lstrlenW(undecorated_name); - und_free(ptr); + free(ptr); } HeapFree(GetProcessHeap(), 0, buf); }

1 0

Zebediah Figura : windows.gaming.input: Link directly to combase.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: ac1c34715368943a39ef20f422125d3d588d5e64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1c34715368943a39ef20f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:34:58 2021 -0500 windows.gaming.input: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/tests/Makefile.in | 2 +- dlls/windows.gaming.input/tests/input.c | 50 ++++++----------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/windows.gaming.input/tests/Makefile.in b/dlls/windows.gaming.input/tests/Makefile.in index 7fce9b04551..88e1c05fbcf 100644 --- a/dlls/windows.gaming.input/tests/Makefile.in +++ b/dlls/windows.gaming.input/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.gaming.input.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ input.c diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index 6ce06de346e..b05dc508637 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -34,13 +34,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); - struct gamepad_event_handler { IEventHandler_Gamepad IEventHandler_Gamepad_iface; @@ -119,13 +112,13 @@ static void test_Gamepad(void) gamepad_event_handler.IEventHandler_Gamepad_iface.lpVtbl = &gamepad_event_handler_vtbl; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(gamepad_name, wcslen(gamepad_name), &str); + hr = WindowsCreateString(gamepad_name, wcslen(gamepad_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); if (hr == REGDB_E_CLASSNOTREG) { @@ -213,9 +206,9 @@ static void test_Gamepad(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } struct controller_event_handler @@ -296,13 +289,13 @@ static void test_RawGameController(void) controller_event_handler.IEventHandler_RawGameController_iface.lpVtbl = &controller_event_handler_vtbl; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK || hr == S_FALSE, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(controller_name, wcslen(controller_name), &str); + hr = WindowsCreateString(controller_name, wcslen(controller_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); if (hr == REGDB_E_CLASSNOTREG) { @@ -390,36 +383,13 @@ static void test_RawGameController(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(input) { - HMODULE combase; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoActivateInstance); - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); -#undef LOAD_FUNCPTR - test_Gamepad(); test_RawGameController(); }

1 0

Zebediah Figura : windows.globalization: Link directly to combase.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 862684feaec45e3ae13cf6a8de793efff5e435f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862684feaec45e3ae13cf6a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:34:59 2021 -0500 windows.globalization: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/tests/Makefile.in | 2 +- dlls/windows.globalization/tests/globalization.c | 64 +++++++----------------- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/windows.globalization/tests/Makefile.in b/dlls/windows.globalization/tests/Makefile.in index d928414c6ea..7ee2bc407d6 100644 --- a/dlls/windows.globalization/tests/Makefile.in +++ b/dlls/windows.globalization/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.globalization.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ globalization.c diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 631c7ad2449..ebe7ccc4704 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -38,14 +38,6 @@ /* kernel32.dll */ static INT (WINAPI *pGetUserDefaultGeoName)(LPWSTR, int); -/* combase.dll */ -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); -static WCHAR *(WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); - static void test_GlobalizationPreferences(void) { @@ -56,28 +48,29 @@ static void test_GlobalizationPreferences(void) IActivationFactory *factory = NULL; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; HSTRING str, tmp_str; + const WCHAR *buf; BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(class_name, wcslen(class_name), &str); + hr = WindowsCreateString(class_name, wcslen(class_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); if (hr == REGDB_E_CLASSNOTREG) { win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); - pWindowsDeleteString(str); - pRoUninitialize(); + WindowsDeleteString(str); + RoUninitialize(); return; } @@ -103,7 +96,7 @@ static void test_GlobalizationPreferences(void) hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); if (pGetUserDefaultGeoName) { @@ -116,7 +109,7 @@ static void test_GlobalizationPreferences(void) len, wine_dbgstr_w(buf), wine_dbgstr_w(country)); } - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); @@ -138,7 +131,7 @@ static void test_GlobalizationPreferences(void) hr = IVectorView_HSTRING_GetAt(languages, 0, &tmp_str); ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); ok(wcslen(locale) == len && !memcmp(buf, locale, len), @@ -151,9 +144,9 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); ok(i == 0 && found == TRUE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); - hr = pWindowsCreateString(L"deadbeef", 8, &tmp_str); + hr = WindowsCreateString(L"deadbeef", 8, &tmp_str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); i = 0xdeadbeef; @@ -162,7 +155,7 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); ok(i == 0 && found == FALSE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); tmp_str = (HSTRING)0xdeadbeef; hr = IVectorView_HSTRING_GetAt(languages, size, &tmp_str); @@ -178,14 +171,14 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); ok(i == 1, "IVectorView_HSTRING_GetMany returned count %u, expected 1\n", i); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); ok(wcslen(locale) == len && !memcmp(buf, locale, len), "IGlobalizationPreferencesStatics_get_Languages 0 returned len %u, str %s, expected %s\n", len, wine_dbgstr_w(buf), wine_dbgstr_w(locale)); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); IVectorView_HSTRING_Release(languages); @@ -229,35 +222,14 @@ static void test_GlobalizationPreferences(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(globalization) { - HMODULE combase, kernel32; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); - LOAD_FUNCPTR(WindowsGetStringRawBuffer); -#undef LOAD_FUNCPTR + HMODULE kernel32; kernel32 = GetModuleHandleA("kernel32"); pGetUserDefaultGeoName = (void*)GetProcAddress(kernel32, "GetUserDefaultGeoName");

1 0

Zebediah Figura : windows.media.devices: Link directly to combase.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: 923af67f24f9b7d552f2c4380c8bd359d4b6de41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=923af67f24f9b7d552f2c438… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:35:00 2021 -0500 windows.media.devices: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.devices/tests/Makefile.in | 2 +- dlls/windows.media.devices/tests/devices.c | 60 ++++++++-------------------- 2 files changed, 17 insertions(+), 45 deletions(-) diff --git a/dlls/windows.media.devices/tests/Makefile.in b/dlls/windows.media.devices/tests/Makefile.in index 42aa4ac9b10..4d107889dad 100644 --- a/dlls/windows.media.devices/tests/Makefile.in +++ b/dlls/windows.media.devices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.media.devices.dll -IMPORTS = ole32 +IMPORTS = combase C_SRCS = \ devices.c diff --git a/dlls/windows.media.devices/tests/devices.c b/dlls/windows.media.devices/tests/devices.c index f3777944848..d8acc638837 100644 --- a/dlls/windows.media.devices/tests/devices.c +++ b/dlls/windows.media.devices/tests/devices.c @@ -37,13 +37,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); -static WCHAR *(WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); - static HRESULT (WINAPI *pActivateAudioInterfaceAsync)(const WCHAR *path, REFIID riid, PROPVARIANT *params, IActivateAudioInterfaceCompletionHandler *done_handler, @@ -141,12 +134,12 @@ static void test_MediaDeviceStatics(void) HRESULT hr; DWORD dr; - hr = pWindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); + hr = WindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); - pWindowsDeleteString(str); + WindowsDeleteString(str); /* interface tests */ hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); @@ -182,12 +175,12 @@ static void test_MediaDeviceStatics(void) if (g_default_capture_id) { - ok(wcsstr(pWindowsGetStringRawBuffer(str, NULL), g_default_capture_id) != NULL, + ok(wcsstr(WindowsGetStringRawBuffer(str, NULL), g_default_capture_id) != NULL, "Expected to find substring of default capture id in %s\n", - wine_dbgstr_w(pWindowsGetStringRawBuffer(str, NULL))); + wine_dbgstr_w(WindowsGetStringRawBuffer(str, NULL))); /* returned id does not work in GetDevice... */ - hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, pWindowsGetStringRawBuffer(str, NULL), &mmdev); + hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ @@ -199,7 +192,7 @@ static void test_MediaDeviceStatics(void) strcpy(async_activate_test.msg_pfx, "capture_activate"); EnterCriticalSection(&async_activate_test.lock); - hr = pActivateAudioInterfaceAsync(pWindowsGetStringRawBuffer(str, NULL), + hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); LeaveCriticalSection(&async_activate_test.lock); @@ -212,7 +205,7 @@ static void test_MediaDeviceStatics(void) ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); - pWindowsDeleteString(str); + WindowsDeleteString(str); } /* test default render device creation */ @@ -223,12 +216,12 @@ static void test_MediaDeviceStatics(void) if (g_default_render_id) { - ok(wcsstr(pWindowsGetStringRawBuffer(str, NULL), g_default_render_id) != NULL, + ok(wcsstr(WindowsGetStringRawBuffer(str, NULL), g_default_render_id) != NULL, "Expected to find substring of default render id in %s\n", - wine_dbgstr_w(pWindowsGetStringRawBuffer(str, NULL))); + wine_dbgstr_w(WindowsGetStringRawBuffer(str, NULL))); /* returned id does not work in GetDevice... */ - hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, pWindowsGetStringRawBuffer(str, NULL), &mmdev); + hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ @@ -240,7 +233,7 @@ static void test_MediaDeviceStatics(void) strcpy(async_activate_test.msg_pfx, "render_activate"); EnterCriticalSection(&async_activate_test.lock); - hr = pActivateAudioInterfaceAsync(pWindowsGetStringRawBuffer(str, NULL), + hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); LeaveCriticalSection(&async_activate_test.lock); @@ -253,7 +246,7 @@ static void test_MediaDeviceStatics(void) ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); - pWindowsDeleteString(str); + WindowsDeleteString(str); } /* cleanup */ @@ -264,31 +257,10 @@ static void test_MediaDeviceStatics(void) START_TEST(devices) { - HMODULE combase, mmdevapi; + HMODULE mmdevapi; IMMDevice *mmdev; HRESULT hr; - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); - LOAD_FUNCPTR(WindowsGetStringRawBuffer); -#undef LOAD_FUNCPTR - if (!(mmdevapi = LoadLibraryW(L"mmdevapi.dll"))) { win_skip("Failed to load mmdevapi.dll, skipping tests\n"); @@ -305,7 +277,7 @@ START_TEST(devices) LOAD_FUNCPTR(ActivateAudioInterfaceAsync); #undef LOAD_FUNCPTR - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, @@ -340,5 +312,5 @@ START_TEST(devices) CoTaskMemFree(g_default_render_id); IMMDeviceEnumerator_Release(g_mmdevenum); - pRoUninitialize(); + RoUninitialize(); }

1 0

Zebediah Figura : windows.media.speech: Link directly to combase.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: e01ad1d275572edf96cc50bb6bb4b344c568aa2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01ad1d275572edf96cc50bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:35:01 2021 -0500 windows.media.speech: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/Makefile.in | 2 +- dlls/windows.media.speech/tests/speech.c | 50 ++++++----------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index f3e458f53d1..2ee10d3db21 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.media.speech.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ speech.c diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 1c48c5bf933..c949b35900b 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -34,13 +34,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); - static void test_SpeechSynthesizer(void) { static const WCHAR *speech_synthesizer_name = L"Windows.Media.SpeechSynthesis.SpeechSynthesizer"; @@ -55,13 +48,13 @@ static void test_SpeechSynthesizer(void) HRESULT hr; UINT32 size; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); + hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); @@ -116,9 +109,9 @@ static void test_SpeechSynthesizer(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } static void test_VoiceInformation(void) @@ -129,45 +122,22 @@ static void test_VoiceInformation(void) HSTRING str; HRESULT hr; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); + hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(speech) { - HMODULE combase; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoActivateInstance); - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); -#undef LOAD_FUNCPTR - test_SpeechSynthesizer(); test_VoiceInformation(); }

1 0

Rémi Bernon : ntdll: Make sure unix_name is zero terminated (valgrind).
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: b3f6f21d01b281cb928538237eea5c39ec7c0b08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3f6f21d01b281cb92853823… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 08:21:11 2021 +0200 ntdll: Make sure unix_name is zero terminated (valgrind). In nt_to_unix_file_name_no_root. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 488f7485ad8..e32de57190b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3290,6 +3290,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char if (prefix_len == name_len) /* no subdir, plain DOS device */ { + unix_name[pos + ret] = 0; *unix_name_ret = unix_name; return get_dos_device( unix_name_ret, pos ); }

1 0

Nikolay Sivov : mfplat: Remove some unnecessary pointer casts.
by Alexandre Julliard 22 Apr '21

22 Apr '21

Module: wine Branch: master Commit: e5475da88e7be1d534b4470504e2614bf73e6183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5475da88e7be1d534b44705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 09:25:33 2021 +0300 mfplat: Remove some unnecessary pointer casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index fae4d3e5055..e0dbb6a1a78 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -978,7 +978,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia TRACE("%p.\n", iface); CoTaskMemFree(media_type->video_format); - if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType((IMFMediaType *)iface, &media_type->video_format, &size))) + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size))) WARN("Failed to create format description, hr %#x.\n", hr); return media_type->video_format; @@ -1378,9 +1378,11 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT TRACE("%p.\n", iface); CoTaskMemFree(media_type->audio_format); - if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType((IMFMediaType *)iface, &media_type->audio_format, &size, - MFWaveFormatExConvertFlag_Normal))) + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format, + &size, MFWaveFormatExConvertFlag_Normal))) + { WARN("Failed to create wave format description, hr %#x.\n", hr); + } return media_type->audio_format; }

1 0

Anton Baskanov : amstream: Implement AMMultiMediaStream::GetEndOfStreamEventHandle.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: c19fb3d70de96adefdfa997333d7b38e3e97e226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19fb3d70de96adefdfa9973… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 21 12:53:32 2021 +0700 amstream: Implement AMMultiMediaStream::GetEndOfStreamEventHandle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34746 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 13 +++++++++---- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index b34634d89d2..6bac95a243b 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -207,13 +207,18 @@ static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_ return IMediaSeeking_SetPositions(This->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } -static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *phEOS) +static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *eos) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); + struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, phEOS); + TRACE("mmstream %p, eos %p.\n", mmstream, eos); - return E_NOTIMPL; + if (!eos) + return E_POINTER; + + *eos = (HANDLE)mmstream->event; + + return S_OK; } static HRESULT create_graph(struct multimedia_stream *mmstream, IGraphBuilder *graph) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 56dc8003719..5226a072364 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2991,11 +2991,11 @@ static void test_get_end_of_stream_event_handle(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetEndOfStreamEventHandle(mmstream, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); event = INVALID_HANDLE_VALUE; hr = IAMMultiMediaStream_GetEndOfStreamEventHandle(mmstream, &event); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &rgb32_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3013,12 +3013,12 @@ static void test_get_end_of_stream_event_handle(void) hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0