August 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite: Fix family name extraction order.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: fb013d7acdea4d68b5b1ba2051878b812ab33932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb013d7acdea4d68b5b1ba205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 21:09:58 2015 +0300 dwrite: Fix family name extraction order. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 22 ++------------------ dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/opentype.c | 48 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1b7bd3a..0fbe44f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -152,7 +152,8 @@ extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_T extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index eda6378..c77c7c5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1108,24 +1108,6 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, - IDWriteLocalizedStrings **names) -{ - const void *name_table = NULL; - void *name_context; - HRESULT hr = E_FAIL; - - opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); - if (name_table) { - hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, names); - IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); - } - else - *names = NULL; - - return hr; -} - static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { struct dwrite_font_data *data = font->data; @@ -1318,7 +1300,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, WARN("no NAME table found.\n"); if (table_exists) { - hr = opentype_get_font_strings_from_id(table_data, stringid, &data->info_strings[stringid]); + hr = opentype_get_font_info_strings(table_data, stringid, &data->info_strings[stringid]); if (FAILED(hr) || !data->info_strings[stringid]) return hr; IDWriteFontFace2_ReleaseFontTable(fontface, context); @@ -2091,7 +2073,7 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat break; /* get family name from font file */ - hr = get_family_names_from_stream(stream, i, face_type, &family_name); + hr = opentype_get_font_familyname(stream, i, face_type, &family_name); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) { WARN("unable to get family name from font\n"); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8248431..8c0aa43 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -575,7 +575,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *ifa index = IDWriteFontFace_GetIndex(fontface); face_type = IDWriteFontFace_GetType(fontface); opentype_get_font_properties(stream, face_type, index, &props); - hr = get_family_names_from_stream(stream, index, face_type, &familynames); + hr = opentype_get_font_familyname(stream, index, face_type, &familynames); IDWriteFontFile_Release(file); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c6d4ec3..76b5c68 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') +#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -1194,12 +1195,11 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la } } -HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; BYTE *storage_area = 0; USHORT count = 0; - UINT16 name_id; BOOL exists; HRESULT hr; int i; @@ -1222,14 +1222,12 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); - name_id = dwriteid_to_opentypeid[id]; - exists = FALSE; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; USHORT lang_id, length, offset, encoding, platform; - if (GET_BE_WORD(record->nameID) != name_id) + if (GET_BE_WORD(record->nameID) != id) continue; exists = TRUE; @@ -1293,6 +1291,46 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA *strings = NULL; } + return exists ? S_OK : E_FAIL; +} + +/* Provides a conversion from DWRITE to OpenType name ids, input id be valid, it's not checked. */ +HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +{ + return opentype_get_font_strings_from_id(table_data, dwriteid_to_opentypeid[id], strings); +} + +/* Name locating order is WWS Family Name -> Preferred Name -> Family Name. If font claims to + have 'Preferred Name' in WWS format, then WWS name is not used. */ +HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, + IDWriteLocalizedStrings **names) +{ + const TT_OS2_V2 *tt_os2; + void *os2_context, *name_context; + const void *name_table; + HRESULT hr; + + opentype_get_font_table(stream, facetype, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + + *names = NULL; + + /* if Preferred Family doesn't conform to WWS model try WWS name */ + if (tt_os2 && !(GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_WWS)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_WWS_FAMILY_NAME, names); + else + hr = E_FAIL; + + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_PREFERRED_FAMILY_NAME, names); + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names); + + if (tt_os2) + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + if (name_context) + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); + return hr; }

1 0

Nikolay Sivov : dwrite: Improve face name extraction.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 2ac68e91a46ddd3f185804ea0e7010c4a1ceeeaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac68e91a46ddd3f185804ea0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 21:10:46 2015 +0300 dwrite: Improve face name extraction. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 19 ++++++++-------- dlls/dwrite/opentype.c | 53 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 57 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0fbe44f..42395ee 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -153,7 +153,8 @@ extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANG extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_facename(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c77c7c5..56a0c4d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -59,6 +59,7 @@ struct dwrite_font_data { DWRITE_FONT_METRICS1 metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; + IDWriteLocalizedStrings *names; /* data needed to create fontface instance */ IDWriteFactory2 *factory; @@ -315,6 +316,7 @@ static void release_font_data(struct dwrite_font_data *data) if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } + IDWriteLocalizedStrings_Release(data->names); IDWriteFontFile_Release(data->file); IDWriteFactory2_Release(data->factory); @@ -1233,11 +1235,8 @@ static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont2 *iface, IDWriteLocali *names = NULL; - if (This->simulations == DWRITE_FONT_SIMULATIONS_NONE) { - BOOL exists; - return IDWriteFont2_GetInformationalStrings(iface, DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES, - names, &exists); - } + if (This->simulations == DWRITE_FONT_SIMULATIONS_NONE) + return clone_localizedstring(This->data->names, names); switch (This->simulations) { case DWRITE_FONT_SIMULATIONS_BOLD|DWRITE_FONT_SIMULATIONS_OBLIQUE: @@ -1940,7 +1939,7 @@ HRESULT get_filestream_from_file(IDWriteFontFile *file, IDWriteFontFileStream ** return hr; } -static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, UINT32 face_index, DWRITE_FONT_FACE_TYPE face_type, +static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index, IDWriteFontFileStream **stream, struct dwrite_font_data **ret) { void *os2_context, *head_context; @@ -1972,6 +1971,7 @@ static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, U opentype_get_font_properties(*stream, face_type, face_index, &props); opentype_get_font_metrics(*stream, face_type, face_index, &data->metrics, NULL); + opentype_get_font_facename(*stream, face_type, face_index, &data->names); data->style = props.style; data->stretch = props.stretch; @@ -2038,9 +2038,8 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat DWRITE_FONT_FACE_TYPE face_type; DWRITE_FONT_FILE_TYPE file_type; IDWriteFontFile *file; - UINT32 face_count; + UINT32 face_count, i; BOOL supported; - int i; current = FALSE; hr = IDWriteFontFileEnumerator_MoveNext(enumerator, &current); @@ -2068,12 +2067,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat UINT32 index; /* alloc and init new font data structure */ - hr = init_font_data(factory, file, i, face_type, &stream, &font_data); + hr = init_font_data(factory, file, face_type, i, &stream, &font_data); if (FAILED(hr)) break; /* get family name from font file */ - hr = opentype_get_font_familyname(stream, i, face_type, &family_name); + hr = opentype_get_font_familyname(stream, face_type, i, &family_name); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) { WARN("unable to get family name from font\n"); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 76b5c68..d0411bd 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -780,11 +780,12 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ void * ttc_context; hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); if (SUCCEEDED(hr)) { - table_offset = GET_BE_DWORD(ttc_header->OffsetTable[0]); if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) hr = E_INVALIDARG; - else + else { + table_offset = GET_BE_DWORD(ttc_header->OffsetTable[font_index]); hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + } IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); } } @@ -1200,6 +1201,7 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_ const TT_NAME_V0 *header; BYTE *storage_area = 0; USHORT count = 0; + WORD format; BOOL exists; HRESULT hr; int i; @@ -1211,14 +1213,17 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_ if (FAILED(hr)) return hr; header = table_data; + format = GET_BE_WORD(header->format); - switch (header->format) { + switch (format) { case 0: + case 1: break; default: - FIXME("unsupported NAME format %d\n", header->format); + FIXME("unsupported NAME format %d\n", format); } + storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); @@ -1300,9 +1305,9 @@ HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIO return opentype_get_font_strings_from_id(table_data, dwriteid_to_opentypeid[id], strings); } -/* Name locating order is WWS Family Name -> Preferred Name -> Family Name. If font claims to - have 'Preferred Name' in WWS format, then WWS name is not used. */ -HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, +/* FamilyName locating order is WWS Family Name -> Preferred Family Name -> Family Name. If font claims to + have 'Preferred Family Name' in WWS format, then WWS name is not used. */ +HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE facetype, UINT32 index, IDWriteLocalizedStrings **names) { const TT_OS2_V2 *tt_os2; @@ -1334,6 +1339,40 @@ HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, UINT32 index return hr; } +/* FaceName locating order is WWS Face Name -> Preferred Face Name -> Face Name. If font claims to + have 'Preferred Face Name' in WWS format, then WWS name is not used. */ +HRESULT opentype_get_font_facename(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE facetype, UINT32 index, + IDWriteLocalizedStrings **names) +{ + const TT_OS2_V2 *tt_os2; + void *os2_context, *name_context; + const void *name_table; + HRESULT hr; + + opentype_get_font_table(stream, facetype, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + + *names = NULL; + + /* if Preferred Family doesn't conform to WWS model try WWS name */ + if (tt_os2 && !(GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_WWS)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_WWS_SUBFAMILY_NAME, names); + else + hr = E_FAIL; + + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_PREFERRED_SUBFAMILY_NAME, names); + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_SUBFAMILY_NAME, names); + + if (tt_os2) + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + if (name_context) + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); + + return hr; +} + static inline const OT_Script *opentype_get_script(const OT_ScriptList *scriptlist, UINT32 scripttag) { UINT16 j;

1 0

Nikolay Sivov : dwrite/tests: Some tests for target hdc mode/transform.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 22a65466b3aa80bf9b543fb583df873db84e6f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a65466b3aa80bf9b543fb58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 21:11:35 2015 +0300 dwrite/tests: Some tests for target hdc mode/transform. --- dlls/dwrite/tests/font.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7ee5c8a..b132749 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -757,6 +757,7 @@ static void test_CreateBitmapRenderTarget(void) HBITMAP hbm, hbm2; DWRITE_MATRIX m; DIBSECTION ds; + XFORM xform; COLORREF c; HRESULT hr; FLOAT pdip; @@ -791,6 +792,11 @@ if (0) /* crashes on native */ hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); ok(hdc != NULL, "got %p\n", hdc); + /* test mode */ + ret = GetGraphicsMode(hdc); +todo_wine + ok(ret == GM_ADVANCED, "got %d\n", ret); + hbm = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm != NULL, "got %p\n", hbm); @@ -914,7 +920,7 @@ if (0) /* crashes on native */ ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel); ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits); - /* transform tests */ + /* transform tests, current hdc transform is not immediately affected */ if (0) /* crashes on native */ hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, NULL); @@ -923,6 +929,10 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + ret = GetWorldTransform(hdc, &xform); + ok(ret, "got %d\n", ret); + ok(xform.eM11 == 1.0 && xform.eM22 == 1.0 && xform.eM12 == 0.0 && xform.eM21 == 0.0, "got wrong transform\n"); + ok(xform.eDx == 0.0 && xform.eDy == 0.0, "got %.1f,%.1f\n", xform.eDx, xform.eDy); memset(&m, 0, sizeof(m)); hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, &m); @@ -933,6 +943,19 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(m.m11 == 0.0 && m.m22 == 0.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + ret = GetWorldTransform(hdc, &xform); + ok(ret, "got %d\n", ret); + ok(xform.eM11 == 1.0 && xform.eM22 == 1.0 && xform.eM12 == 0.0 && xform.eM21 == 0.0, "got wrong transform\n"); + ok(xform.eDx == 0.0 && xform.eDy == 0.0, "got %.1f,%.1f\n", xform.eDx, xform.eDy); + + memset(&m, 0, sizeof(m)); + m.m11 = 2.0; m.m22 = 1.0; + hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = GetWorldTransform(hdc, &xform); + ok(ret, "got %d\n", ret); + ok(xform.eM11 == 1.0 && xform.eM22 == 1.0 && xform.eM12 == 0.0 && xform.eM21 == 0.0, "got wrong transform\n"); + ok(xform.eDx == 0.0 && xform.eDy == 0.0, "got %.1f,%.1f\n", xform.eDx, xform.eDy); hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, NULL); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

André Hentschel : ntdll: Add support for Win 10.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 27bf278d72b2ef16c086799df2f20797924f98a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27bf278d72b2ef16c086799df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 22:32:19 2015 +0200 ntdll: Add support for Win 10. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index a6340eb..41b44f5 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -58,6 +58,7 @@ typedef enum WIN7, /* Windows 7 */ WIN8, /* Windows 8 */ WIN81, /* Windows 8.1 */ + WIN10, /* Windows 10 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -184,6 +185,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, + /* WIN10 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x2800, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; @@ -207,6 +214,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win7", /* WIN7 */ "win8", /* WIN8 */ "win81", /* WIN81 */ + "win10", /* WIN10 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index fad9e5c..82dc870 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,6 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win10", "Windows 10", 10, 0, 0x2800,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Ken Thomases : winemac: Tell Wine when Cocoa brought a clicked window forward even if it sent the click event.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 793ab7d457ef0412069492b6626894d2e23c1a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=793ab7d457ef0412069492b66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Aug 12 18:02:32 2015 -0500 winemac: Tell Wine when Cocoa brought a clicked window forward even if it sent the click event. Not sending the brought-forward event for a click that was sent was an artifact of a time when that branch was only used for posting a request for focus. When I added the brought-forward event, I didn't reconsider that logic. --- dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 82925c8..8e1f318 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1700,10 +1700,10 @@ int macdrv_err_on; } } - if (!process && windowBroughtForward) + if (windowBroughtForward) { [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; - if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + if (!process && ![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) [self windowGotFocus:windowBroughtForward]; }

1 0

Michael Stefaniuc : qedit: COM cleanup for IEnumMediaTypes of SampleGrabber.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 2d3edce0f820cb82d187e5537bd8e4867fb08ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3edce0f820cb82d187e5537… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 7 23:25:06 2015 +0200 qedit: COM cleanup for IEnumMediaTypes of SampleGrabber. --- dlls/qedit/samplegrabber.c | 88 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 537e22c..8b89351 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -41,7 +41,7 @@ static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); /* Single media type enumerator */ typedef struct _ME_Impl { - IEnumMediaTypes me; + IEnumMediaTypes IEnumMediaTypes_iface; LONG refCount; BOOL past; AM_MEDIA_TYPE mtype; @@ -50,22 +50,42 @@ typedef struct _ME_Impl { /* IEnumMediaTypes interface implementation */ -/* IUnknown */ -static ULONG WINAPI -Single_IEnumMediaTypes_AddRef(IEnumMediaTypes *iface) +static inline ME_Impl *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface) +{ + return CONTAINING_RECORD(iface, ME_Impl, IEnumMediaTypes_iface); +} + +static HRESULT WINAPI Single_IEnumMediaTypes_QueryInterface(IEnumMediaTypes *iface, REFIID riid, + void **ret_iface) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumMediaTypes)) { + *ret_iface = iface; + IEnumMediaTypes_AddRef(iface); + return S_OK; + } + *ret_iface = NULL; + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI Single_IEnumMediaTypes_AddRef(IEnumMediaTypes *iface) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedIncrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); return refCount; } -/* IUnknown */ -static ULONG WINAPI -Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) +static ULONG WINAPI Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); if (refCount == 0) { @@ -77,30 +97,13 @@ Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) return refCount; } -/* IUnknown */ -static HRESULT WINAPI -Single_IEnumMediaTypes_QueryInterface(IEnumMediaTypes *iface, REFIID riid, void **ppvObject) -{ - ME_Impl *This = (ME_Impl *)iface; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IEnumMediaTypes)) { - Single_IEnumMediaTypes_AddRef(iface); - *ppvObject = &(This->me); - return S_OK; - } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; -} - /* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, AM_MEDIA_TYPE **types, ULONG *fetched) +static HRESULT WINAPI Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, + AM_MEDIA_TYPE **types, ULONG *fetched) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG count = 0; + TRACE("(%p)->(%u, %p, %p)\n", This, nTypes, types, fetched); if (!nTypes) return E_INVALIDARG; @@ -122,32 +125,29 @@ Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, AM_MEDIA_TYPE return (count == nTypes) ? S_OK : S_FALSE; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Skip(IEnumMediaTypes *iface, ULONG nTypes) +static HRESULT WINAPI Single_IEnumMediaTypes_Skip(IEnumMediaTypes *iface, ULONG nTypes) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%u)\n", This, nTypes); if (nTypes) This->past = TRUE; return This->past ? S_FALSE : S_OK; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Reset(IEnumMediaTypes *iface) +static HRESULT WINAPI Single_IEnumMediaTypes_Reset(IEnumMediaTypes *iface) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->()\n", This); This->past = FALSE; return S_OK; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMediaTypes **me) +static HRESULT WINAPI Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMediaTypes **me) { - ME_Impl *This = (ME_Impl *)iface; + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%p)\n", This, me); if (!me) return E_POINTER; @@ -177,7 +177,7 @@ static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); if (obj) { ZeroMemory(obj, sizeof(ME_Impl)); - obj->me.lpVtbl = &IEnumMediaTypes_VTable; + obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; obj->refCount = 1; obj->past = FALSE; if (mtype) { @@ -193,7 +193,7 @@ static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) else obj->mtype.majortype = GUID_NULL; } - return &obj->me; + return &obj->IEnumMediaTypes_iface; }

1 0

Michael Stefaniuc : qedit: Simplify/ fix the creation of the IEnumMediaTypes.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: f34efaab98bf6ab2be4ebfd35f9bc287fdfe693b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34efaab98bf6ab2be4ebfd35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 7 23:27:20 2015 +0200 qedit: Simplify/fix the creation of the IEnumMediaTypes. --- dlls/qedit/samplegrabber.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 8b89351..e9e4906 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -37,7 +37,7 @@ static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; -static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past); /* Single media type enumerator */ typedef struct _ME_Impl { @@ -151,10 +151,9 @@ static HRESULT WINAPI Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnum TRACE("(%p)->(%p)\n", This, me); if (!me) return E_POINTER; - *me = mediaenum_create(&This->mtype); + *me = mediaenum_create(&This->mtype, This->past); if (!*me) return E_OUTOFMEMORY; - ((ME_Impl *)*me)->past = This->past; return S_OK; } @@ -172,27 +171,29 @@ static const IEnumMediaTypesVtbl IEnumMediaTypes_VTable = Single_IEnumMediaTypes_Clone, }; -static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past) { ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); - if (obj) { - ZeroMemory(obj, sizeof(ME_Impl)); - obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; - obj->refCount = 1; - obj->past = FALSE; - if (mtype) { - obj->mtype = *mtype; - obj->mtype.pUnk = NULL; - if (mtype->cbFormat) { - obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); - CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); - } - else - obj->mtype.pbFormat = NULL; + + if (!obj) + return NULL; + ZeroMemory(obj, sizeof(*obj)); + obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; + obj->refCount = 1; + obj->past = past; + if (mtype) { + obj->mtype = *mtype; + obj->mtype.pUnk = NULL; + if (mtype->cbFormat) { + obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); + CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); } else - obj->mtype.majortype = GUID_NULL; + obj->mtype.pbFormat = NULL; } + else + obj->mtype.majortype = GUID_NULL; + return &obj->IEnumMediaTypes_iface; } @@ -1095,7 +1096,7 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; - *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL); + *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL, FALSE); return *mtypes ? S_OK : E_OUTOFMEMORY; }

1 0

Zhenbo Li : msxml3: Handle NULL parameter in IXMLDOMElement:: get_ownerDocument().
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 59c2b325ea2326ad9ccdc3ed478e1e8ba45a17ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c2b325ea2326ad9ccdc3ed4… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Aug 9 21:11:45 2015 +0800 msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument(). --- dlls/msxml3/node.c | 2 ++ dlls/msxml3/tests/domdoc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1ddc9bf..90b5bde 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -654,6 +654,8 @@ HRESULT node_has_childnodes(const xmlnode *This, VARIANT_BOOL *ret) HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc) { + if(!doc) + return E_INVALIDARG; return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f7f57ac..df71b49 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7467,6 +7467,19 @@ static void test_get_ownerDocument(void) IXMLDOMSchemaCollection *cache; VARIANT_BOOL b; VARIANT var; + IXMLDOMElement *element; + IXMLDOMNodeList *node_list; + IXMLDOMAttribute *attr; + LONG i, len; + HRESULT hr; + const CHAR nodeXML[] = + "<root id='0'>" + " " + " text node 0" + " <x attr='val'></x>" + " <?foo value='PI for x'?>" + " <![CDATA[ cdata ]]>" + "</root>"; if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return; if (!is_clsid_supported(&CLSID_XMLSchemaCache, &IID_IXMLDOMSchemaCollection)) return; @@ -7519,6 +7532,47 @@ static void test_get_ownerDocument(void) check_default_props(doc_owner); check_default_props(doc); + /* NULL check */ + hr = IXMLDOMDocument_loadXML(doc1, _bstr_(nodeXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument_get_documentElement(doc1, &element); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_childNodes(element, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_length(node_list, &len); + EXPECT_HR(hr, S_OK); + + for(i = 0; i < len; i++) { + hr = IXMLDOMNodeList_get_item(node_list, i, &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_get_ownerDocument(node, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + IXMLDOMNode_Release(node); + } + IXMLDOMElement_Release(element); + + /* Test Attribute Node */ + hr = IXMLDOMNodeList_get_item(node_list, 2, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&element); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + + hr = IXMLDOMElement_getAttributeNode(element, _bstr_("attr"), &attr); + EXPECT_HR(hr, S_OK); + ok(attr != NULL, "attr == NULL\n"); + IXMLDOMElement_Release(element); + hr = IXMLDOMAttribute_get_ownerDocument(attr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + IXMLDOMAttribute_Release(attr); + IXMLDOMNodeList_Release(node_list); + IXMLDOMSchemaCollection_Release(cache); IXMLDOMDocument_Release(doc1); IXMLDOMDocument_Release(doc2);

1 0

Carlo Bramini : wmc: Remove redeclaration of optarg and optind.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 891e9bc96741d27620cd46185a9f9a600f669972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891e9bc96741d27620cd46185… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Tue Aug 11 10:42:01 2015 +0200 wmc: Remove redeclaration of optarg and optind. --- tools/wmc/wmc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 9d34a40..a7fbd6a 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -157,8 +157,6 @@ static void exit_on_signal( int sig ) int main(int argc,char *argv[]) { - extern char* optarg; - extern int optind; int optc; int opti = 0; int lose = 0;

1 0

Carlo Bramini : wrc: Remove redeclaration of optarg and optind.
by Alexandre Julliard 13 Aug '15

13 Aug '15

Module: wine Branch: master Commit: 36a39cea9096a1eef46c59392858c26ecae40c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a39cea9096a1eef46c59392… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Tue Aug 11 10:43:28 2015 +0200 wrc: Remove redeclaration of optarg and optind. --- tools/wrc/wrc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 577a6f4..15326ee 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -327,8 +327,6 @@ static void set_target( const char *target ) int main(int argc,char *argv[]) { - extern char* optarg; - extern int optind; int optc; int opti = 0; int stdinc = 1;

1 0