September 2009 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLWindow2::toString implementation.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 9cf9d20197a1e109dbd72444c606e7f840382b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf9d20197a1e109dbd72444c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 20:45:02 2009 +0200 mshtml: Added IHTMLWindow2::toString implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++++-- dlls/mshtml/tests/dom.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a928709..4f2a5de 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -745,8 +745,16 @@ static HRESULT WINAPI HTMLWindow2_execScript(IHTMLWindow2 *iface, BSTR scode, BS static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + *String = SysAllocString(objectW); + return *String ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, LONG x, LONG y) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e9dfef7..5512896 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3959,6 +3959,7 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow2 *window, *window2, *self; IHTMLDocument2 *doc2 = NULL; IDispatch *disp; + BSTR str; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -3991,6 +3992,15 @@ static void test_window(IHTMLDocument2 *doc) ok(disp == (void*)window, "disp != window\n"); IDispatch_Release(disp); + hres = IHTMLWindow2_toString(window, NULL); + ok(hres == E_INVALIDARG, "toString failed: %08x\n", hres); + + str = NULL; + hres = IHTMLWindow2_toString(window, &str); + ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(!strcmp_wa(str, "[object]"), "toString returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLWindow2_Release(window); }

1 0

Jacek Caban : mshtml: Added IOmNavigator::toString implementation.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: f6b846414a4f6d8ea4b97cd0b889d81e7ecf9c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b846414a4f6d8ea4b97cd0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 20:44:47 2009 +0200 mshtml: Added IOmNavigator::toString implementation. --- dlls/mshtml/omnavigator.c | 12 ++++++++++-- dlls/mshtml/tests/dom.c | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 7479180..6e912d3 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -226,8 +226,16 @@ static HRESULT WINAPI OmNavigator_get_opsProfile(IOmNavigator *iface, IHTMLOpsPr static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + TRACE("(%p)->(%p)\n", This, String); + + if(!String) + return E_INVALIDARG; + + *String = SysAllocString(objectW); + return *String ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI OmNavigator_get_cpuClass(IOmNavigator *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e10e41a..e9dfef7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2492,6 +2492,15 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!memcmp(bstr, v40, sizeof(v40)), "appVersion is %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hres = IOmNavigator_toString(navigator, NULL); + ok(hres == E_INVALIDARG, "toString failed: %08x\n", hres); + + bstr = NULL; + hres = IOmNavigator_toString(navigator, &bstr); + ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "[object]"), "toString returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ref = IOmNavigator_Release(navigator); ok(!ref, "navigator should be destroyed here\n"); }

1 0

Jacek Caban : mshtml: Added DISPID_VALUE implementation for HTMLLocation object.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: fc26a1c4bd20712dc525b174dd31ace53f63f139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc26a1c4bd20712dc525b174d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 20:44:20 2009 +0200 mshtml: Added DISPID_VALUE implementation for HTMLLocation object. --- dlls/mshtml/htmllocation.c | 36 +++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 57 ++++++++++++++++++++++++++++++++----------- 2 files changed, 77 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 2026a06..da3027e 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -303,6 +303,34 @@ static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String) return E_NOTIMPL; } +static HRESULT HTMLLocation_value(IUnknown *iface, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLLocation *This = HTMLLOCATION_THIS(iface); + HRESULT hres; + + TRACE("(%p)\n", This); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + BSTR str; + + hres = IHTMLLocation_get_href(HTMLLOCATION(This), &str); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + break; + } + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + #undef HTMLLOCATION_THIS static const IHTMLLocationVtbl HTMLLocationVtbl = { @@ -335,12 +363,18 @@ static const IHTMLLocationVtbl HTMLLocationVtbl = { HTMLLocation_toString }; +static const dispex_static_data_vtbl_t HTMLLocation_dispex_vtbl = { + HTMLLocation_value, + NULL, + NULL +}; + static const tid_t HTMLLocation_iface_tids[] = { IHTMLLocation_tid, 0 }; static dispex_static_data_t HTMLLocation_dispex = { - NULL, + &HTMLLocation_dispex_vtbl, DispHTMLLocation_tid, NULL, HTMLLocation_iface_tids diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f22d6bd..e10e41a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -469,23 +469,50 @@ static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) return ret; } -#define test_disp(u,id) _test_disp(__LINE__,u,id) -static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) +#define test_disp_value(u) _test_disp_value(__LINE__,u,v) +static void _test_disp_value(unsigned line, IUnknown *unk, const char *val) +{ + DISPPARAMS dp = {NULL,NULL,0,0}; + IDispatchEx *dispex; + EXCEPINFO ei; + VARIANT var; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); + ok_(__FILE__,line)(hres == S_OK, "Could not get IDispatchEx interface: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, 0, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); + IDispatchEx_Release(dispex); + ok_(__FILE__,line)(hres == S_OK, "InvokeEx(DISPID_VALUE) returned: %08x\n", hres); + + ok_(__FILE__,line)(V_VT(&var) == VT_BSTR, "V_VT(value) = %d\n", V_VT(&var)); + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&var), val), "value = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&var)), val); + VariantClear(&var); +} + +#define test_disp(u,id,v) _test_disp(__LINE__,u,id,v) +static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const char *val) { IID iid; if(_test_get_dispid(line, unk, &iid)) ok_(__FILE__,line) (IsEqualGUID(&iid, diid), "unexpected guid %s\n", dbgstr_guid(&iid)); + + _test_disp_value(line, unk, val); } -#define test_disp2(u,id,id2) _test_disp2(__LINE__,u,id,id2) -static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID *diid2) +#define test_disp2(u,id,id2,v) _test_disp2(__LINE__,u,id,id2,v) +static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID *diid2, const char *val) { IID iid; if(_test_get_dispid(line, unk, &iid)) ok_(__FILE__,line) (IsEqualGUID(&iid, diid) || broken(IsEqualGUID(&iid, diid2)), "unexpected guid %s\n", dbgstr_guid(&iid)); + + _test_disp_value(line, unk, val); } #define get_elem_iface(u) _get_elem_iface(__LINE__,u) @@ -580,7 +607,7 @@ static void _test_elem_type(unsigned line, IUnknown *unk, elem_type_t type) _test_ifaces(line, unk, elem_type_infos[type].iids); if(elem_type_infos[type].dispiid) - _test_disp(line, unk, elem_type_infos[type].dispiid); + _test_disp(line, unk, elem_type_infos[type].dispiid, "[object]"); } #define get_node_type(n) _get_node_type(__LINE__,n) @@ -1022,7 +1049,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, hres = IUnknown_QueryInterface(unk, &IID_IHTMLElementCollection, (void**)&col); ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); - test_disp((IUnknown*)col, &DIID_DispHTMLElementCollection); + test_disp((IUnknown*)col, &DIID_DispHTMLElementCollection, "[object]"); hres = IHTMLElementCollection_get_length(col, &len); ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); @@ -2396,7 +2423,7 @@ static void test_location(IHTMLDocument2 *doc) IHTMLLocation_Release(location2); test_ifaces((IUnknown*)location, location_iids); - test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation); + test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation, "about:blank"); hres = IHTMLLocation_get_pathname(location, &str); ok(hres == S_OK, "get_pathname failed: %08x\n", hres); @@ -2429,7 +2456,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_navigator(window, &navigator); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); ok(navigator != NULL, "navigator == NULL\n"); - test_disp2((IUnknown*)navigator, &DIID_DispHTMLNavigator, &IID_IOmNavigator); + test_disp2((IUnknown*)navigator, &DIID_DispHTMLNavigator, &IID_IOmNavigator, "[object]"); hres = IHTMLWindow2_get_navigator(window, &navigator2); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); @@ -2475,7 +2502,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) HRESULT hres; VARIANT v; - test_disp((IUnknown*)current_style, &DIID_DispHTMLCurrentStyle); + test_disp((IUnknown*)current_style, &DIID_DispHTMLCurrentStyle, "[object]"); test_ifaces((IUnknown*)current_style, cstyle_iids); hres = IHTMLCurrentStyle_get_display(current_style, &str); @@ -2744,7 +2771,7 @@ static void test_default_style(IHTMLStyle *style) BSTR sDefault; VARIANT vDefault; - test_disp((IUnknown*)style, &DIID_DispHTMLStyle); + test_disp((IUnknown*)style, &DIID_DispHTMLStyle, "[object]"); test_ifaces((IUnknown*)style, style_iids); test_style_csstext(style, NULL); @@ -3928,7 +3955,7 @@ static void test_window(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); test_ifaces((IUnknown*)window, window_iids); - test_disp((IUnknown*)window, &DIID_DispHTMLWindow2); + test_disp((IUnknown*)window, &DIID_DispHTMLWindow2, "[object]"); hres = IHTMLWindow2_get_document(window, &doc2); ok(hres == S_OK, "get_document failed: %08x\n", hres); @@ -4591,7 +4618,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(node != NULL, "node == NULL\n"); if(node) { test_ifaces((IUnknown*)node, text_iids); - test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode); + test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode, "[object]"); node2 = get_first_child((IUnknown*)node); ok(!node2, "node2 != NULL\n"); @@ -4611,7 +4638,7 @@ static void test_elems(IHTMLDocument2 *doc) if(child_col) { LONG length = 0; - test_disp((IUnknown*)child_col, &DIID_DispDOMChildrenCollection); + test_disp((IUnknown*)child_col, &DIID_DispDOMChildrenCollection, "[object]"); hres = IHTMLDOMChildrenCollection_get_length(child_col, &length); ok(hres == S_OK, "get_length failed: %08x\n", hres); @@ -4734,7 +4761,7 @@ static void test_create_elems(IHTMLDocument2 *doc) type = get_node_type((IUnknown*)elem); ok(type == 1, "type=%d\n", type); test_ifaces((IUnknown*)elem, elem_iids); - test_disp((IUnknown*)elem, &DIID_DispHTMLGenericElement); + test_disp((IUnknown*)elem, &DIID_DispHTMLGenericElement, "[object]"); hres = IHTMLDocument2_get_body(doc, &body); ok(hres == S_OK, "get_body failed: %08x\n", hres); @@ -4763,7 +4790,7 @@ static void test_create_elems(IHTMLDocument2 *doc) node = test_create_text(doc, "test"); test_ifaces((IUnknown*)node, text_iids); - test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode); + test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode, "[object]"); V_VT(&var) = VT_NULL; node2 = test_node_insertbefore((IUnknown*)body, node, &var);

1 0

Jacek Caban : mshtml: Added support for DISPID_VALUE.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 8b8e91a50faae121af0af476e0cda8d6cc987bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8e91a50faae121af0af476e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 20:43:44 2009 +0200 mshtml: Added support for DISPID_VALUE. --- dlls/mshtml/dispex.c | 26 ++++++++++++++++++++++++++ dlls/mshtml/htmlelemcol.c | 1 + dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlstyle.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 5 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3dd11b1..0a09de7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -407,6 +407,29 @@ HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VA return S_OK; } +static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + + if(This->data->vtbl && This->data->vtbl->value) + return This->data->vtbl->value(This->outer, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: + V_VT(res) = VT_BSTR; + V_BSTR(res) = SysAllocString(objectW); + if(!V_BSTR(res)) + return E_OUTOFMEMORY; + break; + default: + FIXME("Unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -556,6 +579,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(id == DISPID_VALUE) + return dispex_value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(is_custom_dispid(id) && This->data->vtbl && This->data->vtbl->invoke) return This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 4362890..ba9a440 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -428,6 +428,7 @@ static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = { }; static const dispex_static_data_vtbl_t HTMLElementColection_dispex_vtbl = { + NULL, HTMLElementCollection_get_dispid, HTMLElementCollection_invoke }; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 720bbfe..9b132b1 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -250,6 +250,7 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { }; static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { + NULL, HTMLDOMChildrenCollection_get_dispid, HTMLDOMChildrenCollection_invoke }; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index cd9ae4d..612dc2f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2610,6 +2610,7 @@ static const IHTMLStyleVtbl HTMLStyleVtbl = { }; static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { + NULL, HTMLStyle_get_dispid, NULL }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c3be4b9..db127b5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -127,6 +127,7 @@ typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; #define MSHTML_DISPID_CUSTOM_MAX 0x6fffffff typedef struct { + HRESULT (*value)(IUnknown*,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*get_dispid)(IUnknown*,BSTR,DWORD,DISPID*); HRESULT (*invoke)(IUnknown*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); } dispex_static_data_vtbl_t;

1 0

Alexandre Julliard : ntdll: Implemented the SList functions for Win64.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 7a56aca2eb12c2e1654c68dac574c5facb29cdd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a56aca2eb12c2e1654c68dac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 12:41:57 2009 +0200 ntdll: Implemented the SList functions for Win64. --- dlls/ntdll/rtl.c | 191 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 115 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 16533b2..1477a65 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -939,141 +939,180 @@ PVOID WINAPI RtlDecodePointer( PVOID ptr ) return (PVOID)(ptrval ^ get_pointer_obfuscator()); } -VOID WINAPI RtlInitializeSListHead(PSLIST_HEADER ListHeader) +/************************************************************************* + * RtlInitializeSListHead [NTDLL.@] + */ +VOID WINAPI RtlInitializeSListHead(PSLIST_HEADER list) { - TRACE("(%p)\n", ListHeader); #ifdef _WIN64 - FIXME("stub\n"); + list->s.Alignment = list->s.Region = 0; + list->Header16.HeaderType = 1; /* we use the 16-byte header */ #else - ListHeader->Alignment = 0; + list->Alignment = 0; #endif } -WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER ListHeader) +/************************************************************************* + * RtlQueryDepthSList [NTDLL.@] + */ +WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER list) { - TRACE("(%p)\n", ListHeader); #ifdef _WIN64 - FIXME("stub\n"); - return 0; + return list->Header16.Depth; #else - return ListHeader->s.Depth; + return list->s.Depth; #endif } -PSLIST_ENTRY WINAPI RtlFirstEntrySList(const SLIST_HEADER* ListHeader) +/************************************************************************* + * RtlFirstEntrySList [NTDLL.@] + */ +PSLIST_ENTRY WINAPI RtlFirstEntrySList(const SLIST_HEADER* list) { - TRACE("(%p)\n", ListHeader); #ifdef _WIN64 - FIXME("stub\n"); - return NULL; + return (SLIST_ENTRY *)((ULONG_PTR)list->Header16.NextEntry << 4); #else - return ListHeader->s.Next.Next; + return list->s.Next.Next; #endif } -PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER ListHeader) +/************************************************************************* + * RtlInterlockedFlushSList [NTDLL.@] + */ +PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) { - SLIST_HEADER oldHeader, newHeader; - TRACE("(%p)\n", ListHeader); + SLIST_HEADER old, new; + #ifdef _WIN64 - FIXME("stub\n"); - return NULL; + if (!list->Header16.Depth) return NULL; + new.s.Alignment = new.s.Region = 0; + new.Header16.HeaderType = 1; /* we use the 16-byte header */ + do + { + old = *list; + new.Header16.Sequence = old.Header16.Sequence + 1; + } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - if (ListHeader->s.Depth == 0) - return NULL; - newHeader.Alignment = 0; + if (!list->s.Depth) return NULL; + new.Alignment = 0; do { - oldHeader = *ListHeader; - newHeader.s.Sequence = ListHeader->s.Sequence + 1; - } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment, - newHeader.Alignment, - oldHeader.Alignment) != oldHeader.Alignment); - return oldHeader.s.Next.Next; + old = *list; + new.s.Sequence = old.s.Sequence + 1; + } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment, + old.Alignment) != old.Alignment); + return old.s.Next.Next; #endif } -PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER ListHeader, - PSLIST_ENTRY ListEntry) +/************************************************************************* + * RtlInterlockedPushEntrySList [NTDLL.@] + */ +PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER list, PSLIST_ENTRY entry) { - SLIST_HEADER oldHeader, newHeader; - TRACE("(%p, %p)\n", ListHeader, ListEntry); + SLIST_HEADER old, new; + #ifdef _WIN64 - FIXME("stub\n"); - return NULL; + new.Header16.NextEntry = (ULONG_PTR)entry >> 4; + do + { + old = *list; + entry->Next = (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); + new.Header16.Depth = old.Header16.Depth + 1; + new.Header16.Sequence = old.Header16.Sequence + 1; + } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - newHeader.s.Next.Next = ListEntry; + new.s.Next.Next = entry; do { - oldHeader = *ListHeader; - ListEntry->Next = ListHeader->s.Next.Next; - newHeader.s.Depth = ListHeader->s.Depth + 1; - newHeader.s.Sequence = ListHeader->s.Sequence + 1; - } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment, - newHeader.Alignment, - oldHeader.Alignment) != oldHeader.Alignment); - return oldHeader.s.Next.Next; + old = *list; + entry->Next = old.s.Next.Next; + new.s.Depth = old.s.Depth + 1; + new.s.Sequence = old.s.Sequence + 1; + } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment, + old.Alignment) != old.Alignment); + return old.s.Next.Next; #endif } -PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER ListHeader) +/************************************************************************* + * RtlInterlockedPopEntrySList [NTDLL.@] + */ +PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER list) { - SLIST_HEADER oldHeader, newHeader; + SLIST_HEADER old, new; PSLIST_ENTRY entry; - TRACE("(%p)\n", ListHeader); + #ifdef _WIN64 - FIXME("stub\n"); - return NULL; + do + { + old = *list; + if (!(entry = (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4))) return NULL; + /* entry could be deleted by another thread */ + __TRY + { + new.Header16.NextEntry = (ULONG_PTR)entry->Next >> 4; + new.Header16.Depth = old.Header16.Depth - 1; + new.Header16.Sequence = old.Header16.Sequence + 1; + } + __EXCEPT_PAGE_FAULT + { + } + __ENDTRY + } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); #else do { - oldHeader = *ListHeader; - entry = ListHeader->s.Next.Next; - if (entry == NULL) - return NULL; + old = *list; + if (!(entry = old.s.Next.Next)) return NULL; /* entry could be deleted by another thread */ __TRY { - newHeader.s.Next.Next = entry->Next; - newHeader.s.Depth = ListHeader->s.Depth - 1; - newHeader.s.Sequence = ListHeader->s.Sequence + 1; + new.s.Next.Next = entry->Next; + new.s.Depth = old.s.Depth - 1; + new.s.Sequence = old.s.Sequence + 1; } __EXCEPT_PAGE_FAULT { } __ENDTRY - } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment, - newHeader.Alignment, - oldHeader.Alignment) != oldHeader.Alignment); - return entry; + } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment, + old.Alignment) != old.Alignment); #endif + return entry; } /************************************************************************* * RtlInterlockedPushListSList [NTDLL.@] */ -PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER ListHeader, - PSLIST_ENTRY FirstEntry, - PSLIST_ENTRY LastEntry, - ULONG Count) +PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) { - SLIST_HEADER oldHeader, newHeader; - TRACE("(%p, %p, %p, %d)\n", ListHeader, FirstEntry, LastEntry, Count); + SLIST_HEADER old, new; + #ifdef _WIN64 - FIXME("stub\n"); - return NULL; + new.Header16.NextEntry = (ULONG_PTR)first >> 4; + do + { + old = *list; + new.Header16.Depth = old.Header16.Depth + count; + new.Header16.Sequence = old.Header16.Sequence + 1; + last->Next = (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); + } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); + return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - newHeader.s.Next.Next = FirstEntry; + new.s.Next.Next = first; do { - oldHeader = *ListHeader; - newHeader.s.Depth = ListHeader->s.Depth + Count; - newHeader.s.Sequence = ListHeader->s.Sequence + 1; - LastEntry->Next = ListHeader->s.Next.Next; - } while (interlocked_cmpxchg64((__int64*)&ListHeader->Alignment, - newHeader.Alignment, - oldHeader.Alignment) != oldHeader.Alignment); - return oldHeader.s.Next.Next; + old = *list; + new.s.Depth = old.s.Depth + count; + new.s.Sequence = old.s.Sequence + 1; + last->Next = old.s.Next.Next; + } while (interlocked_cmpxchg64((__int64 *)&list->Alignment, new.Alignment, + old.Alignment) != old.Alignment); + return old.s.Next.Next; #endif }

1 0

Alexandre Julliard : libport: Added an interlocked_cmpxchg128 function for 64-bit.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 192fcc5bb31e6921c3eb6a700f30892dd24c62d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=192fcc5bb31e6921c3eb6a700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 12:39:17 2009 +0200 libport: Added an interlocked_cmpxchg128 function for 64-bit. --- include/wine/port.h | 20 ++++++++++++++++++++ libs/port/interlocked.c | 23 +++++++++++++++++------ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 0fc877c..61c8399 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -412,6 +412,22 @@ extern inline int interlocked_xchg_add( int *dest, int incr ) return ret; } +#ifdef __x86_64__ +extern inline unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, + __int64 xchg_low, __int64 *compare ); +extern inline unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, + __int64 xchg_low, __int64 *compare ) +{ + unsigned char ret; + __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" + : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), + "=a" (compare[0]), "=d" (compare[1]) + : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), + "c" (xchg_high), "b" (xchg_low) ); + return ret; +} +#endif + #else /* __GNUC__ */ extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); @@ -420,6 +436,10 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa extern int interlocked_xchg( int *dest, int val ); extern void *interlocked_xchg_ptr( void **dest, void *val ); extern int interlocked_xchg_add( int *dest, int incr ); +#ifdef _WIN64 +extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, + __int64 xchg_low, __int64 *compare ); +#endif #endif /* __GNUC__ */ diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index cefbb5e..c2ac3eb 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -139,8 +139,6 @@ __declspec(naked) int interlocked_xchg_add( int *dest, int incr ) #elif defined(__x86_64__) -#ifdef __GNUC__ - __ASM_GLOBAL_FUNC(interlocked_cmpxchg, "mov %edx, %eax\n\t" "lock cmpxchgl %esi,(%rdi)\n\t" @@ -165,10 +163,23 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_add, "mov %esi, %eax\n\t" "lock xaddl %eax, (%rdi)\n\t" "ret") - -#else -# error You must implement the interlocked* functions for your compiler -#endif +__ASM_GLOBAL_FUNC(interlocked_cmpxchg128, + "push %rbx\n\t" + ".cfi_adjust_cfa_offset 8\n\t" + ".cfi_rel_offset %rbx,0\n\t" + "mov %rcx,%r8\n\t" /* compare */ + "mov %rdx,%rbx\n\t" /* xchg_low */ + "mov %rsi,%rcx\n\t" /* xchg_high */ + "mov 0(%r8),%rax\n\t" + "mov 8(%r8),%rdx\n\t" + "lock cmpxchg16b (%rdi)\n\t" + "mov %rax,0(%r8)\n\t" + "mov %rdx,8(%r8)\n\t" + "setz %al\n\t" + "pop %rbx\n\t" + ".cfi_adjust_cfa_offset -8\n\t" + ".cfi_same_value %rbx\n\t" + "ret") #elif defined(__powerpc__) void* interlocked_cmpxchg_ptr( void **dest, void* xchg, void* compare)

1 0