May 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Store the window DPI awareness in the server.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: 433788736bcb68b43a35749c28d6272e4041c857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=433788736bcb68b43a35749c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 16:18:16 2018 +0200 user32: Store the window DPI awareness in the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 8 +++++++- dlls/user32/win.c | 25 +++++++++++++++++-------- dlls/user32/win.h | 2 +- include/wine/server_protocol.h | 8 +++++++- server/protocol.def | 3 +++ server/request.h | 9 ++++++--- server/trace.c | 5 +++++ server/window.c | 39 ++++++++++++++++++++++----------------- 8 files changed, 68 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=433788736bcb68b43a35…

1 0

Jacek Caban : mshtml/tests: Added more COM aggregation tests.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: a67a3305d644d315b80586350e0d92e9b0a39221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67a3305d644d315b8058635… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 15:27:36 2018 +0200 mshtml/tests: Added more COM aggregation tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index ebaa630..62bda5c 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -64,6 +64,7 @@ DEFINE_EXPECT(GetBindInfo); DEFINE_EXPECT(ReportProgress); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); +DEFINE_EXPECT(outer_QI_test); static HRESULT expect_hrResult; static BOOL expect_hr_win32err = FALSE; @@ -942,6 +943,68 @@ static void test_javascript_protocol(void) IUnknown_Release(unk); } +static const IID outer_test_iid = {0xabcabc00,0,0,{0,0,0,0,0,0,0,0x66}}; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &outer_test_iid)) { + CHECK_EXPECT(outer_QI_test); + *ppv = (IUnknown*)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + +static void test_com_aggregation(const CLSID *clsid) +{ + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; + IUnknown *unk, *unk2, *unk3; + HRESULT hres; + + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); + + SET_EXPECT(outer_QI_test); + hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); + CHECK_CALLED(outer_QI_test); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); + + IUnknown_Release(unk2); + IUnknown_Release(unk); + + unk = (void*)0xdeadbeef; + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IInternetProtocol, (void**)&unk); + ok(hres == E_INVALIDARG, "CreateInstance returned: %08x\n", hres); + ok(!unk, "unk = %p\n", unk); + + IClassFactory_Release(class_factory); +} + START_TEST(protocol) { res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)/sizeof(WCHAR)-6); @@ -952,5 +1015,8 @@ START_TEST(protocol) test_about_protocol(); test_javascript_protocol(); + test_com_aggregation(&CLSID_AboutProtocol); + test_com_aggregation(&CLSID_ResProtocol); + OleUninitialize(); }

1 0

Jacek Caban : jscript: Support getting value of accessor property.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: fd91fe52b779f91f8e62ebdacc2e52ac358929f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd91fe52b779f91f8e62ebda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 13:26:25 2018 +0200 jscript: Support getting value of accessor property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 20 ++++++++++++++------ dlls/mshtml/tests/es5.js | 10 ++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a1298eb..2557471 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -434,8 +434,14 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) { + jsdisp_t *prop_obj = This; HRESULT hres; + while(prop->type == PROP_PROTREF) { + prop_obj = prop_obj->prototype; + prop = prop_obj->props + prop->u.ref; + } + switch(prop->type) { case PROP_BUILTIN: if(prop->u.p->getter) { @@ -456,18 +462,20 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) *r = jsval_obj(obj); } break; - case PROP_PROTREF: - hres = prop_get(This->prototype, This->prototype->props + prop->u.ref, r); - break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); break; case PROP_ACCESSOR: - FIXME("not supported on accessor property\n"); - hres = E_NOTIMPL; + if(prop->u.accessor.getter) { + hres = jsdisp_call_value(prop->u.accessor.getter, to_disp(This), + DISPATCH_METHOD, 0, NULL, r); + }else { + *r = jsval_undefined(); + hres = S_OK; + } break; case PROP_IDX: - hres = This->builtin_info->idx_get(This, prop->u.idx, r); + hres = prop_obj->builtin_info->idx_get(prop_obj, prop->u.idx, r); break; default: ERR("type %d\n", prop->type); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index df5b7c7..4e7b83b 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -257,6 +257,8 @@ function test_defineProperty() { Object.defineProperty(obj, "getsetprop", desc); test_accessor_prop_desc(obj, "getsetprop", desc); + ok(obj.getsetprop === 1, "getsetprop = " + obj.getsetprop); + Object.defineProperty(obj, "notConf", {writable: true, enumerable: true, configurable: false, value: 1}); test_own_data_prop_desc(obj, "notConf", true, true, false); @@ -379,9 +381,11 @@ function test_defineProperty() { function child() {} desc = { get: function() { + ok(this === obj, "this != obj"); return getsetprop_value; }, set: function(v) { + ok(this === obj, "this != obj"); getsetprop_value = v; }, configurable: true @@ -389,11 +393,17 @@ function test_defineProperty() { Object.defineProperty(child.prototype, "parent_accessor", desc); obj = new child(); + getsetprop_value = 6; + ok(obj.parent_accessor === 6, "parent_accessor = " + obj.parent_accessor); ok(Object.getOwnPropertyDescriptor(obj, "parent_accessor") === undefined, "getOwnPropertyDescriptor(parent_accessor) did not return undefined"); test_accessor_prop_desc(child.prototype, "parent_accessor", desc); + desc.get = undefined; + Object.defineProperty(child.prototype, "parent_accessor", desc); + ok(obj.parent_accessor === undefined, "parent_accessor = " + obj.parent_accessor); + next_test(); }

1 0

Jacek Caban : jscript: Support accessor properties in getOwnPropertyDescriptor.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: d8aa26f660a7fe59272549ca1184094d44e75643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8aa26f660a7fe59272549ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 13:26:10 2018 +0200 jscript: Support accessor properties in getOwnPropertyDescriptor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 9 +++++++++ dlls/mshtml/tests/es5.js | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4eb3a8b..a1298eb 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1623,6 +1623,15 @@ HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_onl return hres; } break; + case PROP_ACCESSOR: + desc->explicit_getter = desc->explicit_setter = TRUE; + if(!flags_only) { + desc->getter = prop->u.accessor.getter + ? jsdisp_addref(prop->u.accessor.getter) : NULL; + desc->setter = prop->u.accessor.setter + ? jsdisp_addref(prop->u.accessor.setter) : NULL; + } + break; default: return DISP_E_UNKNOWNNAME; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index d96803a..df5b7c7 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -204,6 +204,19 @@ function test_getOwnPropertyDescriptor() { } function test_defineProperty() { + function test_accessor_prop_desc(obj, prop, orig_desc) { + var expected_enumerable = "enumerable" in orig_desc && !!orig_desc.enumerable; + var expected_configurable = "configurable" in orig_desc && !!orig_desc.configurable; + + var desc = Object.getOwnPropertyDescriptor(obj, prop); + ok(desc.enumerable === expected_enumerable, "desc.enumerable = " + desc.enumerable + + " expected " + expected_enumerable); + ok(desc.configurable === expected_configurable, "desc.configurable = " + desc.configurable + + " expected " + expected_configurable); + ok(desc.get === orig_desc.get, "desc.get = " + desc.get); + ok(desc.set === orig_desc.set, "desc.set = " + desc.set); + } + function expect_exception(func, expected_number) { try { func(); @@ -242,6 +255,7 @@ function test_defineProperty() { } }; Object.defineProperty(obj, "getsetprop", desc); + test_accessor_prop_desc(obj, "getsetprop", desc); Object.defineProperty(obj, "notConf", {writable: true, enumerable: true, configurable: false, value: 1}); test_own_data_prop_desc(obj, "notConf", true, true, false); @@ -304,6 +318,7 @@ function test_defineProperty() { configurable: false }; Object.defineProperty(obj, "notConfAcc", desc); + test_accessor_prop_desc(obj, "notConfAcc", desc); expect_exception(function() { Object.defineProperty(obj, "notConfAcc", {value: 1}); @@ -322,10 +337,13 @@ function test_defineProperty() { }, JS_E_NONCONFIGURABLE_REDEFINED); Object.defineProperty(obj, "notConfAcc", {get: desc.get}); + test_accessor_prop_desc(obj, "notConfAcc", desc); Object.defineProperty(obj, "notConfAcc", {set: desc.set}); + test_accessor_prop_desc(obj, "notConfAcc", desc); Object.defineProperty(obj, "notConfAcc", {configurable: false}); + test_accessor_prop_desc(obj, "notConfAcc", desc); desc = { get: function() { @@ -337,15 +355,18 @@ function test_defineProperty() { configurable: true }; Object.defineProperty(obj, "confAcc", desc); + test_accessor_prop_desc(obj, "confAcc", desc); Object.defineProperty(obj, "confAcc", {writable: 1}); test_own_data_prop_desc(obj, "confAcc", true, false, true); Object.defineProperty(obj, "confAcc", desc); + test_accessor_prop_desc(obj, "confAcc", desc); desc.get = function() {}; desc.set = undefined; Object.defineProperty(obj, "confAcc", desc); + test_accessor_prop_desc(obj, "confAcc", desc); expect_exception(function() { Object.defineProperty(obj, "invaliddesc", {get: undefined, value: 1}); @@ -371,6 +392,7 @@ function test_defineProperty() { ok(Object.getOwnPropertyDescriptor(obj, "parent_accessor") === undefined, "getOwnPropertyDescriptor(parent_accessor) did not return undefined"); + test_accessor_prop_desc(child.prototype, "parent_accessor", desc); next_test(); }

1 0

Huw Davies : user32: Simplify CheckMenuRadioItem().
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: 5fefb108c4ce84625dbd647da37c709cfd2ec2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fefb108c4ce84625dbd647d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 15 09:36:02 2018 +0100 user32: Simplify CheckMenuRadioItem(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5b83703..8c541cc 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5253,27 +5253,19 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, UINT check, UINT flags) { - POPUPMENU *first_menu = NULL, *check_menu = NULL; - UINT i, first_pos, check_pos; + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; BOOL done = FALSE; for (i = first; i <= last; i++) { MENUITEM *item; - if (!first_menu) - { - if (!(first_menu = find_menu_item(hMenu, i, flags, &first_pos))) - continue; + if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) + continue; - check_pos = first_pos; - check_menu = grab_menu_ptr(first_menu->obj.handle); - } - else - { - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - } + if (!first_menu) + first_menu = grab_menu_ptr(check_menu->obj.handle); if (first_menu != check_menu) {

1 0

Alexandre Julliard : user32: Update the window DPI awareness in SetParent( ).
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: 8a70b70f42b4121816d8acaa2f2533b211efc7a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a70b70f42b4121816d8acaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 16:21:36 2018 +0200 user32: Update the window DPI awareness in SetParent(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 18 +++++++++++++++++- dlls/user32/win.c | 1 + include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + server/window.c | 3 +++ 7 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d898828..f1addbb 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3526,7 +3526,7 @@ static void test_dpi_window(void) DPI_AWARENESS_CONTEXT context, orig; DPI_AWARENESS awareness; ULONG_PTR i, j; - HWND hwnd, child; + HWND hwnd, child, ret; MSG msg = { 0, WM_USER + 1, 0, 0 }; if (!pGetWindowDpiAwarenessContext) @@ -3556,6 +3556,22 @@ static void test_dpi_window(void) context = pGetWindowDpiAwarenessContext( child ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); ok( awareness == i, "%lu/%lu: wrong awareness %u\n", i, j, awareness ); + ret = SetParent( child, NULL ); + ok( ret != 0, "SetParent failed err %u\n", GetLastError() ); + context = pGetWindowDpiAwarenessContext( child ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == i, "%lu/%lu: wrong awareness %u\n", i, j, awareness ); + DestroyWindow( child ); + child = CreateWindowA( "DpiTestClass", "Test", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + context = pGetWindowDpiAwarenessContext( child ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == j, "%lu/%lu: wrong awareness %u\n", i, j, awareness ); + ret = SetParent( child, hwnd ); + ok( ret != 0, "SetParent failed err %u\n", GetLastError() ); + context = pGetWindowDpiAwarenessContext( child ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == i, "%lu/%lu: wrong awareness %u\n", i, j, awareness ); DestroyWindow( child ); } DestroyWindow( hwnd ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 737fce4..c2bf84c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3083,6 +3083,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) { old_parent = wine_server_ptr_handle( reply->old_parent ); wndPtr->parent = parent = wine_server_ptr_handle( reply->full_parent ); + wndPtr->dpi_awareness = reply->awareness; } } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0ca7171..b63f1d2 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3571,6 +3571,8 @@ struct set_parent_reply struct reply_header __header; user_handle_t old_parent; user_handle_t full_parent; + int awareness; + char __pad_20[4]; }; @@ -6507,6 +6509,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 549 +#define SERVER_PROTOCOL_VERSION 550 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 6e78a14..8d7d220 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2564,6 +2564,7 @@ enum message_type @REPLY user_handle_t old_parent; /* old parent window */ user_handle_t full_parent; /* full handle of new parent */ + int awareness; /* new DPI awareness */ @END diff --git a/server/request.h b/server/request.h index 9cc735a..6a36070 100644 --- a/server/request.h +++ b/server/request.h @@ -1717,7 +1717,8 @@ C_ASSERT( FIELD_OFFSET(struct set_parent_request, parent) == 16 ); C_ASSERT( sizeof(struct set_parent_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_parent_reply, old_parent) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_parent_reply, full_parent) == 12 ); -C_ASSERT( sizeof(struct set_parent_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_parent_reply, awareness) == 16 ); +C_ASSERT( sizeof(struct set_parent_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_parents_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_parents_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_window_parents_reply, count) == 8 ); diff --git a/server/trace.c b/server/trace.c index d4c44c8..261a8cc 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3131,6 +3131,7 @@ static void dump_set_parent_reply( const struct set_parent_reply *req ) { fprintf( stderr, " old_parent=%08x", req->old_parent ); fprintf( stderr, ", full_parent=%08x", req->full_parent ); + fprintf( stderr, ", awareness=%d", req->awareness ); } static void dump_get_window_parents_request( const struct get_window_parents_request *req ) diff --git a/server/window.c b/server/window.c index 592ae23..4c9b321 100644 --- a/server/window.c +++ b/server/window.c @@ -250,6 +250,8 @@ static int set_parent_window( struct window *win, struct window *parent ) win->parent = parent; link_window( win, WINPTR_TOP ); + if (!is_desktop_window( parent )) win->dpi_awareness = parent->dpi_awareness; + /* if parent belongs to a different thread and the window isn't */ /* top-level, attach the two threads */ if (parent->thread && parent->thread != win->thread && !is_desktop_window(parent)) @@ -1939,6 +1941,7 @@ DECL_HANDLER(set_parent) reply->old_parent = win->parent->handle; reply->full_parent = parent ? parent->handle : 0; set_parent_window( win, parent ); + reply->awareness = win->dpi_awareness; }

1 0

Jacek Caban : mshtml: Properly support COM aggregation in about and res protocol handlers.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: b952590f93e1bbf2b76188b7c5e6ae9ad23bb541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b952590f93e1bbf2b76188b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 15:27:27 2018 +0200 mshtml: Properly support COM aggregation in about and res protocol handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/main.c | 2 + dlls/mshtml/protocol.c | 146 ++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 76 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 0227ccc..9b2f199 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -571,6 +571,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLPrivateWindow); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); + X(IID_IInternetProtocol); + X(IID_IInternetProtocolRoot); X(IID_IManagedObject); X(IID_IMarshal); X(IID_IMonikerProp); diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index bdb83ce..d385f16 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + IUnknown IUnknown_inner; IInternetProtocol IInternetProtocol_iface; LONG ref; @@ -43,7 +44,7 @@ typedef struct { ULONG data_len; ULONG cur; - IUnknown *pUnkOuter; + IUnknown *outer; } InternetProtocol; /******************************************************************** @@ -144,54 +145,50 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) return S_OK; } +static inline InternetProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, InternetProtocol, IUnknown_inner); +} + static inline InternetProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) { return CONTAINING_RECORD(iface, InternetProtocol, IInternetProtocol_iface); } -static HRESULT WINAPI InternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +static HRESULT WINAPI Protocol_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - InternetProtocol *This = impl_from_IInternetProtocol(iface); + InternetProtocol *This = impl_from_IUnknown(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); - if(This->pUnkOuter) - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppv); - *ppv = &This->IInternetProtocol_iface; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { - TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", iface, ppv); *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { - TRACE("(%p)->(IID_IInternetProtocol %p)\n", iface, ppv); *ppv = &This->IInternetProtocol_iface; - }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { - FIXME("IServiceProvider is not implemented\n"); - return E_NOINTERFACE; - } - - if(!*ppv) { - TRACE("unknown interface %s\n", debugstr_guid(riid)); + }else { + if(IsEqualGUID(&IID_IServiceProvider, riid)) + FIXME("IServiceProvider is not implemented\n"); + *ppv = NULL; return E_NOINTERFACE; } - IInternetProtocol_AddRef(iface); + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } -static ULONG WINAPI InternetProtocol_AddRef(IInternetProtocol *iface) +static ULONG WINAPI Protocol_AddRef(IUnknown *iface) { - InternetProtocol *This = impl_from_IInternetProtocol(iface); + InternetProtocol *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", iface, ref); - return This->pUnkOuter ? IUnknown_AddRef(This->pUnkOuter) : ref; + return ref; } -static ULONG WINAPI InternetProtocol_Release(IInternetProtocol *iface) +static ULONG WINAPI Protocol_Release(IUnknown *iface) { - InternetProtocol *This = impl_from_IInternetProtocol(iface); - IUnknown *pUnkOuter = This->pUnkOuter; + InternetProtocol *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%x\n", iface, ref); @@ -201,7 +198,31 @@ static ULONG WINAPI InternetProtocol_Release(IInternetProtocol *iface) heap_free(This); } - return pUnkOuter ? IUnknown_Release(pUnkOuter) : ref; + return ref; +} + +static const IUnknownVtbl ProtocolUnkVtbl = { + Protocol_QueryInterface, + Protocol_AddRef, + Protocol_Release +}; + +static HRESULT WINAPI InternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + InternetProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI InternetProtocol_AddRef(IInternetProtocol *iface) +{ + InternetProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI InternetProtocol_Release(IInternetProtocol *iface) +{ + InternetProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_Release(This->outer); } static HRESULT WINAPI InternetProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA* pProtocolData) @@ -286,6 +307,28 @@ static HRESULT WINAPI InternetProtocol_UnlockRequest(IInternetProtocol *iface) return S_OK; } +static HRESULT create_protocol_instance(const IInternetProtocolVtbl *protocol_vtbl, + IUnknown *outer, REFIID riid, void **ppv) +{ + InternetProtocol *protocol; + HRESULT hres; + + if(outer && !IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = NULL; + return E_INVALIDARG; + } + + protocol = heap_alloc_zero(sizeof(InternetProtocol)); + protocol->IUnknown_inner.lpVtbl = &ProtocolUnkVtbl; + protocol->IInternetProtocol_iface.lpVtbl = protocol_vtbl; + protocol->outer = outer ? outer : &protocol->IUnknown_inner; + protocol->ref = 1; + + hres = IUnknown_QueryInterface(&protocol->IUnknown_inner, riid, ppv); + IUnknown_Release(&protocol->IUnknown_inner); + return hres; +} + /******************************************************************** * about protocol implementation */ @@ -380,34 +423,9 @@ static const IInternetProtocolVtbl AboutProtocolVtbl = { static HRESULT WINAPI AboutProtocolFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { - InternetProtocol *ret; - HRESULT hres = S_OK; - TRACE("(%p)->(%p %s %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppv); - ret = heap_alloc(sizeof(InternetProtocol)); - ret->IInternetProtocol_iface.lpVtbl = &AboutProtocolVtbl; - ret->ref = 0; - - ret->data = NULL; - ret->data_len = 0; - ret->cur = 0; - ret->pUnkOuter = pUnkOuter; - - if(pUnkOuter) { - ret->ref = 1; - if(IsEqualGUID(&IID_IUnknown, riid)) - *ppv = &ret->IInternetProtocol_iface; - else - hres = E_INVALIDARG; - }else { - hres = IInternetProtocol_QueryInterface(&ret->IInternetProtocol_iface, riid, ppv); - } - - if(FAILED(hres)) - heap_free(ret); - - return hres; + return create_protocol_instance(&AboutProtocolVtbl, pUnkOuter, riid, ppv); } static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, @@ -654,33 +672,9 @@ static const IInternetProtocolVtbl ResProtocolVtbl = { static HRESULT WINAPI ResProtocolFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { - InternetProtocol *ret; - HRESULT hres = S_OK; - TRACE("(%p)->(%p %s %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppv); - ret = heap_alloc(sizeof(InternetProtocol)); - ret->IInternetProtocol_iface.lpVtbl = &ResProtocolVtbl; - ret->ref = 0; - ret->data = NULL; - ret->data_len = 0; - ret->cur = 0; - ret->pUnkOuter = pUnkOuter; - - if(pUnkOuter) { - ret->ref = 1; - if(IsEqualGUID(&IID_IUnknown, riid)) - *ppv = &ret->IInternetProtocol_iface; - else - hres = E_FAIL; - }else { - hres = IInternetProtocol_QueryInterface(&ret->IInternetProtocol_iface, riid, ppv); - } - - if(FAILED(hres)) - heap_free(ret); - - return hres; + return create_protocol_instance(&ResProtocolVtbl, pUnkOuter, riid, ppv); } static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl,

1 0

Jacek Caban : mshtml: Share more code between res and about protocol handlers.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: 6c91835400853d41941c16438d625f9b0840bb3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c91835400853d41941c1643… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 15:27:11 2018 +0200 mshtml: Share more code between res and about protocol handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/protocol.c | 366 +++++++++++++++---------------------------------- 1 file changed, 112 insertions(+), 254 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c91835400853d41941c…

1 0

Jacek Caban : jscript: Support setting accessor property value.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: ff829f0beb27b42d332a08c9b01ee9e1dcc2f77c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff829f0beb27b42d332a08c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 13:26:52 2018 +0200 jscript: Support setting accessor property value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 30 +++++++++++++++++++++--------- dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e6835db..9b47368 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -296,15 +296,12 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *n return S_OK; } -static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, BOOL search_prot, DWORD create_flags, dispex_prop_t **ret) +static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) { dispex_prop_t *prop; HRESULT hres; - if(search_prot) - hres = find_prop_name_prot(This, string_hash(name), name, &prop); - else - hres = find_prop_name(This, string_hash(name), name, &prop); + hres = find_prop_name_prot(This, string_hash(name), name, &prop); if(SUCCEEDED(hres) && (!prop || prop->type == PROP_DELETED)) { TRACE("creating prop %s flags %x\n", debugstr_w(name), create_flags); @@ -495,6 +492,18 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) { HRESULT hres; + if(prop->type == PROP_PROTREF) { + dispex_prop_t *prop_iter = prop; + jsdisp_t *prototype_iter = This; + + do { + prototype_iter = prototype_iter->prototype; + prop_iter = prototype_iter->props + prop_iter->u.ref; + } while(prop_iter->type == PROP_PROTREF); + + if(prop_iter->type == PROP_ACCESSOR) + prop = prop_iter; + } switch(prop->type) { case PROP_BUILTIN: @@ -516,8 +525,11 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) jsval_release(prop->u.val); break; case PROP_ACCESSOR: - FIXME("not supported for accessor properties\n"); - return E_NOTIMPL; + if(!prop->u.accessor.setter) { + TRACE("no setter\n"); + return S_OK; + } + return jsdisp_call_value(prop->u.accessor.setter, to_disp(This), DISPATCH_METHOD, 1, &val, NULL); case PROP_IDX: if(!This->builtin_info->idx_put) { TRACE("no put_idx\n"); @@ -1079,7 +1091,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * HRESULT hres; if(flags & fdexNameEnsure) - hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, + hres = ensure_prop_name(jsdisp, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, &prop); else hres = find_prop_name_prot(jsdisp, string_hash(name), name, &prop); @@ -1343,7 +1355,7 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, FALSE, flags, &prop); + hres = ensure_prop_name(obj, name, flags, &prop); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 4e7b83b..62cf12a 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -258,6 +258,10 @@ function test_defineProperty() { test_accessor_prop_desc(obj, "getsetprop", desc); ok(obj.getsetprop === 1, "getsetprop = " + obj.getsetprop); + obj.getsetprop = 2; + ok(getsetprop_value === 2, "getsetprop_value = " + getsetprop_value); + test_accessor_prop_desc(obj, "getsetprop", desc); + ok(obj.getsetprop === 2, "getsetprop = " + obj.getsetprop); Object.defineProperty(obj, "notConf", {writable: true, enumerable: true, configurable: false, value: 1}); test_own_data_prop_desc(obj, "notConf", true, true, false); @@ -395,6 +399,9 @@ function test_defineProperty() { obj = new child(); getsetprop_value = 6; ok(obj.parent_accessor === 6, "parent_accessor = " + obj.parent_accessor); + obj.parent_accessor = 1; + ok(getsetprop_value === 1, "getsetprop_value = " + getsetprop_value); + ok(obj.parent_accessor === 1, "parent_accessor = " + obj.parent_accessor); ok(Object.getOwnPropertyDescriptor(obj, "parent_accessor") === undefined, "getOwnPropertyDescriptor(parent_accessor) did not return undefined"); @@ -404,6 +411,19 @@ function test_defineProperty() { Object.defineProperty(child.prototype, "parent_accessor", desc); ok(obj.parent_accessor === undefined, "parent_accessor = " + obj.parent_accessor); + /* no setter */ + desc = { + get: function() { + ok(this === obj, "this != obj"); + return true; + }, + configurable: true + }; + Object.defineProperty(obj, "no_setter", desc); + test_accessor_prop_desc(obj, "no_setter", desc); + obj.no_setter = false; + ok(obj.no_setter === true, "no_setter = " + obj.no_setter); + next_test(); }

1 0

Jacek Caban : jscript: Move handling PROPF_WRITABLE to property type specific code.
by Alexandre Julliard May 15, 2018

May 15, 2018

Module: wine Branch: master Commit: 887840a888d26f1d4cfc554d3e408f81d3858ea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887840a888d26f1d4cfc554d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 13:26:38 2018 +0200 jscript: Move handling PROPF_WRITABLE to property type specific code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2557471..e6835db 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -495,28 +495,34 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) { HRESULT hres; - if(!(prop->flags & PROPF_WRITABLE) && prop->type != PROP_PROTREF) - return S_OK; switch(prop->type) { case PROP_BUILTIN: - if(prop->u.p->setter) - return prop->u.p->setter(This->ctx, This, val); - - if(prop->u.p->setter) { - FIXME("getter with no setter\n"); - return E_FAIL; + if(!prop->u.p->setter) { + TRACE("getter with no setter\n"); + return S_OK; } - /* fall through */ + return prop->u.p->setter(This->ctx, This, val); case PROP_PROTREF: + case PROP_DELETED: prop->type = PROP_JSVAL; prop->flags = PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE; prop->u.val = jsval_undefined(); break; case PROP_JSVAL: + if(!(prop->flags & PROPF_WRITABLE)) + return S_OK; + jsval_release(prop->u.val); break; + case PROP_ACCESSOR: + FIXME("not supported for accessor properties\n"); + return E_NOTIMPL; case PROP_IDX: + if(!This->builtin_info->idx_put) { + TRACE("no put_idx\n"); + return S_OK; + } return This->builtin_info->idx_put(This, prop->u.idx, val); default: ERR("type %d\n", prop->type);

1 0