September 2011 - Wine-commits

Jacek Caban : vbscript: Added GetInterfaceSafetyOptions implementation.
by Alexandre Julliard 02 Sep '11

02 Sep '11

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

Jacek Caban : vbscript: Added IObjectSafety tests.
by Alexandre Julliard 02 Sep '11

02 Sep '11

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: Moved includes required by vbscript.h to the header .
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 4f5b2a4c3acbd23c1da981523b674aae5f4c653c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5b2a4c3acbd23c1da981523… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 13:16:27 2011 +0200 vbscript: Moved includes required by vbscript.h to the header. --- dlls/vbscript/vbscript.c | 10 +--------- dlls/vbscript/vbscript.h | 8 ++++++++ dlls/vbscript/vbscript_main.c | 11 +---------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 04a513f..b50cbd6 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -16,19 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> #include <assert.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "objsafe.h" - #include "vbscript.h" +#include "objsafe.h" #include "wine/debug.h" diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 98a4486..29909f2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -16,7 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" #include "activscp.h" + #include "vbscript_classes.h" typedef struct { diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 71eaa86..fc31aed 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -16,20 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" #include "initguid.h" -#include "ole2.h" +#include "vbscript.h" #include "objsafe.h" #include "rpcproxy.h" -#include "vbscript.h" #include "vbscript_classes.h" #include "wine/debug.h"

1 0

André Hentschel : urlmon/tests: Print out the wrong mime.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 62dca77bb3341846af010397c26adad34c66041b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62dca77bb3341846af010397c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 1 22:43:28 2011 +0200 urlmon/tests: Print out the wrong mime. --- dlls/urlmon/tests/misc.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ecb0c87..cfa04f0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -666,7 +666,7 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); }else { ok(hres == E_FAIL || hres == mime_tests[i].hres, @@ -678,13 +678,13 @@ static void test_FindMimeFromData(void) mime = (LPWSTR)0xf0f0f0f0; hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeTextPlain, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mimeTextPlain), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeTextPlain), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeAppOctetStream, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mimeAppOctetStream), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeAppOctetStream), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); } @@ -700,16 +700,16 @@ static void test_FindMimeFromData(void) ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || !lstrcmpW(mimeTextPlain, mime_tests2[i].mime)) - ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); else - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeImagePjpeg, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || i == 17) - ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); else ok(!lstrcmpW(mime, mime_tests2[i].mime) || (mime_tests2[i].mime_alt && !lstrcmpW(mime, mime_tests2[i].mime_alt)), @@ -720,17 +720,17 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, url4, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); @@ -747,7 +747,7 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, NULL, 0);

1 0

Alexandre Julliard : gdi32: Make the BITMAPINFO parameters non-const in driver entry points since we are always passing a copy .
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: a0f1b204649268bea8a2f99c384faee2813a7fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f1b204649268bea8a2f99c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 2 15:53:10 2011 +0200 gdi32: Make the BITMAPINFO parameters non-const in driver entry points since we are always passing a copy. --- dlls/gdi32/dib.c | 2 +- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/enhmfdrv/bitblt.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 5 ++--- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/mfdrv/bitblt.c | 5 ++--- dlls/gdi32/mfdrv/metafiledrv.h | 5 ++--- dlls/wineps.drv/bitmap.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/dib.c | 4 ++-- dlls/winex11.drv/x11drv.h | 4 ++-- include/wine/gdi_driver.h | 6 +++--- 12 files changed, 21 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f1b204649268bea8a2f…

1 0

Piotr Caban : jscript: Added Object.hasOwnProperty implementation.
by Alexandre Julliard 02 Sep '11

02 Sep '11

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

Piotr Caban : jscript: Use hash table when accessing object properties by name.
by Alexandre Julliard 02 Sep '11

02 Sep '11

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: Limit name hash computations number.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 65a7f475313410cd6a9184700c9bdedb02925767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a7f475313410cd6a9184700… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 12:24:35 2011 +0200 jscript: Limit name hash computations number. --- dlls/jscript/dispex.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b80f6f2..0d584f0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -42,6 +42,7 @@ typedef enum { struct _dispex_prop_t { WCHAR *name; + unsigned hash; prop_type_t type; DWORD flags; @@ -139,7 +140,7 @@ static inline HRESULT resize_props(jsdisp_t *This) for(i=1; i<This->prop_cnt; i++) { props = This->props+i; - bucket = get_props_idx(This, string_hash(props->name)); + bucket = get_props_idx(This, props->hash); props->bucket_next = This->props[bucket].bucket_head; This->props[bucket].bucket_head = i; } @@ -161,8 +162,9 @@ static inline dispex_prop_t* alloc_prop(jsdisp_t *This, const WCHAR *name, prop_ return NULL; prop->type = type; prop->flags = flags; + prop->hash = string_hash(name); - bucket = get_props_idx(This, string_hash(name)); + bucket = get_props_idx(This, prop->hash); prop->bucket_next = This->props[bucket].bucket_head; This->props[bucket].bucket_head = This->prop_cnt++; return prop; @@ -180,13 +182,13 @@ static dispex_prop_t *alloc_protref(jsdisp_t *This, const WCHAR *name, DWORD ref return ret; } -static HRESULT find_prop_name(jsdisp_t *This, const WCHAR *name, dispex_prop_t **ret) +static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, dispex_prop_t **ret) { const builtin_prop_t *builtin; unsigned bucket, pos, prev = 0; dispex_prop_t *prop; - bucket = get_props_idx(This, string_hash(name)); + bucket = get_props_idx(This, hash); pos = This->props[bucket].bucket_head; while(pos != 0) { if(!strcmpW(name, This->props[pos].name)) { @@ -219,12 +221,12 @@ static HRESULT find_prop_name(jsdisp_t *This, const WCHAR *name, dispex_prop_t * return S_OK; } -static HRESULT find_prop_name_prot(jsdisp_t *This, const WCHAR *name, dispex_prop_t **ret) +static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *name, dispex_prop_t **ret) { dispex_prop_t *prop, *del=NULL; HRESULT hres; - hres = find_prop_name(This, name, &prop); + hres = find_prop_name(This, hash, name, &prop); if(FAILED(hres)) return hres; if(prop && prop->type==PROP_DELETED) { @@ -235,7 +237,7 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, const WCHAR *name, dispex_pro } if(This->prototype) { - hres = find_prop_name_prot(This->prototype, name, &prop); + hres = find_prop_name_prot(This->prototype, hash, name, &prop); if(FAILED(hres)) return hres; if(prop) { @@ -265,9 +267,9 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, BOOL search_p HRESULT hres; if(search_prot) - hres = find_prop_name_prot(This, name, &prop); + hres = find_prop_name_prot(This, string_hash(name), name, &prop); else - hres = find_prop_name(This, name, &prop); + hres = find_prop_name(This, string_hash(name), name, &prop); if(SUCCEEDED(hres) && (!prop || prop->type==PROP_DELETED)) { TRACE("creating prop %s\n", debugstr_w(name)); @@ -482,7 +484,7 @@ static HRESULT fill_protrefs(jsdisp_t *This) for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { if(!iter->name) continue; - hres = find_prop_name(This, iter->name, &prop); + hres = find_prop_name(This, iter->hash, iter->name, &prop); if(FAILED(hres)) return hres; if(!prop || prop->type==PROP_DELETED) { @@ -716,7 +718,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) FIXME("Unsupported grfdex %x\n", grfdex); - hres = find_prop_name(This, bstrName, &prop); + hres = find_prop_name(This, string_hash(bstrName), bstrName, &prop); if(FAILED(hres)) return hres; if(!prop) { @@ -890,7 +892,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; - hres = find_prop_name_prot(constr, prototypeW, &prop); + hres = find_prop_name_prot(constr, string_hash(prototypeW), prototypeW, &prop); if(SUCCEEDED(hres) && prop && prop->type!=PROP_DELETED) { jsexcept_t jsexcept; VARIANT var; @@ -950,7 +952,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * if(flags & fdexNameEnsure) hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM, &prop); else - hres = find_prop_name_prot(jsdisp, name, &prop); + hres = find_prop_name_prot(jsdisp, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -997,7 +999,7 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARA dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(disp, name, &prop); + hres = find_prop_name_prot(disp, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -1123,7 +1125,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, &prop); + hres = find_prop_name_prot(obj, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -1145,7 +1147,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, I sprintfW(name, formatW, idx); - hres = find_prop_name_prot(obj, name, &prop); + hres = find_prop_name_prot(obj, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -1206,7 +1208,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) sprintfW(buf, formatW, idx); - hres = find_prop_name(obj, buf, &prop); + hres = find_prop_name(obj, string_hash(buf), buf, &prop); if(FAILED(hres) || !prop) return hres; @@ -1218,7 +1220,7 @@ VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name(obj, name, &prop); + hres = find_prop_name(obj, string_hash(name), name, &prop); if(FAILED(hres)) return VARIANT_FALSE; else if(!prop)

1 0

Henri Verbeet : wined3d: Print a FIXME for any flags passed to wined3d_surface_flip().
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: cc10600b5233fa94b8a684c60f6407c018182038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc10600b5233fa94b8a684c60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:20:53 2011 +0200 wined3d: Print a FIXME for any flags passed to wined3d_surface_flip(). --- dlls/wined3d/surface.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4d7e35e..a06030b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3748,6 +3748,15 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined TRACE("surface %p, override %p, flags %#x.\n", surface, override, flags); + if (flags) + { + static UINT once; + if (!once++) + FIXME("Ignoring flags %#x.\n", flags); + else + WARN("Ignoring flags %#x.\n", flags); + } + /* FIXME: This will also prevent overlay flips, since overlays aren't on * a swapchain either. */ if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN) @@ -3775,20 +3784,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } - /* Just overwrite the swapchain presentation interval. This is ok because - * only ddraw apps can call Flip, and only d3d8 and d3d9 applications - * specify the presentation interval. */ - if (!(flags & (WINEDDFLIP_NOVSYNC | WINEDDFLIP_INTERVAL2 | WINEDDFLIP_INTERVAL3 | WINEDDFLIP_INTERVAL4))) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_ONE; - else if (flags & WINEDDFLIP_NOVSYNC) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; - else if (flags & WINEDDFLIP_INTERVAL2) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_TWO; - else if (flags & WINEDDFLIP_INTERVAL3) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_THREE; - else - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_FOUR; - return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); }

1 0

Henri Verbeet : wined3d: Remove a redundant compare in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 179d6f8087ba2b052a2d34c9c1ffc9fd6a710c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179d6f8087ba2b052a2d34c9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:20:54 2011 +0200 wined3d: Remove a redundant compare in IWineD3DSurfaceImpl_BltOverride(). If the source surface isn't on the destination swapchain it can't be a backbuffer there either. --- dlls/wined3d/surface.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a06030b..619bc92 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5312,8 +5312,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa return WINED3DERR_INVALIDCALL; } - /* The only case where both surfaces on a swapchain are supported is a back buffer -> front buffer blit on the same swapchain */ - if (dstSwapchain && dstSwapchain == srcSwapchain && dstSwapchain->back_buffers + /* The only case where both surfaces on a swapchain are supported is a + * back buffer -> front buffer blit on the same swapchain. */ + if (dstSwapchain && dstSwapchain->back_buffers && dst_surface == dstSwapchain->front_buffer && src_surface == dstSwapchain->back_buffers[0]) {

1 0