November 2018 - Wine-commits

Józef Kucia : wined3d: Lock wined3d mutex in wined3d_swapchain_create().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 662e64525720372221211f34240ce2ccedfe7efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=662e64525720372221211f34… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:46 2018 +0100 wined3d: Lock wined3d mutex in wined3d_swapchain_create(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 8 ++------ dlls/d3d9/swapchain.c | 8 ++------ dlls/wined3d/swapchain.c | 2 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index c137d0d..6e8b98e 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -171,12 +171,8 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; swapchain->swap_interval = swap_interval; - wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 5bd16ba..1279663 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -371,12 +371,8 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; swapchain->swap_interval = swap_interval; - wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ed8a3b3..60ef6ad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1030,7 +1030,9 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + wined3d_mutex_lock(); hr = swapchain_init(object, device, desc, parent, parent_ops); + wined3d_mutex_unlock(); if (FAILED(hr)) { WARN("Failed to initialize swapchain, hr %#x.\n", hr);

1 0

Józef Kucia : wined3d: Introduce wined3d_cs_finish() helper.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 57110d5bc237aa341c1b20bcd50781293b0c5087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57110d5bc237aa341c1b20bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:47 2018 +0100 wined3d: Introduce wined3d_cs_finish() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 12 ++++++------ dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 17 ++++++----------- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 5 files changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57110d5bc237aa341c1b…

1 0

Fabian Maurer : winealsa.drv: Don' t crash when getting NULL event from midi.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 20e5920135476cc4e380823a694537fca7fdf7e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e5920135476cc4e380823a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Nov 20 21:09:27 2018 +0100 winealsa.drv: Don't crash when getting NULL event from midi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46170 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 226 +++++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20e5920135476cc4e380…

1 0

Andrey Gusev : riched20/tests: Fix typos in ok() messages.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 00d232fff4cf84d85e79b4d65e584f8694622eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00d232fff4cf84d85e79b4d6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 29 14:16:21 2018 +0200 riched20/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1aa08f8..0415be8 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1013,9 +1013,9 @@ static void test_default_format(void) ITextHostImpl_TxGetCharFormat(host, &host_cf); ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); - ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expected %d.\n", cf2.yHeight, host_cf->yHeight); expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); - ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(host_cf->dwEffects == expected_effects, "got wrong dwEffects: %x, expected %x.\n", cf2.dwEffects, expected_effects); ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", cf2.bPitchAndFamily, host_cf->bPitchAndFamily); ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet);

1 0

Andrey Gusev : usp10/tests: Fix a typo in ok() message.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 743eec6d5e91de6f4aa537b58396a30597bddd5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=743eec6d5e91de6f4aa537b5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 29 14:19:51 2018 +0200 usp10/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index aa26997..8c4b125 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3349,7 +3349,7 @@ static void test_ScriptCacheGetHeight(HDC hdc) height = 123; hr = ScriptCacheGetHeight(hdc, NULL, &height); - ok(hr == E_INVALIDARG, "Uexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(height == 123, "Unexpected height.\n"); memset(&tm, 0, sizeof(tm));

1 0

Marcus Meissner : setupapi: Fix size passed to MultiByteToWideChar.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 161d02fd5db4142bc4478937ae53737f3da7053a URL: https://source.winehq.org/git/wine.git/?a=commit;h=161d02fd5db4142bc4478937… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 29 13:30:21 2018 +0100 setupapi: Fix size passed to MultiByteToWideChar. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55fca89..ae7a575 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1351,7 +1351,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, return FALSE; } - MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, sizeof(nameW)); + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, ARRAY_SIZE(nameW)); if (DeviceDescription) {

1 0

Gabriel Ivăncescu : shell32/iconcache: Prevent the imagelists from going out of sync when loading an icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 4e633f92442a7e45add37e82a07d848a5c13164b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e633f92442a7e45add37e82… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 26 12:22:03 2018 +0200 shell32/iconcache: Prevent the imagelists from going out of sync when loading an icon. When populating the imagelists cache with icons of different sizes, it can happen that only some icon sizes actually succeed the extraction, with others failing with a NULL handle. This is especially true with some broken "executable packers" where for example, a 32x32 icon loads okay, but a 16x16 fails. Even when PrivateExtractIconsW succeeds, the returned handle can still be NULL, leading to the ImageLists becoming out of sync. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c..44422ab 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -364,13 +364,14 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; unsigned int i; SIZE size; - int ret; + INT ret = -1; for (i = 0; i < ARRAY_SIZE(hicons); i++) { get_imagelist_icon_size( i, &size ); if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + if (!hicons[i]) goto fail; } if (flags & GIL_FORSHORTCUT) @@ -403,6 +404,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) } ret = SIC_IconAppend( sourcefile, index, hicons, flags ); + +fail: for (i = 0; i < ARRAY_SIZE(hicons); i++) DestroyIcon(hicons[i]); return ret;

1 0

Sergio Gómez Del Real : riched20: Add destroy_para() helper.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 118908d0afff9df23be3102fc8715b7e03267cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=118908d0afff9df23be3102f… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:48 2018 -0500 riched20: Add destroy_para() helper. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/list.c | 6 ------ dlls/riched20/para.c | 11 ++++++++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2571ce9..d79888b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3164,7 +3164,10 @@ void ME_DestroyEditor(ME_TextEditor *editor) ME_EmptyUndoStack(editor); while(p) { pNext = p->next; - ME_DestroyDisplayItem(p); + if (p->type == diParagraph) + destroy_para(editor, p); + else + ME_DestroyDisplayItem(p); p = pNext; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index eba6d35..e1a002b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -77,6 +77,7 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index ba35a90..23d1a38 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -161,12 +161,6 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) { if (0) TRACE("type=%s\n", ME_GetDITypeName(item->type)); - if (item->type==diParagraph) - { - ME_DestroyString(item->member.para.text); - para_num_clear( &item->member.para.para_num ); - } - if (item->type==diRun) { if (item->member.run.reobj) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fcd7936..3d86734 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -32,6 +32,15 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) return item; } +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) +{ + assert(item->type == diParagraph); + + ME_DestroyString(item->member.para.text); + para_num_clear( &item->member.para.para_num ); + ME_DestroyDisplayItem(item); +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; @@ -682,7 +691,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, tp->member.para.next_para = pNext->member.para.next_para; pNext->member.para.next_para->member.para.prev_para = tp; ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); + destroy_para(editor, pNext); ME_PropagateCharOffset(tp->member.para.next_para, -end_len);

1 0

Sergio Gómez Del Real : riched20: Add get_total_width() to get widest paragraph number.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 3c0b519bba468852343e2cd45d9c722d3b3eea31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0b519bba468852343e2cd4… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:49 2018 -0500 riched20: Add get_total_width() to get widest paragraph number. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e1a002b..eb37368 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -202,6 +202,7 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; +int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; /* paint.c */ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 3d86734..c5755b1 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -36,11 +36,34 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) { assert(item->type == diParagraph); + if (item->member.para.nWidth == editor->nTotalWidth) + { + item->member.para.nWidth = 0; + editor->nTotalWidth = get_total_width(editor); + } ME_DestroyString(item->member.para.text); para_num_clear( &item->member.para.para_num ); ME_DestroyDisplayItem(item); } +int get_total_width(ME_TextEditor *editor) +{ + ME_Paragraph *para; + int total_width = 0; + + if (editor->pBuffer->pFirst && editor->pBuffer->pLast) + { + para = &editor->pBuffer->pFirst->next->member.para; + while (para != &editor->pBuffer->pLast->member.para && para->next_para) + { + total_width = max(total_width, para->nWidth); + para = &para->next_para->member.para; + } + } + + return total_width; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c;

1 0

Sergio Gómez Del Real : riched20: Move y-adjust to its own function.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 70a2fe5886f4fafcb5636076d6463e46c92873ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a2fe5886f4fafcb5636076… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Nov 29 08:44:50 2018 -0500 riched20: Move y-adjust to its own function. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 222 ++++++++++++++++++++++++++------------------------- 1 file changed, 115 insertions(+), 107 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 1855825..e1ec692 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -980,6 +980,120 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, *repaint_end = para; } +static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +{ + if (item->member.para.nFlags & MEPF_ROWSTART) + { + ME_DisplayItem *cell = ME_FindItemFwd(item, diCell); + ME_DisplayItem *endRowPara; + int borderWidth = 0; + cell->member.cell.pt = c->pt; + /* Offset the text by the largest top border width. */ + while (cell->member.cell.next_cell) + { + borderWidth = max(borderWidth, cell->member.cell.border.top.width); + cell = cell->member.cell.next_cell; + } + endRowPara = ME_FindItemFwd(cell, diParagraph); + assert(endRowPara->member.para.nFlags & MEPF_ROWEND); + if (borderWidth > 0) + { + borderWidth = max(ME_twips2pointsY(c, borderWidth), 1); + while (cell) + { + cell->member.cell.yTextOffset = borderWidth; + cell = cell->member.cell.prev_cell; + } + c->pt.y += borderWidth; + } + if (endRowPara->member.para.fmt.dxStartIndent > 0) + { + int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; + cell = ME_FindItemFwd(item, diCell); + cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); + c->pt.x = cell->member.cell.pt.x; + } + } + else if (item->member.para.nFlags & MEPF_ROWEND) + { + /* Set all the cells to the height of the largest cell */ + ME_DisplayItem *startRowPara; + int prevHeight, nHeight, bottomBorder = 0; + ME_DisplayItem *cell = ME_FindItemBack(item, diCell); + item->member.para.nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; + if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWSTART)) + { + /* Last row, the bottom border is added to the height. */ + cell = cell->member.cell.prev_cell; + while (cell) + { + bottomBorder = max(bottomBorder, cell->member.cell.border.bottom.width); + cell = cell->member.cell.prev_cell; + } + bottomBorder = ME_twips2pointsY(c, bottomBorder); + cell = ME_FindItemBack(item, diCell); + } + prevHeight = cell->member.cell.nHeight; + nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; + cell->member.cell.nHeight = nHeight; + item->member.para.nHeight = nHeight; + cell = cell->member.cell.prev_cell; + cell->member.cell.nHeight = nHeight; + while (cell->member.cell.prev_cell) + { + cell = cell->member.cell.prev_cell; + cell->member.cell.nHeight = nHeight; + } + /* Also set the height of the start row paragraph */ + startRowPara = ME_FindItemBack(cell, diParagraph); + startRowPara->member.para.nHeight = nHeight; + c->pt.x = startRowPara->member.para.pt.x; + c->pt.y = cell->member.cell.pt.y + nHeight; + if (prevHeight < nHeight) + { + /* The height of the cells has grown, so invalidate the bottom of + * the cells. */ + ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); + cell = ME_FindItemBack(item, diCell); + while (cell) + { + ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); + cell = cell->member.cell.prev_cell; + } + } + } + else if (item->member.para.pCell && + item->member.para.pCell != item->member.para.next_para->member.para.pCell) + { + /* The next paragraph is in the next cell in the table row. */ + ME_Cell *cell = &item->member.para.pCell->member.cell; + cell->nHeight = c->pt.y + item->member.para.nHeight - cell->pt.y; + + /* Propagate the largest height to the end so that it can be easily + * sent back to all the cells at the end of the row. */ + if (cell->prev_cell) + cell->nHeight = max(cell->nHeight, cell->prev_cell->member.cell.nHeight); + + c->pt.x = cell->pt.x + cell->nWidth; + c->pt.y = cell->pt.y; + cell->next_cell->member.cell.pt = c->pt; + if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWEND)) + c->pt.y += cell->yTextOffset; + } + else + { + if (item->member.para.pCell) + { + /* Next paragraph in the same cell. */ + c->pt.x = item->member.para.pCell->member.cell.pt.x; + } + else + /* Normal paragraph */ + c->pt.x = 0; + c->pt.y += item->member.para.nHeight; + } +} + BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item; @@ -1004,113 +1118,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) if (bRedraw) ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - if (item->member.para.nFlags & MEPF_ROWSTART) - { - ME_DisplayItem *cell = ME_FindItemFwd(item, diCell); - ME_DisplayItem *endRowPara; - int borderWidth = 0; - cell->member.cell.pt = c.pt; - /* Offset the text by the largest top border width. */ - while (cell->member.cell.next_cell) { - borderWidth = max(borderWidth, cell->member.cell.border.top.width); - cell = cell->member.cell.next_cell; - } - endRowPara = ME_FindItemFwd(cell, diParagraph); - assert(endRowPara->member.para.nFlags & MEPF_ROWEND); - if (borderWidth > 0) - { - borderWidth = max(ME_twips2pointsY(&c, borderWidth), 1); - while (cell) { - cell->member.cell.yTextOffset = borderWidth; - cell = cell->member.cell.prev_cell; - } - c.pt.y += borderWidth; - } - if (endRowPara->member.para.fmt.dxStartIndent > 0) - { - int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; - cell = ME_FindItemFwd(item, diCell); - cell->member.cell.pt.x += ME_twips2pointsX(&c, dxStartIndent); - c.pt.x = cell->member.cell.pt.x; - } - } - else if (item->member.para.nFlags & MEPF_ROWEND) - { - /* Set all the cells to the height of the largest cell */ - ME_DisplayItem *startRowPara; - int prevHeight, nHeight, bottomBorder = 0; - ME_DisplayItem *cell = ME_FindItemBack(item, diCell); - item->member.para.nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWSTART)) - { - /* Last row, the bottom border is added to the height. */ - cell = cell->member.cell.prev_cell; - while (cell) - { - bottomBorder = max(bottomBorder, cell->member.cell.border.bottom.width); - cell = cell->member.cell.prev_cell; - } - bottomBorder = ME_twips2pointsY(&c, bottomBorder); - cell = ME_FindItemBack(item, diCell); - } - prevHeight = cell->member.cell.nHeight; - nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; - cell->member.cell.nHeight = nHeight; - item->member.para.nHeight = nHeight; - cell = cell->member.cell.prev_cell; - cell->member.cell.nHeight = nHeight; - while (cell->member.cell.prev_cell) - { - cell = cell->member.cell.prev_cell; - cell->member.cell.nHeight = nHeight; - } - /* Also set the height of the start row paragraph */ - startRowPara = ME_FindItemBack(cell, diParagraph); - startRowPara->member.para.nHeight = nHeight; - c.pt.x = startRowPara->member.para.pt.x; - c.pt.y = cell->member.cell.pt.y + nHeight; - if (prevHeight < nHeight) - { - /* The height of the cells has grown, so invalidate the bottom of - * the cells. */ - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - cell = ME_FindItemBack(item, diCell); - while (cell) { - ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); - cell = cell->member.cell.prev_cell; - } - } - } - else if (item->member.para.pCell && - item->member.para.pCell != item->member.para.next_para->member.para.pCell) - { - /* The next paragraph is in the next cell in the table row. */ - ME_Cell *cell = &item->member.para.pCell->member.cell; - cell->nHeight = c.pt.y + item->member.para.nHeight - cell->pt.y; - - /* Propagate the largest height to the end so that it can be easily - * sent back to all the cells at the end of the row. */ - if (cell->prev_cell) - cell->nHeight = max(cell->nHeight, cell->prev_cell->member.cell.nHeight); - - c.pt.x = cell->pt.x + cell->nWidth; - c.pt.y = cell->pt.y; - cell->next_cell->member.cell.pt = c.pt; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWEND)) - c.pt.y += cell->yTextOffset; - } - else - { - if (item->member.para.pCell) { - /* Next paragraph in the same cell. */ - c.pt.x = item->member.para.pCell->member.cell.pt.x; - } else { - /* Normal paragraph */ - c.pt.x = 0; - } - c.pt.y += item->member.para.nHeight; - } - + adjust_para_y(item, &c, repaint_start, repaint_end); totalWidth = max(totalWidth, item->member.para.nWidth); item = item->member.para.next_para; }

1 0