April 2012 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Set namespace-prefixes on by default.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 9a5da56f561ad5ad476009a778c385bf58f2e6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5da56f561ad5ad476009a77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 17 09:44:44 2012 +0400 msxml3: Set namespace-prefixes on by default. --- dlls/msxml3/saxreader.c | 10 +++++++++- dlls/msxml3/tests/saxreader.c | 4 ++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e15f3e6..d95550f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -241,6 +241,11 @@ static const WCHAR FeatureNamespacesW[] = { '/','n','a','m','e','s','p','a','c','e','s',0 }; +static const WCHAR FeatureNamespacePrefixesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, saxreader_features feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2752,6 +2757,9 @@ static HRESULT WINAPI saxxmlreader_getFeature( if (!strcmpW(FeatureNamespacesW, feature)) return get_feature_value(This, Namespaces, value); + if (!strcmpW(FeatureNamespacePrefixesW, feature)) + return get_feature_value(This, NamespacePrefixes, value); + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -3188,7 +3196,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *outer, LPVOID *ppOb reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; - reader->features = Namespaces; + reader->features = Namespaces | NamespacePrefixes; reader->version = version; init_dispex(&reader->dispex, (IUnknown*)&reader->IVBSAXXMLReader_iface, &saxreader_dispex); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 41e3775..aa3b2a5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2109,7 +2109,11 @@ static void test_saxreader_features(void) value = 0xc; hr = ISAXXMLReader_getFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), &value); EXPECT_HR(hr, S_OK); + ok(entry->value == value, "%s: got wrong default value %x, expected %x\n", entry->clsid, value, entry->value); + value = 0xc; + hr = ISAXXMLReader_getFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), &value); + EXPECT_HR(hr, S_OK); ok(entry->value == value, "%s: got wrong default value %x, expected %x\n", entry->clsid, value, entry->value); ISAXXMLReader_Release(reader);

1 0

Alexandre Julliard : winex11: ExtFloodFill does take the current ROP into account.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: a9b786728cce6e9f68df9c148b0b467316fe4895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b786728cce6e9f68df9c148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 16:40:47 2012 +0200 winex11: ExtFloodFill does take the current ROP into account. --- dlls/winex11.drv/graphics.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 350a936..9959a29 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1377,9 +1377,7 @@ BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillTy { unsigned long pixel = X11DRV_PALETTE_ToPhysical( physDev, color ); - /* ROP mode is always GXcopy for flood-fill */ wine_tsx11_lock(); - XSetFunction( gdi_display, physDev->gc, GXcopy ); X11DRV_InternalFloodFill(image, physDev, pt.x - rect.left, pt.y - rect.top,

1 0

Jacek Caban : jscript: Added parameterized property assignment tests.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: d2fb2af8ee882e2b4143d85f9666573359a77d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fb2af8ee882e2b4143d85f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 16:26:16 2012 +0200 jscript: Added parameterized property assignment tests. --- dlls/jscript/tests/run.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e6f0009..c4dfd1d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -64,6 +64,8 @@ DEFINE_EXPECT(global_propdelete_d); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); +DEFINE_EXPECT(global_propargput_d); +DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(testobj_delete); @@ -96,6 +98,7 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_PUREDISP 0x1010 #define DISPID_GLOBAL_TESTPROPDELETE 0x1010 #define DISPID_GLOBAL_ISNULLBSTR 0x1011 +#define DISPID_GLOBAL_PROPARGPUT 0x1012 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -502,7 +505,21 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } - if(strict_dispid_check) + if(!strcmp_wa(bstrName, "propArgPutG")) { + CHECK_EXPECT(global_propargput_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_PROPARGPUT; + return S_OK; + } + + if(!strcmp_wa(bstrName, "propArgPutO")) { + CHECK_EXPECT(global_propargput_d); + test_grfdex(grfdex, fdexNameEnsure|fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_PROPARGPUT; + return S_OK; + } + + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; } @@ -819,6 +836,28 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_PROPARGPUT: + CHECK_EXPECT(global_propargput_i); + ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg != NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I4, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I4(pdp->rgvarg) == 2, "V_I4(psp->rgvargs) = %d\n", V_I4(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I4(pdp->rgvarg+1) == 1, "V_I4(psp->rgvargs+1) = %d\n", V_I4(pdp->rgvarg+1)); + + ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I4(pdp->rgvarg+2) == 0, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+2)); + return S_OK; + case DISPID_GLOBAL_OBJECT_FLAG: { IDispatchEx *dispex; BSTR str; @@ -1608,6 +1647,18 @@ static BOOL run_tests(void) CHECK_CALLED(testobj_onlydispid_d); CHECK_CALLED(testobj_onlydispid_i); + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("var t=0; propArgPutG(t++, t++) = t++;"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("var t=0; test.propArgPutO(t++, t++) = t++;"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: d0483ec69d601f34db53be55891f30f8bd9a2b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0483ec69d601f34db53be558… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 17 09:11:30 2012 +0400 po: Update Russian translation. --- po/ru.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index b0eb925..022b8ac 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3458,10 +3458,8 @@ msgid "Expected ')'" msgstr "Ожидается ')'" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Неверный параметр.\n" +msgstr "Неверный символ" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::overflowX implementation.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 5b99a4e88017988c4ffa0db38b9d80326d11f3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b99a4e88017988c4ffa0db38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:41:27 2012 +0200 mshtml: Added IHTMLStyle2::overflowX implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0ac98b4..9bad1a6 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -134,6 +134,8 @@ static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; +static const WCHAR attrOverflowX[] = + {'o','v','e','r','f','l','o','w','-','x',0}; static const WCHAR attrPadding[] = {'p','a','d','d','i','n','g',0}; static const WCHAR attrPaddingBottom[] = @@ -229,6 +231,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, + {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, {attrPadding, DISPID_IHTMLSTYLE_PADDING}, {attrPaddingBottom, DISPID_IHTMLSTYLE_PADDINGBOTTOM}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ef4f2a2..2626eb6 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -83,6 +83,7 @@ typedef enum { STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, STYLEID_OVERFLOW, + STYLEID_OVERFLOW_X, STYLEID_PADDING, STYLEID_PADDING_BOTTOM, STYLEID_PADDING_LEFT, diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index d85ea97..05668f9 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -507,15 +507,19 @@ static HRESULT WINAPI HTMLStyle2_get_textAutospace(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_overflowX(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_X, v, 0); } static HRESULT WINAPI HTMLStyle2_get_overflowX(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_X, p, 0); } static HRESULT WINAPI HTMLStyle2_put_overflowY(IHTMLStyle2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 6a31665..280595e 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -344,6 +344,22 @@ static void test_style2(IHTMLStyle2 *style2) hres = IHTMLStyle2_get_bottom(style2, &v); ok(hres == S_OK, "get_bottom failed: %08x\n", hres); test_var_bstr(&v, "4px"); + + /* overflowX */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_overflowX(style2, &str); + ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(!str, "overflowX = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("hidden"); + hres = IHTMLStyle2_put_overflowX(style2, str); + ok(hres == S_OK, "put_overflowX failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle2_get_overflowX(style2, &str); + ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); } static void test_style3(IHTMLStyle3 *style3)

1 0

André Hentschel : advapi32: Avoid shadowing a parameter.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: e4cb946c4aef0375a1f94a9167db0fe95dbbb014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cb946c4aef0375a1f94a916… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:21:54 2012 +0200 advapi32: Avoid shadowing a parameter. --- dlls/advapi32/registry.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c4fef67..fc03c1c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1113,11 +1113,11 @@ LSTATUS WINAPI RegDeleteKeyExA( HKEY hkey, LPCSTR name, REGSAM access, DWORD res { if (!is_version_nt()) /* win95 does recursive key deletes */ { - CHAR name[MAX_PATH]; + CHAR sub[MAX_PATH]; - while(!RegEnumKeyA(tmp, 0, name, sizeof(name))) + while(!RegEnumKeyA(tmp, 0, sub, sizeof(sub))) { - if(RegDeleteKeyExA(tmp, name, access, reserved)) /* recurse */ + if(RegDeleteKeyExA(tmp, sub, access, reserved)) /* recurse */ break; } }

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_AddChild.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 470468c72e345046e8304e607721a9a14cf47c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470468c72e345046e8304e607… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 13 13:55:15 2012 +0200 d3drm: Implement IDirect3DRMFrameX_AddChild. --- dlls/d3drm/frame.c | 71 ++++++++++++++++++++++++++++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 18 ++++++------ 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 5d5427f..985fe58 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "wine/debug.h" #define COBJMACROS @@ -33,6 +34,9 @@ typedef struct { IDirect3DRMFrame2 IDirect3DRMFrame2_iface; IDirect3DRMFrame3 IDirect3DRMFrame3_iface; LONG ref; + ULONG nb_children; + ULONG children_capacity; + IDirect3DRMFrame3** children; } IDirect3DRMFrameImpl; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) @@ -45,6 +49,8 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface); } +static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface); + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* iface, REFIID riid, void** object) @@ -89,11 +95,17 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) + { + for (i = 0; i < This->nb_children; i++) + IDirect3DRMFrame3_Release(This->children[i]); + HeapFree(GetProcessHeap(), 0, This->children); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -185,10 +197,16 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, LPDIRECT3DRMFRAME child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrameImpl *frame; - FIXME("(%p/%p)->(%p): stub\n", iface, This, child); + TRACE("(%p/%p)->(%p)\n", iface, This, child); - return E_NOTIMPL; + frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); + + if (!frame) + return D3DRMERR_BADOBJECT; + + return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, &frame->IDirect3DRMFrame3_iface); } static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2* iface, @@ -928,7 +946,6 @@ static const struct IDirect3DRMFrame2Vtbl Direct3DRMFrame2_Vtbl = IDirect3DRMFrame2Impl_GetHierarchyBox }; - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMFrame3Impl_QueryInterface(IDirect3DRMFrame3* iface, REFIID riid, void** object) @@ -1036,10 +1053,45 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddChild(IDirect3DRMFrame3* iface, LPDIRECT3DRMFRAME3 child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; + IDirect3DRMFrame3** children; - FIXME("(%p/%p)->(%p): stub\n", iface, This, child); + TRACE("(%p/%p)->(%p)\n", iface, This, child); - return E_NOTIMPL; + if (!child) + return D3DRMERR_BADOBJECT; + + /* Check if already existing and return gracefully without increasing ref count */ + for (i = 0; i < This->nb_children; i++) + if (This->children[i] == child) + return D3DRM_OK; + + if ((This->nb_children + 1) > This->children_capacity) + { + ULONG new_capacity; + + if (!This->children_capacity) + { + new_capacity = 16; + children = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMFrame3*)); + } + else + { + new_capacity = This->children_capacity * 2; + children = HeapReAlloc(GetProcessHeap(), 0, This->children, new_capacity * sizeof(IDirect3DRMFrame3*)); + } + + if (!children) + return E_OUTOFMEMORY; + + This->children_capacity = new_capacity; + This->children = children; + } + + This->children[This->nb_children++] = child; + IDirect3DRMFrame3_AddRef(child); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_AddLight(IDirect3DRMFrame3* iface, @@ -1927,6 +1979,15 @@ static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl = IDirect3DRMFrame3Impl_GetMaterialOverride }; +static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &Direct3DRMFrame2_Vtbl); + + return impl_from_IDirect3DRMFrame2(iface); +} + HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) { IDirect3DRMFrameImpl* object; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0a05dcd..caa9dc5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -446,7 +446,7 @@ static void test_Frame(void) /* [Add/Delete]Child with NULL pointer */ hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 1); hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL); @@ -460,9 +460,9 @@ static void test_Frame(void) todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 1); - todo_wine CHECK_REFCOUNT(pFrameC, 2); + CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP1, &pArray); @@ -489,7 +489,7 @@ static void test_Frame(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; @@ -528,7 +528,7 @@ static void test_Frame(void) /* Add child again */ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameC, 2); pArray = NULL; @@ -548,7 +548,7 @@ static void test_Frame(void) /* Delete child */ hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC); todo_wine ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameC, 1); + todo_wine CHECK_REFCOUNT(pFrameC, 1); pArray = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); @@ -570,11 +570,11 @@ static void test_Frame(void) /* Add two children */ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameC, 2); hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1); - todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); todo_wine CHECK_REFCOUNT(pFrameP1, 3); pArray = NULL; @@ -596,7 +596,7 @@ static void test_Frame(void) } IDirect3DRMMeshBuilder_Release(pFrameP2); - todo_wine CHECK_REFCOUNT(pFrameC, 2); + CHECK_REFCOUNT(pFrameC, 2); todo_wine CHECK_REFCOUNT(pFrameP1, 3); IDirect3DRMMeshBuilder_Release(pFrameC);

1 0

Jacek Caban : Added support for shadowing of element pseudo-variables.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: d9876902124e29bb0f80ff34390b1a2ce9cc52fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9876902124e29bb0f80ff343… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:10:48 2012 +0200 Added support for shadowing of element pseudo-variables. --- dlls/mshtml/dispex.c | 13 ++++++++++++ dlls/mshtml/htmlwindow.c | 43 +++++++++++++++++++++++++++++----------- dlls/mshtml/mshtml_private.h | 4 ++- dlls/mshtml/tests/jstest.html | 8 +++++++ 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c42e2ef..66dad69 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -480,6 +480,19 @@ HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VA return S_OK; } +HRESULT dispex_get_dynid(DispatchEx *This, const WCHAR *name, DISPID *id) +{ + dynamic_prop_t *prop; + HRESULT hres; + + hres = get_dynamic_prop(This, name, fdexNameEnsure, &prop); + if(FAILED(hres)) + return hres; + + *id = DISPID_DYNPROP_0 + (prop - This->dynamic_data->props); + return S_OK; +} + static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9069e6d..3ee2273 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2461,21 +2461,40 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD IDispatch_Release(disp); break; } - case GLOBAL_ELEMENTVAR: { - IHTMLElement *elem; + case GLOBAL_ELEMENTVAR: + switch(flags) { + case DISPATCH_PROPERTYGET: { + IHTMLElement *elem; - hres = IHTMLDocument3_getElementById(&This->doc->basedoc.IHTMLDocument3_iface, - prop->name, &elem); - if(FAILED(hres)) - return hres; + hres = IHTMLDocument3_getElementById(&This->doc->basedoc.IHTMLDocument3_iface, + prop->name, &elem); + if(FAILED(hres)) + return hres; - if(!elem) - return DISP_E_MEMBERNOTFOUND; + if(!elem) + return DISP_E_MEMBERNOTFOUND; - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)elem; - break; - } + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)elem; + return S_OK; + } + case DISPATCH_PROPERTYPUT: { + DISPID dispex_id; + + hres = dispex_get_dynid(&This->dispex, prop->name, &dispex_id); + if(FAILED(hres)) + return hres; + + prop->type = GLOBAL_DISPEXVAR; + prop->id = dispex_id; + return IDispatchEx_InvokeEx(&This->dispex.IDispatchEx_iface, dispex_id, 0, flags, params, res, ei, caller); + } + default: + FIXME("Not suppoted flags: %x\n", flags); + return E_NOTIMPL; + } + case GLOBAL_DISPEXVAR: + return IDispatchEx_InvokeEx(&This->dispex.IDispatchEx_iface, prop->id, 0, flags, params, res, ei, caller); default: ERR("invalid type %d\n", prop->type); hres = DISP_E_MEMBERNOTFOUND; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c8551fb..3376084 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -229,6 +229,7 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_prop(DispatchEx*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; @@ -248,7 +249,8 @@ typedef struct ScriptHost ScriptHost; typedef enum { GLOBAL_SCRIPTVAR, - GLOBAL_ELEMENTVAR + GLOBAL_ELEMENTVAR, + GLOBAL_DISPEXVAR } global_prop_type_t; typedef struct { diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index abda45e..10863f4 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -60,6 +60,14 @@ function test_document_name_as_index() { var e = document.getElementById("formid"); ok(!!e, "e is null"); ok(!("formid" in document), "formid is in document"); + + document.body.innerHTML = '<form name="formname"></form>'; + ok("formname" in window, "formname' is not in window"); + ok(typeof(window.formname) === "object", "typeof(window.formname) = " + typeof(window.formname)); + window.formname = 1; + ok(window.formname === 1, "window.formname = " + window.formname); + formname = 2; + ok(window.formname === 2, "window.formname = " + window.formname); } function test_remove_style_attribute() {

1 0

Piotr Caban : msvcr90: Added _byteswap_{ushort, ulong, uint64} implementation .
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: e24e6eb278f601fcb7ea5086ec5c8dbf38008eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24e6eb278f601fcb7ea5086e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 18:11:37 2012 +0200 msvcr90: Added _byteswap_{ushort,ulong,uint64} implementation. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.c | 25 +++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcr90/tests/msvcr90.c | 14 ++++++++++++++ 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ade980c..bf3a068 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -517,9 +517,9 @@ @ cdecl _beep(long long) msvcrt._beep @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex -@ stub _byteswap_uint64 -@ stub _byteswap_ulong -@ stub _byteswap_ushort +@ cdecl _byteswap_uint64(int64) msvcr90._byteswap_uint64 +@ cdecl _byteswap_ulong(long) msvcr90._byteswap_ulong +@ cdecl _byteswap_ushort(long) msvcr90._byteswap_ushort @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d4d7a86..8686359 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -356,9 +356,9 @@ @ cdecl _beep(long long) msvcrt._beep @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex -@ stub _byteswap_uint64 -@ stub _byteswap_ulong -@ stub _byteswap_ushort +@ cdecl _byteswap_uint64(int64) msvcr90._byteswap_uint64 +@ cdecl _byteswap_ulong(long) msvcr90._byteswap_ulong +@ cdecl _byteswap_ushort(long) msvcr90._byteswap_ushort @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 663dd37..2caf60d 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -366,3 +366,28 @@ int CDECL MSVCR90__vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *fo { return _vswprintf_p_l(buffer, length, format, NULL, args); } + +/********************************************************************* + * _byteswap_ushort (MSVCR90.@) + */ +unsigned short CDECL _byteswap_ushort(unsigned short s) +{ + return (s<<8) + (s>>8); +} + +/********************************************************************* + * _byteswap_ulong (MSVCR90.@) + */ +unsigned long CDECL _byteswap_ulong(unsigned long l) +{ + return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24); +} + +/********************************************************************* + * _byteswap_uint64 (MSVCR90.@) + */ +unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) +{ + return (i<<56) + ((i&0xFF00)<<40) + ((i&0xFF0000)<<24) + ((i&0xFF000000)<<8) + + ((i>>8)&0xFF000000) + ((i>>24)&0xFF0000) + ((i>>40)&0xFF00) + (i>>56); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 70bc2b3..6aefe20 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -348,9 +348,9 @@ @ cdecl _beep(long long) msvcrt._beep @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex -@ stub _byteswap_uint64 -@ stub _byteswap_ulong -@ stub _byteswap_ushort +@ cdecl _byteswap_uint64(int64) +@ cdecl _byteswap_ulong(long) +@ cdecl _byteswap_ushort(long) @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 09b4a40..dc15472 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -109,6 +109,7 @@ static int (__cdecl *p_fileno)(FILE*); static int (__cdecl *p_feof)(FILE*); static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); +static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); /* type info */ @@ -286,6 +287,7 @@ static BOOL init(void) SET(p_feof, "feof"); SET(p_ferror, "ferror"); SET(p_flsbuf, "_flsbuf"); + SET(p_byteswap_ulong, "_byteswap_ulong"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1137,6 +1139,17 @@ static void test_nonblocking_file_access(void) p_unlink("test_file"); } +static void test_byteswap(void) +{ + unsigned long ret; + + ret = p_byteswap_ulong(0x12345678); + ok(ret == 0x78563412, "ret = %lx\n", ret); + + ret = p_byteswap_ulong(0); + ok(ret == 0, "ret = %lx\n", ret); +} + START_TEST(msvcr90) { if(!init()) @@ -1159,4 +1172,5 @@ START_TEST(msvcr90) test_getptd(); test__vswprintf_l(); test_nonblocking_file_access(); + test_byteswap(); }

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DTexture8Impl.
by Alexandre Julliard April 17, 2012

April 17, 2012

Module: wine Branch: master Commit: 7bb17f49e3303ee49da7b97fb5080781cd0a4617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb17f49e3303ee49da7b97fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:12 2012 +0200 d3d8: Get rid of IDirect3DTexture8Impl. --- dlls/d3d8/d3d8_private.h | 26 ++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 194 ++++++++++++++++++++++------------------------ 3 files changed, 104 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bb17f49e3303ee49da7b…

1 0