wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Jacek Caban : jscript: Add Map.size property implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: b8f17fa48add830e4119f4cd738d2512cb82eec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f17fa48add830e4119f4cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:29 2021 +0200 jscript: Add Map.size property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index bb1cd40b540..1fdf4f786fe 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -335,6 +335,16 @@ static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return S_OK; } +static HRESULT Map_get_size(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + MapInstance *map = (MapInstance*)jsthis; + + TRACE("%p\n", map); + + *r = jsval_number(map->size); + return S_OK; +} + static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -364,6 +374,10 @@ static const builtin_prop_t Map_prototype_props[] = { {L"set", Map_set, PROPF_METHOD|2}, }; +static const builtin_prop_t Map_props[] = { + {L"size", NULL,0, Map_get_size, builtin_set_const}, +}; + static const builtin_info_t Map_prototype_info = { JSCLASS_OBJECT, {NULL, Map_value, 0}, @@ -376,7 +390,8 @@ static const builtin_info_t Map_prototype_info = { static const builtin_info_t Map_info = { JSCLASS_MAP, {NULL, Map_value, 0}, - 0, NULL, + ARRAY_SIZE(Map_props), + Map_props, Map_destructor, NULL };

1 0

Jacek Caban : jscript: Add Map.prototype.has implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: ae41d600d69233b4bf3f08e5ee7c30b9be3ec61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae41d600d69233b4bf3f08e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:21 2021 +0200 jscript: Add Map.prototype.has implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 5a2865155ae..bb1cd40b540 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -322,8 +322,17 @@ static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p (%s)\n", map, debugstr_jsval(key)); + + entry = get_map_entry(map, key); + if(r) *r = jsval_bool(!!entry); + return S_OK; } static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Add Map.prototype.delete implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 6e9f69d4e938550f32145822d562b327b7db6834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e9f69d4e938550f32145822… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:14 2021 +0200 jscript: Add Map.prototype.delete implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 6038a647e76..5a2865155ae 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -236,8 +236,17 @@ static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p (%s)\n", map, debugstr_jsval(key)); + + if((entry = get_map_entry(map, key))) delete_map_entry(map, entry); + if(r) *r = jsval_bool(!!entry); + return S_OK; } static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Add Map.prototype.clear implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: f7915fb5e4074a21961d2c4c9103a45b23cf99d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7915fb5e4074a21961d2c4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:10 2021 +0200 jscript: Add Map.prototype.clear implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 789ba8e398e..6038a647e76 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -207,11 +207,30 @@ static void release_map_entry(struct jsval_map_entry *entry) heap_free(entry); } +static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry) +{ + map->size--; + wine_rb_remove(&map->map, &entry->entry); + entry->deleted = TRUE; + release_map_entry(entry); +} + static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p\n", map); + + while(!list_empty(&map->entries)) { + struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry); + delete_map_entry(map, entry); + } + + if(r) *r = jsval_undefined(); + return S_OK; } static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Add Map.prototype.get implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 6cc5aa4286ed62fd603ac84b186f5eedf07a0744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc5aa4286ed62fd603ac84b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:01 2021 +0200 jscript: Add Map.prototype.get implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 7524bf02759..789ba8e398e 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -231,8 +231,20 @@ static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p (%s)\n", map, debugstr_jsval(key)); + + if(!(entry = get_map_entry(map, key))) { + if(r) *r = jsval_undefined(); + return S_OK; + } + + return r ? jsval_copy(entry->value, r) : S_OK; } static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Add Map.prototype.set implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

1 0

Jacek Caban : jscript: Add Map object stub implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 6dda7096bf3b8697ee919e24da60dc06929e0081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dda7096bf3b8697ee919e24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:11:37 2021 +0200 jscript: Add Map object stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 5 ++ dlls/jscript/jscript.h | 2 + dlls/jscript/object.c | 1 + dlls/jscript/set.c | 120 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 24 ++++++++ 5 files changed, 152 insertions(+) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 7a037d09b2d..9148451f1cb 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -483,6 +483,11 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } + if(This->ctx->map_prototype) { + jsdisp_release(This->ctx->map_prototype); + This->ctx->map_prototype = NULL; + } + if(This->ctx->set_prototype) { jsdisp_release(This->ctx->set_prototype); This->ctx->set_prototype = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d64d927c227..e4137855430 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -131,6 +131,7 @@ typedef enum { JSCLASS_ARGUMENTS, JSCLASS_VBARRAY, JSCLASS_JSON, + JSCLASS_MAP, JSCLASS_SET, } jsclass_t; @@ -467,6 +468,7 @@ struct _script_ctx_t { jsdisp_t *regexp_constr; jsdisp_t *string_constr; jsdisp_t *vbarray_constr; + jsdisp_t *map_prototype; jsdisp_t *set_prototype; }; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 46d50000cc3..c8c0572c839 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -48,6 +48,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u L"[object Object]", L"[object Object]", L"[object Object]", + L"[object Object]", L"[object Object]" }; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index ec22b69eb91..8ac2475ff90 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -26,6 +26,10 @@ typedef struct { jsdisp_t dispex; } SetInstance; +typedef struct { + jsdisp_t dispex; +} MapInstance; + static HRESULT Set_add(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -119,6 +123,107 @@ static HRESULT Set_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } } +static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("%p\n", jsthis); + return E_NOTIMPL; +} + +static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t Map_prototype_props[] = { + {L"clear", Map_clear, PROPF_METHOD}, + {L"delete" , Map_delete, PROPF_METHOD|1}, + {L"forEach", Map_forEach, PROPF_METHOD|1}, + {L"get", Map_get, PROPF_METHOD|1}, + {L"has", Map_has, PROPF_METHOD|1}, + {L"set", Map_set, PROPF_METHOD|2}, +}; + +static const builtin_info_t Map_prototype_info = { + JSCLASS_OBJECT, + {NULL, Map_value, 0}, + ARRAY_SIZE(Map_prototype_props), + Map_prototype_props, + NULL, + NULL +}; + +static const builtin_info_t Map_info = { + JSCLASS_MAP, + {NULL, Map_value, 0}, + 0, NULL, + NULL, + NULL +}; + +static HRESULT Map_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + MapInstance *map; + HRESULT hres; + + switch(flags) { + case DISPATCH_CONSTRUCT: + TRACE("\n"); + + if(!(map = heap_alloc_zero(sizeof(*map)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&map->dispex, ctx, &Map_info, ctx->map_prototype); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(&map->dispex); + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } +} + HRESULT init_set_constructor(script_ctx_t *ctx) { jsdisp_t *constructor; @@ -139,5 +244,20 @@ HRESULT init_set_constructor(script_ctx_t *ctx) hres = jsdisp_define_data_property(ctx->global, L"Set", PROPF_WRITABLE, jsval_obj(constructor)); jsdisp_release(constructor); + if(FAILED(hres)) + return hres; + + hres = create_dispex(ctx, &Map_prototype_info, ctx->object_prototype, &ctx->map_prototype); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, Map_constructor, L"Map", NULL, + PROPF_CONSTR, ctx->map_prototype, &constructor); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, L"Map", PROPF_WRITABLE, + jsval_obj(constructor)); + jsdisp_release(constructor); return hres; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d46da5d44a0..d4394e011ce 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -117,6 +117,7 @@ sync_test("window_props", function() { test_exposed("onfocusout", v >= 9); test_exposed("getComputedStyle", v >= 9); test_exposed("requestAnimationFrame", v >= 10); + test_exposed("Map", v >= 11); test_exposed("Set", v >= 11); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); @@ -623,6 +624,29 @@ sync_test("set_obj", function() { ok(r === "[object Object]", "toString returned " + r); }); +sync_test("map_obj", function() { + if(!("Map" in window)) return; + + var s = new Map, r; + ok(Object.getPrototypeOf(s) === Map.prototype, "unexpected Map prototype"); + + function test_length(name, len) { + ok(Map.prototype[name].length === len, "Map.prototype." + name + " = " + Map.prototype[name].length); + } + test_length("clear", 0); + test_length("delete", 1); + test_length("forEach", 1); + test_length("get", 1); + test_length("has", 1); + test_length("set", 2); + ok(!("entries" in s), "entries are in Map"); + ok(!("keys" in s), "keys are in Map"); + ok(!("values" in s), "values are in Map"); + + r = Object.prototype.toString.call(s); + ok(r === "[object Object]", "toString returned " + r); +}); + sync_test("elem_attr", function() { var v = document.documentMode; var elem = document.createElement("div"), r;

1 0

Alistair Leslie-Hughes : msado15: Support Properties interface on Field.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: d5aa637737d1fbe97438638867f3ecfc6ecf96eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5aa637737d1fbe974386388… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 23 08:24:57 2021 +1000 msado15: Support Properties interface on Field. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 144 ++++++++++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 20 ++++++ 4 files changed, 164 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3479ceb5b02..6b85c84e8e8 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -184,6 +184,7 @@ static REFIID tid_ids[] = { &IID__Connection, &IID_Field, &IID_Fields, + &IID_Properties, &IID__Recordset, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 55afac3f389..600dcb90a97 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -48,6 +48,7 @@ typedef enum tid_t { Connection_tid, Field_tid, Fields_tid, + Properties_tid, Recordset_tid, Stream_tid, LAST_tid diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 68d4c22d802..d71904193c9 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -65,6 +65,7 @@ struct field { Field Field_iface; ISupportErrorInfo ISupportErrorInfo_iface; + Properties Properties_iface; LONG refs; WCHAR *name; DataTypeEnum type; @@ -79,6 +80,11 @@ static inline struct field *impl_from_Field( Field *iface ) return CONTAINING_RECORD( iface, struct field, Field_iface ); } +static inline struct field *impl_from_Properties( Properties *iface ) +{ + return CONTAINING_RECORD( iface, struct field, Properties_iface ); +} + static ULONG WINAPI field_AddRef( Field *iface ) { struct field *field = impl_from_Field( iface ); @@ -181,8 +187,12 @@ static HRESULT WINAPI field_Invoke( Field *iface, DISPID member, REFIID riid, LC static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) { - FIXME( "%p, %p\n", iface, obj ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + TRACE( "%p, %p\n", iface, obj ); + + *obj = &field->Properties_iface; + Properties_AddRef(&field->Properties_iface); + return S_OK; } static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) @@ -447,6 +457,135 @@ static const ISupportErrorInfoVtbl field_supporterrorinfo_vtbl = field_supporterrorinfo_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI field_props_QueryInterface(Properties *iface, REFIID riid, void **ppv) +{ + struct field *field = impl_from_Properties( iface ); + + if (IsEqualGUID( riid, &IID_Properties) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppv = &field->Properties_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + Field_AddRef(&field->Field_iface); + return S_OK; +} + +static ULONG WINAPI field_props_AddRef(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + return Field_AddRef(&field->Field_iface); +} + +static ULONG WINAPI field_props_Release(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + return Field_Release(&field->Field_iface); +} + +static HRESULT WINAPI field_props_GetTypeInfoCount(Properties *iface, UINT *count) +{ + struct field *field = impl_from_Properties( iface ); + TRACE( "%p, %p\n", field, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI field_props_GetTypeInfo(Properties *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + struct field *field = impl_from_Properties( iface ); + TRACE( "%p, %u, %u, %p\n", field, index, lcid, info ); + return get_typeinfo(Properties_tid, info); +} + +static HRESULT WINAPI field_props_GetIDsOfNames(Properties *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + struct field *field = impl_from_Properties( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Properties_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_props_Invoke(Properties *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + struct field *field = impl_from_Properties( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + + hr = get_typeinfo(Properties_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &field->Field_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_props_get_Count(Properties *iface, LONG *count) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %p\n", field, count); + *count = 0; + return S_OK; +} + +static HRESULT WINAPI field_props__NewEnum(Properties *iface, IUnknown **object) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %p\n", field, object); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_props_Refresh(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p\n", field); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_props_get_Item(Properties *iface, VARIANT index, Property **object) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %s, %p\n", field, debugstr_variant(&index), object); + return MAKE_ADO_HRESULT(adErrItemNotFound); +} + +static struct PropertiesVtbl field_properties_vtbl = +{ + field_props_QueryInterface, + field_props_AddRef, + field_props_Release, + field_props_GetTypeInfoCount, + field_props_GetTypeInfo, + field_props_GetIDsOfNames, + field_props_Invoke, + field_props_get_Count, + field_props__NewEnum, + field_props_Refresh, + field_props_get_Item +}; + static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *recordset, Field **obj ) { struct field *field; @@ -454,6 +593,7 @@ static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *re if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; field->Field_iface.lpVtbl = &field_vtbl; field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; + field->Properties_iface.lpVtbl = &field_properties_vtbl; if (!(field->name = strdupW( name ))) { heap_free( field ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index db606f21fab..b5f1b70dedd 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,8 @@ static void test_Recordset(void) ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; + Properties *props; + Property *prop; LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; @@ -184,6 +186,24 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( name ); + hr = Field_QueryInterface(field, &IID_Properties, (void**)&props); + ok( hr == E_NOINTERFACE, "got %08x\n", hr ); + + hr = Field_get_Properties(field, &props); + ok( hr == S_OK, "got %08x\n", hr ); + + count = -1; + hr = Properties_get_Count(props, &count); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); + + V_VT( &index ) = VT_I4; + V_I4( &index ) = 1000; + hr = Properties_get_Item(props, index, &prop); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + + Properties_Release(props); + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); ok( is_eof( recordset ), "not eof\n" );

1 0

Ziqing Hui : winex11.drv: Correct a full screen condition.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 57b1b21a84b15f121eef998a31151d760beb8c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b1b21a84b15f121eef998a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 23 11:31:50 2021 +0800 winex11.drv: Correct a full screen condition. The if condition here came from 47c54c4ae7f235780a55ddf670503db4afc11055, which is to detect full screen window. However, according to tests in previous commit, there is possibility that a window without setting WS_CAPTION is not full screen, for example, main window of Tencent WeChat. And windows like this can also be maximized or restored. So that we can not treat WS_CAPTION as our full screen condition. This fixes maximizing Tencent WeChat by dragging it to screen edge. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 99943478729..1772a27c48b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1163,7 +1163,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) data->window_rect.bottom - data->window_rect.top, cx, cy ); style = GetWindowLongW( data->hwnd, GWL_STYLE ); - if ((style & WS_CAPTION) == WS_CAPTION) + if ((style & WS_CAPTION) == WS_CAPTION || !is_window_rect_full_screen( &data->whole_rect )) { read_net_wm_states( event->display, data ); if ((data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)))

1 0

Ziqing Hui : user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 1ab8710016d4dc0cb0c61280dd7443b2a89b6b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ab8710016d4dc0cb0c61280… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 23 11:31:36 2021 +0800 user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dbb5f4ce5b5..a37afd2dc5e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6649,6 +6649,21 @@ static void test_ShowWindow(void) RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient; LPARAM ret; MONITORINFO mon_info; + unsigned int i; + + DWORD test_style[] = + { + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MAXIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MAXIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU, + WS_OVERLAPPED | WS_VISIBLE | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE + }; SetRect(&rcClient, 0, 0, 90, 90); rcMain = rcClient; @@ -6905,6 +6920,50 @@ static void test_ShowWindow(void) DestroyWindow(hwnd); flush_events(TRUE); + + /* test maximize and restore windows without setting WS_CAPTION */ + + for (i = 0; i < ARRAY_SIZE(test_style); ++i) + { + SetRect(&rcMain, 0, 0, 90, 90); + OffsetRect(&rcMain, 120, 120); + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, test_style[i], + rcMain.left, rcMain.top, + rcMain.right - rcMain.left, rcMain.bottom - rcMain.top, + 0, 0, 0, NULL); + ok(hwnd != NULL, "Test %u: failed to create window with error %u\n", i, GetLastError()); + + GetWindowRect(hwnd, &rcMain); + ok(rcMain.left > mon_info.rcMonitor.left && + rcMain.right < mon_info.rcMonitor.right && + rcMain.top > mon_info.rcMonitor.top && + rcMain.bottom < mon_info.rcMonitor.bottom, + "Test %u: window should not be fullscreen\n", i); + + rcMaximized = (test_style[i] & WS_MAXIMIZEBOX) ? mon_info.rcWork : mon_info.rcMonitor; + AdjustWindowRectEx(&rcMaximized, GetWindowLongA(hwnd, GWL_STYLE) & ~WS_BORDER, + 0, GetWindowLongA(hwnd, GWL_EXSTYLE)); + + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "unexpected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & WS_MAXIMIZE, "Test %u: window should be maximized\n", i); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMaximized, &rc), "Test %u: expected %s, got %s\n", + i, wine_dbgstr_rect(&rcMaximized), wine_dbgstr_rect(&rc)); + + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "unexpected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(!(style & WS_MAXIMIZE), "Test %u: window should not be maximized\n", i); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "Test %u: expected %s, got %s\n", + i, wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + + DestroyWindow(hwnd); + + flush_events(TRUE); + } } static void test_ShowWindow_owned(HWND hwndMain)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021