Drop FXSYS_ from mem methods

This Cl drops the FXSYS_ from mem methods which are the same on all
platforms.

Bug: pdfium:694
Change-Id: I9d5ae905997dbaaec5aa0b2ae4c07358ed9c6236
Reviewed-on: https://pdfium-review.googlesource.com/3613
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

14 files changed, 50 insertions, 54 deletions

diff --git a/xfa/fde/cfde_txtedtbuf.cpp b/xfa/fde/cfde_txtedtbuf.cpp
index ba9f5cdca0..dc88704a6c 100644
--- a/xfa/fde/cfde_txtedtbuf.cpp
+++ b/xfa/fde/cfde_txtedtbuf.cpp
@@ -53,8 +53,7 @@ void CFDE_TxtEdtBuf::SetText(const CFX_WideString& wsText) {
     }
 
     ChunkHeader* chunk = m_chunks[i].get();
-    FXSYS_memcpy(chunk->wChars.get(), lpSrcBuf,
-                 nCopyedLength * sizeof(wchar_t));
+    memcpy(chunk->wChars.get(), lpSrcBuf, nCopyedLength * sizeof(wchar_t));
     nLeave -= nCopyedLength;
     lpSrcBuf += nCopyedLength;
     chunk->nUsed = nCopyedLength;
@@ -108,7 +107,7 @@ CFX_WideString CFDE_TxtEdtBuf::GetRange(int32_t nBegin, int32_t nLength) const {
     if (nLeave <= nCopyLength) {
       nCopyLength = nLeave;
     }
-    FXSYS_memcpy(lpDstBuf, lpSrcBuf, nCopyLength * sizeof(wchar_t));
+    memcpy(lpDstBuf, lpSrcBuf, nCopyLength * sizeof(wchar_t));
     nChunkIndex++;
     if (nChunkIndex >= nCount) {
       break;
@@ -141,8 +140,8 @@ void CFDE_TxtEdtBuf::Insert(int32_t nPos,
     ChunkHeader* chunk = m_chunks[chunkIndex].get();
     int32_t nCopy = chunk->nUsed - charIndex;
 
-    FXSYS_memcpy(newChunk->wChars.get(), chunk->wChars.get() + charIndex,
-                 nCopy * sizeof(wchar_t));
+    memcpy(newChunk->wChars.get(), chunk->wChars.get() + charIndex,
+           nCopy * sizeof(wchar_t));
     chunk->nUsed -= nCopy;
     chunkIndex++;
 
@@ -157,8 +156,8 @@ void CFDE_TxtEdtBuf::Insert(int32_t nPos,
       chunkIndex--;
       int32_t nFree = GetChunkSize() - chunk->nUsed;
       int32_t nCopy = std::min(nLengthTemp, nFree);
-      FXSYS_memcpy(chunk->wChars.get() + chunk->nUsed, lpText,
-                   nCopy * sizeof(wchar_t));
+      memcpy(chunk->wChars.get() + chunk->nUsed, lpText,
+             nCopy * sizeof(wchar_t));
       lpText += nCopy;
       nLengthTemp -= nCopy;
       chunk->nUsed += nCopy;
@@ -170,7 +169,7 @@ void CFDE_TxtEdtBuf::Insert(int32_t nPos,
     auto chunk = NewChunk();
 
     int32_t nCopy = std::min(nLengthTemp, GetChunkSize());
-    FXSYS_memcpy(chunk->wChars.get(), lpText, nCopy * sizeof(wchar_t));
+    memcpy(chunk->wChars.get(), lpText, nCopy * sizeof(wchar_t));
     lpText += nCopy;
     nLengthTemp -= nCopy;
     chunk->nUsed = nCopy;
@@ -193,9 +192,8 @@ void CFDE_TxtEdtBuf::Delete(int32_t nIndex, int32_t nLength) {
   int32_t nMovePart = chunk->nUsed - nFirstPart;
   if (nMovePart != 0) {
     int32_t nDelete = std::min(nFirstPart, nLength);
-    FXSYS_memmove(chunk->wChars.get() + nFirstPart - nDelete,
-                  chunk->wChars.get() + nFirstPart,
-                  nMovePart * sizeof(wchar_t));
+    memmove(chunk->wChars.get() + nFirstPart - nDelete,
+            chunk->wChars.get() + nFirstPart, nMovePart * sizeof(wchar_t));
     chunk->nUsed -= nDelete;
     nLength -= nDelete;
     endChunkIndex--;
diff --git a/xfa/fde/cfde_txtedtdorecord_insert.cpp b/xfa/fde/cfde_txtedtdorecord_insert.cpp
index 0e3f9218dd..fe79960ebc 100644
--- a/xfa/fde/cfde_txtedtdorecord_insert.cpp
+++ b/xfa/fde/cfde_txtedtdorecord_insert.cpp
@@ -17,7 +17,7 @@ CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(
     : m_pEngine(pEngine), m_nCaret(nCaret) {
   ASSERT(pEngine);
   wchar_t* lpBuffer = m_wsInsert.GetBuffer(nLength);
-  FXSYS_memcpy(lpBuffer, lpText, nLength * sizeof(wchar_t));
+  memcpy(lpBuffer, lpText, nLength * sizeof(wchar_t));
   m_wsInsert.ReleaseBuffer();
 }
 
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp
index 37e3e118d1..633e0bc68e 100644
--- a/xfa/fde/cfde_txtedtengine.cpp
+++ b/xfa/fde/cfde_txtedtengine.cpp
@@ -142,7 +142,7 @@ void CFDE_TxtEdtEngine::SetText(const CFX_WideString& wsText) {
   if (nLength > 0) {
     CFX_WideString wsTemp;
     wchar_t* lpBuffer = wsTemp.GetBuffer(nLength);
-    FXSYS_memcpy(lpBuffer, wsText.c_str(), nLength * sizeof(wchar_t));
+    memcpy(lpBuffer, wsText.c_str(), nLength * sizeof(wchar_t));
     ReplaceParagEnd(lpBuffer, nLength, false);
     wsTemp.ReleaseBuffer(nLength);
     if (m_nLimit > 0 && nLength > m_nLimit) {
@@ -312,7 +312,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart,
 
   CFX_WideString wsTemp;
   wchar_t* lpBuffer = wsTemp.GetBuffer(nLength);
-  FXSYS_memcpy(lpBuffer, lpText, nLength * sizeof(wchar_t));
+  memcpy(lpBuffer, lpText, nLength * sizeof(wchar_t));
   ReplaceParagEnd(lpBuffer, nLength, false);
   wsTemp.ReleaseBuffer(nLength);
   bool bPart = false;
@@ -730,10 +730,10 @@ CFX_WideString CFDE_TxtEdtEngine::GetPreInsertText(int32_t nIndex,
   int32_t nOldLength = wsText.GetLength();
   const wchar_t* pOldBuffer = wsText.c_str();
   wchar_t* lpBuffer = wsTemp.GetBuffer(nOldLength + nLength);
-  FXSYS_memcpy(lpBuffer, pOldBuffer, (nIndex) * sizeof(wchar_t));
-  FXSYS_memcpy(lpBuffer + nIndex, lpText, nLength * sizeof(wchar_t));
-  FXSYS_memcpy(lpBuffer + nIndex + nLength, pOldBuffer + nIndex,
-               (nOldLength - nIndex) * sizeof(wchar_t));
+  memcpy(lpBuffer, pOldBuffer, (nIndex) * sizeof(wchar_t));
+  memcpy(lpBuffer + nIndex, lpText, nLength * sizeof(wchar_t));
+  memcpy(lpBuffer + nIndex + nLength, pOldBuffer + nIndex,
+         (nOldLength - nIndex) * sizeof(wchar_t));
   wsTemp.ReleaseBuffer(nOldLength + nLength);
   wsText = wsTemp;
   return wsText;
@@ -1028,8 +1028,8 @@ bool CFDE_TxtEdtEngine::ReplaceParagEnd(wchar_t*& lpText,
         if (bPreIsCR == true) {
           int32_t nNext = i + 1;
           if (nNext < nLength) {
-            FXSYS_memmove(lpText + i, lpText + nNext,
-                          (nLength - nNext) * sizeof(wchar_t));
+            memmove(lpText + i, lpText + nNext,
+                    (nLength - nNext) * sizeof(wchar_t));
           }
           i--;
           nLength--;
@@ -1079,16 +1079,16 @@ void CFDE_TxtEdtEngine::RecoverParagEnd(CFX_WideString& wsText) const {
     for (int32_t i = 0; i < nCount; i++) {
       int32_t nPos = PosArr[i];
       int32_t nCopyLen = nPos - nSrcPos + 1;
-      FXSYS_memcpy(lpDstBuf + nDstPos, lpSrcBuf + nSrcPos,
-                   nCopyLen * sizeof(wchar_t));
+      memcpy(lpDstBuf + nDstPos, lpSrcBuf + nSrcPos,
+             nCopyLen * sizeof(wchar_t));
       nDstPos += nCopyLen;
       nSrcPos += nCopyLen;
       lpDstBuf[nDstPos] = L'\n';
       nDstPos++;
     }
     if (nSrcPos < nLength) {
-      FXSYS_memcpy(lpDstBuf + nDstPos, lpSrcBuf + nSrcPos,
-                   (nLength - nSrcPos) * sizeof(wchar_t));
+      memcpy(lpDstBuf + nDstPos, lpSrcBuf + nSrcPos,
+             (nLength - nSrcPos) * sizeof(wchar_t));
     }
     wsTemp.ReleaseBuffer(nLength + nCount);
     wsText = wsTemp;
diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp
index 122eb40f7d..5bd731f8f5 100644
--- a/xfa/fde/cfde_txtedtpage.cpp
+++ b/xfa/fde/cfde_txtedtpage.cpp
@@ -158,7 +158,7 @@ int32_t CFDE_TxtEdtPage::GetDisplayPos(const CFX_RectF& rtClip,
   }
   if ((nCharPosCount * 5) < (m_nCharCount << 2)) {
     FXTEXT_CHARPOS* pTemp = FX_Alloc(FXTEXT_CHARPOS, nCharPosCount);
-    FXSYS_memcpy(pTemp, pCharPos, sizeof(FXTEXT_CHARPOS) * nCharPosCount);
+    memcpy(pTemp, pCharPos, sizeof(FXTEXT_CHARPOS) * nCharPosCount);
     FX_Free(pCharPos);
     pCharPos = pTemp;
   }
@@ -298,7 +298,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(const CFX_RectF* pClipBox,
       for (int32_t j = 0; j < nPieceCount; j++) {
         const CFX_BreakPiece* pPiece = pBreak->GetBreakPieceUnstable(j);
         FDE_TEXTEDITPIECE TxtEdtPiece;
-        FXSYS_memset(&TxtEdtPiece, 0, sizeof(FDE_TEXTEDITPIECE));
+        memset(&TxtEdtPiece, 0, sizeof(FDE_TEXTEDITPIECE));
         TxtEdtPiece.nBidiLevel = pPiece->m_iBidiLevel;
         TxtEdtPiece.nCount = pPiece->GetLength();
         TxtEdtPiece.nStart = nPieceStart;
diff --git a/xfa/fde/css/cfde_csstextbuf.cpp b/xfa/fde/css/cfde_csstextbuf.cpp
index 6f74db2a78..b8d8b197ae 100644
--- a/xfa/fde/css/cfde_csstextbuf.cpp
+++ b/xfa/fde/css/cfde_csstextbuf.cpp
@@ -81,6 +81,6 @@ void CFDE_CSSTextBuf::Subtract(int32_t iStart, int32_t iLength) {
   ASSERT(iStart >= 0 && iLength >= 0);
 
   iLength = pdfium::clamp(iLength, 0, m_iDatLen - iStart);
-  FXSYS_memmove(m_pBuffer, m_pBuffer + iStart, iLength * sizeof(wchar_t));
+  memmove(m_pBuffer, m_pBuffer + iStart, iLength * sizeof(wchar_t));
   m_iDatLen = iLength;
 }
diff --git a/xfa/fde/xml/fde_xml_imp.cpp b/xfa/fde/xml/fde_xml_imp.cpp
index 68a4978209..2de48ef1f4 100644
--- a/xfa/fde/xml/fde_xml_imp.cpp
+++ b/xfa/fde/xml/fde_xml_imp.cpp
@@ -1161,8 +1161,8 @@ void CFDE_BlockBuffer::GetTextData(CFX_WideString& wsTextData,
       iCopyLength -= ((m_iAllocStep - 1) - iEndInnerIndex);
     }
     wchar_t* pBlockBuf = m_BlockArray[i].get();
-    FXSYS_memcpy(pBuf + iPointer, pBlockBuf + iBufferPointer,
-                 iCopyLength * sizeof(wchar_t));
+    memcpy(pBuf + iPointer, pBlockBuf + iBufferPointer,
+           iCopyLength * sizeof(wchar_t));
     iPointer += iCopyLength;
   }
   wsTextData.ReleaseBuffer(iLength);
diff --git a/xfa/fgas/crt/ifgas_stream.cpp b/xfa/fgas/crt/ifgas_stream.cpp
index 8627c9f17c..0edf2ccbbd 100644
--- a/xfa/fgas/crt/ifgas_stream.cpp
+++ b/xfa/fgas/crt/ifgas_stream.cpp
@@ -651,7 +651,7 @@ int32_t CFGAS_BufferReadStreamImp::ReadData(uint8_t* pBuffer,
   uint32_t dwOffsetTmp = m_iPosition - dwBlockOffset;
   uint32_t dwCopySize =
       std::min(iBufferSize, (int32_t)(dwBlockSize - dwOffsetTmp));
-  FXSYS_memcpy(pBuffer, pBufferTmp + dwOffsetTmp, dwCopySize);
+  memcpy(pBuffer, pBufferTmp + dwOffsetTmp, dwCopySize);
   dwOffsetTmp = dwCopySize;
   iBufferSize -= dwCopySize;
   while (iBufferSize > 0) {
@@ -662,7 +662,7 @@ int32_t CFGAS_BufferReadStreamImp::ReadData(uint8_t* pBuffer,
     dwBlockSize = m_pBufferRead->GetBlockSize();
     pBufferTmp = m_pBufferRead->GetBlockBuffer();
     dwCopySize = std::min((uint32_t)iBufferSize, dwBlockSize);
-    FXSYS_memcpy(pBuffer + dwOffsetTmp, pBufferTmp, dwCopySize);
+    memcpy(pBuffer + dwOffsetTmp, pBufferTmp, dwCopySize);
     dwOffsetTmp += dwCopySize;
     iBufferSize -= dwCopySize;
   }
@@ -800,7 +800,7 @@ int32_t CFGAS_BufferStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
   if (iLen <= 0) {
     return 0;
   }
-  FXSYS_memcpy(pBuffer, m_pData + m_iPosition, iLen);
+  memcpy(pBuffer, m_pData + m_iPosition, iLen);
   m_iPosition += iLen;
   return iLen;
 }
@@ -831,7 +831,7 @@ int32_t CFGAS_BufferStreamImp::WriteData(const uint8_t* pBuffer,
   if (iLen <= 0) {
     return 0;
   }
-  FXSYS_memcpy(m_pData + m_iPosition, pBuffer, iLen);
+  memcpy(m_pData + m_iPosition, pBuffer, iLen);
   m_iPosition += iLen;
   if (m_iPosition > m_iLength) {
     m_iLength = m_iPosition;
@@ -846,7 +846,7 @@ int32_t CFGAS_BufferStreamImp::WriteString(const wchar_t* pStr,
   if (iLen <= 0) {
     return 0;
   }
-  FXSYS_memcpy(m_pData + m_iPosition, pStr, iLen * 2);
+  memcpy(m_pData + m_iPosition, pStr, iLen * 2);
   m_iPosition += iLen * 2;
   if (m_iPosition > m_iLength) {
     m_iLength = m_iPosition;
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 7b8e19a5bc..766422e381 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -297,7 +297,7 @@ const FX_FONTDESCRIPTOR* CFGAS_FontMgr::FindFont(const wchar_t* pszFontFamily,
                                                  uint32_t dwUSB,
                                                  wchar_t wUnicode) {
   FX_FONTMATCHPARAMS params;
-  FXSYS_memset(&params, 0, sizeof(params));
+  memset(&params, 0, sizeof(params));
   params.dwUSB = dwUSB;
   params.wUnicode = wUnicode;
   params.wCodePage = wCodePage;
@@ -350,13 +350,13 @@ static int32_t CALLBACK FX_GdiFontEnumProc(ENUMLOGFONTEX* lpelfe,
   if (lf.lfFaceName[0] == L'@')
     return 1;
   FX_FONTDESCRIPTOR* pFont = FX_Alloc(FX_FONTDESCRIPTOR, 1);
-  FXSYS_memset(pFont, 0, sizeof(FX_FONTDESCRIPTOR));
+  memset(pFont, 0, sizeof(FX_FONTDESCRIPTOR));
   pFont->uCharSet = lf.lfCharSet;
   pFont->dwFontStyles = FX_GetGdiFontStyles(lf);
   FXSYS_wcsncpy(pFont->wsFontFace, (const wchar_t*)lf.lfFaceName, 31);
   pFont->wsFontFace[31] = 0;
-  FXSYS_memcpy(&pFont->FontSignature, &lpntme->ntmFontSig,
-               sizeof(lpntme->ntmFontSig));
+  memcpy(&pFont->FontSignature, &lpntme->ntmFontSig,
+         sizeof(lpntme->ntmFontSig));
   reinterpret_cast<std::deque<FX_FONTDESCRIPTOR>*>(lParam)->push_back(*pFont);
   FX_Free(pFont);
   return 1;
@@ -367,7 +367,7 @@ static void FX_EnumGdiFonts(std::deque<FX_FONTDESCRIPTOR>* fonts,
                             wchar_t wUnicode) {
   HDC hDC = ::GetDC(nullptr);
   LOGFONTW lfFind;
-  FXSYS_memset(&lfFind, 0, sizeof(lfFind));
+  memset(&lfFind, 0, sizeof(lfFind));
   lfFind.lfCharSet = DEFAULT_CHARSET;
   if (pwsFaceName) {
     FXSYS_wcsncpy(lfFind.lfFaceName, pwsFaceName, 31);
@@ -884,7 +884,7 @@ FXFT_Face CFGAS_FontMgr::LoadFace(
     return nullptr;
 
   FXFT_Stream ftStream = FX_Alloc(FXFT_StreamRec, 1);
-  FXSYS_memset(ftStream, 0, sizeof(FXFT_StreamRec));
+  memset(ftStream, 0, sizeof(FXFT_StreamRec));
   ftStream->base = nullptr;
   ftStream->descriptor.pointer = static_cast<void*>(pFontStream.Get());
   ftStream->pos = 0;
@@ -893,7 +893,7 @@ FXFT_Face CFGAS_FontMgr::LoadFace(
   ftStream->close = _ftStreamClose;
 
   FXFT_Open_Args ftArgs;
-  FXSYS_memset(&ftArgs, 0, sizeof(FXFT_Open_Args));
+  memset(&ftArgs, 0, sizeof(FXFT_Open_Args));
   ftArgs.flags |= FT_OPEN_STREAM;
   ftArgs.stream = ftStream;
 
diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp
index 55299677a3..d0dbf1f773 100644
--- a/xfa/fwl/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -532,7 +532,7 @@ bool CFWL_WidgetMgr::IsNeedRepaint(CFWL_Widget* pWidget,
   bool bOrginPtIntersectWidthChild = false;
   bool bOrginPtIntersectWidthDirty = rtDirty.Contains(rtWidget.TopLeft());
   static FWL_NEEDREPAINTHITDATA hitPoint[kNeedRepaintHitPoints];
-  FXSYS_memset(hitPoint, 0, sizeof(hitPoint));
+  memset(hitPoint, 0, sizeof(hitPoint));
   float fxPiece = rtWidget.width / kNeedRepaintHitPiece;
   float fyPiece = rtWidget.height / kNeedRepaintHitPiece;
   hitPoint[2].hitPoint.x = hitPoint[6].hitPoint.x = rtWidget.left;
diff --git a/xfa/fxfa/app/cxfa_textlayout.cpp b/xfa/fxfa/app/cxfa_textlayout.cpp
index 9f4962e458..2470459b31 100644
--- a/xfa/fxfa/app/cxfa_textlayout.cpp
+++ b/xfa/fxfa/app/cxfa_textlayout.cpp
@@ -601,7 +601,7 @@ bool CXFA_TextLayout::DrawString(CFX_RenderDevice* pFxDevice,
         pCharPos = FX_Alloc(FXTEXT_CHARPOS, iChars);
         iCharCount = iChars;
       }
-      FXSYS_memset(pCharPos, 0, iCharCount * sizeof(FXTEXT_CHARPOS));
+      memset(pCharPos, 0, iCharCount * sizeof(FXTEXT_CHARPOS));
       RenderString(pDevice.get(), pSolidBrush.get(), pPieceLine, j, pCharPos,
                    tmDoc2Device);
     }
diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp
index 40341ad90c..78de94e938 100644
--- a/xfa/fxfa/cxfa_ffapp.cpp
+++ b/xfa/fxfa/cxfa_ffapp.cpp
@@ -70,7 +70,7 @@ bool CXFA_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) {
     const auto& acc = m_Data[index];
     uint32_t dwSize = acc->GetSize();
     size_t dwRead = std::min(size, static_cast<size_t>(dwSize - offset));
-    FXSYS_memcpy(buffer, acc->GetData() + offset, dwRead);
+    memcpy(buffer, acc->GetData() + offset, dwRead);
     size -= dwRead;
     if (size == 0)
       return true;
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index d38a6715e8..83742d9609 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -3557,8 +3557,8 @@ void CXFA_FM2JSContext::DecodeXML(const CFX_ByteStringC& szXMLString,
     const wchar_t* const strName[] = {L"quot", L"amp", L"apos", L"lt", L"gt"};
     int32_t iIndex = 0;
     while (iIndex < 5) {
-      if (FXSYS_memcmp(strString, strName[iIndex],
-                       FXSYS_wcslen(strName[iIndex])) == 0) {
+      if (memcmp(strString, strName[iIndex], FXSYS_wcslen(strName[iIndex])) ==
+          0) {
         break;
       }
       ++iIndex;
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 75a125b2d9..2828c98343 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -3747,13 +3747,13 @@ bool CXFA_Node::TryMeasure(XFA_ATTRIBUTE eAttr,
   void* pValue;
   int32_t iBytes;
   if (GetMapModuleBuffer(pKey, pValue, iBytes) && iBytes == sizeof(mValue)) {
-    FXSYS_memcpy(&mValue, pValue, sizeof(mValue));
+    memcpy(&mValue, pValue, sizeof(mValue));
     return true;
   }
   if (bUseDefault &&
       XFA_GetAttributeDefaultValue(pValue, GetElementType(), eAttr,
                                    XFA_ATTRIBUTETYPE_Measure, m_ePacket)) {
-    FXSYS_memcpy(&mValue, pValue, sizeof(mValue));
+    memcpy(&mValue, pValue, sizeof(mValue));
     return true;
   }
   return false;
@@ -4020,7 +4020,7 @@ bool CXFA_Node::TryUserData(void* pKey, void*& pData, bool bProtoAlso) {
   if (!GetMapModuleBuffer(pKey, pData, iBytes, bProtoAlso)) {
     return false;
   }
-  return iBytes == sizeof(void*) && FXSYS_memcpy(&pData, pData, iBytes);
+  return iBytes == sizeof(void*) && memcpy(&pData, pData, iBytes);
 }
 
 bool CXFA_Node::SetScriptContent(const CFX_WideString& wsContent,
@@ -4889,7 +4889,7 @@ void CXFA_Node::SetMapModuleBuffer(
 
   pBuffer->pCallbackInfo = pCallbackInfo;
   pBuffer->iBytes = iBytes;
-  FXSYS_memcpy(pBuffer->GetData(), pValue, iBytes);
+  memcpy(pBuffer->GetData(), pValue, iBytes);
 }
 
 bool CXFA_Node::GetMapModuleBuffer(void* pKey,
@@ -5006,8 +5006,7 @@ void CXFA_Node::MergeAllData(void* pDstModule) {
     }
     pDstBuffer->pCallbackInfo = pSrcBuffer->pCallbackInfo;
     pDstBuffer->iBytes = pSrcBuffer->iBytes;
-    FXSYS_memcpy(pDstBuffer->GetData(), pSrcBuffer->GetData(),
-                 pSrcBuffer->iBytes);
+    memcpy(pDstBuffer->GetData(), pSrcBuffer->GetData(), pSrcBuffer->iBytes);
     if (pDstBuffer->pCallbackInfo && pDstBuffer->pCallbackInfo->pCopy) {
       pDstBuffer->pCallbackInfo->pCopy(*(void**)pDstBuffer->GetData());
     }
diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp
index 1f224c7685..a3821dd067 100644
--- a/xfa/fxgraphics/cfx_graphics.cpp
+++ b/xfa/fxgraphics/cfx_graphics.cpp
@@ -359,8 +359,7 @@ void CFX_Graphics::FillPathWithPattern(CFX_Path* path,
 
   auto mask = pdfium::MakeRetain<CFX_DIBitmap>();
   mask->Create(data.width, data.height, FXDIB_1bppMask);
-  FXSYS_memcpy(mask->GetBuffer(), data.maskBits,
-               mask->GetPitch() * data.height);
+  memcpy(mask->GetBuffer(), data.maskBits, mask->GetPitch() * data.height);
   CFX_FloatRect rectf = path->GetPathData()->GetBoundingBox();
   if (matrix)
     matrix->TransformRect(rectf);