Manual fixups to PDF_ENABLE_XFA in core/

core/src/fxcrt/fx_extension.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 "core/include/fxcrt/fx_basic.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "extension.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #include <wincrypt.h>
 #else
 #include <ctime>
 #endif
 
 #ifdef PDF_ENABLE_XFA
 IFX_FileAccess* FX_CreateDefaultFileAccess(const CFX_WideStringC& wsPath) {
   if (wsPath.GetLength() == 0)
     return NULL;
 
   CFX_CRTFileAccess* pFA = NULL;
   pFA = new CFX_CRTFileAccess;
   if (NULL == pFA)
     return NULL;
 
   pFA->Init(wsPath);
   return pFA;
 }
-#endif
+#endif  // PDF_ENABLE_XFA
+
 IFX_FileStream* FX_CreateFileStream(const FX_CHAR* filename, FX_DWORD dwModes) {
   IFXCRT_FileAccess* pFA = FXCRT_FileAccess_Create();
   if (!pFA) {
     return NULL;
   }
   if (!pFA->Open(filename, dwModes)) {
     pFA->Release();
     return NULL;
   }
   return new CFX_CRTFileStream(pFA);
@@ skipping 257 matching lines @@
   return TRUE;
 }
 #endif
 void FX_Random_GenerateCrypto(FX_DWORD* pBuffer, int32_t iCount) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
   FX_GenerateCryptoRandom(pBuffer, iCount);
 #else
   FX_Random_GenerateBase(pBuffer, iCount);
 #endif
 }
+
 #ifdef PDF_ENABLE_XFA
-
 void FX_GUID_CreateV4(FX_LPGUID pGUID) {
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
      _FX_OS_ == _FX_WIN64_)
 #ifdef _FX_WINAPI_PARTITION_DESKTOP_
   if (!FX_GenerateCryptoRandom((FX_DWORD*)pGUID, 4)) {
     FX_Random_GenerateMT((FX_DWORD*)pGUID, 4);
   }
 #else
   FX_Random_GenerateMT((FX_DWORD*)pGUID, 4);
 #endif
@@ skipping 12 matching lines @@
   for (int32_t i = 0; i < 16; i++) {
     b = ((const uint8_t*)pGUID)[i];
     *pBuf++ = gs_FX_pHexChars[b >> 4];
     *pBuf++ = gs_FX_pHexChars[b & 0x0F];
     if (bSeparator && (i == 3 || i == 5 || i == 7 || i == 9)) {
       *pBuf++ = L'-';
     }
   }
   bsStr.ReleaseBuffer(bSeparator ? 36 : 32);
 }
-#endif
+#endif  // PDF_ENABLE_XFA