October 2020 - Wine-commits

Nikolay Sivov : evr/mixer: Ignore draining command.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: c1e57ea291d179c210559c8ff3d6952e775df592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e57ea291d179c210559c8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:31 2020 +0300 evr/mixer: Ignore draining command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++++ dlls/evr/tests/evr.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 1b77afac5b2..28361255fe1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -965,6 +965,10 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, LeaveCriticalSection(&mixer->cs); break; + + case MFT_MESSAGE_COMMAND_DRAIN: + break; + default: WARN("Message not handled %d.\n", message); hr = E_NOTIMPL; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 182280d0a39..d71a63ff602 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2171,6 +2171,9 @@ todo_wine hr = IMFTransform_ProcessInput(mixer, 5, sample, 0); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_DRAIN, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFSample_Release(sample); IDirect3DSurface9_Release(surface);

1 0

Nikolay Sivov : evr/mixer: Drop input samples on flush.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: e2a4b8a56338bd6a598e0e77aa74487abd32f387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a4b8a56338bd6a598e0e77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:32 2020 +0300 evr/mixer: Drop input samples on flush. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 28361255fe1..5ea1b9aa22b 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -949,6 +949,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, { struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = S_OK; + unsigned int i; TRACE("%p, %u, %#lx.\n", iface, message, param); @@ -966,6 +967,23 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, break; + case MFT_MESSAGE_COMMAND_FLUSH: + + EnterCriticalSection(&mixer->cs); + + for (i = 0; i < mixer->input_count; ++i) + { + if (mixer->inputs[i].sample) + { + IMFSample_Release(mixer->inputs[i].sample); + mixer->inputs[i].sample = NULL; + } + } + + LeaveCriticalSection(&mixer->cs); + + break; + case MFT_MESSAGE_COMMAND_DRAIN: break;

1 0

Nikolay Sivov : evr/mixer: Maintain streaming state flag.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 14003b00f53efc6e36e1f9de8247c4067ede196e URL: https://source.winehq.org/git/wine.git/?a=commit;h=14003b00f53efc6e36e1f9de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:33 2020 +0300 evr/mixer: Maintain streaming state flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 5ea1b9aa22b..55acf179bdc 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -89,6 +89,7 @@ struct video_mixer IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + unsigned int is_streaming; COLORREF bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; @@ -984,6 +985,17 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, break; + case MFT_MESSAGE_NOTIFY_BEGIN_STREAMING: + case MFT_MESSAGE_NOTIFY_END_STREAMING: + + EnterCriticalSection(&mixer->cs); + + mixer->is_streaming = message == MFT_MESSAGE_NOTIFY_BEGIN_STREAMING; + + LeaveCriticalSection(&mixer->cs); + + break; + case MFT_MESSAGE_COMMAND_DRAIN: break; @@ -1016,6 +1028,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DW hr = MF_E_NOTACCEPTING; else { + mixer->is_streaming = 1; input->sample = sample; IMFSample_AddRef(input->sample); }

1 0

Nikolay Sivov : comsvcs/tests: Close test thread handles.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: c650ec93efb423adf7d9cf3326b0f9d999b9ffcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c650ec93efb423adf7d9cf33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:50:44 2020 +0300 comsvcs/tests: Close test thread handles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 4e9471e7343..f0cf0d8543f 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -197,6 +197,7 @@ static void create_dispenser(void) ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); + CloseHandle(thread); init_test_driver(&driver); @@ -210,6 +211,7 @@ static void create_dispenser(void) ok(!WaitForSingleObject(thread, 20000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); + CloseHandle(thread); hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder2); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Hans Leidekker : bcrypt: Use internal helpers to generate hashes.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: a6e589bc52f4ffc80021e38c49ef2355b9479695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e589bc52f4ffc80021e38c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 09:56:39 2020 +0200 bcrypt: Use internal helpers to generate hashes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 171 ++++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6e589bc52f4ffc80021…

1 0

Alexandre Julliard : gdi32: Move the realized font handle allocation out of freetype.c.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: d7a54394d469480e4a5e7a8b3359f0e3b32515ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7a54394d469480e4a5e7a8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 10:59:51 2020 +0200 gdi32: Move the realized font handle allocation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 88 +++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 101 ++++------------------------------------------- dlls/gdi32/gdi_private.h | 5 ++- 3 files changed, 95 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7a54394d469480e4a5e…

1 0

Alexandre Julliard : gdi32: Move the font cache list out of freetype.c.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 82c140f1a6bc5b8f5f517c7771ffd5d78ec9b89d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c140f1a6bc5b8f5f517c77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:01:50 2020 +0200 gdi32: Move the font cache list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 107 ++++++++++++++++++++++- dlls/gdi32/freetype.c | 220 ++++++++++------------------------------------- dlls/gdi32/gdi_private.h | 22 ++++- 3 files changed, 168 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82c140f1a6bc5b8f5f51…

1 0

Alexandre Julliard : gdi32: Move the font file information out of freetype.c.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: d26462b52a1042b1bfaaf10bd8e0cb18ddd12cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26462b52a1042b1bfaaf10b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:02:48 2020 +0200 gdi32: Move the font file information out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 39 ++++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 49 +----------------------------------------------- dlls/gdi32/gdi_private.h | 12 ++---------- 3 files changed, 40 insertions(+), 60 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c472636035..44f159c03ef 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -422,9 +422,37 @@ void free_gdi_font( struct gdi_font *font ) { if (font->private) font_funcs->destroy_font( font ); free_font_handle( font->handle ); + HeapFree( GetProcessHeap(), 0, font->fileinfo ); HeapFree( GetProcessHeap(), 0, font ); } +/* Undocumented structure filled in by GetFontFileInfo */ +struct font_fileinfo +{ + FILETIME writetime; + LARGE_INTEGER size; + WCHAR path[1]; +}; + +void set_gdi_font_file_info( struct gdi_font *font, const WCHAR *file, SIZE_T data_size ) +{ + WIN32_FILE_ATTRIBUTE_DATA info; + int len = 0; + + if (file) len = strlenW( file ); + if (!(font->fileinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + offsetof( struct font_fileinfo, path[len + 1] )))) + return; + + if (file && GetFileAttributesExW( file, GetFileExInfoStandard, &info )) + { + font->fileinfo->writetime = info.ftLastWriteTime; + font->fileinfo->size.QuadPart = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; + strcpyW( font->fileinfo->path, file ); + } + else font->fileinfo->size.QuadPart = data_size; +} + /* font cache */ static struct list gdi_font_list = LIST_INIT( gdi_font_list ); @@ -5179,12 +5207,19 @@ BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_filei if (!needed) needed = &required_size; - if (!font_funcs || !font) + if (!font) { *needed = 0; return FALSE; } - return font_funcs->pGetFontFileInfo( font, unknown, info, size, needed ); + *needed = sizeof(*info) + strlenW( font->fileinfo->path ) * sizeof(WCHAR); + if (*needed > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + memcpy( info, font->fileinfo, *needed ); + return TRUE; } struct realization_info diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4fa88b960d0..1484260fa07 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -350,7 +350,6 @@ struct tagGdiFont { VOID *GSUB_Table; const VOID *vert_feature; ULONG ttc_item_offset; /* 0 if font is not a part of TrueType collection */ - struct font_fileinfo *fileinfo; }; static inline GdiFont *get_font_ptr( struct gdi_font *font ) { return font->private; } @@ -4112,7 +4111,6 @@ static void CDECL freetype_destroy_font( struct gdi_font *gdi_font ) HeapFree(GetProcessHeap(), 0, child); } - HeapFree(GetProcessHeap(), 0, font->fileinfo); if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); HeapFree(GetProcessHeap(), 0, font->kern_pairs); @@ -4767,30 +4765,6 @@ static const VOID * get_GSUB_vert_feature(const GdiFont *font) return feature; } -static void fill_fileinfo_from_face( GdiFont *font, Face *face ) -{ - WIN32_FILE_ATTRIBUTE_DATA info; - int len; - - if (!face->file) - { - font->fileinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo)); - font->fileinfo->size.QuadPart = face->font_data_size; - return; - } - - len = strlenW(face->file); - font->fileinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); - if (GetFileAttributesExW(face->file, GetFileExInfoStandard, &info)) - { - font->fileinfo->writetime = info.ftLastWriteTime; - font->fileinfo->size.QuadPart = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; - strcpyW(font->fileinfo->path, face->file); - } - else - memset(font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); -} - /************************************************************* * freetype_SelectFont */ @@ -5183,7 +5157,7 @@ found_face: goto done; } - fill_fileinfo_from_face( ret, face ); + set_gdi_font_file_info( gdi_font, face->file, face->font_data_size ); ret->ntmFlags = face->ntmFlags; pick_charmap( ret->ft_face, ret->charset ); @@ -7968,26 +7942,6 @@ static BOOL CDECL freetype_GetFontFileData( struct gdi_font *gdi_font, DWORD unk return get_font_data( font, tag, offset, buff, buff_size ) != 0; } -/************************************************************************* - * freetype_GetFontFileInfo - */ -static BOOL CDECL freetype_GetFontFileInfo( struct gdi_font *gdi_font, DWORD unknown, - struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ) -{ - const GdiFont *font = get_font_ptr( gdi_font ); - - *needed = sizeof(*info) + strlenW(font->fileinfo->path) * sizeof(WCHAR); - if (*needed > size) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - /* path is included too */ - memcpy(info, font->fileinfo, *needed); - return TRUE; -} - /************************************************************************* * Kerning support for TrueType fonts */ @@ -8261,7 +8215,6 @@ static const struct font_backend_funcs font_funcs = freetype_AddFontMemResourceEx, freetype_CreateScalableFontResource, freetype_GetFontFileData, - freetype_GetFontFileInfo, freetype_alloc_font, freetype_destroy_font }; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7d15904fd51..09526eed499 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -301,14 +301,6 @@ struct char_width_info INT unk; /* unknown */ }; -/* Undocumented structure filled in by GetFontFileInfo */ -struct font_fileinfo -{ - FILETIME writetime; - LARGE_INTEGER size; - WCHAR path[1]; -}; - typedef struct { FLOAT eM11, eM12, eM21, eM22; } FMAT2; struct gdi_font @@ -324,6 +316,7 @@ struct gdi_font LOGFONTW lf; FMAT2 matrix; BOOL can_use_bitmap; + struct font_fileinfo *fileinfo; }; struct font_backend_funcs @@ -356,8 +349,6 @@ struct font_backend_funcs LPCWSTR font_file, LPCWSTR font_path ); BOOL (CDECL *pGetFontFileData)( struct gdi_font *font, DWORD unknown, UINT64 offset, void *buff, DWORD buff_size ); - BOOL (CDECL *pGetFontFileInfo)( struct gdi_font *font, DWORD unknown, - struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ); BOOL (CDECL *alloc_font)( struct gdi_font *font ); void (CDECL *destroy_font)( struct gdi_font *font ); @@ -368,6 +359,7 @@ extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *matrix, BOOL can_use_bitmap ) DECLSPEC_HIDDEN; +extern void set_gdi_font_file_info( struct gdi_font *font, const WCHAR *file, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void font_init(void) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alexandre Julliard : gdi32: Move the font name information out of freetype.c.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: ecba0d2bbbf38f964dc3db5eac27cffaa26fec31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecba0d2bbbf38f964dc3db5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:03:51 2020 +0200 gdi32: Move the font name information out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- dlls/gdi32/freetype.c | 49 +++++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 3 ++- 3 files changed, 42 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecba0d2bbbf38f964dc3…

1 0

Alexandre Julliard : gdi32: Move the font charset information out of freetype.c.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 6c94c0b04f35f58828c2edc02db12a490a99e440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c94c0b04f35f58828c2edc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:04:35 2020 +0200 gdi32: Move the font charset information out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 ++- dlls/gdi32/freetype.c | 53 +++++++++++++++++++----------------------------- dlls/gdi32/gdi_private.h | 4 +++- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 486936393b2..d3606d405b2 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1047,7 +1047,8 @@ static UINT CDECL font_GetTextCharsetInfo( PHYSDEV dev, FONTSIGNATURE *fs, DWORD dev = GET_NEXT_PHYSDEV( dev, pGetTextCharsetInfo ); return dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); } - return font_funcs->pGetTextCharsetInfo( physdev->font, fs, flags ); + if (fs) *fs = physdev->font->fs; + return physdev->font->charset; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c5b91d39438..8ebea2616c4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -330,8 +330,6 @@ struct tagGdiFont { /* the following members can be accessed without locking, they are never modified after creation */ FT_Face ft_face; struct font_mapping *mapping; - int charset; - int codepage; BOOL fake_italic; BOOL fake_bold; BYTE underline; @@ -344,7 +342,6 @@ struct tagGdiFont { DWORD ntmFlags; DWORD aa_flags; UINT ntmCellHeight, ntmAvgWidth; - FONTSIGNATURE fs; GdiFont *base_font; VOID *GSUB_Table; const VOID *vert_feature; @@ -4032,7 +4029,7 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) } -static int get_nearest_charset(const WCHAR *family_name, Face *face, int *cp) +static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) { /* Only get here if lfCharSet == DEFAULT_CHARSET or we couldn't find a single face with the requested charset. The idea is to check if @@ -4407,8 +4404,8 @@ static BOOL create_child_font_list(GdiFont *font) * if not SYMBOL or OEM then we also get all the fonts for Microsoft * Sans Serif. This is how asian windows get default fallbacks for fonts */ - if (is_dbcs_ansi_cp(GetACP()) && font->charset != SYMBOL_CHARSET && - font->charset != OEM_CHARSET && + if (is_dbcs_ansi_cp(GetACP()) && gdi_font->charset != SYMBOL_CHARSET && + gdi_font->charset != OEM_CHARSET && strcmpiW(font_name,szDefaultFallbackLink) != 0) { font_link = find_font_link(szDefaultFallbackLink); @@ -4702,7 +4699,7 @@ static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GS return NULL; } -static const char* get_opentype_script(const GdiFont *font) +static const char* get_opentype_script(const struct gdi_font *font) { /* * I am not sure if this is the correct way to generate our script tag @@ -4741,7 +4738,7 @@ static const VOID * get_GSUB_vert_feature(const GdiFont *font) header = font->GSUB_Table; - script = GSUB_get_script_table(header, get_opentype_script(font)); + script = GSUB_get_script_table(header, get_opentype_script(font->gdi_font)); if (!script) { TRACE("Script not found\n"); @@ -5094,14 +5091,14 @@ found: found_face: height = lf.lfHeight; - ret->fs = face->fs; + gdi_font->fs = face->fs; if(csi.fs.fsCsb[0]) { - ret->charset = lf.lfCharSet; - ret->codepage = csi.ciACP; + gdi_font->charset = lf.lfCharSet; + gdi_font->codepage = csi.ciACP; } else - ret->charset = get_nearest_charset( family->family_name, face, &ret->codepage ); + gdi_font->charset = get_nearest_charset( family->family_name, face, &gdi_font->codepage ); TRACE( "Chosen: %s (%s/%p:%ld)\n", debugstr_w(face->full_name), debugstr_w(face->file), face->font_data_ptr, face->face_index ); @@ -5159,7 +5156,7 @@ found_face: set_gdi_font_file_info( gdi_font, face->file, face->font_data_size ); ret->ntmFlags = face->ntmFlags; - pick_charmap( ret->ft_face, ret->charset ); + pick_charmap( ret->ft_face, gdi_font->charset ); ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0; set_gdi_font_name( gdi_font, psub ? psub->from.name : family->family_name ); @@ -5728,6 +5725,7 @@ static FT_UInt get_glyph_index_symbol(const GdiFont *font, UINT glyph) static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) { + struct gdi_font *gdi_font = font->gdi_font; FT_UInt ret; WCHAR wc; char buf; @@ -5739,13 +5737,13 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) default_used_pointer = NULL; default_used = FALSE; - if (codepage_sets_default_used(font->codepage)) + if (codepage_sets_default_used(gdi_font->codepage)) default_used_pointer = &default_used; wc = (WCHAR)glyph; - if (!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || + if (!WideCharToMultiByte(gdi_font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) { - if (font->codepage == CP_SYMBOL) + if (gdi_font->codepage == CP_SYMBOL) { ret = get_glyph_index_symbol(font, glyph); if (!ret) @@ -5781,6 +5779,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) /* helper for freetype_GetGlyphIndices */ static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) { + struct gdi_font *gdi_font = font->gdi_font; WCHAR wc = (WCHAR)glyph; BOOL default_used = FALSE; BOOL *default_used_pointer = NULL; @@ -5790,12 +5789,12 @@ static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) if(font->ft_face->charmap->encoding != FT_ENCODING_NONE) return get_glyph_index(font, glyph); - if (codepage_sets_default_used(font->codepage)) + if (codepage_sets_default_used(gdi_font->codepage)) default_used_pointer = &default_used; - if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) + if(!WideCharToMultiByte(gdi_font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) { - if (font->codepage == CP_SYMBOL && wc < 0x100) + if (gdi_font->codepage == CP_SYMBOL && wc < 0x100) ret = (unsigned char)wc; else ret = 0; @@ -6961,6 +6960,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, static BOOL get_bitmap_text_metrics(GdiFont *font) { + struct gdi_font *gdi_font = font->gdi_font; FT_Face ft_face = font->ft_face; FT_WinFNT_HeaderRec winfnt_header; const DWORD size = offsetof(OUTLINETEXTMETRICW, otmFiller); @@ -7013,7 +7013,7 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) TM.tmStruckOut = font->strikeout; /* NB inverted meaning of TMPF_FIXED_PITCH */ TM.tmPitchAndFamily = FT_IS_FIXED_WIDTH(ft_face) ? 0 : TMPF_FIXED_PITCH; - TM.tmCharSet = font->charset; + TM.tmCharSet = gdi_font->charset; } if(font->fake_bold) @@ -7398,7 +7398,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) TM.tmPitchAndFamily |= TMPF_TRUETYPE; } - TM.tmCharSet = font->charset; + TM.tmCharSet = gdi_font->charset; font->potm->otmFiller = 0; memcpy(&font->potm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); @@ -7772,16 +7772,6 @@ static DWORD CDECL freetype_GetFontData( struct gdi_font *font, DWORD table, DWO return get_font_data( get_font_ptr(font), table, offset, buf, cbData ); } -/************************************************************* - * freetype_GetTextCharsetInfo - */ -static UINT CDECL freetype_GetTextCharsetInfo( struct gdi_font *gdi_font, LPFONTSIGNATURE fs, DWORD flags ) -{ - GdiFont *font = get_font_ptr(gdi_font); - if (fs) *fs = font->fs; - return font->charset; -} - /* Retrieve a list of supported Unicode ranges for a given font. * Can be called with NULL gs to calculate the buffer size. Returns * the number of ranges found. @@ -8190,7 +8180,6 @@ static const struct font_backend_funcs font_funcs = freetype_GetGlyphOutline, freetype_GetKerningPairs, freetype_GetOutlineTextMetrics, - freetype_GetTextCharsetInfo, freetype_GetTextExtentExPoint, freetype_GetTextExtentExPointI, freetype_GetTextMetrics, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b34131698ed..40b231004b8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -313,6 +313,9 @@ struct gdi_font DWORD handle; DWORD cache_num; DWORD hash; + UINT charset; + UINT codepage; + FONTSIGNATURE fs; LOGFONTW lf; FMAT2 matrix; BOOL can_use_bitmap; @@ -336,7 +339,6 @@ struct font_backend_funcs GLYPHMETRICS *gm, DWORD buflen, void *buf, const MAT2 *mat ); DWORD (CDECL *pGetKerningPairs)( struct gdi_font *font, DWORD count, KERNINGPAIR *pairs ); UINT (CDECL *pGetOutlineTextMetrics)( struct gdi_font *font, UINT size, OUTLINETEXTMETRICW *metrics ); - UINT (CDECL *pGetTextCharsetInfo)( struct gdi_font *font, FONTSIGNATURE *fs, DWORD flags ); BOOL (CDECL *pGetTextExtentExPoint)( struct gdi_font *font, LPCWSTR wstr, INT count, INT *dxs ); BOOL (CDECL *pGetTextExtentExPointI)( struct gdi_font *font, const WORD *indices, INT count, INT *dxs ); BOOL (CDECL *pGetTextMetrics)( struct gdi_font *font, TEXTMETRICW *metrics );

1 0