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

Hans Leidekker : ieframe: Implement IViewObject::GetAdvise and IViewObject ::SetAdvise.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 99613c003ed43f5725ef08d32fea440f737e8aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=99613c003ed43f5725ef08d32… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:35:45 2015 +0200 ieframe: Implement IViewObject::GetAdvise and IViewObject::SetAdvise. --- dlls/ieframe/ieframe.h | 4 ++ dlls/ieframe/oleobject.c | 5 ++ dlls/ieframe/tests/webbrowser.c | 121 ++++++++++++++++++++++++++++++++++++++++ dlls/ieframe/view.c | 28 ++++++++-- 4 files changed, 154 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index f8c204c..a83ff35 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -191,6 +191,10 @@ struct WebBrowser { IOleContainer *container; IOleInPlaceSiteEx *inplace; + IAdviseSink *sink; + DWORD sink_aspects; + DWORD sink_flags; + /* window context */ HWND frame_hwnd; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 330804b..53c0e36 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -288,6 +288,11 @@ static void release_client_site(WebBrowser *This) IOleClientSite_Release(This->client); This->client = NULL; } + + if(This->sink) { + IAdviseSink_Release(This->sink); + This->sink = NULL; + } } typedef struct { diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index b19ae7c..4d3ab24 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3841,6 +3841,126 @@ static void test_FileProtocol(void) DeleteFileA(file_path); } +struct sink +{ + IAdviseSink IAdviseSink_iface; +}; + +static inline struct sink *impl_from_IAdviseSink(IAdviseSink *iface) +{ + return CONTAINING_RECORD(iface, struct sink, IAdviseSink_iface); +} + +static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void **obj) +{ + struct sink *sink = impl_from_IAdviseSink(iface); + + trace("%p, %p, %p\n", iface, riid, obj); + + if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = &sink->IAdviseSink_iface; + } + else + { + return E_NOINTERFACE; + } + IAdviseSink_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI sink_AddRef(IAdviseSink *iface) +{ + trace("%p\n", iface); + return 2; +} + +static ULONG WINAPI sink_Release(IAdviseSink *iface) +{ + trace("%p\n", iface); + return 1; +} + +static void WINAPI sink_OnDataChange(IAdviseSink *iface, FORMATETC *format, STGMEDIUM *medium) +{ + trace("%p, %p, %p\n", iface, format, medium); +} + +static void WINAPI sink_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) +{ + trace("%p, %08x, %d\n", iface, aspect, index); +} + +static void WINAPI sink_OnRename(IAdviseSink *iface, IMoniker *moniker) +{ + trace("%p, %p\n", iface, moniker); +} + +static void WINAPI sink_OnSave(IAdviseSink *iface) +{ + trace("%p\n", iface); +} + +static void WINAPI sink_OnClose(IAdviseSink *iface) +{ + trace("%p\n", iface); +} + +static const IAdviseSinkVtbl sink_vtbl = +{ + sink_QueryInterface, + sink_AddRef, + sink_Release, + sink_OnDataChange, + sink_OnViewChange, + sink_OnRename, + sink_OnSave, + sink_OnClose +}; + +static IAdviseSink test_sink = { &sink_vtbl }; + +static void test_SetAdvise(void) +{ + HRESULT hr; + IWebBrowser2 *browser; + IViewObject2 *view; + IAdviseSink *sink; + DWORD aspects, flags; + + if (!(browser = create_webbrowser())) return; + init_test(browser, 0); + + hr = IWebBrowser2_QueryInterface(browser, &IID_IViewObject2, (void **)&view); + ok(hr == S_OK, "got %08x\n", hr); + if (FAILED(hr)) return; + + aspects = flags = 0xdeadbeef; + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(!aspects, "got %08x\n", aspects); + ok(!flags, "got %08x\n", aspects); + ok(sink == NULL, "got %p\n", sink); + + hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, (IAdviseSink *)&test_sink); + ok(hr == S_OK, "got %08x\n", hr); + + aspects = flags = 0xdeadbeef; + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(aspects == DVASPECT_CONTENT, "got %08x\n", aspects); + ok(!flags, "got %08x\n", aspects); + ok(sink == &test_sink, "got %p\n", sink); + + hr = IViewObject2_SetAdvise(view, 0, 0, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + IViewObject2_Release(view); + IWebBrowser2_Release(browser); +} + START_TEST(webbrowser) { OleInitialize(NULL); @@ -3867,6 +3987,7 @@ START_TEST(webbrowser) trace("Testing WebBrowserV1...\n"); test_WebBrowserV1(); test_FileProtocol(); + test_SetAdvise(); OleUninitialize(); } diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 2bf14b5..3e44991 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -92,16 +92,36 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, D IAdviseSink *pAdvSink) { WebBrowser *This = impl_from_IViewObject2(iface); - FIXME("(%p)->(%d %08x %p)\n", This, aspects, advf, pAdvSink); - return E_NOTIMPL; + + TRACE("(%p)->(%d %08x %p)\n", This, aspects, advf, pAdvSink); + + if (aspects || advf) FIXME("aspects and/or flags not supported yet\n"); + + This->sink_aspects = aspects; + This->sink_flags = advf; + if (This->sink) IAdviseSink_Release(This->sink); + This->sink = pAdvSink; + if (This->sink) IAdviseSink_AddRef(This->sink); + + return S_OK; } static HRESULT WINAPI ViewObject_GetAdvise(IViewObject2 *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { WebBrowser *This = impl_from_IViewObject2(iface); - FIXME("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); + + if (pAspects) *pAspects = This->sink_aspects; + if (pAdvf) *pAdvf = This->sink_flags; + if (ppAdvSink) + { + *ppAdvSink = This->sink; + if (*ppAdvSink) IAdviseSink_AddRef(*ppAdvSink); + } + + return S_OK; } static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwAspect, LONG lindex,

1 0

Dmitry Timoshkov : gdi32: EnumFontFamilies should enumerate substituted fonts only when directly asked for.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 50b6b376cbd521486c7765a11d88d17533f2057d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b6b376cbd521486c7765a11… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 17 17:23:19 2015 +0800 gdi32: EnumFontFamilies should enumerate substituted fonts only when directly asked for. --- dlls/gdi32/freetype.c | 8 +++++--- dlls/gdi32/tests/font.c | 6 ------ dlls/gdiplus/font.c | 12 ++++++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e57d1a9..9a7a3d7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5774,7 +5774,7 @@ static BOOL face_matches(const WCHAR *family_name, Face *face, const WCHAR *face } static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, - FONTENUMPROCW proc, LPARAM lparam) + FONTENUMPROCW proc, LPARAM lparam, const WCHAR *subst) { ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; @@ -5808,6 +5808,8 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha else strcpyW(elf.elfFullName, family->FamilyName); } + if (subst) + strcpyW(elf.elfLogFont.lfFaceName, subst); TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), @@ -5862,14 +5864,14 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { if (!face_matches(family->FamilyName, face, face_name)) continue; - if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam, psub ? psub->from.name : NULL)) return FALSE; } } } else { LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { face_list = get_face_list_from_family(family); face = LIST_ENTRY(list_head(face_list), Face, entry); - if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam, NULL)) return FALSE; } } LeaveCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1a663d7..cce4a1f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5051,12 +5051,9 @@ static void test_EnumFonts_subst(void) memset(&efnd, 0, sizeof(efnd)); strcpy(lf.lfFaceName, "MS Shell Dlg"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); -todo_wine ok(!ret, "MS Shell Dlg should be enumerated\n"); -todo_wine ok(efnd.total > 0, "MS Shell Dlg should be enumerated\n"); ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); -todo_wine ok(!ret, "expected MS Shell Dlg, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); ok(ret, "did not expect MS Shell Dlg\n"); @@ -5069,12 +5066,9 @@ todo_wine memset(&efnd, 0, sizeof(efnd)); strcpy(lf.lfFaceName, "MS Shell Dlg 2"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); -todo_wine ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); -todo_wine ok(efnd.total > 0, "MS Shell Dlg 2 should be enumerated\n"); ret = strcmp((const char *)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); -todo_wine ok(!ret, "expected MS Shell Dlg 2, got %s\n", efnd.elf[0].elfLogFont.lfFaceName); ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); ok(ret, "did not expect MS Shell Dlg 2\n"); diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 850f44a..3d8501e 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -630,11 +630,15 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { + const ENUMLOGFONTW *elfW = (const ENUMLOGFONTW *)elf; + LOGFONTW *lf = (LOGFONTW *)lParam; + if (type & RASTER_FONTTYPE) return 1; - *(LOGFONTW *)lParam = *elf; - + *lf = *elf; + /* replace substituted font name by a real one */ + lstrcpynW(lf->lfFaceName, elfW->elfFullName, LF_FACESIZE); return 0; } @@ -656,8 +660,6 @@ static BOOL get_font_metrics(HDC hdc, struct font_metrics *fm) otm.otmSize = sizeof(otm); if (!GetOutlineTextMetricsW(hdc, otm.otmSize, &otm)) return FALSE; - GetTextFaceW(hdc, LF_FACESIZE, fm->facename); - fm->em_height = otm.otmEMSquare; fm->dpi = GetDeviceCaps(hdc, LOGPIXELSY); @@ -706,6 +708,8 @@ static GpStatus find_installed_font(const WCHAR *name, struct font_metrics *fm) { HFONT hfont, old_font; + strcpyW(fm->facename, lf.lfFaceName); + hfont = CreateFontIndirectW(&lf); old_font = SelectObject(hdc, hfont); ret = get_font_metrics(hdc, fm) ? Ok : NotTrueTypeFont;

1 0

Dmitry Timoshkov : gdi32: Add a test for enumerating substituted fonts.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 5289c9fd925fea5766632cef7a37e17dda93dc2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5289c9fd925fea5766632cef7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 17 17:23:14 2015 +0800 gdi32: Add a test for enumerating substituted fonts. EnumFontFamilies(NULL) should not enumerate substituted fonts, but EnumFontFamilies("MS Shell Dlg") should do. --- dlls/gdi32/tests/font.c | 175 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 152 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5289c9fd925fea5766632…

1 0

Nikolay Sivov : dwrite: Aliased texture could only be requested for aliased rendering mode.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 2655ac5f933436c11423fc40fc753b7c690c7b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2655ac5f933436c11423fc40f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 17 11:56:17 2015 +0300 dwrite: Aliased texture could only be requested for aliased rendering mode. --- dlls/dwrite/font.c | 16 +++++++++++ dlls/dwrite/tests/font.c | 75 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 74023c3..11ff9d0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -104,6 +104,8 @@ struct dwrite_fonttable { struct dwrite_glyphrunanalysis { IDWriteGlyphRunAnalysis IDWriteGlyphRunAnalysis_iface; LONG ref; + + DWRITE_RENDERING_MODE rendering_mode; }; #define GLYPH_BLOCK_SHIFT 8 @@ -2774,7 +2776,20 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type, RECT* bounds) { struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + FIXME("(%p)->(%d %p): stub\n", This, type, bounds); + + if ((UINT32)type > DWRITE_TEXTURE_CLEARTYPE_3x1) { + memset(bounds, 0, sizeof(*bounds)); + return E_INVALIDARG; + } + + if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE_ALIASED) || + (type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE_ALIASED)) { + memset(bounds, 0, sizeof(*bounds)); + return S_OK; + } + return E_NOTIMPL; } @@ -2819,6 +2834,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, IDWriteGly analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl; analysis->ref = 1; + analysis->rendering_mode = rendering_mode; *ret = &analysis->IDWriteGlyphRunAnalysis_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9524d6a..7dc6077 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3384,28 +3384,49 @@ static void test_CreateRenderingParams(void) static void test_CreateGlyphRunAnalysis(void) { + static const DWRITE_RENDERING_MODE rendermodes[] = { + DWRITE_RENDERING_MODE_ALIASED, + DWRITE_RENDERING_MODE_GDI_CLASSIC, + DWRITE_RENDERING_MODE_GDI_NATURAL, + DWRITE_RENDERING_MODE_NATURAL, + DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, + }; + IDWriteGlyphRunAnalysis *analysis; IDWriteFactory *factory; DWRITE_GLYPH_RUN run; IDWriteFontFace *face; - UINT16 index; + UINT16 glyph; FLOAT advance; HRESULT hr; UINT32 ch; + RECT rect; + DWRITE_GLYPH_OFFSET offset; + DWRITE_GLYPH_METRICS metrics; + int i; factory = create_factory(); face = create_fontface(factory); ch = 'A'; - hr = IDWriteFontFace_GetGlyphIndices(face, &ch, 1, &index); + glyph = 0; + hr = IDWriteFontFace_GetGlyphIndices(face, &ch, 1, &glyph); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyph > 0, "got %u\n", glyph); + + hr = IDWriteFontFace_GetDesignGlyphMetrics(face, &glyph, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + advance = metrics.advanceWidth; + + offset.advanceOffset = 0.0; + offset.ascenderOffset = 0.0; run.fontFace = face; run.fontEmSize = 24.0; run.glyphCount = 1; - run.glyphIndices = &index; + run.glyphIndices = &glyph; run.glyphAdvances = &advance; - run.glyphOffsets = NULL; + run.glyphOffsets = &offset; run.isSideways = FALSE; run.bidiLevel = 0; @@ -3422,11 +3443,55 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, - DWRITE_RENDERING_MODE_GDI_CLASSIC, DWRITE_MEASURING_MODE_NATURAL, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, 0.0, 0.0, &analysis); ok(hr == S_OK, "got 0x%08x\n", hr); + + /* invalid texture type */ + memset(&rect, 0xcc, sizeof(rect)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1+1, &rect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(rect.left == 0 && rect.right == 0 && + rect.top == 0 && rect.bottom == 0, "unexpected rect\n"); IDWriteGlyphRunAnalysis_Release(analysis); + for (i = 0; i < sizeof(rendermodes)/sizeof(rendermodes[0]); i++) { + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + rendermodes[i], DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (rendermodes[i] == DWRITE_RENDERING_MODE_ALIASED) { + memset(&rect, 0, sizeof(rect)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsRectEmpty(&rect), "got empty rect\n"); + } + rect.left = rect.top = 0; + rect.bottom = rect.right = 1; + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsRectEmpty(&rect), "unexpected empty rect\n"); + } + else { + rect.left = rect.top = 0; + rect.bottom = rect.right = 1; + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsRectEmpty(&rect), "got empty rect\n"); + + memset(&rect, 0, sizeof(rect)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &rect); + todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsRectEmpty(&rect), "got empty rect\n"); + } + } + + IDWriteGlyphRunAnalysis_Release(analysis); + } + IDWriteFontFace_Release(face); IDWriteFactory_Release(factory); }

1 0

Iván Matellanes : msvcirt: Implement ios static locking.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 277da0ea5d3e92815a417de4a4efbe44e7c6ad56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277da0ea5d3e92815a417de4a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 16 13:12:30 2015 +0200 msvcirt: Implement ios static locking. --- dlls/msvcirt/msvcirt.c | 16 ++++++++++++++-- dlls/msvcirt/msvcirt.spec | 2 +- dlls/msvcirt/tests/msvcirt.c | 19 +++++++++++++++++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 5 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9c6b991..e46f574 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -31,6 +31,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); #define RESERVE_SIZE 512 +/* ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A */ +extern CRITICAL_SECTION ios_static_lock; +CRITICAL_SECTION_DEBUG ios_static_lock_debug = +{ + 0, 0, &ios_static_lock, + { &ios_static_lock_debug.ProcessLocksList, &ios_static_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": ios_static_lock") } +}; +CRITICAL_SECTION ios_static_lock = { &ios_static_lock_debug, -1, 0, 0, 0, 0 }; + /* class streambuf */ typedef struct { const vtable_ptr *vtable; @@ -1001,7 +1011,8 @@ void __cdecl ios_lockbuf(ios *this) /* ?lockc(a)ios@@KAXXZ */ void __cdecl ios_lockc(void) { - FIXME("() stub\n"); + TRACE("()\n"); + EnterCriticalSection(&ios_static_lock); } /* ?lockptr(a)ios@@IAEPAU_CRT_CRITICAL_SECTION@@XZ */ @@ -1138,7 +1149,8 @@ void __cdecl ios_unlockbuf(ios *this) /* ?unlockc(a)ios@@KAXXZ */ void __cdecl ios_unlockc(void) { - FIXME("() stub\n"); + TRACE("()\n"); + LeaveCriticalSection(&ios_static_lock); } /* ?unsetf(a)ios@@QAEJJ(a)Z */ diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index dc66bfa..8d26652 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -777,7 +777,7 @@ @ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z # class istream & __cdecl ws(class istream &) @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z # @ extern ?x_curindex(a)ios@@0HA # static int ios::x_curindex -# @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A # static struct _CRT_CRITICAL_SECTION ios::x_lockc +@ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A ios_static_lock # @ extern ?x_maxbit(a)ios@@0JA # static long ios::x_maxbit # @ extern ?x_statebuf(a)ios@@0PAJA # static long * ios::x_statebuf @ cdecl ?xalloc(a)ios@@SAHXZ() ios_xalloc diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 944c024..523fb45 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -134,6 +134,9 @@ static void (*__cdecl p_ios_lock)(ios*); static void (*__cdecl p_ios_unlock)(ios*); static void (*__cdecl p_ios_lockbuf)(ios*); static void (*__cdecl p_ios_unlockbuf)(ios*); +static CRITICAL_SECTION *p_ios_static_lock; +static void (*__cdecl p_ios_lockc)(void); +static void (*__cdecl p_ios_unlockc)(void); /* Emulate a __thiscall */ #ifdef __i386__ @@ -281,6 +284,9 @@ static BOOL init(void) SET(p_ios_lockbuf, "?lockbuf(a)ios@@QAAXXZ"); SET(p_ios_unlockbuf, "?unlockbuf(a)ios@@QAAXXZ"); } + SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); + SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); + SET(p_ios_unlockc, "?unlockc(a)ios@@KAXXZ"); init_thiscall_thunk(); return TRUE; @@ -827,7 +833,7 @@ struct ios_lock_arg { ios *ios_obj; HANDLE lock; - HANDLE release[2]; + HANDLE release[3]; }; static DWORD WINAPI lock_ios(void *arg) @@ -835,10 +841,13 @@ static DWORD WINAPI lock_ios(void *arg) struct ios_lock_arg *lock_arg = arg; p_ios_lock(lock_arg->ios_obj); p_ios_lockbuf(lock_arg->ios_obj); + p_ios_lockc(); SetEvent(lock_arg->lock); WaitForSingleObject(lock_arg->release[0], INFINITE); - p_ios_unlockbuf(lock_arg->ios_obj); + p_ios_unlockc(); WaitForSingleObject(lock_arg->release[1], INFINITE); + p_ios_unlockbuf(lock_arg->ios_obj); + WaitForSingleObject(lock_arg->release[2], INFINITE); p_ios_unlock(lock_arg->ios_obj); return 0; } @@ -962,6 +971,8 @@ static void test_ios(void) ok(lock_arg.release[0] != NULL, "CreateEventW failed\n"); lock_arg.release[1] = CreateEventW(NULL, FALSE, FALSE, NULL); ok(lock_arg.release[1] != NULL, "CreateEventW failed\n"); + lock_arg.release[2] = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.release[2] != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, lock_ios, (void*)&lock_arg, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(lock_arg.lock, INFINITE); @@ -970,9 +981,12 @@ static void test_ios(void) ok(locked == 0, "the ios object was not locked before\n"); locked = TryEnterCriticalSection(&ios_obj.sb->lock); ok(locked == 0, "the streambuf was not locked before\n"); + locked = TryEnterCriticalSection(p_ios_static_lock); + ok(locked == 0, "the static critical section was not locked before\n"); SetEvent(lock_arg.release[0]); SetEvent(lock_arg.release[1]); + SetEvent(lock_arg.release[2]); WaitForSingleObject(thread, INFINITE); ios_obj.delbuf = 1; @@ -981,6 +995,7 @@ static void test_ios(void) CloseHandle(lock_arg.lock); CloseHandle(lock_arg.release[0]); CloseHandle(lock_arg.release[1]); + CloseHandle(lock_arg.release[2]); CloseHandle(thread); } diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 13b965c..b76b1d0 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -765,7 +765,7 @@ @ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z # @ extern ?x_curindex(a)ios@@0HA -# @ extern ?x_lockc(a)ios@@0U_RTL_CRITICAL_SECTION@@A +@ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A # @ extern ?x_maxbit(a)ios@@0JA # @ extern ?x_statebuf(a)ios@@0QAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 924cd02..cfe2fea 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -839,7 +839,7 @@ @ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z # @ extern ?x_curindex(a)ios@@0HA -# @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A +@ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A # @ extern ?x_maxbit(a)ios@@0JA # @ extern ?x_statebuf(a)ios@@0PAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ

1 0

Austin English : winsta: Add initial winsta.h.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 70f9cc9e3ded83ea2e6837d8cacecb5cfcc514a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f9cc9e3ded83ea2e6837d8c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 4 19:14:02 2015 -0500 winsta: Add initial winsta.h. --- dlls/winsta/main.c | 9 +++-- dlls/winsta/winsta.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winsta/winsta.spec | 2 +- 3 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 46a4ce7..a95782f 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "winternl.h" #include "wine/debug.h" +#include "winsta.h" WINE_DEFAULT_DEBUG_CHANNEL(winsta); @@ -68,7 +69,7 @@ BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, } BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, - ULONG *process_count, void *info ) + ULONG *process_count, PTS_ALL_PROCESSES_INFO *info ) { FIXME( "%p %u %p %p\n", server, level, process_count, info ); *process_count = 0; @@ -76,10 +77,10 @@ BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, return FALSE; } -BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, PFILETIME process_start_time, - PBYTE process_user_sid, PDWORD sid_size) +BOOLEAN WINAPI WinStationGetProcessSid( HANDLE server, ULONG process_id, FILETIME *process_start_time, + PVOID process_user_sid, PULONG sid_size ) { - FIXME( "(%p, %p, %d, %p, %p, %p): stub\n", a, server, process_id, process_start_time, process_user_sid, sid_size); + FIXME( "(%p, %d, %p, %p, %p): stub\n", server, process_id, process_start_time, process_user_sid, sid_size); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } diff --git a/dlls/winsta/winsta.h b/dlls/winsta/winsta.h new file mode 100644 index 0000000..a97f4c4 --- /dev/null +++ b/dlls/winsta/winsta.h @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINSTA_H +#define _WINSTA_H + +#define WINSTATIONNAME_LENGTH 32 +typedef WCHAR WINSTATIONNAME[WINSTATIONNAME_LENGTH + 1]; + +typedef enum _WINSTATIONSTATECLASS +{ + State_Active, + State_Connected, + State_ConnectQuery, + State_Shadow, + State_Disconnected, + State_Idle, + State_Listen, + State_Reset, + State_Down, + State_Init +} WINSTATIONSTATECLASS; + +typedef struct _SESSIONIDW +{ + union + { + ULONG SessionId; + ULONG LogonId; + } DUMMYUNIONNAME; + WINSTATIONNAME WinStationName; + WINSTATIONSTATECLASS State; +} SESSIONIDW, *PSESSIONIDW; + +typedef struct _TS_SYS_PROCESS_INFORMATION +{ + ULONG NextEntryOffset; + ULONG NumberOfThreads; + LARGE_INTEGER SpareLi1; + LARGE_INTEGER SpareLi2; + LARGE_INTEGER SpareLi3; + LARGE_INTEGER CreateTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; + UNICODE_STRING ImageName; + LONG BasePriority; + ULONG UniqueProcessId; + ULONG InheritedFromUniqueProcessId; + ULONG HandleCount; + ULONG SessionId; + ULONG SpareUl3; + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + ULONG PeakWorkingSetSize; + ULONG WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivatePageCount; +} TS_SYS_PROCESS_INFORMATION, *PTS_SYS_PROCESS_INFORMATION; + +typedef struct _TS_ALL_PROCESSES_INFO +{ + PTS_SYS_PROCESS_INFORMATION pTsProcessInfo; + DWORD SizeOfSid; +#ifdef MIDL_PASS + [size_is(SizeOfSid)] PBYTE pSid; +#else + PBYTE pSid; +#endif +} TS_ALL_PROCESSES_INFO, *PTS_ALL_PROCESSES_INFO; + +BOOLEAN WINAPI WinStationEnumerateW(HANDLE,PSESSIONIDW *,PULONG); +BOOLEAN WINAPI WinStationGetAllProcesses(HANDLE,ULONG,PULONG,PTS_ALL_PROCESSES_INFO *); +BOOLEAN WINAPI WinStationGetProcessSid(HANDLE,ULONG,FILETIME *,PVOID,PULONG); +BOOLEAN WINAPI WinStationQueryInformationW(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG); +BOOLEAN WINAPI WinStationRegisterConsoleNotification(HANDLE,HWND,ULONG); + +#endif /* _WINSTA_H */ diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 5854d83..30aa6b5 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -39,7 +39,7 @@ @ stub WinStationGetLanAdapterNameA @ stub WinStationGetLanAdapterNameW @ stub WinStationGetMachinePolicy -@ stdcall WinStationGetProcessSid(ptr ptr long ptr ptr ptr) +@ stdcall WinStationGetProcessSid(ptr long ptr ptr ptr) @ stub WinStationGetTermSrvCountersValue @ stub WinStationInstallLicense @ stub WinStationIsHelpAssistantSession

1 0

Alex Henrie : user32: Simplify if-else statement.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: f6125536948201ee380a44edc0b87a29b0a55af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6125536948201ee380a44edc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 16 01:05:25 2015 -0600 user32: Simplify if-else statement. --- dlls/user32/listbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 4853c3f..ed60a19 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -319,7 +319,8 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } - if (!scroll) InvalidateRect( descr->self, NULL, TRUE ); + else + InvalidateRect( descr->self, NULL, TRUE ); descr->top_item = index; LISTBOX_UpdateScroll( descr ); return LB_OKAY;

1 0

Hans Leidekker : server: Make returning used privileges optional in token_access_check.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: e0206d9f8a7a8c4abedad1346ade99305c48d042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0206d9f8a7a8c4abedad1346… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:37:24 2015 +0200 server: Make returning used privileges optional in token_access_check. --- server/token.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/token.c b/server/token.c index c235ece..42cfb3d 100644 --- a/server/token.c +++ b/server/token.c @@ -848,7 +848,7 @@ static unsigned int token_access_check( struct token *token, /* fail if desired_access contains generic rights */ if (desired_access & (GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE|GENERIC_ALL)) { - *priv_count = 0; + if (priv_count) *priv_count = 0; return STATUS_GENERIC_NOT_MAPPED; } @@ -856,14 +856,14 @@ static unsigned int token_access_check( struct token *token, owner = sd_get_owner( sd ); if (!owner || !sd_get_group( sd )) { - *priv_count = 0; + if (priv_count) *priv_count = 0; return STATUS_INVALID_SECURITY_DESCR; } /* 1: Grant desired access if the object is unprotected */ if (!dacl_present || !dacl) { - *priv_count = 0; + if (priv_count) *priv_count = 0; *granted_access = desired_access; return *status = STATUS_SUCCESS; } @@ -899,7 +899,7 @@ static unsigned int token_access_check( struct token *token, } else { - *priv_count = 0; + if (priv_count) *priv_count = 0; *status = STATUS_PRIVILEGE_NOT_HELD; return STATUS_SUCCESS; } @@ -1002,8 +1002,7 @@ int check_object_access(struct object *obj, unsigned int *access) { GENERIC_MAPPING mapping; struct token *token = current->token ? current->token : current->process->token; - LUID_AND_ATTRIBUTES priv; - unsigned int status, priv_count = 1; + unsigned int status; int res; mapping.GenericAll = obj->ops->map_access( obj, GENERIC_ALL ); @@ -1019,7 +1018,7 @@ int check_object_access(struct object *obj, unsigned int *access) mapping.GenericWrite = obj->ops->map_access( obj, GENERIC_WRITE ); mapping.GenericExecute = obj->ops->map_access( obj, GENERIC_EXECUTE ); - res = token_access_check( token, obj->sd, *access, &priv, &priv_count, + res = token_access_check( token, obj->sd, *access, NULL, NULL, &mapping, access, &status ) == STATUS_SUCCESS && status == STATUS_SUCCESS;

1 0

Dmitry Timoshkov : user32: SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should return real font names.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 268cdbbfb627dd64e527bb8603d9f8d8d788f0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=268cdbbfb627dd64e527bb860… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 17 17:23:24 2015 +0800 user32: SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should return real font names. --- dlls/user32/sysparams.c | 20 ++++++++++++++++++++ dlls/user32/tests/sysparams.c | 5 ----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 79396ae..1f76241 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -621,6 +621,20 @@ static inline int get_display_dpi(void) return display_dpi; } +static INT CALLBACK real_fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *ntm, DWORD type, LPARAM lparam) +{ + const ENUMLOGFONTW *elf = (const ENUMLOGFONTW *)lf; + LOGFONTW *lfW = (LOGFONTW *)lparam; + + lstrcpynW(lfW->lfFaceName, elf->elfFullName, LF_FACESIZE); + return 0; +} + +static void get_real_fontname(LOGFONTW *lf) +{ + EnumFontFamiliesExW(get_display_dc(), lf, real_fontname_proc, (LPARAM)lf, 0); +} + /* adjust some of the raw values found in the registry */ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm) { @@ -633,10 +647,16 @@ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm) /* adjust some heights to the corresponding font */ get_text_metr_size( get_display_dc(), &pncm->lfMenuFont, &tm, NULL); pncm->iMenuHeight = max( pncm->iMenuHeight, 2 + tm.tmHeight + tm.tmExternalLeading ); + get_real_fontname( &pncm->lfMenuFont ); get_text_metr_size( get_display_dc(), &pncm->lfCaptionFont, &tm, NULL); pncm->iCaptionHeight = max( pncm->iCaptionHeight, 2 + tm.tmHeight); + get_real_fontname( &pncm->lfCaptionFont ); get_text_metr_size( get_display_dc(), &pncm->lfSmCaptionFont, &tm, NULL); pncm->iSmCaptionHeight = max( pncm->iSmCaptionHeight, 2 + tm.tmHeight); + get_real_fontname( &pncm->lfSmCaptionFont ); + + get_real_fontname( &pncm->lfStatusFont ); + get_real_fontname( &pncm->lfMessageFont ); } static BOOL CALLBACK enum_monitors( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index dabecdb..1ee8920 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2709,15 +2709,10 @@ static void test_GetSystemMetrics( void) return; } -todo_wine ok(is_font_enumerated(ncm.lfCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfCaptionFont.lfFaceName); -todo_wine ok(is_font_enumerated(ncm.lfSmCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfSmCaptionFont.lfFaceName); -todo_wine ok(is_font_enumerated(ncm.lfMenuFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMenuFont.lfFaceName); -todo_wine ok(is_font_enumerated(ncm.lfStatusFont.lfFaceName), "font %s should be enumerated\n", ncm.lfStatusFont.lfFaceName); -todo_wine ok(is_font_enumerated(ncm.lfMessageFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMessageFont.lfFaceName); /* CaptionWidth from the registry may have different value of iCaptionWidth

1 0

Dmitry Timoshkov : user32: Add a test to show that fonts returned by SystemParametersInfo( SPI_GETNONCLIENTMETRICS) should be listed by EnumFontFamilies(hdc, NULL).
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: b68593ef5c307d7f1db40b3b276da0899f8797dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68593ef5c307d7f1db40b3b2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 17 17:23:08 2015 +0800 user32: Add a test to show that fonts returned by SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should be listed by EnumFontFamilies(hdc, NULL). --- dlls/user32/tests/sysparams.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 31d1a8e..dabecdb 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2650,6 +2650,23 @@ static int gsm_error_ctr; ok( !( exp1 != act && exp2 != act && exp3 != act),"GetSystemMetrics(%s): expected %d or %d or %d actual %d\n", #i, exp1, exp2, exp3, act);\ } +static INT CALLBACK enum_all_fonts_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lparam) +{ + return lstrcmpiA(elf->lfFaceName, (const char *)lparam); +} + +static BOOL is_font_enumerated(const char *name) +{ + HDC hdc = CreateCompatibleDC(0); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)name)) + ret = TRUE; + + DeleteDC(hdc); + return ret; +} + static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; @@ -2691,6 +2708,18 @@ static void test_GetSystemMetrics( void) win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); return; } + +todo_wine + ok(is_font_enumerated(ncm.lfCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfCaptionFont.lfFaceName); +todo_wine + ok(is_font_enumerated(ncm.lfSmCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfSmCaptionFont.lfFaceName); +todo_wine + ok(is_font_enumerated(ncm.lfMenuFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMenuFont.lfFaceName); +todo_wine + ok(is_font_enumerated(ncm.lfStatusFont.lfFaceName), "font %s should be enumerated\n", ncm.lfStatusFont.lfFaceName); +todo_wine + ok(is_font_enumerated(ncm.lfMessageFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMessageFont.lfFaceName); + /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP) */ CaptionWidthfromreg = metricfromreg(

1 0