Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
85cd1350
Commit
85cd1350
authored
Aug 19, 2005
by
Huw Davies
Committed by
Alexandre Julliard
Aug 19, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify ExtTextOut a bit. Should be a nop.
parent
523fef0c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
font.c
dlls/gdi/font.c
+10
-7
No files found.
dlls/gdi/font.c
View file @
85cd1350
...
...
@@ -1718,6 +1718,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
const
RECT
*
lprect
,
LPCWSTR
str
,
UINT
count
,
const
INT
*
lpDx
)
{
BOOL
ret
=
FALSE
;
LPWSTR
reordered_string
=
(
LPWSTR
)
str
;
DC
*
dc
=
DC_GetDCUpdate
(
hdc
);
if
(
dc
)
{
...
...
@@ -1732,19 +1734,20 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
{
/* The caller did not specify that language processing was already done.
*/
LPWSTR
lpReorderedString
=
HeapAlloc
(
GetProcessHeap
(),
0
,
count
*
sizeof
(
WCHAR
));
reordered_string
=
HeapAlloc
(
GetProcessHeap
(),
0
,
count
*
sizeof
(
WCHAR
));
BIDI_Reorder
(
str
,
count
,
GCP_REORDER
,
((
flags
&
ETO_RTLREADING
)
!=
0
||
(
GetTextAlign
(
hdc
)
&
TA_RTLREADING
)
!=
0
)
?
WINE_GCPW_FORCE_RTL:
WINE_GCPW_FORCE_LTR
,
lpReorderedS
tring
,
count
,
NULL
);
reordered_s
tring
,
count
,
NULL
);
ret
=
dc
->
funcs
->
pExtTextOut
(
dc
->
physDev
,
x
,
y
,
flags
|
ETO_IGNORELANGUAGE
,
lprect
,
lpReorderedString
,
count
,
lpDx
,
dc
->
breakExtra
);
HeapFree
(
GetProcessHeap
(),
0
,
lpReorderedString
);
}
else
ret
=
dc
->
funcs
->
pExtTextOut
(
dc
->
physDev
,
x
,
y
,
flags
,
lprect
,
str
,
count
,
flags
|=
ETO_IGNORELANGUAGE
;
}
ret
=
dc
->
funcs
->
pExtTextOut
(
dc
->
physDev
,
x
,
y
,
flags
,
lprect
,
reordered_string
,
count
,
lpDx
,
dc
->
breakExtra
);
if
(
reordered_string
!=
str
)
HeapFree
(
GetProcessHeap
(),
0
,
reordered_string
);
}
GDI_ReleaseObj
(
hdc
);
}
...
...
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