From b69da0b96ffdad124efd1b48d51c617bb216a98e Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Mon, 8 Dec 2014 13:10:02 -0800 Subject: Getting rid of more (FX_LPCWSTR) casts and fixing two bugs revealed by this. Since casts to FX_LPCWSTR have been shown to hide bugs I tried removing more of them, targeting those places where a cast was used to force a conversion from CFX_WideString to FX_LPCWSTR, replacing these casts with calls to the newly added .c_str() function. This revealed two places where the cast was hiding a bug -- where ->c_str() was required instead! This removes ~33 FX_LPCWSTR casts and there are ~31 left, many of which will go away in some future change. Also includes this change: Removing unnecessary casts from wchar_t* to wchar_t*, by various names. Original patch from Bruce Dawson(brucedawson@chromium.org) R=bo_xu@foxitsoftware.com, tsepez@chromium.org Review URL: https://codereview.chromium.org/733693003 --- fpdfsdk/include/javascript/JS_Define.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index 62a8d1417e..379af0662a 100644 --- 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)\ {\ -- cgit v1.2.3