[ros-diffs] [gschneider] 43375: [cardlib] Re-add changes that got lost due to an old version being used as base

Author: gschneider
Date: Sun Oct 11 16:15:02 2009
New Revision: 43375

URL: http://svn.reactos.org/svn/reactos?rev=43375&view=rev
Log:
[cardlib] Re-add changes that got lost due to an old version being used as base

Modified:
    trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp
    trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp

Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] Sun Oct 11 16:15:02
2009
@@ -326,7 +326,7 @@
             else
             {
                 HWND hwnd = (HWND)parentWnd;
-                SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED),
(LONG)hwnd);
+                SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED),
(LONG_PTR)hwnd);
             }
         }
     }

Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] Sun Oct 11 16:15:02
2009
@@ -298,7 +298,7 @@
             else
                 fDrawTips = TRUE;
 
-            if(yoffset != 0 && abs(xoffset) == 1 ||    xoffset != 0 &&
abs(yoffset) == 1)
+            if((yoffset != 0 && abs(xoffset) == 1) || (xoffset != 0 &&
abs(yoffset) == 1))
                 fDrawTips = TRUE;
 
             //draw horizontal strips

Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] Sun Oct 11 16:15:02
2009
@@ -626,7 +626,7 @@
 
         MoveDragCardTo(hdc, ix, iy);
 
-        if(attarget || ix == idestx && iy == idesty)
+        if(attarget || (ix == idestx && iy == idesty))
             break;
 
         oldx = (int)x;

Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw…
==============================================================================
--- trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] Sun Oct 11 16:15:02
2009
@@ -275,7 +275,7 @@
 //
 LRESULT CALLBACK CardWindow::CardWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
lParam)
 {
-    CardWindow *cw = (CardWindow *)GetWindowLong(hwnd, 0);
+    CardWindow *cw = (CardWindow *)GetWindowLongPtr(hwnd, 0);
     return cw->WndProc(hwnd, iMsg, wParam, lParam);
 }
 
@@ -366,7 +366,7 @@
         //
         // associate this class with the window
         //
-        SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams);
+        SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
 
         return 1;