March 2021 - Wine-Commits - list.winehq.org

Huw Davies : riched20: Add support for ENM_SCROLLEVENTS.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: de1398ef3817a8d3424c7834a27519f034939725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de1398ef3817a8d3424c7834… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 30 12:36:49 2021 +0100 riched20: Add support for ENM_SCROLLEVENTS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35650 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index a7b91716dab..6d2221e4d69 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1097,7 +1097,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) || - ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST)) && + ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) || + ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL)) && send_msg_filter( host, msg, &wparam, &lparam )) { TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n",

1 0

Nikolay Sivov : dwrite: Explicitly cast to signed type for abs().
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 69cfb81b2916210ba3c7fc4a8f49613af29ab1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69cfb81b2916210ba3c7fc4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 14:06:16 2021 +0300 dwrite: Explicitly cast to signed type for abs(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2fd6ad90f1f..68d3b1256ea 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3910,16 +3910,17 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA weight = font_extract_weight(&tokens, font->weight, &weight_name); /* resolve weight */ - if (weight != font->weight) { + if (weight != font->weight) + { if (!(weight < DWRITE_FONT_WEIGHT_NORMAL && font->weight < DWRITE_FONT_WEIGHT_NORMAL) && !(weight > DWRITE_FONT_WEIGHT_MEDIUM && font->weight > DWRITE_FONT_WEIGHT_MEDIUM) && !((weight == DWRITE_FONT_WEIGHT_NORMAL && font->weight == DWRITE_FONT_WEIGHT_MEDIUM) || (weight == DWRITE_FONT_WEIGHT_MEDIUM && font->weight == DWRITE_FONT_WEIGHT_NORMAL)) && - !(abs(weight - font->weight) <= 150 && + !(abs((int)weight - (int)font->weight) <= 150 && font->weight != DWRITE_FONT_WEIGHT_NORMAL && font->weight != DWRITE_FONT_WEIGHT_MEDIUM && - font->weight != DWRITE_FONT_WEIGHT_BOLD)) { - + font->weight != DWRITE_FONT_WEIGHT_BOLD)) + { font->weight = weight; } }

1 0

Nikolay Sivov : dwrite: Move outline dumping helpers.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 8bcdac04a83c9e28e63bfd2dd03c5b9a1a84a46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bcdac04a83c9e28e63bfd2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 14:06:15 2021 +0300 dwrite: Move outline dumping helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 10 +++++----- dlls/dwrite/font.c | 27 --------------------------- dlls/dwrite/freetype.c | 27 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 8536e3c6a36..2408251717b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -97,7 +97,11 @@ static inline BOOL dwrite_array_reserve(void **elements, size_t *capacity, size_ if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!*elements) + new_elements = RtlAllocateHeap(GetProcessHeap(), 0, new_capacity * size); + else + new_elements = RtlReAllocateHeap(GetProcessHeap(), 0, *elements, new_capacity * size); + if (!new_elements) return FALSE; *elements = new_elements; @@ -481,10 +485,6 @@ struct dwrite_outline } points; }; -extern int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) DECLSPEC_HIDDEN; -extern int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, - unsigned int count) DECLSPEC_HIDDEN; - /* Glyph shaping */ enum SCRIPT_JUSTIFY { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 57c64e4622d..2fd6ad90f1f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -832,33 +832,6 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace5 *iface, void IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, table_context); } -int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) -{ - if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, - sizeof(*outline->tags.values))) - { - return 1; - } - - outline->tags.values[outline->tags.count++] = tag; - - return 0; -} - -int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) -{ - if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, - sizeof(*outline->points.values))) - { - return 1; - } - - memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); - outline->points.count += count; - - return 0; -} - static void apply_outline_point_offset(const D2D1_POINT_2F *src, const D2D1_POINT_2F *offset, D2D1_POINT_2F *dst) { diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index efa0f24d96c..128388c9c86 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -267,6 +267,33 @@ static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F *p) p->y = v->y / 64.0f; } +static int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) +{ + if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, + sizeof(*outline->tags.values))) + { + return 1; + } + + outline->tags.values[outline->tags.count++] = tag; + + return 0; +} + +static int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) +{ + if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, + sizeof(*outline->points.values))) + { + return 1; + } + + memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); + outline->points.count += count; + + return 0; +} + static int decompose_beginfigure(struct decompose_context *ctxt) { D2D1_POINT_2F point;

1 0

Hans Leidekker : dnsapi: Get rid of imported domain name parsing code.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 0d26dd2afbc3255a6871f636257f7be3d962aba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d26dd2afbc3255a6871f636… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 30 10:35:26 2021 +0200 dnsapi: Get rid of imported domain name parsing code. These functions have been exported since glibc 2.9. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/Makefile.in | 2 - dlls/dnsapi/dnsapi.h | 7 -- dlls/dnsapi/ns_name.c | 313 ------------------------------------------------ dlls/dnsapi/ns_parse.c | 210 -------------------------------- dlls/dnsapi/query.c | 14 +-- 5 files changed, 7 insertions(+), 539 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d26dd2afbc3255a6871…

1 0

Alexandre Julliard : kernelbase: Don't fall back to dll loading for LOAD_LIBRARY_AS_DATAFILE.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: f404e309df185e4e0952f0b82d9d3533248cf9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f404e309df185e4e0952f0b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 12:26:22 2021 +0200 kernelbase: Don't fall back to dll loading for LOAD_LIBRARY_AS_DATAFILE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 7 +------ dlls/kernelbase/loader.c | 32 ++++++++++++-------------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 46f5c43b54e..96577989431 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -377,11 +377,7 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_FILE_INVALID, - "Expected ERROR_FILE_INVALID, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_INVALID, "Expected ERROR_FILE_INVALID, got %d\n", GetLastError()); DeleteFileA("testfile.dll"); @@ -423,7 +419,6 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA(path, NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..bdc153b1a47 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -95,6 +95,7 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na file = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 ); } + if (file == INVALID_HANDLE_VALUE) ERR("can't load %s\n", debugstr_w(name)); if (file == INVALID_HANDLE_VALUE) return FALSE; mapping = CreateFileMappingW( file, NULL, protect, 0, 0, NULL ); @@ -154,31 +155,22 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrGetDllHandle( load_path, flags, libname, &module )) - { LdrAddRefDll( 0, module ); - LdrUnlockLoaderLock( 0, magic ); - goto done; - } - if (load_library_as_datafile( load_path, flags, libname->Buffer, &module )) - { - LdrUnlockLoaderLock( 0, magic ); - goto done; - } + else + load_library_as_datafile( load_path, flags, libname->Buffer, &module ); LdrUnlockLoaderLock( 0, magic ); - flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */ - /* Fallback to normal behaviour */ } - - status = LdrLoadDll( load_path, flags, libname, &module ); - if (status != STATUS_SUCCESS) + else { - module = 0; - if (status == STATUS_DLL_NOT_FOUND && (GetVersion() & 0x80000000)) - SetLastError( ERROR_DLL_NOT_FOUND ); - else - SetLastError( RtlNtStatusToDosError( status ) ); + status = LdrLoadDll( load_path, flags, libname, &module ); + if (!set_ntstatus( status )) + { + module = 0; + if (status == STATUS_DLL_NOT_FOUND && (GetVersion() & 0x80000000)) + SetLastError( ERROR_DLL_NOT_FOUND ); + } } -done: + RtlReleasePath( load_path ); return module; }

1 0

Alexandre Julliard : ntdll: Set the window title to the image name on the Unix side.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: c5b0dd5fc22f7819f0921e173da8734e8e58bac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b0dd5fc22f7819f0921e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 12:25:42 2021 +0200 ntdll: Set the window title to the image name on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a7b025d79d2..2101f463287 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1941,7 +1941,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) size = (sizeof(*params) + MAX_PATH * sizeof(WCHAR) /* curdir */ + (wcslen( cmdline ) + 1) * sizeof(WCHAR) /* command line */ - + (wcslen( main_wargv[0] ) + 1) * sizeof(WCHAR) /* image path */ + + (wcslen( main_wargv[0] ) + 1) * sizeof(WCHAR) * 2 /* image path + window title */ + env_pos * sizeof(WCHAR)); status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&params, 0, &size, @@ -1961,6 +1961,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) put_unicode_string( main_wargv[0], &dst, &params->ImagePathName ); put_unicode_string( cmdline, &dst, &params->CommandLine ); + put_unicode_string( main_wargv[0], &dst, &params->WindowTitle ); free( image ); free( cmdline ); free( curdir );

1 0

Huw Davies : riched20: Remove SendOldNotify() helper.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 03c2fca74ac7519f5cca8c78bd9febb459e7a101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c2fca74ac7519f5cca8c78… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 30 12:36:48 2021 +0100 riched20: Remove SendOldNotify() helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 9 ++------- dlls/riched20/editor.h | 1 - dlls/riched20/paint.c | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dccc431f041..fe05d1e7444 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3939,7 +3939,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bHaveFocus = TRUE; create_caret(editor); update_caret(editor); - ME_SendOldNotify(editor, EN_SETFOCUS); + ITextHost_TxNotify( editor->texthost, EN_SETFOCUS, NULL ); if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; @@ -3949,7 +3949,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->wheel_remain = 0; hide_caret(editor); DestroyCaret(); - ME_SendOldNotify(editor, EN_KILLFOCUS); + ITextHost_TxNotify( editor->texthost, EN_KILLFOCUS, NULL ); if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; @@ -4244,11 +4244,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0L; } -void ME_SendOldNotify(ME_TextEditor *editor, int nCode) -{ - ITextHost_TxNotify(editor->texthost, nCode, NULL); -} - /* Fill buffer with srcChars unicode characters from the start cursor. * * buffer: destination buffer diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index fa1e22f9b48..d0274de409d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -274,7 +274,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSP void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, HRESULT* phresult ) DECLSPEC_HIDDEN; -void ME_SendOldNotify(ME_TextEditor *editor, int nCode) DECLSPEC_HIDDEN; int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) DECLSPEC_HIDDEN; void ME_RTFCharAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 550c3c97045..f991b2bebcf 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -141,7 +141,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) update_caret( editor ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ME_SendOldNotify( editor, EN_UPDATE ); + ITextHost_TxNotify( editor->texthost, EN_UPDATE, NULL ); ITextHost_TxViewChange(editor->texthost, update_now); @@ -150,7 +150,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) if(editor->nEventMask & ENM_CHANGE) { editor->nEventMask &= ~ENM_CHANGE; - ME_SendOldNotify(editor, EN_CHANGE); + ITextHost_TxNotify( editor->texthost, EN_CHANGE, NULL ); editor->nEventMask |= ENM_CHANGE; } }

1 0

Hans Leidekker : dnsapi/tests: Add a query test.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 7ff591d7dee84be729c037e88a25cc307ad38cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ff591d7dee84be729c037e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 30 10:35:30 2021 +0200 dnsapi/tests: Add a query test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/query.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 237dfd6ae7c..74669005a33 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -38,6 +38,11 @@ static void test_DnsQuery(void) DNS_RECORDW *rec; DNS_STATUS status; + rec = NULL; + status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + DnsRecordListFree(rec, DnsFreeRecordList); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status);

1 0

Huw Davies : riched20: Add support for EN_[HV]SCROLL notifications.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 08c4de06a1acb6109e665ab40218d88b2680c0d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c4de06a1acb6109e665ab4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 30 12:36:47 2021 +0100 riched20: Add support for EN_[HV]SCROLL notifications. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 20 +++++++------- dlls/riched20/editor.h | 6 ++--- dlls/riched20/paint.c | 47 +++++++++++++++++--------------- dlls/riched20/richole.c | 2 +- dlls/riched20/tests/txtsrv.c | 64 +++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 99 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08c4de06a1acb6109e66…

1 0

Nikolay Sivov : dwrite: Build with msvcrt.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: db516804cca24fc7feedbc58ad7d2ccd4055687a URL: https://source.winehq.org/git/wine.git/?a=commit;h=db516804cca24fc7feedbc58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 14:06:18 2021 +0300 dwrite: Build with msvcrt. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 2 + dlls/dwrite/analyzer.c | 9 +-- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/dwrite_private.h | 5 +- dlls/dwrite/font.c | 140 +++++++++++++++++++++++-------------------- dlls/dwrite/freetype.c | 6 +- dlls/dwrite/layout.c | 51 ++++++++-------- dlls/dwrite/main.c | 40 ++++++------- dlls/dwrite/opentype.c | 47 ++++++++------- dlls/dwrite/shape.c | 4 +- 10 files changed, 163 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db516804cca24fc7feed…

1 0