wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Nikolay Sivov : dwrite: Implement GetString().
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 9b0f49264e423ecb49fa4fc45959556b021a2e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0f49264e423ecb49fa4fc45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 18:43:15 2012 -0400 dwrite: Implement GetString(). --- dlls/dwrite/main.c | 17 +++++++++++++++-- dlls/dwrite/tests/font.c | 37 ++++++++++++++++++++++++++++++++++--- include/winerror.h | 2 ++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4ddc74b..67ba83c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -286,8 +286,21 @@ static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings * static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p)->(%u %p %u): stub\n", This, index, buffer, size); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p %u)\n", This, index, buffer, size); + + if (index >= This->count) { + if (buffer) *buffer = 0; + return E_FAIL; + } + + if (size < strlenW(This->data[index].string)+1) { + if (buffer) *buffer = 0; + return E_NOT_SUFFICIENT_BUFFER; + } + + strcpyW(buffer, This->data[index].string); + return S_OK; } static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b22453c..81e17fd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -320,6 +320,7 @@ static void test_GetFamilyNames(void) IDWriteGdiInterop *interop; IDWriteFont *font; LOGFONTW logfont; + WCHAR buffer[100]; HRESULT hr; UINT32 len; @@ -357,15 +358,45 @@ if (0) /* crashes on native */ if (0) /* crashes on native */ hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL); + len = 100; + hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(len == (UINT32)-1, "got %u\n", len); + len = 0; hr = IDWriteLocalizedStrings_GetStringLength(names, 0, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len > 0, "got %u\n", len); - len = 100; - hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len); + /* GetString */ + hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + + hr = IDWriteLocalizedStrings_GetString(names, 10, NULL, 0); ok(hr == E_FAIL, "got 0x%08x\n", hr); - ok(len == (UINT32)-1, "got %u\n", len); + +if (0) + hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100); + + buffer[0] = 1; + hr = IDWriteLocalizedStrings_GetString(names, 10, buffer, 100); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(buffer[0] == 0, "got %x\n", buffer[0]); + + buffer[0] = 1; + hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len-1); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(buffer[0] == 0, "got %x\n", buffer[0]); + + buffer[0] = 1; + hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(buffer[0] == 0, "got %x\n", buffer[0]); + + buffer[0] = 0; + hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len+1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(buffer[0] != 0, "got %x\n", buffer[0]); IDWriteLocalizedStrings_Release(names); diff --git a/include/winerror.h b/include/winerror.h index 0b9a59e..b6281f8 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1939,6 +1939,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) /* the codes 4000-40ff are reserved for OLE */ #undef NOERROR /* arpa/nameser_compat.h defines this */ +#define E_NOT_SUFFICIENT_BUFFER HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) + #ifdef RC_INVOKED #define _HRESULT_TYPEDEF_(x) (x) #else

1 0

Nikolay Sivov : dwrite: Implement GetStringLength method.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 114ef0688bd141f684ce42b0f6b1db2d2e709278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114ef0688bd141f684ce42b0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 17:25:23 2012 -0400 dwrite: Implement GetStringLength method. --- dlls/dwrite/main.c | 12 ++++++++++-- dlls/dwrite/tests/font.c | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index b056cb1..4ddc74b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -271,8 +271,16 @@ static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *if static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, length); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p)\n", This, index, length); + + if (index >= This->count) { + *length = (UINT32)-1; + return E_FAIL; + } + + *length = strlenW(This->data[index].string); + return S_OK; } static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3bba1ca..b22453c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -321,6 +321,7 @@ static void test_GetFamilyNames(void) IDWriteFont *font; LOGFONTW logfont; HRESULT hr; + UINT32 len; hr = IDWriteFactory_GetGdiInterop(factory, &interop); EXPECT_HR(hr, S_OK); @@ -350,9 +351,24 @@ if (0) /* crashes on native */ EXPECT_REF(names2, 1); ok(names != names2, "got %p, was %p\n", names2, names); - IDWriteLocalizedStrings_Release(names); IDWriteLocalizedStrings_Release(names2); + /* GetStringLength */ +if (0) /* crashes on native */ + hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL); + + len = 0; + hr = IDWriteLocalizedStrings_GetStringLength(names, 0, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len > 0, "got %u\n", len); + + len = 100; + hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(len == (UINT32)-1, "got %u\n", len); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop);

1 0

Nikolay Sivov : dwrite: Add family name to string array.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 98ce55c148bcad1122a85df7dd1c2229074ee1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ce55c148bcad1122a85df7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 17:13:29 2012 -0400 dwrite: Add family name to string array. --- dlls/dwrite/dwrite_private.h | 11 +++++++++ dlls/dwrite/font.c | 10 +++++++- dlls/dwrite/main.c | 47 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cba8130..a754f42 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -23,6 +23,16 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); @@ -47,3 +57,4 @@ extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC extern HRESULT create_textlayout(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/font.c b/dlls/dwrite/font.c index 3890f89..4acd35f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -471,9 +471,15 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + HRESULT hr; - FIXME("(%p)->(%p): stub\n", This, names); - return create_localizedstrings(names); + TRACE("(%p)->(%p)\n", This, names); + + hr = create_localizedstrings(names); + if (FAILED(hr)) return hr; + + return add_localizedstring(*names, enusW, This->familyname); } static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 679416b..b056cb1 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -172,9 +172,18 @@ static HRESULT create_renderingparams(FLOAT gamma, FLOAT enhancedContrast, FLOAT return S_OK; } +struct localizedpair { + WCHAR *locale; + WCHAR *string; +}; + struct localizedstrings { IDWriteLocalizedStrings IDWriteLocalizedStrings_iface; LONG ref; + + struct localizedpair *data; + UINT32 count; + UINT32 alloc; }; static inline struct localizedstrings *impl_from_IDWriteLocalizedStrings(IDWriteLocalizedStrings *iface) @@ -215,8 +224,17 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) TRACE("(%p)->(%d)\n", This, ref); - if (!ref) + if (!ref) { + int i; + + for (i = 0; i < This->count; i++) { + heap_free(This->data[i].locale); + heap_free(This->data[i].string); + } + + heap_free(This->data); heap_free(This); + } return S_OK; } @@ -224,8 +242,8 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->count; } static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *iface, @@ -287,12 +305,35 @@ HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) This->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; This->ref = 1; + This->count = 0; + This->data = heap_alloc_zero(sizeof(struct localizedpair)); + if (!This->data) { + heap_free(This); + return E_OUTOFMEMORY; + } + This->alloc = 1; *strings = &This->IDWriteLocalizedStrings_iface; return S_OK; } +HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, const WCHAR *string) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + + if (This->count == This->alloc) { + This->alloc *= 2; + This->data = heap_realloc(This->data, This->alloc*sizeof(struct localizedpair)); + } + + This->data[This->count].locale = heap_strdupW(locale); + This->data[This->count].string = heap_strdupW(string); + This->count++; + + return S_OK; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj);

1 0

Nikolay Sivov : dwrite: Added IDWriteFontFace stub.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 41df37f17d0fe1a0d678e60dd8c86417cc8cb7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41df37f17d0fe1a0d678e60dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 15:03:52 2012 -0400 dwrite: Added IDWriteFontFace stub. --- dlls/dwrite/font.c | 220 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 51 +++++++++++ include/dwrite.idl | 2 +- 3 files changed, 270 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41df37f17d0fe1a0d678e…

1 0

Nikolay Sivov : dwrite: Added IDWriteLocalizedStrings stub.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 45a9560e83bf172f95e404730f451fef544dc650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a9560e83bf172f95e404730… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 13:11:04 2012 -0400 dwrite: Added IDWriteLocalizedStrings stub. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 3 +- dlls/dwrite/main.c | 121 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 47 ++++++++++++++++ 4 files changed, 171 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d3af015..cba8130 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -46,3 +46,4 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; +extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 15e9d14..7a3ec6b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -256,8 +256,9 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); + FIXME("(%p)->(%p): stub\n", This, names); - return E_NOTIMPL; + return create_localizedstrings(names); } static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c126ec1..679416b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -172,6 +172,127 @@ static HRESULT create_renderingparams(FLOAT gamma, FLOAT enhancedContrast, FLOAT return S_OK; } +struct localizedstrings { + IDWriteLocalizedStrings IDWriteLocalizedStrings_iface; + LONG ref; +}; + +static inline struct localizedstrings *impl_from_IDWriteLocalizedStrings(IDWriteLocalizedStrings *iface) +{ + return CONTAINING_RECORD(iface, struct localizedstrings, IDWriteLocalizedStrings_iface); +} + +static HRESULT WINAPI localizedstrings_QueryInterface(IDWriteLocalizedStrings *iface, REFIID riid, void **obj) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteLocalizedStrings)) + { + *obj = iface; + IDWriteLocalizedStrings_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI localizedstrings_AddRef(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return S_OK; +} + +static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p): stub\n", This); + return 0; +} + +static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *iface, + WCHAR const *locale_name, UINT32 *index, BOOL *exists) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_w(locale_name), index, exists); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetLocaleNameLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p): stub\n", This, index, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *locale_name, UINT32 size) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p %u): stub\n", This, index, locale_name, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p): stub\n", This, index, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p %u): stub\n", This, index, buffer, size); + return E_NOTIMPL; +} + +static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = { + localizedstrings_QueryInterface, + localizedstrings_AddRef, + localizedstrings_Release, + localizedstrings_GetCount, + localizedstrings_FindLocaleName, + localizedstrings_GetLocaleNameLength, + localizedstrings_GetLocaleName, + localizedstrings_GetStringLength, + localizedstrings_GetString +}; + +HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) +{ + struct localizedstrings *This; + + *strings = NULL; + + This = heap_alloc(sizeof(struct localizedstrings)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + This->ref = 1; + + *strings = &This->IDWriteLocalizedStrings_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 229e2f7..34d123c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -312,6 +312,52 @@ if (0) /* crashes on native */ IDWriteGdiInterop_Release(interop); } +static void test_GetFamilyNames(void) +{ + static const WCHAR arialW[] = {'A','r','i','a','l',0}; + IDWriteFontFamily *family; + IDWriteLocalizedStrings *names, *names2; + IDWriteGdiInterop *interop; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + EXPECT_HR(hr, S_OK); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + EXPECT_HR(hr, S_OK); + + hr = IDWriteFont_GetFontFamily(font, &family); + EXPECT_HR(hr, S_OK); + +if (0) /* crashes on native */ + hr = IDWriteFontFamily_GetFamilyNames(family, NULL); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(names, 1); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names2); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(names2, 1); + ok(names != names2, "got %p, was %p\n", names2, names); + + IDWriteLocalizedStrings_Release(names); + IDWriteLocalizedStrings_Release(names2); + + IDWriteFontFamily_Release(family); + IDWriteFont_Release(font); + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -327,6 +373,7 @@ START_TEST(font) test_CreateFontFromLOGFONT(); test_CreateBitmapRenderTarget(); test_GetFontFamily(); + test_GetFamilyNames(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Store font family name in IDWriteFontFamily implementation.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 89561b9247c0f2a91667dfddb04c0e57d7628e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89561b9247c0f2a91667dfddb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 12:29:39 2012 -0400 dwrite: Store font family name in IDWriteFontFamily implementation. --- dlls/dwrite/dwrite_private.h | 17 +++++++++++++++++ dlls/dwrite/font.c | 34 ++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 27 +++++++++++++++++++++++++-- 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5c82453..d3af015 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -26,6 +28,21 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 892ee72..15e9d14 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; + + WCHAR *familyname; }; struct dwrite_font { @@ -222,7 +224,10 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + heap_free(This->familyname); heap_free(This); + } return S_OK; } @@ -283,7 +288,7 @@ static const IDWriteFontFamilyVtbl fontfamilyvtbl = { dwritefontfamily_GetMatchingFonts }; -static HRESULT create_fontfamily(IDWriteFontFamily **family) +static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; @@ -294,6 +299,7 @@ static HRESULT create_fontfamily(IDWriteFontFamily **family) This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; + This->familyname = heap_strdupW(familyname); *family = &This->IDWriteFontFamily_iface; @@ -302,13 +308,37 @@ static HRESULT create_fontfamily(IDWriteFontFamily **family) HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { + const WCHAR* facename, *familyname; struct dwrite_font *This; IDWriteFontFamily *family; + OUTLINETEXTMETRICW *otm; HRESULT hr; + HFONT hfont; + HDC hdc; + int ret; *font = NULL; - hr = create_fontfamily(&family); + hfont = CreateFontIndirectW(logfont); + if (!hfont) return DWRITE_E_NOFONT; + + hdc = CreateCompatibleDC(0); + SelectObject(hdc, hfont); + + ret = GetOutlineTextMetricsW(hdc, 0, NULL); + otm = heap_alloc(ret); + otm->otmSize = ret; + ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm); + + DeleteDC(hdc); + DeleteObject(hfont); + + facename = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFaceName); + familyname = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFamilyName); + TRACE("facename=%s, familyname=%s\n", debugstr_w(facename), debugstr_w(familyname)); + + hr = create_fontfamily(familyname, &family); + heap_free(otm); if (hr != S_OK) return hr; This = heap_alloc(sizeof(struct dwrite_font)); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 64fe390..229e2f7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -43,6 +43,7 @@ static IDWriteFactory *factory; static void test_CreateFontFromLOGFONT(void) { static const WCHAR arialW[] = {'A','r','i','a','l',0}; + static const WCHAR arialspW[] = {'A','r','i','a','l',' ',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; @@ -143,18 +144,40 @@ todo_wine logfont.lfWeight = FW_NORMAL; lstrcpyW(logfont.lfFaceName, blahW); + font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine +todo_wine { EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; + lstrcpyW(logfont.lfFaceName, arialspW); + font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine +todo_wine { EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + + font = (void*)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine { + EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} IDWriteGdiInterop_Release(interop); }

1 0

André Hentschel : winedbg: Adjust copyright to avoid confusions.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 096426f1f192dda0d0f6e9f07bb4102c47ced701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096426f1f192dda0d0f6e9f07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:40:31 2012 +0200 winedbg: Adjust copyright to avoid confusions. --- programs/winedbg/be_arm.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 2380f88..85eb0ef 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1,9 +1,7 @@ /* * Debugger ARM specific functions * - * Copyright 2000-2003 Marcus Meissner - * 2004 Eric Pouech - * 2010-2012 André Hentschel + * Copyright 2010-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

1 0

André Hentschel : winedbg: Simplify Coprocessor operators in the Thumb2 disassembler.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 86d0c87552b61baec1b63bfa85285801d68322d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d0c87552b61baec1b63bfa8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:35:43 2012 +0200 winedbg: Simplify Coprocessor operators in the Thumb2 disassembler. --- programs/winedbg/be_arm.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3009e70..2380f88 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1058,15 +1058,11 @@ static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; - if (opc2) - dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u, #%u", (inst & 0x10000000)?"2":"", - get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), - get_nibble(inst, 4), get_nibble(inst, 0), opc2); - else - dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u", (inst & 0x10000000)?"2":"", - get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), - get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u", (inst & 0x10000000)?"2":"", + get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), + get_nibble(inst, 4), get_nibble(inst, 0)); + if (opc2) dbg_printf(", #%u", opc2); return 0; } @@ -1075,15 +1071,11 @@ static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) WORD opc1 = (inst >> 21) & 0x07; WORD opc2 = (inst >> 5) & 0x07; - if (opc2) - dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u, #%u", (inst & 0x00100000)?"mrc":"mcr", - (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, - tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0), opc2); - else - dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr", - (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, - tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr", + (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, + tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0)); + if (opc2) dbg_printf(", #%u", opc2); return 0; }

1 0

André Hentschel : winedbg: Add load non-word operators to Thumb2 disassembler.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: a0ae8b4bd286fd41f30c9e639c2dff8a0ef74b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ae8b4bd286fd41f30c9e639… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:34:46 2012 +0200 winedbg: Add load non-word operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a3c5243..3009e70 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -992,6 +992,68 @@ static UINT thumb2_disasm_preload(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_ldrnonword(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 23) & 0x03; + WORD hw = (inst >> 21) & 0x01; + + if (!(op1 & 0x01) && !((inst >> 6) & 0x3f) && get_nibble(inst, 4) != 15) + { + WORD shift = (inst >> 4) & 0x03; + dbg_printf("\n\t%s%s\t%s, [%s, %s", op1?"ldrs":"ldr", hw?"h":"b", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + if (shift) dbg_printf(", lsl #%u]", shift); + else dbg_printf("]"); + return 0; + } + + if (!(op1 & 0x01) && ((inst >> 8) & 0x0f) == 14 && get_nibble(inst, 4) != 15) + { + WORD offset = inst & 0xff; + dbg_printf("\n\t%s%s\t%s, [%s", op1?"ldrs":"ldr", hw?"ht":"bt", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)]); + if (offset) dbg_printf(", #%u]", offset); + else dbg_printf("]"); + return 0; + } + + if (get_nibble(inst, 4) != 15) + { + int offset; + + dbg_printf("\n\t%s%s\t%s, [%s", (op1 & 0x02)?"ldrs":"ldr", hw?"h":"b", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)]); + + if (op1 & 0x01) + { + dbg_printf(", #%u]", inst & 0x0fff); + return 0; + } + + offset = inst & 0xff; + if (!(inst & 0x0200)) offset *= -1; + + if (!(inst & 0x0400) && (inst & 0x0100)) dbg_printf("], #%i", offset); + else if (inst & 0x0400) dbg_printf(", #%i]%s", offset, (inst & 0x0100)?"!":""); + else return inst; + + return 0; + } + + if (get_nibble(inst, 4) == 15) + { + int offset = inst & 0x0fff; + if (!op1) offset *= -1; + dbg_printf("\n\t%s%s\t%s, ", (op1 & 0x02)?"ldrs":"ldr", hw?"h":"b", + tbl_regs[get_nibble(inst, 3)]); + db_printsym(addr->Offset + offset + 4); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1139,6 +1201,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff100000, 0xf8000000, thumb2_disasm_str }, { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, + { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

André Hentschel : winedbg: Add preload operators for Thumb2 disassembler.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 13da3a92fd84b392a76cff6ba06cd716496fb8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13da3a92fd84b392a76cff6ba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:33:03 2012 +0200 winedbg: Add preload operators for Thumb2 disassembler. --- programs/winedbg/be_arm.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index bad74d0..a3c5243 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -959,6 +959,39 @@ static UINT thumb2_disasm_ldrword(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_preload(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 23) & 0x03; + + if (!(op1 & 0x01) && !((inst >> 6) & 0x3f) && get_nibble(inst, 4) != 15) + { + WORD shift = (inst >> 4) & 0x03; + dbg_printf("\n\t%s\t[%s, %s", op1?"pli":"pld", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + if (shift) dbg_printf(", lsl #%u]", shift); + else dbg_printf("]"); + return 0; + } + + if (get_nibble(inst, 4) != 15) + { + dbg_printf("\n\t%s\t[%s, #%d]", (op1 & 0x02)?"pli":"pld", tbl_regs[get_nibble(inst, 4)], + (op1 & 0x01)?(inst & 0x0fff):(-1 * (inst & 0xff))); + return 0; + } + + if (get_nibble(inst, 4) == 15) + { + int offset = inst & 0x0fff; + if (!op1) offset *= -1; + dbg_printf("\n\t%s\t", (op1 & 0x02)?"pli":"pld"); + db_printsym(addr->Offset + offset + 4); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1105,6 +1138,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, { 0xff100000, 0xf8000000, thumb2_disasm_str }, { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, + { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
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