diff options
Diffstat (limited to 'utils/mir_fonts.cpp')
| -rw-r--r-- | utils/mir_fonts.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/utils/mir_fonts.cpp b/utils/mir_fonts.cpp index cb0dba3571..9b8c32cb23 100644 --- a/utils/mir_fonts.cpp +++ b/utils/mir_fonts.cpp @@ -8,7 +8,7 @@ int FontService_RegisterFont(const char *pszDbModule, const char *pszDbName, const wchar_t *pszSection, const wchar_t *pszDescription, const wchar_t *pszBackgroundGroup, const wchar_t *pszBackgroundName, int position, BOOL bAllowEffects, LOGFONT *plfDefault, COLORREF clrDefault) { - FontIDT fid = { 0 }; + FontIDW fid = { 0 }; fid.cbSize = sizeof(fid); mir_strncpy(fid.dbSettingsGroup, pszDbModule, sizeof(fid.dbSettingsGroup)); /* buffer safe */ mir_strncpy(fid.prefix, pszDbName, sizeof(fid.prefix)); /* buffer safe */ @@ -30,38 +30,38 @@ int FontService_RegisterFont(const char *pszDbModule, const char *pszDbName, con fid.deffontsettings.charset = plfDefault->lfCharSet; mir_wstrncpy(fid.deffontsettings.szFace, plfDefault->lfFaceName, _countof(fid.deffontsettings.szFace)); /* buffer safe */ } - FontRegisterT(&fid); + FontRegisterW(&fid); return 0; } int FontService_GetFont(const wchar_t *pszSection, const wchar_t *pszDescription, COLORREF *pclr, LOGFONT *plf) { - FontIDT fid = { 0 }; + FontIDW fid = { 0 }; mir_wstrncpy(fid.group, pszSection, _countof(fid.group)); /* buffer sfae */ mir_wstrncpy(fid.name, pszDescription, _countof(fid.name)); /* buffer safe */ - *pclr = (COLORREF)CallService(MS_FONT_GETT, (WPARAM)&fid, (LPARAM)plf); /* uses fallback font on error */ + *pclr = (COLORREF)CallService(MS_FONT_GETW, (WPARAM)&fid, (LPARAM)plf); /* uses fallback font on error */ return (int)*pclr == -1; } int FontService_RegisterColor(const char *pszDbModule, const char *pszDbName, const wchar_t *pszSection, const wchar_t *pszDescription, COLORREF clrDefault) { - ColourIDT cid = { 0 }; + ColourIDW cid = { 0 }; cid.cbSize = sizeof(cid); cid.defcolour = clrDefault; mir_strncpy(cid.dbSettingsGroup, pszDbModule, sizeof(cid.dbSettingsGroup)); /* buffer safe */ mir_strncpy(cid.setting, pszDbName, sizeof(cid.setting)); /* buffer safe */ mir_wstrncpy(cid.group, pszSection, _countof(cid.group)); /* buffer safe */ mir_wstrncpy(cid.name, pszDescription, _countof(cid.name)); /* buffer safe */ - ColourRegisterT(&cid); + ColourRegisterW(&cid); return 0; } int FontService_GetColor(const wchar_t *pszSection, const wchar_t *pszDescription, COLORREF *pclr) { - ColourIDT cid = { 0 }; + ColourIDW cid = { 0 }; cid.cbSize = sizeof(cid); wcsncpy_s(cid.group, pszSection, _TRUNCATE); wcsncpy_s(cid.name, pszDescription, _TRUNCATE); - *pclr = (COLORREF)CallService(MS_COLOUR_GETT, (WPARAM)&cid, 0); + *pclr = (COLORREF)CallService(MS_COLOUR_GETW, (WPARAM)&cid, 0); return (int)*pclr == -1; } |