summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-22 13:32:41 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-22 13:32:41 -0800
commit14b8cbe2b6ff8723cd734c5bd067121d12e5087f (patch)
treee5ff93ecc3f540c5f7a865f18a126d2036f16b85 /xfa
parenta846215ad29b75670d9db4cb9225de9f1e6979b8 (diff)
downloadpdfium-14b8cbe2b6ff8723cd734c5bd067121d12e5087f.tar.xz
Fix remaining FX_memsets in windows
TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1723693002 .
Diffstat (limited to 'xfa')
-rw-r--r--xfa/src/fgas/src/font/fx_gdifont.cpp6
-rw-r--r--xfa/src/fgas/src/font/fx_stdfontmgr.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/xfa/src/fgas/src/font/fx_gdifont.cpp b/xfa/src/fgas/src/font/fx_gdifont.cpp
index 25365dd2a3..10e3e09943 100644
--- a/xfa/src/fgas/src/font/fx_gdifont.cpp
+++ b/xfa/src/fgas/src/font/fx_gdifont.cpp
@@ -102,7 +102,7 @@ CFX_GdiFont::CFX_GdiFont(IFX_FontMgr* pFontMgr)
m_FontMapper(16),
m_FontCache(FX_GDIFONT_FONTCACHESIZE) {
m_hDC = ::CreateCompatibleDC(NULL);
- FX_memset(&m_LogFont, 0, sizeof(m_LogFont));
+ FXSYS_memset(&m_LogFont, 0, sizeof(m_LogFont));
FXSYS_assert(m_hDC != NULL);
}
CFX_GdiFont::~CFX_GdiFont() {
@@ -163,7 +163,7 @@ FX_BOOL CFX_GdiFont::LoadFont(const FX_WCHAR* pszFontFamily,
FX_WORD wCodePage) {
FXSYS_assert(m_hFont == NULL);
LOGFONTW lf;
- FX_memset(&lf, 0, sizeof(lf));
+ FXSYS_memset(&lf, 0, sizeof(lf));
lf.lfHeight = -1000;
lf.lfWeight = (dwFontStyles & FX_FONTSTYLE_Bold) ? FW_BOLD : FW_NORMAL;
lf.lfItalic = (dwFontStyles & FX_FONTSTYLE_Italic) != 0;
@@ -287,7 +287,7 @@ int32_t CFX_GdiFont::GetFontFamilies(Gdiplus::FontCollection& fc) {
}
void CFX_GdiFont::RetrieveFontStyles() {
FXSYS_assert(m_hFont != NULL);
- FX_memset(&m_LogFont, 0, sizeof(m_LogFont));
+ FXSYS_memset(&m_LogFont, 0, sizeof(m_LogFont));
::GetObjectW(m_hFont, sizeof(m_LogFont), &m_LogFont);
m_dwStyles = FX_GetGdiFontStyles(m_LogFont);
}
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
index e645666616..3f1c59e2cc 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
@@ -327,7 +327,7 @@ FX_LPCFONTDESCRIPTOR CFX_StdFontMgrImp::FindFont(const FX_WCHAR* pszFontFamily,
return NULL;
}
FX_FONTMATCHPARAMS params;
- FX_memset(&params, 0, sizeof(params));
+ FXSYS_memset(&params, 0, sizeof(params));
params.dwUSB = dwUSB;
params.wUnicode = wUnicode;
params.wCodePage = wCodePage;
@@ -472,8 +472,8 @@ static int32_t CALLBACK FX_GdiFontEnumProc(ENUMLOGFONTEX* lpelfe,
pFont->dwFontStyles = FX_GetGdiFontStyles(lf);
FXSYS_wcsncpy(pFont->wsFontFace, (const FX_WCHAR*)lf.lfFaceName, 31);
pFont->wsFontFace[31] = 0;
- FX_memcpy(&pFont->FontSignature, &lpntme->ntmFontSig,
- sizeof(lpntme->ntmFontSig));
+ FXSYS_memcpy(&pFont->FontSignature, &lpntme->ntmFontSig,
+ sizeof(lpntme->ntmFontSig));
((CFX_FontDescriptors*)lParam)->Add(*pFont);
FX_Free(pFont);
return 1;
@@ -484,7 +484,7 @@ static void FX_EnumGdiFonts(CFX_FontDescriptors& fonts,
FX_WCHAR wUnicode) {
HDC hDC = ::GetDC(NULL);
LOGFONTW lfFind;
- FX_memset(&lfFind, 0, sizeof(lfFind));
+ FXSYS_memset(&lfFind, 0, sizeof(lfFind));
lfFind.lfCharSet = DEFAULT_CHARSET;
if (pwsFaceName) {
FXSYS_wcsncpy((FX_WCHAR*)lfFind.lfFaceName, pwsFaceName, 31);