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
51bbd929
Commit
51bbd929
authored
Apr 14, 2010
by
Aric Stewart
Committed by
Alexandre Julliard
Apr 15, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
usp10: Have ScriptShape respect fLogicalOrder and fRTL when ordering glyphs.
parent
6aeffb53
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
6 deletions
+17
-6
usp10.c
dlls/usp10/usp10.c
+17
-6
No files found.
dlls/usp10/usp10.c
View file @
51bbd929
...
...
@@ -1332,6 +1332,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
{
HRESULT
hr
;
unsigned
int
i
;
BOOL
rtl
;
TRACE
(
"(%p, %p, %s, %d, %d, %p, %p, %p, %p, %p)
\n
"
,
hdc
,
psc
,
debugstr_wn
(
pwcChars
,
cChars
),
cChars
,
cMaxGlyphs
,
psa
,
pwOutGlyphs
,
pwLogClust
,
psva
,
pcGlyphs
);
...
...
@@ -1341,6 +1342,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
if
(
!
psva
||
!
pcGlyphs
)
return
E_INVALIDARG
;
if
(
cChars
>
cMaxGlyphs
)
return
E_OUTOFMEMORY
;
rtl
=
(
!
psa
->
fLogicalOrder
&&
psa
->
fRTL
);
*
pcGlyphs
=
cChars
;
if
((
hr
=
init_script_cache
(
hdc
,
psc
))
!=
S_OK
)
return
hr
;
...
...
@@ -1350,33 +1352,42 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
{
for
(
i
=
0
;
i
<
cChars
;
i
++
)
{
if
(
!
(
pwOutGlyphs
[
i
]
=
get_cache_glyph
(
psc
,
pwcChars
[
i
])))
int
idx
=
i
;
if
(
rtl
)
idx
=
cChars
-
1
-
i
;
if
(
!
(
pwOutGlyphs
[
i
]
=
get_cache_glyph
(
psc
,
pwcChars
[
idx
])))
{
WORD
glyph
;
if
(
!
hdc
)
return
E_PENDING
;
if
(
GetGlyphIndicesW
(
hdc
,
&
pwcChars
[
i
],
1
,
&
glyph
,
0
)
==
GDI_ERROR
)
return
S_FALSE
;
pwOutGlyphs
[
i
]
=
set_cache_glyph
(
psc
,
pwcChars
[
i
],
glyph
);
if
(
GetGlyphIndicesW
(
hdc
,
&
pwcChars
[
i
dx
],
1
,
&
glyph
,
0
)
==
GDI_ERROR
)
return
S_FALSE
;
pwOutGlyphs
[
i
]
=
set_cache_glyph
(
psc
,
pwcChars
[
i
dx
],
glyph
);
}
}
}
else
{
TRACE
(
"no glyph translation
\n
"
);
for
(
i
=
0
;
i
<
cChars
;
i
++
)
pwOutGlyphs
[
i
]
=
pwcChars
[
i
];
for
(
i
=
0
;
i
<
cChars
;
i
++
)
{
int
idx
=
i
;
if
(
rtl
)
idx
=
cChars
-
1
-
i
;
pwOutGlyphs
[
i
]
=
pwcChars
[
idx
];
}
}
/* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */
for
(
i
=
0
;
i
<
cChars
;
i
++
)
{
int
idx
=
i
;
if
(
rtl
)
idx
=
cChars
-
1
-
i
;
/* FIXME: set to better values */
psva
[
i
].
uJustification
=
(
pwcChars
[
i
]
==
' '
)
?
SCRIPT_JUSTIFY_BLANK
:
SCRIPT_JUSTIFY_CHARACTER
;
psva
[
i
].
uJustification
=
(
pwcChars
[
i
dx
]
==
' '
)
?
SCRIPT_JUSTIFY_BLANK
:
SCRIPT_JUSTIFY_CHARACTER
;
psva
[
i
].
fClusterStart
=
1
;
psva
[
i
].
fDiacritic
=
0
;
psva
[
i
].
fZeroWidth
=
0
;
psva
[
i
].
fReserved
=
0
;
psva
[
i
].
fShapeReserved
=
0
;
pwLogClust
[
i
]
=
i
;
pwLogClust
[
i
]
=
i
dx
;
}
return
S_OK
;
}
...
...
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