summaryrefslogtreecommitdiff
path: root/fpdfsdk/javascript/JS_GlobalData.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-03-25 14:52:27 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 14:52:28 -0700
commitc3255f55954b2adc3edbd3269c0a8779f7d4b7ad (patch)
tree802c0e9158e14f1e67ad181089739a176e8fba24 /fpdfsdk/javascript/JS_GlobalData.cpp
parentdeee3d2ee201d62e7ef41e7d8378d7f52e057a9c (diff)
downloadpdfium-c3255f55954b2adc3edbd3269c0a8779f7d4b7ad.tar.xz
Remove FX_DWORD from fpdfsdk/ and testing
BUG= Review URL: https://codereview.chromium.org/1835693002
Diffstat (limited to 'fpdfsdk/javascript/JS_GlobalData.cpp')
-rw-r--r--fpdfsdk/javascript/JS_GlobalData.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/fpdfsdk/javascript/JS_GlobalData.cpp b/fpdfsdk/javascript/JS_GlobalData.cpp
index 3376ccdc61..2c2ec1d5c1 100644
--- a/fpdfsdk/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/javascript/JS_GlobalData.cpp
@@ -328,19 +328,19 @@ void CJS_GlobalData::LoadGlobalPersistentVariables() {
ASSERT(wVersion <= 2);
- FX_DWORD dwCount = *((FX_DWORD*)p);
- p += sizeof(FX_DWORD);
+ uint32_t dwCount = *((uint32_t*)p);
+ p += sizeof(uint32_t);
- FX_DWORD dwSize = *((FX_DWORD*)p);
- p += sizeof(FX_DWORD);
+ uint32_t dwSize = *((uint32_t*)p);
+ p += sizeof(uint32_t);
- if (dwSize == nLength - sizeof(uint16_t) * 2 - sizeof(FX_DWORD) * 2) {
+ if (dwSize == nLength - sizeof(uint16_t) * 2 - sizeof(uint32_t) * 2) {
for (int32_t i = 0, sz = dwCount; i < sz; i++) {
if (p > pBuffer + nLength)
break;
- FX_DWORD dwNameLen = *((FX_DWORD*)p);
- p += sizeof(FX_DWORD);
+ uint32_t dwNameLen = *((uint32_t*)p);
+ p += sizeof(uint32_t);
if (p + dwNameLen > pBuffer + nLength)
break;
@@ -356,8 +356,8 @@ void CJS_GlobalData::LoadGlobalPersistentVariables() {
double dData = 0;
switch (wVersion) {
case 1: {
- FX_DWORD dwData = *((FX_DWORD*)p);
- p += sizeof(FX_DWORD);
+ uint32_t dwData = *((uint32_t*)p);
+ p += sizeof(uint32_t);
dData = dwData;
} break;
case 2: {
@@ -375,8 +375,8 @@ void CJS_GlobalData::LoadGlobalPersistentVariables() {
SetGlobalVariablePersistent(sEntry, TRUE);
} break;
case JS_GLOBALDATA_TYPE_STRING: {
- FX_DWORD dwLength = *((FX_DWORD*)p);
- p += sizeof(FX_DWORD);
+ uint32_t dwLength = *((uint32_t*)p);
+ p += sizeof(uint32_t);
if (p + dwLength > pBuffer + nLength)
break;
@@ -398,7 +398,7 @@ void CJS_GlobalData::LoadGlobalPersistentVariables() {
}
void CJS_GlobalData::SaveGlobalPersisitentVariables() {
- FX_DWORD nCount = 0;
+ uint32_t nCount = 0;
CFX_BinaryBuf sData;
for (int i = 0, sz = m_arrayGlobalData.GetSize(); i < sz; i++) {
@@ -421,9 +421,9 @@ void CJS_GlobalData::SaveGlobalPersisitentVariables() {
sFile.AppendBlock(&wType, sizeof(uint16_t));
uint16_t wVersion = 2;
sFile.AppendBlock(&wVersion, sizeof(uint16_t));
- sFile.AppendBlock(&nCount, sizeof(FX_DWORD));
- FX_DWORD dwSize = sData.GetSize();
- sFile.AppendBlock(&dwSize, sizeof(FX_DWORD));
+ sFile.AppendBlock(&nCount, sizeof(uint32_t));
+ uint32_t dwSize = sData.GetSize();
+ sFile.AppendBlock(&dwSize, sizeof(uint32_t));
sFile.AppendBlock(sData.GetBuffer(), sData.GetSize());
@@ -451,8 +451,8 @@ void CJS_GlobalData::MakeByteString(const CFX_ByteString& name,
uint16_t wType = (uint16_t)pData->nType;
switch (wType) {
case JS_GLOBALDATA_TYPE_NUMBER: {
- FX_DWORD dwNameLen = (FX_DWORD)name.GetLength();
- sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
+ uint32_t dwNameLen = (uint32_t)name.GetLength();
+ sData.AppendBlock(&dwNameLen, sizeof(uint32_t));
sData.AppendString(name);
sData.AppendBlock(&wType, sizeof(uint16_t));
@@ -460,8 +460,8 @@ void CJS_GlobalData::MakeByteString(const CFX_ByteString& name,
sData.AppendBlock(&dData, sizeof(double));
} break;
case JS_GLOBALDATA_TYPE_BOOLEAN: {
- FX_DWORD dwNameLen = (FX_DWORD)name.GetLength();
- sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
+ uint32_t dwNameLen = (uint32_t)name.GetLength();
+ sData.AppendBlock(&dwNameLen, sizeof(uint32_t));
sData.AppendString(name);
sData.AppendBlock(&wType, sizeof(uint16_t));
@@ -469,20 +469,20 @@ void CJS_GlobalData::MakeByteString(const CFX_ByteString& name,
sData.AppendBlock(&wData, sizeof(uint16_t));
} break;
case JS_GLOBALDATA_TYPE_STRING: {
- FX_DWORD dwNameLen = (FX_DWORD)name.GetLength();
- sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
+ uint32_t dwNameLen = (uint32_t)name.GetLength();
+ sData.AppendBlock(&dwNameLen, sizeof(uint32_t));
sData.AppendString(name);
sData.AppendBlock(&wType, sizeof(uint16_t));
- FX_DWORD dwDataLen = (FX_DWORD)pData->sData.GetLength();
- sData.AppendBlock(&dwDataLen, sizeof(FX_DWORD));
+ uint32_t dwDataLen = (uint32_t)pData->sData.GetLength();
+ sData.AppendBlock(&dwDataLen, sizeof(uint32_t));
sData.AppendString(pData->sData);
} break;
case JS_GLOBALDATA_TYPE_NULL: {
- FX_DWORD dwNameLen = (FX_DWORD)name.GetLength();
- sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
+ uint32_t dwNameLen = (uint32_t)name.GetLength();
+ sData.AppendBlock(&dwNameLen, sizeof(uint32_t));
sData.AppendString(name);
- sData.AppendBlock(&wType, sizeof(FX_DWORD));
+ sData.AppendBlock(&wType, sizeof(uint32_t));
} break;
default:
break;