Re-enable several MSVC warnings

core/fxcrt/fx_basic_wstring.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cctype>
@@ skipping 623 matching lines @@
   }
   FX_STRSIZE nSourceLen = FXSYS_wcslen(lpszOld);
   if (nSourceLen == 0) {
     return 0;
   }
   FX_STRSIZE nReplacementLen = lpszNew ? FXSYS_wcslen(lpszNew) : 0;
   FX_STRSIZE nCount = 0;
   FX_WCHAR* lpszStart = m_pData->m_String;
   FX_WCHAR* lpszEnd = m_pData->m_String + m_pData->m_nDataLength;
   FX_WCHAR* lpszTarget;
-  {
-    while ((lpszTarget = (FX_WCHAR*)FXSYS_wcsstr(lpszStart, lpszOld)) &&
-           lpszStart < lpszEnd) {
-      nCount++;
-      lpszStart = lpszTarget + nSourceLen;
-    }
+  while ((lpszTarget = FXSYS_wcsstr(lpszStart, lpszOld)) != nullptr &&

[Tom Sepez, 2016/03/17 16:40:05]

nit: again, I think this reads cleaner as a while loop that only checks the
(lpszStart < lpszEnd) at top. Then it looks like lsszTarget can become local to
the loop body.

while (lpszStart < lpszEnd) {
  FX_WCHAR* lpszTarget = FXSYS_wcsstr(lpszStart, lpszOld);
  if (!lpszTarget)
    break;
  ...

[Wei Li, 2016/03/18 17:42:39]

Absolutely agree with you. I originally planned to do this, but thought some
people might like less lines. :) 

+         lpszStart < lpszEnd) {
+    nCount++;
+    lpszStart = lpszTarget + nSourceLen;
   }
   if (nCount > 0) {
     CopyBeforeWrite();
     FX_STRSIZE nOldLength = m_pData->m_nDataLength;
     FX_STRSIZE nNewLength =
         nOldLength + (nReplacementLen - nSourceLen) * nCount;
     if (m_pData->m_nAllocLength < nNewLength || m_pData->m_nRefs > 1) {
       StringData* pOldData = m_pData;
       const FX_WCHAR* pstr = m_pData->m_String;
       m_pData = StringData::Create(nNewLength);
       if (!m_pData) {
         return 0;
       }
       FXSYS_memcpy(m_pData->m_String, pstr,
                    pOldData->m_nDataLength * sizeof(FX_WCHAR));
       pOldData->Release();
     }
     lpszStart = m_pData->m_String;
     lpszEnd = m_pData->m_String + std::max(m_pData->m_nDataLength, nNewLength);
     {

[Tom Sepez, 2016/03/17 16:40:05]

nit: braces?

[Wei Li, 2016/03/18 17:42:39]

Done.

-      while ((lpszTarget = (FX_WCHAR*)FXSYS_wcsstr(lpszStart, lpszOld)) !=
-                 NULL &&
+      while ((lpszTarget = FXSYS_wcsstr(lpszStart, lpszOld)) != nullptr &&

[Tom Sepez, 2016/03/17 16:40:05]

nit: re-write as discussed above.

[Wei Li, 2016/03/18 17:42:39]

Done.

              lpszStart < lpszEnd) {
         FX_STRSIZE nBalance =
             nOldLength -
             (FX_STRSIZE)(lpszTarget - m_pData->m_String + nSourceLen);
         FXSYS_memmove(lpszTarget + nReplacementLen, lpszTarget + nSourceLen,
                       nBalance * sizeof(FX_WCHAR));
         FXSYS_memcpy(lpszTarget, lpszNew, nReplacementLen * sizeof(FX_WCHAR));
         lpszStart = lpszTarget + nReplacementLen;
         lpszStart[nBalance] = 0;
         nOldLength += (nReplacementLen - nSourceLen);
@@ skipping 359 matching lines @@
   int dest_len =
       FXSYS_MultiByteToWideChar(codepage, 0, bstr, src_len, nullptr, 0);
   CFX_WideString wstr;
   if (dest_len) {
     FX_WCHAR* dest_buf = wstr.GetBuffer(dest_len);
     FXSYS_MultiByteToWideChar(codepage, 0, bstr, src_len, dest_buf, dest_len);
     wstr.ReleaseBuffer(dest_len);
   }
   return wstr;
 }