[akhaldi] 70471: [0.4.0] * Merge the solitaire no action upon doubleclick fix by Carlo Bramini in r70470. CORE-6514

Author: akhaldi
Date: Thu Dec 31 13:55:16 2015
New Revision: 70471

URL: http://svn.reactos.org/svn/reactos?rev=70471&view=rev
Log:
[0.4.0] * Merge the solitaire no action upon doubleclick fix by Carlo Bramini in r70470.
CORE-6514

Modified:
    branches/ros-branch-0_4_0/   (props changed)
    branches/ros-branch-0_4_0/reactos/   (props changed)
    branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp
    branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp

Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Dec 31 13:55:16 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464
+/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470

Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Dec 31 13:55:16 2015
@@ -20,4 +20,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470

Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a…
==============================================================================
---
branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp	[iso-8859-1]
(original)
+++
branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp	[iso-8859-1]
Thu Dec 31 13:55:16 2015
@@ -12,6 +12,7 @@
 CardStack activepile;
 int LastId;
 bool fGameStarted = false;
+bool bAutoroute = false;
 
 void NewGame(void)
 {
@@ -233,7 +234,7 @@
     SetPlayTimer();
 
     //only drop 1 card at a time
-    if(dragcards.NumCards() != 1)
+    if (!bAutoroute && dragcards.NumCards() != 1)
     {
         TRACE("EXIT SuitStackDropProc()\n");
         return false;
@@ -415,7 +416,9 @@
         //stackobj.MoveCards(pDest, 1, true);
         //use the SimulateDrag funcion, because we get the
         //AddProc callbacks called for us on the destination stacks...
+        bAutoroute = true;
         stackobj.SimulateDrag(pDest, 1, true);
+        bAutoroute = false;
     }
     TRACE("EXIT RowStackDblClickProc()\n");
 }

Modified:
branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a…
==============================================================================
---
branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp	[iso-8859-1]
(original)
+++
branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp	[iso-8859-1]
Thu Dec 31 13:55:16 2015
@@ -243,6 +243,8 @@
                 NULL,                     // use window class menu
                 hInst,                    // program instance handle
                 NULL);                    // creation parameters
+    if (hwnd == NULL)
+        return 1;
 
     hwndMain = hwnd;