From 5cf9826eae6e52438e1d4fd1ccb7a046f32138cb Mon Sep 17 00:00:00 2001 From: Juan Lang Date: Tue, 18 Sep 2007 09:21:39 -0700 Subject: [PATCH] Fix alignment for 64-bit systems --- dlls/crypt32/msg.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 1a96205..14dbb50 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1756,8 +1756,8 @@ static inline void CRYPT_CopyAttributes( { DWORD i; - if ((*nextData - (LPBYTE)0) % sizeof(DWORD)) - *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD); + if ((*nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD_PTR); out->rgAttr = (CRYPT_ATTRIBUTE *)*nextData; *nextData += in->cAttr * sizeof(CRYPT_ATTRIBUTE); for (i = 0; i < in->cAttr; i++) @@ -1773,8 +1773,8 @@ static inline void CRYPT_CopyAttributes( DWORD j; out->rgAttr[i].cValue = in->rgAttr[i].cValue; - if ((*nextData - (LPBYTE)0) % sizeof(DWORD)) - *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD); + if ((*nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD_PTR); out->rgAttr[i].rgValue = (PCRYPT_DATA_BLOB)*nextData; for (j = 0; j < in->rgAttr[i].cValue; j++) CRYPT_CopyBlob(&out->rgAttr[i].rgValue[j], @@ -1793,8 +1793,8 @@ static DWORD CRYPT_SizeOfAttributes(cons if (attr->rgAttr[i].pszObjId) size += strlen(attr->rgAttr[i].pszObjId) + 1; /* align pointer */ - if (size % sizeof(DWORD)) - size += size % sizeof(DWORD); + if (size % sizeof(DWORD_PTR)) + size += size % sizeof(DWORD_PTR); size += attr->rgAttr[i].cValue * sizeof(CRYPT_DATA_BLOB); for (j = 0; j < attr->rgAttr[i].cValue; j++) size += attr->rgAttr[i].rgValue[j].cbData; @@ -1818,8 +1818,8 @@ static BOOL CRYPT_CopySignerInfo(void *p size += in->HashEncryptionAlgorithm.Parameters.cbData; size += in->EncryptedHash.cbData; /* align pointer */ - if (size % sizeof(DWORD)) - size += size % sizeof(DWORD); + if (size % sizeof(DWORD_PTR)) + size += size % sizeof(DWORD_PTR); size += CRYPT_SizeOfAttributes(&in->AuthAttrs); size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); if (!pvData) @@ -1847,8 +1847,8 @@ static BOOL CRYPT_CopySignerInfo(void *p &in->HashEncryptionAlgorithm, &nextData); CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); /* align pointer */ - if ((nextData - (LPBYTE)0) % sizeof(DWORD)) - nextData += (nextData - (LPBYTE)0) % sizeof(DWORD); + if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); ret = TRUE; -- 1.4.1