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
79228f64
Commit
79228f64
authored
Jun 07, 2020
by
Gijs Vermeulen
Committed by
Alexandre Julliard
Jun 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface.
Signed-off-by:
Gijs Vermeulen
<
gijsvrm@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0c14b1a9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
connection.c
dlls/msado15/connection.c
+7
-0
recordset.c
dlls/msado15/recordset.c
+7
-0
msado15.c
dlls/msado15/tests/msado15.c
+6
-0
No files found.
dlls/msado15/connection.c
View file @
79228f64
...
@@ -98,6 +98,8 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid
...
@@ -98,6 +98,8 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid
struct
connection
*
connection
=
impl_from_Connection
(
iface
);
struct
connection
*
connection
=
impl_from_Connection
(
iface
);
TRACE
(
"%p, %s, %p
\n
"
,
connection
,
debugstr_guid
(
riid
),
obj
);
TRACE
(
"%p, %s, %p
\n
"
,
connection
,
debugstr_guid
(
riid
),
obj
);
*
obj
=
NULL
;
if
(
IsEqualGUID
(
riid
,
&
IID__Connection
)
||
IsEqualGUID
(
riid
,
&
IID_IDispatch
)
||
if
(
IsEqualGUID
(
riid
,
&
IID__Connection
)
||
IsEqualGUID
(
riid
,
&
IID_IDispatch
)
||
IsEqualGUID
(
riid
,
&
IID_IUnknown
))
IsEqualGUID
(
riid
,
&
IID_IUnknown
))
{
{
...
@@ -111,6 +113,11 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid
...
@@ -111,6 +113,11 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid
{
{
*
obj
=
&
connection
->
IConnectionPointContainer_iface
;
*
obj
=
&
connection
->
IConnectionPointContainer_iface
;
}
}
else
if
(
IsEqualGUID
(
riid
,
&
IID_IRunnableObject
))
{
TRACE
(
"IID_IRunnableObject not supported returning NULL
\n
"
);
return
E_NOINTERFACE
;
}
else
else
{
{
FIXME
(
"interface %s not implemented
\n
"
,
debugstr_guid
(
riid
)
);
FIXME
(
"interface %s not implemented
\n
"
,
debugstr_guid
(
riid
)
);
...
...
dlls/msado15/recordset.c
View file @
79228f64
...
@@ -784,6 +784,8 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid,
...
@@ -784,6 +784,8 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid,
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
TRACE
(
"%p, %s, %p
\n
"
,
iface
,
debugstr_guid
(
riid
),
obj
);
TRACE
(
"%p, %s, %p
\n
"
,
iface
,
debugstr_guid
(
riid
),
obj
);
*
obj
=
NULL
;
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IDispatch
)
||
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IDispatch
)
||
IsEqualIID
(
riid
,
&
IID__ADO
)
||
IsEqualIID
(
riid
,
&
IID_Recordset15
)
||
IsEqualIID
(
riid
,
&
IID__ADO
)
||
IsEqualIID
(
riid
,
&
IID_Recordset15
)
||
IsEqualIID
(
riid
,
&
IID_Recordset20
)
||
IsEqualIID
(
riid
,
&
IID_Recordset21
)
||
IsEqualIID
(
riid
,
&
IID_Recordset20
)
||
IsEqualIID
(
riid
,
&
IID_Recordset21
)
||
...
@@ -795,6 +797,11 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid,
...
@@ -795,6 +797,11 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid,
{
{
*
obj
=
&
recordset
->
ISupportErrorInfo_iface
;
*
obj
=
&
recordset
->
ISupportErrorInfo_iface
;
}
}
else
if
(
IsEqualGUID
(
riid
,
&
IID_IRunnableObject
))
{
TRACE
(
"IID_IRunnableObject not supported returning NULL
\n
"
);
return
E_NOINTERFACE
;
}
else
else
{
{
FIXME
(
"interface %s not implemented
\n
"
,
debugstr_guid
(
riid
)
);
FIXME
(
"interface %s not implemented
\n
"
,
debugstr_guid
(
riid
)
);
...
...
dlls/msado15/tests/msado15.c
View file @
79228f64
...
@@ -61,6 +61,7 @@ static LONG get_refs_recordset( _Recordset *recordset )
...
@@ -61,6 +61,7 @@ static LONG get_refs_recordset( _Recordset *recordset )
static
void
test_Recordset
(
void
)
static
void
test_Recordset
(
void
)
{
{
_Recordset
*
recordset
;
_Recordset
*
recordset
;
IRunnableObject
*
runtime
;
ISupportErrorInfo
*
errorinfo
;
ISupportErrorInfo
*
errorinfo
;
Fields
*
fields
,
*
fields2
;
Fields
*
fields
,
*
fields2
;
Field
*
field
;
Field
*
field
;
...
@@ -73,6 +74,10 @@ static void test_Recordset(void)
...
@@ -73,6 +74,10 @@ static void test_Recordset(void)
hr
=
CoCreateInstance
(
&
CLSID_Recordset
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID__Recordset
,
(
void
**
)
&
recordset
);
hr
=
CoCreateInstance
(
&
CLSID_Recordset
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID__Recordset
,
(
void
**
)
&
recordset
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
hr
=
_Recordset_QueryInterface
(
recordset
,
&
IID_IRunnableObject
,
(
void
**
)
&
runtime
);
ok
(
hr
==
E_NOINTERFACE
,
"Unexpected IRunnableObject interface
\n
"
);
ok
(
runtime
==
NULL
,
"expected NULL
\n
"
);
/* _Recordset object supports ISupportErrorInfo */
/* _Recordset object supports ISupportErrorInfo */
errorinfo
=
NULL
;
errorinfo
=
NULL
;
hr
=
_Recordset_QueryInterface
(
recordset
,
&
IID_ISupportErrorInfo
,
(
void
**
)
&
errorinfo
);
hr
=
_Recordset_QueryInterface
(
recordset
,
&
IID_ISupportErrorInfo
,
(
void
**
)
&
errorinfo
);
...
@@ -676,6 +681,7 @@ static void test_Connection(void)
...
@@ -676,6 +681,7 @@ static void test_Connection(void)
hr
=
_Connection_QueryInterface
(
connection
,
&
IID_IRunnableObject
,
(
void
**
)
&
runtime
);
hr
=
_Connection_QueryInterface
(
connection
,
&
IID_IRunnableObject
,
(
void
**
)
&
runtime
);
ok
(
hr
==
E_NOINTERFACE
,
"Unexpected IRunnableObject interface
\n
"
);
ok
(
hr
==
E_NOINTERFACE
,
"Unexpected IRunnableObject interface
\n
"
);
ok
(
runtime
==
NULL
,
"expected NULL
\n
"
);
hr
=
_Connection_QueryInterface
(
connection
,
&
IID_ISupportErrorInfo
,
(
void
**
)
&
errorinfo
);
hr
=
_Connection_QueryInterface
(
connection
,
&
IID_ISupportErrorInfo
,
(
void
**
)
&
errorinfo
);
ok
(
hr
==
S_OK
,
"Failed to get ISupportErrorInfo interface
\n
"
);
ok
(
hr
==
S_OK
,
"Failed to get ISupportErrorInfo interface
\n
"
);
...
...
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