October 2012 - Wine-commits

André Hentschel : winedbg: Fix check for register number (coverity).
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 72836c0b7eb13d8d840a73c1c999c35e38c2264e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72836c0b7eb13d8d840a73c1c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:46:44 2012 +0200 winedbg: Fix check for register number (coverity). --- programs/winedbg/gdbproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ff845d2..b3978ae 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1547,7 +1547,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) assert(gdbctx->in_trap); reg = strtoul(gdbctx->in_packet, &ptr, 16); - if (ptr == NULL || reg > cpu_num_regs || *ptr++ != '=') + if (ptr == NULL || reg >= cpu_num_regs || *ptr++ != '=') { if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) fprintf(stderr, "Invalid register index %s\n", gdbctx->in_packet);

1 0

André Hentschel : wing32: Use the correct size for memcpy (coverity).
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 7b07e015a9c75867e4c3dc7d40a8bdfa5d1e127f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b07e015a9c75867e4c3dc7d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:56:41 2012 +0200 wing32: Use the correct size for memcpy (coverity). --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index dc6dfd6..b6702ba 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(bmi->bmiHeader) ); + bmi->bmiHeader = ds.dsBmih; return ds.dsBm.bmBits; } return NULL;

1 0

André Hentschel : wing32: Use the correct size for memcpy (coverity).
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 859bf8d9e9e66227c7f6733320189e0493ac22a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859bf8d9e9e66227c7f673332… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:56:41 2012 +0200 wing32: Use the correct size for memcpy (coverity). --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index 0c942a6..dc6dfd6 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(*bmi) ); + memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(bmi->bmiHeader) ); return ds.dsBm.bmBits; } return NULL;

1 0

André Hentschel : atl: Warn when CoRegisterClassObject fails.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 010e311b042404acf7f79b3aeb6590b7595157cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=010e311b042404acf7f79b3ae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 23:49:49 2012 +0200 atl: Warn when CoRegisterClassObject fails. --- dlls/atl/atl_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 2898835..5b47f5e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -179,7 +179,6 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex DWORD dwFlags) { _ATL_OBJMAP_ENTRYW_V1 *obj; - HRESULT hRes = S_OK; int i=0; TRACE("(%p %i %i)\n",pM, dwClsContext, dwFlags); @@ -199,15 +198,19 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex (LPVOID*)&pUnknown); if (SUCCEEDED (rc) ) { - CoRegisterClassObject(obj->pclsid, pUnknown, dwClsContext, - dwFlags, &obj->dwRegister); + rc = CoRegisterClassObject(obj->pclsid, pUnknown, dwClsContext, + dwFlags, &obj->dwRegister); + + if (FAILED (rc) ) + WARN("Failed to register object %i: 0x%08x\n", i, rc); + if (pUnknown) IUnknown_Release(pUnknown); } } } - return hRes; + return S_OK; } HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEW* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID)

1 0

André Hentschel : gdiplus/tests: Fix out-of-bounds access (coverity).
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 9e5936b36c75a417c2e5801049877d06e93fd417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5936b36c75a417c2e580104… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 23:52:55 2012 +0200 gdiplus/tests: Fix out-of-bounds access (coverity). --- dlls/gdiplus/tests/graphics.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 475f7d6..4ed13ea 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2948,7 +2948,7 @@ static void test_string_functions(void) GpRegion *regions[4]; BOOL region_isempty[4]; int i; - PointF position; + PointF positions[8]; GpMatrix *identity; ok(hdc != NULL, "Expected HDC to be initialized\n"); @@ -3186,24 +3186,22 @@ static void test_string_functions(void) status = GdipCreateMatrix(&identity); expect(Ok, status); - position.X = 0; - position.Y = 0; - rc.X = 0; rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(NULL, teststring, 6, font, &position, + memset(positions, 0, sizeof(positions)); + status = GdipMeasureDriverString(NULL, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, NULL, 6, font, &position, + status = GdipMeasureDriverString(graphics, NULL, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, teststring, 6, NULL, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, NULL, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); @@ -3213,16 +3211,16 @@ static void test_string_functions(void) identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, 0x100, identity, &rc); expect(Ok, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL, &rc); expect(Ok, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, NULL); expect(InvalidParameter, status); @@ -3231,7 +3229,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status); @@ -3248,7 +3246,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring, 4, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 4, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status); @@ -3262,7 +3260,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, + status = GdipMeasureDriverString(graphics, teststring2, 1, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status);

1 0

James Eder : ntdll: Use build-time API detection instead of OS detection for finding the number of processors .
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 0d5f301352232d1959086090b133a82ab3e1b7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d5f301352232d1959086090b… Author: James Eder <jimportal(a)gmail.com> Date: Mon Oct 22 15:22:50 2012 -0600 ntdll: Use build-time API detection instead of OS detection for finding the number of processors. --- dlls/ntdll/nt.c | 73 +++++++++++++++++++------------------------------------ 1 files changed, 25 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3f8e772..a851542 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1012,6 +1012,31 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) */ void fill_cpu_info(void) { + long num; + +#ifdef _SC_NPROCESSORS_ONLN + num = sysconf(_SC_NPROCESSORS_ONLN); + if (num < 1) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#elif defined(CTL_HW) && defined(HW_NCPU) + int mib[2]; + size_t len = sizeof(num); + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + if (sysctl(mib, 2, &num, &len, NULL, 0) != 0) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#else + num = 1; + FIXME("Detecting the number of processors not suported.\n"); +#endif + NtCurrentTeb()->Peb->NumberOfProcessors = num; + memset(&cached_sci, 0, sizeof(cached_sci)); /* choose sensible defaults ... * FIXME: perhaps overridable with precompiler flags? @@ -1034,8 +1059,6 @@ void fill_cpu_info(void) cached_sci.Reserved = 0; cached_sci.FeatureSet = 0x1fff; - NtCurrentTeb()->Peb->NumberOfProcessors = 1; - /* Hmm, reasonable processor feature defaults? */ #ifdef linux @@ -1064,17 +1087,6 @@ void fill_cpu_info(void) if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "processor")) - { - /* processor number counts up... */ - unsigned int x; - - if (sscanf(value, "%d",&x)) - if (x + 1 > NtCurrentTeb()->Peb->NumberOfProcessors) - NtCurrentTeb()->Peb->NumberOfProcessors = x + 1; - - continue; - } if (!strcasecmp(line, "model")) { /* First part of Revision */ @@ -1206,11 +1218,6 @@ void fill_cpu_info(void) if (value) user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; #endif mib[0] = CTL_HW; - mib[1] = HW_NCPU; - val_len = sizeof(value); - if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) - if (value > NtCurrentTeb()->Peb->NumberOfProcessors) - NtCurrentTeb()->Peb->NumberOfProcessors = value; mib[1] = HW_MODEL; val_len = sizeof(model)-1; if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) @@ -1270,9 +1277,6 @@ void fill_cpu_info(void) } #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) { - int ret, num; - size_t len; - get_cpuinfo( &cached_sci ); /* Check for OS support of SSE -- Is this used, and should it be sse1 or sse2? */ @@ -1280,32 +1284,10 @@ void fill_cpu_info(void) ret = sysctlbyname("hw.instruction_sse", &num, &len, NULL, 0); if (!ret) user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = num;*/ - - len = sizeof(num); - ret = sysctlbyname("hw.ncpu", &num, &len, NULL, 0); - if (!ret) - NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined(__sun) { - int num = sysconf( _SC_NPROCESSORS_ONLN ); - - if (num == -1) num = 1; get_cpuinfo( &cached_sci ); - NtCurrentTeb()->Peb->NumberOfProcessors = num; - } -#elif defined (__OpenBSD__) - { - int mib[2], num, ret; - size_t len; - - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - len = sizeof(num); - - ret = sysctl(mib, 2, &num, &len, NULL, 0); - if (!ret) - NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined (__APPLE__) { @@ -1322,11 +1304,6 @@ void fill_cpu_info(void) else user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = TRUE; } - valSize = sizeof(int); - if (sysctlbyname ("hw.ncpu", &value, &valSize, NULL, 0) == 0) - NtCurrentTeb()->Peb->NumberOfProcessors = value; - - /* FIXME: we don't use the "hw.activecpu" value... but the cached one */ valSize = sizeof(int); if (sysctlbyname ("hw.cputype", &cputype, &valSize, NULL, 0) == 0)

1 0

James Eder : ntdll: Split up feature detection by architecture.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 7978a38f24eca2eae944025a6fbb11c10d2f0fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7978a38f24eca2eae944025a6… Author: James Eder <jimportal(a)gmail.com> Date: Mon Oct 22 15:22:51 2012 -0600 ntdll: Split up feature detection by architecture. --- dlls/ntdll/nt.c | 439 ++++++++++++++----------------------------------------- 1 files changed, 109 insertions(+), 330 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7978a38f24eca2eae9440…

1 0

Nikolay Sivov : dwrite: Keep a single instance of system font collection.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: a291a7adf8f92e97e3bb9365008b0fc28d17a773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a291a7adf8f92e97e3bb93650… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 21 23:20:42 2012 -0400 dwrite: Keep a single instance of system font collection. --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 97 +++++++++++++++++++++-------------------- dlls/dwrite/main.c | 5 ++- dlls/dwrite/tests/font.c | 12 +++++- 4 files changed, 67 insertions(+), 50 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4cb0e3b..e9d927a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -74,4 +74,5 @@ extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSP extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; -extern HRESULT create_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern void release_system_fontcollection(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ff4a345..60aa7db 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -129,13 +129,14 @@ typedef struct struct dwrite_fontcollection { IDWriteFontCollection IDWriteFontCollection_iface; - LONG ref; WCHAR **families; UINT32 count; int alloc; }; +static IDWriteFontCollection *system_collection; + struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; @@ -645,32 +646,14 @@ static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection return E_NOINTERFACE; } -static ULONG WINAPI dwritefontcollection_AddRef(IDWriteFontCollection *iface) +static ULONG WINAPI dwritesysfontcollection_AddRef(IDWriteFontCollection *iface) { - struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + return 2; } -static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) +static ULONG WINAPI dwritesysfontcollection_Release(IDWriteFontCollection *iface) { - struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(%d)\n", This, ref); - - if (!ref) - { - int i; - - for (i = 0; i < This->count; i++) - heap_free(This->families[i]); - heap_free(This->families); - heap_free(This); - } - - return ref; + return 1; } static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollection *iface) @@ -715,10 +698,10 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec return E_NOTIMPL; } -static const IDWriteFontCollectionVtbl fontcollectionvtbl = { +static const IDWriteFontCollectionVtbl systemfontcollectionvtbl = { dwritefontcollection_QueryInterface, - dwritefontcollection_AddRef, - dwritefontcollection_Release, + dwritesysfontcollection_AddRef, + dwritesysfontcollection_Release, dwritefontcollection_GetFontFamilyCount, dwritefontcollection_GetFontFamily, dwritefontcollection_FindFamilyName, @@ -749,35 +732,55 @@ static INT CALLBACK enum_font_families(const LOGFONTW *lf, const TEXTMETRICW *tm return add_family_syscollection(collection, lf->lfFaceName) == S_OK; } -HRESULT create_system_fontcollection(IDWriteFontCollection **collection) +static void release_font_collection(IDWriteFontCollection *iface) { - struct dwrite_fontcollection *This; - LOGFONTW lf; - HDC hdc; + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + int i; - *collection = NULL; + for (i = 0; i < This->count; i++) + heap_free(This->families[i]); + heap_free(This->families); + heap_free(This); +} - This = heap_alloc(sizeof(struct dwrite_fontcollection)); - if (!This) return E_OUTOFMEMORY; +void release_system_fontcollection(void) +{ + release_font_collection(system_collection); +} - This->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; - This->ref = 1; +HRESULT get_system_fontcollection(IDWriteFontCollection **collection) +{ + if (!system_collection) + { + struct dwrite_fontcollection *This; + LOGFONTW lf; + HDC hdc; - This->alloc = 50; - This->count = 0; - This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + *collection = NULL; - TRACE("building system font collection:\n"); + This = heap_alloc(sizeof(struct dwrite_fontcollection)); + if (!This) return E_OUTOFMEMORY; - hdc = CreateCompatibleDC(0); - memset(&lf, 0, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = DEFAULT_PITCH; - lf.lfFaceName[0] = 0; - EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); - DeleteDC(hdc); + This->IDWriteFontCollection_iface.lpVtbl = &systemfontcollectionvtbl; + This->alloc = 50; + This->count = 0; + This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + + TRACE("building system font collection:\n"); + + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = DEFAULT_PITCH; + lf.lfFaceName[0] = 0; + EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); + DeleteDC(hdc); + + if (InterlockedCompareExchangePointer((void**)&system_collection, &This->IDWriteFontCollection_iface, NULL)) + release_font_collection(&This->IDWriteFontCollection_iface); + } - *collection = &This->IDWriteFontCollection_iface; + *collection = system_collection; return S_OK; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4605008..ea1bbce 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -43,6 +43,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); break; + case DLL_PROCESS_DETACH: + release_system_fontcollection(); + break; } return TRUE; } @@ -389,7 +392,7 @@ static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *ifac if (check_for_updates) FIXME("checking for system font updates not implemented\n"); - return create_system_fontcollection(collection); + return get_system_fontcollection(collection); } static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 07d3e7d..423c876 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -525,7 +525,7 @@ todo_wine static void test_system_fontcollection(void) { - IDWriteFontCollection *collection; + IDWriteFontCollection *collection, *coll2; HRESULT hr; UINT32 i; BOOL ret; @@ -533,6 +533,16 @@ static void test_system_fontcollection(void) hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll2 == collection, "got %p, was %p\n", coll2, collection); + IDWriteFontCollection_Release(coll2); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll2 == collection, "got %p, was %p\n", coll2, collection); + IDWriteFontCollection_Release(coll2); + i = IDWriteFontCollection_GetFontFamilyCount(collection); ok(i, "got %u\n", i);

1 0

Nikolay Sivov : dwrite: Implement IDWriteTextFormat::GetFontCollection().
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: a30faec10ebce7c8c4c1fc2dc96ba6edbd5911a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30faec10ebce7c8c4c1fc2dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 21 23:49:27 2012 -0400 dwrite: Implement IDWriteTextFormat::GetFontCollection(). --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 31 ++++++++++++++++++++++++++++--- dlls/dwrite/main.c | 6 +----- dlls/dwrite/tests/layout.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index e9d927a..7216393 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -68,7 +68,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; -extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, +extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 760ebb2..91360ee 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -51,6 +51,8 @@ struct dwrite_textformat { DWRITE_FONT_STRETCH stretch; FLOAT size; + + IDWriteFontCollection *collection; }; static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout(IDWriteTextLayout *iface) @@ -705,6 +707,7 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) if (!ref) { + if (This->collection) IDWriteFontCollection_Release(This->collection); heap_free(This->family_name); heap_free(This->locale); heap_free(This); @@ -832,8 +835,13 @@ static HRESULT WINAPI dwritetextformat_GetLineSpacing(IDWriteTextFormat *iface, static HRESULT WINAPI dwritetextformat_GetFontCollection(IDWriteTextFormat *iface, IDWriteFontCollection **collection) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p): stub\n", This, collection); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, collection); + + *collection = This->collection; + IDWriteFontCollection_AddRef(*collection); + + return S_OK; } static UINT32 WINAPI dwritetextformat_GetFontFamilyNameLength(IDWriteTextFormat *iface) @@ -923,11 +931,13 @@ static const IDWriteTextFormatVtbl dwritetextformatvtbl = { dwritetextformat_GetLocaleName }; -HRESULT create_textformat(const WCHAR *family_name, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, +HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) { struct dwrite_textformat *This; + *format = NULL; + This = heap_alloc(sizeof(struct dwrite_textformat)); if (!This) return E_OUTOFMEMORY; @@ -939,6 +949,21 @@ HRESULT create_textformat(const WCHAR *family_name, DWRITE_FONT_WEIGHT weight, D This->style = style; This->size = size; + if (collection) + { + This->collection = collection; + IDWriteFontCollection_AddRef(collection); + } + else + { + HRESULT hr = get_system_fontcollection(&This->collection); + if (hr != S_OK) + { + IDWriteTextFormat_Release(&This->IDWriteTextFormat_iface); + return hr; + } + } + *format = &This->IDWriteTextFormat_iface; return S_OK; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ea1bbce..09ed3f2 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -488,11 +488,7 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHA { TRACE("(%s %p %d %d %d %f %s %p)\n", debugstr_w(family_name), collection, weight, style, stretch, size, debugstr_w(locale), format); - - if (collection) - FIXME("font collection not supported\n"); - - return create_textformat(family_name, weight, style, stretch, size, locale, format); + return create_textformat(family_name, collection, weight, style, stretch, size, locale, format); } static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory *iface, IDWriteTypography **typography) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ab29c06..6b8dc62 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -28,6 +28,7 @@ static IDWriteFactory *factory; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR enusW[] = {'e','n','-','u','s',0}; #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) @@ -62,7 +63,6 @@ static void test_CreateTextLayout(void) static void test_CreateGdiCompatibleTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; - static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteTextLayout *layout; IDWriteTextFormat *format; HRESULT hr; @@ -107,6 +107,33 @@ static void test_CreateGdiCompatibleTextLayout(void) IDWriteTextFormat_Release(format); } +static void test_CreateTextFormat(void) +{ + IDWriteFontCollection *collection, *syscoll; + IDWriteTextFormat *format; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDWriteTextFormat_GetFontCollection(format, NULL); + + collection = NULL; + hr = IDWriteTextFormat_GetFontCollection(format, &collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(collection != NULL, "got %p\n", collection); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscoll, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(collection == syscoll, "got %p, was %p\n", syscoll, collection); + IDWriteFontCollection_Release(syscoll); + IDWriteFontCollection_Release(collection); + + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { HRESULT hr; @@ -121,6 +148,7 @@ START_TEST(layout) test_CreateTextLayout(); test_CreateGdiCompatibleTextLayout(); + test_CreateTextFormat(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement GetFontFamily() for system font collection.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 10431905e50baa8d0b3ffaf50b9af3a34bf57157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10431905e50baa8d0b3ffaf50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 00:06:03 2012 -0400 dwrite: Implement GetFontFamily() for system font collection. --- dlls/dwrite/font.c | 14 ++++++++++++-- dlls/dwrite/tests/font.c | 7 +++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 60aa7db..bdc84ee 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -161,6 +161,8 @@ struct dwrite_fontface { LONG ref; }; +static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); + static inline struct dwrite_fontface *impl_from_IDWriteFontFace(IDWriteFontFace *iface) { return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace_iface); @@ -666,8 +668,16 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, family); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p)\n", This, index, family); + + if (index >= This->count) + { + *family = NULL; + return E_FAIL; + } + + return create_fontfamily(This->families[index], family); } static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 423c876..dde50eb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -526,6 +526,7 @@ todo_wine static void test_system_fontcollection(void) { IDWriteFontCollection *collection, *coll2; + IDWriteFontFamily *family; HRESULT hr; UINT32 i; BOOL ret; @@ -546,6 +547,12 @@ static void test_system_fontcollection(void) i = IDWriteFontCollection_GetFontFamilyCount(collection); ok(i, "got %u\n", i); + /* invalid index */ + family = (void*)0xdeadbeef; + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(family == NULL, "got %p\n", family); + ret = FALSE; i = (UINT32)-1; hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &i, &ret);

1 0