Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2025-12-14 16:34:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a potential bug: reserve key when creating logfont by calling CreateLogFontIndirect

Browse Source
This commit is contained in:
Vincent Wei
2019-01-19 14:04:11 +08:00
parent 21ac9f2def
commit bbf2376f7a
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile.sa
View File

@@ -38,7 +38,7 @@ PROJECT_NAME = "MiniGUI API Reference (MiniGUI-Standalone)"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = v3.2.0
PROJECT_NUMBER = v3.4.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

2
include/gdi.h
View File

@@ -6624,7 +6624,7 @@ MG_EXPORT void GUIAPI TermVectorialFonts (void);
* size expected.
* \param rotation The rotation of the logical font, it is in units of
* tenth degrees. Note that you can specify rotation only for
* TrueType and Adobe Type1 fonts.
* vector fonts (use FreeType2 font engine).
* \return The pointer to the logical font created, NULL on error.
*
* \sa CreateLogFontIndirect, CreateLogFontByName, SelectFont

27
src/font/logfont.c
View File

@@ -72,7 +72,7 @@ static PLOGFONT gdiCreateLogFont (const char* type, const char* family,
{
PLOGFONT log_font;
int sbc_value, mbc_value = 0;
char dev_family [LEN_LOGFONT_NAME_FIELD + 1];
char dev_name_field [LEN_LOGFONT_NAME_FIELD + 1];
DEVFONT* sbc_devfont, *mbc_devfont;
// is valid style?
@@ -138,8 +138,7 @@ static PLOGFONT gdiCreateLogFont (const char* type, const char* family,
/*check if sbc_devfont and mbc_devfont support rotation*/
if (get_rotation(log_font, sbc_devfont, rotation) == rotation
&& (!mbc_devfont ||
get_rotation(log_font, mbc_devfont, rotation) == rotation))
&& (!mbc_devfont || get_rotation(log_font, mbc_devfont, rotation) == rotation))
log_font->rotation = rotation;
else
log_font->rotation = 0;
@@ -163,25 +162,25 @@ static PLOGFONT gdiCreateLogFont (const char* type, const char* family,
/*reset type name of logfont*/
if (log_font->mbc_devfont) {
fontGetTypeNameFromName (log_font->mbc_devfont->name, dev_family);
strncpy (log_font->type, dev_family, LEN_LOGFONT_NAME_FIELD);
fontGetTypeNameFromName (log_font->mbc_devfont->name, dev_name_field);
strncpy (log_font->type, dev_name_field, LEN_LOGFONT_NAME_FIELD);
log_font->type[LEN_LOGFONT_NAME_FIELD] = '\0';
}
else {
fontGetTypeNameFromName (log_font->sbc_devfont->name, dev_family);
strncpy (log_font->type, dev_family, LEN_LOGFONT_NAME_FIELD);
fontGetTypeNameFromName (log_font->sbc_devfont->name, dev_name_field);
strncpy (log_font->type, dev_name_field, LEN_LOGFONT_NAME_FIELD);
log_font->type[LEN_LOGFONT_NAME_FIELD] = '\0';
}
/*reset family name of logfont*/
if (log_font->mbc_devfont) {
fontGetFamilyFromName (log_font->mbc_devfont->name, dev_family);
strncpy (log_font->family, dev_family, LEN_LOGFONT_NAME_FIELD);
fontGetFamilyFromName (log_font->mbc_devfont->name, dev_name_field);
strncpy (log_font->family, dev_name_field, LEN_LOGFONT_NAME_FIELD);
log_font->family [LEN_LOGFONT_NAME_FIELD] = '\0';
}
else {
fontGetFamilyFromName (log_font->sbc_devfont->name, dev_family);
strncpy (log_font->family, dev_family, LEN_LOGFONT_NAME_FIELD);
fontGetFamilyFromName (log_font->sbc_devfont->name, dev_name_field);
strncpy (log_font->family, dev_name_field, LEN_LOGFONT_NAME_FIELD);
log_font->family [LEN_LOGFONT_NAME_FIELD] = '\0';
}
@@ -261,10 +260,14 @@ PLOGFONT GUIAPI CreateLogFontIndirect (LOGFONT *logfont)
if (!logfont) return NULL;
if ((font = malloc (sizeof (LOGFONT))) == NULL)
// VincentWei: make sure the logfont has the key for resource manager.
//if ((font = malloc (sizeof (LOGFONT))) == NULL)
if ((font = (PLOGFONT)malloc (sizeof (FONT_RES))) == NULL)
return INV_LOGFONT;
// VincentWei: make sure the logfont has an invalid key for resource manager.
memcpy (font, logfont, sizeof(LOGFONT));
((FONT_RES *)font)->key = -1;
sbc_devfont = logfont->sbc_devfont;
if (sbc_devfont->font_ops->new_instance)