- Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Fix _putenv_s return value on error.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: e5c7a6685d6293c5c69b84aea744e0b89697b80a URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c7a6685d6293c5c69b84aea744e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:28:23 2022 +0200 msvcrt: Fix _putenv_s return value on error. (cherry picked from commit 53acb6e736d6feb10b19fd609771ecfa33f7d1e9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/environ.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 5e07fe5e367..5c4db668be3 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -165,17 +165,22 @@ finish: */ int CDECL _putenv_s(const char *name, const char *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_a(name), debugstr_a(value)); - if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; - if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; - - ret = SetEnvironmentVariableA(name, value[0] ? value : NULL) ? 0 : -1; + if (!MSVCRT_CHECK_PMT(name != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableA(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0

Hugh McMaster : conhost: Set correct face name when the specified font is not available.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: a40055a4612c86eaebcd3641bc9bedf46bd18e77 URL: https://gitlab.winehq.org/wine/wine/-/commit/a40055a4612c86eaebcd3641bc9bed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue May 24 23:27:23 2022 +1000 conhost: Set correct face name when the specified font is not available. conhost.exe currently copies the user-specified face name from the LOGFONT structure. This results in an invalid face name when the specified font is not available. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 303f8042f9db508adaca02ef21f8de4992cb9c03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 7ad0d48effd..3a21db3542b 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -675,6 +675,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) struct font_info *font_info = &console->active->font; HFONT font, old_font; TEXTMETRICW tm; + WCHAR face_name[LF_FACESIZE]; CPINFO cpinfo; HDC dc; @@ -700,6 +701,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) old_font = SelectObject( dc, font ); GetTextMetricsW( dc, &tm ); + font_info->face_len = GetTextFaceW( dc, ARRAY_SIZE(face_name), face_name ) - 1; SelectObject( dc, old_font ); ReleaseDC( console->win, dc ); @@ -708,9 +710,8 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ); font_info->face_name = malloc( font_info->face_len * sizeof(WCHAR) ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); + memcpy( font_info->face_name, face_name, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2)

1 0

Claire Girka : winepulse: Fix memory leak in pulse_create_stream in some error cases.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 4ba4c3b0587bab99b71798abd28866ddc2128551 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ba4c3b0587bab99b71798abd28866… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 5 17:13:08 2022 +0200 winepulse: Fix memory leak in pulse_create_stream in some error cases. (cherry picked from commit 32a6380825cc05972a95a8f3138088da3a846203) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 356f68e0db2..9362e2af6b0 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -916,8 +916,8 @@ exit: if (stream->stream) { pa_stream_disconnect(stream->stream); pa_stream_unref(stream->stream); - free(stream); } + free(stream); } pulse_unlock();

1 0

Akihiro Sagawa : mciqtz32: Fix thread handle leak if a second play.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 43688617bb97320e987afa3542780b717c425b91 URL: https://gitlab.winehq.org/wine/wine/-/commit/43688617bb97320e987afa3542780b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 5 21:02:49 2022 +0900 mciqtz32: Fix thread handle leak if a second play. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> (cherry picked from commit de0794a1ddbfaa5bab9728e5d8f956541079c341) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 11 +++++++---- dlls/winmm/tests/mci.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 487a0d820cd..551bf54a25a 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -449,10 +449,13 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms IVideoWindow_put_Visible(wma->vidwin, OATRUE); - wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); - if (!wma->thread) { - TRACE("Can't create thread\n"); - return MCIERR_INTERNAL; + if (!wma->thread) + { + wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); + if (!wma->thread) { + TRACE("Can't create thread\n"); + return MCIERR_INTERNAL; + } } return 0; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index f8bb4c56ac0..69f63279b2f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1336,6 +1336,19 @@ static void test_playWaveTypeMpegvideo(void) err = mciSendStringA("close mysound", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err)); + + /* test a second play */ + err = mciSendStringA("open tempfile.wav type MPEGVideo alias mysound", NULL, 0, NULL); + ok(err==ok_saved,"mci open tempfile.wav type MPEGVideo returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("close mysound", NULL, 0, NULL); + ok(!err,"mci close returned %s\n", dbg_mcierr(err)); } static void test_asyncWaveTypeMpegvideo(HWND hwnd)

1 0

David Kahurani : ieframe: Fix memory leak in open_dde_url.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: f0d48a022b30272b70aa769c032a1496835be185 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0d48a022b30272b70aa769c032a14… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jul 11 19:15:43 2022 +0300 ieframe: Fix memory leak in open_dde_url. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> (cherry picked from commit 6e32c011a2b977246f9ab2282d30b69cff90142b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/iexplore.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 00883c80e77..9dafafa0c3e 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1027,10 +1027,12 @@ static HDDEDATA open_dde_url(WCHAR *dde_url) } hres = IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &urlv, NULL, NULL, NULL, NULL); - if(FAILED(hres)) - return 0; + SysFreeString(V_BSTR(&urlv)); IWebBrowser2_Release(&ie->IWebBrowser2_iface); + + if(FAILED(hres)) + return 0; return ULongToHandle(DDE_FACK); }

1 0

Alex Henrie : user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity).
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: f87e48d6df2817a225b4115df592ab4b10a65ba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f87e48d6df2817a225b4115df592ab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 29 16:37:19 2022 -0600 user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> (cherry picked from commit 001d78a58257b67871924774485ce226f4b87a9c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/mdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 1047b969c17..e8558fe07f5 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -859,7 +859,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); if (!hIcon) hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED); if (hIcon) { HDC hMemDC;

1 0

Kevin Puetz : vbscript: Don't abort when trying to TRACE() functions with many arguments.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 484f3e0ea4516ed8d97c20f13c07b7b501cb7d00 URL: https://gitlab.winehq.org/wine/wine/-/commit/484f3e0ea4516ed8d97c20f13c07b7… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Sep 28 17:53:36 2022 -0500 vbscript: Don't abort when trying to TRACE() functions with many arguments. __wine_dbg_output accumulates the output characters in a debug_info structure, flushing it when it encounters '\n'. If debug_info plus the new string exceed 1024 characters, append_output will print > wine_dbg_output: debugstr buffer overflow and then crash the process via abort(). wine_dbgstr_variant limits the length printed for any individual argument, but a function with multiple parameters can still plausibly exceed 1024. Fixed by formatting the TRACE for each argument on a separate line, as similar places (like oleaut32/typelib.c:dump_DispParms) do. (cherry picked from commit 0fb2d0f04e321100d0e166b804c2898f52be2ce7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d9d1eee741..4ad1cab3ab2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2422,7 +2422,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd heap_pool_init(&exec.heap); - TRACE("%s(", debugstr_w(func->name)); + TRACE("%s args=%u\n", debugstr_w(func->name),func->arg_cnt); if(func->arg_cnt) { VARIANT *v; unsigned i; @@ -2435,7 +2435,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd for(i=0; i < func->arg_cnt; i++) { v = get_arg(dp, i); - TRACE("%s%s", i ? ", " : "", debugstr_variant(v)); + TRACE(" [%d] %s\n", i, debugstr_variant(v)); if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { if(func->args[i].by_ref) exec.args[i] = *v; @@ -2452,7 +2452,6 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd }else { exec.args = NULL; } - TRACE(")\n"); if(func->var_cnt) { exec.vars = heap_alloc_zero(func->var_cnt * sizeof(VARIANT)); diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..05a1fbf1c06 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -748,6 +748,11 @@ Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +function strlength(s1, s2, s3, s4, s5) + strlength = Len(s1 & s2 & s3 & s4 & s5) +end function +Call ok(strlength(String(500, "a"), String(500, "b"), String(500, "c"), String(500, "d"), String(500, "e")) = 500*5, "strlength(...) = 500*5") + sub test_string(cnt, char, exp) call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _ String(cnt, char) & """ expected """ & exp & """")

1 0

Zhiyi Zhang : win32u: Fix a memory leak.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: d75cfe9749008622ea98e54d2292e16820b35e78 URL: https://gitlab.winehq.org/wine/wine/-/commit/d75cfe9749008622ea98e54d2292e1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:19:01 2022 +0800 win32u: Fix a memory leak. The subkey handle is leaked when deleting a GPU entry succeeded. Also, there is no need to restart the enumeration for the grandparent key hkey. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e55515bf5b21580499ee05bee964444be8dc3c3a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/win32u/sysparams.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4c65bd9d7f1..76dd2e77d49 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -673,7 +673,6 @@ static void cleanup_devices(void) hkey = reg_open_key( enum_key, pciW, sizeof(pciW) ); -restart: while (!NtEnumerateKey( hkey, i++, KeyNodeInformation, key, sizeof(buffer), &size )) { unsigned int j = 0; @@ -706,7 +705,7 @@ restart: NtClose( device_key ); if (!present && reg_delete_tree( subkey, bufferW, lstrlenW( bufferW ) * sizeof(WCHAR) )) - goto restart; + j = 0; } NtClose( subkey );

1 0

Torge Matthies : msvcp90: Fix segfault in bad_alloc exception default constructor.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 84692f4c9164b7653f6ac6a3a48a9735ddc9a587 URL: https://gitlab.winehq.org/wine/wine/-/commit/84692f4c9164b7653f6ac6a3a48a97… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Tue Jun 7 10:30:07 2022 +0200 msvcp90: Fix segfault in bad_alloc exception default constructor. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00012d3381c4fdd81d2e9c5fc7de5c74e7740cf9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e5b6018fe31..eaf8121c56a 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -36,7 +36,7 @@ int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; #define EXCEPTION_STR(name) (*name) -#define EXCEPTION_NAME(str) ((exception_name)&str) +#define EXCEPTION_NAME(str) (&str) #else typedef const char *exception_name; #define EXCEPTION_STR(name) (name) @@ -96,7 +96,7 @@ exception* __thiscall exception_copy_ctor(exception *this, const exception *rhs) this->name = rhs->name; this->do_free = FALSE; } else - MSVCP_exception_ctor(this, EXCEPTION_NAME(rhs->name)); + MSVCP_exception_ctor(this, (exception_name)EXCEPTION_NAME(rhs->name)); TRACE("name = %s\n", this->name); return this; } @@ -214,7 +214,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, exception_name name) DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_default_ctor, 4) bad_alloc* __thiscall MSVCP_bad_alloc_default_ctor(bad_alloc *this) { - static const char name[] = "bad allocation"; + static const char *name = "bad allocation"; return MSVCP_bad_alloc_ctor(this, EXCEPTION_NAME(name)); }

1 0

Zhiyi Zhang : win32u: Choose a smaller ppem to avoid exceeding the requested font height.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 047d3f054495e644fdfa28ea91668469918f7a11 URL: https://gitlab.winehq.org/wine/wine/-/commit/047d3f054495e644fdfa28ea916684… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 win32u: Choose a smaller ppem to avoid exceeding the requested font height. When height > 0, CreateFontA/W() should not return a font face exceeding the requested height. For instance, Tahoma has 2049 units of ascent, 423 units of descent and its units per EM square is 2048. When requesting a font 20 pixels in height, ppem = units_per_EM * requested_height / (ascent + descent) = 2048 * 20 / (2049 + 423) = 16.57 ~= 17. When getting the resulting height back from the ppem, resulting_height = (ascent + descent) * ppem / units_per_EM = (2049.0 + 423) * 17 / 2048 = 20.52 ~=21. So it ends up getting a larger font than requested and violates the spec. Fix Nancy Drew: Legend of the Crystal Skull crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 58b477d1581f715d75c2e117ffa9489c6e64a678) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 1 - dlls/win32u/freetype.c | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 18fbf0660d6..5a67cf4fcf0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4032,7 +4032,6 @@ static void test_GetTextMetrics(void) old_hf = SelectObject(hdc, hf); ret = GetTextMetricsA(hdc, &tm); ok(ret, "GetTextMetricsA failed, error %u\n", GetLastError()); - todo_wine ok(tm.tmHeight <= 20, "Got unexpected tmHeight %d\n", tm.tmHeight); SelectObject(hdc, old_hf); DeleteObject(hf); diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 77f4ef8eab3..0879c29b5f9 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1975,10 +1975,18 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) if(height > 0) { USHORT windescent = get_fixed_windescent(pOS2->usWinDescent); + LONG units; + if(pOS2->usWinAscent + windescent == 0) - ppem = pFT_MulDiv(ft_face->units_per_EM, height, pHori->Ascender - pHori->Descender); + units = pHori->Ascender - pHori->Descender; else - ppem = pFT_MulDiv(ft_face->units_per_EM, height, pOS2->usWinAscent + windescent); + units = pOS2->usWinAscent + windescent; + ppem = pFT_MulDiv(ft_face->units_per_EM, height, units); + + /* If rounding ends up getting a font exceeding height, choose a smaller ppem */ + if(ppem > 1 && pFT_MulDiv(units, ppem, ft_face->units_per_EM) > height) + --ppem; + if(ppem > MAX_PPEM) { WARN("Ignoring too large height %d, ppem %d\n", height, ppem); ppem = 1;

1 0