August 2008 - Wine-Commits - list.winehq.org

Rob Shearman : rpcrt4: Factorise conformant string functions into array_* functions.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: b2305adc3c8505a0a033cabc94d417cedb8cda5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2305adc3c8505a0a033cabc9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 11:14:25 2008 +0100 rpcrt4: Factorise conformant string functions into array_* functions. This allows conformant string array types to be marshalled/unmarshalled when embedded in a complex type. --- dlls/rpcrt4/ndr_marshall.c | 849 ++++++++++++++++++++++++-------------------- 1 files changed, 458 insertions(+), 391 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2305adc3c8505a0a033c…

1 0

Dylan Smith : richedit: Added in support for streaming in and out nested tables.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 59195ed2ec9dbec80e558c0ccdf35d24eec15c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59195ed2ec9dbec80e558c0cc… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 7 12:31:46 2008 -0400 richedit: Added in support for streaming in and out nested tables. --- dlls/riched20/editor.c | 101 ++++++++++++++++++++++++++++++++++++++++------- dlls/riched20/reader.c | 14 +++++- dlls/riched20/rtf.h | 14 ++++++- dlls/riched20/writer.c | 30 +++++++++++--- 4 files changed, 133 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59195ed2ec9dbec80e558…

1 0

Rob Shearman : rpcrt4: Add tests for a complex struct with conformant array .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 518242ef339385f1e3a8f7871410c1fc9f36f189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518242ef339385f1e3a8f7871… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 11:14:17 2008 +0100 rpcrt4: Add tests for a complex struct with conformant array. --- dlls/rpcrt4/tests/ndr_marshall.c | 100 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 969cce2..7c538c6 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1807,6 +1807,105 @@ static void test_nonconformant_string(void) HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); } +static void test_conf_complex_struct(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + unsigned int i; + struct conf_complex + { + unsigned int size; + unsigned int *array[1]; + }; + struct conf_complex *memsrc; + struct conf_complex *mem; + + static const unsigned char fmtstr_complex_struct[] = + { +/* 0 */ + 0x1b, /* FC_CARRAY */ + 0x3, /* 3 */ +/* 2 */ NdrFcShort( 0x4 ), /* 4 */ +/* 4 */ 0x8, /* Corr desc: FC_LONG */ + 0x0, /* */ +/* 6 */ NdrFcShort( 0xfffc ), /* -4 */ +/* 8 */ + 0x4b, /* FC_PP */ + 0x5c, /* FC_PAD */ +/* 10 */ + 0x48, /* FC_VARIABLE_REPEAT */ + 0x49, /* FC_FIXED_OFFSET */ +/* 12 */ NdrFcShort( 0x4 ), /* 4 */ +/* 14 */ NdrFcShort( 0x0 ), /* 0 */ +/* 16 */ NdrFcShort( 0x1 ), /* 1 */ +/* 18 */ NdrFcShort( 0x0 ), /* 0 */ +/* 20 */ NdrFcShort( 0x0 ), /* 0 */ +/* 22 */ 0x12, 0x8, /* FC_UP [simple_pointer] */ +/* 24 */ 0x8, /* FC_LONG */ + 0x5c, /* FC_PAD */ +/* 26 */ + 0x5b, /* FC_END */ + + 0x8, /* FC_LONG */ +/* 28 */ 0x5c, /* FC_PAD */ + 0x5b, /* FC_END */ +/* 30 */ + 0x1a, /* FC_BOGUS_STRUCT */ + 0x3, /* 3 */ +/* 32 */ NdrFcShort( 0x4 ), /* 4 */ +/* 34 */ NdrFcShort( 0xffffffde ), /* Offset= -34 (0) */ +/* 36 */ NdrFcShort( 0x0 ), /* Offset= 0 (36) */ +/* 38 */ 0x8, /* FC_LONG */ + 0x5b, /* FC_END */ + }; + + memsrc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + FIELD_OFFSET(struct conf_complex, array[20])); + memsrc->size = 20; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_complex_struct; + + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + NdrComplexStructBufferSize( &StubMsg, + (unsigned char *)memsrc, + &fmtstr_complex_struct[30] ); + ok(StubMsg.BufferLength >= 28, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrComplexStructMarshall( &StubMsg, (unsigned char *)memsrc, + &fmtstr_complex_struct[30] ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(*(unsigned int *)StubMsg.BufferStart == 20, "Conformance should have been 20 instead of %d\n", (unsigned int)StubMsg.BufferStart); + ok(*(unsigned int *)(StubMsg.BufferStart + 4) == 20, "conf_complex.size should have been 20 instead of %d\n", (unsigned int)(StubMsg.BufferStart + 4)); + for (i = 0; i < 20; i++) + ok(*(unsigned int *)(StubMsg.BufferStart + 8 + i * 4) == 0, "pointer id for conf_complex.array[%d] should have been 0 instead of 0x%x\n", i, *(unsigned int *)(StubMsg.BufferStart + 8 + i * 4)); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + ptr = NdrComplexStructUnmarshall( &StubMsg, (unsigned char **)&mem, &fmtstr_complex_struct[30], 0); + ok(ptr == NULL, "ret %p\n", ptr); + ok(mem->size == 20, "mem->size wasn't unmarshalled correctly (%d)\n", mem->size); + ok(mem->array[0] == NULL, "mem->array[0] wasn't unmarshalled correctly (%p)\n", mem->array[0]); + StubMsg.pfnFree(mem); + + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); +} + static void test_ndr_buffer(void) { static unsigned char ncalrpc[] = "ncalrpc"; @@ -1943,6 +2042,7 @@ START_TEST( ndr_marshall ) test_conformant_array(); test_conformant_string(); test_nonconformant_string(); + test_conf_complex_struct(); test_ndr_buffer(); test_NdrMapCommAndFaultStatus(); }

1 0

Rob Shearman : rpcrt4: Factorise conformant array NDR functions and use them to fix the wire-representation of complex structures with conformant arrays .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 9116d73c63256e7318e0a74bb80f7ecdf0c7f2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9116d73c63256e7318e0a74bb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 11:14:07 2008 +0100 rpcrt4: Factorise conformant array NDR functions and use them to fix the wire-representation of complex structures with conformant arrays. Factorise each conformant array function into the part that deals with reading, writing or sizing the conformance and another part that deals with reading, writing or sizing the variance and the element data. This allows complex structures to use the right wire format where the conformance appears before the structure data starts. --- dlls/rpcrt4/ndr_marshall.c | 425 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 346 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9116d73c63256e7318e0a…

1 0

Dylan Smith : richedit: Reversed deletion direction so tables are inserted forwards.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: bc61a637b9629af9efa66b085e04355ff0af9c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc61a637b9629af9efa66b085… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 7 12:31:37 2008 -0400 richedit: Reversed deletion direction so tables are inserted forwards. --- dlls/riched20/caret.c | 50 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 754c75f..90a5aa8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -268,6 +268,19 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars, ME_Cursor c; int shift = 0; int totalChars = nChars; + ME_DisplayItem *start_para; + + { + /* Prevent deletion past last end of paragraph run. */ + ME_DisplayItem *pTextEnd = editor->pBuffer->pLast; + int nMaxChars = pTextEnd->member.para.prev_para->member.para.nCharOfs; + nMaxChars += ME_FindItemBack(pTextEnd, diRun)->member.run.nCharOfs; + nMaxChars -= nOfs; + nChars = min(nChars, nMaxChars); + } + + ME_CursorFromCharOfs(editor, nOfs, &c); + start_para = ME_GetParagraph(c.pRun); if (!bForce) { @@ -279,7 +292,19 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars, while(nChars > 0) { ME_Run *run; - ME_CursorFromCharOfs(editor, nOfs, &c); + ME_CursorFromCharOfs(editor, nOfs+nChars, &c); + if (!c.nOffset && + nOfs+nChars == (c.pRun->member.run.nCharOfs + + ME_GetParagraph(c.pRun)->member.para.nCharOfs)) + { + /* We aren't deleting anything in this run, so we will go back to the + * last run we are deleting text in. */ + c.pRun = ME_FindItemBack(c.pRun, diRun); + if (c.pRun->member.run.nFlags & MERF_ENDPARA) + c.nOffset = c.pRun->member.run.nCR + c.pRun->member.run.nLF; + else + c.nOffset = c.pRun->member.run.strText->nLen; + } run = &c.pRun->member.run; if (run->nFlags & MERF_ENDPARA) { int eollen = run->nCR + run->nLF; @@ -300,22 +325,21 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars, else { ME_Cursor cursor; - int nIntendedChars = nChars; - int nCharsToDelete = nChars; + int nCharsToDelete = min(nChars, c.nOffset); int i; - int loc = c.nOffset; - + + c.nOffset -= nCharsToDelete; + ME_FindItemBack(c.pRun, diParagraph)->member.para.nFlags |= MEPF_REWRAP; - + cursor = c; - ME_StrRelPos(run->strText, loc, &nChars); /* nChars is the number of characters that should be deleted from the - FOLLOWING runs (these AFTER cursor.pRun) + PRECEDING runs (these BEFORE cursor.pRun) nCharsToDelete is a number of chars to delete from THIS run */ - nCharsToDelete -= nChars; + nChars -= nCharsToDelete; shift -= nCharsToDelete; - TRACE("Deleting %d (intended %d-remaning %d) chars at %d in '%s' (%d)\n", - nCharsToDelete, nIntendedChars, nChars, c.nOffset, + TRACE("Deleting %d (remaning %d) chars at %d in '%s' (%d)\n", + nCharsToDelete, nChars, c.nOffset, debugstr_w(run->strText->szData), run->strText->nLen); if (!c.nOffset && ME_StrVLen(run->strText) == nCharsToDelete) @@ -325,7 +349,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars, to the current (deleted) run */ ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); if (pUndo) - pUndo->di.member.run.nCharOfs = nOfs; + pUndo->di.member.run.nCharOfs = nOfs+nChars; } else { @@ -333,7 +357,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars, ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); if (pUndo) { ME_DestroyString(pUndo->di.member.run.strText); - pUndo->di.member.run.nCharOfs = nOfs; + pUndo->di.member.run.nCharOfs = nOfs+nChars; pUndo->di.member.run.strText = ME_MakeStringN(run->strText->szData+c.nOffset, nCharsToDelete); } }

1 0

Dylan Smith : richedit: Each cell can contain multiple paragraphs in msftedit.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 300db3765ff64397beaf61f20e86408a7ccad258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300db3765ff64397beaf61f20… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 7 12:31:41 2008 -0400 richedit: Each cell can contain multiple paragraphs in msftedit. --- dlls/riched20/caret.c | 151 ++++++++++++-- dlls/riched20/editor.c | 235 ++++++++++++++++++-- dlls/riched20/editor.h | 10 +- dlls/riched20/editstr.h | 55 ++++-- dlls/riched20/list.c | 15 ++- dlls/riched20/paint.c | 117 ++++++++--- dlls/riched20/para.c | 118 ++++++++++- dlls/riched20/rtf.h | 8 + dlls/riched20/run.c | 10 +- dlls/riched20/table.c | 542 ++++++++++++++++++++++++++++++++++++++--------- dlls/riched20/undo.c | 32 +++- dlls/riched20/wrap.c | 129 ++++++++++-- dlls/riched20/writer.c | 89 ++++++-- 13 files changed, 1272 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=300db3765ff64397beaf6…

1 0

Dylan Smith : richedit: Protect deletion of cell boundaries when not deleting row.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: d29f671d1aa67ba6f42e309a9d359502d3017e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29f671d1aa67ba6f42e309a9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 5 12:10:51 2008 -0400 richedit: Protect deletion of cell boundaries when not deleting row. --- dlls/riched20/caret.c | 22 +++++++++---- dlls/riched20/editor.c | 18 ++++++------ dlls/riched20/editor.h | 5 ++- dlls/riched20/table.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/undo.c | 2 +- 5 files changed, 103 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d29f671d1aa67ba6f42e3…

1 0

Dylan Smith : richedit: Word/Line/ Paragraph selection had selection anchor on wrong side.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 608c54ee69ec4b8b7fb89df01e4bdcd136c8fd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608c54ee69ec4b8b7fb89df01… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 5 12:10:43 2008 -0400 richedit: Word/Line/Paragraph selection had selection anchor on wrong side. After selection a word, line, or paragraph with multi click selection or using the selection bar, then shift can be held and the arrows can be used to move one of the ends of the selection. --- dlls/riched20/caret.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 89cd132..93fa77b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -725,8 +725,8 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) void ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) { - /* pCursor[0] will be the start of the selection - * pCursor[1] is the other end of the selection range + /* pCursor[0] is the end of the selection + * pCursor[1] is the start of the selection (or the position selection anchor) * pCursor[2] and [3] are the selection anchors that are backed up * so they are kept when the selection changes for drag selection. */ @@ -737,9 +737,9 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) case stPosition: break; case stWord: - ME_MoveCursorWords(editor, &editor->pCursors[1], +1); - editor->pCursors[0] = editor->pCursors[1]; - ME_MoveCursorWords(editor, &editor->pCursors[0], -1); + ME_MoveCursorWords(editor, &editor->pCursors[0], +1); + editor->pCursors[1] = editor->pCursors[0]; + ME_MoveCursorWords(editor, &editor->pCursors[1], -1); break; case stLine: case stParagraph: @@ -753,16 +753,16 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) backSearchType = diStartRow; fwdSearchType = diStartRowOrParagraphOrEnd; } - pItem = ME_FindItemBack(editor->pCursors[0].pRun, backSearchType); - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].nOffset = 0; - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, fwdSearchType); assert(pItem); if (pItem->type == diTextEnd) - editor->pCursors[1].pRun = ME_FindItemBack(pItem, diRun); + editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); else - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); + editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); + editor->pCursors[0].nOffset = 0; + + pItem = ME_FindItemBack(pItem, backSearchType); + editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); editor->pCursors[1].nOffset = 0; break; } @@ -941,8 +941,8 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) if (editor->nSelectionType == stPosition || editor->nSelectionType == stDocument) return; curOfs = ME_GetCursorOfs(editor, 0); - anchorStartOfs = ME_GetCursorOfs(editor, 2); - anchorEndOfs = ME_GetCursorOfs(editor, 3); + anchorStartOfs = ME_GetCursorOfs(editor, 3); + anchorEndOfs = ME_GetCursorOfs(editor, 2); tmp_cursor = editor->pCursors[0]; editor->pCursors[0] = editor->pCursors[2]; @@ -950,36 +950,36 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) if (curOfs < anchorStartOfs) { /* Extend the left side of selection */ - editor->pCursors[0] = tmp_cursor; + editor->pCursors[1] = tmp_cursor; if (editor->nSelectionType == stWord) - ME_MoveCursorWords(editor, &editor->pCursors[0], -1); + ME_MoveCursorWords(editor, &editor->pCursors[1], -1); else { ME_DisplayItem *pItem; ME_DIType searchType = ((editor->nSelectionType == stLine) ? diStartRowOrParagraph:diParagraph); - pItem = ME_FindItemBack(editor->pCursors[0].pRun, searchType); - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].nOffset = 0; + pItem = ME_FindItemBack(editor->pCursors[1].pRun, searchType); + editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); + editor->pCursors[1].nOffset = 0; } } else if (curOfs >= anchorEndOfs) { /* Extend the right side of selection */ - editor->pCursors[1] = tmp_cursor; + editor->pCursors[0] = tmp_cursor; if (editor->nSelectionType == stWord) - ME_MoveCursorWords(editor, &editor->pCursors[1], +1); + ME_MoveCursorWords(editor, &editor->pCursors[0], +1); else { ME_DisplayItem *pItem; ME_DIType searchType = ((editor->nSelectionType == stLine) ? diStartRowOrParagraphOrEnd:diParagraphOrEnd); - pItem = ME_FindItemFwd(editor->pCursors[1].pRun, searchType); + pItem = ME_FindItemFwd(editor->pCursors[0].pRun, searchType); if (pItem->type == diTextEnd) - editor->pCursors[1].pRun = ME_FindItemBack(pItem, diRun); + editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); else - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].nOffset = 0; + editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); + editor->pCursors[0].nOffset = 0; } } }

1 0

Dylan Smith : richedit: Removed assumption about the order of rtf indent control words.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: e568e151426761b8e37f4dbb45262cbb9dbac20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e568e151426761b8e37f4dbb4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 7 10:17:12 2008 -0400 richedit: Removed assumption about the order of rtf indent control words. Previously the calculations of dxStartIdent and dxOffset depended on their order. --- dlls/riched20/editor.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 381443b..e3f91f1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -473,15 +473,13 @@ static void ME_RTFParAttrHook(RTF_Info *info) case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; - fmt.dxStartIndent += info->rtfParam; + fmt.dxStartIndent += fmt.dxOffset + info->rtfParam; fmt.dxOffset = -info->rtfParam; break; case rtfLeftIndent: - /* we assume rtfLeftIndent is always specified before rtfFirstIndent */ ME_GetSelectionParaFormat(info->editor, &fmt); fmt.dwMask = PFM_STARTINDENT; - fmt.dxStartIndent = info->rtfParam; - fmt.dxOffset = 0; + fmt.dxStartIndent = info->rtfParam - fmt.dxOffset; break; case rtfRightIndent: fmt.dwMask = PFM_RIGHTINDENT;

1 0

Dylan Smith : richedit: Handle tab key properly within table cells.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: bf5ccefc4cf6ecdb2c15bf0eb70dfadee241ad65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5ccefc4cf6ecdb2c15bf0eb… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Aug 5 12:10:47 2008 -0400 richedit: Handle tab key properly within table cells. Within table cells the tab key moves to the next cell in the table, or creates a new table row when at the end of the table. --- dlls/riched20/Makefile.in | 1 + dlls/riched20/caret.c | 1 - dlls/riched20/editor.c | 24 ++++++- dlls/riched20/editor.h | 4 + dlls/riched20/table.c | 173 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 200 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 4e443a1..8bcf8ed 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -20,6 +20,7 @@ C_SRCS = \ run.c \ string.c \ style.c \ + table.c \ txtsrv.c \ undo.c \ wrap.c \ diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 93fa77b..99ad947 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -781,7 +781,6 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) editor->pCursors[3] = editor->pCursors[1]; } - int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor) { ME_Cursor *pCursor = &editor->pCursors[nCursor]; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e3f91f1..732797a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3286,10 +3286,30 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (((unsigned)wstr)>=' ' || (wstr=='\r' && (GetWindowLongW(hWnd, GWL_STYLE) & ES_MULTILINE)) || wstr=='\t') { - /* FIXME maybe it would make sense to call EM_REPLACESEL instead ? */ - /* WM_CHAR is restricted to nTextLimit */ int from, to; ME_GetSelection(editor, &from, &to); + if (wstr=='\t') { + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para; + BOOL bSelectedRow = FALSE; + + para = ME_GetParagraph(cursor.pRun); + if (ME_IsSelection(editor) && + cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + para->member.para.prev_para->type == diParagraph) + { + para = para->member.para.prev_para; + bSelectedRow = TRUE; + } + if (ME_IsInTable(para)) + { + ME_TabPressedInTable(editor, bSelectedRow); + ME_CommitUndo(editor); + return 0; + } + } + /* FIXME maybe it would make sense to call EM_REPLACESEL instead ? */ + /* WM_CHAR is restricted to nTextLimit */ if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) { ME_Style *style = ME_GetInsertStyle(editor, 0); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a32811c..869a2ce 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -285,6 +285,10 @@ extern BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, int sel_min, int sel_max) BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_max); void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor); +/* table.c */ +BOOL ME_IsInTable(ME_DisplayItem *pItem); +void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow); + /* undo.c */ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_DisplayItem *pdi); void ME_CommitUndo(ME_TextEditor *editor); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c new file mode 100644 index 0000000..ace36d0 --- /dev/null +++ b/dlls/riched20/table.c @@ -0,0 +1,173 @@ +/* + * RichEdit functions dealing with on tables + * + * Copyright 2008 by Dylan Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * The implementation of tables differs greatly between version 3.0 + * (in riched20.dll) and version 4.1 (in msftedit.dll) of richedit controls. + * Currently Wine is not implementing table support as done in version 4.1. + * + * Richedit version 1.0 - 3.0: + * Tables are implemented in these versions using tabs at the end of cells, + * and tab stops to position the cells. The paragraph format flag PFE_TABLE + * will indicate the the paragraph is a table row. Note that in this + * implementation there is one paragraph per table row. + */ + +#include "editor.h" + +WINE_DEFAULT_DEBUG_CHANNEL(richedit); + +BOOL ME_IsInTable(ME_DisplayItem *pItem) +{ + PARAFORMAT2 *pFmt; + if (!pItem) + return FALSE; + if (pItem->type == diRun) + pItem = ME_GetParagraph(pItem); + if (pItem->type != diParagraph) + return FALSE; + pFmt = pItem->member.para.pFmt; + return pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE; +} + +static ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, + ME_DisplayItem *table_row) +{ + WCHAR endl = '\r', tab = '\t'; + ME_DisplayItem *run; + PARAFORMAT2 *pFmt; + int i; + + assert(table_row); + run = ME_FindItemBack(table_row->member.para.next_para, diRun); + pFmt = table_row->member.para.pFmt; + assert(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE); + editor->pCursors[0].pRun = run; + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, run->member.run.style); + run = editor->pCursors[0].pRun; + for (i = 0; i < pFmt->cTabCount; i++) { + ME_InsertTextFromCursor(editor, 0, &tab, 1, run->member.run.style); + } + return table_row->member.para.next_para; +} + +/* Selects the next table cell or appends a new table row if at end of table */ +static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, + ME_DisplayItem *run) +{ + ME_DisplayItem *para = ME_GetParagraph(run); + int i; + + assert(run && run->type == diRun); + assert(ME_IsInTable(run)); + if (run->member.run.nFlags & MERF_ENDPARA && + ME_IsInTable(ME_FindItemFwd(run, diParagraphOrEnd))) + { + run = ME_FindItemFwd(run, diRun); + assert(run); + } + for (i = 0; i < 2; i++) + { + while (!(run->member.run.nFlags & MERF_TAB)) + { + run = ME_FindItemFwd(run, diRunOrParagraphOrEnd); + if (run->type != diRun) + { + para = run; + if (ME_IsInTable(para)) + { + run = ME_FindItemFwd(para, diRun); + assert(run); + editor->pCursors[0].pRun = run; + editor->pCursors[0].nOffset = 0; + i = 1; + } else { + /* Insert table row */ + para = ME_AppendTableRow(editor, para->member.para.prev_para); + /* Put cursor at the start of the new table row */ + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_WrapMarkedParagraphs(editor); + return; + } + } + } + if (i == 0) + run = ME_FindItemFwd(run, diRun); + editor->pCursors[i].pRun = run; + editor->pCursors[i].nOffset = 0; + } +} + + +void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) +{ + /* FIXME: Shift tab should move to the previous cell. */ + ME_Cursor fromCursor, toCursor; + ME_InvalidateSelection(editor); + { + int from, to; + from = ME_GetCursorOfs(editor, 0); + to = ME_GetCursorOfs(editor, 1); + if (from <= to) + { + fromCursor = editor->pCursors[0]; + toCursor = editor->pCursors[1]; + } else { + fromCursor = editor->pCursors[1]; + toCursor = editor->pCursors[0]; + } + } + if (!ME_IsInTable(fromCursor.pRun)) + { + editor->pCursors[0] = fromCursor; + editor->pCursors[1] = fromCursor; + /* FIXME: For some reason the caret is shown at the start of the + * previous paragraph in v1.0 to v3.0, and bCaretAtEnd only works + * within the paragraph for wrapped lines. */ + if (ME_FindItemBack(fromCursor.pRun, diRun)) + editor->bCaretAtEnd = TRUE; + } else { + if (bSelectedRow || !ME_IsInTable(toCursor.pRun)) + { + ME_SelectOrInsertNextCell(editor, fromCursor.pRun); + } else { + if (ME_IsSelection(editor) && !toCursor.nOffset) + { + ME_DisplayItem *run; + run = ME_FindItemBack(toCursor.pRun, diRunOrParagraphOrEnd); + if (run->type == diRun && run->member.run.nFlags & MERF_TAB) + ME_SelectOrInsertNextCell(editor, run); + else + ME_SelectOrInsertNextCell(editor, toCursor.pRun); + } else { + ME_SelectOrInsertNextCell(editor, toCursor.pRun); + } + } + } + ME_InvalidateSelection(editor); + ME_Repaint(editor); + HideCaret(editor->hWnd); + ME_ShowCaret(editor); + ME_SendSelChange(editor); +}

1 0