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
393f4bc5
Commit
393f4bc5
authored
Jul 11, 2014
by
Shuai Meng
Committed by
Alexandre Julliard
Jul 11, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Implemented VarType.
parent
a5665693
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
2 deletions
+31
-2
global.c
dlls/vbscript/global.c
+10
-2
api.vbs
dlls/vbscript/tests/api.vbs
+21
-0
No files found.
dlls/vbscript/global.c
View file @
393f4bc5
...
@@ -602,8 +602,16 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA
...
@@ -602,8 +602,16 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA
static
HRESULT
Global_VarType
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_VarType
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXME
(
"
\n
"
);
TRACE
(
"(%s)
\n
"
,
debugstr_variant
(
arg
));
return
E_NOTIMPL
;
assert
(
args_cnt
==
1
);
if
(
V_VT
(
arg
)
&
~
VT_TYPEMASK
)
{
FIXME
(
"not supported %s
\n
"
,
debugstr_variant
(
arg
));
return
E_NOTIMPL
;
}
return
return_short
(
res
,
V_VT
(
arg
));
}
}
static
HRESULT
Global_IsDate
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_IsDate
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
...
...
dlls/vbscript/tests/api.vbs
View file @
393f4bc5
...
@@ -857,4 +857,25 @@ Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True))
...
@@ -857,4 +857,25 @@ Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True))
Call
ok
(
TypeName
(
MyEmpty
)
=
"Empty"
,
"TypeName(MyEmpty) = "
&
TypeName
(
Empty
))
Call
ok
(
TypeName
(
MyEmpty
)
=
"Empty"
,
"TypeName(MyEmpty) = "
&
TypeName
(
Empty
))
Call
ok
(
TypeName
(
Null
)
=
"Null"
,
"TypeName(Null) = "
&
TypeName
(
Null
))
Call
ok
(
TypeName
(
Null
)
=
"Null"
,
"TypeName(Null) = "
&
TypeName
(
Null
))
Call
ok
(
VarType
(
Empty
)
=
vbEmpty
,
"VarType(Empty) = "
&
VarType
(
Empty
))
Call
ok
(
getVT
(
VarType
(
Empty
))
=
"VT_I2"
,
"getVT(VarType(Empty)) = "
&
getVT
(
VarType
(
Empty
)))
Call
ok
(
VarType
(
Null
)
=
vbNull
,
"VarType(Null) = "
&
VarType
(
Null
))
Call
ok
(
getVT
(
VarType
(
Null
))
=
"VT_I2"
,
"getVT(VarType(Null)) = "
&
getVT
(
VarType
(
Null
)))
Call
ok
(
VarType
(
255
)
=
vbInteger
,
"VarType(255) = "
&
VarType
(
255
))
Call
ok
(
getVT
(
VarType
(
255
))
=
"VT_I2"
,
"getVT(VarType(255)) = "
&
getVT
(
VarType
(
255
)))
Call
ok
(
VarType
(
32768
)
=
vbLong
,
"VarType(32768) = "
&
VarType
(
32768
))
Call
ok
(
getVT
(
VarType
(
32768
))
=
"VT_I2"
,
"getVT(VarType(32768)) = "
&
getVT
(
VarType
(
32768
)))
Call
ok
(
VarType
(
CSng
(
0.5
))
=
vbSingle
,
"VarType(CSng(0.5)) = "
&
VarType
(
CSng
(
0.5
)))
Call
ok
(
getVT
(
VarType
(
CSng
(
0.5
)))
=
"VT_I2"
,
"getVT(VarType(CSng(0.5))) = "
&
getVT
(
VarType
(
CSng
(
0.5
))))
Call
ok
(
VarType
(
-
0.5
)
=
vbDouble
,
"VarType(-0.5) = "
&
VarType
(
-
0.5
))
Call
ok
(
getVT
(
VarType
(
-
0.5
))
=
"VT_I2"
,
"getVT(VarType(-0.5)) = "
&
getVT
(
VarType
(
-
0.5
)))
Call
ok
(
VarType
(
CCur
(
0.5
))
=
vbCurrency
,
"VarType(CCur(0.5)) = "
&
VarType
(
CCur
(
0.5
)))
Call
ok
(
getVT
(
VarType
(
CCur
(
0.5
)))
=
"VT_I2"
,
"getVT(VarType(CCur(0.5))) = "
&
getVT
(
VarType
(
CCur
(
0.5
))))
Call
ok
(
VarType
(
CStr
(
0.5
))
=
vbString
,
"VarType(CStr(0.5)) = "
&
VarType
(
CStr
(
0.5
)))
Call
ok
(
getVT
(
VarType
(
CStr
(
0.5
)))
=
"VT_I2"
,
"getVT(VarType(CStr(0.5))) = "
&
getVT
(
VarType
(
CStr
(
0.5
))))
Call
ok
(
VarType
(
CBool
(
0.5
))
=
vbBoolean
,
"VarType(CBool(0.5)) = "
&
VarType
(
CBool
(
0.5
)))
Call
ok
(
getVT
(
VarType
(
CBool
(
0.5
)))
=
"VT_I2"
,
"getVT(VarType(CBool(0.5))) = "
&
getVT
(
VarType
(
CBool
(
0.5
))))
Call
ok
(
VarType
(
CByte
(
255
))
=
vbByte
,
"VarType(CByte(255)) = "
&
VarType
(
CByte
(
255
)))
Call
ok
(
getVT
(
VarType
(
CByte
(
255
)))
=
"VT_I2"
,
"getVT(VarType(CByte(255))) = "
&
getVT
(
VarType
(
CByte
(
255
))))
Call
reportSuccess
()
Call
reportSuccess
()
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