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

Jacek Caban : mshtml: Use caller for argument convertion in builtin_propput if available.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 4ae7d364dda2cc1c403f44e6039816f6f3cb90b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae7d364dda2cc1c403f44e60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:47:10 2012 +0100 mshtml: Use caller for argument convertion in builtin_propput if available. --- dlls/mshtml/dispex.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 29628eb..7eff5c6 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -771,6 +771,25 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID CASE_VT(VT_UNKNOWN, IUnknown*, V_UNKNOWN); \ CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH) +static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) +{ + V_VT(dst) = VT_EMPTY; + + if(caller) { + IVariantChangeType *change_type = NULL; + HRESULT hres; + + hres = IServiceProvider_QueryService(caller, &SID_VariantConversion, &IID_IVariantChangeType, (void**)&change_type); + if(SUCCEEDED(hres)) { + hres = IVariantChangeType_ChangeType(change_type, dst, src, LOCALE_NEUTRAL, vt); + IVariantChangeType_Release(change_type); + return hres; + } + } + + return VariantChangeType(dst, src, 0, vt); +} + static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS *dp, VARIANT *res) { IUnknown *iface; @@ -810,7 +829,7 @@ static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS * return S_OK; } -static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS *dp) +static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS *dp, IServiceProvider *caller) { VARIANT *v, tmpv; IUnknown *iface; @@ -829,8 +848,7 @@ static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS * v = dp->rgvarg; if(func->prop_vt != VT_VARIANT && V_VT(v) != func->prop_vt) { - V_VT(&tmpv) = VT_EMPTY; - VariantChangeType(&tmpv, v, 0, func->prop_vt); + hres = change_type(&tmpv, v, func->prop_vt, caller); if(FAILED(hres)) return hres; v = &tmpv; @@ -882,7 +900,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD case DISPATCH_PROPERTYPUT: if(res) V_VT(res) = VT_EMPTY; - hres = builtin_propput(This, func, dp); + hres = builtin_propput(This, func, dp, caller); break; case DISPATCH_PROPERTYGET: hres = builtin_propget(This, func, dp, res);

1 0

André Hentschel : d3drm/tests: Add GetParent NULL pointer test.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 748bb3e2e7b6567011177072fa7f4facbc4a3bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=748bb3e2e7b6567011177072f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 17:57:49 2012 +0100 d3drm/tests: Add GetParent NULL pointer test. --- dlls/d3drm/tests/d3drm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 482806e..e68d968 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -278,6 +278,11 @@ static void test_Frame(void) hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameP1); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + /* GetParent with NULL pointer */ + hr = IDirect3DRMFrame_GetParent(pFrameP1, NULL); + todo_wine ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + /* [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);

1 0

Jacek Caban : mshtml: Don't use ITypeInfo for InvokeEx(DISPATCH_PROPERTYGET ) implementation.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: c9eed8f987ff3fa19bc11ef3baf319d697f7b2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9eed8f987ff3fa19bc11ef3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:46:42 2012 +0100 mshtml: Don't use ITypeInfo for InvokeEx(DISPATCH_PROPERTYGET) implementation. --- dlls/mshtml/dispex.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index bdad32e..88f10c3 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -759,6 +759,57 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } +/* List all types used by IDispatchEx-based properties */ +#define BUILTIN_TYPES_SWITCH \ + CASE_VT(VT_I2, INT16, V_I2); \ + CASE_VT(VT_I4, INT32, V_I4); \ + CASE_VT(VT_R4, float, V_R4); \ + CASE_VT(VT_BSTR, BSTR, V_BSTR); \ + CASE_VT(VT_BOOL, VARIANT_BOOL, V_BOOL); \ + CASE_VT(VT_VARIANT, VARIANT, *); \ + CASE_VT(VT_PTR, void*, V_BYREF); \ + CASE_VT(VT_UNKNOWN, IUnknown*, V_UNKNOWN); \ + CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH) + +static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS *dp, VARIANT *res) +{ + IUnknown *iface; + HRESULT hres; + + if(dp->cArgs) { + FIXME("cArgs %d\n", dp->cArgs); + return E_NOTIMPL; + } + + assert(func->get_vtbl_off); + + hres = IUnknown_QueryInterface(This->outer, tid_ids[func->tid], (void**)&iface); + if(SUCCEEDED(hres)) { + switch(func->prop_vt) { +#define CASE_VT(vt,type,access) \ + case vt: { \ + type val; \ + hres = ((HRESULT (WINAPI*)(IUnknown*,type*))((void**)iface->lpVtbl)[func->get_vtbl_off])(iface,&val); \ + if(SUCCEEDED(hres)) \ + access(res) = val; \ + } \ + break + BUILTIN_TYPES_SWITCH; +#undef CASE_VT + default: + FIXME("Unhandled vt %d\n", func->prop_vt); + hres = E_NOTIMPL; + } + IUnknown_Release(iface); + } + + if(FAILED(hres)) + return hres; + + V_VT(res) = func->prop_vt == VT_PTR ? VT_DISPATCH : func->prop_vt; + return S_OK; +} + static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -776,10 +827,16 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(func->func_disp_idx == -1) + if(func->func_disp_idx != -1) + return function_invoke(This, func, flags, dp, res, ei); + + switch(flags) { + case DISPATCH_PROPERTYGET: + hres = builtin_propget(This, func, dp, res); + break; + default: hres = typeinfo_invoke(This, func, flags, dp, res, ei); - else - hres = function_invoke(This, func, flags, dp, res, ei); + } return hres; }

1 0

Nikolay Sivov : msxml3: Implement IMXAttributes::addAttribute().
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 70aa4f1a43b80d65330f857ad01fbd3fa62419a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70aa4f1a43b80d65330f857ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 13 10:59:53 2012 +0300 msxml3: Implement IMXAttributes::addAttribute(). --- dlls/msxml3/mxwriter.c | 68 +++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 2 - 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 2188557..d0ce946 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -120,10 +120,25 @@ typedef struct typedef struct { + BSTR qname; + BSTR local; + BSTR uri; + BSTR type; + BSTR value; +} mxattribute; + +typedef struct +{ DispatchEx dispex; IMXAttributes IMXAttributes_iface; ISAXAttributes ISAXAttributes_iface; LONG ref; + + MSXML_VERSION class_version; + + mxattribute *attr; + int length; + int allocated; } mxattributes; static inline mxattributes *impl_from_IMXAttributes( IMXAttributes *iface ) @@ -136,6 +151,16 @@ static inline mxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) return CONTAINING_RECORD(iface, mxattributes, ISAXAttributes_iface); } +static HRESULT mxattributes_grow(mxattributes *This) +{ + if (This->length < This->allocated) return S_OK; + + This->allocated *= 2; + This->attr = heap_realloc(This->attr, This->allocated*sizeof(mxattribute)); + + return This->attr ? S_OK : E_OUTOFMEMORY; +} + static xml_encoding parse_encoding_name(const WCHAR *encoding) { static const WCHAR utf8W[] = {'U','T','F','-','8',0}; @@ -1505,7 +1530,19 @@ static ULONG WINAPI MXAttributes_Release(IMXAttributes *iface) if (ref == 0) { + int i; + + for (i = 0; i < This->length; i++) + { + SysFreeString(This->attr[i].qname); + SysFreeString(This->attr[i].local); + SysFreeString(This->attr[i].uri); + SysFreeString(This->attr[i].type); + SysFreeString(This->attr[i].value); + } + release_dispex(&This->dispex); + heap_free(This->attr); heap_free(This); } @@ -1557,9 +1594,29 @@ static HRESULT WINAPI MXAttributes_addAttribute(IMXAttributes *iface, BSTR uri, BSTR localName, BSTR QName, BSTR type, BSTR value) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%s %s %s %s %s): stub\n", This, debugstr_w(uri), debugstr_w(localName), + mxattribute *attr; + HRESULT hr; + + TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_w(uri), debugstr_w(localName), debugstr_w(QName), debugstr_w(type), debugstr_w(value)); - return E_NOTIMPL; + + if ((!uri || !localName || !QName || !type || !value) && This->class_version != MSXML6) + return E_INVALIDARG; + + /* ensure array is large enough */ + hr = mxattributes_grow(This); + if (hr != S_OK) return hr; + + attr = &This->attr[This->length]; + + attr->qname = SysAllocString(QName); + attr->local = SysAllocString(localName); + attr->uri = SysAllocString(uri); + attr->type = SysAllocString(type); + attr->value = SysAllocString(value); + This->length++; + + return S_OK; } static HRESULT WINAPI MXAttributes_addAttributeFromIndex(IMXAttributes *iface, @@ -1806,6 +1863,7 @@ static dispex_static_data_t mxattrs_dispex = { HRESULT SAXAttributes_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) { + static const int default_count = 10; mxattributes *This; TRACE("(%p, %p)\n", outer, ppObj); @@ -1818,6 +1876,12 @@ HRESULT SAXAttributes_create(MSXML_VERSION version, IUnknown *outer, void **ppOb This->ISAXAttributes_iface.lpVtbl = &SAXAttributesVtbl; This->ref = 1; + This->class_version = version; + + This->attr = heap_alloc(default_count*sizeof(mxattribute)); + This->length = 0; + This->allocated = default_count; + *ppObj = &This->IMXAttributes_iface; init_dispex(&This->dispex, (IUnknown*)&This->IMXAttributes_iface, &mxattrs_dispex); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 505acaf..4aca3af 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3332,7 +3332,6 @@ todo_wine { } hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); -todo_wine ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); len = -1; @@ -3380,7 +3379,6 @@ todo_wine hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("local"), _bstr_("qname"), _bstr_("type"), _bstr_("value")); -todo_wine EXPECT_HR(hr, S_OK); len = -1;

1 0

André Hentschel : d3drm/tests: Add tests for IDirect3DRMFrameArray_GetElement.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: f5dfa21115f470811fa90f35252e736e0612ccc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dfa21115f470811fa90f352… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 17:55:33 2012 +0100 d3drm/tests: Add tests for IDirect3DRMFrameArray_GetElement. --- dlls/d3drm/tests/d3drm.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ff2986b..482806e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Christian Costa + * Copyright 2012 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -268,6 +269,9 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 0, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -301,6 +305,10 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -325,6 +333,10 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -335,6 +347,9 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 0, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -357,6 +372,10 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -372,6 +391,9 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 0, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(pArray); } @@ -396,6 +418,14 @@ static void test_Frame(void) { count = IDirect3DRMFrameArray_GetSize(pArray); ok(count == 2, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(pArray, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); + hr = IDirect3DRMFrameArray_GetElement(pArray, 1, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); IDirect3DRMFrameArray_Release(pArray); }

1 0

Kusanagi Kouichi : gdi32: Add a helper function to get face list from family.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 4bb0e2d076bcf535df3dbab4dafca24a78f44855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb0e2d076bcf535df3dbab4d… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:15 2012 +0900 gdi32: Add a helper function to get face list from family. --- dlls/gdi32/freetype.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9a4a6b6..a4d369a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1989,6 +1989,11 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) return NULL; } +static const struct list *get_face_list_from_family(const Family *family) +{ + return &family->faces; +} + static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value; @@ -2023,6 +2028,7 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) memset(&font_link->fs, 0, sizeof font_link->fs); for (i = 0; values[i] != NULL; i++) { + const struct list *face_list; CHILD_FONT *child_font; value = values[i]; @@ -2036,7 +2042,8 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) continue; file = NULL; /* Use first extant filename for this Family */ - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (!face->file) continue; @@ -3902,7 +3909,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) GdiFont *ret; Face *face, *best, *best_bitmap; Family *family, *last_resort_family; - struct list *family_elem_ptr, *face_elem_ptr; + const struct list *family_elem_ptr, *face_list, *face_elem_ptr; INT height, width = 0; unsigned int score = 0, new_score; signed int diff = 0, newdiff; @@ -4034,7 +4041,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) (psub && !strcmpiW(family->FamilyName, psub->to.name))) { font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!(face->scalable || can_use_bitmap)) continue; @@ -4052,7 +4060,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) /* Search by full face name. */ LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->FullName && !strcmpiW(face->FullName, FaceName) && (face->scalable || can_use_bitmap)) @@ -4127,7 +4136,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) family = LIST_ENTRY(family_elem_ptr, Family, entry); if(!strcmpiW(family->FamilyName, lf.lfFaceName)) { font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!(face->scalable || can_use_bitmap)) continue; @@ -4143,7 +4153,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->vertical == want_vertical && (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || @@ -4164,7 +4175,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->scalable && face->vertical == want_vertical) { csi.fs.fsCsb[0] = 0; @@ -4194,7 +4206,8 @@ found: face = best = best_bitmap = NULL; font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || (font_link != NULL && csi.fs.fsCsb[0] & font_link->fs.fsCsb[0]) || @@ -4637,11 +4650,12 @@ static void create_full_name(WCHAR *full_name, const WCHAR *family_name, const W static BOOL family_matches(Family *family, const LOGFONTW *lf) { - struct list *face_elem_ptr; + const struct list *face_list, *face_elem_ptr; if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; - LIST_FOR_EACH(face_elem_ptr, &family->faces) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { WCHAR full_family_name[LF_FULLFACESIZE]; Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); @@ -4720,7 +4734,7 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, { Family *family; Face *face; - struct list *family_elem_ptr, *face_elem_ptr; + const struct list *family_elem_ptr, *face_list, *face_elem_ptr; LOGFONTW lf; struct enum_charset_list enum_charsets; @@ -4753,7 +4767,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); if(family_matches(family, plf)) { - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!face_matches(face, plf)) continue; if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; @@ -4763,7 +4778,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, } else { LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - face_elem_ptr = list_head(&family->faces); + face_list = get_face_list_from_family(family); + face_elem_ptr = list_head(face_list); face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; }

1 0

Kusanagi Kouichi : gdi32: Simplify font replacement loading.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: eab02574929df3a5a6e6dcdb26d4d9a629618e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab02574929df3a5a6e6dcdb2… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:20 2012 +0900 gdi32: Simplify font replacement loading. --- dlls/gdi32/freetype.c | 54 +++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a4d369a..32a6442 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -281,6 +281,7 @@ typedef struct tagFamily { const WCHAR *FamilyName; const WCHAR *EnglishName; struct list faces; + struct list *replacement; } Family; typedef struct { @@ -1323,6 +1324,7 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) family->FamilyName = strdupW(family_name); family->EnglishName = english_family; list_init(&family->faces); + family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); if(english_family) @@ -1540,6 +1542,7 @@ static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, family->FamilyName = strdupW(localised_family ? localised_family : english_family); family->EnglishName = localised_family ? strdupW(english_family) : NULL; list_init(&family->faces); + family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); if(localised_family) { @@ -1900,20 +1903,18 @@ static void LoadReplaceList(void) if(!find_family_from_any_name(value)) { - /* Find the old family and hence all of the font files - in that family */ - const Family * const family = find_family_from_any_name(data); + Family * const family = find_family_from_any_name(data); if (family != NULL) { - const struct list *face_elem_ptr; - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - const Face * const face = LIST_ENTRY(face_elem_ptr, Face, entry); - TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), - debugstr_w(face->StyleName), familyA); - /* Now add a new entry with the new family name */ - AddFontToList(face->file, face->font_data_ptr, face->font_data_size, - familyA, family->FamilyName, - ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + Family * const new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); + if (new_family != NULL) + { + TRACE("mapping %s to %s\n", debugstr_w(data), debugstr_w(value)); + new_family->FamilyName = strdupW(value); + new_family->EnglishName = NULL; + list_init(&new_family->faces); + new_family->replacement = &family->faces; + list_add_tail(&font_list, &new_family->entry); } } else @@ -1991,7 +1992,10 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) static const struct list *get_face_list_from_family(const Family *family) { - return &family->faces; + if (!list_empty(&family->faces)) + return &family->faces; + else + return family->replacement; } static void populate_system_links(const WCHAR *name, const WCHAR *const *values) @@ -4674,24 +4678,24 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) return FALSE; } -static BOOL face_matches(Face *face, const LOGFONTW *lf) +static BOOL face_matches(const WCHAR *family_name, Face *face, const LOGFONTW *lf) { WCHAR full_family_name[LF_FULLFACESIZE]; - if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; + if (!strcmpiW(lf->lfFaceName, family_name)) return TRUE; - if (strlenW(face->family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + if (strlenW(family_name) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) { FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", - debugstr_w(face->family->FamilyName), debugstr_w(face->StyleName)); + debugstr_w(family_name), debugstr_w(face->StyleName)); return FALSE; } - create_full_name(full_family_name, face->family->FamilyName, face->StyleName); + create_full_name(full_family_name, family_name, face->StyleName); return !strcmpiW(lf->lfFaceName, full_family_name); } -static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, +static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, FONTENUMPROCW proc, LPARAM lparam) { ENUMLOGFONTEXW elf; @@ -4713,6 +4717,12 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, if (!elf.elfScript[0]) FIXME("Unknown elfscript for bit %d\n", ffs(list->element[i].mask) - 1); } + /* Font Replacement */ + if (family != face->family) + { + strcpyW(elf.elfLogFont.lfFaceName, family->FamilyName); + create_full_name(elf.elfFullName, family->FamilyName, face->StyleName); + } TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), @@ -4770,8 +4780,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, face_list = get_face_list_from_family(family); LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!face_matches(face, plf)) continue; - if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; + if (!face_matches(family->FamilyName, face, plf)) continue; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } } } @@ -4781,7 +4791,7 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, face_list = get_face_list_from_family(family); face_elem_ptr = list_head(face_list); face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } } LeaveCriticalSection( &freetype_cs );

1 0

André Hentschel : ddraw: Fix a typo.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: b9c1e5ad321f0d612682de6a463fc47be64557e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c1e5ad321f0d612682de6a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 21:03:11 2012 +0100 ddraw: Fix a typo. --- dlls/ddraw/light.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 4eeebd4..2d6a462 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirect3DLightImpl_SetLight(IDirect3DLight *iface, D3DLIGH return DDERR_INVALIDPARAMS; if ( lpLight->dltType == D3DLIGHT_PARALLELPOINT ) - FIXME("D3DLIGHT_PARALLELPOINT no supported\n"); + FIXME("D3DLIGHT_PARALLELPOINT not supported\n"); /* Translate D3DLIGH2 structure to D3DLIGHT7 */ light7->dltType = lpLight->dltType;

1 0

Austin English : advapi32: Add a stub for RegDisableReflectionKey.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 1163d1c00bbd209669615b64e22d7df113961866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1163d1c00bbd209669615b64e… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 3 21:54:14 2012 -0600 advapi32: Add a stub for RegDisableReflectionKey. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 2b5db2b..87a92dc 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -596,7 +596,7 @@ @ stdcall RegDeleteValueW(long wstr) @ stdcall RegDisablePredefinedCache() # @ stub RegDisablePredefinedCacheEx -# @ stub RegDisableReflectionKey +@ stdcall RegDisableReflectionKey(ptr) # @ stub RegEnableReflectionKey @ stdcall RegEnumKeyA(long long ptr long) @ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 758ba08..c4fef67 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2909,3 +2909,13 @@ LSTATUS WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) RtlFreeUnicodeString( &lpszSubKeyW ); return ret; } + +/****************************************************************************** + * RegDisableReflectionKey [ADVAPI32.@] + * + */ +LONG WINAPI RegDisableReflectionKey(HKEY base) +{ + FIXME("%p: stub\n", base); + return ERROR_SUCCESS; +}

1 0

Christian Costa : d3dxof: Do not allow separator to terminate the string. Only the double quote can do that.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 67488dec097e56c8bcb64a17f65d5f4a317b7b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67488dec097e56c8bcb64a17f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 9 11:54:00 2012 +0100 d3dxof: Do not allow separator to terminate the string. Only the double quote can do that. --- dlls/d3dxof/parsing.c | 3 +- dlls/d3dxof/tests/d3dxof.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 9f426c4..0bef29d 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -605,8 +605,9 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while ((pos+1) < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) + while ((pos+1) < buf->rem_bytes) { + c = *(buf->buffer+pos+1); if (c == '"') { ok = 1; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 5293b44..335db62 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -118,6 +118,27 @@ static char object_syntax_empty_array_nosemicolon[] = "1234;\n" "}\n"; +static char template_syntax_string[] = +"xof 0302txt 0064\n" +"template Filename\n" +"{\n" +"<3D82AB43-62DA-11CF-AB39-0020AF71E433>\n" +"STRING filename;\n" +"}\n"; + +static char object_syntax_string_normal[] = +"xof 0302txt 0064\n" +"Filename\n" +"{\n" +"\"foobar\";\n" +"}\n"; + +static char object_syntax_string_with_separator[] = +"xof 0302txt 0064\n" +"Filename\n" +"{\n" +"\"foo;bar\";\n" +"}\n"; static void init_function_pointers(void) { @@ -493,6 +514,8 @@ static void test_syntax(void) LPDIRECTXFILEENUMOBJECT lpdxfeo; LPDIRECTXFILEDATA lpdxfd; DXFILELOADMEMORY dxflm; + DWORD size; + char** string; if (!pDirectXFileCreate) { @@ -541,6 +564,47 @@ static void test_syntax(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_string, sizeof(template_syntax_string) - 1); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + dxflm.lpMemory = &object_syntax_string_normal; + dxflm.dSize = sizeof(object_syntax_string_normal) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(!strcmp(*string, "foobar"), "Got string %s, expected foobar\n", *string); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + + dxflm.lpMemory = &object_syntax_string_with_separator; + dxflm.dSize = sizeof(object_syntax_string_with_separator) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(!strcmp(*string, "foo;bar"), "Got string %s, expected foo;bar\n", *string); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 0, "Got refcount %d, expected 0\n", ref); }

1 0