Gerald Pfeifer : wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: e1e1821fbc7595aaaefd17f727d3399ba89ab9dc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e1e1821fbc7595aaaefd17f727...

Author: Gerald Pfeifer <gerald(a)pfeifer.com>
Date:   Sun Feb 13 00:54:05 2011 +0100

wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends.
(cherry picked from commit 7f6d6b835dc361eab32e939c2745bd37930de888)

---

 libs/wpp/ppy.y |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y
index 5a63494..5f1566e 100644
--- a/libs/wpp/ppy.y
+++ b/libs/wpp/ppy.y
@@ -61,7 +61,7 @@
 	else if(cv_signed(v1) && !cv_signed(v2))	\
 		r.val.si = v1.val.si OP v2.val.ui;	\
 	else if(!cv_signed(v1) && cv_signed(v2))	\
-		r.val.ui = v1.val.ui OP v2.val.si;	\
+		r.val.si = v1.val.ui OP v2.val.si;	\
 	else						\
 		r.val.ui = v1.val.ui OP v2.val.ui;
 
@@ -72,7 +72,7 @@
 	else if(cv_signed(v1) && !cv_signed(v2))	\
 		r.val.sl = v1.val.sl OP v2.val.ul;	\
 	else if(!cv_signed(v1) && cv_signed(v2))	\
-		r.val.ul = v1.val.ul OP v2.val.sl;	\
+		r.val.sl = v1.val.ul OP v2.val.sl;	\
 	else						\
 		r.val.ul = v1.val.ul OP v2.val.ul;
 
@@ -83,7 +83,7 @@
 	else if(cv_signed(v1) && !cv_signed(v2))	\
 		r.val.sll = v1.val.sll OP v2.val.ull;	\
 	else if(!cv_signed(v1) && cv_signed(v2))	\
-		r.val.ull = v1.val.ull OP v2.val.sll;	\
+		r.val.sll = v1.val.ull OP v2.val.sll;	\
 	else						\
 		r.val.ull = v1.val.ull OP v2.val.ull;