November 2020 - Wine-commits

Alexandre Julliard : gdi32: Initialize the font gamma ramp with the other font options.
by Alexandre Julliard 06 Nov '20

06 Nov '20

Module: wine Branch: master Commit: a56487732e1a9c39e462b0fa1d0d36f0cee9a68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56487732e1a9c39e462b0fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 6 12:10:54 2020 +0100 gdi32: Initialize the font gamma ramp with the other font options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 64 +++++++++++++++++-------------------------------------- 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index bbda64ed557..6ad03df176b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,7 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static UINT font_smoothing = GGO_BITMAP; static UINT subpixel_orientation = GGO_GRAY4_BITMAP; static BOOL antialias_fakes = TRUE; +static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); @@ -3878,7 +3879,7 @@ static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) static void init_font_options(void) { HKEY key; - DWORD type, size, val; + DWORD i, type, size, val, gamma = 1400; WCHAR buffer[20]; size = sizeof(buffer); @@ -3910,8 +3911,24 @@ static void init_font_options(void) else font_smoothing = GGO_GRAY4_BITMAP; } + if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + { + gamma = min( max( val, 1000 ), 2200 ); + } RegCloseKey( key ); } + + /* Calibrating the difference between the registry value and the Wine gamma value. + This looks roughly similar to Windows Native with the same registry value. + MS GDI seems to be rasterizing the outline at a different rate than FreeType. */ + gamma = 1000 * gamma / 1400; + for (i = 0; i < 256; i++) + { + font_gamma_ramp.encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + font_gamma_ramp.decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + font_gamma_ramp.gamma = gamma; + TRACE("gamma %d\n", font_gamma_ramp.gamma); } @@ -4424,49 +4441,6 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } -static BOOL WINAPI fill_font_gamma_ramp( INIT_ONCE *once, void *param, void **context ) -{ - struct font_gamma_ramp *ramp = param; - const DWORD gamma_default = 1400; - DWORD i, gamma; - HKEY key; - - gamma = gamma_default; - if (RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key ) == ERROR_SUCCESS) - { - if (get_key_value( key, L"FontSmoothingGamma", &gamma ) || gamma == 0) - gamma = gamma_default; - RegCloseKey( key ); - - gamma = min( max( gamma, 1000 ), 2200 ); - } - - /* Calibrating the difference between the registry value and the Wine gamma value. - This looks roughly similar to Windows Native with the same registry value. - MS GDI seems to be rasterizing the outline at a different rate than FreeType. */ - gamma = 1000 * gamma / 1400; - - for (i = 0; i < 256; i++) - { - ramp->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; - ramp->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; - } - - ramp->gamma = gamma; - TRACE("gamma %d\n", ramp->gamma); - - return TRUE; -} - -static struct font_gamma_ramp *get_font_gamma_ramp( void ) -{ - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - static struct font_gamma_ramp ramp; - - InitOnceExecuteOnce( &init_once, fill_font_gamma_ramp, &ramp, NULL ); - return &ramp; -} - /*********************************************************************** * FONT_SelectObject */ @@ -4493,7 +4467,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); if (dc->font_gamma_ramp == NULL) - dc->font_gamma_ramp = get_font_gamma_ramp(); + dc->font_gamma_ramp = &font_gamma_ramp; GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle );

1 0

Akihiro Sagawa : gdi32: Fix font rendering issue when child font is used.
by Alexandre Julliard 06 Nov '20

06 Nov '20

Module: wine Branch: master Commit: 308a0cf72d884f2b716b6df6954ef55e572b07cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=308a0cf72d884f2b716b6df6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 6 21:16:35 2020 +0900 gdi32: Fix font rendering issue when child font is used. Otherwise, freetype_get_glyph_outline() fails at FT_Load_Glyph due to combination of base_font's ft_face and child font's glyph index. Fixes a regression introduced by 044315c0b3890676d9fd751d8191b0b7381e0b97. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 70a4b18c4f8..61397e8b542 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3219,7 +3219,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph const MAT2 *lpmat, BOOL tategaki ) { struct gdi_font *base_font = font->base_font ? font->base_font : font; - FT_Face ft_face = get_ft_face( base_font ); + FT_Face ft_face = get_ft_face( font ); FT_Glyph_Metrics metrics; FT_Error err; FT_BBox bbox;

1 0

Rémi Bernon : gdi32: Implement GdiDllInitialize stub.
by Alexandre Julliard 06 Nov '20

06 Nov '20

Module: wine Branch: master Commit: cb1ff768acbdfbd28311dbbc1b72f0ea83c0f325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb1ff768acbdfbd28311dbbc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 6 18:05:42 2020 +0100 gdi32: Implement GdiDllInitialize stub. This is required by several Call of Duty games that are calling this directly after loading gdi32.dll from disk. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48171 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdiobj.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 725afebb8eb..dc63dbcbf32 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -182,7 +182,7 @@ @ stub GdiDeleteLocalObject # @ stub GdiDeleteSpoolFileHandle @ stdcall GdiDescribePixelFormat(long long long ptr) -@ stub GdiDllInitialize +@ stdcall GdiDllInitialize(ptr long ptr) @ stdcall GdiDrawStream(long long ptr) # @ stub GdiEndDocEMF # @ stub GdiEndPageEMF diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 29e55adc4eb..2309fdac582 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -672,6 +672,19 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) return TRUE; } + +/*********************************************************************** + * GdiDllInitialize + * + * Stub entry point, some games (CoD: Black Ops 3) call it directly. + */ +BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + FIXME("stub\n"); + return TRUE; +} + + static const char *gdi_obj_type( unsigned type ) { switch ( type )

1 0

Alistair Leslie-Hughes : include: Add DBPROPSTATUSENUM enum values.
by Alexandre Julliard 06 Nov '20

06 Nov '20

Module: wine Branch: master Commit: f5831eda2ec9918e5fa794682ac8c114a7c6b672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5831eda2ec9918e5fa79468… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 18:50:56 2020 +1100 include: Add DBPROPSTATUSENUM enum values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 19f92b3c05f..cbdb89d23b2 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -79,6 +79,22 @@ enum DBPROPOPTIONENUM { typedef DWORD DBPROPSTATUS; +enum DBPROPSTATUSENUM { + DBPROPSTATUS_OK = 0, + DBPROPSTATUS_NOTSUPPORTED = 1, + DBPROPSTATUS_BADVALUE = 2, + DBPROPSTATUS_BADOPTION = 3, + DBPROPSTATUS_BADCOLUMN = 4, + DBPROPSTATUS_NOTALLSETTABLE = 5, + DBPROPSTATUS_NOTSETTABLE = 6, + DBPROPSTATUS_NOTSET = 7, + DBPROPSTATUS_CONFLICTING = 8 +}; + +enum DBPROPSTATUSENUM21 { + DBPROPSTATUS_NOTAVAILABLE = 9 +}; + typedef struct tagDBPROP { DBPROPID dwPropertyID; DBPROPOPTIONS dwOptions;

1 0

Robert Wilhelm : vbscript: Allow keywords to be used as function name.
by Alexandre Julliard 06 Nov '20

06 Nov '20

Module: wine Branch: master Commit: 72977a75a4e281dff69f150b608f50a73bb5c81f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72977a75a4e281dff69f150b… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Nov 5 23:12:15 2020 +0100 vbscript: Allow keywords to be used as function name. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 10 +++++----- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 942e76459c2..7c749b5ef77 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -490,11 +490,11 @@ ArgumentDecl /* these keywords may also be an identifier, depending on context */ Identifier : tIdentifier { $$ = $1; } - | tDEFAULT { $$ = $1; } - | tERROR { $$ = $1; } - | tEXPLICIT { $$ = $1; } - | tPROPERTY { $$ = $1; } - | tSTEP { $$ = $1; } + | tDEFAULT { ctx->last_token = tIdentifier; $$ = $1; } + | tERROR { ctx->last_token = tIdentifier; $$ = $1; } + | tEXPLICIT { ctx->last_token = tIdentifier; $$ = $1; } + | tPROPERTY { ctx->last_token = tIdentifier; $$ = $1; } + | tSTEP { ctx->last_token = tIdentifier; $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 65f8a458cd7..570bb7fbcb3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1631,9 +1631,31 @@ sub test_identifiers Dim step step = "xx" Call ok(step = "xx", "step = " & step & " expected ""xx""") + + Dim property + property = "xx" + Call ok(property = "xx", "property = " & property & " expected ""xx""") end sub call test_identifiers() +Class class_test_identifiers_as_function_name + Sub Property ( par ) + End Sub + + Function Error( par ) + End Function + + Sub Default () + End Sub + + Function Explicit (par) + Explicit = par + End Function + + Sub Step ( default ) + End Sub +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10")

1 0

Nikolay Sivov : evr/sample: Use separate thread for tracking notifications.
by Alexandre Julliard 06 Nov '20

06 Nov '20

Module: wine Branch: master Commit: 2865d4216e58f552cfa122efed6fcb4e58d89753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2865d4216e58f552cfa122ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 6 18:15:26 2020 +0300 evr/sample: Use separate thread for tracking notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 275 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 39520cb6020..729f279fafe 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -103,6 +103,276 @@ static struct surface_buffer *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct surface_buffer, IMFGetService_iface); } +struct tracked_async_result +{ + MFASYNCRESULT result; + LONG refcount; + IUnknown *object; + IUnknown *state; +}; + +static struct tracked_async_result *impl_from_IMFAsyncResult(IMFAsyncResult *iface) +{ + return CONTAINING_RECORD(iface, struct tracked_async_result, result.AsyncResult); +} + +static HRESULT WINAPI tracked_async_result_QueryInterface(IMFAsyncResult *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncResult) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncResult_AddRef(iface); + return S_OK; + } + + *obj = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI tracked_async_result_AddRef(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + ULONG refcount = InterlockedIncrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI tracked_async_result_Release(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + ULONG refcount = InterlockedDecrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + { + if (result->result.pCallback) + IMFAsyncCallback_Release(result->result.pCallback); + if (result->object) + IUnknown_Release(result->object); + if (result->state) + IUnknown_Release(result->state); + heap_free(result); + } + + return refcount; +} + +static HRESULT WINAPI tracked_async_result_GetState(IMFAsyncResult *iface, IUnknown **state) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %p.\n", iface, state); + + if (!result->state) + return E_POINTER; + + *state = result->state; + IUnknown_AddRef(*state); + + return S_OK; +} + +static HRESULT WINAPI tracked_async_result_GetStatus(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->result.hrStatusResult; +} + +static HRESULT WINAPI tracked_async_result_SetStatus(IMFAsyncResult *iface, HRESULT status) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %#x.\n", iface, status); + + result->result.hrStatusResult = status; + + return S_OK; +} + +static HRESULT WINAPI tracked_async_result_GetObject(IMFAsyncResult *iface, IUnknown **object) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %p.\n", iface, object); + + if (!result->object) + return E_POINTER; + + *object = result->object; + IUnknown_AddRef(*object); + + return S_OK; +} + +static IUnknown * WINAPI tracked_async_result_GetStateNoAddRef(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->state; +} + +static const IMFAsyncResultVtbl tracked_async_result_vtbl = +{ + tracked_async_result_QueryInterface, + tracked_async_result_AddRef, + tracked_async_result_Release, + tracked_async_result_GetState, + tracked_async_result_GetStatus, + tracked_async_result_SetStatus, + tracked_async_result_GetObject, + tracked_async_result_GetStateNoAddRef, +}; + +static HRESULT create_async_result(IUnknown *object, IMFAsyncCallback *callback, + IUnknown *state, IMFAsyncResult **out) +{ + struct tracked_async_result *result; + + result = heap_alloc_zero(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->result.AsyncResult.lpVtbl = &tracked_async_result_vtbl; + result->refcount = 1; + result->object = object; + if (result->object) + IUnknown_AddRef(result->object); + result->result.pCallback = callback; + if (result->result.pCallback) + IMFAsyncCallback_AddRef(result->result.pCallback); + result->state = state; + if (result->state) + IUnknown_AddRef(result->state); + + *out = &result->result.AsyncResult; + + return S_OK; +} + +struct tracking_thread +{ + HANDLE hthread; + DWORD tid; + LONG refcount; +}; +static struct tracking_thread tracking_thread; + +static CRITICAL_SECTION tracking_thread_cs = { NULL, -1, 0, 0, 0, 0 }; + +enum tracking_thread_message +{ + TRACKM_STOP = WM_USER, + TRACKM_INVOKE = WM_USER + 1, +}; + +static DWORD CALLBACK tracking_thread_proc(void *arg) +{ + HANDLE ready_event = arg; + BOOL stop_thread = FALSE; + IMFAsyncResult *result; + MFASYNCRESULT *data; + MSG msg; + + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(ready_event); + + while (!stop_thread) + { + MsgWaitForMultipleObjects(0, NULL, FALSE, INFINITE, QS_POSTMESSAGE); + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + switch (msg.message) + { + case TRACKM_INVOKE: + result = (IMFAsyncResult *)msg.lParam; + data = (MFASYNCRESULT *)result; + if (data->pCallback) + IMFAsyncCallback_Invoke(data->pCallback, result); + IMFAsyncResult_Release(result); + break; + + case TRACKM_STOP: + stop_thread = TRUE; + break; + + default: + ; + } + } + } + + TRACE("Tracking thread exiting.\n"); + + return 0; +} + +static void video_sample_create_tracking_thread(void) +{ + EnterCriticalSection(&tracking_thread_cs); + + if (++tracking_thread.refcount == 1) + { + HANDLE ready_event; + + ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + if (!(tracking_thread.hthread = CreateThread(NULL, 0, tracking_thread_proc, + ready_event, 0, &tracking_thread.tid))) + { + WARN("Failed to create sample tracking thread.\n"); + CloseHandle(ready_event); + return; + } + + WaitForSingleObject(ready_event, INFINITE); + CloseHandle(ready_event); + + TRACE("Create tracking thread %#x.\n", tracking_thread.tid); + } + + LeaveCriticalSection(&tracking_thread_cs); +} + +static void video_sample_stop_tracking_thread(void) +{ + EnterCriticalSection(&tracking_thread_cs); + + if (!--tracking_thread.refcount) + { + PostThreadMessageW(tracking_thread.tid, TRACKM_STOP, 0, 0); + CloseHandle(tracking_thread.hthread); + memset(&tracking_thread, 0, sizeof(tracking_thread)); + } + + LeaveCriticalSection(&tracking_thread_cs); +} + +static void video_sample_tracking_thread_invoke(IMFAsyncResult *result) +{ + if (!tracking_thread.tid) + { + WARN("Sample tracking thread is not initialized.\n"); + return; + } + + IMFAsyncResult_AddRef(result); + PostThreadMessageW(tracking_thread.tid, TRACKM_INVOKE, 0, (LPARAM)result); +} + struct sample_allocator { IMFVideoSampleAllocator IMFVideoSampleAllocator_iface; @@ -628,14 +898,11 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) { struct video_sample *sample = impl_from_IMFSample(iface); ULONG refcount; - HRESULT hr; IMFSample_LockStore(sample->sample); if (sample->tracked_result && sample->tracked_refcount == (sample->refcount - 1)) { - /* Call could fail if queue system is not initialized, it's not critical. */ - if (FAILED(hr = MFInvokeCallback(sample->tracked_result))) - WARN("Failed to invoke tracking callback, hr %#x.\n", hr); + video_sample_tracking_thread_invoke(sample->tracked_result); IMFAsyncResult_Release(sample->tracked_result); sample->tracked_result = NULL; sample->tracked_refcount = 0; @@ -648,6 +915,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) if (!refcount) { + video_sample_stop_tracking_thread(); if (sample->sample) IMFSample_Release(sample->sample); heap_free(sample); @@ -1132,7 +1400,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, hr = MF_E_NOTACCEPTING; else { - if (SUCCEEDED(hr = MFCreateAsyncResult((IUnknown *)iface, sample_allocator, state, &sample->tracked_result))) + if (SUCCEEDED(hr = create_async_result((IUnknown *)iface, sample_allocator, state, &sample->tracked_result))) { /* Account for additional refcount brought by 'state' object. This threshold is used on Release() to invoke tracker callback. */ @@ -1428,6 +1696,8 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam if (buffer) IMFSample_AddBuffer(object->sample, buffer); + video_sample_create_tracking_thread(); + *sample = &object->IMFSample_iface; return S_OK;

1 0

Alexandre Julliard : Release 5.21.
by Alexandre Julliard 06 Nov '20

06 Nov '20

Module: wine Branch: master Commit: 70d77a439ab58dcf56664d1545aa0c4cd3edb31e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d77a439ab58dcf56664d15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 6 21:13:30 2020 +0100 Release 5.21. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 810 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 378 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70d77a439ab58dcf5666…

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: 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: 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