crypt32(8/11): Simplify alignment calculation

[Juan Lang]

--Juan
-------------- next part --------------
From 65a8157c53d1e7c506f75ad17d6b278e6b382260 Mon Sep 17 00:00:00 2001
From: Juan Lang <juanlang at juan.corp.google.com>
Date: Mon, 30 Jul 2007 12:08:24 -0700
Subject: [PATCH] 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
                          : 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,
-- 
1.4.1