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
1967fae8
Commit
1967fae8
authored
Jan 30, 2012
by
Aric Stewart
Committed by
Alexandre Julliard
Jan 30, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Have a fallback in linebreaking if uniscribe fails to analyse a string.
parent
4bc418b3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
15 deletions
+24
-15
edit.c
dlls/user32/edit.c
+24
-15
No files found.
dlls/user32/edit.c
View file @
1967fae8
...
...
@@ -598,9 +598,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
const
SIZE
*
sz
;
EDIT_InvalidateUniscribeData_linedef
(
current_line
);
EDIT_UpdateUniscribeData_linedef
(
es
,
NULL
,
current_line
);
sz
=
ScriptString_pSize
(
current_line
->
ssa
);
/* Calculate line width */
current_line
->
width
=
sz
->
cx
;
if
(
current_line
->
ssa
)
{
sz
=
ScriptString_pSize
(
current_line
->
ssa
);
/* Calculate line width */
current_line
->
width
=
sz
->
cx
;
}
else
current_line
->
width
=
es
->
char_width
*
current_line
->
net_length
;
}
else
current_line
->
width
=
0
;
...
...
@@ -644,18 +648,23 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
EDIT_InvalidateUniscribeData_linedef
(
current_line
);
EDIT_UpdateUniscribeData_linedef
(
es
,
NULL
,
current_line
);
count
=
ScriptString_pcOutChars
(
current_line
->
ssa
);
piDx
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
INT
)
*
(
*
count
));
ScriptStringGetLogicalWidths
(
current_line
->
ssa
,
piDx
);
prev
=
current_line
->
net_length
-
1
;
do
{
current_line
->
width
-=
piDx
[
prev
];
prev
--
;
}
while
(
prev
>
0
&&
current_line
->
width
>
fw
);
if
(
prev
<=
0
)
prev
=
1
;
HeapFree
(
GetProcessHeap
(),
0
,
piDx
);
if
(
current_line
->
ssa
)
{
count
=
ScriptString_pcOutChars
(
current_line
->
ssa
);
piDx
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
INT
)
*
(
*
count
));
ScriptStringGetLogicalWidths
(
current_line
->
ssa
,
piDx
);
prev
=
current_line
->
net_length
-
1
;
do
{
current_line
->
width
-=
piDx
[
prev
];
prev
--
;
}
while
(
prev
>
0
&&
current_line
->
width
>
fw
);
if
(
prev
<=
0
)
prev
=
1
;
HeapFree
(
GetProcessHeap
(),
0
,
piDx
);
}
else
prev
=
(
fw
/
es
->
char_width
);
}
/* If the first line we are calculating, wrapped before istart, we must
...
...
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