wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Nikolay Sivov : mfmediaengine: Handle shutdown state in GetNativeVideoSize().
by Alexandre Julliard 05 Nov '20

05 Nov '20

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

Nikolay Sivov : mfmediaengine: Implement GetVideoAspectRatio().
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: ef8bf642c716983317badb799e20eb6419be374c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8bf642c716983317badb79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 19:04:55 2020 +0300 mfmediaengine: Implement GetVideoAspectRatio(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 69 +++++++++++++++++++++++++++----- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index cbea4263702..27f6a26d6b7 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -74,7 +74,8 @@ enum media_engine_flags struct video_frame { LONGLONG pts; - UINT64 size; + SIZE size; + SIZE ratio; TOPOID node_id; }; @@ -252,15 +253,34 @@ static struct media_engine *impl_from_IMFSampleGrabberSinkCallback(IMFSampleGrab return CONTAINING_RECORD(iface, struct media_engine, grabber_callback); } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology *topology) { IMFMediaTypeHandler *handler; IMFMediaType *media_type; IMFStreamDescriptor *sd; IMFTopologyNode *node; + unsigned int gcd; + UINT64 size; HRESULT hr; - engine->video_frame.size = 0; + engine->video_frame.size.cx = 0; + engine->video_frame.size.cy = 0; + engine->video_frame.ratio.cx = 1; + engine->video_frame.ratio.cy = 1; if (FAILED(IMFTopology_GetNodeByID(topology, engine->video_frame.node_id, &node))) return; @@ -284,7 +304,17 @@ static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology return; } - IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &engine->video_frame.size); + IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &size); + + engine->video_frame.size.cx = size >> 32; + engine->video_frame.size.cy = size; + + if ((gcd = get_gcd(engine->video_frame.size.cx, engine->video_frame.size.cy))) + { + engine->video_frame.ratio.cx = engine->video_frame.size.cx / gcd; + engine->video_frame.ratio.cy = engine->video_frame.size.cy / gcd; + } + IMFMediaType_Release(media_type); } @@ -533,8 +563,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi UINT64 duration; HRESULT hr; - engine->video_frame.node_id = 0; - engine->video_frame.size = 0; + memset(&engine->video_frame, 0, sizeof(engine->video_frame)); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) return hr; @@ -1309,12 +1338,12 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO EnterCriticalSection(&engine->cs); - if (!engine->video_frame.size) + if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) hr = E_FAIL; else { - if (cx) *cx = engine->video_frame.size >> 32; - if (cy) *cy = engine->video_frame.size; + if (cx) *cx = engine->video_frame.size.cx; + if (cy) *cy = engine->video_frame.size.cy; } LeaveCriticalSection(&engine->cs); @@ -1324,9 +1353,29 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) { - FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, cx, cy); + + if (!cx && !cy) + return E_INVALIDARG; + + EnterCriticalSection(&engine->cs); + + 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 + { + if (cx) *cx = engine->video_frame.ratio.cx; + if (cy) *cy = engine->video_frame.ratio.cy; + } + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 21ead1b0afa..2f062741f60 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -383,7 +383,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaEngine_Release(media_engine);

1 0

Nikolay Sivov : evr/presenter: Implement GetCurrentMediaType().
by Alexandre Julliard 05 Nov '20

05 Nov '20

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

Nikolay Sivov : evr/presenter: Create dedicated thread to handle presentation time.
by Alexandre Julliard 05 Nov '20

05 Nov '20

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

Michael Stefaniuc : jscript: Use wide-char string literals in struct initialization.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: a8a03eb35fa3d9d4f7efc8c9f4abca91bf093c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a03eb35fa3d9d4f7efc8c9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 23:34:40 2020 +0100 jscript: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/bool.c | 7 +-- dlls/jscript/date.c | 146 +++++++++++++++------------------------------- dlls/jscript/enumerator.c | 13 ++--- dlls/jscript/error.c | 3 +- dlls/jscript/function.c | 20 +++---- dlls/jscript/global.c | 54 ++++++----------- dlls/jscript/json.c | 7 +-- dlls/jscript/jsregexp.c | 72 ++++++++--------------- dlls/jscript/math.c | 79 +++++++++---------------- dlls/jscript/number.c | 19 ++---- dlls/jscript/vbarray.c | 16 ++--- 11 files changed, 143 insertions(+), 293 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8a03eb35fa3d9d4f7ef…

1 0

Alexandre Julliard : gdi32: Build with msvcrt.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: aa90a5969f08dfbd6219e77bf0713ce0da3f7625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa90a5969f08dfbd6219e77b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 10:44:16 2020 +0100 gdi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 + dlls/gdi32/bidi.c | 2 - dlls/gdi32/bitblt.c | 4 - dlls/gdi32/brush.c | 2 - dlls/gdi32/dc.c | 8 +- dlls/gdi32/dib.c | 2 - dlls/gdi32/dibdrv/graphics.c | 7 +- dlls/gdi32/driver.c | 24 +++--- dlls/gdi32/enhmetafile.c | 3 - dlls/gdi32/enhmfdrv/graphics.c | 3 - dlls/gdi32/font.c | 190 ++++++++++++++++++++--------------------- dlls/gdi32/gdiobj.c | 2 - dlls/gdi32/icm.c | 3 - dlls/gdi32/metafile.c | 2 - dlls/gdi32/opengl.c | 3 - dlls/gdi32/painting.c | 3 - dlls/gdi32/path.c | 5 -- dlls/gdi32/pen.c | 2 - dlls/gdi32/vulkan.c | 3 - 19 files changed, 111 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa90a5969f08dfbd6219…

1 0

Alexandre Julliard : gdi32: Move OSMesa support to the Unix library.
by Alexandre Julliard 05 Nov '20

05 Nov '20

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

Alexandre Julliard : gdi32: Move FreeType support to a new Unix library.
by Alexandre Julliard 05 Nov '20

05 Nov '20

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

Alexandre Julliard : gdi32: Use ntdll functions for heap allocations.
by Alexandre Julliard 05 Nov '20

05 Nov '20

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: Use ntdll functions for locale support.
by Alexandre Julliard 05 Nov '20

05 Nov '20

Module: wine Branch: master Commit: 013f1033c030d92014e2d75c5894eb785f2b1810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=013f1033c030d92014e2d75c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 10:08:58 2020 +0100 gdi32: Use ntdll functions for locale support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 61 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c3626f18358..e2020fff70f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -262,6 +262,7 @@ struct font_mapping static struct list mappings_list = LIST_INIT( mappings_list ); static UINT default_aa_flags; +static LCID system_lcid; static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ); static BOOL CDECL freetype_set_bitmap_text_metrics( struct gdi_font *font ); @@ -923,7 +924,6 @@ static inline void get_bitmap_size( FT_Face ft_face, struct bitmap_font_size *fa static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) { TT_OS2 *os2; - CHARSETINFO csi; FT_WinFNT_HeaderRec winfnt_header; int i; @@ -956,8 +956,25 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) { TRACE("pix_h %d charset %d dpi %dx%d pt %d\n", winfnt_header.pixel_height, winfnt_header.charset, winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); - if (TranslateCharsetInfo( (DWORD*)(UINT_PTR)winfnt_header.charset, &csi, TCI_SRCCHARSET )) - *fs = csi.fs; + switch (winfnt_header.charset) + { + case ANSI_CHARSET: fs->fsCsb[0] = FS_LATIN1; break; + case EASTEUROPE_CHARSET: fs->fsCsb[0] = FS_LATIN2; break; + case RUSSIAN_CHARSET: fs->fsCsb[0] = FS_CYRILLIC; break; + case GREEK_CHARSET: fs->fsCsb[0] = FS_GREEK; break; + case TURKISH_CHARSET: fs->fsCsb[0] = FS_TURKISH; break; + case HEBREW_CHARSET: fs->fsCsb[0] = FS_HEBREW; break; + case ARABIC_CHARSET: fs->fsCsb[0] = FS_ARABIC; break; + case BALTIC_CHARSET: fs->fsCsb[0] = FS_BALTIC; break; + case VIETNAMESE_CHARSET: fs->fsCsb[0] = FS_VIETNAMESE; break; + case THAI_CHARSET: fs->fsCsb[0] = FS_THAI; break; + case SHIFTJIS_CHARSET: fs->fsCsb[0] = FS_JISJAPAN; break; + case GB2312_CHARSET: fs->fsCsb[0] = FS_CHINESESIMP; break; + case HANGEUL_CHARSET: fs->fsCsb[0] = FS_WANSUNG; break; + case CHINESEBIG5_CHARSET: fs->fsCsb[0] = FS_CHINESETRAD; break; + case JOHAB_CHARSET: fs->fsCsb[0] = FS_JOHAB; break; + case SYMBOL_CHARSET: fs->fsCsb[0] = FS_SYMBOL; break; + } } } @@ -988,21 +1005,23 @@ static int AddFaceToList(FT_Face ft_face, const WCHAR *file, void *data_ptr, SIZ struct bitmap_font_size size; FONTSIGNATURE fs; int ret; - WCHAR *family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); + WCHAR *family_name = ft_face_get_family_name( ft_face, system_lcid ); WCHAR *second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - WCHAR *style_name = ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); - WCHAR *full_name = ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); + WCHAR *style_name = ft_face_get_style_name( ft_face, system_lcid ); + WCHAR *full_name = ft_face_get_full_name( ft_face, system_lcid ); /* try to find another secondary name, preferring the lowest langids */ - if (!strcmpiW( family_name, second_name )) + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) { HeapFree( GetProcessHeap(), 0, second_name ); second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - } - if (!strcmpiW( family_name, second_name )) - { - HeapFree( GetProcessHeap(), 0, second_name ); - second_name = NULL; + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + second_name = NULL; + } } get_fontsig( ft_face, &fs ); @@ -1657,6 +1676,7 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) #endif *funcs = &font_funcs; + NtQueryDefaultLocale( FALSE, &system_lcid ); return TRUE; } @@ -2189,9 +2209,9 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font ) if (!font->aa_flags) font->aa_flags = ADDFONT_AA_FLAGS( default_aa_flags ); if (!font->otm.otmpFamilyName) { - font->otm.otmpFamilyName = (char *)ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - font->otm.otmpStyleName = (char *)ft_face_get_style_name( ft_face, GetSystemDefaultLangID() ); - font->otm.otmpFaceName = (char *)ft_face_get_full_name( ft_face, GetSystemDefaultLangID() ); + font->otm.otmpFamilyName = (char *)ft_face_get_family_name( ft_face, system_lcid ); + font->otm.otmpStyleName = (char *)ft_face_get_style_name( ft_face, system_lcid ); + font->otm.otmpFaceName = (char *)ft_face_get_full_name( ft_face, system_lcid ); } if (font->scalable) @@ -3445,8 +3465,7 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ) /* note: we store actual pointers in the names instead of offsets, they are fixed up when returned to the app */ - if (!(font->otm.otmpFullName = (char *)get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, - GetSystemDefaultLangID() ))) + if (!(font->otm.otmpFullName = (char *)get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, system_lcid ))) { static const WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w((WCHAR *)font->otm.otmpFamilyName)); @@ -3547,12 +3566,14 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ) if (face_has_symbol_charmap(ft_face) || (pOS2->usFirstCharIndex >= 0xf000 && pOS2->usFirstCharIndex < 0xf100)) { TM.tmFirstChar = 0; - switch(GetACP()) + switch (PRIMARYLANGID(system_lcid)) { - case 1255: /* Hebrew */ + case LANG_HEBREW: TM.tmLastChar = 0xf896; break; - case 1257: /* Baltic */ + case LANG_ESTONIAN: + case LANG_LATVIAN: + case LANG_LITHUANIAN: TM.tmLastChar = 0xf8fd; break; default:

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020