wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Sebastian Lackner : server: Avoid invalid memory access if creation of namespace fails in create_directory (Coverity).
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 9dab25c12483f7a684686bdb0f82bc523b6b0e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dab25c12483f7a684686bdb0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 24 18:50:56 2016 +0100 server: Avoid invalid memory access if creation of namespace fails in create_directory (Coverity). Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index de049ef..937ab89 100644 --- a/server/directory.c +++ b/server/directory.c @@ -192,7 +192,7 @@ static struct directory *create_directory( struct directory *root, const struct if (!(dir->entries = create_namespace( hash_size ))) { release_object( dir ); - dir = NULL; + return NULL; } if (sd) default_set_sd( &dir->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION );

1 0

Sebastian Lackner : server: Add missing check for objattr variable in load_registry wineserver call ( Coverity).
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: a52a117f80330e1ad8c322f8282b1eabeafcf0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52a117f80330e1ad8c322f82… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 24 18:50:43 2016 +0100 server: Add missing check for objattr variable in load_registry wineserver call (Coverity). Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/registry.c b/server/registry.c index 5723824..a35765c 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2187,6 +2187,8 @@ DECL_HANDLER(load_registry) const struct security_descriptor *sd; const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); + if (!objattr) return; + if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { set_error( STATUS_PRIVILEGE_NOT_HELD );

1 0

Nikolay Sivov : ctl3d32: Claim success in Ctl3dRegister().
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 28afe7fc04e1a069163c3c56f28a61df1a3b068b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28afe7fc04e1a069163c3c56f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 13:33:25 2016 +0300 ctl3d32: Claim success in Ctl3dRegister(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctl3d32/ctl3d32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ctl3d32/ctl3d32.c b/dlls/ctl3d32/ctl3d32.c index cbcb93d..6d3ceb0 100644 --- a/dlls/ctl3d32/ctl3d32.c +++ b/dlls/ctl3d32/ctl3d32.c @@ -75,7 +75,7 @@ BOOL WINAPI Ctl3dIsAutoSubclass(void) BOOL WINAPI Ctl3dRegister(HINSTANCE hInst) { - return FALSE; + return TRUE; } BOOL WINAPI Ctl3dSubclassCtl(HWND hwnd)

1 0

Nikolay Sivov : dwrite: Fix underline/ strikethrough position adjustment caused by text alignment.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: a62a9fcc1f856ded124c4ba3026730f7823921a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62a9fcc1f856ded124c4ba30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:11:02 2016 +0300 dwrite: Fix underline/strikethrough position adjustment caused by text alignment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9842746..b6f4a65 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3151,7 +3151,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawUnderline(renderer, context, /* horizontal underline always grows from left to right, width is always added to origin regardless of run direction */ - (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + run->align_dx + origin_x, + (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + u->run->align_dx + origin_x, SNAP_COORD(u->run->origin_y + origin_y), &u->u, u->run->effect); @@ -3161,7 +3161,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, LIST_FOR_EACH_ENTRY(s, &This->strikethrough, struct layout_strikethrough, entry) { IDWriteTextRenderer_DrawStrikethrough(renderer, context, - s->run->origin_x + run->align_dx + origin_x, + s->run->origin_x + s->run->align_dx + origin_x, SNAP_COORD(s->run->origin_y + origin_y), &s->s, s->run->effect);

1 0

Nikolay Sivov : dwrite: Remove useless assignment (Coverity).
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 3fa5ebd014d0f06b59f417c195b922c08624fc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa5ebd014d0f06b59f417c19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:11:01 2016 +0300 dwrite: Remove useless assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d0d6b3f..9842746 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1485,7 +1485,6 @@ static BOOL is_same_u_splitting(struct layout_underline_splitting_params *left, static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct layout_effective_run *first, struct layout_effective_run *last) { - struct layout_underline_splitting_params params, prev_params; struct layout_effective_run *cur; DWRITE_FONT_METRICS metrics; FLOAT thickness, offset; @@ -1517,8 +1516,8 @@ static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct lay } cur = first; - prev_params = params; do { + struct layout_underline_splitting_params params, prev_params; struct layout_effective_run *next, *w; struct layout_underline *u;

1 0

Nikolay Sivov : dwrite: Don' t check for line overflow for DWRITE_WORD_WRAPPING_NO_WRAP mode.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 2626f80b011754bff36ac756e136d566bbaacd64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2626f80b011754bff36ac756e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:11:00 2016 +0300 dwrite: Don't check for line overflow for DWRITE_WORD_WRAPPING_NO_WRAP mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 ++- dlls/dwrite/tests/layout.c | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b5f6aa8..d0d6b3f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1606,7 +1606,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } overflow = layout->clustermetrics[i].canWrapLineAfter && - (width + layout->clustermetrics[i].width > layout->metrics.layoutWidth); + (width + layout->clustermetrics[i].width > layout->metrics.layoutWidth) && + (layout->format.wrapping != DWRITE_WORD_WRAPPING_NO_WRAP); /* check if we got new */ if (overflow || layout->clustermetrics[i].isNewline || /* always wrap on new line */ diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c112ebd..cbc222f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1084,7 +1084,6 @@ if (0) {/* crashes on native */ metrics.supportsSideways = TRUE; hr = IDWriteInlineObject_GetMetrics(sign, &metrics); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(metrics.width > 0.0, "got %.2f\n", metrics.width); ok(metrics.height == 0.0, "got %.2f\n", metrics.height); ok(metrics.baseline == 0.0, "got %.2f\n", metrics.baseline); @@ -1786,7 +1785,6 @@ todo_wine hr = IDWriteInlineObject_GetMetrics(trimm, &inline_metrics); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(inline_metrics.width > 0.0 && inline_metrics.width == metrics[0].width, "got %.2f, expected %.2f\n", inline_metrics.width, metrics[0].width); @@ -3314,7 +3312,6 @@ static void test_SetTextAlignment(void) hr = IDWriteTextLayout_GetMetrics(layout, &metrics); ok(hr == S_OK, "got 0x%08x\n", hr); ok(metrics.left == metrics.layoutWidth - metrics.width, "got %.2f\n", metrics.left); -todo_wine ok(metrics.width == 5*clusters[0].width, "got %.2f\n", metrics.width); ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); IDWriteTextLayout_Release(layout); @@ -3705,11 +3702,13 @@ static void test_pixelsnapping(void) static void test_SetWordWrapping(void) { - static const WCHAR strW[] = {'a',0}; + static const WCHAR strW[] = {'a',' ','s','o','m','e',' ','t','e','x','t',' ','a','n','d', + ' ','a',' ','b','i','t',' ','m','o','r','e','\n','b'}; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; DWRITE_WORD_WRAPPING v; + UINT32 count; HRESULT hr; factory = create_factory(); @@ -3721,7 +3720,7 @@ static void test_SetWordWrapping(void) v = IDWriteTextFormat_GetWordWrapping(format); ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, strW, sizeof(strW)/sizeof(WCHAR), format, 10.0f, 100.0f, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); v = IDWriteTextLayout_GetWordWrapping(layout); @@ -3736,6 +3735,24 @@ static void test_SetWordWrapping(void) v = IDWriteTextFormat_GetWordWrapping(format); ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); + /* disable wrapping, text has explicit newline */ + hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, NULL, 0, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); +todo_wine + ok(count == 2, "got %u\n", count); + + hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, NULL, 0, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(count > 2, "got %u\n", count); + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Update line breaking logic with Unicode 8.0.0 modifications.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 10b843bb22fa21e73943a19adb3109d1291899a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b843bb22fa21e73943a19ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:59 2016 +0300 dwrite: Update line breaking logic with Unicode 8.0.0 modifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a55b27f..094fb69 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -522,8 +522,9 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B case b_BB: set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; - /* LB21a */ + /* LB21a, LB21b */ case b_HL: + /* LB21a */ if (i < count-1) switch (break_class[i+1]) { @@ -531,6 +532,9 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B case b_BA: set_break_condition(i+1, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); } + /* LB21b */ + if (i > 0 && break_class[i-1] == b_SY) + set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; /* LB22 */ case b_IN: @@ -540,6 +544,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B { case b_AL: case b_HL: + case b_EX: case b_ID: case b_IN: case b_NU:

1 0

Nikolay Sivov : dwrite: Fix off by one issue in line breaking rule LB21a.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 68c45de6ae48743bf813c35b4e2c9c0fbb8891d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c45de6ae48743bf813c35b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:58 2016 +0300 dwrite: Fix off by one issue in line breaking rule LB21a. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index af034d1..a55b27f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -524,7 +524,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; /* LB21a */ case b_HL: - if (i < count-2) + if (i < count-1) switch (break_class[i+1]) { case b_HY:

1 0

Nikolay Sivov : dwrite: Cluster text position is relative to initial run.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 91df67df0c1804c81e242e5281f1835e06f0fbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=91df67df0c1804c81e242e528… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:57 2016 +0300 dwrite: Cluster text position is relative to initial run. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9109924..b5f6aa8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -601,7 +601,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, } metrics->length = length; - position = stop_position; + position = run->descr.textPosition + stop_position; if (stop_glyph == run->glyphcount) breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; else {

1 0

Stefan Dösinger : ddraw/tests: Port test_lockrect_invalid to other versions.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 4fac292ee83f9e2cf4f2817282ee68f2efd3d799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fac292ee83f9e2cf4f281728… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jan 21 16:40:13 2016 +0100 ddraw/tests: Port test_lockrect_invalid to other versions. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 148 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 152 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 151 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 165 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 121 -------------------------------- 5 files changed, 616 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fac292ee83f9e2cf4f28…

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
63
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 January 2016