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
0c0e6f53
Commit
0c0e6f53
authored
Oct 03, 2012
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 03, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Support vb* constants for message box return value.
parent
6666284f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
14 deletions
+29
-14
global.c
dlls/vbscript/global.c
+14
-14
api.vbs
dlls/vbscript/tests/api.vbs
+15
-0
No files found.
dlls/vbscript/global.c
View file @
0c0e6f53
...
@@ -1690,44 +1690,44 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_
...
@@ -1690,44 +1690,44 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_
static
HRESULT
Global_vbOK
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbOK
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXM
E
(
"
\n
"
);
TRAC
E
(
"
\n
"
);
return
E_NOTIMPL
;
return
return_short
(
res
,
IDOK
)
;
}
}
static
HRESULT
Global_vbCancel
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbCancel
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXM
E
(
"
\n
"
);
TRAC
E
(
"
\n
"
);
return
E_NOTIMPL
;
return
return_short
(
res
,
IDCANCEL
)
;
}
}
static
HRESULT
Global_vbAbort
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbAbort
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXM
E
(
"
\n
"
);
TRAC
E
(
"
\n
"
);
return
E_NOTIMPL
;
return
return_short
(
res
,
IDABORT
)
;
}
}
static
HRESULT
Global_vbRetry
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbRetry
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXM
E
(
"
\n
"
);
TRAC
E
(
"
\n
"
);
return
E_NOTIMPL
;
return
return_short
(
res
,
IDRETRY
)
;
}
}
static
HRESULT
Global_vbIgnore
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbIgnore
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXM
E
(
"
\n
"
);
TRAC
E
(
"
\n
"
);
return
E_NOTIMPL
;
return
return_short
(
res
,
IDIGNORE
)
;
}
}
static
HRESULT
Global_vbYes
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbYes
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXM
E
(
"
\n
"
);
TRAC
E
(
"
\n
"
);
return
E_NOTIMPL
;
return
return_short
(
res
,
IDYES
)
;
}
}
static
HRESULT
Global_vbNo
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbNo
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
{
FIXM
E
(
"
\n
"
);
TRAC
E
(
"
\n
"
);
return
E_NOTIMPL
;
return
return_short
(
res
,
IDNO
)
;
}
}
static
HRESULT
Global_vbEmpty
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
static
HRESULT
Global_vbEmpty
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
...
...
dlls/vbscript/tests/api.vbs
View file @
0c0e6f53
...
@@ -312,4 +312,19 @@ Call ok(getVT(vbYesNo) = "VT_I2", "getVT(vbYesNo) = " & getVT(vbYesNo))
...
@@ -312,4 +312,19 @@ Call ok(getVT(vbYesNo) = "VT_I2", "getVT(vbYesNo) = " & getVT(vbYesNo))
Call
ok
(
vbRetryCancel
=
5
,
"vbRetryCancel = "
&
vbRetryCancel
)
Call
ok
(
vbRetryCancel
=
5
,
"vbRetryCancel = "
&
vbRetryCancel
)
Call
ok
(
getVT
(
vbRetryCancel
)
=
"VT_I2"
,
"getVT(vbRetryCancel) = "
&
getVT
(
vbRetryCancel
))
Call
ok
(
getVT
(
vbRetryCancel
)
=
"VT_I2"
,
"getVT(vbRetryCancel) = "
&
getVT
(
vbRetryCancel
))
Call
ok
(
vbOK
=
1
,
"vbOK = "
&
vbOK
)
Call
ok
(
getVT
(
vbOK
)
=
"VT_I2"
,
"getVT(vbOK) = "
&
getVT
(
vbOK
))
Call
ok
(
vbCancel
=
2
,
"vbCancel = "
&
vbCancel
)
Call
ok
(
getVT
(
vbCancel
)
=
"VT_I2"
,
"getVT(vbCancel) = "
&
getVT
(
vbCancel
))
Call
ok
(
vbAbort
=
3
,
"vbAbort = "
&
vbAbort
)
Call
ok
(
getVT
(
vbAbort
)
=
"VT_I2"
,
"getVT(vbAbort) = "
&
getVT
(
vbAbort
))
Call
ok
(
vbRetry
=
4
,
"vbRetry = "
&
vbRetry
)
Call
ok
(
getVT
(
vbRetry
)
=
"VT_I2"
,
"getVT(vbRetry) = "
&
getVT
(
vbRetry
))
Call
ok
(
vbIgnore
=
5
,
"vbIgnore = "
&
vbIgnore
)
Call
ok
(
getVT
(
vbIgnore
)
=
"VT_I2"
,
"getVT(vbIgnore) = "
&
getVT
(
vbIgnore
))
Call
ok
(
vbYes
=
6
,
"vbYes = "
&
vbYes
)
Call
ok
(
getVT
(
vbYes
)
=
"VT_I2"
,
"getVT(vbYes) = "
&
getVT
(
vbYes
))
Call
ok
(
vbNo
=
7
,
"vbNo = "
&
vbNo
)
Call
ok
(
getVT
(
vbNo
)
=
"VT_I2"
,
"getVT(vbNo) = "
&
getVT
(
vbNo
))
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