November 2020 - Wine-Commits

Alexandre Julliard : gdi32: Move OSMesa support to the Unix library.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: 60ef5b018221843edb231f535ff9f064ae6bdd35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60ef5b018221843edb231f53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 10:41:12 2020 +0100 gdi32: Move OSMesa support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 229 ++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dibdrv.h | 11 +- dlls/gdi32/dibdrv/opengl.c | 271 +++++++++++---------------------------------- dlls/gdi32/freetype.c | 19 +++- dlls/gdi32/gdi_private.h | 2 + 5 files changed, 321 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60ef5b018221843edb23…

1 0

Anton Baskanov : amstream: Implement MediaStreamFilter::Flush.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: 4919b9b99fe20cfb8599b7b827811fdd7937ea9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4919b9b99fe20cfb8599b7b8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Oct 29 11:41:01 2020 +0700 amstream: Implement MediaStreamFilter::Flush. 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/filter.c | 23 ++++++++++++++++++++--- dlls/amstream/tests/amstream.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 7531265cb8e..5fd5b2afdbc 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -750,11 +750,28 @@ static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME return hr; } -static HRESULT WINAPI filter_Flush(IMediaStreamFilter *iface, BOOL bCancelEOS) +static HRESULT WINAPI filter_Flush(IMediaStreamFilter *iface, BOOL cancel_eos) { - FIXME("(%p)->(%d): Stub!\n", iface, bCancelEOS); + struct filter *filter = impl_from_IMediaStreamFilter(iface); + struct event *event; - return E_NOTIMPL; + TRACE("filter %p, cancel_eos %d.\n", iface, cancel_eos); + + EnterCriticalSection(&filter->cs); + + LIST_FOR_EACH_ENTRY(event, &filter->used_events, struct event, entry) + { + if (!event->interrupted) + { + event->interrupted = TRUE; + IReferenceClock_Unadvise(filter->clock, event->cookie); + SetEvent(event->event); + } + } + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_EndOfStream(IMediaStreamFilter *iface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2f156538e4c..da5ef8f56a1 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6839,6 +6839,35 @@ static void test_mediastreamfilter_wait_until(void) ok(!WaitForSingleObject(cookie2.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n"); ok(WaitForSingleObject(thread2, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n"); + hr = IMediaStreamFilter_Flush(filter, FALSE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(cookie1.unadvise_called, "Expected Unadvise to be called.\n"); + ok(cookie2.unadvise_called, "Expected Unadvise to be called.\n"); + + ok(!WaitForSingleObject(thread1, 2000), "Wait timed out.\n"); + CloseHandle(thread1); + ok(!WaitForSingleObject(thread2, 2000), "Wait timed out.\n"); + CloseHandle(thread2); + + clock.advise_time_cookie = &cookie1; + + params1.filter = filter; + params1.time = 23456789; + params1.expected_hr = S_FALSE; + thread1 = CreateThread(NULL, 0, mediastreamfilter_wait_until, &params1, 0, NULL); + ok(!WaitForSingleObject(cookie1.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n"); + ok(WaitForSingleObject(thread1, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n"); + + clock.advise_time_cookie = &cookie2; + + params2.filter = filter; + params2.time = 23456789; + params2.expected_hr = S_FALSE; + thread2 = CreateThread(NULL, 0, mediastreamfilter_wait_until, &params2, 0, NULL); + ok(!WaitForSingleObject(cookie2.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n"); + ok(WaitForSingleObject(thread2, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n"); + hr = IMediaStreamFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Nikolay Sivov : mfmediaengine: Handle shutdown state in GetNativeVideoSize().
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: 86a72e055e6ca9a35ebb21de7d3325b219cfe215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a72e055e6ca9a35ebb21de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 19:04:56 2020 +0300 mfmediaengine: Handle shutdown state in GetNativeVideoSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 +++- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 27f6a26d6b7..55585b8b826 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1338,7 +1338,9 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO EnterCriticalSection(&engine->cs); - if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) hr = E_FAIL; else { diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 2f062741f60..f9f8fed4a74 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -379,7 +379,6 @@ todo_wine ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_GetNativeVideoSize(media_engine, &cx, &cy); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy);

1 0

Jacek Caban : mshtml: Ignore attempts to set read only builtin properties in IE9+ mode.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: a1d04f704d44229726bd72904ce765b08c4837b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d04f704d44229726bd7290… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 5 17:50:32 2020 +0100 mshtml: Ignore attempts to set read only builtin properties in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 4 ++++ dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index dab44991bf5..f4cc2b76f2a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1101,6 +1101,10 @@ static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS * } if(!func->put_vtbl_off) { + if(dispex_compat_mode(This) >= COMPAT_MODE_IE9) { + WARN("No setter\n"); + return S_OK; + } FIXME("No setter\n"); return E_FAIL; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index ded25df5128..09ea9e0d657 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -949,3 +949,8 @@ sync_test("preventExtensions", function() { ok(Object.preventExtensions.length === 1, "Object.preventExtensions.length = " + Object.preventExtensions.length); }); + +sync_test("head_setter", function() { + document.head = ""; + ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); +});

1 0

Francois Gouget : oleacc/tests: Fix the window name and keyboard shortcut tests.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: 0c3bb475899ad392eb426e6c28d802ca7ef64b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3bb475899ad392eb426e6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 5 16:03:06 2020 +0100 oleacc/tests: Fix the window name and keyboard shortcut tests. Unlike button names and static messages, window titles don't contain keyboard shortcuts so they should be returned as is. Windows did not make any distinction between these cases before Windows 10 1607. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 75 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index e4ef0e78bf2..ce44e06abe4 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -715,12 +715,17 @@ static void test_AccessibleChildren(IAccessible *acc) ok(V_VT(children) == VT_I4, "V_VT(children) = %d\n", V_VT(children)); ok(V_I4(children) == 1, "V_I4(children) = %d\n", V_I4(children)); + + ok(count == 1, "count = %d\n", count); + ok(V_VT(children+1) == VT_EMPTY, "V_VT(children+1) = %d\n", V_VT(children+1)); }else { ok(V_VT(children) == VT_DISPATCH, "V_VT(children) = %d\n", V_VT(children)); IDispatch_Release(V_DISPATCH(children)); + + ok(count == 2, "count = %d\n", count); + ok(V_VT(children+1) == VT_DISPATCH, "V_VT(children+1) = %d\n", V_VT(children+1)); + IDispatch_Release(V_DISPATCH(children+1)); } - ok(count == 1, "count = %d\n", count); - ok(V_VT(children+1) == VT_EMPTY, "V_VT(children+1) = %d\n", V_VT(children+1)); ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); } @@ -730,7 +735,7 @@ static void test_default_client_accessible_object(void) IDispatch *disp; IOleWindow *ow; IEnumVARIANT *ev; - HWND chld, hwnd, hwnd2; + HWND chld, btn, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -739,16 +744,59 @@ static void test_default_client_accessible_object(void) LONG l, left, top, width, height; ULONG fetched; - hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, + hwnd = CreateWindowA("oleacc_test", "wnd &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed\n"); - chld = CreateWindowA("static", "message", WS_CHILD | WS_VISIBLE, + chld = CreateWindowA("static", "static &t &junk", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, NULL, NULL, NULL); ok(chld != NULL, "CreateWindow failed\n"); + btn = CreateWindowA("BUTTON", "btn &t &junk", WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, + 50, 0, 50, 50, hwnd, NULL, NULL, NULL); + ok(btn != NULL, "CreateWindow failed\n"); hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == E_FAIL, "got %x\n", hr); + + /* Test the static message */ + hr = CreateStdAccessibleObject(chld, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"static t &junk"), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IAccessible_Release(acc); + + + /* Test the button */ + hr = CreateStdAccessibleObject(btn, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"btn t &junk"), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IAccessible_Release(acc); + + + /* Now we can test and destroy the top-level window */ hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); @@ -764,7 +812,7 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); - ok(l == 1, "l = %d\n", l); + ok(l == 2, "l = %d\n", l); V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; @@ -810,7 +858,15 @@ static void test_default_client_accessible_object(void) V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, L"test t &junk"), "name = %s\n", wine_dbgstr_w(str)); + /* Window names don't have keyboard shortcuts */ + todo_wine ok(!lstrcmpW(str, L"wnd &t &junk") || + broken(!lstrcmpW(str, L"wnd t &junk")), /* Windows < 10 1607 */ + "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + todo_wine ok(hr == S_FALSE || broken(hr == S_OK), "got %x\n", hr); + todo_wine ok(str == NULL || broken(!lstrcmpW(str, L"Alt+t")), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_I4(&vid) = 1; @@ -850,11 +906,6 @@ static void test_default_client_accessible_object(void) ok(hr == S_FALSE, "got %x\n", hr); ok(!str, "str != NULL\n"); - hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); - ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - str = (void*)0xdeadbeef; hr = IAccessible_get_accDefaultAction(acc, vid, &str); ok(hr == S_FALSE, "got %x\n", hr);

1 0

Nikolay Sivov : evr/presenter: Implement GetCurrentMediaType().
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: 813596f64c688ea2b0084ee7727e8c8bbc59a930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=813596f64c688ea2b0084ee7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 18:37:24 2020 +0300 evr/presenter: Implement GetCurrentMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 01623815dd3..1b98e63a49a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -71,6 +71,7 @@ struct video_presenter IDirect3DDeviceManager9 *device_manager; struct streaming_thread thread; + IMFMediaType *media_type; UINT reset_token; HWND video_window; MFVideoNormalizedRect src_rect; @@ -168,6 +169,38 @@ static void video_presenter_get_native_video_size(struct video_presenter *presen IMFMediaType_Release(media_type); } +static void video_presenter_reset_media_type(struct video_presenter *presenter) +{ + if (presenter->media_type) + IMFMediaType_Release(presenter->media_type); + presenter->media_type = NULL; + + /* FIXME: release samples pool */ +} + +static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) +{ + unsigned int flags; + + if (!media_type) + { + video_presenter_reset_media_type(presenter); + return S_OK; + } + + if (presenter->media_type && IMFMediaType_IsEqual(presenter->media_type, media_type, &flags) == S_OK) + return S_OK; + + video_presenter_reset_media_type(presenter); + + /* FIXME: allocate samples pool */ + + presenter->media_type = media_type; + IMFMediaType_AddRef(presenter->media_type); + + return S_OK; +} + static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { IMFMediaType *media_type; @@ -182,16 +215,16 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre /* FIXME: potentially adjust frame size */ - if (SUCCEEDED(IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY))) - { - /* FIXME: should keep a copy internally too */ + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); - IMFMediaType_Release(media_type); - break; - } + if (SUCCEEDED(hr)) + hr = video_presenter_set_media_type(presenter, media_type); + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); IMFMediaType_Release(media_type); + + if (SUCCEEDED(hr)) + break; } return hr; @@ -478,11 +511,29 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M return hr; } -static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, IMFVideoMediaType **media_type) +static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, + IMFVideoMediaType **media_type) { - FIXME("%p, %p.\n", iface, media_type); + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, media_type); + + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!presenter->media_type) + hr = MF_E_NOT_INITIALIZED; + else + { + hr = IMFMediaType_QueryInterface(presenter->media_type, &IID_IMFVideoMediaType, + (void **)media_type); + } + + LeaveCriticalSection(&presenter->cs); + + return hr; } static const IMFVideoPresenterVtbl video_presenter_vtbl =

1 0

Alexandre Julliard : gdi32: Move FreeType support to a new Unix library.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: 3cfafab38b26e0fd731c511d9ef984c1594e9ebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cfafab38b26e0fd731c511d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 10:32:04 2020 +0100 gdi32: Move FreeType support to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 14 ++++++----- dlls/gdi32/freetype.c | 61 +++++++++++++++++++++--------------------------- dlls/gdi32/gdi_private.h | 17 +++++++------- 3 files changed, 42 insertions(+), 50 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6a76e28d06d..e3c7d8ad06a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -940,11 +940,11 @@ static struct gdi_font_face *create_face( struct gdi_font_family *family, const return NULL; } -int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, - const WCHAR *style, const WCHAR *fullname, const WCHAR *file, - void *data_ptr, SIZE_T data_size, UINT index, FONTSIGNATURE fs, - DWORD ntmflags, DWORD version, DWORD flags, - const struct bitmap_font_size *size ) +static int CDECL add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, + const WCHAR *style, const WCHAR *fullname, const WCHAR *file, + void *data_ptr, SIZE_T data_size, UINT index, FONTSIGNATURE fs, + DWORD ntmflags, DWORD version, DWORD flags, + const struct bitmap_font_size *size ) { struct gdi_font_face *face; struct gdi_font_family *family; @@ -8040,6 +8040,8 @@ static void load_registry_fonts(void) RegCloseKey( hkey ); } +static const struct font_callback_funcs callback_funcs = { add_gdi_face }; + /*********************************************************************** * font_init */ @@ -8055,7 +8057,7 @@ void font_init(void) init_font_options(); update_codepage(); - if (!WineEngInit( &font_funcs )) return; + if (__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &callback_funcs, &font_funcs )) return; if (!(mutex = CreateMutexW( NULL, FALSE, mutex_nameW ))) return; WaitForSingleObject( mutex, INFINITE ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f112a04b4c1..9c875c1fa2f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include "wine/port.h" @@ -102,16 +106,15 @@ #include "winreg.h" #include "wingdi.h" #include "gdi_private.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(font); - #ifdef HAVE_FREETYPE +WINE_DEFAULT_DEBUG_CHANNEL(font); + #ifndef HAVE_FT_TRUETYPEENGINETYPE typedef enum { @@ -247,7 +250,7 @@ static inline FT_Face get_ft_face( struct gdi_font *font ) return ((struct font_private_data *)font->private)->ft_face; } -static const struct font_backend_funcs font_funcs; +static const struct font_callback_funcs *callback_funcs; struct font_mapping { @@ -1028,9 +1031,10 @@ static int AddFaceToList(FT_Face ft_face, const WCHAR *file, void *data_ptr, SIZ if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - ret = add_gdi_face( family_name, second_name, style_name, full_name, file, data_ptr, data_size, - face_index, fs, get_ntm_flags( ft_face ), get_font_version( ft_face ), - flags, FT_IS_SCALABLE(ft_face) ? NULL : &size ); + ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, + data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), + get_font_version( ft_face ), flags, + FT_IS_SCALABLE(ft_face) ? NULL : &size ); TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); @@ -1662,24 +1666,6 @@ static void CDECL freetype_load_fonts(void) #endif } -/************************************************************* - * WineEngInit - * - * Initialize FreeType library and create a list of available faces - */ -BOOL WineEngInit( const struct font_backend_funcs **funcs ) -{ - if(!init_freetype()) return FALSE; - -#ifdef SONAME_LIBFONTCONFIG - init_fontconfig(); -#endif - - *funcs = &font_funcs; - NtQueryDefaultLocale( FALSE, &system_lcid ); - return TRUE; -} - /* Some fonts have large usWinDescent values, as a result of storing signed short in unsigned field. That's probably caused by sTypoDescent vs usWinDescent confusion in some font generation tools. */ @@ -3471,10 +3457,10 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ) FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w((WCHAR *)font->otm.otmpFamilyName)); font->otm.otmpFullName = (char *)strdupW(fake_nameW); } - needed = sizeof(font->otm) + (strlenW( (WCHAR *)font->otm.otmpFamilyName ) + 1 + - strlenW( (WCHAR *)font->otm.otmpStyleName ) + 1 + - strlenW( (WCHAR *)font->otm.otmpFaceName ) + 1 + - strlenW( (WCHAR *)font->otm.otmpFullName ) + 1) * sizeof(WCHAR); + needed = sizeof(font->otm) + (lstrlenW( (WCHAR *)font->otm.otmpFamilyName ) + 1 + + lstrlenW( (WCHAR *)font->otm.otmpStyleName ) + 1 + + lstrlenW( (WCHAR *)font->otm.otmpFaceName ) + 1 + + lstrlenW( (WCHAR *)font->otm.otmpFullName ) + 1) * sizeof(WCHAR); em_scale = (FT_Fixed)pFT_MulDiv(font->ppem, 1 << 16, ft_face->units_per_EM); @@ -4044,13 +4030,18 @@ static const struct font_backend_funcs font_funcs = freetype_destroy_font }; -#else /* HAVE_FREETYPE */ - -/*************************************************************************/ - -BOOL WineEngInit( const struct font_backend_funcs **funcs ) +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) { - return FALSE; + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + + callback_funcs = ptr_in; + if (!init_freetype()) return STATUS_DLL_NOT_FOUND; +#ifdef SONAME_LIBFONTCONFIG + init_fontconfig(); +#endif + NtQueryDefaultLocale( FALSE, &system_lcid ); + *(const struct font_backend_funcs **)ptr_out = &font_funcs; + return STATUS_SUCCESS; } #endif /* HAVE_FREETYPE */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c5703689d46..9b48732b73b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -400,18 +400,17 @@ struct font_backend_funcs void (CDECL *destroy_font)( struct gdi_font *font ); }; -extern int add_gdi_face( const WCHAR *family_name, const WCHAR *second_name, - const WCHAR *style, const WCHAR *fullname, const WCHAR *file, - void *data_ptr, SIZE_T data_size, UINT index, FONTSIGNATURE fs, - DWORD ntmflags, DWORD version, DWORD flags, - const struct bitmap_font_size *size ) DECLSPEC_HIDDEN; +struct font_callback_funcs +{ + int (CDECL *add_gdi_face)( const WCHAR *family_name, const WCHAR *second_name, + const WCHAR *style, const WCHAR *fullname, const WCHAR *file, + void *data_ptr, SIZE_T data_size, UINT index, FONTSIGNATURE fs, + DWORD ntmflags, DWORD version, DWORD flags, + const struct bitmap_font_size *size ); +}; extern void font_init(void) DECLSPEC_HIDDEN; -/* freetype.c */ - -extern BOOL WineEngInit( const struct font_backend_funcs **funcs ) DECLSPEC_HIDDEN; - /* gdiobj.c */ extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : evr/presenter: Create dedicated thread to handle presentation time.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: bf8a9613c500689206448760bd3d20aa707225d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8a9613c500689206448760… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 18:37:23 2020 +0300 evr/presenter: Create dedicated thread to handle presentation time. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 54ad9fee994..01623815dd3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -40,6 +40,18 @@ enum presenter_state PRESENTER_STATE_PAUSED, }; +enum streaming_thread_message +{ + EVRM_STOP = WM_USER, +}; + +struct streaming_thread +{ + HANDLE hthread; + HANDLE ready_event; + DWORD tid; +}; + struct video_presenter { IMFVideoPresenter IMFVideoPresenter_iface; @@ -58,6 +70,7 @@ struct video_presenter IMediaEventSink *event_sink; IDirect3DDeviceManager9 *device_manager; + struct streaming_thread thread; UINT reset_token; HWND video_window; MFVideoNormalizedRect src_rect; @@ -184,6 +197,80 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre return hr; } +static DWORD CALLBACK video_presenter_streaming_thread(void *arg) +{ + struct video_presenter *presenter = arg; + BOOL stop_thread = FALSE; + MSG msg; + + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(presenter->thread.ready_event); + + while (!stop_thread) + { + MsgWaitForMultipleObjects(0, NULL, FALSE, INFINITE, QS_POSTMESSAGE); + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + switch (msg.message) + { + case EVRM_STOP: + stop_thread = TRUE; + break; + + default: + ; + } + } + } + + return 0; +} + +static HRESULT video_presenter_start_streaming(struct video_presenter *presenter) +{ + if (presenter->thread.hthread) + return S_OK; + + if (!(presenter->thread.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(presenter->thread.hthread = CreateThread(NULL, 0, video_presenter_streaming_thread, + presenter, 0, &presenter->thread.tid))) + { + WARN("Failed to create streaming thread.\n"); + CloseHandle(presenter->thread.ready_event); + presenter->thread.ready_event = NULL; + return E_FAIL; + } + + WaitForSingleObject(presenter->thread.ready_event, INFINITE); + CloseHandle(presenter->thread.ready_event); + presenter->thread.ready_event = NULL; + + TRACE("Started streaming thread, tid %#x.\n", presenter->thread.tid); + + return S_OK; +} + +static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) +{ + if (!presenter->thread.hthread) + return S_OK; + + PostThreadMessageW(presenter->thread.tid, EVRM_STOP, 0, 0); + + WaitForSingleObject(presenter->thread.hthread, INFINITE); + CloseHandle(presenter->thread.hthread); + + TRACE("Terminated streaming thread tid %#x.\n", presenter->thread.tid); + + memset(&presenter->thread, 0, sizeof(presenter->thread)); + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -266,6 +353,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) if (!refcount) { + video_presenter_end_streaming(presenter); video_presenter_clear_container(presenter); DeleteCriticalSection(&presenter->cs); if (presenter->device_manager) @@ -374,6 +462,12 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M case MFVP_MESSAGE_INVALIDATEMEDIATYPE: hr = video_presenter_invalidate_media_type(presenter); break; + case MFVP_MESSAGE_BEGINSTREAMING: + hr = video_presenter_start_streaming(presenter); + break; + case MFVP_MESSAGE_ENDSTREAMING: + hr = video_presenter_end_streaming(presenter); + break; default: FIXME("Unsupported message %u.\n", message); hr = E_NOTIMPL;

1 0

Alexandre Julliard : gdi32: Use ntdll functions for heap allocations.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: 54a01ea1ec3fa77620100b643d164ab361927173 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a01ea1ec3fa77620100b64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 10:11:10 2020 +0100 gdi32: Use ntdll functions for heap allocations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 80 +++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54a01ea1ec3fa7762010…

1 0

Alexandre Julliard : gdi32: Don't abort enumeration if a font fails to load.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: fe6bb5f72394b4d56c6f4956363f347b050ce4ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6bb5f72394b4d56c6f4956… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 09:59:22 2020 +0100 gdi32: Don't abort enumeration if a font fails to load. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 89197361fe2..300b8fc1106 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2772,11 +2772,11 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi { struct gdi_font_enum_data *data; - if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return FALSE; - if (!get_face_enum_data( face, &data->elf, &data->ntm )) + if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) )) || + !get_face_enum_data( face, &data->elf, &data->ntm )) { HeapFree( GetProcessHeap(), 0, data ); - return FALSE; + return TRUE; } face->cached_enum_data = data; }

1 0