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
83d33b6f
Commit
83d33b6f
authored
Feb 02, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oledb32: Added GetDataSource() for DataLinks object.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c2a6738f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
6 deletions
+17
-6
datainit.c
dlls/oledb32/datainit.c
+11
-4
dslocator.c
dlls/oledb32/dslocator.c
+3
-2
oledb_private.h
dlls/oledb32/oledb_private.h
+3
-0
No files found.
dlls/oledb32/datainit.c
View file @
83d33b6f
...
...
@@ -587,12 +587,10 @@ static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub)
return
r
;
}
static
HRESULT
WINAPI
datainit_GetDataSource
(
IDataInitialize
*
iface
,
IUnknown
*
outer
,
DWORD
clsctx
,
LPWSTR
initstring
,
REFIID
riid
,
IUnknown
**
datasource
)
HRESULT
get_data_source
(
IUnknown
*
outer
,
DWORD
clsctx
,
LPWSTR
initstring
,
REFIID
riid
,
IUnknown
**
datasource
)
{
static
const
WCHAR
providerW
[]
=
{
'P'
,
'r'
,
'o'
,
'v'
,
'i'
,
'd'
,
'e'
,
'r'
,
'='
,
0
};
static
const
WCHAR
msdasqlW
[]
=
{
'M'
,
'S'
,
'D'
,
'A'
,
'S'
,
'Q'
,
'L'
,
0
};
datainit
*
This
=
impl_from_IDataInitialize
(
iface
);
BOOL
datasource_created
=
FALSE
;
IDBProperties
*
dbprops
;
DBPROPSET
*
propset
;
...
...
@@ -600,7 +598,6 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o
CLSID
provclsid
;
HRESULT
hr
;
TRACE
(
"(%p)->(%p 0x%x %s %s %p)
\n
"
,
This
,
outer
,
clsctx
,
debugstr_w
(
initstring
),
debugstr_guid
(
riid
),
datasource
);
/* first get provider name */
provclsid
=
IID_NULL
;
...
...
@@ -727,6 +724,16 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o
return
hr
;
}
static
HRESULT
WINAPI
datainit_GetDataSource
(
IDataInitialize
*
iface
,
IUnknown
*
outer
,
DWORD
clsctx
,
LPWSTR
initstring
,
REFIID
riid
,
IUnknown
**
datasource
)
{
datainit
*
This
=
impl_from_IDataInitialize
(
iface
);
TRACE
(
"(%p)->(%p 0x%x %s %s %p)
\n
"
,
This
,
outer
,
clsctx
,
debugstr_w
(
initstring
),
debugstr_guid
(
riid
),
datasource
);
return
get_data_source
(
outer
,
clsctx
,
initstring
,
riid
,
datasource
);
}
/* returns character length of string representation */
static
int
get_propvalue_length
(
DBPROP
*
prop
)
{
...
...
dlls/oledb32/dslocator.c
View file @
83d33b6f
...
...
@@ -221,9 +221,10 @@ static ULONG WINAPI datainitialize_Release(IDataInitialize *iface)
static
HRESULT
WINAPI
datainitialize_GetDataSource
(
IDataInitialize
*
iface
,
IUnknown
*
outer
,
DWORD
context
,
LPWSTR
initstring
,
REFIID
riid
,
IUnknown
**
datasource
)
{
FIXME
(
"(%p)->(%p %#x %s %s %p): stub
\n
"
,
iface
,
outer
,
context
,
debugstr_w
(
initstring
),
debugstr_guid
(
riid
),
TRACE
(
"(%p)->(%p %#x %s %s %p)
\n
"
,
iface
,
outer
,
context
,
debugstr_w
(
initstring
),
debugstr_guid
(
riid
),
datasource
);
return
E_NOTIMPL
;
return
get_data_source
(
outer
,
context
,
initstring
,
riid
,
datasource
);
}
static
HRESULT
WINAPI
datainitialize_GetInitializationString
(
IDataInitialize
*
iface
,
IUnknown
*
datasource
,
...
...
dlls/oledb32/oledb_private.h
View file @
83d33b6f
...
...
@@ -23,6 +23,9 @@ HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
HRESULT
create_oledb_rowpos
(
IUnknown
*
outer
,
void
**
obj
)
DECLSPEC_HIDDEN
;
HRESULT
create_dslocator
(
IUnknown
*
outer
,
void
**
obj
)
DECLSPEC_HIDDEN
;
HRESULT
get_data_source
(
IUnknown
*
outer
,
DWORD
clsctx
,
LPWSTR
initstring
,
REFIID
riid
,
IUnknown
**
datasource
)
DECLSPEC_HIDDEN
;
static
inline
void
*
heap_alloc
(
size_t
len
)
{
return
HeapAlloc
(
GetProcessHeap
(),
0
,
len
);
...
...
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