May 2012 - Wine-commits - list.winehq.org

Michael Stefaniuc : ddraw/tests: Remove some stray ok() calls.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 7fcbf0736e5800fbd117cd994f600f342adcdd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcbf0736e5800fbd117cd994… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:03:57 2012 +0200 ddraw/tests: Remove some stray ok() calls. --- dlls/ddraw/tests/d3d.c | 2 -- dlls/ddraw/tests/visual.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d4a344d..bdac379 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2849,9 +2849,7 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x103d, "Expected 0x103d, got %x\n", result[0]); - ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[1] == 0x3f, "Expected 0x3f, got %x\n", result[1]); - ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[2] == 0x3f, "Expected 0x3f, got %x\n", result[2]); view._11=1.0; view._12=0.0; view._13=0.0; view._14=0.0; diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 73d2b1a..1571b3a 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -560,8 +560,6 @@ static void fog_test(IDirect3DDevice7 *device) untransformed_2, 4, Indices, 6, 0); ok(hr == D3D_OK, "DrawIndexedPrimitive returned %08x\n", hr); - /* transformed verts */ - ok( hr == D3D_OK, "SetFVF returned %08x\n", hr); /* Transformed, vertex fog != NONE, pixel fog == NONE: Use specular color alpha component */ hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, transformed_1, 4, Indices, 6, 0);

1 0

Michael Stefaniuc : winhttp/tests: Remove wrong check for 'len'.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 6542c708ed51f90cf94366faa967eb88fc8c3408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6542c708ed51f90cf94366faa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:06:37 2012 +0200 winhttp/tests: Remove wrong check for 'len'. --- dlls/winhttp/tests/url.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index d447879..f0bd434 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -142,7 +142,6 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, NULL, NULL ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0u, "expected len ~0u got %u\n", len ); /* valid components, NULL url */ SetLastError( 0xdeadbeef );

1 0

Nikolay Sivov : urlmon: Implement TYMED_HGLOBAL case for CopyStgMedium.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 6c4bdf3bdf95718db25ccf67d16ee0e7bdf1a55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4bdf3bdf95718db25ccf67d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 02:06:06 2012 +0400 urlmon: Implement TYMED_HGLOBAL case for CopyStgMedium. --- dlls/urlmon/tests/misc.c | 33 ++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon_main.c | 15 +++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6af98f3..fb20509 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1219,8 +1219,10 @@ static void test_ReleaseBindInfo(void) static void test_CopyStgMedium(void) { STGMEDIUM src, dst; - HGLOBAL empty; + HGLOBAL empty, hg; + char *ptr1, *ptr2; HRESULT hres; + int size; static WCHAR fileW[] = {'f','i','l','e',0}; @@ -1257,6 +1259,35 @@ static void test_CopyStgMedium(void) ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); ReleaseStgMedium(&dst); + /* TYMED_HGLOBAL */ + hg = GlobalAlloc(GMEM_MOVEABLE, 10); + ptr1 = GlobalLock(hg); + memset(ptr1, 0xfa, 10); + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_HGLOBAL; + src.u.hGlobal = hg; + hres = pCopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.tymed == TYMED_HGLOBAL, "tymed=%d\n", dst.tymed); + ok(dst.u.hGlobal != hg, "got %p, %p\n", dst.u.hGlobal, hg); + size = GlobalSize(dst.u.hGlobal); + ok(size == 10, "got size %d\n", size); + /* compare contents */ + ptr2 = GlobalLock(dst.u.hGlobal); + ok(!memcmp(ptr1, ptr2, 10), "got wrong data\n"); + GlobalUnlock(ptr2); + GlobalUnlock(ptr1); + ok(GlobalFlags(dst.u.hGlobal) == 0, "got 0x%08x\n", GlobalFlags(dst.u.hGlobal)); + GlobalFree(hg); + ReleaseStgMedium(&dst); + + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_HGLOBAL; + src.u.hGlobal = NULL; + hres = pCopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.u.hGlobal == NULL, "got %p\n", dst.u.hGlobal); + hres = pCopyStgMedium(&src, NULL); ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres); hres = pCopyStgMedium(NULL, &dst); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0cb72dd..f2abe13 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -544,6 +544,21 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) if(dst->u.pstg) IStorage_AddRef(dst->u.pstg); break; + case TYMED_HGLOBAL: + if(dst->u.hGlobal) { + SIZE_T size = GlobalSize(src->u.hGlobal); + char *src_ptr, *dst_ptr; + + dst->u.hGlobal = GlobalAlloc(GMEM_FIXED, size); + if(!dst->u.hGlobal) + return E_OUTOFMEMORY; + dst_ptr = GlobalLock(dst->u.hGlobal); + src_ptr = GlobalLock(src->u.hGlobal); + memcpy(dst_ptr, src_ptr, size); + GlobalUnlock(src_ptr); + GlobalUnlock(dst_ptr); + } + break; default: FIXME("Unimplemented tymed %d\n", src->tymed); }

1 0

Nikolay Sivov : msxml3: Support dumping VT_VARIANT|VT_BYREF variants.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 08d3b4b9fc0c17be3d03d3c428a92a8f708e5414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d3b4b9fc0c17be3d03d3c42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:52:14 2012 +0400 msxml3: Support dumping VT_VARIANT|VT_BYREF variants. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 93b5b10..bfb301e 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -287,6 +287,8 @@ const char *debugstr_variant(const VARIANT *v) V_BSTRREF(v), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); case VT_ERROR: return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); + case VT_VARIANT|VT_BYREF: + return wine_dbg_sprintf("{VT_VARIANT|VT_BYREF: %s}", debugstr_variant(V_VARIANTREF(v))); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Nikolay Sivov : msxml3/tests: Fix test crashes running old versions.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: cce2b95a8f7dc1f8f74437a8822cfd1149a4dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce2b95a8f7dc1f8f74437a88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 14:38:30 2012 +0400 msxml3/tests: Fix test crashes running old versions. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 49a6cb0..b4d6f7f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3760,7 +3760,7 @@ static void test_mxwriter_encoding(void) "%s: encoding not accepted\n", enc); if (hr != S_OK) { - enc = encoding_names[i++]; + enc = encoding_names[++i]; IStream_Release(stream); continue; }

1 0

Nikolay Sivov : msxml3/tests: A test to show that writer flushes buffer to stream automatically.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 9a4d8c30d1b00d51bd74a366580cd485586828fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4d8c30d1b00d51bd74a3665… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 14:43:56 2012 +0400 msxml3/tests: A test to show that writer flushes buffer to stream automatically. --- dlls/msxml3/tests/saxreader.c | 82 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b4d6f7f..003446f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2813,6 +2813,7 @@ static void test_mxwriter_properties(void) static void test_mxwriter_flush(void) { + static const WCHAR emptyW[] = {0}; ISAXContentHandler *content; IMXWriter *writer; LARGE_INTEGER pos; @@ -2820,6 +2821,7 @@ static void test_mxwriter_flush(void) IStream *stream; VARIANT dest; HRESULT hr; + char *buff; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2886,9 +2888,89 @@ static void test_mxwriter_flush(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(pos2.QuadPart != 0, "expected stream position moved\n"); + IStream_Release(stream); + + /* auto-flush feature */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + EXPECT_HR(hr, S_OK); + EXPECT_REF(stream, 1); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_byteOrderMark(writer, VARIANT_FALSE); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + + /* internal buffer is flushed automatically on certain threshold */ + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + buff = HeapAlloc(GetProcessHeap(), 0, 2048); + memset(buff, 'A', 2048); + hr = ISAXContentHandler_characters(content, _bstr_(buff), 2048); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); +todo_wine + ok(pos2.QuadPart != 0, "unexpected stream beginning\n"); + + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); + + IStream_Release(stream); + + /* test char count lower than threshold */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + EXPECT_HR(hr, S_OK); + EXPECT_REF(stream, 1); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + memset(buff, 'A', 2048); + hr = ISAXContentHandler_characters(content, _bstr_(buff), 2040); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); + + HeapFree(GetProcessHeap(), 0, buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer); + free_bstrs(); } static void test_mxwriter_startenddocument(void)

1 0

Nikolay Sivov : msxml3: Move methods implementation to separate functions, so it can be reused.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 82fe81c404f857ad8dde70bdeee0f3dc92019ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fe81c404f857ad8dde70bde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:23:39 2012 +0400 msxml3: Move methods implementation to separate functions, so it can be reused. --- dlls/msxml3/httprequest.c | 597 +++++++++++++++++++++++++-------------------- 1 files changed, 327 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82fe81c404f857ad8dde7…

1 0

Nikolay Sivov : msxml3: Stub support for IServerXMLHTTPRequest.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 1a94d8f3c1f09c925f7c3db82da90df68f9c2faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a94d8f3c1f09c925f7c3db82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:24:50 2012 +0400 msxml3: Stub support for IServerXMLHTTPRequest. --- dlls/msxml3/factory.c | 8 ++ dlls/msxml3/httprequest.c | 290 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + 3 files changed, 299 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a94d8f3c1f09c925f7c3…

1 0

Nikolay Sivov : msxml3: Added IDispatch support for IServerXMLHTTPRequest.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: ec2114e66e7ec033bd8dacb06ce6e5f509b435f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2114e66e7ec033bd8dacb06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:35:16 2012 +0400 msxml3: Added IDispatch support for IServerXMLHTTPRequest. --- dlls/msxml3/dispex.c | 3 ++- dlls/msxml3/httprequest.c | 39 +++++++++++++++++++++++++++++++-------- dlls/msxml3/msxml_private.h | 1 + 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 23b8805..3aafc44 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -150,7 +150,8 @@ static tid_id_t tid_ids[] = { { &IID_IMXAttributes, LibXml2 }, { &IID_IMXReaderControl, LibXml2 }, { &IID_IMXWriter, LibXml2 }, - { &IID_IVBMXNamespaceManager, LibXml2 } + { &IID_IVBMXNamespaceManager, LibXml2 }, + { &IID_IServerXMLHTTPRequest, LibXml2 } }; const IID *get_riid_from_tid(tid_t tid) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 385908a..16e2446 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1590,9 +1590,10 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfoCount(IServerXMLHTTPReques { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - FIXME("(%p)->(%p): stub\n", This, pctinfo); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *iface, UINT iTInfo, @@ -1600,20 +1601,32 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *if { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - FIXME("(%p)->(%u %u %p): stub\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return get_typeinfo(IServerXMLHTTPRequest_tid, ppTInfo); } static HRESULT WINAPI ServerXMLHTTPRequest_GetIDsOfNames(IServerXMLHTTPRequest *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p)->(%s %p %u %u %p): stub\n", This, debugstr_guid(riid), rgszNames, cNames, + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI ServerXMLHTTPRequest_Invoke(IServerXMLHTTPRequest *iface, DISPID dispIdMember, REFIID riid, @@ -1621,11 +1634,21 @@ static HRESULT WINAPI ServerXMLHTTPRequest_Invoke(IServerXMLHTTPRequest *iface, EXCEPINFO *pExcepInfo, UINT *puArgErr) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %s %d %d %p %p %p %p): stub\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IServerXMLHTTPRequest_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI ServerXMLHTTPRequest_open(IServerXMLHTTPRequest *iface, BSTR method, BSTR url, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1c58730..3a2efb0 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -80,6 +80,7 @@ typedef enum tid_t { IMXReaderControl_tid, IMXWriter_tid, IVBMXNamespaceManager_tid, + IServerXMLHTTPRequest_tid, LAST_tid } tid_t;

1 0

Nikolay Sivov : msxml3: Use constant to store supported safety options.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 84863dfff739276880152a9fc5074aa543e537d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84863dfff739276880152a9fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:43:54 2012 +0400 msxml3: Use constant to store supported safety options. --- dlls/msxml3/httprequest.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 16e2446..0abe2ff 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -55,6 +55,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const WCHAR colspaceW[] = {':',' ',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; @@ -1495,8 +1499,6 @@ static ULONG WINAPI httprequest_Safety_Release(IObjectSafety *iface) 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, DWORD *supported, DWORD *enabled) { @@ -1506,7 +1508,7 @@ static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety if(!supported || !enabled) return E_POINTER; - *supported = SAFETY_SUPPORTED_OPTIONS; + *supported = safety_supported_options; *enabled = This->safeopt; return S_OK; @@ -1518,7 +1520,7 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety httprequest *This = impl_from_IObjectSafety(iface); 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; This->safeopt = (This->safeopt & ~mask) | (mask & enabled); @@ -1526,8 +1528,6 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety return S_OK; } -#undef SAFETY_SUPPORTED_OPTIONS - static const IObjectSafetyVtbl ObjectSafetyVtbl = { httprequest_Safety_QueryInterface, httprequest_Safety_AddRef,

1 0