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
18732f85
Commit
18732f85
authored
Jul 28, 2006
by
Robert Shearman
Committed by
Alexandre Julliard
Jul 28, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix the return code for an invalid dispid in IFontDisp::Invoke.
parent
fd48f795
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
olefont.c
dlls/oleaut32/olefont.c
+7
-5
olefont.c
dlls/oleaut32/tests/olefont.c
+6
-0
No files found.
dlls/oleaut32/olefont.c
View file @
18732f85
...
...
@@ -1402,6 +1402,10 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
OLEFontImpl
*
this
=
impl_from_IDispatch
(
iface
);
HRESULT
hr
;
TRACE
(
"%p->(%ld,%s,0x%lx,0x%x,%p,%p,%p,%p)
\n
"
,
this
,
dispIdMember
,
debugstr_guid
(
riid
),
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExepInfo
,
puArgErr
);
/* validate parameters */
if
(
!
IsEqualIID
(
riid
,
&
IID_NULL
))
...
...
@@ -1600,12 +1604,10 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
return
hr
;
}
break
;
default:
ERR
(
"member not found for dispid 0x%lx
\n
"
,
dispIdMember
);
return
DISP_E_MEMBERNOTFOUND
;
}
FIXME
(
"%p->(%ld,%s,%lx,%x,%p,%p,%p,%p), unhandled dispid/flag!
\n
"
,
this
,
dispIdMember
,
debugstr_guid
(
riid
),
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExepInfo
,
puArgErr
);
return
S_OK
;
}
/************************************************************************
...
...
dlls/oleaut32/tests/olefont.c
View file @
18732f85
...
...
@@ -459,6 +459,12 @@ static void test_Invoke(void)
hr
=
IFontDisp_Invoke
(
fontdisp
,
DISPID_FONT_BOLD
,
&
IID_NULL
,
0
,
DISPATCH_PROPERTYGET
,
NULL
,
&
varresult
,
NULL
,
NULL
);
ok_ole_success
(
hr
,
"IFontDisp_Invoke"
);
hr
=
IFontDisp_Invoke
(
fontdisp
,
DISPID_FONT_BOLD
,
&
IID_NULL
,
0
,
DISPATCH_METHOD
,
NULL
,
&
varresult
,
NULL
,
NULL
);
ok
(
hr
==
DISP_E_MEMBERNOTFOUND
,
"IFontDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx
\n
"
,
hr
);
hr
=
IFontDisp_Invoke
(
fontdisp
,
0xdeadbeef
,
&
IID_NULL
,
0
,
DISPATCH_PROPERTYGET
,
NULL
,
&
varresult
,
NULL
,
NULL
);
ok
(
hr
==
DISP_E_MEMBERNOTFOUND
,
"IFontDisp_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx
\n
"
,
hr
);
IFontDisp_Release
(
fontdisp
);
}
...
...
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