Commit Graph

1249 Commits

Author SHA1 Message Date
Huw Davies b3b5c25628 riched20: Embed PARAFORMAT2 in the paragraph struct rather than its ptr.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-29 22:40:18 +09:00
Huw Davies 1d27f9151d riched20: Pass a ME_Paragraph structure to ME_SetParaFormat().
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-27 21:43:24 +09:00
Huw Davies 8d8895bfac riched20: Don't clear the existing mask when reading a \ltrpar .
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-23 23:55:19 +09:00
Kenneth Haley fc1b2e0473 v4 resend: Riched20: allow setting background text color.
Signed-off-by: Kenneth Haley <haleykd@users.sf.net>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-16 22:37:05 +09:00
Huw Davies adb43b9192 riched20: Update the auto url detection after a StreamIn.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-11 20:18:01 +09:00
Andrey Gusev c43aebd79b riched20: Use debugstr_guid() in TRACE() messages.
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-26 20:33:18 +09:00
Michael Stefaniuc 6eef44ed9a riched20/tests: Use InflateRect() too when expanding in just one axis.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-14 17:31:05 +09:00
Michael Stefaniuc d357dbfdd7 riched20: Get rid of casts from COM objects to interfaces.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-14 17:31:00 +09:00
Piotr Caban 060d8c6abb riched20: Add support for ECO_NOHIDESEL flag.
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-08 22:35:02 +09:00
Michael Stefaniuc f18f44c505 riched20/tests: Use wine_dbgstr_rect() to print RECTs.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-07 11:15:51 +09:00
Huw Davies 65feea4e5a riched20: Pass the correct range to the EN_LINK notification when the link is wrapped.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-04 17:32:13 +09:00
Huw Davies 3d1d65bc2c riched20: Add an option to constrain the run search to the current para.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-04 17:32:09 +09:00
Michael Stefaniuc fe2f34a5c7 riched20/tests: Use InflateRect() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-04 17:29:08 +09:00
Andrey Gusev 355a216246 riched20/tests: Fix a typo in ok() messages.
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-23 22:02:42 +09:00
Nikolay Sivov 7cb3b72559 riched20: Remove duplicated condition.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-16 01:21:47 +09:00
Huw Davies 8477dcf909 riched20: Add support for saving enhanced metafiles.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-07 22:04:47 +09:00
Michael Stefaniuc b0104692ac riched20/tests: Use EqualRect() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-02 21:10:36 +09:00
Huw Davies 03fa4cfaff riched20: Add support for quoting urls with spaces within '<' '>'.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-01 22:15:46 +09:00
Huw Davies ea1e44e4f6 riched20: Fix URL auto-detection to handle 'neutral' characters.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-01 22:15:43 +09:00
Francois Gouget 155eccd9c6 riched20/tests: Fix a spelling error in an editor comment.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-17 18:18:11 +09:00
Andrey Gusev 33c1a16a18 riched20: Fix a typo in TRACE() message.
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-17 18:18:06 +09:00
Alex Henrie e60b276698 riched20: Don't call UpdateWindow after setting the background color.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-14 12:10:15 +09:00
Gerald Pfeifer 8fb1802b9c riched20: Properly clear all of a buffer of type WCHAR.
Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-14 12:09:01 +09:00
Francois Gouget ca147f51f0 riched20: Fix a spelling error in a dump message.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 21:37:34 +09:00
Michael Stefaniuc 9b4b75312a riched20: Use wine_dbgstr_rect() to trace a RECT.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 18:42:12 +09:00
Piotr Caban 3dbd467162 riched20: Don't allow negative margins in ME_WrapTextParagraph.
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 22:42:58 +09:00
Piotr Caban d11c758faf riched20/tests: Add negative indentation display test.
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 22:42:55 +09:00
Adam Buchbinder 20323e3f11 riched20: Implement ITextRange::ScrollIntoView.
This only implements bStart = tomStart, but that seems like the most
common use case.

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-29 19:31:35 +09:00
Huw Davies a2c57a2a8a riched20: Set the base embedding level for RTL paragraphs.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-11 20:22:34 +09:00
Huw Davies ac5edd1b6b riched20: \pard resets the reading direction.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-11 20:22:31 +09:00
Michael Stefaniuc a58822dba4 riched20: Use SetRectEmpty() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 21:29:44 +09:00
Huw Davies da7c4f9753 riched20: Add handling for a few more special characters.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:13 +09:00
Huw Davies 372a16af63 riched20: Don't apply paragraph formatting until the end of paragraph.
Specifically this means that if the final paragraph does not end in
a trailing \par, then new formatting is not applied to that paragraph.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:13 +09:00
Huw Davies aec411ed3e riched20/tests: wAlignment should be compared to the PFA_ values.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:12 +09:00
Huw Davies 9a934a3198 riched20/tests: Actually copy something to the clipboard.
Previously this test was relying on a quirk - pasting with an empty
clipboard generated an undo event.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:12 +09:00
Nikolay Sivov bf1cdf58ce riched20/tests: Use todo_wine_if() in tests.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-15 23:50:15 +09:00
Jactry Zeng 684965b866 riched20: Print boundary for ME_CheckCharOffsets only when richedit_check channel was opened.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-08 00:47:13 +09:00
Nikolay Sivov 0db7cb6002 riched20: Preserve higher bits of tabstop values (Coverity).
Bits 24-31 are reserved for tab alignment and tab leader style,
writer supports thatl.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-30 08:07:05 +01:00
Nikolay Sivov c5b68d1db2 riched20: Initialize wEffects field before setting bits in it (Coverity).
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-30 08:06:56 +01:00
Jactry Zeng bb5974987e riched20/tests: Add tests for WM_GETTEXTLENGTH.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-23 16:32:13 +01:00
Jactry Zeng 30049ba798 riched20/tests: Test EM_GETSELTEXT with multibyte character.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-23 16:32:13 +01:00
Jactry Zeng fb304e0e4e riched20/tests: Test EM_GETTEXTRANGE with multibyte character.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-23 16:32:13 +01:00
Jactry Zeng de0add976d riched20/tests: Add multibyte character tests for selection.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-21 19:50:29 +01:00
Jactry Zeng 99f0f6b91b riched20/tests: Test EM_LINELENGTH with multibyte character.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-21 19:50:28 +01:00
Jactry Zeng d5c587b1c2 riched20/tests: Add return tests for EM_SETTEXTEX.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-07 21:29:34 +09:00
Jactry Zeng f52ae04585 riched20/tests: Test EM_SETTEXT and EM_REPLACESEL with multibyte character.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-07 21:29:34 +09:00
Jactry Zeng 7365f557b6 riched20/tests: Test EM_REPLACESEL with rtf stream.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-30 23:16:51 +09:00
Nikolay Sivov 91ed2a81c1 riched20: Fix a memory leak on error path (Coverity).
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-11 19:39:16 +09:00
Huw Davies b241276f50 riched20: Maintain a list of styles and reuse them if possible.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-10 11:50:08 +09:00
Huw Davies f47aab6167 riched20: Release the font cache when changing the default style.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-10 11:50:05 +09:00
Huw Davies bb165d22e0 riched20: Store the font cache entry rather than the HFONT.
This also removes an incorrect DeleteObject() from DestroyStyle().

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-10 11:50:01 +09:00
Jactry Zeng 6401ab45c0 riched20: Implement alignment styles support.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-06 21:59:07 +09:00
Jactry Zeng f8e73e370d riched20: Make paragraph in make_para independently.
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-06 19:22:44 +09:00
Jactry Zeng dc6b2853f5 riched20: Set pStream->written in ME_StreamOutFlush.
Superseded patch 115907.

ChangeLog:
- Add tests.

Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-06 19:22:43 +09:00
Huw Davies 2d23a95c96 riched20: Add support for the \shppict destination.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-28 22:31:27 +09:00
Huw Davies cfc8914200 riched20: Rewrite the picture destination parser to handle embedded groups.
Since almost every line of ME_RTFReadPictGroup() changed, I took the
opportunity to re-format it.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-28 22:31:27 +09:00
Nikolay Sivov 20f4a9ff7b riched20: Handle invalid HFONT values passed to WM_SETFONT.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
2015-10-05 22:27:12 +09:00
Jactry Zeng 515b4a9725 riched20: Repaint paragraph after undo format setting of the paragraph. 2015-09-04 17:45:44 +09:00
Jactry Zeng d62dd46516 riched20: Implement EM_SETFONTSIZE. 2015-08-27 21:43:46 +09:00
Andrey Gusev 5cdcd4493f Assorted spelling and typos fixes. 2015-08-18 15:00:13 +09:00
Francois Gouget f8a7d6ed74 Assorted spelling fixes. 2015-08-07 23:50:48 +09:00
Huw Davies 7a3c9889e3 riched20: Free the script cache when updating the default style. 2015-07-01 22:56:40 +09:00
Michael Stefaniuc b05cc8c0a6 riched20: Print the debug string and not the pointer to it. 2015-06-30 17:40:28 +09:00
Nikolay Sivov 060cffc1b3 riched20: Improve tracing for unimplemented selection methods. 2015-06-18 21:41:02 +09:00
Alex Henrie af19e64017 riched20: Fix link notification conditions and add tests. 2015-06-18 17:11:05 +09:00
Nikolay Sivov bb82d669d1 riched20/tests: Remove explicit todo flag values from static test data. 2015-06-17 15:44:38 +09:00
Nikolay Sivov fd4affc0cb riched20/tests: Some more EM_SETSEL tests. 2015-06-17 15:44:36 +09:00
Nikolay Sivov 3357fdd70a riched20: Implement Expand for tomStory case. 2015-06-17 15:44:34 +09:00
Nikolay Sivov b0db959ec9 riched20: Improve tracing for unimplemented range methods. 2015-06-16 20:00:37 +09:00
Huw Davies 17f273360a riched20: Append a final \par when writing the whole buffer. 2015-06-09 14:47:30 +09:00
Nikolay Sivov 3681a59c29 riched20: Improve error handling in SetFont (Coverity). 2015-06-08 15:48:04 +09:00
Nikolay Sivov 2688363714 riched20: Handle range method failures in InRange (Coverity). 2015-06-08 15:48:00 +09:00
Nikolay Sivov 3889dadcca riched20: Handle range method failures in IsEqual (Coverity). 2015-06-08 15:47:57 +09:00
Nikolay Sivov 5f933018a2 riched20: Implement GetDuplicate() for selection. 2015-06-08 15:47:52 +09:00
Nikolay Sivov 9c6bcec509 riched20: Implement GetStoryLength(). 2015-06-08 15:47:48 +09:00
Nikolay Sivov 17a50f39b2 riched20/tests: Fix a BSTR leak (Valgrind). 2015-06-04 15:55:49 +09:00
Nikolay Sivov 2a2446abdb riched20: Return 0x0 size for NULL objects. 2015-06-03 19:29:49 +09:00
Nikolay Sivov b75cd7e2f0 riched20: Avoid extra host calls during CreateTextServices(). 2015-06-02 20:53:44 +09:00
Nikolay Sivov 0b94369bb7 riched20: Reduce code duplication in WM_SETTEXT/WM_CREATE handler. 2015-06-02 20:53:44 +09:00
Nikolay Sivov a50e0d71a4 riched20/tests: Don't use global vars for host/textservices. 2015-06-02 20:53:43 +09:00
Nikolay Sivov f0c5086618 riched20: Create selection instance first time it's requested. 2015-06-01 14:52:30 +09:00
Nikolay Sivov 41687841bc riched20: Properly implement GetClientSite(). 2015-06-01 14:52:28 +09:00
Nikolay Sivov b620fb6e85 riched20: Move data linking text range to IRichEditOle in separate structure. 2015-06-01 14:52:25 +09:00
Nikolay Sivov 383dbeedd7 riched20/tests: Small test for GetClientSite(). 2015-06-01 14:52:22 +09:00
Nikolay Sivov b2e13bc6e7 riched20: Implement GetText() for regular range. 2015-06-01 14:52:17 +09:00
Nikolay Sivov dd8287e9e8 riched20/tests: Test more return values and released cases. 2015-05-29 15:00:44 +09:00
Nikolay Sivov 054eecb2bf riched20: Implement SetFont(). 2015-05-29 15:00:38 +09:00
Nikolay Sivov d178e7ba68 riched20: Added GetStoryType(). 2015-05-29 15:00:32 +09:00
Nikolay Sivov b4959154ca riched20: Switch font unit is not allowed. 2015-05-29 15:00:27 +09:00
Nikolay Sivov eecb757248 riched20: Convert from twips to points when tomUsePoints is used. 2015-05-29 15:00:22 +09:00
Nikolay Sivov 6a335ca5da riched20: A bit more tests for GetChar(), improve tracing. 2015-05-28 14:21:07 +09:00
Nikolay Sivov cb095a82a2 riched20: Implement Select(). 2015-05-28 14:21:06 +09:00
Nikolay Sivov 6ccfde327a riched20: Implement IsEqual() for ranges. 2015-05-28 14:21:04 +09:00
Nikolay Sivov cebee9bd71 riched20: Implement InRange(). 2015-05-28 14:21:02 +09:00
Nikolay Sivov c1ce95dc96 riched20: Implement GetPara() for selection range. 2015-05-28 14:21:00 +09:00
Nikolay Sivov 251e168590 riched20: Implement SetText() for selection range. 2015-05-27 14:31:40 +09:00
Nikolay Sivov d27234617c riched20: Implement SetText for regular range. 2015-05-27 14:31:40 +09:00
Nikolay Sivov aa37c179ad riched20: Implement SetName(). 2015-05-27 14:31:40 +09:00
Nikolay Sivov 43a80b8023 riched20: Implement font property setters. 2015-05-27 14:31:40 +09:00
Nikolay Sivov 38f6919312 riched20: Support setting boolean font properties. 2015-05-26 18:45:35 +09:00