Make CPDFXFA_App / IXFA_AppProvider saner

fpdfsdk/src/fpdfview.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 "../../public/fpdf_ext.h"
 #include "../../public/fpdf_formfill.h"
 #include "../../public/fpdf_progressive.h"
 #include "../../public/fpdfview.h"
@@ skipping 158 matching lines @@
                         else
                                 return FALSE;
                 }
                 break;
         default:
                 break;
         }
         return FALSE;
 }
 
-
-#ifndef _T
-#define _T(x) x
-#endif
-
 CCodec_ModuleMgr*       g_pCodecModule = NULL;
 
 DLLEXPORT void STDCALL FPDF_InitLibrary()
 {
-        g_pCodecModule = CCodec_ModuleMgr::Create();
-        
-        CFX_GEModule::Create();
-        CFX_GEModule::Get()->SetCodecModule(g_pCodecModule);
-        
-        CPDF_ModuleMgr::Create();
-        CPDF_ModuleMgr::Get()->SetCodecModule(g_pCodecModule);
-        CPDF_ModuleMgr::Get()->InitPageModule();
-        CPDF_ModuleMgr::Get()->InitRenderModule();
+    g_pCodecModule = CCodec_ModuleMgr::Create();
 
-        CPDFXFA_App* pAppProvider = FPDFXFA_GetApp();
-        pAppProvider->Initialize();
+    CFX_GEModule::Create();
+    CFX_GEModule::Get()->SetCodecModule(g_pCodecModule);
+
+    CPDF_ModuleMgr::Create();
+    CPDF_ModuleMgr::Get()->SetCodecModule(g_pCodecModule);
+    CPDF_ModuleMgr::Get()->InitPageModule();
+    CPDF_ModuleMgr::Get()->InitRenderModule();
+
+    CPDFXFA_App::GetInstance()->Initialize();
 }
 
-
 DLLEXPORT void STDCALL FPDF_DestroyLibrary()
 {
-        FPDFXFA_ReleaseApp();
-        CPDF_ModuleMgr::Destroy();
-        CFX_GEModule::Destroy();
-        g_pCodecModule->Destroy();
+    CPDFXFA_App::ReleaseInstance();
+    CPDF_ModuleMgr::Destroy();
+    CFX_GEModule::Destroy();
+    g_pCodecModule->Destroy();
 }
 
 #ifndef _WIN32
 int g_LastError;
 void SetLastError(int err)
 {
         g_LastError = err;
 }
 
 int GetLastError()
@@ skipping 35 matching lines @@
         FX_DWORD err_code = pParser->StartParse((FX_LPCSTR)file_path);
         if (err_code) {
                 delete pParser;
                 ProcessParseError(err_code);
                 return NULL;
         }
         CPDF_Document* pPDFDoc = pParser->GetDocument();
         if (!pPDFDoc)
                 return NULL;
 
-        CPDFXFA_App* pProvider = FPDFXFA_GetApp();
+        CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance();
         CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pProvider);
         return pDocument;
 }
 
 DLLEXPORT FX_BOOL STDCALL FPDF_HasXFAField(FPDF_DOCUMENT document, int* docType)
 {
         if (!document)
                 return FALSE;
 
         CPDF_Document *pdfDoc = (static_cast<CPDFXFA_Document *>(document))->GetPDFDoc();
@@ skipping 65 matching lines @@
                 ProcessParseError(err_code);
                 return NULL;
         }
         CPDF_Document * pDoc = NULL;
         pDoc = pParser?pParser->GetDocument():NULL;
         CheckUnSupportError(pDoc, err_code);
         CPDF_Document* pPDFDoc = pParser->GetDocument();
         if (!pPDFDoc)
                 return NULL;
 
-        CPDFXFA_App* pProvider = FPDFXFA_GetApp();
+        CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance();
         CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pProvider);
-        //pDocument->LoadXFADoc();
-
         return pDocument;
 }
 
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadCustomDocument(FPDF_FILEACCESS* pFileAccess, FPDF_BYTESTRING password)
 {
         CPDF_Parser* pParser = FX_NEW CPDF_Parser;
         pParser->SetPassword(password);
         CPDF_CustomAccess* pFile = FX_NEW CPDF_CustomAccess(pFileAccess);
         FX_DWORD err_code = pParser->StartParse(pFile);
         if (err_code) {
                 delete pParser;
                 ProcessParseError(err_code);
                 return NULL;
         }
         CPDF_Document * pDoc = NULL;
         pDoc = pParser?pParser->GetDocument():NULL;
         CheckUnSupportError(pDoc, err_code);
         CPDF_Document* pPDFDoc = pParser->GetDocument();
         if (!pPDFDoc)
                 return NULL;
 
-        CPDFXFA_App* pProvider = FPDFXFA_GetApp();
+        CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance();
         CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pProvider);
-        //pDocument->LoadXFADoc();
-
         return pDocument;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_GetFileVersion(FPDF_DOCUMENT doc, int* fileVersion)
 {
         if(!doc||!fileVersion) return FALSE;
         *fileVersion = 0;
         CPDFXFA_Document* pDoc = (CPDFXFA_Document*)doc;
         CPDF_Document* pPDFDoc = pDoc->GetPDFDoc();
         if (!pPDFDoc) return (FX_DWORD)-1;
@@ skipping 664 matching lines @@
     if (!buffer) {
         *buflen = len;
     } else if (*buflen >= len) {
         memcpy(buffer, utf16Name.c_str(), len);
         *buflen = len;
     } else {
         *buflen = -1;
     }
     return (FPDF_DEST)pDestObj;
 }