Commit 84863dff authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

msxml3: Use constant to store supported safety options.

parent ec2114e6
...@@ -55,6 +55,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); ...@@ -55,6 +55,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR colspaceW[] = {':',' ',0};
static const WCHAR crlfW[] = {'\r','\n',0}; static const WCHAR crlfW[] = {'\r','\n',0};
static const DWORD safety_supported_options =
INTERFACESAFE_FOR_UNTRUSTED_CALLER |
INTERFACESAFE_FOR_UNTRUSTED_DATA |
INTERFACE_USES_SECURITY_MANAGER;
typedef struct BindStatusCallback BindStatusCallback; typedef struct BindStatusCallback BindStatusCallback;
...@@ -1495,8 +1499,6 @@ static ULONG WINAPI httprequest_Safety_Release(IObjectSafety *iface) ...@@ -1495,8 +1499,6 @@ static ULONG WINAPI httprequest_Safety_Release(IObjectSafety *iface)
return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This);
} }
#define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER)
static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,
DWORD *supported, DWORD *enabled) DWORD *supported, DWORD *enabled)
{ {
...@@ -1506,7 +1508,7 @@ static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety ...@@ -1506,7 +1508,7 @@ static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety
if(!supported || !enabled) return E_POINTER; if(!supported || !enabled) return E_POINTER;
*supported = SAFETY_SUPPORTED_OPTIONS; *supported = safety_supported_options;
*enabled = This->safeopt; *enabled = This->safeopt;
return S_OK; return S_OK;
...@@ -1518,7 +1520,7 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety ...@@ -1518,7 +1520,7 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety
httprequest *This = impl_from_IObjectSafety(iface); httprequest *This = impl_from_IObjectSafety(iface);
TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled); TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled);
if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) if ((mask & ~safety_supported_options))
return E_FAIL; return E_FAIL;
This->safeopt = (This->safeopt & ~mask) | (mask & enabled); This->safeopt = (This->safeopt & ~mask) | (mask & enabled);
...@@ -1526,8 +1528,6 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety ...@@ -1526,8 +1528,6 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety
return S_OK; return S_OK;
} }
#undef SAFETY_SUPPORTED_OPTIONS
static const IObjectSafetyVtbl ObjectSafetyVtbl = { static const IObjectSafetyVtbl ObjectSafetyVtbl = {
httprequest_Safety_QueryInterface, httprequest_Safety_QueryInterface,
httprequest_Safety_AddRef, httprequest_Safety_AddRef,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment