February 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Replace hlsl_message() with hlsl_error().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: vkd3d Branch: master Commit: 7069fa1c40f8762581336b57b06f0f41c5ca6161 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7069fa1c40f8762581336b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 21 22:04:37 2021 -0600 vkd3d-shader: Replace hlsl_message() with hlsl_error(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 5 ----- libs/vkd3d-shader/hlsl.h | 2 -- libs/vkd3d-shader/hlsl.y | 4 +++- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1f9a392..dbc6954 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -20,11 +20,6 @@ #include "hlsl.h" #include <stdio.h> -void hlsl_message(const char *fmt, ...) -{ - /* FIXME */ -} - void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, const char *fmt, ...) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9122b09..a374f54 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -544,8 +544,6 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN; struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN; - void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b6d0324..ea640b9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3110,7 +3110,9 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) if (!(entry_func = get_func_entry(ctx, entrypoint))) { - hlsl_message("error: entry point \"%s\" is not defined\n", entrypoint); + const struct vkd3d_shader_location loc = {.source_name = ctx->location.source_name}; + + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entrypoint); return VKD3D_ERROR_INVALID_SHADER; }

1 0

Zebediah Figura : vkd3d-shader: Implement hlsl_note().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: vkd3d Branch: master Commit: 87a371292d7cdb5b7eb2159b49c24d3fdfb4c2e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=87a371292d7cdb5b7eb2159… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 21 22:04:38 2021 -0600 vkd3d-shader: Implement hlsl_note(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 +++++- libs/vkd3d-shader/vkd3d_shader_main.c | 20 ++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index dbc6954..52b3dd1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -23,7 +23,11 @@ void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, const char *fmt, ...) { - /* FIXME */ + va_list args; + + va_start(args, fmt); + vkd3d_shader_vnote(ctx->message_context, &loc, level, fmt, args); + va_end(args); } void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6f1482a..bae2852 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -144,6 +144,26 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont return true; } +void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_log_level level, const char *format, va_list args) +{ + if (context->log_level < level) + return; + + if (location) + { + const char *source_name = location->source_name ? location->source_name : "<anonymous>"; + + if (location->line) + vkd3d_string_buffer_printf(&context->messages, "%s:%u:%u: ", + source_name, location->line, location->column); + else + vkd3d_string_buffer_printf(&context->messages, "%s: ", source_name); + } + vkd3d_string_buffer_vprintf(&context->messages, format, args); + vkd3d_string_buffer_printf(&context->messages, "\n"); +} + void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2d7eb05..e837dbc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -906,6 +906,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const stru enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_log_level level, const char *format, va_list args) DECLSPEC_HIDDEN; void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : vkd3d-shader: Implement hlsl_error() and hlsl_warning().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: vkd3d Branch: master Commit: 6124aa664fc3aa45f4f39732b1ea66b25ef88d00 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6124aa664fc3aa45f4f3973… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 21 22:04:36 2021 -0600 vkd3d-shader: Implement hlsl_error() and hlsl_warning(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.c | 18 ++- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.l | 3 +- libs/vkd3d-shader/hlsl.y | 204 +++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 18 +++ 6 files changed, 147 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6124aa664fc3aa45f4f…

1 0

Gijs Vermeulen : msvcirt: Implement remainder of fstream class.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 4981785f0fbcafbdc6a9dc4f71d06b137d558597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4981785f0fbcafbdc6a9dc4f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Feb 21 18:05:02 2021 +0100 msvcirt: Implement remainder of fstream class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 157 +++++++++++++++++ dlls/msvcirt/msvcirt.spec | 52 +++--- dlls/msvcirt/tests/msvcirt.c | 397 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 52 +++--- dlls/msvcrt40/msvcrt40.spec | 52 +++--- 5 files changed, 625 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4981785f0fbcafbdc6a9…

1 0

Jactry Zeng : include: Avoid using C++ keyword.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 27040a4f009f1e35a540882dc150d14431de64a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27040a4f009f1e35a540882d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Feb 22 22:19:46 2021 +0800 include: Avoid using C++ keyword. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50670 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e264a3b18e4..52e0c5c9db1 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3984,7 +3984,7 @@ interface IFileOperation : IUnknown [in, unique] IFileOperationProgressSink *sink); HRESULT DeleteItems([in] IUnknown *items); HRESULT NewItem([in] IShellItem *folder, [in] DWORD attributes, - [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template, + [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template_name, [in, unique] IFileOperationProgressSink *sink); HRESULT PerformOperations(); HRESULT GetAnyOperationsAborted([out] BOOL *aborted);

1 0

Nikolay Sivov : mf/tests: Skip some tests on missing function.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 1d1665efb371b5b3a1c29e0a84b3ac226808fa44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1665efb371b5b3a1c29e0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 22 19:55:48 2021 +0300 mf/tests: Skip some tests on missing function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 65f2b40faa9..e3a752553bb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -47,6 +47,8 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "wine/test.h" +static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) { @@ -4669,7 +4671,13 @@ static void test_sample_copier(void) UINT32 value; HRESULT hr; - hr = MFCreateSampleCopierMFT(&copier); + if (!pMFCreateSampleCopierMFT) + { + win_skip("MFCreateSampleCopierMFT() is not available.\n"); + return; + } + + hr = pMFCreateSampleCopierMFT(&copier); ok(hr == S_OK, "Failed to create sample copier, hr %#x.\n", hr); hr = IMFTransform_GetAttributes(copier, &attributes); @@ -5005,7 +5013,10 @@ static void test_sample_copier_output_processing(void) HRESULT hr; BYTE *ptr; - hr = MFCreateSampleCopierMFT(&copier); + if (!pMFCreateSampleCopierMFT) + return; + + hr = pMFCreateSampleCopierMFT(&copier); ok(hr == S_OK, "Failed to create sample copier, hr %#x.\n", hr); /* Configure for 16 x 16 of D3DFMT_X8R8G8B8. */ @@ -5152,8 +5163,19 @@ static void test_MFGetTopoNodeCurrentType(void) IMFMediaType_Release(media_type2); } +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mf.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFCreateSampleCopierMFT); +#undef X +} + START_TEST(mf) { + init_functions(); + test_topology(); test_topology_tee_node(); test_topology_loader();

1 0

Zhiyi Zhang : user32/tests: Fix a test failure on w7u_2qxl TestBot VM.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 068cf6f02c147bd646ffd0f319493fe3783b4dc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=068cf6f02c147bd646ffd0f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 21:38:01 2021 +0800 user32/tests: Fix a test failure on w7u_2qxl TestBot VM. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..6b233970ace 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -743,17 +743,18 @@ static void test_ChangeDisplaySettingsEx(void) { dm.dmPosition = position; dm.dmFields |= DM_POSITION; - res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ if (mode == 0 && device) { - todo_wine ok(res == DISP_CHANGE_FAILED, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", - devices[device].name, mode, res); res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", devices[device].name, mode, res); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); } + else + { + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + } ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* TestBots using VGA driver can't change to some modes */

1 0

Zhiyi Zhang : user32/tests: Add optional messages to test sequences.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: a11ffeec96e5205d281862d9ff61d073e81576f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a11ffeec96e5205d281862d9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 21:39:32 2021 +0800 user32/tests: Add optional messages to test sequences. Fix a possible test failure on Win10 2009. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11fb764e6cd..7eaa2c67945 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5412,7 +5412,7 @@ static void test_messages(void) { ShowWindow(hwnd, SW_RESTORE); flush_events(); - ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE); + ok_sequence(WmShowRestoreMinOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE); flush_sequence(); } @@ -13917,6 +13917,7 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_QUERYNEWPALETTE, sent|optional }, { WM_PALETTEISCHANGING, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOREDRAW }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Zhiyi Zhang : comctl32/ipaddress: Only print an error when it actually occurs.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 7315afbc13582d1171058705d21881906a77afe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7315afbc13582d1171058705… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:50:40 2021 +0800 comctl32/ipaddress: Only print an error when it actually occurs. IPADDRESS_GetPartIndex() is also used for handling WM_KILLFOCUS and WM_SETFOCUS messages. In this case, it's actually expected that the window receiving or losing focus may not be a IP Address part window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 82d47d4e576..c7b9ada1f6a 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -130,7 +130,6 @@ static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd) for (i = 0; i < 4; i++) if (infoPtr->Part[i].EditHwnd == hwnd) return i; - ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd); return -1; } @@ -503,7 +502,11 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam); - if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0; + if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) + { + ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd); + return 0; + } part = &infoPtr->Part[index]; if (uMsg == WM_CHAR || uMsg == WM_KEYDOWN) {

1 0

Nikolay Sivov : dwrite: Correct return glyph origins for RTL runs.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 87bc6aac205cf3091e0b6ea91aeb1a8b5f05e710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87bc6aac205cf3091e0b6ea9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 22 21:29:35 2021 +0300 dwrite: Correct return glyph origins for RTL runs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 84 ++++++++++++++++-------------------------------- dlls/dwrite/tests/font.c | 1 - 2 files changed, 28 insertions(+), 57 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 40c82b6cd05..3b0505231bf 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1551,76 +1551,48 @@ static HRESULT WINAPI dwritefactory4_TranslateColorGlyphRun(IDWriteFactory7 *ifa } static HRESULT compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURING_MODE measuring_mode, - D2D1_POINT_2F baseline_origin, DWRITE_MATRIX const *transform, D2D1_POINT_2F *origins) + D2D1_POINT_2F baseline_origin, DWRITE_MATRIX const *transform, D2D1_POINT_2F *origins) { - IDWriteFontFace1 *fontface1 = NULL; - DWRITE_FONT_METRICS metrics; - FLOAT rtl_factor; - HRESULT hr; - UINT32 i; + struct dwrite_fontface *font_obj; + unsigned int i; + float advance; - rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; + font_obj = unsafe_impl_from_IDWriteFontFace(run->fontFace); - if (run->fontFace) { - IDWriteFontFace_GetMetrics(run->fontFace, &metrics); - if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1))) - WARN("Failed to get IDWriteFontFace1, %#x.\n", hr); - } + for (i = 0; i < run->glyphCount; ++i) + { + origins[i] = baseline_origin; - for (i = 0; i < run->glyphCount; i++) { - FLOAT advance; + if (run->bidiLevel & 1) + { + advance = fontface_get_scaled_design_advance(font_obj, measuring_mode, run->fontEmSize, + 1.0f, transform, run->glyphIndices[i], run->isSideways); - /* Use nominal advances if not provided by caller. */ - if (run->glyphAdvances) - advance = rtl_factor * run->glyphAdvances[i]; - else { - INT32 a; + origins[i].x -= advance; - advance = 0.0f; - switch (measuring_mode) + if (run->glyphOffsets) { - case DWRITE_MEASURING_MODE_NATURAL: - if (SUCCEEDED(IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, - run->isSideways))) - advance = rtl_factor * get_scaled_advance_width(a, run->fontEmSize, &metrics); - break; - case DWRITE_MEASURING_MODE_GDI_CLASSIC: - case DWRITE_MEASURING_MODE_GDI_NATURAL: - if (SUCCEEDED(IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, - 1.0f, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, - run->isSideways, 1, run->glyphIndices + i, &a))) - advance = rtl_factor * floorf(a * run->fontEmSize / metrics.designUnitsPerEm + 0.5f); - break; - default: - ; + origins[i].x -= run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; } - } - origins[i] = baseline_origin; + baseline_origin.x -= run->glyphAdvances ? run->glyphAdvances[i] : advance; + } + else + { + if (run->glyphOffsets) + { + origins[i].x += run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; + } - /* Apply offsets. */ - if (run->glyphOffsets) { - FLOAT advanceoffset = rtl_factor * run->glyphOffsets[i].advanceOffset; - FLOAT ascenderoffset = -run->glyphOffsets[i].ascenderOffset; + baseline_origin.x += run->glyphAdvances ? run->glyphAdvances[i] : + fontface_get_scaled_design_advance(font_obj, measuring_mode, run->fontEmSize, 1.0f, transform, + run->glyphIndices[i], run->isSideways); - if (run->isSideways) { - origins[i].x += ascenderoffset; - origins[i].y += advanceoffset; - } - else { - origins[i].x += advanceoffset; - origins[i].y += ascenderoffset; - } } - - if (run->isSideways) - baseline_origin.y += advance; - else - baseline_origin.x += advance; } - if (fontface1) - IDWriteFontFace1_Release(fontface1); return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 872405b1639..d7ced109a2f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8468,7 +8468,6 @@ static void test_ComputeGlyphOrigins(void) ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); for (j = 0; j < run.glyphCount; ++j) { - todo_wine_if(run.bidiLevel & 1) ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, expected_origins[j].x, expected_origins[j].y);

1 0