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
0bff85cd
Commit
0bff85cd
authored
Nov 02, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Introduce variant_bool helper.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
59963983
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
htmlinput.c
dlls/mshtml/htmlinput.c
+6
-5
mshtml_private.h
dlls/mshtml/mshtml_private.h
+5
-0
No files found.
dlls/mshtml/htmlinput.c
View file @
0bff85cd
...
...
@@ -275,7 +275,7 @@ static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VA
nsIDOMHTMLInputElement_GetDisabled
(
This
->
nsinput
,
&
disabled
);
*
p
=
disabled
?
VARIANT_TRUE
:
VARIANT_FALSE
;
*
p
=
variant_bool
(
disabled
)
;
return
S_OK
;
}
...
...
@@ -474,7 +474,8 @@ static HRESULT WINAPI HTMLInputElement_get_readOnly(IHTMLInputElement *iface, VA
ERR
(
"Get ReadOnly Failed: %08x
\n
"
,
nsres
);
return
E_FAIL
;
}
*
p
=
b
?
VARIANT_TRUE
:
VARIANT_FALSE
;
*
p
=
variant_bool
(
b
);
return
S_OK
;
}
...
...
@@ -529,7 +530,7 @@ static HRESULT WINAPI HTMLInputElement_get_defaultChecked(IHTMLInputElement *ifa
return
E_FAIL
;
}
*
p
=
default_checked
?
VARIANT_TRUE
:
VARIANT_FALSE
;
*
p
=
variant_bool
(
default_checked
)
;
return
S_OK
;
}
...
...
@@ -563,7 +564,7 @@ static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VAR
return
E_FAIL
;
}
*
p
=
checked
?
VARIANT_TRUE
:
VARIANT_FALSE
;
*
p
=
variant_bool
(
checked
)
;
TRACE
(
"checked=%x
\n
"
,
*
p
);
return
S_OK
;
}
...
...
@@ -1891,7 +1892,7 @@ static HRESULT WINAPI HTMLButtonElement_get_disabled(IHTMLButtonElement *iface,
return
E_FAIL
;
}
*
p
=
disabled
?
VARIANT_TRUE
:
VARIANT_FALSE
;
*
p
=
variant_bool
(
disabled
)
;
return
S_OK
;
}
...
...
dlls/mshtml/mshtml_private.h
View file @
0bff85cd
...
...
@@ -1333,6 +1333,11 @@ static inline void windowref_release(windowref_t *ref)
heap_free
(
ref
);
}
static
inline
VARIANT_BOOL
variant_bool
(
BOOL
b
)
{
return
b
?
VARIANT_TRUE
:
VARIANT_FALSE
;
}
UINT
cp_from_charset_string
(
BSTR
)
DECLSPEC_HIDDEN
;
BSTR
charset_string_from_cp
(
UINT
)
DECLSPEC_HIDDEN
;
HDC
get_display_dc
(
void
)
DECLSPEC_HIDDEN
;
...
...
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