Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jason Beetham
wine
Commits
e81b63fc
Commit
e81b63fc
authored
24 years ago
by
Francois Jacques
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Implemented SafeArrayGetVarType.
Added a VT_RECORD variant type definition.
parent
00e7c334
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/oleaut32/oleaut32.spec
+1
-0
1 addition, 0 deletions
dlls/oleaut32/oleaut32.spec
dlls/oleaut32/safearray.c
+42
-0
42 additions, 0 deletions
dlls/oleaut32/safearray.c
include/wine/obj_oleaut.h
+1
-0
1 addition, 0 deletions
include/wine/obj_oleaut.h
with
44 additions
and
0 deletions
dlls/oleaut32/oleaut32.spec
+
1
−
0
View file @
e81b63fc
...
...
@@ -73,6 +73,7 @@ import ole32.dll
74 stdcall VarR4FromStr(wstr long long ptr) VarR4FromStr
75 stub VarR4FromDisp
76 stdcall VarR4FromBool(long ptr) VarR4FromBool
77 stdcall SafeArrayGetVarType(ptr ptr) SafeArrayGetVarType
78 stdcall VarR8FromUI1(long ptr) VarR8FromUI1
79 stdcall VarR8FromI2(long ptr) VarR8FromI2
80 stdcall VarR8FromI4(long ptr) VarR8FromI4
...
...
This diff is collapsed.
Click to expand it.
dlls/oleaut32/safearray.c
+
42
−
0
View file @
e81b63fc
...
...
@@ -1036,3 +1036,45 @@ static HRESULT duplicateData(
return
S_OK
;
}
/************************************************************************
* SafeArrayGetVarType
* Returns the VARTYPE stored in the given safearray
*/
HRESULT
WINAPI
SafeArrayGetVarType
(
SAFEARRAY
*
psa
,
VARTYPE
*
pvt
)
{
HRESULT
hr
=
E_INVALIDARG
;
VARTYPE
vt
=
VT_EMPTY
;
/* const short VARTYPE_OFFSET = -4; */
if
(
psa
->
fFeatures
&
FADF_HAVEVARTYPE
)
{
/* VT tag @ negative offset 4 in the array descriptor */
FIXME
(
"Returning VT_BSTR instead of VT_..."
);
vt
=
VT_BSTR
;
}
else
if
(
psa
->
fFeatures
&
FADF_RECORD
)
{
vt
=
VT_RECORD
;
}
else
if
(
psa
->
fFeatures
&
FADF_DISPATCH
)
{
vt
=
VT_DISPATCH
;
}
else
if
(
psa
->
fFeatures
&
FADF_UNKNOWN
)
{
vt
=
VT_UNKNOWN
;
}
if
(
vt
!=
VT_EMPTY
)
{
*
pvt
=
vt
;
hr
=
S_OK
;
}
TRACE
(
"HRESULT = %08lx"
,
hr
);
return
hr
;
}
This diff is collapsed.
Click to expand it.
include/wine/obj_oleaut.h
+
1
−
0
View file @
e81b63fc
...
...
@@ -467,6 +467,7 @@ enum VARENUM {
VT_USERDEFINED
=
29
,
VT_LPSTR
=
30
,
VT_LPWSTR
=
31
,
VT_RECORD
=
36
,
VT_FILETIME
=
64
,
VT_BLOB
=
65
,
VT_STREAM
=
66
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment