Michael Stefaniuc
d08852d835
riched20: Use wide-char string literals in a struct initialization.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-19 21:23:22 +01:00
Michael Stefaniuc
60b2167901
riched20: Use wide-char string literals.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-19 21:23:22 +01:00
Huw Davies
3f0c4d5c72
riched20: Move the code to clear the cell bottom out of the loop.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-09 10:45:53 +01:00
Huw Davies
378a86b8b6
riched20: Simplify search for the cell to delete.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-09 10:45:51 +01:00
Huw Davies
cb9353bca9
riched20: Use row and para ptrs in the cursor up/down handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-09 10:45:49 +01:00
Huw Davies
ab95fb31fc
riched20: Use row ptrs in the page up/down handlers.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-09 10:45:47 +01:00
Huw Davies
47228b7db4
riched20: Pass a para or run ptr to the char ofs propagation function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-09 10:45:45 +01:00
Huw Davies
00fa9a9546
riched20: Use paragraph and run ptrs in the cursor structure.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 12:02:01 +01:00
Huw Davies
12dd2d5d78
riched20: Add next / prev run from cursor helpers.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 12:01:59 +01:00
Huw Davies
3131f91940
riched20: Use cell ptrs to link the cells.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 12:01:57 +01:00
Huw Davies
b7084cd7e3
riched20: Use cell ptrs in the paragraph splitting and joining functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 12:01:55 +01:00
Huw Davies
b692fb5e08
riched20: Use more cell helpers in some of the table functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 12:01:52 +01:00
Huw Davies
eb6b188a94
riched20: Pass paragraph ptrs to the para marking function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 09:06:43 +01:00
Huw Davies
c8fef26884
riched20: Use para_in_table() instead of IsInTable().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 09:06:41 +01:00
Huw Davies
507f517094
riched20: Return a row ptr from the row creation function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 09:06:39 +01:00
Huw Davies
3c10a3eff7
riched20: Use a cell helper in the split paragraph undo function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 09:06:38 +01:00
Huw Davies
04158801f9
riched20: Use a paragraph ptr in the rtf writer function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 09:06:35 +01:00
Huw Davies
8b613eb2ed
riched20: Use a paragraph ptr in the clipboard get text function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:21:27 +01:00
Huw Davies
b132d8bf05
riched20: Use para and row ptrs in the row number from offset function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:21:26 +01:00
Huw Davies
410dceb939
riched20: Remove unused ME_RowStart().
...
Its functionality has been replaced with row_from_cursor().
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:21:24 +01:00
Huw Davies
27f8e16bde
riched20: Use run ptrs in the text retrieval function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:21:22 +01:00
Huw Davies
cfdfe51785
riched20: Use row ptrs in the EM_GETLINELENGTH handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:21:20 +01:00
Huw Davies
d55bc24001
riched20: Use run ptrs in the EM_GETLINECOUNT handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
Huw Davies
fe2fd44e0a
riched20: Return a row ptr from the row from row number function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
Huw Davies
c5b1378756
riched20: Use para and row ptrs in the EM_GETFIRSTVISIBLELINE handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
Huw Davies
8046b5bc96
riched20: Use a run ptr in the link notify function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
Huw Davies
50c8fe4560
riched20: Use paragraph ptrs in the WM_CHAR handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
Huw Davies
cdd507eb2b
riched20: Use paragraph and run ptrs in the find text function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 10:35:41 +01:00
Huw Davies
0c9d5ebf5c
riched20: Use a run ptr in the rtf row handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 10:35:39 +01:00
Huw Davies
a0f0dc1c5b
riched20: Use paragraph ptrs in the enter handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 10:35:37 +01:00
Huw Davies
352e7664d8
riched20: Use paragraph ptrs in the selection link check function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 10:35:35 +01:00
Huw Davies
2bc67cfcf9
riched20: Use a paragraph ptr in the stream in function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 10:35:33 +01:00
Huw Davies
f2d770d491
riched20: Remove the table corruption check function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 20:19:13 +01:00
Huw Davies
3ba419081a
riched20: Use paragraph ptrs in the table move from row start function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 20:19:13 +01:00
Huw Davies
963075706d
riched20: Use cell ptrs in the table tab handler.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 20:19:13 +01:00
Huw Davies
77895ecdde
riched20: Use cell ptrs in the append table row function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 20:19:13 +01:00
Huw Davies
20b4a03553
riched20: Use para and run ptrs in the table deletion function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 20:19:13 +01:00
Huw Davies
5d179e4b39
riched20: Use a helper to retrieve the first run.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-28 09:53:50 +01:00
Huw Davies
6b9b7b2d0b
riched20: Use the paragraph from the cursor.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-28 09:53:48 +01:00
Huw Davies
f9a82574c9
riched20: Use a helper to find the next run.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-28 09:53:46 +01:00
Huw Davies
b3b3624079
riched20: Use a helper function to find the first row.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-28 09:53:44 +01:00
Huw Davies
da50829128
riched20: Pass para ptrs to the various para selection functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-28 09:53:39 +01:00
Huw Davies
9908c5d3c4
riched20: Fix the struct size check in the para fmt retrieval function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 09:51:55 +01:00
Huw Davies
1abbb78a09
riched20: Use row and para ptrs in the ensure visible function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 09:51:53 +01:00
Huw Davies
30ad0b936a
riched20: Use a row ptr in the run drawing function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 09:51:50 +01:00
Huw Davies
0d50e0182d
riched20: Use a run helper in the delete text function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 09:51:47 +01:00
Huw Davies
245b9231c5
riched20: Use row and para helpers in the extend selection function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 09:51:44 +01:00
Huw Davies
6b3fd7869a
riched20: Use row ptrs in the cursor to co-ordinates function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 10:24:26 +01:00
Huw Davies
f45408b24a
riched20: Use row helpers for Home/End key handling.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 10:24:24 +01:00
Huw Davies
aaf29c7991
riched20: Use row and para helpers for the selection function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 10:24:22 +01:00
Huw Davies
0fda889f35
riched20: Use row ptrs in the cursor from virtual co-ords function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 10:24:20 +01:00
Huw Davies
b47e5d0d23
riched20: Pass a row ptr to the cursor from row function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 10:24:18 +01:00
Huw Davies
dd134546f4
riched20: Remove the caret at end hack.
...
The end of one run already has a different cursor
to the beginning of the next run.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-23 19:56:20 +02:00
Huw Davies
c8862864fe
riched20: Use run and para ptrs in the cursor move lines function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-23 19:56:20 +02:00
Huw Davies
2c2020ddb5
riched20: Use cell ptrs in the table position to offset function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-23 19:56:20 +02:00
Huw Davies
2809ac2b78
riched20: Use cell ptrs in the wrapping functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-23 19:56:20 +02:00
Huw Davies
ff23a6d792
riched20: Use cell and para ptrs in the table border drawing function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-23 19:56:20 +02:00
Huw Davies
6488613a3a
riched20: Simplify some of the drawing code using a few helpers.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 22:02:03 +02:00
Huw Davies
b2c812e3a3
riched20: Use cell ptrs in the rtf writing code.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 22:02:03 +02:00
Huw Davies
431ee50875
riched20: Use cell ptrs in the rtf parsing code.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 22:02:03 +02:00
Huw Davies
670dadf719
riched20: Return paragraph ptrs from the remaining table insert functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 22:02:02 +02:00
Huw Davies
caa1d4a480
riched20: Return a para ptr from the insert start table row functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 22:02:02 +02:00
Huw Davies
103cd9f2f2
riched20: Return a paragraph ptr from the table insert helper.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:08:07 +02:00
Huw Davies
f0783863f9
riched20: Pass and return paragraph ptrs in the table append row function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:08:06 +02:00
Huw Davies
75433bc39b
riched20: Pass a cursor ptr to the insert style retrieval function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:08:04 +02:00
Huw Davies
e69bb46c06
riched20: Remove a redundant condition.
...
If the cursor offset is zero, then it is by definition
at the beginning of a run.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:08:01 +02:00
Huw Davies
887d7e686d
riched20: Use the paragraph and run helpers in the delete text function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:07:59 +02:00
Huw Davies
218225548a
riched20: Don't split the paragraph at the first \intbl.
...
The whole of the current paragraph should be included
in the table.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-20 22:54:02 +02:00
Huw Davies
2b817872cb
riched20: Start re-wrap loop at the beginning of any table.
...
This ensures that cell heights of cells before the first marked
cell are correctly adjusted.
Fixes last part of a regression caused by commit
195f84cfa1
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-20 22:54:02 +02:00
Huw Davies
9098d5b300
riched20: Update both co-ords during layout.
...
This partially fixes a regression caused by
commit 195f84cfa1
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-20 22:54:02 +02:00
Huw Davies
4a30e0601e
riched20: Pass paragraph ptrs to the paragraph property writers.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-20 22:54:02 +02:00
Huw Davies
0033253777
riched20: Pass run ptrs to the font and colour table writer function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-20 22:54:02 +02:00
Huw Davies
db6c554909
richedit: Use the correct ptr to the cell.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-19 14:58:47 +02:00
Huw Davies
53959eb7d4
riched20: Use helpers in the cursor to start/end functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-19 14:58:45 +02:00
Huw Davies
87c4d217ed
riched20: Pass a run ptr to the run drawing function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-19 14:58:44 +02:00
Huw Davies
7875a77b23
riched20: Pass a paragraph ptr to a couple of the drawing helpers.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-19 14:58:42 +02:00
Huw Davies
00824a032f
riched20: Pass a paragraph ptr to the paragraph destruction function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-19 14:58:40 +02:00
Huw Davies
434feab6a2
riched20: Pass and return a paragraph ptr in the paragraph joining function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-16 22:00:53 +02:00
Huw Davies
f758d1effd
riched20: Pass a run ptr to, and return a para ptr from, the para splitting function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-16 22:00:50 +02:00
Huw Davies
d3fb8b29c1
riched20: Use paragraph and run ptrs in the paragraph splitting function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-16 22:00:47 +02:00
Huw Davies
9b3a538c35
riched20: Return a paragraph ptr from the paragraph creation function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-16 22:00:45 +02:00
Huw Davies
77f1894f21
riched20: Pass a paragraph ptr to the table update flags function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-16 22:00:42 +02:00
Damjan Jovanovic
aa1ef09fef
riched20: Implement ITextRange/ITextSelection Copy and Cut.
...
Signed-off-by: Damjan Jovanovic <damjan.jov@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-15 20:18:40 +02:00
Huw Davies
a9a2a68be9
riched20: Use a run ptr in GetXForArrow().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-15 20:18:37 +02:00
Huw Davies
fe0a7a78db
riched20: Remove InternalInsertTextFromCursor().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-15 20:18:35 +02:00
Huw Davies
120ee0de1b
riched20: Simplify the char offset from run offset function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-15 20:18:33 +02:00
Huw Davies
57c2580a73
riched20: Simplify the cursor from char offset function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-15 20:18:30 +02:00
Huw Davies
1994d21ddb
riched20: Use run ptrs in GetCharFormat().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-15 20:18:28 +02:00
Huw Davies
579618c0d7
riched20: Return a run ptr from the run insert function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-14 20:32:03 +02:00
Huw Davies
1797d2124a
riched20: Use run ptrs in SetCharFormat().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-14 20:31:59 +02:00
Huw Davies
bfac43798b
riched20: Don't return the diTextStart paragraph from para_prev().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-14 20:31:56 +02:00
Huw Davies
02f4a178ff
riched20: Don't mark the diTextStart paragraph as requiring repainting.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-14 20:31:52 +02:00
Huw Davies
0b01b40a7c
riched20: Return a run ptr from the run splitting function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-14 20:31:49 +02:00
Huw Davies
a37147c083
riched20: Return a run ptr from the run creation function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-13 18:18:37 +02:00
Huw Davies
3cade70f14
riched20: Pass a run ptr to the run joining function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-13 18:18:35 +02:00
Huw Davies
4366c81f49
riched20: Use paragraph ptrs in FindPixelPos().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-13 18:18:33 +02:00
Huw Davies
586e31a1e6
riched20: Use the run and para helpers in the cursor movement functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-13 18:18:31 +02:00
Huw Davies
468609ae7b
riched20: Use paragraph and run ptrs in InsertTextFromCursor().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-13 18:18:29 +02:00
Huw Davies
a6d41a0391
riched20: Use ME_Paragraph ptrs in InternalDeleteText().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-12 18:44:34 +02:00
Huw Davies
f648eff162
riched20: Use ME_Paragraph and ME_Run ptrs in GetCursorCoordinates().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-12 18:44:32 +02:00
Huw Davies
bb50c5a845
riched20: Use the table_row_start/end() helpers.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-12 18:44:30 +02:00
Huw Davies
88cfc04be0
riched20: Use ME_Paragraph ptrs for the update range.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-12 18:44:28 +02:00
Huw Davies
efa45652a9
riched20: Use a structure to hold the repaint range.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-12 18:44:26 +02:00
Huw Davies
1bda5913fc
riched20: Use ME_Paragraph ptrs in a few of the table functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-09 16:21:33 +02:00
Huw Davies
c3e6cb5b70
riched20: Don't create a display context in InvalidateParagraphRange().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-09 16:21:33 +02:00
Huw Davies
b466eefbdf
riched20: Move the marked paragraph list to a rbtree.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-09 16:21:33 +02:00
Huw Davies
3a1aaf2655
riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-09 16:21:33 +02:00
Huw Davies
02cf14cf43
riched20: Pass a ME_Paragraph ptr to the marking functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-09 16:21:33 +02:00
Huw Davies
749c80bdaf
riched20: Pass a ME_Paragraph ptr to shape_para().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-08 19:45:35 +02:00
Huw Davies
7ef2c6c8d5
riched20: Pass a ME_Paragraph ptr to itemize_para().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-08 19:45:35 +02:00
Huw Davies
1500cfe8fa
riched20: Pass a ME_Paragraph ptr to WrapTextParagraph().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-08 19:45:35 +02:00
Huw Davies
94e34fa8ee
riched20: Store a ME_Paragraph ptr in the wrap context.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-08 19:45:35 +02:00
Huw Davies
7291506667
riched20: Move several of the wrapping functions to use ME_Run directly.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-08 19:45:35 +02:00
Huw Davies
14044d93fd
riched20: Simplify SplitByBacktracking().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-07 18:40:09 +02:00
Huw Davies
5dc422d4e5
riched20: Simplify FindPixelPos().
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-07 18:40:07 +02:00
Damjan Jovanovic
7a347c20dc
riched20: Implement ITextRange::StartOf() and ITextRange::EndOf() for tomCharacter.
...
Signed-off-by: Damjan Jovanovic <damjan.jov@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-19 21:30:58 +02:00
Damjan Jovanovic
55d4cf27af
riched20: Implement ITextRange::Move() for tomCharacter.
...
Signed-off-by: Damjan Jovanovic <damjan.jov@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-19 21:30:56 +02:00
Damjan Jovanovic
41915acaed
riched20: Implement ITextRange::MoveStart() and ITextRange::MoveEnd() for tomCharacter.
...
Signed-off-by: Damjan Jovanovic <damjan.jov@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-19 21:30:53 +02:00
Alexandre Julliard
0c5ebf4231
riched20: Fix potentially uninitialized variable compiler warnings.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-08 14:59:30 +02:00
Jacek Caban
9763f5189f
riched20: Include wine/asm.h in editstr.h.
...
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49068
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-05-04 12:39:09 +02:00
Jacek Caban
650aebadb7
riched20: Use __ASM_USE_THISCALL_WRAPPER macro.
...
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-04-27 12:51:05 +02:00
Jacek Caban
270599cc81
riched20/tests: Don't use thiscall wrappers on clang MSVC target.
...
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-04-27 12:50:59 +02:00
Gijs Vermeulen
55ca155ab8
riched20: Turn FIXME into a TRACE for ITextRange::SetRange.
...
It was implemented in fec6920638
.
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-04-03 17:06:21 +02:00
Serge Gautherie
7770e26f2d
include: Remove now useless forced _WIN32_IE defines.
...
Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-03-20 19:38:38 +01:00
Mathew Hodson
3808b61967
riched20/tests: Fix function names in two ok() messages.
...
Signed-off-by: Mathew Hodson <mathew.hodson@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-12-03 21:27:13 +01:00
Huw Davies
ebe31c7919
riched20: Don't calculate the para numbering data if numbering is disabled.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:12:35 +02:00
Huw Davies
cfeb4358b5
riched20: Use PatBlt() instead of FillRect() to paint the background area.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:12:22 +02:00
Huw Davies
6f1cc1f3b5
riched20: Allow the style to remain selected in the context.
...
This avoids swapping out the font if the next run uses the same style.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:12:05 +02:00
Huw Davies
da9bc7cd95
riched20: Move release_font_cache() further up the file.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:11:54 +02:00
Huw Davies
b9e1ed0668
riched20: Only invalidate the selection if it's not hidden.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:11:46 +02:00
Huw Davies
5419a9804a
riched20: Clearly separate the selection setting functions.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-19 14:11:38 +02:00
Huw Davies
04040d0aca
riched20: Don't force an update when styles are changed.
...
The appropriate region has already been invalidated and will be
repainted in due course.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-15 20:17:17 +02:00
Huw Davies
03a93eb80e
riched20: Move handling of EM_SETCHARFORMAT to a helper function.
...
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-15 20:17:14 +02:00
Alexandre Julliard
a6d57b0add
riched20: Build with msvcrt.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-19 11:22:47 +02:00
Jactry Zeng
fec6920638
riched20: Implement ITextRange::SetRange.
...
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-28 12:06:46 +02:00
Alexandre Julliard
0a79eb3608
include: Use the __thiscall attribute directly for the Mingw build.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 19:00:10 +02:00
Alexandre Julliard
f3e45c37a2
riched20: Declare thiscall functions as __thiscall.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-15 20:11:19 +02:00
Alexandre Julliard
ee4db2005e
include: Define thiscall assembly wrappers globally.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-15 20:11:19 +02:00
Alexandre Julliard
d5a372abbb
include: Move inline assembly definitions to a new wine/asm.h header.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-14 13:45:07 +02:00
Gijs Vermeulen
840af642db
riched20: Handle tomEnd in ITextRange::ScrollIntoView.
...
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46899
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-15 21:33:07 +02:00
Sergio Gómez Del Real
5868c664c1
riched20: Handle efficiently caret creation/destruction.
...
Signed-off-by: Sergio Gómez Del Real <sdelreal@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-03 19:35:34 +02:00
Thomas Faber
b64511c00a
riched20: Implement MSVC asm wrappers.
...
Signed-off-by: Thomas Faber <thomas.faber@reactos.org>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 10:09:45 +01:00
Jactry Zeng
74b17a353a
riched20: Handle REO_IOB_SELECTION in IRichEditOle::GetObject().
...
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-07 17:54:01 +01:00
Michael Stefaniuc
350123e183
riched20/tests: Avoid using the comma operator.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-01 09:37:31 +01:00
Sven Baars
d917f0ef09
riched20: Fix IRichEditOle COM aggregation (Valgrind).
...
Signed-off-by: Sven Baars <sven.wine@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-02-06 19:57:27 +01:00
Sergio Gómez Del Real
4f007da8d3
riched20: Mask out extended flags introduced by CHARFORMAT2 when converting to CHARFORMAT.
...
Signed-off-by: Sergio Gómez Del Real <sdelreal@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-02-06 19:57:27 +01:00
Sven Baars
9d79aa686b
riched20/tests: Fix a memory leak (Valgrind).
...
Signed-off-by: Sven Baars <sven.wine@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-01-17 10:45:58 +01:00
Zhiyi Zhang
62d80cff69
riched20: Fix a use after free.
...
In ME_DestroyEditor(), the item list is being freed when
calling get_total_width() in destroy_para().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46328
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-01-02 12:28:07 +01:00
Andrey Gusev
ec2c2f9fa0
riched20: Remove redundant comparison.
...
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>
2018-12-13 22:37:46 +01:00
Fabian Maurer
52c106418c
riched32: Handle enter press in WM_CHAR instead of WM_KEYDOWN.
...
This fixes an old regression when VK_RETURN handling was implemented
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23282
Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-12-12 17:10:13 +01:00