September 2011 - Wine-Commits

Stefan Dösinger : ddraw: Simplify Z format parsing a bit, remove ERRs.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 2fc534edf2447603b7dcb1743ca56b141aae1fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc534edf2447603b7dcb1743… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 16:04:24 2011 +0200 ddraw: Simplify Z format parsing a bit, remove ERRs. --- dlls/ddraw/utils.c | 49 ++++++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 63c6a5e..d2a4194 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -519,31 +519,22 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { switch(DDPixelFormat->u1.dwZBufferBitDepth) { - case 8: - FIXME("8 Bits Z+Stencil buffer pixelformat is not supported. Returning WINED3DFMT_UNKNOWN\n"); - return WINED3DFMT_UNKNOWN; - - case 15: - FIXME("15 bit depth buffer not handled yet, assuming 16 bit\n"); case 16: - if(DDPixelFormat->u2.dwStencilBitDepth == 1) - return WINED3DFMT_S1_UINT_D15_UNORM; - - FIXME("Don't know how to handle a 16 bit Z buffer with %d bit stencil buffer pixelformat\n", DDPixelFormat->u2.dwStencilBitDepth); + if (DDPixelFormat->u2.dwStencilBitDepth == 1) return WINED3DFMT_S1_UINT_D15_UNORM; + WARN("Unknown depth stenil format: 16 z bits, %u stencil bits\n", + DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; - case 24: - FIXME("Don't know how to handle a 24 bit depth buffer with stencil bits\n"); - return WINED3DFMT_D24_UNORM_S8_UINT; - case 32: - if(DDPixelFormat->u2.dwStencilBitDepth == 8) - return WINED3DFMT_D24_UNORM_S8_UINT; - else - return WINED3DFMT_S4X4_UINT_D24_UNORM; + if (DDPixelFormat->u2.dwStencilBitDepth == 8) return WINED3DFMT_D24_UNORM_S8_UINT; + else if (DDPixelFormat->u2.dwStencilBitDepth == 4) return WINED3DFMT_S4X4_UINT_D24_UNORM; + WARN("Unknown depth stenil format: 32 z bits, %u stencil bits\n", + DDPixelFormat->u2.dwStencilBitDepth); + return WINED3DFMT_UNKNOWN; default: - ERR("Unknown Z buffer depth %d\n", DDPixelFormat->u1.dwZBufferBitDepth); + WARN("Unknown depth stenil format: %u z bits, %u stencil bits\n", + DDPixelFormat->u1.dwZBufferBitDepth, DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; } } @@ -551,10 +542,6 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { switch(DDPixelFormat->u1.dwZBufferBitDepth) { - case 8: - ERR("8 Bit Z buffers are not supported. Trying a 16 Bit one\n"); - return WINED3DFMT_D16_UNORM; - case 16: return WINED3DFMT_D16_UNORM; @@ -562,16 +549,16 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat return WINED3DFMT_X8D24_UNORM; case 32: - if(DDPixelFormat->u3.dwZBitMask == 0x00FFFFFF) { - return WINED3DFMT_X8D24_UNORM; - } else if(DDPixelFormat->u3.dwZBitMask == 0xFFFFFFFF) { - return WINED3DFMT_D32_UNORM; - } - FIXME("Unhandled 32 bit depth buffer bitmasks, returning WINED3DFMT_D24X8\n"); - return WINED3DFMT_X8D24_UNORM; /* That's most likely to make games happy */ + if (DDPixelFormat->u3.dwZBitMask == 0x00FFFFFF) return WINED3DFMT_X8D24_UNORM; + else if (DDPixelFormat->u3.dwZBitMask == 0xFFFFFF00) return WINED3DFMT_X8D24_UNORM; + else if (DDPixelFormat->u3.dwZBitMask == 0xFFFFFFFF) return WINED3DFMT_D32_UNORM; + WARN("Unknown depth-only format: 32 z bits, mask 0x%08x\n", + DDPixelFormat->u3.dwZBitMask); + return WINED3DFMT_UNKNOWN; default: - ERR("Unsupported Z buffer depth %d\n", DDPixelFormat->u1.dwZBufferBitDepth); + WARN("Unknown depth-only format: %u z bits, mask 0x%08x\n", + DDPixelFormat->u1.dwZBufferBitDepth, DDPixelFormat->u3.dwZBitMask); return WINED3DFMT_UNKNOWN; } }

1 0

Jacek Caban : vbscript: Added SetInterfaceSafetyOptions implementation.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: a34ece4cbe10321ed3c1f1b8c724cddaf18b7fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34ece4cbe10321ed3c1f1b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 13:16:00 2011 +0200 vbscript: Added SetInterfaceSafetyOptions implementation. --- dlls/vbscript/vbscript.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 3f963a3..70b35f2 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -53,6 +53,7 @@ struct VBScript { LONG ref; + DWORD safeopt; SCRIPTSTATE state; IActiveScriptSite *site; script_ctx_t *ctx; @@ -431,6 +432,8 @@ static ULONG WINAPI VBScriptSafety_Release(IObjectSafety *iface) return IActiveScript_Release(&This->IActiveScript_iface); } +#define SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER) + static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) { @@ -443,8 +446,14 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if DWORD dwOptionSetMask, DWORD dwEnabledOptions) { VBScript *This = impl_from_IObjectSafety(iface); - FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + if(dwOptionSetMask & ~SUPPORTED_OPTIONS) + return E_FAIL; + + This->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; + return S_OK; } static const IObjectSafetyVtbl VBScriptSafetyVtbl = { @@ -472,6 +481,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->ref = 1; ret->state = SCRIPTSTATE_UNINITIALIZED; + ret->safeopt = INTERFACE_USES_DISPEX; hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface);

1 0

Piotr Caban : jscript: Use hash table when accessing object properties by name.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: f1a237d682a116ebbbb995637c16d14b10f69257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a237d682a116ebbbb995637… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 12:24:25 2011 +0200 jscript: Use hash table when accessing object properties by name. --- dlls/jscript/dispex.c | 168 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 124 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1a237d682a116ebbbb99…

1 0

Piotr Caban : jscript: Added Object.hasOwnProperty implementation.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 71b58e56c24c06db589605cd53fc37aca5e2d747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b58e56c24c06db589605cd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 12:24:12 2011 +0200 jscript: Added Object.hasOwnProperty implementation. --- dlls/jscript/dispex.c | 14 ++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 11 +++++++++++ dlls/jscript/tests/run.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 653857c..3a0eabf 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1132,3 +1132,17 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) return delete_prop(prop); } + +VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name(obj, name, &prop); + if(FAILED(hres)) + return VARIANT_FALSE; + else if(!prop) + return VARIANT_FALSE; + + return prop->type==PROP_VARIANT ? VARIANT_TRUE : VARIANT_FALSE; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c0b60ae..ee03e90 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -217,6 +217,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*,IServiceProvi HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; +VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 9f2e4d5..c1137c1 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -111,8 +111,47 @@ static HRESULT Object_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR name; + BOOL result; + DISPID id; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = VARIANT_FALSE; + } + + return S_OK; + } + + hres = to_string(ctx, get_arg(dp, 0), ei, &name); + if(FAILED(hres)) + return hres; + + if(is_jsdisp(jsthis)) { + result = jsdisp_is_own_prop(jsthis->u.jsdisp, name); + if(retv) { + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = result; + } + + return S_OK; + } else if(is_dispex(jsthis)) { + hres = IDispatchEx_GetDispID(jsthis->u.dispex, name, + make_grfdex(ctx, fdexNameCaseSensitive), &id); + } else { + hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, + &name, 1, ctx->lcid, &id); + } + + if(retv) { + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = SUCCEEDED(hres) ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c5f0c4f..09c3360 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1864,11 +1864,22 @@ ok(err.message === 4, "err.message = " + err.message); ok(!("number" in Error), "number is in Error"); tmp = new Object(); +ok(tmp.hasOwnProperty("toString") === false, "toString property should be inherited"); tmp.toString = function() { return "test"; }; +ok(tmp.hasOwnProperty("toString") === true, "toString own property should exist"); +ok(tmp.hasOwnProperty("nonExisting") === false, "nonExisting property should not exist"); tmp = Error.prototype.toString.call(tmp); ok(tmp === "[object Error]", "Error.prototype.toString.call(tmp) = " + tmp); +tmp = function() { return 0; }; +tmp[0] = true; +ok(tmp.hasOwnProperty("toString") === false, "toString property should be inherited"); +ok(tmp.hasOwnProperty("0") === true, "hasOwnProperty(0) returned false"); +ok(tmp.hasOwnProperty() === false, "hasOwnProperty() returned true"); + +ok(Object.prototype.hasOwnProperty.call(testObj) === false, "hasOwnProperty without name returned true"); + if(invokeVersion >= 2) { obj = new Object(); obj.name = "test"; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 88c69ef..fbbff96 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -64,6 +64,8 @@ DEFINE_EXPECT(global_propput_i); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); +DEFINE_EXPECT(puredisp_prop_d); +DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(testobj_delete); DEFINE_EXPECT(testobj_value); DEFINE_EXPECT(testobj_prop_d); @@ -173,6 +175,18 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { + ok(IsEqualGUID(riid, &IID_NULL), "Expected IID_NULL\n"); + ok(cNames==1, "cNames = %d\n", cNames); + + if(!strcmp_wa(*rgszNames, "prop")) { + CHECK_EXPECT(puredisp_prop_d); + *rgDispId = DISPID_TESTOBJ_PROP; + return S_OK; + } else if(!strcmp_wa(*rgszNames, "noprop")) { + CHECK_EXPECT(puredisp_noprop_d); + return DISP_E_UNKNOWNNAME; + } + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -1476,6 +1490,22 @@ static void run_tests(void) parse_script_a("ok(('noprop' in testObj) === false, 'noprop is in testObj');"); CHECK_CALLED(testobj_noprop_d); + SET_EXPECT(testobj_prop_d); + parse_script_a("ok(Object.prototype.hasOwnProperty.call(testObj, 'prop') === true, 'hasOwnProperty(\\\"prop\\\") returned false');"); + CHECK_CALLED(testobj_prop_d); + + SET_EXPECT(testobj_noprop_d); + parse_script_a("ok(Object.prototype.hasOwnProperty.call(testObj, 'noprop') === false, 'hasOwnProperty(\\\"noprop\\\") returned true');"); + CHECK_CALLED(testobj_noprop_d); + + SET_EXPECT(puredisp_prop_d); + parse_script_a("ok(Object.prototype.hasOwnProperty.call(pureDisp, 'prop') === true, 'hasOwnProperty(\\\"noprop\\\") returned false');"); + CHECK_CALLED(puredisp_prop_d); + + SET_EXPECT(puredisp_noprop_d); + parse_script_a("ok(Object.prototype.hasOwnProperty.call(pureDisp, 'noprop') === false, 'hasOwnProperty(\\\"noprop\\\") returned true');"); + CHECK_CALLED(puredisp_noprop_d); + SET_EXPECT(testobj_value); parse_script_a("ok(String(testObj) === '1', 'wrong testObj value');"); CHECK_CALLED(testobj_value);

1 0

Jacek Caban : vbscript: Added IObjectSafety tests.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 286c9cee4a2e78c9f07d69238eacab4679e489e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=286c9cee4a2e78c9f07d69238… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 13:16:18 2011 +0200 vbscript: Added IObjectSafety tests. --- dlls/vbscript/tests/vbscript.c | 96 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 9d0dbdf..ff167b7 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -22,9 +22,12 @@ #include <initguid.h> #include <ole2.h> #include <activscp.h> +#include <objsafe.h> #include "wine/test.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -188,6 +191,97 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { static IActiveScriptSite ActiveScriptSite = { &ActiveScriptSiteVtbl }; +static void test_safety(IActiveScript *script) +{ + IObjectSafety *safety; + DWORD supported, enabled; + HRESULT hres; + + hres = IActiveScript_QueryInterface(script, &IID_IObjectSafety, (void**)&safety); + ok(hres == S_OK, "Could not get IObjectSafety: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_NULL, &supported, NULL); + ok(hres == E_POINTER, "GetInterfaceSafetyOptions failed: %08x, expected E_POINTER\n", hres); + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_NULL, NULL, &enabled); + ok(hres == E_POINTER, "GetInterfaceSafetyOptions failed: %08x, expected E_POINTER\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_NULL, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScript, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER + |INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); + ok(hres == E_FAIL, "SetInterfaceSafetyOptions failed: %08x, expected E_FAIL\n", hres); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "enabled=%x\n", enabled); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, INTERFACESAFE_FOR_UNTRUSTED_DATA, 0); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == (INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), "enabled=%x\n", enabled); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER, 0); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACE_USES_DISPEX, 0); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + IObjectSafety_Release(safety); +} + static IActiveScript *create_vbscript(void) { IActiveScript *ret; @@ -213,6 +307,7 @@ static void test_vbscript(void) ok(hres == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hres); test_state(vbscript, SCRIPTSTATE_UNINITIALIZED); + test_safety(vbscript); SET_EXPECT(GetLCID); hres = IActiveScript_SetScriptSite(vbscript, &ActiveScriptSite); @@ -244,7 +339,6 @@ static void test_vbscript(void) ok(!ref, "ref = %d\n", ref); } - static BOOL check_vbscript(void) { IActiveScript *vbscript;

1 0

Jacek Caban : vbscript: Added GetInterfaceSafetyOptions implementation.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: dd7ee024afd8b1879d437d63a2c6eeec1d9403f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7ee024afd8b1879d437d63a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 13:16:08 2011 +0200 vbscript: Added GetInterfaceSafetyOptions implementation. --- dlls/vbscript/vbscript.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 70b35f2..04a513f 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -438,8 +438,15 @@ static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *if DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) { VBScript *This = impl_from_IObjectSafety(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + + if(!pdwSupportedOptions || !pdwEnabledOptions) + return E_POINTER; + + *pdwSupportedOptions = SUPPORTED_OPTIONS; + *pdwEnabledOptions = This->safeopt; + return S_OK; } static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,

1 0

Stefan Dösinger : ddraw: Fix a test message.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 41079639679e7a77e2cf053d54603e99d3ece62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41079639679e7a77e2cf053d5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:17:40 2011 +0200 ddraw: Fix a test message. --- dlls/ddraw/tests/overlay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 93d6c9c..5053efb 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -212,7 +212,7 @@ static void yv12_test(void) ok(desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM) || desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_HWCODEC), "Unexpected desc.ddsCaps.dwCaps 0x%08x\n", desc.ddsCaps.dwCaps); - ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 64x64, got %ux%u\n", + ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 256x256, got %ux%u\n", desc.dwWidth, desc.dwHeight); /* The overlay pitch seems to have 256 byte alignment */ ok(U1(desc).lPitch == 256, "Unexpected pitch %u, expected 256\n", U1(desc).lPitch);

1 0

Stefan Dösinger : ddraw: Make the overlay tests pass on Windows 7.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 6057041debe35dc965bbb90a51c1a45356e3e99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6057041debe35dc965bbb90a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:11:43 2011 +0200 ddraw: Make the overlay tests pass on Windows 7. --- dlls/ddraw/tests/overlay.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 55c4989..93d6c9c 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -96,17 +96,18 @@ static BOOL CreateDirectDraw(void) static void rectangle_settings(void) { IDirectDrawSurface7 *overlay = create_overlay(64, 64, MAKEFOURCC('U','Y','V','Y')); - HRESULT hr; + HRESULT hr, hr2; RECT rect = {0, 0, 64, 64}; LONG posx, posy; - /* The dx sdk sort of implies that rect must be set when DDOVER_SHOW is used. Show that this is wrong */ + /* The dx sdk sort of implies that rect must be set when DDOVER_SHOW is used. This is not true + * in Windows Vista and earlier, but changed in Win7 */ hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_SHOW, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_HIDE, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_SHOW, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); + ok(hr == DD_OK || hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); /* Show that the overlay position is the (top, left) coordinate of the dest rectangle */ rect.top += 16; @@ -122,13 +123,21 @@ static void rectangle_settings(void) { posx, posy, rect.left, rect.top); /* Passing a NULL dest rect sets the position to 0/0 . Visually it can be seen that the overlay overlays the whole primary(==screen)*/ - hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); + hr2 = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, 0, NULL); + ok(hr2 == DD_OK || hr2 == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_GetOverlayPosition(overlay, &posx, &posy); ok(hr == DD_OK, "IDirectDrawSurface7_GetOverlayPosition failed with hr=0x%08x\n", hr); - ok(posx == 0 && posy == 0, "Overlay position is (%d, %d), expected (%d, %d)\n", - posx, posy, 0, 0); - + if (SUCCEEDED(hr2)) + { + ok(posx == 0 && posy == 0, "Overlay position is (%d, %d), expected (%d, %d)\n", + posx, posy, 0, 0); + } + else + { + /* Otherwise the position remains untouched */ + ok(posx == 32 && posy == 16, "Overlay position is (%d, %d), expected (%d, %d)\n", + posx, posy, 32, 16); + } /* The position cannot be retrieved when the overlay is not shown */ hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_HIDE, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr);

1 0

Stefan Dösinger : ddraw: Set the viewport after changing the render target.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: e0db367aefb85a2defca983a59a7165c8fe3f7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0db367aefb85a2defca983a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 16:48:52 2011 +0200 ddraw: Set the viewport after changing the render target. --- dlls/ddraw/tests/visual.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index acefb67..9026f97 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -210,16 +210,24 @@ out: return ret; } -/* - * Helper function to get and set the viewport - needed on geforce 8800 on XP - driver bug? - * This is needed after IDirect3DDevice7_SetRenderTarget in combination with offscreen to backbuffer rendering. - */ -static void set_the_same_viewport_again(IDirect3DDevice7 *device) +static void set_viewport_size(IDirect3DDevice7 *device) { D3DVIEWPORT7 vp = {0}; + DDSURFACEDESC2 ddsd; HRESULT hr; - hr = IDirect3DDevice7_GetViewport(device,&vp); - ok(hr == D3D_OK && vp.dwWidth == 640 && vp.dwHeight == 480, "IDirect3DDevice7_SetViewport returned %08x\n", hr); + IDirectDrawSurface7 *target; + + hr = IDirect3DDevice7_GetRenderTarget(device, &target); + ok(hr == D3D_OK, "IDirect3DDevice7_GetRenderTarget returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + IDirectDrawSurface7_GetSurfaceDesc(target, &ddsd); + ok(hr == D3D_OK, "IDirectDrawSurface7_GetSurfaceDesc returned %08x\n", hr); + IDirectDrawSurface7_Release(target); + + vp.dwWidth = ddsd.dwWidth; + vp.dwHeight = ddsd.dwHeight; hr = IDirect3DDevice7_SetViewport(device, &vp); ok(hr == D3D_OK, "IDirect3DDevice7_SetViewport returned %08x\n", hr); return; @@ -831,6 +839,7 @@ static void offscreen_test(IDirect3DDevice7 *device) if(IDirect3DDevice7_BeginScene(device) == D3D_OK) { hr = IDirect3DDevice7_SetRenderTarget(device, offscreen, 0); ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr); + set_viewport_size(device); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); @@ -840,7 +849,7 @@ static void offscreen_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr); - set_the_same_viewport_again(device); + set_viewport_size(device); hr = IDirect3DDevice7_SetTexture(device, 0, offscreen); ok(hr == D3D_OK, "SetTexture failed, %08x\n", hr); @@ -987,7 +996,8 @@ static void alpha_test(IDirect3DDevice7 *device) * vertices */ hr = IDirect3DDevice7_SetRenderTarget(device, offscreen, 0); - ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr = %08x\n", hr); + set_viewport_size(device); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x80ff0000, 0.0, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); @@ -1006,8 +1016,8 @@ static void alpha_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "DrawPrimitive failed, hr = %08x\n", hr); hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); - ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); - set_the_same_viewport_again(device); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr = %08x\n", hr); + set_viewport_size(device); /* Render the offscreen texture onto the frame buffer to be able to compare it regularly. * Disable alpha blending for the final composition

1 0

Francois Gouget : dinput: Make semantic_to_obj_id() static.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 1e8abc39844b8a0d092ea4e161f433181fc1a61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8abc39844b8a0d092ea4e16… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 2 10:51:12 2011 +0200 dinput: Make semantic_to_obj_id() static. --- dlls/dinput/device.c | 2 +- dlls/dinput/device_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ead1052..a4052ea 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -570,7 +570,7 @@ int find_property(const DataFormat *df, LPCDIPROPHEADER ph) return -1; } -DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) +static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) { DWORD type = (0x0000ff00 & dwSemantic) >> 8; DWORD offset = 0x000000ff & dwSemantic; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 347c642..660ebd7 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -124,7 +124,6 @@ extern void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) DECLSPEC extern void _dump_DIDATAFORMAT(const DIDATAFORMAT *df) DECLSPEC_HIDDEN; extern const char *_dump_dinput_GUID(const GUID *guid) DECLSPEC_HIDDEN; -extern DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DECLSPEC_HIDDEN; extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) DECLSPEC_HIDDEN; extern HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN;

1 0