Dmitry Timoshkov : cabinet: Fix the regression caused by 4046075462c00f4479f185d1c0514584ff851223.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ddd35f493f40ecd447fa8d0a4591e92a8e91306
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5ddd35f493f40ecd447fa8d0a4...

Author: Dmitry Timoshkov 
Date:   Thu May 15 19:53:36 2008 +0900

cabinet: Fix the regression caused by 4046075462c00f4479f185d1c0514584ff851223.

---

dlls/cabinet/fdi.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index 3194d67..47e36e8 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -1178,8 +1178,9 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph
       ZIPDUMPBITS(e)
       do
       {
-        d = max(d & (ZIPWSIZE - 1), w);
-        e = min(ZIPWSIZE - d, n);
+        d &= ZIPWSIZE - 1;
+        e = ZIPWSIZE - max(d, w);
+        e = min(e, n);
         n -= e;
         do
         {