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
25ec9d4c
Commit
25ec9d4c
authored
Feb 26, 2021
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix VariantChangeType()/VariantChangeTypeEx() prototypes.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a55f4f9f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
variant.c
dlls/oleaut32/variant.c
+2
-2
oleauto.h
include/oleauto.h
+2
-2
No files found.
dlls/oleaut32/variant.c
View file @
25ec9d4c
...
...
@@ -960,7 +960,7 @@ VariantCopyInd_Return:
* The LCID used for the conversion is LOCALE_USER_DEFAULT.
* See VariantChangeTypeEx.
*/
HRESULT
WINAPI
DECLSPEC_HOTPATCH
VariantChangeType
(
VARIANTARG
*
pvargDest
,
VARIANTARG
*
pvargSrc
,
HRESULT
WINAPI
DECLSPEC_HOTPATCH
VariantChangeType
(
VARIANTARG
*
pvargDest
,
const
VARIANTARG
*
pvargSrc
,
USHORT
wFlags
,
VARTYPE
vt
)
{
return
VariantChangeTypeEx
(
pvargDest
,
pvargSrc
,
LOCALE_USER_DEFAULT
,
wFlags
,
vt
);
...
...
@@ -986,7 +986,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIAN
* pvargDest and pvargSrc can point to the same variant to perform an in-place
* conversion. If the conversion is successful, pvargSrc will be freed.
*/
HRESULT
WINAPI
VariantChangeTypeEx
(
VARIANTARG
*
pvargDest
,
VARIANTARG
*
pvargSrc
,
HRESULT
WINAPI
VariantChangeTypeEx
(
VARIANTARG
*
pvargDest
,
const
VARIANTARG
*
pvargSrc
,
LCID
lcid
,
USHORT
wFlags
,
VARTYPE
vt
)
{
HRESULT
res
=
S_OK
;
...
...
include/oleauto.h
View file @
25ec9d4c
...
...
@@ -188,8 +188,8 @@ void WINAPI VariantInit(VARIANT*);
HRESULT
WINAPI
VariantClear
(
VARIANT
*
);
HRESULT
WINAPI
VariantCopy
(
VARIANTARG
*
dst
,
const
VARIANTARG
*
src
);
HRESULT
WINAPI
VariantCopyInd
(
VARIANT
*
dst
,
const
VARIANTARG
*
src
);
HRESULT
WINAPI
VariantChangeType
(
VARIANT
*
,
VARIANT
*
,
USHORT
,
VARTYPE
);
HRESULT
WINAPI
VariantChangeTypeEx
(
VARIANT
*
,
VARIANT
*
,
LCID
,
USHORT
,
VARTYPE
);
HRESULT
WINAPI
VariantChangeType
(
VARIANT
ARG
*
dst
,
const
VARIANTARG
*
src
,
USHORT
flags
,
VARTYPE
vt
);
HRESULT
WINAPI
VariantChangeTypeEx
(
VARIANT
ARG
*
dst
,
const
VARIANTARG
*
src
,
LCID
lcid
,
USHORT
flags
,
VARTYPE
vt
);
/* VariantChangeType/VariantChangeTypeEx flags */
#define VARIANT_NOVALUEPROP 0x01
/* Don't get the default value property from IDispatch */
...
...
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