wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Nikolay Sivov : dwrite: Add all installed font families to system font collection.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: f0f1735495d79c474f50c0303718b719a4febe2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f1735495d79c474f50c0303… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 21 00:24:35 2012 -0400 dwrite: Add all installed font families to system font collection. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 57 +++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/main.c | 8 ++++- dlls/dwrite/tests/font.c | 34 ++++++++++++++++++++++++- 4 files changed, 94 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3135ade..4cb0e3b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -68,10 +68,10 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; -extern HRESULT create_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +extern HRESULT create_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d5346c9..689a330 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -130,6 +130,10 @@ typedef struct struct dwrite_fontcollection { IDWriteFontCollection IDWriteFontCollection_iface; LONG ref; + + WCHAR **families; + UINT32 count; + int alloc; }; struct dwrite_fontfamily { @@ -657,7 +661,14 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + int i; + + for (i = 0; i < This->count; i++) + heap_free(This->families[i]); + heap_free(This->families); heap_free(This); + } return ref; } @@ -665,8 +676,8 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollection *iface) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->count; } static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) @@ -700,9 +711,35 @@ static const IDWriteFontCollectionVtbl fontcollectionvtbl = { dwritefontcollection_GetFontFromFontFace }; -HRESULT create_fontcollection(IDWriteFontCollection **collection) +static HRESULT add_family_syscollection(struct dwrite_fontcollection *collection, const WCHAR *family) +{ + /* check for duplicate family name */ + if (collection->count && !strcmpW(collection->families[collection->count-1], family)) return S_OK; + + /* double array length */ + if (collection->count == collection->alloc) + { + collection->alloc *= 2; + collection->families = heap_realloc(collection->families, collection->alloc*sizeof(WCHAR*)); + } + + collection->families[collection->count++] = heap_strdupW(family); + TRACE("family name %s\n", debugstr_w(family)); + + return S_OK; +} + +static INT CALLBACK enum_font_families(const LOGFONTW *lf, const TEXTMETRICW *tm, DWORD type, LPARAM lParam) +{ + struct dwrite_fontcollection *collection = (struct dwrite_fontcollection*)lParam; + return add_family_syscollection(collection, lf->lfFaceName) == S_OK; +} + +HRESULT create_system_fontcollection(IDWriteFontCollection **collection) { struct dwrite_fontcollection *This; + LOGFONTW lf; + HDC hdc; *collection = NULL; @@ -712,6 +749,20 @@ HRESULT create_fontcollection(IDWriteFontCollection **collection) This->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; This->ref = 1; + This->alloc = 50; + This->count = 0; + This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + + TRACE("building system font collection:\n"); + + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = DEFAULT_PITCH; + lf.lfFaceName[0] = 0; + EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); + DeleteDC(hdc); + *collection = &This->IDWriteFontCollection_iface; return S_OK; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 5f69723..4605008 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -384,8 +384,12 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *iface, IDWriteFontCollection **collection, BOOL check_for_updates) { - FIXME("(%p %d): semi-stub\n", collection, check_for_updates); - return create_fontcollection(collection); + TRACE("(%p %d)\n", collection, check_for_updates); + + if (check_for_updates) + FIXME("checking for system font updates not implemented\n"); + + return create_system_fontcollection(collection); } static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 594ccea..9dc59e0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -41,11 +41,11 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) static IDWriteFactory *factory; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR blahW[] = {'B','l','a','h','!',0}; static void test_CreateFontFromLOGFONT(void) { static const WCHAR tahomaspW[] = {'T','a','h','o','m','a',' ',0}; - static const WCHAR blahW[] = {'B','l','a','h','!',0}; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; @@ -523,6 +523,37 @@ todo_wine IDWriteGdiInterop_Release(interop); } +static void test_system_fontcollection(void) +{ + IDWriteFontCollection *collection; + HRESULT hr; + UINT32 i; + BOOL ret; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + i = IDWriteFontCollection_GetFontFamilyCount(collection); + ok(i, "got %u\n", i); + +todo_wine { + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + + ret = TRUE; + i = 0; + hr = IDWriteFontCollection_FindFamilyName(collection, blahW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!ret, "got %d\n", ret); + ok(i == (UINT32)-1, "got %u\n", i); +} + IDWriteFontCollection_Release(collection); +} + START_TEST(font) { HRESULT hr; @@ -541,6 +572,7 @@ START_TEST(font) test_GetFamilyNames(); test_CreateFontFace(); test_GetMetrics(); + test_system_fontcollection(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Fix a stupid copy/ paste typo in Release return value.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: eb7d51b649b4061b5c674031d913025f0e9e568a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7d51b649b4061b5c674031d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 20 21:47:22 2012 -0400 dwrite: Fix a stupid copy/paste typo in Release return value. --- dlls/dwrite/font.c | 6 +++--- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/main.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bb3e8a6..d5346c9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -211,7 +211,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace *iface) if (!ref) heap_free(This); - return S_OK; + return ref; } static DWRITE_FONT_FACE_TYPE WINAPI dwritefontface_GetType(IDWriteFontFace *iface) @@ -405,7 +405,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont *iface, IDWriteFontFamily **family) @@ -558,7 +558,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily *iface, IDWriteFontCollection **collection) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index bac6e40..fcc14f7 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -84,7 +84,7 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget *iface, diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 577a261..760ebb2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -104,7 +104,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritetextlayout_SetTextAlignment(IDWriteTextLayout *iface, DWRITE_TEXT_ALIGNMENT alignment) @@ -710,7 +710,7 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) heap_free(This); } - return S_OK; + return ref; } static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat *iface, DWRITE_TEXT_ALIGNMENT alignment) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 29552c6..5f69723 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -99,7 +99,7 @@ static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams *iface) if (!ref) heap_free(This); - return S_OK; + return ref; } static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams *iface) @@ -236,7 +236,7 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) heap_free(This); } - return S_OK; + return ref; } static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface)

1 0

Nikolay Sivov : dwrite: Added a stub for IDWriteFontCollection.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: be699372c2150d1d2dd3b8496cf370981ceb6581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be699372c2150d1d2dd3b8496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 20 21:43:01 2012 -0400 dwrite: Added a stub for IDWriteFontCollection. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 103 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9e63da0..3135ade 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -68,6 +68,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; +extern HRESULT create_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 90131b8..bb3e8a6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -127,6 +127,11 @@ typedef struct #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +struct dwrite_fontcollection { + IDWriteFontCollection IDWriteFontCollection_iface; + LONG ref; +}; + struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; @@ -166,6 +171,11 @@ static inline struct dwrite_fontfamily *impl_from_IDWriteFontFamily(IDWriteFontF return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontFamily_iface); } +static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection(IDWriteFontCollection *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontcollection, IDWriteFontCollection_iface); +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); @@ -614,6 +624,99 @@ static const IDWriteFontFamilyVtbl fontfamilyvtbl = { dwritefontfamily_GetMatchingFonts }; +static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection *iface, REFIID riid, void **obj) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDWriteFontCollection)) + { + *obj = iface; + IDWriteFontCollection_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefontcollection_AddRef(IDWriteFontCollection *iface) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollection *iface) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p): stub\n", This); + return 0; +} + +static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p)->(%u %p): stub\n", This, index, family); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_w(name), index, exists); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p)->(%p %p): stub\n", This, face, font); + return E_NOTIMPL; +} + +static const IDWriteFontCollectionVtbl fontcollectionvtbl = { + dwritefontcollection_QueryInterface, + dwritefontcollection_AddRef, + dwritefontcollection_Release, + dwritefontcollection_GetFontFamilyCount, + dwritefontcollection_GetFontFamily, + dwritefontcollection_FindFamilyName, + dwritefontcollection_GetFontFromFontFace +}; + +HRESULT create_fontcollection(IDWriteFontCollection **collection) +{ + struct dwrite_fontcollection *This; + + *collection = NULL; + + This = heap_alloc(sizeof(struct dwrite_fontcollection)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; + This->ref = 1; + + *collection = &This->IDWriteFontCollection_iface; + + return S_OK; +} + static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 75445e8..29552c6 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -384,8 +384,8 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *iface, IDWriteFontCollection **collection, BOOL check_for_updates) { - FIXME("(%p %d): stub\n", collection, check_for_updates); - return E_NOTIMPL; + FIXME("(%p %d): semi-stub\n", collection, check_for_updates); + return create_fontcollection(collection); } static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface,

1 0

Nikolay Sivov : dwrite: Store text string in layout object.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 11d94a11b604633d08adbc37afe63c9cc7be59a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d94a11b604633d08adbc37a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 20 17:02:25 2012 -0400 dwrite: Store text string in layout object. --- dlls/dwrite/dwrite_private.h | 18 ++++++++++++++++-- dlls/dwrite/layout.c | 8 +++++++- dlls/dwrite/main.c | 4 ++-- dlls/dwrite/tests/layout.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d5890bb..9e63da0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -38,7 +38,7 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } -static inline LPWSTR heap_strdupW(LPCWSTR str) +static inline LPWSTR heap_strdupW(const WCHAR *str) { LPWSTR ret = NULL; @@ -53,10 +53,24 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) +{ + WCHAR *ret = NULL; + + if (len) + { + ret = heap_alloc((len+1)*sizeof(WCHAR)); + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } + + return ret; +} + extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; -extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 64f3c0d..577a261 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_textlayout { IDWriteTextLayout IDWriteTextLayout_iface; LONG ref; + + WCHAR *str; }; struct dwrite_textformat { @@ -97,7 +99,10 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + heap_free(This->str); heap_free(This); + } return S_OK; } @@ -646,7 +651,7 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { dwritetextlayout_HitTestTextRange }; -HRESULT create_textlayout(IDWriteTextLayout **layout) +HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; @@ -657,6 +662,7 @@ HRESULT create_textlayout(IDWriteTextLayout **layout) This->IDWriteTextLayout_iface.lpVtbl = &dwritetextlayoutvtbl; This->ref = 1; + This->str = heap_strdupnW(str, len); *layout = &This->IDWriteTextLayout_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 20aed56..75445e8 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -506,7 +506,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory *iface, WCHA FIXME("(%s %u %p %f %f %p): stub\n", debugstr_w(string), len, format, max_width, max_height, layout); if (!format) return E_INVALIDARG; - return create_textlayout(layout); + return create_textlayout(string, len, layout); } static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory *iface, WCHAR const* string, @@ -517,7 +517,7 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory pixels_per_dip, transform, use_gdi_natural, layout); if (!format) return E_INVALIDARG; - return create_textlayout(layout); + return create_textlayout(string, len, layout); } static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory *iface, IDWriteTextFormat *format, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6e2c718..ab29c06 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -27,6 +27,16 @@ static IDWriteFactory *factory; +static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc = IUnknown_AddRef(obj); + IUnknown_Release(obj); + ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); +} + static void test_CreateTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -52,7 +62,9 @@ static void test_CreateTextLayout(void) static void test_CreateGdiCompatibleTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteTextLayout *layout; + IDWriteTextFormat *format; HRESULT hr; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, 0.0, NULL, FALSE, &layout); @@ -69,6 +81,30 @@ static void test_CreateGdiCompatibleTextLayout(void) hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, 1.0, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* create with text format */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(format, 1); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(format, 1); + EXPECT_REF(layout, 1); + + IDWriteTextLayout_AddRef(layout); + EXPECT_REF(format, 1); + EXPECT_REF(layout, 2); + IDWriteTextLayout_Release(layout); + IDWriteTextLayout_Release(layout); + + /* zero length string is okay */ + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); } START_TEST(layout)

1 0

Jacek Caban : mshtml: Added more events tests.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 516731c8618d0b30e4fb0298bd6b3b89fc7c2051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516731c8618d0b30e4fb0298b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 12:00:06 2012 +0200 mshtml: Added more events tests. --- dlls/mshtml/tests/events.html | 42 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index b3b6958..131ba19 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -78,12 +78,50 @@ function test_scriptfor() { ok(typeof(div.ontest) === "undefined", "typeof(div.ontest) = " + typeof(div.ontest)); } -function runTests() { +function test_handler_this() { + document.body.innerHTML = '<div id="d1"><div id="d2"></div></div>'; + + var div1 = document.getElementById("d1"); + var div2 = document.getElementById("d2"); + var calls = new Array(); + + function createHandler(name, node) { + return function() { + ok(this === node, "this !== node"); + calls.push(name); + } + } + + function registerHandler(name, target) { + var b = target.attachEvent("onclick", function() { + ok(this === window, "this !== window"); + calls.push(name+"*"); + }); + ok(b, "attachEvent failed"); + } + + registerHandler("div1", div1); + registerHandler("div2", div2); + registerHandler("body", document.body); + div1.onclick = createHandler("div1", div1); + div2.onclick = createHandler("div2", div2); + document.body.onclick = createHandler("body", document.body); + + div2.click(); + ok(calls == "div2,div2*,div1,div1*,body,body*", "calls = " + calls); +} + +function runTests(t) { try { ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); + ok(t === window, "t !== window"); + + ok(typeof(window.onload) === "function", "typeof(window.onload) = " + typeof(window.onload)); + ok(document.body.onload === window.onload, "document.body.onload !== window.onload"); test_scriptfor(); ondataavailable_test(); + test_handler_this(); }catch(e) { ok(false, "Got an exception: " + e.message); } @@ -92,7 +130,7 @@ function runTests() { } </script> </head> -<body onload="runTests()"> +<body onload="runTests(this)"> <div id="divid"></div> <div id="divid2"></div> <script event="onclick" for="divid2">

1 0

Jacek Caban : mshtml: Set 'this' to window object for onload handlers.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 4940275d21c1112b60e6d14c86985d5b6e32a912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4940275d21c1112b60e6d14c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 11:59:45 2012 +0200 mshtml: Set 'this' to window object for onload handlers. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 20 +++++++++++--------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/persist.c | 5 +++-- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 753bbcb..2e7b18c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1664,7 +1664,7 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve switch(code) { case VK_F1: /* DOM_VK_F1 */ TRACE("F1 pressed\n"); - fire_event(This->node.doc, EVENTID_HELP, TRUE, This->node.nsnode, NULL); + fire_event(This->node.doc, EVENTID_HELP, TRUE, This->node.nsnode, NULL, NULL); *prevent_default = TRUE; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 641d453..068114a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1033,7 +1033,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } } -static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, nsIDOMNode *target) +static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, + nsIDOMNode *target, IDispatch *script_this) { IHTMLEventObj *prev_event; nsIDOMNode *parent, *nsnode; @@ -1060,7 +1061,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e hres = get_node(doc, nsnode, FALSE, &node); if(SUCCEEDED(hres) && node) { call_event_handlers(doc, event_obj, *get_node_event_target(node), - node->cp_container, eid, (IDispatch*)&node->IHTMLDOMNode_iface); + node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } @@ -1089,7 +1090,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e hres = get_node(doc, (nsIDOMNode*)nsbody, FALSE, &node); if(SUCCEEDED(hres) && node) { call_event_handlers(doc, event_obj, *get_node_event_target(node), - node->cp_container, eid, (IDispatch*)&node->IHTMLDOMNode_iface); + node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } nsIDOMHTMLElement_Release(nsbody); @@ -1099,7 +1100,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e } call_event_handlers(doc, event_obj, doc->node.event_target, &doc->basedoc.cp_container, eid, - (IDispatch*)&doc->basedoc.IHTMLDocument2_iface); + script_this ? script_this : (IDispatch*)&doc->basedoc.IHTMLDocument2_iface); break; default: @@ -1148,7 +1149,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e } } -void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent) +void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent, + IDispatch *script_this) { HTMLEventObj *event_obj = NULL; HTMLDOMNode *node; @@ -1171,7 +1173,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode } } - fire_event_obj(doc, eid, event_obj, target); + fire_event_obj(doc, eid, event_obj, target, script_this); if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); @@ -1216,7 +1218,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(event_obj) { hres = set_event_info(event_obj, node, eid, NULL); if(SUCCEEDED(hres)) - fire_event_obj(node->doc, eid, event_obj, node->nsnode); + fire_event_obj(node->doc, eid, event_obj, node->nsnode, NULL); IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(FAILED(hres)) @@ -1227,7 +1229,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even return E_NOTIMPL; } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + fire_event(node->doc, eid, TRUE, node->nsnode, NULL, NULL); } *cancelled = VARIANT_TRUE; /* FIXME */ @@ -1246,7 +1248,7 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return hres; } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + fire_event(node->doc, eid, TRUE, node->nsnode, NULL, NULL); return S_OK; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8aa8ed1..ca39038 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -51,7 +51,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; -void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*) DECLSPEC_HIDDEN; + void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(event_target_t**,nsIDOMNode*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(event_target_t**,nsIDOMNode*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 48a54b0..c93673a 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1418,7 +1418,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList TRACE("(%p)->(%08x %p %p)\n", This, aContextFlags, aEvent, aNode); - fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, aNode, aEvent); + fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, aNode, aEvent, NULL); nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&event); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 7f66f17..5f23e08 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -269,7 +269,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); if(nsbody) { - fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event); + fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); nsIDOMHTMLElement_Release(nsbody); } @@ -313,7 +313,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } - fire_event(doc, eid, TRUE, nsnode, event); + fire_event(doc, eid, TRUE, nsnode, event, NULL); nsIDOMNode_Release(nsnode); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d92989e..e29bb25 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -409,11 +409,12 @@ void set_ready_state(HTMLOuterWindow *window, READYSTATE readystate) if(window->doc_obj && window->doc_obj->basedoc.window == window) call_property_onchanged(&window->doc_obj->basedoc.cp_propnotif, DISPID_READYSTATE); - fire_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, FALSE, window->base.inner_window->doc->node.nsnode, NULL); + fire_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, FALSE, + window->base.inner_window->doc->node.nsnode, NULL, NULL); if(window->frame_element) fire_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, - TRUE, window->frame_element->element.node.nsnode, NULL); + TRUE, window->frame_element->element.node.nsnode, NULL, NULL); } static HRESULT get_doc_string(HTMLDocumentNode *This, char **str)

1 0

Jacek Caban : mshtml: Added IHTMLLocation::toString implementation.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 610ea94da5ba5ac954f7d9dc6434562f3fee85b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610ea94da5ba5ac954f7d9dc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 11:59:27 2012 +0200 mshtml: Added IHTMLLocation::toString implementation. --- dlls/mshtml/htmllocation.c | 6 ++++-- dlls/mshtml/tests/htmllocation.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 3ce0978..3a978b5 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -583,8 +583,10 @@ static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - FIXME("(%p)->(%p)\n", This, String); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, String); + + return IHTMLLocation_get_href(&This->IHTMLLocation_iface, String); } static const IHTMLLocationVtbl HTMLLocationVtbl = { diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index d314a13..8bf5517 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -129,6 +129,12 @@ static void test_href(IHTMLLocation *loc, const struct location_test *test) "%s: expected retrieved href to be L\"%s\", was: %s\n", test->name, test->href, wine_dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLLocation_toString(loc, &str); + ok(hres == S_OK, "%s: toString failed: 0x%08x\n", test->name, hres); + ok(str_eq_wa(str, test->href), "%s: toString returned %s, expected %s\n", + test->name, wine_dbgstr_w(str), test->href); + SysFreeString(str); } static void test_protocol(IHTMLLocation *loc, const struct location_test *test)

1 0

Jacek Caban : mshtml: Fixed attribute object caching logic.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 8b04ab10b9dc36fe5f8b1a74eb7866b465d5cd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b04ab10b9dc36fe5f8b1a74e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 11:59:10 2012 +0200 mshtml: Fixed attribute object caching logic. --- dlls/mshtml/htmlelem.c | 21 +++++++++++---------- dlls/mshtml/tests/jstest.html | 10 ++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d11ebbc..753bbcb 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2254,7 +2254,6 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - pos++; hres = HTMLDOMAttribute_Create(This->elem, id, attr); if(FAILED(hres)) return hres; @@ -2596,20 +2595,22 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI switch(flags) { case DISPATCH_PROPERTYGET: { HTMLDOMAttribute *iter; + DWORD pos; - id = id-MSHTML_DISPID_CUSTOM_MIN+1; + pos = id-MSHTML_DISPID_CUSTOM_MIN; LIST_FOR_EACH_ENTRY(iter, &This->attrs, HTMLDOMAttribute, entry) { - if(!(--id)) - break; + if(!pos) { + IHTMLDOMAttribute_AddRef(&iter->IHTMLDOMAttribute_iface); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)&iter->IHTMLDOMAttribute_iface; + return S_OK; + } + pos--; } - if(id) - return E_INVALIDARG; - IHTMLDOMAttribute_AddRef(&iter->IHTMLDOMAttribute_iface); - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)&iter->IHTMLDOMAttribute_iface; - return S_OK; + WARN("invalid arg\n"); + return E_INVALIDARG; } default: diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 70478e4..7fa9565 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -113,7 +113,16 @@ function test_setAttribute() { input.setAttribute("checked", ""); ok(input.checked === false, "input.checked = " + input.checked); +} + +function test_attribute_collection() { + var div, attr; + + document.body.innerHTML = '<div id="divid" class="test"></div>'; + div = document.getElementById("divid"); + attr = div.attributes["dir"]; + ok(attr === div.attributes["dir"], "attr !== div.attributes['dir']"); } function test_getter_call() { @@ -166,6 +175,7 @@ function runTests() { test_remove_style_attribute(); test_getter_call(); test_setAttribute(); + test_attribute_collection(); test_override_functions(); var r = window.execScript("globalVar = true;");

1 0

Christian Costa : d3drm: Fix normals computation and add according tests.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: cb131bf03032663fa9712bcdd83012b4eb487d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb131bf03032663fa9712bcdd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 18:11:03 2012 +0200 d3drm: Fix normals computation and add according tests. --- dlls/d3drm/meshbuilder.c | 2 +- dlls/d3drm/tests/d3drm.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 22efb00..4ba29cc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1419,7 +1419,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) D3DVECTOR a, b; D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[2]], &This->pVertices[faces_vertex_idx_ptr[1]]); - D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[1]], &This->pVertices[faces_vertex_idx_ptr[0]]); + D3DRMVectorSubtract(&b, &This->pVertices[faces_vertex_idx_ptr[0]], &This->pVertices[faces_vertex_idx_ptr[1]]); D3DRMVectorCrossProduct(&face_normal, &a, &b); D3DRMVectorNormalize(&face_normal); } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a257aea..0d600c5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -64,6 +64,11 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static BOOL match_float(float a, float b) +{ + return (a - b) < 0.000001f; +} + static D3DRMMATRIX4D identity = { { 1.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f, 0.0f }, @@ -186,7 +191,7 @@ static void test_MeshBuilder(void) DWORD val1, val2, val3; D3DVALUE valu, valv; D3DVECTOR v[3]; - D3DVECTOR n[3]; + D3DVECTOR n[4]; DWORD f[8]; char name[10]; DWORD size; @@ -259,6 +264,22 @@ static void test_MeshBuilder(void) ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + /* Check that Load method generated default normals */ + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(match_float(U1(n[0]).x, 0.577350f), "Wrong component n[0].x = %f (expected %f)\n", U1(n[0]).x, 0.577350f); + ok(match_float(U2(n[0]).y, 0.577350f), "Wrong component n[0].y = %f (expected %f)\n", U2(n[0]).y, 0.577350f); + ok(match_float(U3(n[0]).z, 0.577350f), "Wrong component n[0].z = %f (expected %f)\n", U3(n[0]).z, 0.577350f); + ok(match_float(U1(n[1]).x, -0.229416f), "Wrong component n[1].x = %f (expected %f)\n", U1(n[1]).x, -0.229416f); + ok(match_float(U2(n[1]).y, 0.688247f), "Wrong component n[1].y = %f (expected %f)\n", U2(n[1]).y, 0.688247f); + ok(match_float(U3(n[1]).z, 0.688247f), "Wrong component n[1].z = %f (expected %f)\n", U3(n[1]).z, 0.688247f); + ok(match_float(U1(n[2]).x, -0.229416f), "Wrong component n[2].x = %f (expected %f)\n", U1(n[2]).x, -0.229416f); + ok(match_float(U2(n[2]).y, 0.688247f), "Wrong component n[2].y = %f (expected %f)\n", U2(n[2]).y, 0.688247f); + ok(match_float(U3(n[2]).z, 0.688247f), "Wrong component n[2].z = %f (expected %f)\n", U3(n[2]).z, 0.688247f); + ok(match_float(U1(n[3]).x, -0.577350f), "Wrong component n[3].x = %f (expected %f)\n", U1(n[3]).x, -0.577350f); + ok(match_float(U2(n[3]).y, 0.577350f), "Wrong component n[3].y = %f (expected %f)\n", U2(n[3]).y, 0.577350f); + ok(match_float(U3(n[3]).z, 0.577350f), "Wrong component n[3].z = %f (expected %f)\n", U3(n[3]).z, 0.577350f); + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ valu = 1.23f; valv = 3.21f;

1 0

Christian Costa : d3drm: Enum all materials even if only the first one is handled.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 466c244d1833f6644abae540030ef662a187984d URL: http://source.winehq.org/git/wine.git/?a=commit;h=466c244d1833f6644abae5400… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:32 2012 +0200 d3drm: Enum all materials even if only the first one is handled. --- dlls/d3drm/meshbuilder.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 180a8a9..22efb00 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1244,10 +1244,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) WARN("Returned size %u does not match expected one %u\n", size, data_size); if (nb_materials > 1) - { FIXME("Only one material per mesh supported, first one applies to all faces\n"); - nb_materials = 1; - } while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(pData2, &child)) && (i < nb_materials)) { @@ -1256,6 +1253,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) LPDIRECT3DRMMATERIAL2 material; LPDIRECTXFILEOBJECT material_child; + if (i >= 1) + { + /* FIXME: Only handle first material but enum all of them */ + IDirectXFileObject_Release(child); + i++; + continue; + } + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) {

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012