1 files changed, 216 insertions, 133 deletions

diff --git a/fpdfsdk/include/javascript/app.h b/fpdfsdk/include/javascript/app.h
index ac90e62b0d..221a7c1d89 100644
--- a/fpdfsdk/include/javascript/app.h
+++ b/fpdfsdk/include/javascript/app.h
@@ -15,35 +15,33 @@ class CJS_Runtime;
 
 class CJS_Timer;
 
-class TimerObj : public CJS_EmbedObj
-{
-public:
-	TimerObj(CJS_Object* pJSObject);
-	virtual ~TimerObj();
-
-public:
-	void			SetTimer(CJS_Timer* pTimer);
-	CJS_Timer*		GetTimer() const;
-
-private:
-	CJS_Timer*		m_pTimer;
-};
+class TimerObj : public CJS_EmbedObj {
+ public:
+  TimerObj(CJS_Object* pJSObject);
+  virtual ~TimerObj();
 
-class CJS_TimerObj : public CJS_Object
-{
-public:
-	CJS_TimerObj(JSFXObject pObject) : CJS_Object(pObject) {}
-	virtual ~CJS_TimerObj(){}
+ public:
+  void SetTimer(CJS_Timer* pTimer);
+  CJS_Timer* GetTimer() const;
 
-	DECLARE_JS_CLASS(CJS_TimerObj);
+ private:
+  CJS_Timer* m_pTimer;
 };
 
+class CJS_TimerObj : public CJS_Object {
+ public:
+  CJS_TimerObj(JSFXObject pObject) : CJS_Object(pObject) {}
+  virtual ~CJS_TimerObj() {}
+
+  DECLARE_JS_CLASS(CJS_TimerObj);
+};
 
 // struct APP_MENUITEM_ARRAY;
 //
 // struct APP_MENUITEM
 // {
-// 	APP_MENUITEM() : oSubMenu(NULL), cName(L""), cReturn(L""), bMarked(false), bEnabled(true)
+// 	APP_MENUITEM() : oSubMenu(NULL), cName(L""), cReturn(L""),
+// bMarked(false), bEnabled(true)
 // 	{
 // 	}
 // 	CFX_WideString cName;
@@ -103,121 +101,206 @@ public:
 // 	HMENU hMenu;
 // };
 
-class app : public CJS_EmbedObj
-{
-public:
-	app(CJS_Object * pJSObject);
-	virtual ~app();
-
-public:
-	FX_BOOL						activeDocs(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						calculate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						formsVersion(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						fs(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						fullscreen(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						language(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						media(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						platform(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						runtimeHighlight(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						viewerType(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						viewerVariation(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-	FX_BOOL						viewerVersion(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
-
-
-	FX_BOOL						alert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						beep(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						browseForDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						clearInterval(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						clearTimeOut(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						execDialog(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						execMenuItem(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						findComponent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						goBack(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						goForward(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						launchURL(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						mailMsg(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						newFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						newDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						openDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						openFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						popUpMenuEx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						popUpMenu(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						response(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						setInterval(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-	FX_BOOL						setTimeOut(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError);
-
-private:
-//	FX_DWORD					AppGetTickCount();
-	void						TimerProc(CJS_Timer* pTimer);
-	void						RunJsScript(CJS_Runtime * pRuntime,const CFX_WideString & wsScript);
-//	void						ParsePopupMenuObj(APP_MENUITEM * ppMenuItem,JSObject * pObj);
-//	void						DeleteMenuItems(APP_MENUITEM_ARRAY * pMenuItems);
-// 	void						AddMenuItem(APP_MENUITEM_ARRAY * pMenuItems, HMENU hMenu, MENUITEMINFO MenuItemInfo);
-// 	void						InitMenuItemInfo(MENUITEMINFO& MenuItemInfo);
-// 	void						DestroyPopUpMenu();
-
-// 	void						ParserMenuItem(APP_MENU* pHead, const CJS_Parameters&params);
-// 	void						AddItemToMenu(APP_MENU* pHead, HMENU hMenu, MENUITEMINFO MenuItemInfo);
-// 	void						DestroyMenuItems(APP_MENU* pHead);
-
-public:
-	static CFX_WideString		SysPathToPDFPath(const CFX_WideString& sOldPath);
-
-private:
-
-	bool						m_bCalculate;
-	bool						m_bRuntimeHighLight;
-
-	CFX_ArrayTemplate<CJS_Timer*>	m_aTimer;
-//	APP_MENU*					m_pMenuHead;
-
-public:
-//	static CReader_App* s_App;
+class app : public CJS_EmbedObj {
+ public:
+  app(CJS_Object* pJSObject);
+  virtual ~app();
+
+ public:
+  FX_BOOL activeDocs(IFXJS_Context* cc,
+                     CJS_PropValue& vp,
+                     CFX_WideString& sError);
+  FX_BOOL calculate(IFXJS_Context* cc,
+                    CJS_PropValue& vp,
+                    CFX_WideString& sError);
+  FX_BOOL formsVersion(IFXJS_Context* cc,
+                       CJS_PropValue& vp,
+                       CFX_WideString& sError);
+  FX_BOOL fs(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
+  FX_BOOL fullscreen(IFXJS_Context* cc,
+                     CJS_PropValue& vp,
+                     CFX_WideString& sError);
+  FX_BOOL language(IFXJS_Context* cc,
+                   CJS_PropValue& vp,
+                   CFX_WideString& sError);
+  FX_BOOL media(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
+  FX_BOOL platform(IFXJS_Context* cc,
+                   CJS_PropValue& vp,
+                   CFX_WideString& sError);
+  FX_BOOL runtimeHighlight(IFXJS_Context* cc,
+                           CJS_PropValue& vp,
+                           CFX_WideString& sError);
+  FX_BOOL viewerType(IFXJS_Context* cc,
+                     CJS_PropValue& vp,
+                     CFX_WideString& sError);
+  FX_BOOL viewerVariation(IFXJS_Context* cc,
+                          CJS_PropValue& vp,
+                          CFX_WideString& sError);
+  FX_BOOL viewerVersion(IFXJS_Context* cc,
+                        CJS_PropValue& vp,
+                        CFX_WideString& sError);
+
+  FX_BOOL alert(IFXJS_Context* cc,
+                const CJS_Parameters& params,
+                CJS_Value& vRet,
+                CFX_WideString& sError);
+  FX_BOOL beep(IFXJS_Context* cc,
+               const CJS_Parameters& params,
+               CJS_Value& vRet,
+               CFX_WideString& sError);
+  FX_BOOL browseForDoc(IFXJS_Context* cc,
+                       const CJS_Parameters& params,
+                       CJS_Value& vRet,
+                       CFX_WideString& sError);
+  FX_BOOL clearInterval(IFXJS_Context* cc,
+                        const CJS_Parameters& params,
+                        CJS_Value& vRet,
+                        CFX_WideString& sError);
+  FX_BOOL clearTimeOut(IFXJS_Context* cc,
+                       const CJS_Parameters& params,
+                       CJS_Value& vRet,
+                       CFX_WideString& sError);
+  FX_BOOL execDialog(IFXJS_Context* cc,
+                     const CJS_Parameters& params,
+                     CJS_Value& vRet,
+                     CFX_WideString& sError);
+  FX_BOOL execMenuItem(IFXJS_Context* cc,
+                       const CJS_Parameters& params,
+                       CJS_Value& vRet,
+                       CFX_WideString& sError);
+  FX_BOOL findComponent(IFXJS_Context* cc,
+                        const CJS_Parameters& params,
+                        CJS_Value& vRet,
+                        CFX_WideString& sError);
+  FX_BOOL goBack(IFXJS_Context* cc,
+                 const CJS_Parameters& params,
+                 CJS_Value& vRet,
+                 CFX_WideString& sError);
+  FX_BOOL goForward(IFXJS_Context* cc,
+                    const CJS_Parameters& params,
+                    CJS_Value& vRet,
+                    CFX_WideString& sError);
+  FX_BOOL launchURL(IFXJS_Context* cc,
+                    const CJS_Parameters& params,
+                    CJS_Value& vRet,
+                    CFX_WideString& sError);
+  FX_BOOL mailMsg(IFXJS_Context* cc,
+                  const CJS_Parameters& params,
+                  CJS_Value& vRet,
+                  CFX_WideString& sError);
+  FX_BOOL newFDF(IFXJS_Context* cc,
+                 const CJS_Parameters& params,
+                 CJS_Value& vRet,
+                 CFX_WideString& sError);
+  FX_BOOL newDoc(IFXJS_Context* cc,
+                 const CJS_Parameters& params,
+                 CJS_Value& vRet,
+                 CFX_WideString& sError);
+  FX_BOOL openDoc(IFXJS_Context* cc,
+                  const CJS_Parameters& params,
+                  CJS_Value& vRet,
+                  CFX_WideString& sError);
+  FX_BOOL openFDF(IFXJS_Context* cc,
+                  const CJS_Parameters& params,
+                  CJS_Value& vRet,
+                  CFX_WideString& sError);
+  FX_BOOL popUpMenuEx(IFXJS_Context* cc,
+                      const CJS_Parameters& params,
+                      CJS_Value& vRet,
+                      CFX_WideString& sError);
+  FX_BOOL popUpMenu(IFXJS_Context* cc,
+                    const CJS_Parameters& params,
+                    CJS_Value& vRet,
+                    CFX_WideString& sError);
+  FX_BOOL response(IFXJS_Context* cc,
+                   const CJS_Parameters& params,
+                   CJS_Value& vRet,
+                   CFX_WideString& sError);
+  FX_BOOL setInterval(IFXJS_Context* cc,
+                      const CJS_Parameters& params,
+                      CJS_Value& vRet,
+                      CFX_WideString& sError);
+  FX_BOOL setTimeOut(IFXJS_Context* cc,
+                     const CJS_Parameters& params,
+                     CJS_Value& vRet,
+                     CFX_WideString& sError);
+
+ private:
+  //	FX_DWORD					AppGetTickCount();
+  void TimerProc(CJS_Timer* pTimer);
+  void RunJsScript(CJS_Runtime* pRuntime, const CFX_WideString& wsScript);
+  //	void						ParsePopupMenuObj(APP_MENUITEM *
+  //ppMenuItem,JSObject * pObj);
+  //	void						DeleteMenuItems(APP_MENUITEM_ARRAY *
+  //pMenuItems);
+  // 	void						AddMenuItem(APP_MENUITEM_ARRAY * pMenuItems, HMENU
+  // hMenu, MENUITEMINFO MenuItemInfo);
+  // 	void						InitMenuItemInfo(MENUITEMINFO&
+  // MenuItemInfo);
+  // 	void						DestroyPopUpMenu();
+
+  // 	void						ParserMenuItem(APP_MENU* pHead, const
+  // CJS_Parameters&params);
+  // 	void						AddItemToMenu(APP_MENU* pHead, HMENU hMenu,
+  // MENUITEMINFO MenuItemInfo);
+  // 	void						DestroyMenuItems(APP_MENU*
+  // pHead);
+
+ public:
+  static CFX_WideString SysPathToPDFPath(const CFX_WideString& sOldPath);
+
+ private:
+  bool m_bCalculate;
+  bool m_bRuntimeHighLight;
+
+  CFX_ArrayTemplate<CJS_Timer*> m_aTimer;
+  //	APP_MENU*					m_pMenuHead;
+
+ public:
+  //	static CReader_App* s_App;
 };
 
-class CJS_App : public CJS_Object
-{
-public:
-	CJS_App(JSFXObject  pObject) : CJS_Object(pObject) {};
-	virtual ~CJS_App(void){};
-
-	DECLARE_JS_CLASS(CJS_App);
-
-	JS_STATIC_PROP(activeDocs, app);
-	JS_STATIC_PROP(calculate, app);
-	JS_STATIC_PROP(formsVersion, app);
-	JS_STATIC_PROP(fs, app);
-	JS_STATIC_PROP(fullscreen, app);
-	JS_STATIC_PROP(language, app);
-	JS_STATIC_PROP(media, app);
-	JS_STATIC_PROP(platform, app);
-	JS_STATIC_PROP(runtimeHighlight, app);
-	JS_STATIC_PROP(viewerType, app);
-	JS_STATIC_PROP(viewerVariation, app);
-	JS_STATIC_PROP(viewerVersion, app);
-
-	JS_STATIC_METHOD(alert, app);
-	JS_STATIC_METHOD(beep, app);
-	JS_STATIC_METHOD(browseForDoc, app);
-	JS_STATIC_METHOD(clearInterval, app);
-	JS_STATIC_METHOD(clearTimeOut, app);
-	JS_STATIC_METHOD(execDialog, app);
-	JS_STATIC_METHOD(execMenuItem, app);
-	JS_STATIC_METHOD(findComponent, app);
-	JS_STATIC_METHOD(goBack, app);
-	JS_STATIC_METHOD(goForward, app);
-	JS_STATIC_METHOD(launchURL, app);
-	JS_STATIC_METHOD(mailMsg, app);
-	JS_STATIC_METHOD(newFDF, app);
-	JS_STATIC_METHOD(newDoc, app);
-	JS_STATIC_METHOD(openDoc, app);
-	JS_STATIC_METHOD(openFDF, app);
-	JS_STATIC_METHOD(popUpMenuEx, app);
-	JS_STATIC_METHOD(popUpMenu, app);
-	JS_STATIC_METHOD(response, app);
-	JS_STATIC_METHOD(setInterval, app);
-	JS_STATIC_METHOD(setTimeOut, app);
-
+class CJS_App : public CJS_Object {
+ public:
+  CJS_App(JSFXObject pObject) : CJS_Object(pObject){};
+  virtual ~CJS_App(void){};
+
+  DECLARE_JS_CLASS(CJS_App);
+
+  JS_STATIC_PROP(activeDocs, app);
+  JS_STATIC_PROP(calculate, app);
+  JS_STATIC_PROP(formsVersion, app);
+  JS_STATIC_PROP(fs, app);
+  JS_STATIC_PROP(fullscreen, app);
+  JS_STATIC_PROP(language, app);
+  JS_STATIC_PROP(media, app);
+  JS_STATIC_PROP(platform, app);
+  JS_STATIC_PROP(runtimeHighlight, app);
+  JS_STATIC_PROP(viewerType, app);
+  JS_STATIC_PROP(viewerVariation, app);
+  JS_STATIC_PROP(viewerVersion, app);
+
+  JS_STATIC_METHOD(alert, app);
+  JS_STATIC_METHOD(beep, app);
+  JS_STATIC_METHOD(browseForDoc, app);
+  JS_STATIC_METHOD(clearInterval, app);
+  JS_STATIC_METHOD(clearTimeOut, app);
+  JS_STATIC_METHOD(execDialog, app);
+  JS_STATIC_METHOD(execMenuItem, app);
+  JS_STATIC_METHOD(findComponent, app);
+  JS_STATIC_METHOD(goBack, app);
+  JS_STATIC_METHOD(goForward, app);
+  JS_STATIC_METHOD(launchURL, app);
+  JS_STATIC_METHOD(mailMsg, app);
+  JS_STATIC_METHOD(newFDF, app);
+  JS_STATIC_METHOD(newDoc, app);
+  JS_STATIC_METHOD(openDoc, app);
+  JS_STATIC_METHOD(openFDF, app);
+  JS_STATIC_METHOD(popUpMenuEx, app);
+  JS_STATIC_METHOD(popUpMenu, app);
+  JS_STATIC_METHOD(response, app);
+  JS_STATIC_METHOD(setInterval, app);
+  JS_STATIC_METHOD(setTimeOut, app);
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_