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
0eef665d
Commit
0eef665d
authored
Oct 05, 2012
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Oct 08, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oledb32: Add IDBProperties support in IDBInitialize.
parent
718f0956
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
1 deletion
+75
-1
datainit.c
dlls/oledb32/datainit.c
+74
-0
database.c
dlls/oledb32/tests/database.c
+1
-1
No files found.
dlls/oledb32/datainit.c
View file @
0eef665d
...
...
@@ -50,6 +50,7 @@ static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface)
typedef
struct
{
IDBInitialize
IDBInitialize_iface
;
IDBProperties
IDBProperties_iface
;
LONG
ref
;
}
dbinit
;
...
...
@@ -59,6 +60,74 @@ static inline dbinit *impl_from_IDBInitialize(IDBInitialize *iface)
return
CONTAINING_RECORD
(
iface
,
dbinit
,
IDBInitialize_iface
);
}
static
inline
dbinit
*
impl_from_IDBProperties
(
IDBProperties
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
dbinit
,
IDBProperties_iface
);
}
static
HRESULT
WINAPI
dbprops_QueryInterface
(
IDBProperties
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
{
dbinit
*
This
=
impl_from_IDBProperties
(
iface
);
return
IDBInitialize_QueryInterface
(
&
This
->
IDBInitialize_iface
,
riid
,
ppvObject
);
}
static
ULONG
WINAPI
dbprops_AddRef
(
IDBProperties
*
iface
)
{
dbinit
*
This
=
impl_from_IDBProperties
(
iface
);
return
IDBInitialize_AddRef
(
&
This
->
IDBInitialize_iface
);
}
static
ULONG
WINAPI
dbprops_Release
(
IDBProperties
*
iface
)
{
dbinit
*
This
=
impl_from_IDBProperties
(
iface
);
return
IDBInitialize_Release
(
&
This
->
IDBInitialize_iface
);
}
static
HRESULT
WINAPI
dbprops_GetProperties
(
IDBProperties
*
iface
,
ULONG
cPropertyIDSets
,
const
DBPROPIDSET
rgPropertyIDSets
[],
ULONG
*
pcPropertySets
,
DBPROPSET
**
prgPropertySets
)
{
dbinit
*
This
=
impl_from_IDBProperties
(
iface
);
FIXME
(
"(%p)->(%d %p %p %p)
\n
"
,
This
,
cPropertyIDSets
,
rgPropertyIDSets
,
pcPropertySets
,
prgPropertySets
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
dbprops_GetPropertyInfo
(
IDBProperties
*
iface
,
ULONG
cPropertyIDSets
,
const
DBPROPIDSET
rgPropertyIDSets
[],
ULONG
*
pcPropertyInfoSets
,
DBPROPINFOSET
**
prgPropertyInfoSets
,
OLECHAR
**
ppDescBuffer
)
{
dbinit
*
This
=
impl_from_IDBProperties
(
iface
);
FIXME
(
"(%p)->(%d %p %p %p %p)
\n
"
,
This
,
cPropertyIDSets
,
rgPropertyIDSets
,
pcPropertyInfoSets
,
prgPropertyInfoSets
,
ppDescBuffer
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
dbprops_SetProperties
(
IDBProperties
*
iface
,
ULONG
cPropertySets
,
DBPROPSET
rgPropertySets
[])
{
dbinit
*
This
=
impl_from_IDBProperties
(
iface
);
FIXME
(
"(%p)->(%d %p)
\n
"
,
This
,
cPropertySets
,
rgPropertySets
);
return
E_NOTIMPL
;
}
static
const
struct
IDBPropertiesVtbl
dbprops_vtbl
=
{
dbprops_QueryInterface
,
dbprops_AddRef
,
dbprops_Release
,
dbprops_GetProperties
,
dbprops_GetPropertyInfo
,
dbprops_SetProperties
};
static
HRESULT
WINAPI
dbinit_QueryInterface
(
IDBInitialize
*
iface
,
REFIID
riid
,
void
**
obj
)
{
dbinit
*
This
=
impl_from_IDBInitialize
(
iface
);
...
...
@@ -71,6 +140,10 @@ static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, v
{
*
obj
=
iface
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IDBProperties
))
{
*
obj
=
&
This
->
IDBProperties_iface
;
}
else
{
FIXME
(
"interface %s not implemented
\n
"
,
debugstr_guid
(
riid
));
...
...
@@ -144,6 +217,7 @@ static HRESULT create_db_init(void **obj)
if
(
!
This
)
return
E_OUTOFMEMORY
;
This
->
IDBInitialize_iface
.
lpVtbl
=
&
dbinit_vtbl
;
This
->
IDBProperties_iface
.
lpVtbl
=
&
dbprops_vtbl
;
This
->
ref
=
1
;
*
obj
=
&
This
->
IDBInitialize_iface
;
...
...
dlls/oledb32/tests/database.c
View file @
0eef665d
...
...
@@ -51,7 +51,7 @@ static void test_database(void)
IDBProperties
*
props
=
NULL
;
hr
=
IDBInitialize_QueryInterface
(
dbinit
,
&
IID_IDBProperties
,
(
void
**
)
&
props
);
todo_wine
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
IDBProperties_Release
(
props
);
...
...
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