wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Gabriel Ivăncescu : mshtml: Implement enumerator for HTMLFormElement.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: f9fd7b77a2ec830d3f222fda5118fd107d98259f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9fd7b77a2ec830d3f222fda… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:55 2022 +0300 mshtml: Implement enumerator for HTMLFormElement. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlform.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 39 +++++++++++- 2 files changed, 193 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 45ff19aaa77..18b56ae54a8 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -41,6 +41,15 @@ struct HTMLFormElement { nsIDOMHTMLFormElement *nsform; }; +typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLFormElement *elem; +} HTMLFormElementEnum; + HRESULT return_nsform(nsresult nsres, nsIDOMHTMLFormElement *form, IHTMLFormElement **p) { nsIDOMNode *form_node; @@ -108,6 +117,135 @@ static HRESULT htmlform_item(HTMLFormElement *This, int i, IDispatch **ret) return S_OK; } +static inline HTMLFormElementEnum *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLFormElementEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLFormElementEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLFormElementEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLFormElementEnum_Release(IEnumVARIANT *iface) +{ + HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IHTMLFormElement_Release(&This->elem->IHTMLFormElement_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLFormElementEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface); + nsresult nsres; + HRESULT hres; + ULONG num, i; + LONG len; + + TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched); + + nsres = nsIDOMHTMLFormElement_GetLength(This->elem->nsform, &len); + if(NS_FAILED(nsres)) + return E_FAIL; + num = min(len - This->iter, celt); + + for(i = 0; i < num; i++) { + hres = htmlform_item(This->elem, This->iter + i, &V_DISPATCH(&rgVar[i])); + if(FAILED(hres)) { + while(i--) + VariantClear(&rgVar[i]); + return hres; + } + V_VT(&rgVar[i]) = VT_DISPATCH; + } + + This->iter += num; + if(pCeltFetched) + *pCeltFetched = num; + return num == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLFormElementEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface); + nsresult nsres; + LONG len; + + TRACE("(%p)->(%lu)\n", This, celt); + + nsres = nsIDOMHTMLFormElement_GetLength(This->elem->nsform, &len); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(This->iter + celt > len) { + This->iter = len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLFormElementEnum_Reset(IEnumVARIANT *iface) +{ + HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLFormElementEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLFormElementEnum *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLFormElementEnumVtbl = { + HTMLFormElementEnum_QueryInterface, + HTMLFormElementEnum_AddRef, + HTMLFormElementEnum_Release, + HTMLFormElementEnum_Next, + HTMLFormElementEnum_Skip, + HTMLFormElementEnum_Reset, + HTMLFormElementEnum_Clone +}; + static inline HTMLFormElement *impl_from_IHTMLFormElement(IHTMLFormElement *iface) { return CONTAINING_RECORD(iface, HTMLFormElement, IHTMLFormElement_iface); @@ -545,8 +683,23 @@ static HRESULT WINAPI HTMLFormElement_get_length(IHTMLFormElement *iface, LONG * static HRESULT WINAPI HTMLFormElement__newEnum(IHTMLFormElement *iface, IUnknown **p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLFormElementEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLFormElementEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + HTMLFormElement_AddRef(&This->IHTMLFormElement_iface); + ret->elem = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI HTMLFormElement_item(IHTMLFormElement *iface, VARIANT name, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 00c15773f96..bd4b7724e89 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5504,7 +5504,10 @@ static void test_form_item(IHTMLElement *elem) { IHTMLFormElement *form = get_form_iface((IUnknown*)elem); IDispatch *disp, *disp2; - VARIANT name, index; + IEnumVARIANT *enum_var; + VARIANT name, index, v; + IUnknown *enum_unk; + ULONG fetched; HRESULT hres; V_VT(&index) = VT_EMPTY; @@ -5543,6 +5546,40 @@ static void test_form_item(IHTMLElement *elem) ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); IDispatch_Release(disp2); IDispatch_Release(disp); + + hres = IHTMLFormElement_get__newEnum(form, &enum_unk); + ok(hres == S_OK, "_newEnum failed: %08lx\n", hres); + + hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); + IUnknown_Release(enum_unk); + ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08lx\n", hres); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_OK, "Next failed: %08lx\n", hres); + ok(fetched == 1, "fetched = %lu\n", fetched); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) == NULL\n"); + test_disp((IUnknown*)V_DISPATCH(&v), &DIID_DispHTMLTextAreaElement, &CLSID_HTMLTextAreaElement, NULL); + VariantClear(&v); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_OK, "Next failed: %08lx\n", hres); + ok(fetched == 1, "fetched = %lu\n", fetched); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) == NULL\n"); + test_disp((IUnknown*)V_DISPATCH(&v), &DIID_DispHTMLInputElement, &CLSID_HTMLInputElement, NULL); + VariantClear(&v); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_FALSE, "Next failed: %08lx\n", hres); + ok(fetched == 0, "fetched = %lu\n", fetched); + IEnumVARIANT_Release(enum_var); } static void test_create_option_elem(IHTMLDocument2 *doc)

1 0

Gabriel Ivăncescu : mshtml: Implement enumerator for HTMLRectCollection.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 6c98c657079e5a7170c89e8687a3af4247cbdc11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c98c657079e5a7170c89e86… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:54 2022 +0300 mshtml: Implement enumerator for HTMLRectCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 27 +++++++++ 2 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 47c18279689..9ed22495058 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -781,6 +781,139 @@ typedef struct { nsIDOMClientRectList *rect_list; } HTMLRectCollection; +typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLRectCollection *col; +} HTMLRectCollectionEnum; + +static inline HTMLRectCollectionEnum *HTMLRectCollectionEnum_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLRectCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLRectCollectionEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLRectCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLRectCollectionEnum_Release(IEnumVARIANT *iface) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IHTMLRectCollection_Release(&This->col->IHTMLRectCollection_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + VARIANT index; + HRESULT hres; + ULONG num, i; + UINT32 len; + + TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched); + + nsIDOMClientRectList_GetLength(This->col->rect_list, &len); + num = min(len - This->iter, celt); + V_VT(&index) = VT_I4; + + for(i = 0; i < num; i++) { + V_I4(&index) = This->iter + i; + hres = IHTMLRectCollection_item(&This->col->IHTMLRectCollection_iface, &index, &rgVar[i]); + if(FAILED(hres)) { + while(i--) + VariantClear(&rgVar[i]); + return hres; + } + } + + This->iter += num; + if(pCeltFetched) + *pCeltFetched = num; + return num == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + UINT32 len; + + TRACE("(%p)->(%lu)\n", This, celt); + + nsIDOMClientRectList_GetLength(This->col->rect_list, &len); + if(This->iter + celt > len) { + This->iter = len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Reset(IEnumVARIANT *iface) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLRectCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLRectCollectionEnum *This = HTMLRectCollectionEnum_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLRectCollectionEnumVtbl = { + HTMLRectCollectionEnum_QueryInterface, + HTMLRectCollectionEnum_AddRef, + HTMLRectCollectionEnum_Release, + HTMLRectCollectionEnum_Next, + HTMLRectCollectionEnum_Skip, + HTMLRectCollectionEnum_Reset, + HTMLRectCollectionEnum_Clone +}; + static inline HTMLRectCollection *impl_from_IHTMLRectCollection(IHTMLRectCollection *iface) { return CONTAINING_RECORD(iface, HTMLRectCollection, IHTMLRectCollection_iface); @@ -883,8 +1016,23 @@ static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p) { HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLRectCollectionEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLRectCollectionEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + HTMLRectCollection_AddRef(&This->IHTMLRectCollection_iface); + ret->col = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI HTMLRectCollection_item(IHTMLRectCollection *iface, VARIANT *index, VARIANT *result) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 73b983174d5..00c15773f96 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5229,8 +5229,11 @@ static void test_elem_bounding_client_rect(IUnknown *unk) { IHTMLRectCollection *rects; IHTMLRect *rect, *rect2; + IEnumVARIANT *enum_var; IHTMLElement2 *elem2; + IUnknown *enum_unk; VARIANT v, index; + ULONG fetched; LONG l; HRESULT hres; @@ -5285,6 +5288,30 @@ static void test_elem_bounding_client_rect(IUnknown *unk) test_disp((IUnknown*)V_DISPATCH(&v), &IID_IHTMLRect, NULL, L"[object]"); VariantClear(&v); + hres = IHTMLRectCollection_get__newEnum(rects, &enum_unk); + ok(hres == S_OK, "_newEnum failed: %08lx\n", hres); + + hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); + IUnknown_Release(enum_unk); + ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08lx\n", hres); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_OK, "Next failed: %08lx\n", hres); + ok(fetched == 1, "fetched = %lu\n", fetched); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) == NULL\n"); + test_disp((IUnknown*)V_DISPATCH(&v), &IID_IHTMLRect, NULL, L"[object]"); + VariantClear(&v); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_FALSE, "Next failed: %08lx\n", hres); + ok(fetched == 0, "fetched = %lu\n", fetched); + IEnumVARIANT_Release(enum_var); + IHTMLRectCollection_Release(rects); IHTMLElement2_Release(elem2); }

1 0

Gabriel Ivăncescu : mshtml: Implement enumerator for HTMLStyleSheetsCollection.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 7c311fbcc1b89ba833f8e7d2e514cfced43da0a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c311fbcc1b89ba833f8e7d2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:53 2022 +0300 mshtml: Implement enumerator for HTMLStyleSheetsCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 152 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 27 ++++++++ 2 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 2d16f4aceca..2d76e370ed2 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -50,6 +50,15 @@ struct HTMLStyleSheetsCollection { nsIDOMStyleSheetList *nslist; }; +typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLStyleSheetsCollection *col; +} HTMLStyleSheetsCollectionEnum; + struct HTMLStyleSheetRulesCollection { DispatchEx dispex; IHTMLStyleSheetRulesCollection IHTMLStyleSheetRulesCollection_iface; @@ -479,6 +488,130 @@ static HRESULT create_style_sheet_rules_collection(nsIDOMCSSRuleList *nslist, co return S_OK; } +static inline HTMLStyleSheetsCollectionEnum *HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyleSheetsCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLStyleSheetsCollectionEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLStyleSheetsCollectionEnum *This = HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLStyleSheetsCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLStyleSheetsCollectionEnum *This = HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLStyleSheetsCollectionEnum_Release(IEnumVARIANT *iface) +{ + HTMLStyleSheetsCollectionEnum *This = HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IHTMLStyleSheetsCollection_Release(&This->col->IHTMLStyleSheetsCollection_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLStyleSheetsCollectionEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLStyleSheetsCollectionEnum *This = HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(iface); + VARIANT index; + HRESULT hres; + ULONG num, i; + UINT32 len; + + TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched); + + nsIDOMStyleSheetList_GetLength(This->col->nslist, &len); + num = min(len - This->iter, celt); + V_VT(&index) = VT_I4; + + for(i = 0; i < num; i++) { + V_I4(&index) = This->iter + i; + hres = IHTMLStyleSheetsCollection_item(&This->col->IHTMLStyleSheetsCollection_iface, &index, &rgVar[i]); + if(FAILED(hres)) { + while(i--) + VariantClear(&rgVar[i]); + return hres; + } + } + + This->iter += num; + if(pCeltFetched) + *pCeltFetched = num; + return num == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLStyleSheetsCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLStyleSheetsCollectionEnum *This = HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(iface); + UINT32 len; + + TRACE("(%p)->(%lu)\n", This, celt); + + nsIDOMStyleSheetList_GetLength(This->col->nslist, &len); + if(This->iter + celt > len) { + This->iter = len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLStyleSheetsCollectionEnum_Reset(IEnumVARIANT *iface) +{ + HTMLStyleSheetsCollectionEnum *This = HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLStyleSheetsCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLStyleSheetsCollectionEnum *This = HTMLStyleSheetsCollectionEnum_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLStyleSheetsCollectionEnumVtbl = { + HTMLStyleSheetsCollectionEnum_QueryInterface, + HTMLStyleSheetsCollectionEnum_AddRef, + HTMLStyleSheetsCollectionEnum_Release, + HTMLStyleSheetsCollectionEnum_Next, + HTMLStyleSheetsCollectionEnum_Skip, + HTMLStyleSheetsCollectionEnum_Reset, + HTMLStyleSheetsCollectionEnum_Clone +}; + static inline HTMLStyleSheetsCollection *impl_from_IHTMLStyleSheetsCollection(IHTMLStyleSheetsCollection *iface) { return CONTAINING_RECORD(iface, HTMLStyleSheetsCollection, IHTMLStyleSheetsCollection_iface); @@ -586,8 +719,23 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_get__newEnum(IHTMLStyleSheetsCol IUnknown **p) { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLStyleSheetsCollectionEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLStyleSheetsCollectionEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + HTMLStyleSheetsCollection_AddRef(&This->IHTMLStyleSheetsCollection_iface); + ret->col = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection *iface, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4af0e9bcfc4..73b983174d5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8577,7 +8577,10 @@ static void test_stylesheet(IDispatch *disp) static void test_stylesheets(IHTMLDocument2 *doc) { IHTMLStyleSheetsCollection *col = NULL; + IEnumVARIANT *enum_var; + IUnknown *enum_unk; VARIANT idx, res; + ULONG fetched; LONG len = 0; HRESULT hres; @@ -8611,6 +8614,30 @@ static void test_stylesheets(IHTMLDocument2 *doc) ok(V_VT(&res) == VT_EMPTY, "V_VT(res) = %d\n", V_VT(&res)); VariantClear(&res); + hres = IHTMLStyleSheetsCollection_get__newEnum(col, &enum_unk); + ok(hres == S_OK, "_newEnum failed: %08lx\n", hres); + + hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); + IUnknown_Release(enum_unk); + ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08lx\n", hres); + + fetched = 0; + V_VT(&res) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &res, &fetched); + ok(hres == S_OK, "Next failed: %08lx\n", hres); + ok(fetched == 1, "fetched = %lu\n", fetched); + ok(V_VT(&res) == VT_DISPATCH, "V_VT(res) = %d\n", V_VT(&res)); + ok(V_DISPATCH(&res) != NULL, "V_DISPATCH(&res) == NULL\n"); + test_disp2((IUnknown*)V_DISPATCH(&res), &DIID_DispHTMLStyleSheet, &IID_IHTMLStyleSheet, NULL, L"[object]"); + VariantClear(&res); + + fetched = 0; + V_VT(&res) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &res, &fetched); + ok(hres == S_FALSE, "Next failed: %08lx\n", hres); + ok(fetched == 0, "fetched = %lu\n", fetched); + IEnumVARIANT_Release(enum_var); + IHTMLStyleSheetsCollection_Release(col); }

1 0

Gabriel Ivăncescu : jscript: Defer lookup to the actual locals for function statements.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 2bdce91e8f63088b3ab0eef678e03fb59853f30c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bdce91e8f63088b3ab0eef6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:52 2022 +0300 jscript: Defer lookup to the actual locals for function statements. Functions declared as function statements have an associated local_ref and can be changed from within themselves by using their name (by literally changing the local variable), while function expressions can not. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 6 ++++-- dlls/mshtml/tests/es5.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c483f2adb0a..73b9d868e0c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -587,7 +587,8 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ scope->obj = to_disp(scope->jsobj); } - if (scope == frame->base_scope && func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + if (scope == frame->base_scope && func->name && func->local_ref == INVALID_LOCAL_REF && + ctx->version >= SCRIPTLANGUAGEVERSION_ES5) jsdisp_propput_name(scope->jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); index = scope->scope_index; @@ -716,7 +717,8 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } /* ECMA-262 5.1 Edition 13 */ - if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !wcscmp(identifier, func->name)) { + if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && + func->local_ref == INVALID_LOCAL_REF && !wcscmp(identifier, func->name)) { TRACE("returning a function from scope chain\n"); ret->type = EXPRVAL_JSVAL; ret->u.val = jsval_obj(jsdisp_addref(scope->frame->function_instance)); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e8ee7133dfd..43a6ce77350 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1691,6 +1691,34 @@ sync_test("functions scope", function() { func_outer(o); func(); ok(ret === o, "ret != o"); + + func_outer = function g() { + var g2 = g; + g = 10; + ok(g !== 10, "g was redefined to 10"); + g = function() {}; + ok(g === g2, "g !== g2: " + g); + } + func_outer(); + + function h() { + h = 1; + ok(h === 1, "h was not redefined: " + h); + } + h(); + ok(h === 1, "h = " + h); + + function h2() { return function() { h2 = 2; }; } + h2()(); + ok(h2 === 2, "h2 = " + h2); + + (function e() { + var f = e; + ok(typeof(f) === "function", "f = " + f); + (function () { e = 1; })(); + e = 2; + ok(f === e, "f != e"); + })(); }); sync_test("console", function() {

1 0

Eric Pouech : start: Remove workaround for /exec without console.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 603d7f406c032527e761c3ff2a7252e8b120328a URL: https://source.winehq.org/git/wine.git/?a=commit;h=603d7f406c032527e761c3ff… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 13 11:51:11 2022 +0200 start: Remove workaround for /exec without console. Rather use inheritance of SHELL_NO_WINDOW pseudo console in this case. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 7252d54e046..835128ebf28 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -516,10 +516,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) break; } else if (is_option(argv[i], L"/exec")) { - /* If start.exe isn't attached to a console, force that no console would be created. - * This is needed when target process belongs to CUI subsystem. - */ - creation_flags = GetConsoleCP() == 0 ? DETACHED_PROCESS : 0; + creation_flags = 0; sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE | SEE_MASK_FLAG_NO_UI; i++; break;

1 0

Nikolay Sivov : ddrawex/tests: Simplify refcount helper.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 0666950b38a5b4f3dec7d04bb74e303343c7efc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0666950b38a5b4f3dec7d04b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 08:53:30 2022 +0300 ddrawex/tests: Simplify refcount helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/tests/ddrawex.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 1cff73776fd..59268444ea2 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -37,10 +37,11 @@ static IDirectDraw *createDDraw(void) return SUCCEEDED(hr) ? dd : NULL; } -static ULONG get_ref(IUnknown *o) +static ULONG get_refcount(void *iface) { - IUnknown_AddRef(o); - return IUnknown_Release(o); + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } static void RefCountTest(void) @@ -52,11 +53,11 @@ static void RefCountTest(void) HRESULT hr; ULONG ref; - ref = get_ref((IUnknown *) dd1); + ref = get_refcount(dd1); ok(ref == 1, "Unexpected refcount %lu.\n", ref); IDirectDraw_AddRef(dd1); - ref = get_ref((IUnknown *) dd1); + ref = get_refcount(dd1); if (ref == 1) { win_skip("Refcounting is broken\n"); @@ -65,15 +66,15 @@ static void RefCountTest(void) } ok(ref == 2, "Unexpected refcount %lu.\n", ref); IDirectDraw_Release(dd1); - ref = get_ref((IUnknown *) dd1); + ref = get_refcount(dd1); ok(ref == 1, "Unexpected refcount %lu.\n", ref); IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw2, (void **) &dd2); - ref = get_ref((IUnknown *) dd2); + ref = get_refcount(dd2); ok(ref == 2, "Unexpected refcount %lu.\n", ref); IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **) &dd3); - ref = get_ref((IUnknown *) dd3); + ref = get_refcount(dd3); ok(ref == 3, "Unexpected refcount %lu.\n", ref); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); @@ -85,14 +86,14 @@ static void RefCountTest(void) IDirectDraw3_Release(dd3); return; } - ref = get_ref((IUnknown *) dd4); + ref = get_refcount(dd4); ok(ref == 4, "Unexpected refcount %lu.\n", ref); IDirectDraw_Release(dd1); IDirectDraw2_Release(dd2); IDirectDraw3_Release(dd3); - ref = get_ref((IUnknown *) dd4); + ref = get_refcount(dd4); ok(ref == 1, "Unexpected refcount %lu.\n", ref); IDirectDraw4_Release(dd4);

1 0

Nikolay Sivov : ddrawex/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 5a0f48364184f0a0b110d16c9e6086480921c664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0f48364184f0a0b110d16c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 08:53:29 2022 +0300 ddrawex/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/tests/Makefile.in | 1 - dlls/ddrawex/tests/ddrawex.c | 21 ++++---- dlls/ddrawex/tests/surface.c | 106 ++++++++++++++++++++--------------------- 3 files changed, 63 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a0f48364184f0a0b110…

1 0

Nikolay Sivov : ddrawex: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 2df68bd4ffcb9c2e2ded0709e6c8764c2554d288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df68bd4ffcb9c2e2ded0709… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 08:53:28 2022 +0300 ddrawex: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/Makefile.in | 1 - dlls/ddrawex/ddraw.c | 64 +++++++++++++++++++-------------------- dlls/ddrawex/main.c | 8 ++--- dlls/ddrawex/surface.c | 78 ++++++++++++++++++++++++------------------------ 4 files changed, 75 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2df68bd4ffcb9c2e2ded…

1 0

Ziqing Hui : d2d1/tests: Add tests for context unit mode.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: a23e07937db323e203dda29c13961644dc0a0fcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a23e07937db323e203dda29c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 13 10:58:59 2022 +0800 d2d1/tests: Add tests for context unit mode. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e412459ebf2..9937d9d4a82 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9584,6 +9584,38 @@ static void test_dpi(BOOL d3d11) release_test_context(&ctx); } +static void test_unit_mode(BOOL d3d11) +{ + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D1_UNIT_MODE unit_mode; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_SetUnitMode(context, 0xdeadbeef); + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_SetUnitMode(context, 0xdeadbeef); + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_Release(context); + release_test_context(&ctx); +} + static void test_wic_bitmap_format(BOOL d3d11) { IWICImagingFactory *wic_factory; @@ -10919,6 +10951,7 @@ START_TEST(d2d1) queue_test(test_command_list); queue_d3d10_test(test_max_bitmap_size); queue_test(test_dpi); + queue_test(test_unit_mode); queue_test(test_wic_bitmap_format); queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space);

1 0

Zhiyi Zhang : joy.cpl: Enable visual styles.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 9ec0f8a3d5e85c79fd1cb88a661c1b4c2396b079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec0f8a3d5e85c79fd1cb88a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 13 17:41:10 2022 +0800 joy.cpl: Enable visual styles. joy.cpl uses manifest at ID 124. According to tests, manifest at ID 124 is not loaded automatically by rundll32.exe or Control_RunDLL(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.manifest | 16 ++++++++++++++++ dlls/joy.cpl/joy.rc | 3 +++ dlls/joy.cpl/main.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/dlls/joy.cpl/joy.manifest b/dlls/joy.cpl/joy.manifest new file mode 100644 index 00000000000..877860e3d68 --- /dev/null +++ b/dlls/joy.cpl/joy.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Joy" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 77f121c5b1c..c1d8380af37 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -77,6 +77,9 @@ FONT 8, "Ms Shell Dlg" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: joy.manifest */ +124 RT_MANIFEST joy.manifest + /* @makedep: joy.ico */ ICO_MAIN ICON "joy.ico" diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3ecef2d9aa8..c1f41fb0e56 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -992,10 +992,24 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) { INITCOMMONCONTROLSEX icex; PROPSHEETPAGEW psp[NUM_PROPERTY_PAGES]; + BOOL activated = FALSE; PROPSHEETHEADERW psh; + ULONG_PTR cookie; + ACTCTXW actctx; + HANDLE context; DWORD id = 0; OleInitialize(NULL); + /* Activate context */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = hcpl; + actctx.lpResourceName = MAKEINTRESOURCEW(124); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(context, &cookie); + /* Initialize common controls */ icex.dwSize = sizeof(INITCOMMONCONTROLSEX); icex.dwICC = ICC_LISTVIEW_CLASSES | ICC_BAR_CLASSES; @@ -1039,6 +1053,9 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data) /* display the dialog */ PropertySheetW(&psh); + if (activated) + DeactivateActCtx(0, cookie); + ReleaseActCtx(context); OleUninitialize(); }

1 0

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 2022