Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
6666284f
Commit
6666284f
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 buttons.
parent
8e6d2bab
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
13 deletions
+26
-13
global.c
dlls/vbscript/global.c
+12
-12
api.vbs
dlls/vbscript/tests/api.vbs
+13
-0
vbsglobal.idl
dlls/vbscript/vbsglobal.idl
+1
-1
No files found.
dlls/vbscript/global.c
View file @
6666284f
...
...
@@ -1594,38 +1594,38 @@ static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned arg
static
HRESULT
Global_vbOKOnly
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
FIXM
E
(
"
\n
"
);
return
E_NOTIMPL
;
TRAC
E
(
"
\n
"
);
return
return_short
(
res
,
MB_OK
)
;
}
static
HRESULT
Global_vbOKCancel
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
FIXM
E
(
"
\n
"
);
return
E_NOTIMPL
;
TRAC
E
(
"
\n
"
);
return
return_short
(
res
,
MB_OKCANCEL
)
;
}
static
HRESULT
Global_vbAbortRetryIgnore
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
FIXM
E
(
"
\n
"
);
return
E_NOTIMPL
;
TRAC
E
(
"
\n
"
);
return
return_short
(
res
,
MB_ABORTRETRYIGNORE
)
;
}
static
HRESULT
Global_vbYesNoCancel
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
FIXM
E
(
"
\n
"
);
return
E_NOTIMPL
;
TRAC
E
(
"
\n
"
);
return
return_short
(
res
,
MB_YESNOCANCEL
)
;
}
static
HRESULT
Global_vbYesNo
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
FIXM
E
(
"
\n
"
);
return
E_NOTIMPL
;
TRAC
E
(
"
\n
"
);
return
return_short
(
res
,
MB_YESNO
)
;
}
static
HRESULT
Global_vbRetryCancel
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
FIXM
E
(
"
\n
"
);
return
E_NOTIMPL
;
TRAC
E
(
"
\n
"
);
return
return_short
(
res
,
MB_RETRYCANCEL
)
;
}
static
HRESULT
Global_vbCritical
(
vbdisp_t
*
This
,
VARIANT
*
arg
,
unsigned
args_cnt
,
VARIANT
*
res
)
...
...
dlls/vbscript/tests/api.vbs
View file @
6666284f
...
...
@@ -299,4 +299,17 @@ end if
Call
ok
(
getVT
(
Now
())
=
"VT_DATE"
,
"getVT(Now()) = "
&
getVT
(
Now
()))
Call
ok
(
vbOKOnly
=
0
,
"vbOKOnly = "
&
vbOKOnly
)
Call
ok
(
getVT
(
vbOKOnly
)
=
"VT_I2"
,
"getVT(vbOKOnly) = "
&
getVT
(
vbOKOnly
))
Call
ok
(
vbOKCancel
=
1
,
"vbOKCancel = "
&
vbOKCancel
)
Call
ok
(
getVT
(
vbOKCancel
)
=
"VT_I2"
,
"getVT(vbOKCancel) = "
&
getVT
(
vbOKCancel
))
Call
ok
(
vbAbortRetryIgnore
=
2
,
"vbAbortRetryIgnore = "
&
vbAbortRetryIgnore
)
Call
ok
(
getVT
(
vbAbortRetryIgnore
)
=
"VT_I2"
,
"getVT(vbAbortRetryIgnore) = "
&
getVT
(
vbAbortRetryIgnore
))
Call
ok
(
vbYesNoCancel
=
3
,
"vbYesNoCancel = "
&
vbYesNoCancel
)
Call
ok
(
getVT
(
vbYesNoCancel
)
=
"VT_I2"
,
"getVT(vbYesNoCancel) = "
&
getVT
(
vbYesNoCancel
))
Call
ok
(
vbYesNo
=
4
,
"vbYesNo = "
&
vbYesNo
)
Call
ok
(
getVT
(
vbYesNo
)
=
"VT_I2"
,
"getVT(vbYesNo) = "
&
getVT
(
vbYesNo
))
Call
ok
(
vbRetryCancel
=
5
,
"vbRetryCancel = "
&
vbRetryCancel
)
Call
ok
(
getVT
(
vbRetryCancel
)
=
"VT_I2"
,
"getVT(vbRetryCancel) = "
&
getVT
(
vbRetryCancel
))
Call
reportSuccess
()
dlls/vbscript/vbsglobal.idl
View file @
6666284f
...
...
@@ -85,7 +85,7 @@ library VBScript_Global
[
id
(
DISPID_GLOBAL_VBYESNO
),
readonly
]
VARIANT
vbYesNo
;
[
id
(
DISPID_GLOBAL_VB
YESNO
CANCEL
),
readonly
]
[
id
(
DISPID_GLOBAL_VB
RETRY
CANCEL
),
readonly
]
VARIANT
vbRetryCancel
;
[
id
(
DISPID_GLOBAL_VBCRITICAL
),
readonly
]
...
...
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