mshtml: Turn several constants and variables into static constants.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
58da918e4d
commit
31deafe153
|
@ -350,7 +350,7 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p)
|
||||||
|
|
||||||
if(url.nPort) {
|
if(url.nPort) {
|
||||||
/* <hostname>:<port> */
|
/* <hostname>:<port> */
|
||||||
const WCHAR format[] = {'%','u',0};
|
static const WCHAR format[] = {'%','u',0};
|
||||||
DWORD len, port_len;
|
DWORD len, port_len;
|
||||||
WCHAR portW[6];
|
WCHAR portW[6];
|
||||||
WCHAR *buf;
|
WCHAR *buf;
|
||||||
|
|
|
@ -1160,8 +1160,8 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex
|
||||||
|
|
||||||
static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value)
|
static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value)
|
||||||
{
|
{
|
||||||
|
static const WCHAR szFormat[] = {'%','.','0','f','p','x',0};
|
||||||
WCHAR szValue[25];
|
WCHAR szValue[25];
|
||||||
WCHAR szFormat[] = {'%','.','0','f','p','x',0};
|
|
||||||
|
|
||||||
value = floor(value);
|
value = floor(value);
|
||||||
|
|
||||||
|
|
|
@ -2067,7 +2067,7 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri)
|
||||||
nsresult nsres;
|
nsresult nsres;
|
||||||
HRESULT hres;
|
HRESULT hres;
|
||||||
|
|
||||||
const WCHAR selector_formatW[] = {'a','[','i','d','=','"','%','s','"',']',0};
|
static const WCHAR selector_formatW[] = {'a','[','i','d','=','"','%','s','"',']',0};
|
||||||
|
|
||||||
set_current_uri(window, uri);
|
set_current_uri(window, uri);
|
||||||
|
|
||||||
|
|
|
@ -1171,11 +1171,11 @@ static GUID get_default_script_guid(HTMLInnerWindow *window)
|
||||||
|
|
||||||
static BOOL get_guid_from_type(LPCWSTR type, GUID *guid)
|
static BOOL get_guid_from_type(LPCWSTR type, GUID *guid)
|
||||||
{
|
{
|
||||||
const WCHAR text_javascriptW[] =
|
static const WCHAR text_javascriptW[] =
|
||||||
{'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0};
|
{'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0};
|
||||||
const WCHAR text_jscriptW[] =
|
static const WCHAR text_jscriptW[] =
|
||||||
{'t','e','x','t','/','j','s','c','r','i','p','t',0};
|
{'t','e','x','t','/','j','s','c','r','i','p','t',0};
|
||||||
const WCHAR text_vbscriptW[] =
|
static const WCHAR text_vbscriptW[] =
|
||||||
{'t','e','x','t','/','v','b','s','c','r','i','p','t',0};
|
{'t','e','x','t','/','v','b','s','c','r','i','p','t',0};
|
||||||
|
|
||||||
/* FIXME: Handle more types */
|
/* FIXME: Handle more types */
|
||||||
|
|
|
@ -938,7 +938,7 @@ static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p)
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!*p) {
|
if(!*p) {
|
||||||
const WCHAR emptyW[] = {0};
|
static const WCHAR emptyW[] = {0};
|
||||||
*p = SysAllocString(emptyW);
|
*p = SysAllocString(emptyW);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -100,8 +100,8 @@ void update_title(HTMLDocumentObj *This)
|
||||||
|
|
||||||
hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd);
|
hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd);
|
||||||
if(SUCCEEDED(hres)) {
|
if(SUCCEEDED(hres)) {
|
||||||
|
static const WCHAR empty[] = {0};
|
||||||
VARIANT title;
|
VARIANT title;
|
||||||
WCHAR empty[] = {0};
|
|
||||||
|
|
||||||
V_VT(&title) = VT_BSTR;
|
V_VT(&title) = VT_BSTR;
|
||||||
V_BSTR(&title) = SysAllocString(empty);
|
V_BSTR(&title) = SysAllocString(empty);
|
||||||
|
|
Loading…
Reference in New Issue