Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
4c174fc8
Commit
4c174fc8
authored
Jul 28, 2010
by
Dylan Smith
Committed by
Alexandre Julliard
Jul 29, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
richedit: Removed unused run flags values.
The only place MERF_SKIPPED was in debug code, and MERF_CALCBYWRAP was only used to clear this unused flag value, so I got rid of both of them.
parent
15251ad8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
11 deletions
+1
-11
editstr.h
dlls/riched20/editstr.h
+0
-4
paint.c
dlls/riched20/paint.c
+1
-4
wrap.c
dlls/riched20/wrap.c
+0
-3
No files found.
dlls/riched20/editstr.h
View file @
4c174fc8
...
@@ -118,10 +118,6 @@ typedef enum {
...
@@ -118,10 +118,6 @@ typedef enum {
#define MERF_ENDWHITE 0x004000
#define MERF_ENDWHITE 0x004000
/* run is completely made of whitespaces */
/* run is completely made of whitespaces */
#define MERF_WHITESPACE 0x008000
#define MERF_WHITESPACE 0x008000
/* run is a last (dummy) run in the paragraph */
#define MERF_SKIPPED 0x010000
/* flags that are calculated during text wrapping */
#define MERF_CALCBYWRAP 0x0F0000
/* the "end of paragraph" run, contains 1 character */
/* the "end of paragraph" run, contains 1 character */
#define MERF_ENDPARA 0x100000
#define MERF_ENDPARA 0x100000
/* forcing the "end of row" run, contains 1 character */
/* forcing the "end of row" run, contains 1 character */
...
...
dlls/riched20/paint.c
View file @
4c174fc8
...
@@ -959,10 +959,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph)
...
@@ -959,10 +959,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph)
rc
.
top
=
c
->
pt
.
y
+
para
->
pt
.
y
+
run
->
pt
.
y
;
rc
.
top
=
c
->
pt
.
y
+
para
->
pt
.
y
+
run
->
pt
.
y
;
rc
.
bottom
=
rc
.
bottom
+
height
;
rc
.
bottom
=
rc
.
bottom
+
height
;
TRACE
(
"rc = (%d, %d, %d, %d)
\n
"
,
rc
.
left
,
rc
.
top
,
rc
.
right
,
rc
.
bottom
);
TRACE
(
"rc = (%d, %d, %d, %d)
\n
"
,
rc
.
left
,
rc
.
top
,
rc
.
right
,
rc
.
bottom
);
if
(
run
->
nFlags
&
MERF_SKIPPED
)
FrameRect
(
c
->
hDC
,
&
rc
,
GetSysColorBrush
(
COLOR_GRAYTEXT
));
DrawFocusRect
(
c
->
hDC
,
&
rc
);
else
FrameRect
(
c
->
hDC
,
&
rc
,
GetSysColorBrush
(
COLOR_GRAYTEXT
));
}
}
if
(
visible
)
if
(
visible
)
ME_DrawRun
(
c
,
c
->
pt
.
x
+
run
->
pt
.
x
,
ME_DrawRun
(
c
,
c
->
pt
.
x
+
run
->
pt
.
x
,
...
...
dlls/riched20/wrap.c
View file @
4c174fc8
...
@@ -349,7 +349,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
...
@@ -349,7 +349,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
return
p
->
next
;
return
p
->
next
;
if
(
run
->
nFlags
&
MERF_WHITESPACE
)
{
if
(
run
->
nFlags
&
MERF_WHITESPACE
)
{
p
->
member
.
run
.
nFlags
|=
MERF_SKIPPED
;
wc
->
pt
.
x
+=
run
->
nWidth
;
wc
->
pt
.
x
+=
run
->
nWidth
;
/* skip runs consisting of only whitespaces */
/* skip runs consisting of only whitespaces */
return
p
->
next
;
return
p
->
next
;
...
@@ -362,7 +361,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
...
@@ -362,7 +361,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
if
(
black
)
{
if
(
black
)
{
wc
->
bOverflown
=
FALSE
;
wc
->
bOverflown
=
FALSE
;
pp
=
ME_SplitRun
(
wc
,
p
,
black
);
pp
=
ME_SplitRun
(
wc
,
p
,
black
);
p
->
member
.
run
.
nFlags
|=
MERF_SKIPPED
;
ME_InsertRowStart
(
wc
,
pp
);
ME_InsertRowStart
(
wc
,
pp
);
return
pp
;
return
pp
;
}
}
...
@@ -588,7 +586,6 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) {
...
@@ -588,7 +586,6 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) {
else
else
break
;
break
;
}
}
p
->
member
.
run
.
nFlags
&=
~
MERF_CALCBYWRAP
;
break
;
break
;
default:
default:
break
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment