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

Jactry Zeng : riched20: Implement IOleWindow::GetWindow.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: f1d22c0ebdab26fee8b29dd9bc861b81d894186b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d22c0ebdab26fee8b29dd9b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Mar 16 17:27:38 2015 +0800 riched20: Implement IOleWindow::GetWindow. --- dlls/riched20/richole.c | 9 +++++++-- dlls/riched20/tests/richole.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 47f2964..c62998a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -363,8 +363,13 @@ static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) { IOleClientSiteImpl *This = impl_from_IOleWindow(iface); - FIXME("not implemented: (%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, phwnd); + + if (!phwnd) + return E_INVALIDARG; + + *phwnd = This->reOle->editor->hWnd; + return S_OK; } static const IOleWindowVtbl olewinvt = { diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 22d2048..a89ee55 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1000,6 +1000,34 @@ static void test_IOleClientSite_QueryInterface(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_IOleWindow_GetWindow(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + IOleClientSite *clientSite = NULL; + IOleWindow *oleWin = NULL; + HRESULT hres; + HWND hwnd; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + hres = IRichEditOle_GetClientSite(reOle, &clientSite); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + hres = IOleWindow_GetWindow(oleWin, &hwnd); + ok(hres == S_OK, "IOleClientSite_GetWindow: 0x%08x\n", hres); + ok(w == hwnd, "got wrong pointer\n"); + + hres = IOleWindow_GetWindow(oleWin, NULL); + ok(hres == E_INVALIDARG, "IOleClientSite_GetWindow: 0x%08x\n", hres); + + IOleWindow_Release(oleWin); + IOleClientSite_Release(clientSite); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -1019,4 +1047,5 @@ START_TEST(richole) test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); test_IOleClientSite_QueryInterface(); + test_IOleWindow_GetWindow(); }

1 0

Alexandre Julliard : msvcp: Add a macro to access the locale field of I/ O streams.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 90aad327ae6d1c8dab95b6a6a8ae5b0c636607a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90aad327ae6d1c8dab95b6a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 16 17:25:08 2015 +0900 msvcp: Add a macro to access the locale field of I/O streams. --- dlls/msvcp60/ios.c | 156 ++++++++++++++++----------------- dlls/msvcp60/locale.c | 90 +++++++++---------- dlls/msvcp60/msvcp.h | 2 + dlls/msvcp90/ios.c | 232 ++++++++++++++++++++++++++----------------------- dlls/msvcp90/locale.c | 88 +++++++++---------- dlls/msvcp90/msvcp90.h | 6 ++ 6 files changed, 296 insertions(+), 278 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90aad327ae6d1c8dab95b…

1 0

Akihiro Sagawa : msvcrt: Fix _ismbckata() for Halfwidth Katakana characters.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: a2149ba7bab0ecf812ab3608eb07a6b8bed1566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2149ba7bab0ecf812ab3608e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 16 21:48:45 2015 +0900 msvcrt: Fix _ismbckata() for Halfwidth Katakana characters. --- dlls/msvcrt/mbcs.c | 4 ---- dlls/msvcrt/tests/string.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d2c12d3..ba88ff2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1350,7 +1350,6 @@ int CDECL _ismbcpunct(unsigned int ch) */ int CDECL _ismbchira(unsigned int c) { - /* FIXME: use lc_ctype when supported, not lc_all */ if(get_mbcinfo()->mbcodepage == 932) { /* Japanese/Hiragana, CP 932 */ @@ -1364,11 +1363,8 @@ int CDECL _ismbchira(unsigned int c) */ int CDECL _ismbckata(unsigned int c) { - /* FIXME: use lc_ctype when supported, not lc_all */ if(get_mbcinfo()->mbcodepage == 932) { - if(c < 256) - return _ismbbkana(c); /* Japanese/Katakana, CP 932 */ return (c >= 0x8340 && c <= 0x8396 && c != 0x837f); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e2d53d4..4388085 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1190,6 +1190,37 @@ static void test_mbctombb(void) _setmbcp(prev_cp); } +static void test_ismbckata(void) { + struct katakana_pair { + UINT c; + BOOL exp; + }; + static const struct katakana_pair tests[] = { + {0x8152, FALSE}, {0x8153, FALSE}, {0x8154, FALSE}, {0x8155, FALSE}, + {0x82a0, FALSE}, {0x833f, FALSE}, {0x8340, TRUE }, {0x837e, TRUE }, + {0x837f, FALSE}, {0x8380, TRUE }, {0x8396, TRUE }, {0x8397, FALSE}, + {0xa5, FALSE}, {0xb0, FALSE}, {0xdd, FALSE} + }; + unsigned int prev_cp = _getmbcp(); + int ret; + unsigned int i; + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!ret, "expected 0, got %d for %04x\n", ret, tests[i].c); + } + + _setmbcp(932); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!!ret == tests[i].exp, "expected %d, got %d for %04x\n", + tests[i].exp, !!ret, tests[i].c); + } + + _setmbcp(prev_cp); +} + static void test_ismbclegal(void) { unsigned int prev_cp = _getmbcp(); int ret, exp, err; @@ -2859,6 +2890,7 @@ START_TEST(string) test_mbcjmsjis(); test_mbbtombc(); test_mbctombb(); + test_ismbckata(); test_ismbclegal(); test_strtok(); test__mbstok();

1 0

Jactry Zeng : riched20: Implement IOleWindow interface.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: bbb9755896f9660ace3c4e1c353baad180f00d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb9755896f9660ace3c4e1c3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Mar 16 17:27:21 2015 +0800 riched20: Implement IOleWindow interface. --- dlls/riched20/richole.c | 51 ++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1280016..47f2964 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -82,6 +82,7 @@ struct ITextSelectionImpl { struct IOleClientSiteImpl { IOleClientSite IOleClientSite_iface; + IOleWindow IOleWindow_iface; LONG ref; IRichEditOleImpl *reOle; @@ -219,12 +220,15 @@ static inline IOleClientSiteImpl *impl_from_IOleClientSite(IOleClientSite *iface static HRESULT WINAPI IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) { + IOleClientSiteImpl *This = impl_from_IOleClientSite(me); TRACE("%p %s\n", me, debugstr_guid(riid) ); *ppvObj = NULL; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleClientSite)) *ppvObj = me; + else if (IsEqualGUID(riid, &IID_IOleWindow)) + *ppvObj = &This->IOleWindow_iface; if (*ppvObj) { IOleClientSite_AddRef(me); @@ -325,6 +329,52 @@ static const IOleClientSiteVtbl ocst = { IOleClientSite_fnRequestNewObjectLayout }; +/* IOleWindow interface */ +static inline IOleClientSiteImpl *impl_from_IOleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleWindow_iface); +} + +static HRESULT WINAPI IOleWindow_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObj) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); +} + +static ULONG WINAPI IOleWindow_fnAddRef(IOleWindow *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI IOleWindow_fnRelease(IOleWindow *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + FIXME("not implemented: (%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static const IOleWindowVtbl olewinvt = { + IOleWindow_fnQueryInterface, + IOleWindow_fnAddRef, + IOleWindow_fnRelease, + IOleWindow_fnGetWindow, + IOleWindow_fnContextSensitiveHelp +}; + static IOleClientSiteImpl * CreateOleClientSite(IRichEditOleImpl *reOle) { @@ -333,6 +383,7 @@ CreateOleClientSite(IRichEditOleImpl *reOle) return NULL; clientSite->IOleClientSite_iface.lpVtbl = &ocst; + clientSite->IOleWindow_iface.lpVtbl = &olewinvt; clientSite->ref = 1; clientSite->reOle = reOle; return clientSite; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index ee31a16..22d2048 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -949,6 +949,57 @@ static void test_ITextSelection_Collapse(void) release_interfaces(&w, &reOle, &txtDoc, &txtSel); } +static void test_IOleClientSite_QueryInterface(void) +{ + HWND w; + IRichEditOle *reOle = NULL, *reOle1 = NULL; + ITextDocument *txtDoc = NULL; + IOleClientSite *clientSite = NULL, *clientSite1 = NULL, *clientSite2 = NULL; + IOleWindow *oleWin = NULL, *oleWin1 = NULL; + HRESULT hres; + LONG refcount1, refcount2; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + hres = IRichEditOle_GetClientSite(reOle, &clientSite); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount1 = get_refcount((IUnknown *)clientSite); + todo_wine ok(refcount1 == 1, "got wrong ref count: %d\n", refcount1); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IRichEditOle, (void **)&reOle1); + ok(hres == E_NOINTERFACE, "IOleClientSite_QueryInterface: %x\n", hres); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleClientSite, (void **)&clientSite1); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + ok(clientSite == clientSite1, "Should not return a new pointer.\n"); + refcount1 = get_refcount((IUnknown *)clientSite); + todo_wine ok(refcount1 == 2, "got wrong ref count: %d\n", refcount1); + + /* IOleWindow interface */ + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + refcount1 = get_refcount((IUnknown *)clientSite); + refcount2 = get_refcount((IUnknown *)oleWin); + ok(refcount1 == refcount2, "got wrong ref count.\n"); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin1); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + ok(oleWin == oleWin1, "Should not return a new pointer.\n"); + refcount1 = get_refcount((IUnknown *)clientSite); + refcount2 = get_refcount((IUnknown *)oleWin); + ok(refcount1 == refcount2, "got wrong ref count.\n"); + + hres = IOleWindow_QueryInterface(oleWin, &IID_IOleClientSite, (void **)&clientSite2); + ok(hres == S_OK, "IOleWindow_QueryInterface: 0x%08x\n", hres); + ok(clientSite2 == clientSite1, "got wrong pointer\n"); + + IOleWindow_Release(oleWin1); + IOleWindow_Release(oleWin); + IOleClientSite_Release(clientSite2); + IOleClientSite_Release(clientSite1); + IOleClientSite_Release(clientSite); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -967,4 +1018,5 @@ START_TEST(richole) test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); + test_IOleClientSite_QueryInterface(); }

1 0

Nikolay Sivov : dwrite: Implement GetKerningPairAdjustments().
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 7e480d3c6d475617e66a21711daffd02d8fef0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e480d3c6d475617e66a21711… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 23:19:18 2015 +0300 dwrite: Implement GetKerningPairAdjustments(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 21 +++++++++++++++++--- dlls/dwrite/freetype.c | 25 ++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 92f0427..aa73b4b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -163,6 +163,7 @@ extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT, extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; +extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT16) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 66dbc68..59eda80 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -658,12 +658,27 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF return E_NOTIMPL; } -static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 *iface, UINT32 glyph_count, +static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 *iface, UINT32 count, const UINT16 *indices, INT32 *adjustments) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, glyph_count, indices, adjustments); - return E_NOTIMPL; + UINT32 i; + + TRACE("(%p)->(%u %p %p)\n", This, count, indices, adjustments); + + if (!(indices || adjustments) || !count) + return E_INVALIDARG; + + if (!indices || count == 1) { + memset(adjustments, 0, count*sizeof(INT32)); + return E_INVALIDARG; + } + + for (i = 0; i < count-1; i++) + adjustments[i] = freetype_get_kerning_pair_adjustment(iface, indices[i], indices[i+1]); + adjustments[count-1] = 0; + + return S_OK; } static BOOL WINAPI dwritefontface1_HasKerningPairs(IDWriteFontFace2 *iface) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 325f156..a18c542 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -63,6 +63,7 @@ typedef struct #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_FreeType); +MAKE_FUNCPTR(FT_Get_Kerning); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Library_Version); MAKE_FUNCPTR(FT_Load_Glyph); @@ -135,6 +136,7 @@ BOOL init_freetype(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Done_FreeType) + LOAD_FUNCPTR(FT_Get_Kerning) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Library_Version) LOAD_FUNCPTR(FT_Load_Glyph) @@ -420,6 +422,24 @@ BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) return has_kerning_pairs; } +INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2 *fontface, UINT16 left, UINT16 right) +{ + INT32 adjustment = 0; + FT_Face face; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) { + FT_Vector kern; + if (FT_HAS_KERNING(face)) { + pFT_Get_Kerning(face, left, right, FT_KERNING_UNSCALED, &kern); + adjustment = kern.x; + } + } + LeaveCriticalSection(&freetype_cs); + + return adjustment; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -466,4 +486,9 @@ BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) return FALSE; } +INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2 *fontface, UINT16 left, UINT16 right) +{ + return 0; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a9a6802..9762d49 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3136,6 +3136,51 @@ static void test_GetGlyphCount(void) DELETE_FONTFILE(path); } +static void test_GetKerningPairAdjustments(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFontFile *file; + WCHAR *path; + HRESULT hr; + + path = create_testfontfile(test_fontfile); + factory = create_factory(); + + hr = IDWriteFactory_CreateFontFileReference(factory, path, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (hr == S_OK) { + INT32 adjustments[1]; + + hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 0, NULL, NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr); + + if (0) /* crashes on native */ + hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, NULL); + + adjustments[0] = 1; + hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, adjustments); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(adjustments[0] == 0, "got %d\n", adjustments[0]); + + IDWriteFontFace1_Release(fontface1); + } + else + win_skip("GetKerningPairAdjustments() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFactory_Release(factory); + DELETE_FONTFILE(path); +} + + START_TEST(font) { IDWriteFactory *factory; @@ -3176,6 +3221,7 @@ START_TEST(font) test_GetEudcFontCollection(); test_GetCaretMetrics(); test_GetGlyphCount(); + test_GetKerningPairAdjustments(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement HasKerningPairs().
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 23c2ef2fcde3aef1ecc3021a3440c47db0007d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c2ef2fcde3aef1ecc3021a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 22:42:30 2015 +0300 dwrite: Implement HasKerningPairs(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/freetype.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9481c74..92f0427 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -162,6 +162,7 @@ extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; +extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c4b8818..66dbc68 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -669,8 +669,8 @@ static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 static BOOL WINAPI dwritefontface1_HasKerningPairs(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return freetype_has_kerning_pairs(iface); } static HRESULT WINAPI dwritefontface1_GetRecommendedRenderingMode(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 84c9cad..325f156 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -407,6 +407,19 @@ UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) return glyph; } +BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) +{ + BOOL has_kerning_pairs = FALSE; + FT_Face face; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) + has_kerning_pairs = FT_HAS_KERNING(face); + LeaveCriticalSection(&freetype_cs); + + return has_kerning_pairs; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -448,4 +461,9 @@ UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) return 0; } +BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) +{ + return FALSE; +} + #endif /* HAVE_FREETYPE */

1 0

Nikolay Sivov : dwrite: Actually return NULL names pointer and error code when failed to read them.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 5eccb1322d09362c5431911bcdc5a4d218ee98fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eccb1322d09362c5431911bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 21:24:49 2015 +0300 dwrite: Actually return NULL names pointer and error code when failed to read them. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 12ce3ca..32ed712 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -773,7 +773,7 @@ HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index { const void *name_table = NULL; void *name_context; - HRESULT hr = S_OK; + HRESULT hr = E_FAIL; opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); if (name_table) { @@ -781,7 +781,7 @@ HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); } else - names = NULL; + *names = NULL; return hr; }

1 0

Francois Gouget : dbghelp: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: ed82981ae070c2c144c3c98e292126fae23c403c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed82981ae070c2c144c3c98e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:12:48 2015 +0100 dbghelp: Mark internal symbols with hidden visibility. --- dlls/dbghelp/dbghelp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0d300f3..56a5bb8 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -580,7 +580,7 @@ extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPE extern BOOL macho_synchronize_module_list(struct process* pcs) DECLSPEC_HIDDEN; /* minidump.c */ -void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva); +void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva) DECLSPEC_HIDDEN; /* module.c */ extern const WCHAR S_ElfW[] DECLSPEC_HIDDEN;

1 0

Francois Gouget : ntdll/tests: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 872e96fc4e4a8937d34968de26fb054c8649a548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872e96fc4e4a8937d34968de2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 14 03:38:49 2015 +0100 ntdll/tests: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/ntdll/tests/exception.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5cbab71..a594e3f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -25,10 +25,9 @@ #define _WIN32_WINNT 0x500 /* For NTSTATUS */ #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winnt.h"

1 0

Francois Gouget : ntdll: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: ca1545cf1734a9a2de7222bf8c1585e0ade4fc5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1545cf1734a9a2de7222bf8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 14 03:38:17 2015 +0100 ntdll: Remove unneeded NONAMELESSXXX directives. --- dlls/ntdll/actctx.c | 3 +-- dlls/ntdll/cdrom.c | 3 +-- dlls/ntdll/directory.c | 3 +-- dlls/ntdll/file.c | 3 +-- dlls/ntdll/heap.c | 3 +-- dlls/ntdll/loader.c | 4 +--- dlls/ntdll/serial.c | 3 +-- dlls/ntdll/sync.c | 4 +--- dlls/ntdll/tape.c | 3 +-- dlls/ntdll/time.c | 2 -- dlls/ntdll/virtual.c | 3 +-- 11 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 20a98ec..6ea7b54 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -28,10 +28,9 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "winternl.h" #include "ddk/wdm.h" #include "ntdll_misc.h" diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 62c3d16..34910e7 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -116,10 +116,9 @@ typedef struct #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 283fe49..cbfc022 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -70,10 +70,9 @@ # include <unistd.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winnt.h" #include "winternl.h" diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3bd2c31..92e83dd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -76,10 +76,9 @@ # include <valgrind/memcheck.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "wine/unicode.h" #include "wine/debug.h" #include "wine/server.h" diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4ef44cf..a908f19 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -33,10 +33,9 @@ #define RUNNING_ON_VALGRIND 0 #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winnt.h" #include "winternl.h" diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e1444d2..9810f07 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -28,11 +28,9 @@ # include <sys/mman.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winnt.h" #include "winternl.h" diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 9f73ce6..91d9be9 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -57,10 +57,9 @@ # include <sys/strtio.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 08fab44..7d44e60 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -48,11 +48,9 @@ #include <stdlib.h> #include <time.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "wine/server.h" diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index df46015..fef31cb 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -48,10 +48,9 @@ #define MTSETBLK MTSETBSIZ #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 0f14a3e..69bd736 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -42,8 +42,6 @@ # include <mach/mach_time.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index dc5db00..ab6bf9b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -42,10 +42,9 @@ # include <valgrind/valgrind.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "wine/library.h"

1 0