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
422ca43d
Commit
422ca43d
authored
Jun 06, 2006
by
Jeff Latimer
Committed by
Alexandre Julliard
Jun 08, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
usp10: Update ScriptGetCMap to conform to Windows.
parent
beb097fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
usp10.c
dlls/usp10/tests/usp10.c
+10
-3
usp10.c
dlls/usp10/usp10.c
+1
-1
No files found.
dlls/usp10/tests/usp10.c
View file @
422ca43d
...
...
@@ -220,7 +220,7 @@ void test_ScriptGetCMap(unsigned short pwOutGlyphs[256])
int
cInChars
;
int
cChars
;
unsigned
short
pwOutGlyphs3
[
256
];
WCHAR
TestItem1
[
6
]
=
{
'T'
,
'e'
,
's'
,
't'
,
0x0166
,
0
};
WCHAR
TestItem1
[
6
]
=
{
'T'
,
'e'
,
's'
,
't'
,
'a'
,
0
};
DWORD
dwFlags
;
int
cnt
;
...
...
@@ -249,10 +249,17 @@ void test_ScriptGetCMap(unsigned short pwOutGlyphs[256])
/* Set psc to NULL, to be able to check if a pointer is returned in psc */
psc
=
NULL
;
hr
=
ScriptGetCMap
(
NULL
,
&
psc
,
NULL
,
0
,
0
,
NULL
);
ok
(
hr
==
E_
INVALIDARG
,
"(NULL,&psc,NULL,0,0NULL), expected E_INVALIDAR
G, "
"got %08x
\n
"
,
(
unsigned
int
)
hr
);
ok
(
hr
==
E_
PENDING
,
"(NULL,&psc,NULL,0,0NULL), expected E_PENDIN
G, "
"got %08x
\n
"
,
(
unsigned
int
)
hr
);
ok
(
psc
==
NULL
,
"Expected psc to be NULL, got %p
\n
"
,
psc
);
/* Set psc to NULL but add hdc, to be able to check if a pointer is returned in psc */
psc
=
NULL
;
hr
=
ScriptGetCMap
(
hdc
,
&
psc
,
NULL
,
0
,
0
,
NULL
);
ok
(
hr
==
S_OK
,
"ScriptGetCMap(NULL,&psc,NULL,0,0,NULL), expected S_OK, "
"got %08x
\n
"
,
(
unsigned
int
)
hr
);
ok
(
psc
!=
NULL
,
"ScritpGetCMap expected psc to be not NULL
\n
"
);
/* Set psc to NULL, to be able to check if a pointer is returned in psc */
psc
=
NULL
;
hr
=
ScriptGetCMap
(
NULL
,
&
psc
,
TestItem1
,
cInChars
,
dwFlags
,
pwOutGlyphs3
);
...
...
dlls/usp10/usp10.c
View file @
422ca43d
...
...
@@ -555,7 +555,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars
FIXME
(
"(%p,%p,%s,%d,0x%lx,%p): semi-stub
\n
"
,
hdc
,
psc
,
debugstr_wn
(
pwcInChars
,
cChars
),
cChars
,
dwFlags
,
pwOutGlyphs
);
if
(
!
psc
||
!
pwcInChars
||
!
pwOutGlyphs
)
if
(
!
psc
)
return
E_INVALIDARG
;
if
(
!
hdc
&&
!*
psc
)
{
...
...
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