wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Gabriel Ivăncescu : mshtml: Implement window.setTimeout with a hook.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: 8dbdded67366fce7e1e459570d99e90a72cf52cd URL: https://gitlab.winehq.org/wine/wine/-/commit/8dbdded67366fce7e1e459570d99e9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:29 2022 +0300 mshtml: Implement window.setTimeout with a hook. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 56 ++++++++++++++++++++++------------------------ dlls/mshtml/tests/events.c | 26 ++++++++++++++++++++- 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c3267e1e4ca..0043fb79731 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3614,34 +3614,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { HTMLWindow *This = impl_from_IDispatchEx(iface); - HTMLInnerWindow *window = This->inner_window; - - TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - - switch(id) { - case DISPID_IHTMLWINDOW2_SETTIMEOUT: - case DISPID_IHTMLWINDOW3_SETTIMEOUT: { - VARIANT args[2]; - DISPPARAMS dp = {args, NULL, 2, 0}; - - /* - * setTimeout calls should use default value 0 for the second argument if only one is provided, - * but IDL file does not reflect that. We fixup arguments here instead. - */ - if(!(wFlags & DISPATCH_METHOD) || pdp->cArgs != 1 || pdp->cNamedArgs) - break; - - TRACE("Fixing args\n"); - - V_VT(args) = VT_I4; - V_I4(args) = 0; - args[1] = *pdp->rgvarg; - return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, - wFlags, &dp, pvarRes, pei, pspCaller); - } - } - - return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return IDispatchEx_InvokeEx(&This->inner_window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) @@ -3915,12 +3888,37 @@ static HRESULT IHTMLWindow2_location_hook(DispatchEx *dispex, WORD flags, DISPPA return hres; } +static HRESULT IHTMLWindow3_setTimeout_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + /* + * setTimeout calls should use default value 0 for the second argument if only one is provided, + * but IDL file does not reflect that. We fixup arguments here instead. + */ + if(!(flags & DISPATCH_METHOD) || dp->cArgs != 1 || dp->cNamedArgs) + return S_FALSE; + + TRACE("Fixing args\n"); + + V_VT(args) = VT_I4; + V_I4(args) = 0; + args[1] = dp->rgvarg[0]; + return dispex_call_builtin(dispex, DISPID_IHTMLWINDOW3_SETTIMEOUT, &new_dp, res, ei, caller); +} + static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { static const dispex_hook_t window2_hooks[] = { {DISPID_IHTMLWINDOW2_LOCATION, IHTMLWindow2_location_hook}, {DISPID_UNKNOWN} }; + static const dispex_hook_t window3_hooks[] = { + {DISPID_IHTMLWINDOW3_SETTIMEOUT, IHTMLWindow3_setTimeout_hook}, + {DISPID_UNKNOWN} + }; if(compat_mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLWindow7_tid, NULL); @@ -3930,7 +3928,7 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IWineHTMLWindowPrivate_tid, NULL); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); - dispex_info_add_interface(info, IHTMLWindow3_tid, NULL); + dispex_info_add_interface(info, IHTMLWindow3_tid, window3_hooks); dispex_info_add_interface(info, IHTMLWindow2_tid, window2_hooks); EventTarget_init_dispex_info(info, compat_mode); } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 95ed071bf78..c5210e721d2 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2523,11 +2523,35 @@ static void test_submit(IHTMLDocument2 *doc) static void test_timeout(IHTMLDocument2 *doc) { + VARIANT expr, var, args[2]; + DISPPARAMS dp = { args, NULL, 2, 0 }; IHTMLWindow3 *win3; - VARIANT expr, var; + IDispatch *disp; + UINT argerr; LONG id; HRESULT hres; + /* First try the IHTMLWindow2 DISPIDs via IDispatch, since they're not exposed */ + hres = IHTMLWindow2_QueryInterface(window, &IID_IDispatch, (void**)&disp); + ok(hres == S_OK, "Could not get IDispatch iface: %08lx\n", hres); + + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(L""); + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 1; + V_VT(&var) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_IHTMLWINDOW2_SETINTERVAL, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, &var, NULL, &argerr); + todo_wine + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke(DISPID_IHTMLWINDOW2_SETINTERVAL) returned: %08lx\n", hres); + + hres = IDispatch_Invoke(disp, DISPID_IHTMLWINDOW2_SETTIMEOUT, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, &var, NULL, &argerr); + todo_wine + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke(DISPID_IHTMLWINDOW2_SETTIMEOUT) returned: %08lx\n", hres); + SysFreeString(V_BSTR(&args[1])); + IDispatch_Release(disp); + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow3, (void**)&win3); ok(hres == S_OK, "Could not get IHTMLWindow3 iface: %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml: Implement window.location setter with a hook.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: e275b2197b23996172c112877c85c9b4459c0611 URL: https://gitlab.winehq.org/wine/wine/-/commit/e275b2197b23996172c112877c85c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:29 2022 +0300 mshtml: Implement window.location setter with a hook. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3ab42af0fa4..c3267e1e4ca 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3619,24 +3619,6 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); switch(id) { - case DISPID_IHTMLWINDOW2_LOCATION: { - HTMLLocation *location; - HRESULT hres; - - if(!(wFlags & DISPATCH_PROPERTYPUT)) - break; - - TRACE("forwarding to location.href\n"); - - hres = get_location(window, &location); - if(FAILED(hres)) - return hres; - - hres = IDispatchEx_InvokeEx(&location->dispex.IDispatchEx_iface, DISPID_VALUE, lcid, - wFlags, pdp, pvarRes, pei, pspCaller); - IHTMLLocation_Release(&location->IHTMLLocation_iface); - return hres; - } case DISPID_IHTMLWINDOW2_SETTIMEOUT: case DISPID_IHTMLWINDOW3_SETTIMEOUT: { VARIANT args[2]; @@ -3912,8 +3894,34 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) ensure_doc_nsevent_handler(This->doc, NULL, eid); } +static HRESULT IHTMLWindow2_location_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + HTMLLocation *location; + HRESULT hres; + + if(!(flags & DISPATCH_PROPERTYPUT)) + return S_FALSE; + + TRACE("forwarding to location.href\n"); + + hres = get_location(This, &location); + if(FAILED(hres)) + return hres; + + hres = IDispatchEx_InvokeEx(&location->dispex.IDispatchEx_iface, DISPID_VALUE, 0, flags, dp, res, ei, caller); + IHTMLLocation_Release(&location->IHTMLLocation_iface); + return hres; +} + static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { + static const dispex_hook_t window2_hooks[] = { + {DISPID_IHTMLWINDOW2_LOCATION, IHTMLWindow2_location_hook}, + {DISPID_UNKNOWN} + }; + if(compat_mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLWindow7_tid, NULL); else @@ -3922,6 +3930,8 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IWineHTMLWindowPrivate_tid, NULL); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); + dispex_info_add_interface(info, IHTMLWindow3_tid, NULL); + dispex_info_add_interface(info, IHTMLWindow2_tid, window2_hooks); EventTarget_init_dispex_info(info, compat_mode); } @@ -3948,8 +3958,6 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { }; static const tid_t HTMLWindow_iface_tids[] = { - IHTMLWindow2_tid, - IHTMLWindow3_tid, IHTMLWindow4_tid, IHTMLWindow6_tid, 0

1 0

Gabriel Ivăncescu : mshtml: Forward Document's Invoke to InvokeEx.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: 4cc16ada4b96c53a9a4d2383298373fd5a273827 URL: https://gitlab.winehq.org/wine/wine/-/commit/4cc16ada4b96c53a9a4d2383298373… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:29 2022 +0300 mshtml: Forward Document's Invoke to InvokeEx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 38 +++++++++++++++++++++----------------- dlls/mshtml/tests/htmldoc.c | 10 ++++++++++ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0cf19388481..3cbd229f19e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4912,20 +4912,8 @@ static HRESULT WINAPI DocDispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMemb TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - switch(dispIdMember) { - case DISPID_READYSTATE: - TRACE("DISPID_READYSTATE\n"); - - if(!(wFlags & DISPATCH_PROPERTYGET)) - return E_INVALIDARG; - - V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = This->window->readystate; - return S_OK; - } - - return IDispatchEx_Invoke(This->dispex, dispIdMember, riid, lcid, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) @@ -4945,10 +4933,26 @@ static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID { HTMLDocument *This = impl_from_IDispatchEx(iface); - if(This->window && id == DISPID_IHTMLDOCUMENT2_LOCATION && (wFlags & DISPATCH_PROPERTYPUT)) - return IDispatchEx_InvokeEx(&This->window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, - lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(This->window) { + switch(id) { + case DISPID_READYSTATE: + TRACE("DISPID_READYSTATE\n"); + + if(!(wFlags & DISPATCH_PROPERTYGET)) + return E_INVALIDARG; + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = This->window->readystate; + return S_OK; + case DISPID_IHTMLDOCUMENT2_LOCATION: + if(!(wFlags & DISPATCH_PROPERTYPUT)) + break; + return IDispatchEx_InvokeEx(&This->window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, + lcid, wFlags, pdp, pvarRes, pei, pspCaller); + default: + break; + } + } return IDispatchEx_InvokeEx(This->dispex, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ff050863b6f..7764f256ab0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5364,6 +5364,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) { IHTMLDocument2 *htmldoc; DISPPARAMS dispparams; + IDispatchEx *dispex; IHTMLElement *elem; BSTR state; VARIANT out; @@ -5437,6 +5438,15 @@ static void _test_readyState(unsigned line, IUnknown *unk) ok_(__FILE__,line) (V_VT(&out) == VT_I4, "V_VT(out)=%d\n", V_VT(&out)); ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%ld, expected %d\n", V_I4(&out), load_state%5); + hres = IHTMLDocument2_QueryInterface(htmldoc, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "QueryInterface(IID_IDispatchEx) failed: %08lx\n", hres); + hres = IDispatchEx_InvokeEx(dispex, DISPID_READYSTATE, 0, DISPATCH_PROPERTYGET, &dispparams, &out, NULL, NULL); + ok(hres == S_OK, "InvokeEx(DISPID_READYSTATE) failed: %08lx\n", hres); + IDispatchEx_Release(dispex); + + ok_(__FILE__,line) (V_VT(&out) == VT_I4, "V_VT(out)=%d\n", V_VT(&out)); + ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%ld, expected %d\n", V_I4(&out), load_state%5); + test_doscroll((IUnknown*)htmldoc); IHTMLDocument2_Release(htmldoc);

1 0

Akihiro Sagawa : ieframe: Allow STGM_WRITE in IPropertyStorage::Open.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: b1281f9cf89fa50c36fbd7a8b3acbb4475ef9a77 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1281f9cf89fa50c36fbd7a8b3acbb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 12 19:45:46 2022 +0900 ieframe: Allow STGM_WRITE in IPropertyStorage::Open. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ieframe/intshcut.c | 5 +++++ dlls/ieframe/tests/intshcut.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 8938a2d9c71..e1dda3f6c1c 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -718,9 +718,14 @@ static HRESULT WINAPI PropertySetStorage_Open( DWORD grfMode, IPropertyStorage **ppprstg) { + const DWORD STGM_ACCESS_MASK = 0x0000000f; InternetShortcut *This = impl_from_IPropertySetStorage(iface); TRACE("(%s, 0x%lx, %p)\n", debugstr_guid(rfmtid), grfMode, ppprstg); + /* ole32 doesn't like STGM_WRITE */ + if ((grfMode & STGM_ACCESS_MASK) == STGM_WRITE) + grfMode = (grfMode & ~STGM_ACCESS_MASK) | STGM_READWRITE; + /* Note: The |STGM_SHARE_EXCLUSIVE is to cope with a bug in the implementation. Should be fixed in ole32. */ return IPropertySetStorage_Open(This->property_set_storage, rfmtid, diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 5d9baa7cd9f..b5487491414 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -236,7 +236,7 @@ static void test_ReadAndWriteProperties(void) /* Test with STGM_WRITE */ hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_WRITE, &pPropStgWrite); - todo_wine ok(hr == S_OK, "Unable to get an IPropertyStorage for writing, hr=0x%lx\n", hr); + ok(hr == S_OK, "Unable to get an IPropertyStorage for writing, hr=0x%lx\n", hr); if (hr == S_OK) {

1 0

Akihiro Sagawa : ieframe/tests: Add a test for IPropertySetStorage::Open with STGM_WRITE.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: e31ec426ec6928af3282bd4a1afa95033a5bbbb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e31ec426ec6928af3282bd4a1afa95… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 12 19:45:46 2022 +0900 ieframe/tests: Add a test for IPropertySetStorage::Open with STGM_WRITE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ieframe/tests/intshcut.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 9778d77cd11..5d9baa7cd9f 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -233,6 +233,25 @@ static void test_ReadAndWriteProperties(void) ok(hr == S_OK, "Failed to commit properties, hr=0x%lx\n", hr); pPropStgWrite->lpVtbl->Release(pPropStgWrite); + + /* Test with STGM_WRITE */ + hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_WRITE, &pPropStgWrite); + todo_wine ok(hr == S_OK, "Unable to get an IPropertyStorage for writing, hr=0x%lx\n", hr); + + if (hr == S_OK) + { + memset(pvread, 0, sizeof(pvread)); + hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); + ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); + ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); + ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); + ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + PropVariantClear(&pvread[0]); + PropVariantClear(&pvread[1]); + + IPropertyStorage_Release(pPropStgWrite); + } urlA->lpVtbl->Release(urlA); IPropertySetStorage_Release(pPropSetStg); }

1 0

Akihiro Sagawa : ieframe/tests: Add more IPropertyStorage read/write tests.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: 3535fe2591415baf60c647ab85318d0316d7c9f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/3535fe2591415baf60c647ab85318d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 12 19:45:46 2022 +0900 ieframe/tests: Add more IPropertyStorage read/write tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ieframe/tests/intshcut.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 4e86000d610..9778d77cd11 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -173,12 +173,18 @@ static void test_ReadAndWriteProperties(void) WCHAR fileNameW[MAX_PATH]; static WCHAR iconPath[] = L"file:///C:/arbitrary/icon/path"; char testurl[] = "http://some/bogus/url.html"; + PROPVARIANT pv[2], pvread[2]; ps[0].ulKind = PRSPEC_PROPID; U(ps[0]).propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; U(ps[1]).propid = PID_IS_ICONINDEX; + pv[0].vt = VT_LPWSTR; + U(pv[0]).pwszVal = iconPath; + pv[1].vt = VT_I4; + U(pv[1]).lVal = iconIndex; + /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); lstrcatW(fileNameW, L"testshortcut.url"); @@ -190,7 +196,6 @@ static void test_ReadAndWriteProperties(void) IPersistFile *pf; IPropertyStorage *pPropStgWrite; IPropertySetStorage *pPropSetStg; - PROPVARIANT pv[2]; /* We need to set a URL -- IPersistFile refuses to save without one. */ hr = urlA->lpVtbl->SetURL(urlA, testurl, 0); @@ -205,10 +210,6 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); - pv[0].vt = VT_LPWSTR; - U(pv[0]).pwszVal = iconPath; - pv[1].vt = VT_I4; - U(pv[1]).lVal = iconIndex; hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%lx\n", hr); @@ -218,6 +219,16 @@ static void test_ReadAndWriteProperties(void) hr = IPropertyStorage_WriteMultiple(pPropStgWrite, 2, ps, pv, 0); ok(hr == S_OK, "Unable to set properties, hr=0x%lx\n", hr); + memset(pvread, 0, sizeof(pvread)); + hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); + ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); + ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); + ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); + ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + PropVariantClear(&pvread[0]); + PropVariantClear(&pvread[1]); + hr = IPropertyStorage_Commit(pPropStgWrite, STGC_DEFAULT); ok(hr == S_OK, "Failed to commit properties, hr=0x%lx\n", hr); @@ -268,6 +279,10 @@ static void test_ReadAndWriteProperties(void) } PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); + + hr = IPropertyStorage_WriteMultiple(pPropStgRead, 2, ps, pv, 0); + ok(hr == STG_E_ACCESSDENIED, "setting properties should return STG_E_ACCESSDENIED instead of 0x%lx\n", hr); + IPropertyStorage_Release(pPropStgRead); IPropertySetStorage_Release(pPropSetStg); urlAFromFile->lpVtbl->Release(urlAFromFile);

1 0

Jacek Caban : wow64win: Fix NULL msg handling in wow64_NtUserPeekMessage.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: c5d8ebe7abc145b28c9a36ed4cd674a5501b02d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5d8ebe7abc145b28c9a36ed4cd674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 15:32:40 2022 +0200 wow64win: Fix NULL msg handling in wow64_NtUserPeekMessage. --- dlls/wow64win/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 551ba44ccd9..6aecdacda39 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2209,7 +2209,7 @@ NTSTATUS WINAPI wow64_NtUserPeekMessage( UINT *args ) UINT flags = get_ulong( &args ); MSG msg; - if (!NtUserPeekMessage( &msg, hwnd, first, last, flags )) return FALSE; + if (!NtUserPeekMessage( msg32 ? &msg : NULL, hwnd, first, last, flags )) return FALSE; msg_64to32( &msg, msg32 ); return TRUE; }

1 0

Jacek Caban : wow64win: Fix error handling in wow64_NtUserGetMessage.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: 901ccc8e612cf6e100d44809621fec81428a4db5 URL: https://gitlab.winehq.org/wine/wine/-/commit/901ccc8e612cf6e100d44809621fec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 15:29:48 2022 +0200 wow64win: Fix error handling in wow64_NtUserGetMessage. --- dlls/wow64win/user.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7c6abd5bef6..551ba44ccd9 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1565,10 +1565,11 @@ NTSTATUS WINAPI wow64_NtUserGetMessage( UINT *args ) UINT first = get_ulong( &args ); UINT last = get_ulong( &args ); MSG msg; + int ret; - if (!NtUserGetMessage( &msg, hwnd, first, last )) return FALSE; - msg_64to32( &msg, msg32 ); - return TRUE; + ret = NtUserGetMessage( &msg, hwnd, first, last ); + if (ret != -1) msg_64to32( &msg, msg32 ); + return ret; } NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args )

1 0

Jacek Caban : wow64win: Always set output bits pointer in wow64_NtGdiCreateDIBSection.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: 76e28e6029aa64302ef2b009750955051b7c6d1a URL: https://gitlab.winehq.org/wine/wine/-/commit/76e28e6029aa64302ef2b009750955… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 13:53:53 2022 +0200 wow64win: Always set output bits pointer in wow64_NtGdiCreateDIBSection. --- dlls/wow64win/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index f13ed3da1f0..5ddadaa642b 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -136,7 +136,7 @@ NTSTATUS WINAPI wow64_NtGdiCreateDIBSection( UINT *args ) ret = NtGdiCreateDIBSection( hdc, section, offset, bmi, usage, header_size, flags, color_space, addr_32to64( &bits, bits32 )); - if (ret) put_addr( bits32, bits ); + put_addr( bits32, bits ); return HandleToUlong( ret ); }

1 0

Jacek Caban : wow64win: Handle bitmaps and pens in wow64_NtGdiExtGetObjectW.
by Alexandre Julliard 13 Aug '22

13 Aug '22

Module: wine Branch: master Commit: c3c82bd96a399c90f548639ce8f879a4b0c5c601 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3c82bd96a399c90f548639ce8f879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 15:17:24 2022 +0200 wow64win: Handle bitmaps and pens in wow64_NtGdiExtGetObjectW. --- dlls/wow64win/gdi.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 4d98a1b9b13..f13ed3da1f0 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -27,6 +27,35 @@ #include "ntgdi.h" #include "wow64win_private.h" +typedef struct +{ + INT bmType; + INT bmWidth; + INT bmHeight; + INT bmWidthBytes; + WORD bmPlanes; + WORD bmBitsPixel; + ULONG bmBits; +} BITMAP32; + +typedef struct +{ + DWORD elpPenStyle; + DWORD elpWidth; + UINT elpBrushStyle; + COLORREF elpColor; + ULONG elpHatch; + DWORD elpNumEntries; + DWORD elpStyleEntry[1]; +} EXTLOGPEN32; + + +static DWORD gdi_handle_type( HGDIOBJ obj ) +{ + unsigned int handle = HandleToUlong( obj ); + return handle & NTGDI_HANDLE_TYPE_MASK; +} + NTSTATUS WINAPI wow64_NtGdiAddFontMemResourceEx( UINT *args ) { void *ptr = get_ptr( &args ); @@ -334,7 +363,91 @@ NTSTATUS WINAPI wow64_NtGdiExtGetObjectW( UINT *args ) INT count = get_ulong( &args ); void *buffer = get_ptr( &args ); - return NtGdiExtGetObjectW( handle, count, buffer ); + switch (gdi_handle_type( handle )) + { + case NTGDI_OBJ_BITMAP: + { + BITMAP32 *bitmap32 = buffer; + struct + { + BITMAP32 dsBm; + BITMAPINFOHEADER dsBmih; + DWORD dsBitfields[3]; + ULONG dshSection; + DWORD dsOffset; + } *dib32 = buffer; + DIBSECTION dib; + int ret; + + if (buffer) + { + if (count < sizeof(*bitmap32)) return 0; + count = count < sizeof(*dib32) ? sizeof(BITMAP) : sizeof(DIBSECTION); + } + + if (!(ret = NtGdiExtGetObjectW( handle, count, buffer ? &dib : NULL ))) return 0; + + if (bitmap32) + { + bitmap32->bmType = dib.dsBm.bmType; + bitmap32->bmWidth = dib.dsBm.bmWidth; + bitmap32->bmHeight = dib.dsBm.bmHeight; + bitmap32->bmWidthBytes = dib.dsBm.bmWidthBytes; + bitmap32->bmPlanes = dib.dsBm.bmPlanes; + bitmap32->bmBitsPixel = dib.dsBm.bmBitsPixel; + bitmap32->bmBits = PtrToUlong( dib.dsBm.bmBits ); + } + if (ret != sizeof(dib)) return sizeof(*bitmap32); + + if (dib32) + { + dib32->dsBmih = dib.dsBmih; + dib32->dsBitfields[0] = dib.dsBitfields[0]; + dib32->dsBitfields[1] = dib.dsBitfields[1]; + dib32->dsBitfields[2] = dib.dsBitfields[2]; + dib32->dshSection = HandleToUlong( dib.dshSection ); + dib32->dsOffset = dib.dsOffset; + } + return sizeof(*dib32); + } + + case NTGDI_OBJ_PEN: + case NTGDI_OBJ_EXTPEN: + { + EXTLOGPEN32 *pen32 = buffer; + EXTLOGPEN *pen = NULL; + + if (count == sizeof(LOGPEN) || (buffer && !HIWORD( buffer ))) + return NtGdiExtGetObjectW( handle, count, buffer ); + + if (pen32 && count && !(pen = Wow64AllocateTemp( count + sizeof(ULONG) ))) return 0; + count = NtGdiExtGetObjectW( handle, count + sizeof(ULONG), pen ); + + if (count == sizeof(LOGPEN)) + { + if (buffer) memcpy( buffer, pen, count ); + } + else if (count) + { + if (pen32) + { + pen32->elpPenStyle = pen->elpPenStyle; + pen32->elpWidth = pen->elpWidth; + pen32->elpBrushStyle = pen->elpBrushStyle; + pen32->elpColor = pen->elpColor; + pen32->elpHatch = pen->elpHatch; + pen32->elpNumEntries = pen->elpNumEntries; + } + count -= FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ); + if (count && pen32) memcpy( pen32->elpStyleEntry, pen->elpStyleEntry, count ); + count += FIELD_OFFSET( EXTLOGPEN32, elpStyleEntry ); + } + return count; + } + + default: + return NtGdiExtGetObjectW( handle, count, buffer ); + } } NTSTATUS WINAPI wow64_NtGdiFlattenPath( UINT *args )

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
60
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 August 2022