Replace manual/error-prone/hard-to-verify arraysize calculations with safe FX_ArraySi...

[pdfium.git] / fpdfsdk / include / javascript / JS_Define.h

diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 108c1e2..0821b62 100644 (file)
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -341,8 +341,8 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        ASSERT(pObj != NULL);\
        FX_BOOL bRet = FALSE;\
        MEMLEAKCHECK_1();\
-       bRet = pObj->QueryProperty((FX_LPCWSTR)propname);\
-       MEMLEAKCHECK_2(class_name, (FX_LPCWSTR)prop_name);\
+       bRet = pObj->QueryProperty(propname.c_str());\
+       MEMLEAKCHECK_2(class_name, prop_name.c_str());\
        if (bRet)\
        {\
                info.GetReturnValue().Set(0x004);\
@@ -376,7 +376,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
        MEMLEAKCHECK_1();\
-       bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, value, sError);\
+       bRet = pObj->DoProperty(cc, propname.c_str(), value, sError);\
        MEMLEAKCHECK_2(class_name, L"GetProperty");\
        if (bRet)\
        {\
@@ -414,7 +414,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
        MEMLEAKCHECK_1();\
-       bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, PropValue, sError);\
+       bRet = pObj->DoProperty(cc, propname.c_str(), PropValue, sError);\
        MEMLEAKCHECK_2(class_name,L"PutProperty");\
        if (bRet)\
        {\
@@ -449,7 +449,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
        MEMLEAKCHECK_1();\
-       bRet = pObj->DelProperty(cc, (FX_LPCWSTR)propname, sError);\
+       bRet = pObj->DelProperty(cc, propname.c_str(), sError);\
        MEMLEAKCHECK_2(class_name,L"DelProperty");\
        if (bRet)\
        {\
@@ -623,10 +623,10 @@ if (JS_DefineGlobalConst(pRuntime,JS_WIDESTRING(const_name),JS_NewString(pRuntim
 /* ======================================== GLOBAL ARRAYS ============================================ */
 
 #define DEFINE_GLOBAL_ARRAY(pRuntime)\
-int size = sizeof(ArrayContent) / sizeof(FX_LPCWSTR);\
+int size = FX_ArraySize(ArrayContent);\
 \
 CJS_Array array(pRuntime);\
-for (int i=0; i<size; i++) array.SetElement(i,CJS_Value(pRuntime,(FX_LPCWSTR)ArrayContent[i]));\
+for (int i=0; i<size; i++) array.SetElement(i,CJS_Value(pRuntime,ArrayContent[i]));\
 \
 CJS_PropValue prop(pRuntime);\
 prop << array;\