Juan Lang : crypt32: Simplify alignment calculation.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jul 31 07:54:38 CDT 2007
Module: wine
Branch: master
Commit: f0509c49d1701e9dd962962254226436e9b8ba19
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0509c49d1701e9dd962962254226436e9b8ba19
Author: Juan Lang <juan.lang at gmail.com>
Date: Mon Jul 30 12:08:24 2007 -0700
crypt32: Simplify alignment calculation.
---
dlls/crypt32/decode.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c
index 2f589dc..846f6e1 100644
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -351,19 +351,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType,
: NULL, &items[i].size);
if (ret)
{
- if (nextData && items[i].hasPointer &&
- items[i].size > items[i].minSize)
- {
- nextData += items[i].size - items[i].minSize;
- /* align nextData to DWORD boundaries */
- if (items[i].size % sizeof(DWORD))
- nextData += sizeof(DWORD) - items[i].size %
- sizeof(DWORD);
- }
/* Account for alignment padding */
if (items[i].size % sizeof(DWORD))
items[i].size += sizeof(DWORD) -
items[i].size % sizeof(DWORD);
+ if (nextData && items[i].hasPointer &&
+ items[i].size > items[i].minSize)
+ nextData += items[i].size - items[i].minSize;
ptr += 1 + nextItemLenBytes + nextItemLen;
decoded += 1 + nextItemLenBytes + nextItemLen;
TRACE("item %d: decoded %d bytes\n", i,
More information about the wine-cvs
mailing list