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
87278835
Commit
87278835
authored
Apr 11, 2013
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 11, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oledb32: Implement DBTYPE_I4 -> DBTYPE_VARIANT conversion.
parent
1d462aab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
convert.c
dlls/oledb32/convert.c
+6
-1
convert.c
dlls/oledb32/tests/convert.c
+12
-0
No files found.
dlls/oledb32/convert.c
View file @
87278835
...
...
@@ -740,6 +740,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
switch
(
src_type
)
{
case
DBTYPE_I4
:
V_VT
(
v
)
=
VT_I4
;
V_I4
(
v
)
=
*
(
signed
int
*
)
src
;
hr
=
S_OK
;
break
;
case
DBTYPE_BSTR
:
{
BSTR
s
=
*
(
WCHAR
**
)
src
;
...
...
@@ -747,8 +752,8 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_VT
(
v
)
=
VT_BSTR
;
V_BSTR
(
v
)
=
SysAllocString
(
s
);
hr
=
V_BSTR
(
v
)
?
S_OK
:
E_OUTOFMEMORY
;
break
;
}
break
;
default:
FIXME
(
"Unimplemented conversion %04x -> VARIANT
\n
"
,
src_type
);
return
E_NOTIMPL
;
}
break
;
...
...
dlls/oledb32/tests/convert.c
View file @
87278835
...
...
@@ -2481,6 +2481,7 @@ static void test_converttovar(void)
DBLENGTH
dst_len
;
VARIANT
dst
;
HRESULT
hr
;
INT
i4
;
hr
=
CoCreateInstance
(
&
CLSID_OLEDB_CONVERSIONLIBRARY
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IDataConvert
,
(
void
**
)
&
convert
);
if
(
FAILED
(
hr
))
...
...
@@ -2508,6 +2509,17 @@ static void test_converttovar(void)
ok
(
!
lstrcmpW
(
V_BSTR
(
&
dst
),
strW
),
"got %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
dst
)));
VariantClear
(
&
dst
);
V_VT
(
&
dst
)
=
VT_EMPTY
;
dst_len
=
0
;
dst_status
=
DBSTATUS_S_DEFAULT
;
i4
=
123
;
hr
=
IDataConvert_DataConvert
(
convert
,
DBTYPE_I4
,
DBTYPE_VARIANT
,
sizeof
(
i4
),
&
dst_len
,
&
i4
,
&
dst
,
sizeof
(
dst
),
0
,
&
dst_status
,
0
,
0
,
0
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
ok
(
dst_status
==
DBSTATUS_S_OK
,
"got %08x
\n
"
,
dst_status
);
ok
(
dst_len
==
sizeof
(
dst
),
"got %ld
\n
"
,
dst_len
);
ok
(
V_VT
(
&
dst
)
==
VT_I4
,
"got %d
\n
"
,
V_VT
(
&
dst
));
ok
(
V_I4
(
&
dst
)
==
123
,
"got %d
\n
"
,
V_I4
(
&
dst
));
IDataConvert_Release
(
convert
);
}
...
...
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