Merge to XFA: Tidy up CPDFDOC_Environment.

fpdfsdk/src/fpdfformfill.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_formfill.h"
 #include "../../public/fpdfview.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
 #include "../include/fpdfxfa/fpdfxfa_app.h"
 
 
 #include "../include/javascript/IJavaScript.h"
 
-
-DLLEXPORT int STDCALL FPDPage_HasFormFieldAtPoint(FPDF_FORMHANDLE hHandle, FPDF_PAGE page,double page_x, double page_y)
-{
-        if(!page || !hHandle)
-                return -1;
-        CPDF_Page * pPage = ((CPDFXFA_Page*) page)->GetPDFPage();
-        if (pPage)
-        {
-                CPDF_InterForm * pInterForm = NULL;
-                pInterForm = new CPDF_InterForm(pPage->m_pDocument,FALSE);
-                if (!pInterForm)
-                        return -1;
-                CPDF_FormControl* pFormCtrl = pInterForm->GetControlAtPoint(pPage, (FX_FLOAT)page_x, (FX_FLOAT)page_y);
-                if(!pFormCtrl)
-                {
-                        delete pInterForm;
-                        return -1;
-                }
-                CPDF_FormField* pFormField = pFormCtrl->GetField();
-                if(!pFormField)
-                {
-                        delete pInterForm;
-                        return -1;
-                }
-
-                int nType = pFormField->GetFieldType();
-                delete pInterForm;
-                return nType;
-        }
-
-        IXFA_PageView* pPageView = ((CPDFXFA_Page*)page)->GetXFAPageView();
-        if (pPageView)
-        {
-                IXFA_WidgetHandler* pWidgetHandler = NULL;
-                IXFA_DocView* pDocView = pPageView->GetDocView();
-                if (!pDocView)
-                        return -1;
-
-                pWidgetHandler = pDocView->GetWidgetHandler();
-                if (!pWidgetHandler)
-                        return -1;
-
-                IXFA_Widget* pXFAAnnot = NULL;
-                IXFA_WidgetIterator* pWidgetIterator = pPageView->CreateWidgetIterator(XFA_TRAVERSEWAY_Form, XFA_WIDGETFILTER_Viewable|XFA_WIDGETFILTER_AllType);
-                if (!pWidgetIterator)
-                        return -1;
-                pXFAAnnot = pWidgetIterator->MoveToNext();
-                while (pXFAAnnot) {
-                        CFX_RectF rcBBox;
-                        pWidgetHandler->GetBBox (pXFAAnnot, rcBBox, 0);
-                        CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.left + rcBBox.width, rcBBox.top+rcBBox.height);
-                        rcWidget.left -= 1.0f;
-                        rcWidget.right += 1.0f;
-                        rcWidget.bottom -= 1.0f;
-                        rcWidget.top += 1.0f;
-
-                        if (rcWidget.Contains(static_cast<FX_FLOAT>(page_x),
-                                static_cast<FX_FLOAT>(page_y))) {
-                                pWidgetIterator->Release();
-                                return FPDF_FORMFIELD_XFA;
-                        }
-                        pXFAAnnot = pWidgetIterator->MoveToNext();
-                }
-
-                pWidgetIterator->Release();
-        }
-
-        return -1;
+namespace {
+
+CPDFSDK_Document* FormHandleToSDKDoc(FPDF_FORMHANDLE hHandle)
+{
+    CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
+    return pEnv ? pEnv->GetSDKDocument() : nullptr;
+}
+
+CPDFSDK_InterForm* FormHandleToInterForm(FPDF_FORMHANDLE hHandle)
+{
+    CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
+    return pSDKDoc ? pSDKDoc->GetInterForm() : nullptr;
+}
+
+CPDFSDK_PageView* FormHandleToPageView(FPDF_FORMHANDLE hHandle, FPDF_PAGE page)
+{
+    CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
+    return pSDKDoc ? pSDKDoc->GetPageView((CPDFXFA_Page*)page, TRUE) : nullptr;
+}
+
+}  // namespace
+
+DLLEXPORT int STDCALL FPDPage_HasFormFieldAtPoint(
+    FPDF_FORMHANDLE hHandle, FPDF_PAGE page, double page_x, double page_y)
+{
+    if(!page || !hHandle)
+        return -1;
+    CPDF_Page * pPage = ((CPDFXFA_Page*) page)->GetPDFPage();
+    if (pPage)
+    {
+        CPDF_InterForm * pInterForm = NULL;
+        pInterForm = new CPDF_InterForm(pPage->m_pDocument,FALSE);
+        if (!pInterForm)
+            return -1;
+        CPDF_FormControl* pFormCtrl = pInterForm->GetControlAtPoint(pPage, (FX_FLOAT)page_x, (FX_FLOAT)page_y);
+        if(!pFormCtrl)
+        {
+            delete pInterForm;
+            return -1;
+        }
+        CPDF_FormField* pFormField = pFormCtrl->GetField();
+        if(!pFormField)
+        {
+            delete pInterForm;
+            return -1;
+        }
+
+        int nType = pFormField->GetFieldType();
+        delete pInterForm;
+        return nType;
+    }
+
+    IXFA_PageView* pPageView = ((CPDFXFA_Page*)page)->GetXFAPageView();
+    if (pPageView)
+    {
+        IXFA_WidgetHandler* pWidgetHandler = NULL;
+        IXFA_DocView* pDocView = pPageView->GetDocView();
+        if (!pDocView)
+            return -1;
+
+        pWidgetHandler = pDocView->GetWidgetHandler();
+        if (!pWidgetHandler)
+            return -1;
+
+        IXFA_Widget* pXFAAnnot = NULL;
+        IXFA_WidgetIterator* pWidgetIterator = pPageView->CreateWidgetIterator(XFA_TRAVERSEWAY_Form, XFA_WIDGETFILTER_Viewable|XFA_WIDGETFILTER_AllType);
+        if (!pWidgetIterator)
+            return -1;
+        pXFAAnnot = pWidgetIterator->MoveToNext();
+        while (pXFAAnnot) {
+            CFX_RectF rcBBox;
+            pWidgetHandler->GetBBox (pXFAAnnot, rcBBox, 0);
+            CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.left + rcBBox.width, rcBBox.top+rcBBox.height);
+            rcWidget.left -= 1.0f;
+            rcWidget.right += 1.0f;
+            rcWidget.bottom -= 1.0f;
+            rcWidget.top += 1.0f;
+
+            if (rcWidget.Contains(static_cast<FX_FLOAT>(page_x),
+                static_cast<FX_FLOAT>(page_y))) {
+                pWidgetIterator->Release();
+                return FPDF_FORMFIELD_XFA;
+            }
+            pXFAAnnot = pWidgetIterator->MoveToNext();
+        }
+
+        pWidgetIterator->Release();
+    }
+
+    return -1;
 }
 
 DLLEXPORT FPDF_FORMHANDLE STDCALL FPDFDOC_InitFormFillEnvironment(FPDF_DOCUMENT document, FPDF_FORMFILLINFO* formInfo)
 {
-        if(!document || !formInfo || formInfo->version!=2)
-                return NULL;
-        CPDFXFA_Document * pDocument = (CPDFXFA_Document*) document;
-        CPDFDoc_Environment * pEnv = NULL;
-        pEnv = new CPDFDoc_Environment(pDocument);
-        if (!pEnv)
-                return NULL;
-        pEnv->RegAppHandle(formInfo);
-
-        CPDFXFA_App* pApp = CPDFXFA_App::GetInstance();
-        pApp->AddFormFillEnv(pEnv);
-
-        if(pEnv->GetPDFXFADocument())

[Lei Zhang, 2015/07/16 21:12:15]

This block of code went missing

[Tom Sepez, 2015/07/16 21:39:04]

It should be covered by line 117 in the new code.

pEnv->GetPDFXFADocument() just returns the pDocument we passed in at creation
time.  We know its not null or we would have bailed at [new] line 112. So this
becomes if (1) { ... }

Next, even if pSDKDoc is NULL, we just created the pEnv with a NULL placeholder,
so assigning NULL over null doesn't matter.  So lose this if block.

Lastly, move it higher since it doesnt use the pApp.

-        {
-                //CPDFSDK_Document* pSDKDoc = new CPDFSDK_Document(pEnv->GetPDFXFADocument(), pEnv);
-                CPDFSDK_Document* pSDKDoc = pDocument->GetSDKDocument(pEnv);
-                if(pSDKDoc) {
-                        pEnv->SetCurrentDoc(pSDKDoc);
-                }
-        }
-        return pEnv;
+    if (!document || !formInfo || formInfo->version != 1)

[Lei Zhang, 2015/07/16 21:12:15]

This changed from 2 to 1

[Tom Sepez, 2015/07/16 21:39:04]

Nice catch.

+        return nullptr;
+
+    CPDFXFA_Document *pDocument = (CPDFXFA_Document*)document;
+    CPDFDoc_Environment* pEnv = new CPDFDoc_Environment(pDocument, formInfo);
+    pEnv->SetSDKDocument(pDocument->GetSDKDocument(pEnv));
+
+    CPDFXFA_App* pApp = CPDFXFA_App::GetInstance();
+    pApp->AddFormFillEnv(pEnv);
+
+    return pEnv;
 }
 
 DLLEXPORT void STDCALL FPDFDOC_ExitFormFillEnvironment(FPDF_FORMHANDLE hHandle)
 {
-        if (!hHandle)
-                return;
-        CPDFXFA_App* pApp = CPDFXFA_App::GetInstance();
-        pApp->RemoveFormFillEnv((CPDFDoc_Environment*)hHandle);
-        delete (CPDFDoc_Environment*)hHandle;
-        hHandle = NULL;
+    if (!hHandle)
+        return;
+    CPDFXFA_App* pApp = CPDFXFA_App::GetInstance();
+    pApp->RemoveFormFillEnv((CPDFDoc_Environment*)hHandle);
+    delete (CPDFDoc_Environment*)hHandle;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnMouseMove(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
-        if (!hHandle || !page)
-                return FALSE;
-//      CPDF_Page * pPage = (CPDF_Page*) page;
-//      CPDF_Document * pDoc = pPage->m_pDocument;
-//      CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-
-//      double page_x = 0;
-//      double page_y = 0;
-//      pEnv->FFI_DeviceToPage(page, point_x, point_y, &page_x, &page_y);
-        CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
-        return pPageView->OnMouseMove(pt, modifier);
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
+    return pPageView->OnMouseMove(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonDown(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
-        if (!hHandle || !page)
-                return FALSE;
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-//      double page_x = 0;
-//      double page_y = 0;
-//      pEnv->FFI_DeviceToPage(page, point_x, point_y, &page_x, &page_y);
-        CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
-        return pPageView->OnLButtonDown(pt, modifier);
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
+    return pPageView->OnLButtonDown(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonUp(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
-        if (!hHandle || !page)
-                return FALSE;
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-//      double page_x = 0;
-//      double page_y = 0;
-//      pEnv->FFI_DeviceToPage(page, point_x, point_y, &page_x, &page_y);
-        CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
-        return pPageView->OnLButtonUp(pt, modifier);
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
+    return pPageView->OnLButtonUp(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnRButtonDown(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
-        if (!hHandle || !page)
-                return FALSE;
-
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-
-        CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
-        return pPageView->OnRButtonDown(pt, modifier);
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
+    return pPageView->OnRButtonDown(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnRButtonUp(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
-        if (!hHandle || !page)
-                return FALSE;
-
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-
-        CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
-        return pPageView->OnRButtonUp(pt, modifier);
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
+    return pPageView->OnRButtonUp(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnKeyDown(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int nKeyCode, int modifier)
 {
-        if (!hHandle || !page)
-                return FALSE;
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-
-
-        return pPageView->OnKeyDown(nKeyCode, modifier);
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    return pPageView->OnKeyDown(nKeyCode, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnKeyUp(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int nKeyCode, int modifier)
 {
-        if (!hHandle || !page)
-                return FALSE;
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-
-
-        return pPageView->OnKeyUp(nKeyCode, modifier);
-}
-
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    return pPageView->OnKeyUp(nKeyCode, modifier);
+}
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnChar(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int nChar,  int modifier)
 {
-        if (!hHandle || !page)
-                return FALSE;
-        CPDFSDK_Document* pFXDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pFXDoc)
-                return FALSE;
-        CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page);
-        if(!pPageView)
-                return FALSE;
-        return pPageView->OnChar(nChar, modifier);
-
+    CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
+    if (!pPageView)
+        return FALSE;
+
+    return pPageView->OnChar(nChar, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_ForceToKillFocus(FPDF_FORMHANDLE hHandle)
 {
-        if(!hHandle)
-                return FALSE;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pSDKDoc)
-                return FALSE;
-        //Kill the current focus.
-        return pSDKDoc->KillFocusAnnot(0);
-}
-
-DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle, FPDF_BITMAP bitmap, FPDF_PAGE page, int start_x, int start_y,
-                                                                                                  int size_x, int size_y, int rotate, int flags)
-{
-        if (!hHandle || !page)
-                return ;
-
-        CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
-        CPDFXFA_Document* pDocument = pPage->GetDocument();
-        if (!pDocument)
-                return;
-        CPDF_Document* pPDFDoc = pDocument->GetPDFDoc();
-        if (!pPDFDoc)
-                return;
-
-        CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
-        CPDFSDK_Document* pFXDoc = pEnv->GetCurrentDoc();
-        if (!pFXDoc)
-                return;
-
-        CFX_AffineMatrix matrix;
-        pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
-
-        FX_RECT clip;
-        clip.left = start_x;
-        clip.right = start_x + size_x;
-        clip.top = start_y;
-        clip.bottom = start_y + size_y;
+    CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
+    if (!pSDKDoc)
+        return FALSE;
+
+    return pSDKDoc->KillFocusAnnot(0);
+}
+
+DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle, FPDF_BITMAP bitmap, FPDF_PAGE page,
+                                    int start_x, int start_y, int size_x, int size_y, int rotate, int flags)
+{
+    if (!hHandle || !page)
+        return ;
+
+    CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
+    CPDFXFA_Document* pDocument = pPage->GetDocument();
+    if (!pDocument)
+        return;
+    CPDF_Document* pPDFDoc = pDocument->GetPDFDoc();
+    if (!pPDFDoc)
+        return;
+
+    CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
+    CPDFSDK_Document* pFXDoc = pEnv->GetSDKDocument();
+    if (!pFXDoc)
+        return;
+
+    CFX_AffineMatrix matrix;
+    pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
+
+    FX_RECT clip;
+    clip.left = start_x;
+    clip.right = start_x + size_x;
+    clip.top = start_y;
+    clip.bottom = start_y + size_y;
 
 #ifdef _SKIA_SUPPORT_
-        CFX_SkiaDevice* pDevice = FX_NEW CFX_SkiaDevice;
+    CFX_SkiaDevice* pDevice = FX_NEW CFX_SkiaDevice;

[Lei Zhang, 2015/07/16 21:12:15]

Not going to put in a unique_ptr here?

[Tom Sepez, 2015/07/16 21:39:04]

Will do.  This seemed different enough in XFA that I reverted to the XFA  
codebase.

 #else
-        CFX_FxgeDevice* pDevice = NULL;
-        pDevice = FX_NEW CFX_FxgeDevice;
+    CFX_FxgeDevice* pDevice = NULL;
+    pDevice = FX_NEW CFX_FxgeDevice;
 #endif
 
-        if (!pDevice)
-                return;
-        pDevice->Attach((CFX_DIBitmap*)bitmap);
-        pDevice->SaveState();
-        pDevice->SetClip_Rect(&clip);
-
-        CPDF_RenderOptions options;
-        if (flags & FPDF_LCD_TEXT)
-                options.m_Flags |= RENDER_CLEARTYPE;
-        else
-                options.m_Flags &= ~RENDER_CLEARTYPE;
-
-        //Grayscale output
-        if (flags & FPDF_GRAYSCALE)
-        {
-                options.m_ColorMode = RENDER_COLOR_GRAY;
-                options.m_ForeColor = 0;
-                options.m_BackColor = 0xffffff;
-        }
-        options.m_AddFlags = flags >> 8;
-
-        options.m_pOCContext = FX_NEW CPDF_OCContext(pPDFDoc);
-
-        if(CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page))
-        {
-                pPageView->PageView_OnDraw(pDevice, &matrix, &options, &clip);
-        }
-        pDevice->RestoreState();
-
-        if(options.m_pOCContext)
-        {
-                delete options.m_pOCContext;
-                options.m_pOCContext = NULL;
-        }
-        if(pDevice)
-        {
-                delete pDevice;
-                pDevice = NULL;
-        }
-
+    if (!pDevice)
+        return;
+    pDevice->Attach((CFX_DIBitmap*)bitmap);
+    pDevice->SaveState();
+    pDevice->SetClip_Rect(&clip);
+
+    CPDF_RenderOptions options;
+    if (flags & FPDF_LCD_TEXT)
+        options.m_Flags |= RENDER_CLEARTYPE;
+    else
+        options.m_Flags &= ~RENDER_CLEARTYPE;
+
+    //Grayscale output
+    if (flags & FPDF_GRAYSCALE)
+    {
+        options.m_ColorMode = RENDER_COLOR_GRAY;
+        options.m_ForeColor = 0;
+        options.m_BackColor = 0xffffff;
+    }
+    options.m_AddFlags = flags >> 8;
+
+    options.m_pOCContext = FX_NEW CPDF_OCContext(pPDFDoc);
+
+    if(CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page))
+    {
+        pPageView->PageView_OnDraw(pDevice, &matrix, &options, &clip);
+    }
+    pDevice->RestoreState();
+
+    if(options.m_pOCContext)
+    {
+        delete options.m_pOCContext;
+        options.m_pOCContext = NULL;
+    }
+    if(pDevice)
+    {
+        delete pDevice;
+        pDevice = NULL;
+    }
 }
 DLLEXPORT void STDCALL FPDF_Widget_Undo(FPDF_DOCUMENT document, FPDF_WIDGET hWidget)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        pXFAMenuHander->Undo((IXFA_Widget*)hWidget);
+    if (NULL == hWidget || NULL == document)
+        return;
+
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    pXFAMenuHander->Undo((IXFA_Widget*)hWidget);
 
 }
 DLLEXPORT void STDCALL FPDF_Widget_Redo(FPDF_DOCUMENT document, FPDF_WIDGET hWidget)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        pXFAMenuHander->Redo((IXFA_Widget*)hWidget);
+    if (NULL == hWidget || NULL == document)
+        return;
+
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    pXFAMenuHander->Redo((IXFA_Widget*)hWidget);
 }
 
 DLLEXPORT void STDCALL FPDF_Widget_SelectAll(FPDF_DOCUMENT document, FPDF_WIDGET hWidget)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        pXFAMenuHander->SelectAll((IXFA_Widget*)hWidget);
+    if (NULL == hWidget || NULL == document)
+        return;
+
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    pXFAMenuHander->SelectAll((IXFA_Widget*)hWidget);
 }
 DLLEXPORT void STDCALL FPDF_Widget_Copy(FPDF_DOCUMENT document, FPDF_WIDGET hWidget, FPDF_WIDESTRING wsText, FPDF_DWORD* size)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        CFX_WideString wsCpText;
-        pXFAMenuHander->Copy((IXFA_Widget*)hWidget, wsCpText);
-
-        CFX_ByteString bsCpText = wsCpText.UTF16LE_Encode();
-        int len = bsCpText.GetLength()/sizeof(unsigned short);
-        if (wsText == NULL) {
-                *size = len;
-                return;
-        }
-
-        int real_size = len < *size ? len : *size;
-        if (real_size > 0)
-        {
-                FXSYS_memcpy((void*)wsText,bsCpText.GetBuffer(real_size*sizeof(unsigned short)),real_size*sizeof(unsigned short));
-                bsCpText.ReleaseBuffer(real_size*sizeof(unsigned short));
-        }
-        *size = real_size;
+    if (NULL == hWidget || NULL == document)
+        return;
+
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    CFX_WideString wsCpText;
+    pXFAMenuHander->Copy((IXFA_Widget*)hWidget, wsCpText);
+
+    CFX_ByteString bsCpText = wsCpText.UTF16LE_Encode();
+    int len = bsCpText.GetLength()/sizeof(unsigned short);
+    if (wsText == NULL) {
+        *size = len;
+        return;
+    }
+
+    int real_size = len < *size ? len : *size;
+    if (real_size > 0)
+    {
+        FXSYS_memcpy((void*)wsText,bsCpText.GetBuffer(real_size*sizeof(unsigned short)),real_size*sizeof(unsigned short));
+        bsCpText.ReleaseBuffer(real_size*sizeof(unsigned short));
+    }
+    *size = real_size;
 }
 DLLEXPORT void STDCALL FPDF_Widget_Cut(FPDF_DOCUMENT document, FPDF_WIDGET hWidget, FPDF_WIDESTRING wsText, FPDF_DWORD* size)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        CFX_WideString wsCpText;
-        pXFAMenuHander->Cut((IXFA_Widget*)hWidget, wsCpText);
-
-        CFX_ByteString bsCpText = wsCpText.UTF16LE_Encode();
-        int len = bsCpText.GetLength()/sizeof(unsigned short);
-        if (wsText == NULL) {
-                *size = len;
-                return;
-        }
-
-        int real_size = len < *size ? len : *size;
-        if (real_size > 0)
-        {
-                FXSYS_memcpy((void*)wsText,bsCpText.GetBuffer(real_size*sizeof(unsigned short)),real_size*sizeof(unsigned short));
-                bsCpText.ReleaseBuffer(real_size*sizeof(unsigned short));
-        }
-        *size = real_size;
+    if (NULL == hWidget || NULL == document)
+        return;
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    CFX_WideString wsCpText;
+    pXFAMenuHander->Cut((IXFA_Widget*)hWidget, wsCpText);
+
+    CFX_ByteString bsCpText = wsCpText.UTF16LE_Encode();
+    int len = bsCpText.GetLength()/sizeof(unsigned short);
+    if (wsText == NULL) {
+        *size = len;
+        return;
+    }
+
+    int real_size = len < *size ? len : *size;
+    if (real_size > 0)
+    {
+        FXSYS_memcpy((void*)wsText,bsCpText.GetBuffer(real_size*sizeof(unsigned short)),real_size*sizeof(unsigned short));
+        bsCpText.ReleaseBuffer(real_size*sizeof(unsigned short));
+    }
+    *size = real_size;
 }
 DLLEXPORT void STDCALL FPDF_Widget_Paste(FPDF_DOCUMENT document, FPDF_WIDGET hWidget, FPDF_WIDESTRING wsText, FPDF_DWORD size)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        CFX_WideString wstr = CFX_WideString::FromUTF16LE(wsText, size);
-        pXFAMenuHander->Paste((IXFA_Widget*)hWidget, wstr);
+    if (NULL == hWidget || NULL == document)
+        return;
+
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    CFX_WideString wstr = CFX_WideString::FromUTF16LE(wsText, size);
+    pXFAMenuHander->Paste((IXFA_Widget*)hWidget, wstr);
 
 }
 DLLEXPORT void STDCALL FPDF_Widget_ReplaceSpellCheckWord(FPDF_DOCUMENT document, FPDF_WIDGET hWidget, float x, float y, FPDF_BYTESTRING bsText)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        CFX_PointF ptPopup;
-        ptPopup.x = x;
-        ptPopup.y = y;
-        CFX_ByteStringC bs(bsText);
-        pXFAMenuHander->ReplaceSpellCheckWord((IXFA_Widget*)hWidget,ptPopup,bs);
+    if (NULL == hWidget || NULL == document)
+        return;
+
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    CFX_PointF ptPopup;
+    ptPopup.x = x;
+    ptPopup.y = y;
+    CFX_ByteStringC bs(bsText);
+    pXFAMenuHander->ReplaceSpellCheckWord((IXFA_Widget*)hWidget,ptPopup,bs);
 
 }
 DLLEXPORT void STDCALL FPDF_Widget_GetSpellCheckWords(FPDF_DOCUMENT document, FPDF_WIDGET hWidget, float x, float y, FPDF_STRINGHANDLE* stringHandle)
 {
-        if (NULL == hWidget || NULL == document)
-                return;
-
-        CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
-        if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
-                return;
-
-        IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
-        if (pXFAMenuHander == NULL)
-                return;
-
-        CFX_ByteStringArray* sSuggestWords = FX_NEW CFX_ByteStringArray;
-        CFX_PointF ptPopup;
-        ptPopup.x = x;
-        ptPopup.y = y;
-        pXFAMenuHander->GetSuggestWords((IXFA_Widget*)hWidget, ptPopup, *sSuggestWords);
-        *stringHandle = (FPDF_STRINGHANDLE)sSuggestWords;
+    if (NULL == hWidget || NULL == document)
+        return;
+
+    CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
+    if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic && pDocument->GetDocType() != XFA_DOCTYPE_Static)
+        return;
+
+    IXFA_MenuHandler* pXFAMenuHander = CPDFXFA_App::GetInstance()->GetXFAApp()->GetMenuHandler();
+    if (pXFAMenuHander == NULL)
+        return;
+
+    CFX_ByteStringArray* sSuggestWords = FX_NEW CFX_ByteStringArray;
+    CFX_PointF ptPopup;
+    ptPopup.x = x;
+    ptPopup.y = y;
+    pXFAMenuHander->GetSuggestWords((IXFA_Widget*)hWidget, ptPopup, *sSuggestWords);
+    *stringHandle = (FPDF_STRINGHANDLE)sSuggestWords;
 }
 DLLEXPORT int STDCALL FPDF_StringHandleCounts(FPDF_STRINGHANDLE stringHandle)
 {
-        if (stringHandle == NULL)
-                return -1;
-        CFX_ByteStringArray* sSuggestWords = (CFX_ByteStringArray*)stringHandle;
-        return sSuggestWords->GetSize();
+    if (stringHandle == NULL)
+        return -1;
+    CFX_ByteStringArray* sSuggestWords = (CFX_ByteStringArray*)stringHandle;
+    return sSuggestWords->GetSize();
 }
 DLLEXPORT FPDF_BOOL STDCALL FPDF_StringHandleGetStringByIndex(FPDF_STRINGHANDLE stringHandle, int index, FPDF_BYTESTRING bsText, FPDF_DWORD* size)
 {
-        if (stringHandle == NULL || size == NULL)
-                return FALSE;
-        int count = FPDF_StringHandleCounts(stringHandle);
-        if (index < 0|| index >= count)
-                return FALSE;
-
-        CFX_ByteStringArray sSuggestWords = *(CFX_ByteStringArray*)stringHandle;
-        int len = sSuggestWords[index].GetLength();
-
-        if (bsText == NULL) {
-                *size = len;
-                return TRUE;
-        }
-
-        int real_size = len < *size ? len : *size;
-        if (real_size > 0)
-                FXSYS_memcpy((void*)bsText, (const FX_CHAR*)(sSuggestWords[index]), real_size);
-        *size = real_size;
-
-        return TRUE;
+    if (stringHandle == NULL || size == NULL)
+        return FALSE;
+    int count = FPDF_StringHandleCounts(stringHandle);
+    if (index < 0|| index >= count)
+        return FALSE;
+
+    CFX_ByteStringArray sSuggestWords = *(CFX_ByteStringArray*)stringHandle;
+    int len = sSuggestWords[index].GetLength();
+
+    if (bsText == NULL) {
+        *size = len;
+        return TRUE;
+    }
+
+    int real_size = len < *size ? len : *size;
+    if (real_size > 0)
+        FXSYS_memcpy((void*)bsText, (const FX_CHAR*)(sSuggestWords[index]), real_size);
+    *size = real_size;
+
+    return TRUE;
 }
 DLLEXPORT void STDCALL FPDF_StringHandleRelease(FPDF_STRINGHANDLE stringHandle)
 {
-        if (stringHandle == NULL)
-                return;
-        CFX_ByteStringArray* sSuggestWords = (CFX_ByteStringArray*)stringHandle;
-        delete sSuggestWords;
+    if (stringHandle == NULL)
+        return;
+    CFX_ByteStringArray* sSuggestWords = (CFX_ByteStringArray*)stringHandle;
+    delete sSuggestWords;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_StringHandleAddString(FPDF_STRINGHANDLE stringHandle, FPDF_BYTESTRING bsText, FPDF_DWORD size)
 {
-        if (stringHandle == NULL || bsText == NULL || size <= 0)
-                return FALSE;
-
-        CFX_ByteStringArray* stringArr = (CFX_ByteStringArray*)stringHandle;
-        CFX_ByteString bsStr(bsText, size);
-
-        stringArr->Add(bsStr);
-        return TRUE;
+    if (stringHandle == NULL || bsText == NULL || size <= 0)
+        return FALSE;
+
+    CFX_ByteStringArray* stringArr = (CFX_ByteStringArray*)stringHandle;
+    CFX_ByteString bsStr(bsText, size);
+
+    stringArr->Add(bsStr);
+    return TRUE;
 }
 
 DLLEXPORT void STDCALL FPDF_SetFormFieldHighlightColor(FPDF_FORMHANDLE hHandle, int fieldType, unsigned long color)
 {
-        if (!hHandle)
-                return;
-//      CPDFDoc_Environment* pEnv = (CPDFDoc_Environment* )hHandle;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(pSDKDoc)
-        {
-                if(CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm())
-                {
-                        pInterForm->SetHighlightColor(color, fieldType);
-                }
-
-        }
-
+    if (CPDFSDK_InterForm* pInterForm = FormHandleToInterForm(hHandle))
+        pInterForm->SetHighlightColor(color, fieldType);
 }
 
 DLLEXPORT void STDCALL FPDF_SetFormFieldHighlightAlpha(FPDF_FORMHANDLE hHandle, unsigned char alpha)
 {
-        if (!hHandle)
-                return;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(pSDKDoc)
-        {
-                if(CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm())
-                        pInterForm->SetHighlightAlpha(alpha);
-        }
+    if (CPDFSDK_InterForm* pInterForm = FormHandleToInterForm(hHandle))
+        pInterForm->SetHighlightAlpha(alpha);
 }
 
 DLLEXPORT void STDCALL FPDF_RemoveFormFieldHighlight(FPDF_FORMHANDLE hHandle)
 {
-        if (!hHandle)
-                return;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(pSDKDoc)
-        {
-                if(CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm())
-                        pInterForm->RemoveAllHighLight();
-        }
+    if (CPDFSDK_InterForm* pInterForm = FormHandleToInterForm(hHandle))
+        pInterForm->RemoveAllHighLight();
 }
 
 DLLEXPORT void STDCALL FORM_OnAfterLoadPage(FPDF_PAGE page, FPDF_FORMHANDLE hHandle)
 {
-        if(!hHandle || !page)
-                return;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(!pSDKDoc)
-                return;
-        CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
-        CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, TRUE);
-        if(pPageView)
-        {
-                pPageView->SetValid(TRUE);
-        }
+    if (CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page))
+        pPageView->SetValid(TRUE);
 }
 
 DLLEXPORT void STDCALL FORM_OnBeforeClosePage(FPDF_PAGE page, FPDF_FORMHANDLE hHandle)
 {
-        if(!hHandle || !page)
-                return;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
-        CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
-        if(pPageView)
-        {
-                pPageView->SetValid(FALSE);
-                // ReMovePageView() takes care of the delete for us.
-                pSDKDoc->ReMovePageView(pPage);
-        }
-}
+    if (!hHandle || !page)
+        return;
+
+    CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
+    if (!pSDKDoc)
+        return;
+
+    CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
+    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
+    if (pPageView)
+    {
+        pPageView->SetValid(FALSE);
+        // ReMovePageView() takes care of the delete for us.
+        pSDKDoc->ReMovePageView(pPage);
+    }
+}
+
 DLLEXPORT void STDCALL FORM_DoDocumentJSAction(FPDF_FORMHANDLE hHandle)
 {
-        if(!hHandle)
-                return;
-        if( CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc())
-        {
-                if(((CPDFDoc_Environment*)hHandle)->IsJSInitiated())
-                        pSDKDoc->ProcJavascriptFun();
-        }
+    CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
+    if (pSDKDoc && ((CPDFDoc_Environment*)hHandle)->IsJSInitiated())
+        pSDKDoc->ProcJavascriptFun();
 }
 
 DLLEXPORT void STDCALL FORM_DoDocumentOpenAction(FPDF_FORMHANDLE hHandle)
 {
-        if(!hHandle)
-                return;
-        if( CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc())
-        {
-                if(((CPDFDoc_Environment*)hHandle)->IsJSInitiated())
-                        pSDKDoc->ProcOpenAction();
-        }
-}
+    CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
+    if (pSDKDoc && ((CPDFDoc_Environment*)hHandle)->IsJSInitiated())
+        pSDKDoc->ProcOpenAction();
+}
+
 DLLEXPORT void STDCALL FORM_DoDocumentAAction(FPDF_FORMHANDLE hHandle, int aaType)
 {
-        if(!hHandle)
-                return;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        if(pSDKDoc)
-        {
-                CPDF_Document* pDoc = pSDKDoc->GetDocument()->GetPDFDoc();
-                CPDF_Dictionary* pDic = pDoc->GetRoot();
-                if (!pDic)
-                        return;
-                CPDF_AAction aa = pDic->GetDict(FX_BSTRC("AA"));
-
-                if(aa.ActionExist((CPDF_AAction::AActionType)aaType))
-                {
-                        CPDF_Action action = aa.GetAction((CPDF_AAction::AActionType)aaType);
-                        CPDFSDK_ActionHandler *pActionHandler = ((CPDFDoc_Environment*)hHandle)->GetActionHander();
-                        ASSERT(pActionHandler != NULL);
-                        pActionHandler->DoAction_Document(action, (CPDF_AAction::AActionType)aaType, pSDKDoc);
-                }
-        }
-}
+    CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
+    if (!pSDKDoc)
+        return;
+
+    CPDF_Document* pDoc = pSDKDoc->GetDocument()->GetPDFDoc();
+    CPDF_Dictionary* pDic = pDoc->GetRoot();
+    if (!pDic)
+        return;
+    CPDF_AAction aa = pDic->GetDict(FX_BSTRC("AA"));
+    if(aa.ActionExist((CPDF_AAction::AActionType)aaType))
+    {
+        CPDF_Action action = aa.GetAction((CPDF_AAction::AActionType)aaType);
+        CPDFSDK_ActionHandler *pActionHandler = ((CPDFDoc_Environment*)hHandle)->GetActionHander();
+        ASSERT(pActionHandler != NULL);
+        pActionHandler->DoAction_Document(action, (CPDF_AAction::AActionType)aaType, pSDKDoc);
+    }
+}
+
 DLLEXPORT void STDCALL FORM_DoPageAAction(FPDF_PAGE page, FPDF_FORMHANDLE hHandle, int aaType)
 {
-        if(!hHandle || !page)
-                return;
-        CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetCurrentDoc();
-        CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
-        CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
-        if(pPageView)
-        {
-                CPDFDoc_Environment *pEnv = pSDKDoc->GetEnv();
-                ASSERT(pEnv != NULL);
-
-                CPDFSDK_ActionHandler *pActionHandler = pEnv->GetActionHander();
-                ASSERT(pActionHandler != NULL);
-
-                if (!pPage->GetPDFPage())
-                        return;
-                CPDF_Dictionary *pPageDict = pPage->GetPDFPage()->m_pFormDict;
-                ASSERT(pPageDict != NULL);
-
-                CPDF_AAction aa = pPageDict->GetDict(FX_BSTRC("AA"));
-
-                FX_BOOL bExistOAAction = FALSE;
-                FX_BOOL bExistCAAction = FALSE;
-                if (FPDFPAGE_AACTION_OPEN == aaType)
-                {
-                        bExistOAAction = aa.ActionExist(CPDF_AAction::OpenPage);
-                        if (bExistOAAction)
-                        {
-                                CPDF_Action action = aa.GetAction(CPDF_AAction::OpenPage);
-                                pActionHandler->DoAction_Page(action, CPDF_AAction::OpenPage, pSDKDoc);
-                        }
-                }
-                else
-                {
-                        bExistCAAction = aa.ActionExist(CPDF_AAction::ClosePage);
-                        if (bExistCAAction)
-                        {
-                                CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
-                                pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
-                        }
-                }
-        }
-}
-
-
+    if(!hHandle || !page)
+        return;
+    CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
+    CPDFXFA_Page* pPage = (CPDFXFA_Page*)page;
+    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
+    if(pPageView)
+    {
+        CPDFDoc_Environment *pEnv = pSDKDoc->GetEnv();
+        CPDFSDK_ActionHandler *pActionHandler = pEnv->GetActionHander();
+        CPDF_Dictionary *pPageDict = pPage->GetPDFPage()->m_pFormDict;
+        CPDF_AAction aa = pPageDict->GetDict(FX_BSTRC("AA"));
+
+        FX_BOOL bExistOAAction = FALSE;
+        FX_BOOL bExistCAAction = FALSE;
+        if (FPDFPAGE_AACTION_OPEN == aaType)
+        {
+            bExistOAAction = aa.ActionExist(CPDF_AAction::OpenPage);
+            if (bExistOAAction)
+            {
+                CPDF_Action action = aa.GetAction(CPDF_AAction::OpenPage);
+                pActionHandler->DoAction_Page(action, CPDF_AAction::OpenPage, pSDKDoc);
+            }
+        }
+        else
+        {
+            bExistCAAction = aa.ActionExist(CPDF_AAction::ClosePage);
+            if (bExistCAAction)
+            {
+                CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
+                pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
+            }
+        }
+    }
+}