December 2020 - Wine-Commits

Dmitry Timoshkov : crypt32: Add support for CRYPT_STRING_HEX to CryptBinaryToStringW.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: d3a4477bad90f37dab584af89e1baa07a989437e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3a4477bad90f37dab584af8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 3 09:57:21 2020 +0300 crypt32: Add support for CRYPT_STRING_HEX to CryptBinaryToStringW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 79 ++++++++++++++++++++++++++++++- dlls/crypt32/tests/base64.c | 113 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 189 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 1fd4dc136ef..0e8bd2227eb 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -460,7 +460,7 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, return ret; } -static BOOL BinaryToHexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) +static BOOL BinaryToHexRawW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) { static const WCHAR hex[] = L"0123456789abcdef"; DWORD needed; @@ -506,6 +506,79 @@ static BOOL BinaryToHexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, D return TRUE; } +static BOOL binary_to_hexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) +{ + static const WCHAR hex[] = L"0123456789abcdef"; + DWORD needed, i; + + needed = nbin * 3; /* spaces + terminating \0 */ + + if (flags & CRYPT_STRING_NOCR) + { + needed += (nbin + 7) / 16; /* space every 16 characters */ + needed += 1; /* terminating \n */ + } + else if (!(flags & CRYPT_STRING_NOCRLF)) + { + needed += (nbin + 7) / 16; /* space every 16 characters */ + needed += nbin / 16 + 1; /* LF every 16 characters + terminating \r */ + + if (nbin % 16) + needed += 1; /* terminating \n */ + } + + if (!str) + { + *nstr = needed; + return TRUE; + } + + if (needed > *nstr) + { + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + + for (i = 0; i < nbin; i++) + { + *str++ = hex[(bin[i] >> 4) & 0xf]; + *str++ = hex[bin[i] & 0xf]; + + if (i >= nbin - 1) break; + + if (i && !(flags & CRYPT_STRING_NOCRLF)) + { + if (!((i + 1) % 16)) + { + if (flags & CRYPT_STRING_NOCR) + *str++ = '\n'; + else + { + *str++ = '\r'; + *str++ = '\n'; + } + continue; + } + else if (!((i + 1) % 8)) + *str++ = ' '; + } + + *str++ = ' '; + } + + if (flags & CRYPT_STRING_NOCR) + *str++ = '\n'; + else if (!(flags & CRYPT_STRING_NOCRLF)) + { + *str++ = '\r'; + *str++ = '\n'; + } + + *str = 0; + *nstr = needed - 1; + return TRUE; +} + BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) { @@ -537,9 +610,11 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, encoder = BinaryToBase64W; break; case CRYPT_STRING_HEXRAW: - encoder = BinaryToHexW; + encoder = BinaryToHexRawW; break; case CRYPT_STRING_HEX: + encoder = binary_to_hexW; + break; case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index a48f0a5c440..64148342b2b 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -236,12 +236,36 @@ static void encode_compare_base64_W(const BYTE *toEncode, DWORD toEncodeLen, DWO heap_free(trailerW); } +static DWORD binary_to_hex_len(DWORD binary_len, DWORD flags) +{ + DWORD strLen2; + + strLen2 = binary_len * 3; /* spaces + terminating \0 */ + + if (flags & CRYPT_STRING_NOCR) + { + strLen2 += (binary_len + 7) / 16; /* space every 16 characters */ + strLen2 += 1; /* terminating \n */ + } + else if (!(flags & CRYPT_STRING_NOCRLF)) + { + strLen2 += (binary_len + 7) / 16; /* space every 16 characters */ + strLen2 += binary_len / 16 + 1; /* LF every 16 characters + terminating \r */ + + if (binary_len % 16) + strLen2 += 1; /* terminating \n */ + } + + return strLen2; +} + static void test_CryptBinaryToString(void) { static const DWORD flags[] = { 0, CRYPT_STRING_NOCR, CRYPT_STRING_NOCRLF }; + static const DWORD sizes[] = { 3, 4, 7, 8, 12, 15, 16, 17, 256 }; static const WCHAR hexdig[] = L"0123456789abcdef"; BYTE input[256 * sizeof(WCHAR)]; - DWORD strLen, strLen2, i, j; + DWORD strLen, strLen2, i, j, k; WCHAR *hex, *cmp, *ptr; BOOL ret; @@ -444,6 +468,93 @@ static void test_CryptBinaryToString(void) heap_free(hex); heap_free(cmp); } + + for (k = 0; k < ARRAY_SIZE(sizes); k++) + for (i = 0; i < ARRAY_SIZE(flags); i++) + { + strLen = 0; + ret = CryptBinaryToStringW(input, sizes[k], CRYPT_STRING_HEX | flags[i], NULL, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen > 0, "Unexpected string length.\n"); + + strLen = ~0; + ret = CryptBinaryToStringW(input, sizes[k], CRYPT_STRING_HEX | flags[i], NULL, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + strLen2 = binary_to_hex_len(sizes[k], CRYPT_STRING_HEX | flags[i]); + ok(strLen == strLen2, "%u: Expected length %d, got %d\n", i, strLen2, strLen); + + hex = heap_alloc(strLen * sizeof(WCHAR) + 256); + memset(hex, 0xcc, strLen * sizeof(WCHAR)); + + ptr = cmp = heap_alloc(strLen * sizeof(WCHAR) + 256); + for (j = 0; j < sizes[k]; j++) + { + *ptr++ = hexdig[(input[j] >> 4) & 0xf]; + *ptr++ = hexdig[input[j] & 0xf]; + + if (j >= sizes[k] - 1) break; + + if (j && !(flags[i] & CRYPT_STRING_NOCRLF)) + { + + if (!((j + 1) % 16)) + { + if (flags[i] & CRYPT_STRING_NOCR) + { + *ptr++ = '\n'; + } + else + { + *ptr++ = '\r'; + *ptr++ = '\n'; + } + continue; + } + else if (!((j + 1) % 8)) + *ptr++ = ' '; + } + + *ptr++ = ' '; + } + + if (flags[i] & CRYPT_STRING_NOCR) + { + *ptr++ = '\n'; + } + else if (!(flags[i] & CRYPT_STRING_NOCRLF)) + { + *ptr++ = '\r'; + *ptr++ = '\n'; + } + *ptr++ = 0; + + ret = CryptBinaryToStringW(input, sizes[k], CRYPT_STRING_HEX | flags[i], hex, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + strLen2--; + ok(strLen == strLen2, "%u: Expected length %d, got %d\n", i, strLen, strLen2); + ok(!memcmp(hex, cmp, strLen * sizeof(WCHAR)), "%u: got %s\n", i, wine_dbgstr_wn(hex, strLen)); + + /* adjusts size if buffer too big */ + strLen *= 2; + ret = CryptBinaryToStringW(input, sizes[k], CRYPT_STRING_HEX | flags[i], hex, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen == strLen2, "%u: Expected length %d, got %d\n", i, strLen, strLen2); + + /* no writes if buffer too small */ + strLen /= 2; + strLen2 /= 2; + memset(hex, 0xcc, strLen * sizeof(WCHAR)); + memset(cmp, 0xcc, strLen * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = CryptBinaryToStringW(input, sizes[k], CRYPT_STRING_HEX | flags[i], hex, &strLen); + ok(!ret && GetLastError() == ERROR_MORE_DATA,"Expected ERROR_MORE_DATA, got ret=%d le=%u\n", + ret, GetLastError()); + ok(strLen == strLen2, "%u: Expected length %d, got %d\n", i, strLen, strLen2); + ok(!memcmp(hex, cmp, strLen * sizeof(WCHAR)), "%u: got %s\n", i, wine_dbgstr_wn(hex, strLen)); + + heap_free(hex); + heap_free(cmp); + } } static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header,

1 0

Rémi Bernon : gdi32: Try to parse font props without FreeType.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 3ea171dee542027a4497a17920c69315994526eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea171dee542027a4497a179… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:50 2020 +0100 gdi32: Try to parse font props without FreeType. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 7 ++-- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/opentype.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 521bf054e43..364d58b4450 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1224,7 +1224,9 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This = NULL; } else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 ) && - opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 )) + opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 ) && + opentype_get_properties( data_ptr, data_size, ttc_sfnt_v1, &This->font_version, + &This->fs, &This->ntm_flags )) { struct family_names_data family_names; struct face_name_data style_name; @@ -1291,10 +1293,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = ft_face_get_style_name( This->ft_face, system_lcid ); This->full_name = ft_face_get_full_name( This->ft_face, system_lcid ); - } - if (This) - { This->ntm_flags = get_ntm_flags( This->ft_face ); This->font_version = get_font_version( This->ft_face ); if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9a988d08d7e..8d917a795c0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -439,6 +439,9 @@ extern BOOL opentype_enum_style_names( const struct tt_name_v0 *tt_name_v0, extern BOOL opentype_enum_full_names( const struct tt_name_v0 *tt_name_v0, opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN; +extern BOOL opentype_get_properties( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags ) DECLSPEC_HIDDEN; + /* gdiobj.c */ extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 4200b08d318..67af44dfe91 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #define MS_EBDT_TAG MS_MAKE_TAG('E','B','D','T') #define MS_CBDT_TAG MS_MAKE_TAG('C','B','D','T') #define MS_NAME_TAG MS_MAKE_TAG('n','a','m','e') +#define MS_CFF__TAG MS_MAKE_TAG('C','F','F',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -135,6 +136,28 @@ struct tt_name_v0 WORD stringOffset; struct tt_namerecord nameRecord[1]; }; + +struct tt_head +{ + USHORT majorVersion; + USHORT minorVersion; + ULONG revision; + ULONG checksumadj; + ULONG magic; + USHORT flags; + USHORT unitsPerEm; + ULONGLONG created; + ULONGLONG modified; + SHORT xMin; + SHORT yMin; + SHORT xMax; + SHORT yMax; + USHORT macStyle; + USHORT lowestRecPPEM; + SHORT direction_hint; + SHORT index_format; + SHORT glyphdata_format; +}; #include "poppack.h" enum OPENTYPE_PLATFORM_ID @@ -236,6 +259,20 @@ enum OPENTYPE_NAME_ID OPENTYPE_NAME_WWS_SUBFAMILY }; +enum OS2_FSSELECTION +{ + OS2_FSSELECTION_ITALIC = 1 << 0, + OS2_FSSELECTION_UNDERSCORE = 1 << 1, + OS2_FSSELECTION_NEGATIVE = 1 << 2, + OS2_FSSELECTION_OUTLINED = 1 << 3, + OS2_FSSELECTION_STRIKEOUT = 1 << 4, + OS2_FSSELECTION_BOLD = 1 << 5, + OS2_FSSELECTION_REGULAR = 1 << 6, + OS2_FSSELECTION_USE_TYPO_METRICS = 1 << 7, + OS2_FSSELECTION_WWS = 1 << 8, + OS2_FSSELECTION_OBLIQUE = 1 << 9 +}; + static BOOL opentype_get_table_ptr( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, UINT32 table_tag, const void **table_ptr, UINT32 *table_size ) { @@ -270,6 +307,13 @@ static BOOL opentype_get_tt_os2_v1( const void *data, size_t size, const struct return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_OS_2_TAG, (const void **)tt_os2_v1, &table_size ); } +static BOOL opentype_get_tt_head( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + const struct tt_head **tt_head ) +{ + UINT32 table_size = sizeof(**tt_head); + return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_HEAD_TAG, (const void **)tt_head, &table_size ); +} + static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT encoding ) { switch (platform) @@ -677,3 +721,50 @@ BOOL opentype_enum_full_names( const struct tt_name_v0 *header, opentype_enum_na return TRUE; return FALSE; } + +BOOL opentype_get_properties( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags ) +{ + const struct tt_os2_v1 *tt_os2_v1; + const struct tt_head *tt_head; + const void *cff_header; + UINT32 table_size = 0; + USHORT idx, selection; + DWORD flags = 0; + + if (!opentype_get_tt_head( data, size, ttc_sfnt_v1, &tt_head )) return FALSE; + if (!opentype_get_tt_os2_v1( data, size, ttc_sfnt_v1, &tt_os2_v1 )) return FALSE; + + *version = GET_BE_DWORD( tt_head->revision ); + + fs->fsUsb[0] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange1 ); + fs->fsUsb[1] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange2 ); + fs->fsUsb[2] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange3 ); + fs->fsUsb[3] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange4 ); + + if (tt_os2_v1->version == 0) + { + idx = GET_BE_WORD( tt_os2_v1->usFirstCharIndex ); + if (idx >= 0xf000 && idx < 0xf100) fs->fsCsb[0] = FS_SYMBOL; + else fs->fsCsb[0] = FS_LATIN1; + fs->fsCsb[1] = 0; + } + else + { + fs->fsCsb[0] = GET_BE_DWORD( tt_os2_v1->ulCodePageRange1 ); + fs->fsCsb[1] = GET_BE_DWORD( tt_os2_v1->ulCodePageRange2 ); + } + + selection = GET_BE_WORD( tt_os2_v1->fsSelection ); + + if (selection & OS2_FSSELECTION_ITALIC) flags |= NTM_ITALIC; + if (selection & OS2_FSSELECTION_BOLD) flags |= NTM_BOLD; + if (selection & OS2_FSSELECTION_REGULAR) flags |= NTM_REGULAR; + if (flags == 0) flags = NTM_REGULAR; + + if (opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_CFF__TAG, &cff_header, &table_size )) + flags |= NTM_PS_OPENTYPE; + + *ntm_flags = flags; + return TRUE; +}

1 0

Rémi Bernon : gdi32: Try to parse font names without FreeType.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 93ef83e903354e5d28a9a0b14dd2ff83504f2b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=93ef83e903354e5d28a9a0b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:49 2020 +0100 gdi32: Try to parse font names without FreeType. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 131 +++++++++++++- dlls/gdi32/gdi_private.h | 18 ++ dlls/gdi32/opentype.c | 459 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 603 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93ef83e903354e5d28a9…

1 0

Rémi Bernon : gdi32: Introduce new opentype font parsing helpers.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: e338d046976064d6f050591f1c99fa1ddd4077b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e338d046976064d6f050591f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:48 2020 +0100 gdi32: Introduce new opentype font parsing helpers. Mostly taken from dwrite source, adapted to make it more flexible. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/freetype.c | 11 +++ dlls/gdi32/gdi_private.h | 7 ++ dlls/gdi32/opentype.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 239 insertions(+) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index a965e80001c..910450b9f64 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -42,6 +42,7 @@ C_SRCS = \ mfdrv/objects.c \ mfdrv/text.c \ opengl.c \ + opentype.c \ painting.c \ palette.c \ path.c \ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cb993034d09..686f2b54682 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1110,8 +1110,10 @@ struct unix_face static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, UINT face_index, DWORD flags ) { + const struct ttc_sfnt_v1 *ttc_sfnt_v1; struct unix_face *This; struct stat st; + DWORD face_count; int fd; TRACE( "unix_name %s, face_index %u, data_ptr %p, data_size %u, flags %#x\n", @@ -1138,11 +1140,20 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr RtlFreeHeap( GetProcessHeap(), 0, This ); This = NULL; } + else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 )) + { + This->scalable = TRUE; + This->num_faces = face_count; + } else { + WARN( "unable to parse font, falling back to FreeType\n" ); This->scalable = FT_IS_SCALABLE( This->ft_face ); This->num_faces = This->ft_face->num_faces; + } + if (This) + { This->family_name = ft_face_get_family_name( This->ft_face, system_lcid ); This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b9a06415538..a529cb0890c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -414,6 +414,13 @@ struct font_callback_funcs extern void font_init(void) DECLSPEC_HIDDEN; +/* opentype.c */ + +struct ttc_sfnt_v1; + +extern BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD *count, + const struct ttc_sfnt_v1 **ttc_sfnt_v1 ) DECLSPEC_HIDDEN; + /* gdiobj.c */ extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c new file mode 100644 index 00000000000..2363439cdc5 --- /dev/null +++ b/dlls/gdi32/opentype.c @@ -0,0 +1,220 @@ +/* + * Copyright 2020 Rémi Bernon for CodeWeavers + * Copyright 2014 Aric Stewart for CodeWeavers + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +#include "gdi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(font); + +#define MS_OTTO_TAG MS_MAKE_TAG('O','T','T','O') +#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') +#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') +#define MS_OS_2_TAG MS_MAKE_TAG('O','S','/','2') +#define MS_EBSC_TAG MS_MAKE_TAG('E','B','S','C') +#define MS_EBDT_TAG MS_MAKE_TAG('E','B','D','T') +#define MS_CBDT_TAG MS_MAKE_TAG('C','B','D','T') + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) +#endif + +#include "pshpack2.h" +struct ttc_header_v1 +{ + CHAR TTCTag[4]; + DWORD Version; + DWORD numFonts; + DWORD OffsetTable[1]; +}; + +struct ttc_sfnt_v1 +{ + DWORD version; + WORD numTables; + WORD searchRange; + WORD entrySelector; + WORD rangeShift; +}; + +struct tt_tablerecord +{ + DWORD tag; + DWORD checkSum; + DWORD offset; + DWORD length; +}; + +struct tt_os2_v1 +{ + USHORT version; + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + SHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + SHORT sFamilyClass; + PANOSE panose; + ULONG ulUnicodeRange1; + ULONG ulUnicodeRange2; + ULONG ulUnicodeRange3; + ULONG ulUnicodeRange4; + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + /* According to the Apple spec, original version didn't have the below fields, + * version numbers were taken from the OpenType spec. + */ + /* version 0 (TrueType 1.5) */ + USHORT sTypoAscender; + USHORT sTypoDescender; + USHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + /* version 1 (TrueType 1.66) */ + ULONG ulCodePageRange1; + ULONG ulCodePageRange2; +}; +#include "poppack.h" + +static BOOL opentype_get_table_ptr( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + UINT32 table_tag, const void **table_ptr, UINT32 *table_size ) +{ + const struct tt_tablerecord *table_record; + UINT16 i, table_count; + UINT32 offset, length; + + if (!ttc_sfnt_v1) return FALSE; + + table_record = (const struct tt_tablerecord *)(ttc_sfnt_v1 + 1); + table_count = GET_BE_WORD( ttc_sfnt_v1->numTables ); + for (i = 0; i < table_count; i++, table_record++) + { + if (table_record->tag != table_tag) continue; + offset = GET_BE_DWORD( table_record->offset ); + length = GET_BE_DWORD( table_record->length ); + if (size < offset + length) return FALSE; + if (table_size && length < *table_size) return FALSE; + + if (table_ptr) *table_ptr = (const char *)data + offset; + if (table_size) *table_size = length; + return TRUE; + } + + return FALSE; +} + +static BOOL opentype_get_tt_os2_v1( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + const struct tt_os2_v1 **tt_os2_v1 ) +{ + UINT32 table_size = sizeof(**tt_os2_v1); + return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_OS_2_TAG, (const void **)tt_os2_v1, &table_size ); +} + +BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD *count, const struct ttc_sfnt_v1 **ttc_sfnt_v1 ) +{ + const struct ttc_header_v1 *ttc_header_v1 = data; + const struct tt_os2_v1 *tt_os2_v1; + UINT32 offset, fourcc; + + *ttc_sfnt_v1 = NULL; + *count = 1; + + if (size < sizeof(fourcc)) return FALSE; + memcpy( &fourcc, data, sizeof(fourcc) ); + + switch (fourcc) + { + default: + WARN( "unsupported font format %x\n", fourcc ); + return FALSE; + case MS_TTCF_TAG: + if (size < sizeof(ttc_header_v1)) return FALSE; + if (index >= (*count = GET_BE_DWORD( ttc_header_v1->numFonts ))) return FALSE; + offset = GET_BE_DWORD( ttc_header_v1->OffsetTable[index] ); + break; + case 0x00000100: + case MS_OTTO_TAG: + offset = 0; + break; + } + + if (size < offset + sizeof(**ttc_sfnt_v1)) return FALSE; + *ttc_sfnt_v1 = (const struct ttc_sfnt_v1 *)((const char *)data + offset); + + if (!opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_HEAD_TAG, NULL, NULL )) + { + WARN( "unsupported sfnt font: missing head table.\n" ); + return FALSE; + } + + if (!opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_HHEA_TAG, NULL, NULL )) + { + WARN( "unsupported sfnt font: missing hhea table.\n" ); + return FALSE; + } + + if (!opentype_get_tt_os2_v1( data, size, *ttc_sfnt_v1, &tt_os2_v1 )) + { + WARN( "unsupported sfnt font: missing OS/2 table.\n" ); + return FALSE; + } + + /* Wine uses ttfs as an intermediate step in building its bitmap fonts; + we don't want to load these. */ + if (!memcmp( tt_os2_v1->achVendID, "Wine", sizeof(tt_os2_v1->achVendID) ) && + opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_EBSC_TAG, NULL, NULL )) + { + TRACE( "ignoring wine bitmap-only sfnt font.\n" ); + return FALSE; + } + + if (opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_EBDT_TAG, NULL, NULL ) || + opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_CBDT_TAG, NULL, NULL )) + { + WARN( "unsupported sfnt font: embedded bitmap data.\n" ); + return FALSE; + } + + return TRUE; +}

1 0

Rémi Bernon : gdi32: Introduce struct unix_face as a ft_face wrapper.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: dbe4462057e861f45cc8bdd06b33794d5085c22c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe4462057e861f45cc8bdd0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:46 2020 +0100 gdi32: Introduce struct unix_face as a ft_face wrapper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 124 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 91 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1ee02795bed..00334b470c8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1092,65 +1092,123 @@ fail: return NULL; } +struct unix_face +{ + FT_Face ft_face; + BOOL scalable; + UINT num_faces; + WCHAR *family_name; + WCHAR *second_name; +}; + +static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, + UINT face_index, DWORD flags ) +{ + struct unix_face *This; + struct stat st; + int fd; + + TRACE( "unix_name %s, face_index %u, data_ptr %p, data_size %u, flags %#x\n", + unix_name, face_index, data_ptr, data_size, flags ); + + if (unix_name) + { + if ((fd = open( unix_name, O_RDONLY )) == -1) return NULL; + if (fstat( fd, &st ) == -1) + { + close( fd ); + return NULL; + } + data_size = st.st_size; + data_ptr = mmap( NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0 ); + close( fd ); + if (data_ptr == MAP_FAILED) return NULL; + } + + if (!(This = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This) ))) goto done; + + if (!(This->ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + { + RtlFreeHeap( GetProcessHeap(), 0, This ); + This = NULL; + } + else + { + This->scalable = FT_IS_SCALABLE( This->ft_face ); + This->num_faces = This->ft_face->num_faces; + + This->family_name = ft_face_get_family_name( This->ft_face, system_lcid ); + This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + + /* try to find another secondary name, preferring the lowest langids */ + if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), + This->second_name, lstrlenW( This->second_name ), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); + if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), + This->second_name, lstrlenW( This->second_name ), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + This->second_name = NULL; + } + } + } + +done: + if (unix_name) munmap( data_ptr, data_size ); + return This; +} + +static void unix_face_destroy( struct unix_face *This ) +{ + pFT_Done_Face( This->ft_face ); + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + RtlFreeHeap( GetProcessHeap(), 0, This->family_name ); + RtlFreeHeap( GetProcessHeap(), 0, This ); +} + static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_ptr, SIZE_T data_size, DWORD face_index, DWORD flags, DWORD *num_faces ) { + struct unix_face *unix_face; struct bitmap_font_size size; FONTSIGNATURE fs; - FT_Face ft_face; - WCHAR *family_name, *second_name, *style_name, *full_name; + WCHAR *style_name, *full_name; int ret; if (num_faces) *num_faces = 0; - if (!(ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + if (!(unix_face = unix_face_create( unix_name, data_ptr, data_size, face_index, flags ))) return 0; - if (ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ + if (unix_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ { TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); - pFT_Done_Face( ft_face ); + unix_face_destroy( unix_face ); return 0; } - family_name = ft_face_get_family_name( ft_face, system_lcid ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - style_name = ft_face_get_style_name( ft_face, system_lcid ); - full_name = ft_face_get_full_name( ft_face, system_lcid ); - - /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = NULL; - } - } + style_name = ft_face_get_style_name( unix_face->ft_face, system_lcid ); + full_name = ft_face_get_full_name( unix_face->ft_face, system_lcid ); - get_fontsig( ft_face, &fs ); - if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); + get_fontsig( unix_face->ft_face, &fs ); + if (!unix_face->scalable) get_bitmap_size( unix_face->ft_face, &size ); if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, - data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), - get_font_version( ft_face ), flags, - FT_IS_SCALABLE(ft_face) ? NULL : &size ); + ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, style_name, full_name, + file, data_ptr, data_size, face_index, fs, get_ntm_flags( unix_face->ft_face ), + get_font_version( unix_face->ft_face ), flags, + unix_face->scalable ? NULL : &size ); TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - RtlFreeHeap( GetProcessHeap(), 0, family_name ); - RtlFreeHeap( GetProcessHeap(), 0, second_name ); RtlFreeHeap( GetProcessHeap(), 0, style_name ); RtlFreeHeap( GetProcessHeap(), 0, full_name ); - if (num_faces) *num_faces = ft_face->num_faces; - pFT_Done_Face( ft_face ); + if (num_faces) *num_faces = unix_face->num_faces; + unix_face_destroy( unix_face ); return ret; }

1 0

Rémi Bernon : gdi32: Use FreeType as a fallback when loading font faces.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 8aa404bba0f17db479ad2cf214b17cb6f1eae2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aa404bba0f17db479ad2cf2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:51 2020 +0100 gdi32: Use FreeType as a fallback when loading font faces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 364d58b4450..09c8251de8f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1218,15 +1218,10 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr if (!(This = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This) ))) goto done; - if (!(This->ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) - { - RtlFreeHeap( GetProcessHeap(), 0, This ); - This = NULL; - } - else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 ) && - opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 ) && - opentype_get_properties( data_ptr, data_size, ttc_sfnt_v1, &This->font_version, - &This->fs, &This->ntm_flags )) + if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 ) && + opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 ) && + opentype_get_properties( data_ptr, data_size, ttc_sfnt_v1, &This->font_version, + &This->fs, &This->ntm_flags )) { struct family_names_data family_names; struct face_name_data style_name; @@ -1268,7 +1263,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr WARN( "full name not found, using %s instead\n", debugstr_w(This->full_name) ); } } - else + else if ((This->ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) { WARN( "unable to parse font, falling back to FreeType\n" ); This->scalable = FT_IS_SCALABLE( This->ft_face ); @@ -1299,6 +1294,11 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); get_fontsig( This->ft_face, &This->fs ); } + else + { + RtlFreeHeap( GetProcessHeap(), 0, This ); + This = NULL; + } done: if (unix_name) munmap( data_ptr, data_size ); @@ -1307,7 +1307,7 @@ done: static void unix_face_destroy( struct unix_face *This ) { - pFT_Done_Face( This->ft_face ); + if (This->ft_face) pFT_Done_Face( This->ft_face ); RtlFreeHeap( GetProcessHeap(), 0, This->full_name ); RtlFreeHeap( GetProcessHeap(), 0, This->style_name ); RtlFreeHeap( GetProcessHeap(), 0, This->second_name );

1 0

Rémi Bernon : gdi32: Store ft_face font props on unix_face.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: dece7fa9eb5a0075d94d623e7e9cef84f95366d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dece7fa9eb5a0075d94d623e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 1 15:54:47 2020 +0100 gdi32: Store ft_face font props on unix_face. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 00334b470c8..cb993034d09 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1099,6 +1099,12 @@ struct unix_face UINT num_faces; WCHAR *family_name; WCHAR *second_name; + WCHAR *style_name; + WCHAR *full_name; + DWORD ntm_flags; + DWORD font_version; + FONTSIGNATURE fs; + struct bitmap_font_size size; }; static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, @@ -1153,6 +1159,14 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->second_name = NULL; } } + + This->style_name = ft_face_get_style_name( This->ft_face, system_lcid ); + This->full_name = ft_face_get_full_name( This->ft_face, system_lcid ); + + This->ntm_flags = get_ntm_flags( This->ft_face ); + This->font_version = get_font_version( This->ft_face ); + if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); + get_fontsig( This->ft_face, &This->fs ); } done: @@ -1163,6 +1177,8 @@ done: static void unix_face_destroy( struct unix_face *This ) { pFT_Done_Face( This->ft_face ); + RtlFreeHeap( GetProcessHeap(), 0, This->full_name ); + RtlFreeHeap( GetProcessHeap(), 0, This->style_name ); RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); RtlFreeHeap( GetProcessHeap(), 0, This->family_name ); RtlFreeHeap( GetProcessHeap(), 0, This ); @@ -1172,9 +1188,6 @@ static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_p DWORD face_index, DWORD flags, DWORD *num_faces ) { struct unix_face *unix_face; - struct bitmap_font_size size; - FONTSIGNATURE fs; - WCHAR *style_name, *full_name; int ret; if (num_faces) *num_faces = 0; @@ -1189,23 +1202,14 @@ static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_p return 0; } - style_name = ft_face_get_style_name( unix_face->ft_face, system_lcid ); - full_name = ft_face_get_full_name( unix_face->ft_face, system_lcid ); - - get_fontsig( unix_face->ft_face, &fs ); - if (!unix_face->scalable) get_bitmap_size( unix_face->ft_face, &size ); if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, style_name, full_name, - file, data_ptr, data_size, face_index, fs, get_ntm_flags( unix_face->ft_face ), - get_font_version( unix_face->ft_face ), flags, - unix_face->scalable ? NULL : &size ); + ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, unix_face->style_name, unix_face->full_name, + file, data_ptr, data_size, face_index, unix_face->fs, unix_face->ntm_flags, + unix_face->font_version, flags, unix_face->scalable ? NULL : &unix_face->size ); - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - - RtlFreeHeap( GetProcessHeap(), 0, style_name ); - RtlFreeHeap( GetProcessHeap(), 0, full_name ); + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", unix_face->fs.fsCsb[0], unix_face->fs.fsCsb[1], + unix_face->fs.fsUsb[0], unix_face->fs.fsUsb[1], unix_face->fs.fsUsb[2], unix_face->fs.fsUsb[3]); if (num_faces) *num_faces = unix_face->num_faces; unix_face_destroy( unix_face );

1 0

Michael Stefaniuc : oleaut32: Use a string literal for an empty string.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: b32eb7b191f91de7b6dff761aaf4c7da3f21225e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b32eb7b191f91de7b6dff761… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:49 2020 +0100 oleaut32: Use a string literal for an empty string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 98b9762d896..6793de317ac 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6469,7 +6469,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl { WCHAR *p; WCHAR numbuff[256]; - WCHAR empty[] = {'\0'}; + WCHAR empty[] = L""; NUMBERFMTW minFormat; minFormat.NumDigits = 0;

1 0

Michael Stefaniuc : msi: Use a string literal for empty strings.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 17c745a9d253b888366831ce4b9e695297f0dac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c745a9d253b888366831ce… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:52 2020 +0100 msi: Use a string literal for empty strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 6 +++--- dlls/msi/automation.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/source.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ed1d0c8ffcc..cc5d56fdc2b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1269,7 +1269,7 @@ static UINT load_folder_persistence( MSIPACKAGE *package, MSIFOLDER *folder ) static UINT load_folder( MSIRECORD *row, LPVOID param ) { MSIPACKAGE *package = param; - static WCHAR szEmpty[] = {0}; + static WCHAR szEmpty[] = L""; LPWSTR p, tgt_short, tgt_long, src_short, src_long; MSIFOLDER *folder; @@ -5240,14 +5240,14 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) L"ProductID", L"USERNAME", L"COMPANYNAME", - {0}, + L"", }; static const WCHAR szRegKeys[][80] = { L"ProductID", L"RegOwner", L"RegCompany", - {0}, + L"", }; HKEY hkey = 0; LPWSTR buffer, productid = NULL; diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index dc38436e682..80d6b8a66ba 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -781,7 +781,7 @@ static HRESULT summaryinfo_invoke( DATE date; LPWSTR str; - static WCHAR szEmpty[] = {0}; + static WCHAR szEmpty[] = L""; hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 0963c814211..c4c787da4e4 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -324,7 +324,7 @@ static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_co MSIHANDLE patch, info = 0; UINT r, type; DWORD size; - static WCHAR empty[] = {0}; + static WCHAR empty[] = L""; WCHAR *codes = NULL; r = MsiOpenDatabaseW( szPatchPackage, MSIDBOPEN_READONLY, &patch ); @@ -1096,7 +1096,7 @@ static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type ) static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, awstring *szValue, LPDWORD pcchValueBuf) { - static WCHAR empty[] = {0}; + static WCHAR empty[] = L""; MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED; UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; diff --git a/dlls/msi/source.c b/dlls/msi/source.c index b4b3b54fe35..0eed436774a 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -585,7 +585,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, 0, 0, NULL, &size); if (rc != ERROR_SUCCESS) { - static WCHAR szEmpty[] = {0}; + static WCHAR szEmpty[] = L""; rc = ERROR_SUCCESS; source = NULL; ptr = szEmpty;

1 0

Michael Stefaniuc : windowscodecs: Use wide-char string literals in struct initialization.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 780ff81227e5672b19cfb83e4bd3ff577a85c6e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780ff81227e5672b19cfb83e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:45 2020 +0100 windowscodecs: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 4 +--- dlls/windowscodecs/encoder.c | 31 ++++++++++--------------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 342f2c897e8..30b1f361c98 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -77,8 +77,6 @@ typedef struct BmpFrameEncode { BOOL committed; } BmpFrameEncode; -static const WCHAR wszEnableV5Header32bppBGRA[] = {'E','n','a','b','l','e','V','5','H','e','a','d','e','r','3','2','b','p','p','B','G','R','A',0}; - static inline BmpFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) { return CONTAINING_RECORD(iface, BmpFrameEncode, IWICBitmapFrameEncode_iface); @@ -562,7 +560,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, HRESULT hr; static const PROPBAG2 opts[1] = { - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszEnableV5Header32bppBGRA }, + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)L"EnableV5Header32bppBGRA" }, }; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index 869588baec1..8e05048d1df 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -31,28 +31,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); -static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; -static const WCHAR wszPngFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; -static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; -static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; -static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; -static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; -static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; -static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; -static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; -static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; - static const PROPBAG2 encoder_option_properties[ENCODER_OPTION_END] = { - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTiffCompressionMethod }, - { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality }, - { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszImageQuality }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszBitmapTransform }, - { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszLuminance }, - { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszChrominance }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszJpegYCrCbSubsampling }, - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszSuppressApp0 } + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)L"InterlaceOption" }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)L"FilterOption" }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)L"TiffCompressionMethod" }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)L"CompressionQuality" }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)L"ImageQuality" }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)L"BitmapTransform" }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)L"Luminance" }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)L"Chrominance" }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)L"JpegYCrCbSubsampling" }, + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)L"SuppressApp0" } }; typedef struct CommonEncoder {

1 0