diff --git a/reactos/lib/3rdparty/cardlib/cardbutton.cpp b/reactos/lib/3rdparty/cardlib/cardbutton.cpp index 66e7e77a18d..1722624f59c 100644 --- a/reactos/lib/3rdparty/cardlib/cardbutton.cpp +++ b/reactos/lib/3rdparty/cardlib/cardbutton.cpp @@ -326,7 +326,7 @@ int CardButton::OnLButtonUp(HWND hwnd, int x, int y) 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); } } } diff --git a/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp b/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp index 4c95613b338..84b748332be 100644 --- a/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp +++ b/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp @@ -298,7 +298,7 @@ void CardRegion::Render(HDC hdc) 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 diff --git a/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp b/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp index 52c269f2363..c8cdf4a3aff 100644 --- a/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp +++ b/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp @@ -626,7 +626,7 @@ void CardRegion::ZoomCard(HDC hdc, int xpos, int ypos, CardRegion *pDestStack) MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; diff --git a/reactos/lib/3rdparty/cardlib/cardwindow.cpp b/reactos/lib/3rdparty/cardlib/cardwindow.cpp index 400985e1215..cb03193aa15 100644 --- a/reactos/lib/3rdparty/cardlib/cardwindow.cpp +++ b/reactos/lib/3rdparty/cardlib/cardwindow.cpp @@ -275,7 +275,7 @@ CardRegion* CardWindow::CardRegionFromPoint(int x, int y) // 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 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM // // associate this class with the window // - SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams); + SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams); return 1;