From 97ce25072a42615bbd2a2e88d6526840a6c27c2a Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Mon, 22 Nov 2010 16:10:42 +0000
Subject: [PATCH] Remove the 'death' tasks from the demo as on Win2K and WinXP
 the behaviour of the TerminateThread() function is such that resources leak
 and eventually the 'death' tests will fail.

---
 Demo/WIN32-MSVC/WIN32.suo             | Bin 54784 -> 54784 bytes
 Demo/WIN32-MSVC/WIN32.vcxproj         |   2 +-
 Demo/WIN32-MSVC/WIN32.vcxproj.filters |  16 ++++++++--------
 Demo/WIN32-MSVC/main.c                |  10 ----------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Demo/WIN32-MSVC/WIN32.suo b/Demo/WIN32-MSVC/WIN32.suo
index a6a78775b5325202320169eb8b0390c67a30dbd4..84fd5718cbc17eef3ab1bdc3cc25356bff2183a9 100644
GIT binary patch
delta 1691
zcmb7EVN6q36u$Spf*nGkfQq#gs8y&IN0p&yDGz9<&~92VM$srD1H@9a6vmj+2O5Il
zaN{iMkA-MivTR{y>_*W|W8F-qQ!-}E%+xve!)3;0VMaISknUVoO^m;GU%s4o&i&qd
z-#O>LBM*u4kof5ZffmC>VQyYNA;gTB4243=&`O8`L?NOG@iHP0u@YfNlpr{_l-qY*
zMT2gUsw%fn3~cVXL`4jem8?yn5lozv9wr;Zmd7|U(O(pf<)DRNq;?(O;A)nKH!NXm
zMJpk=DhGlq<6Ils<A~z0&lU3clrpqV^t%u&d)fg7d}T7T2h+zy<unY%BEXuL!5+k}
z7L>EliwQ@-7eA(4gHH6bK*DN89Cs!co7jT{r^u6pw`b*noa7Xn$VPAtWx_;KOUz$|
z$A*8rlcCby;|%|7V@eZgBsIiGQb`NhMw&=7*+Sgtt@}0#DFp0}T#)B%Q;W$hr;@sl
z+|aadSf{@9s4o_NwkAT~?8USl&S~=dHM`YACC3*htTFc9-}oqD?(ob3VTuya+yYv$
z0*=%w)Pr{upL8~VU^x~g1g?4a_bx|9Lb3-7y_K{rOkV0<b${tGv$weC`oW`W{5qBh
zB%Q=0txQ4INibZR21j#KAgGh+FHm6dGbshPj()u!e#lQ}QrbyDP*C=GZd(MM&zg-P
zfo4FnX^-%6GCVf5(FM?)>5pEBuU7Kxa6y542{`+dY{jB^${609XA2r~YST_2X9U4_
zPN6-6_yTb{9Ghehb9#mTQi%m~gApK=$^j{oNj{k}*)9tZEX|mmjohc}^QSk&+n5Wq
z{%pTPhWL63f(|LL9kX=FKue6!C#%@VtNTO<S}NeWS*1R7uVvRKuC*rPjYW5Us&1~2
z=CzBd!e+gW^{d0zs-eS?P7gwXc^-VDO`=Wk$7o7gE!K7`*+_QawUuP!l|?p_R&2H#
z;UTTyFFOZg<|K9E&LZP0C7!!AyGO6Z`+pmm`hr+XiXh}F7z~yRAeBj<t^HDjLY)Q1
zN3G0K(MQ$VO#5hOUTxP^)rE-}mvtiwE{y%YAs&-2mYKW>OL4fXj=~OI5{#dXgJ8M}
zaw@C(t9&o%C?P3`$zj(X8mJbaXMv5~tTa%#-IxlgHLXxpEP+%P1Zigw8Z>bbw=Ik2
zGFl&^AhpU<C+t193GNSA*hH&>4oVHQzcC2<3LR|n=)qev6RdU>Gwc`>=rZ=u>sL?{
zG{51W&ZoxUf6ajJYVw)2HA+;dFu?yh@V&LaKU)uan_gLlvFYJ>L^6s!1m-Iau=Sn>
z>52`lrT=OwOKrbR1G@xxr#y;9$u>%T;A*u$%~xHGUD|@bS>4oGCuA9Obi|7ES6J22
z3zsdgL4_wSg3p<Hd@K)(s{)5X$IkD)N&`KVO9@DN<!U69howaG(HD(!_?psMq=)mS
ztca87pJspe?xSFE&WGeV8c5BG#F@h91y^N`FyLJ$nD;e7T<ti>-HGtg<~U~PzDc3I
zp%^^wNc<(7AXH|*C>$Ie|4=V<*sD{XPwJu^Jo8YzbMeiVCh-KZOZ@mG!g$wA@Hpea
zTW)3F_bs5pVFHC_!~Z&<t2}e)QugG)hct$tbswHyA7-!w(&Pr{*^>xDXE&@|ufiN>
zVEo0R-U^qw3>lHgc&^AeEVCelZMaaO0$bOb!24RbvVJ)@@(nPsyNY)dqU1kW@RX$e
E7j2S1*#H0l

delta 1381
zcmZWoZA?>F7{2GWNCjF-VbYcY;$RFYA0-5*K)sa;laGOg5XJ~WMEMXH>nI}(*DKRy
zD5=ngkW9id3R%pCjq6F~7L8twiCZ9!Unbj+CENb&$25%KAG5&Dr5BQACwcOm_c`x<
z-uFHCUU69^E~{?+z>{+P$iHeU<2cU7aE##%27$rBaGW8Zp@Ly+dwW|(rM#a$Rkzru
zBD(dW)zH0(6{2FIc!G|q%{*p!y+t<4Q69=wc-H{ZK1;J)MHY@KT&l30@h8f@nz7tL
zIfGNtb~|}fiK`T@QJ5A*UQ_Sq>RA}g0DIZ%bTfKQrD3(U^?OQeJ+INRNUJCqGOTH0
zS&+CV#Mi4M<zTDON;l(cR4OOuM0sMF_B{7K)8*w3D-p8Nic`zEvK?Cm?84mKS$Km<
zNhi4h?hMz*dALsQZ1|YV+dI!Rg(V@ZunZU1$klNT+(CE~YcZK<gcP*+jc#o&dm|^<
zeb~5MR@Q6G!VQx#viYYd*#VB*Ht0Up_{|sMOs<#Le{bJBXqlM1QS{GBKabz+2?&^f
z^_zO)Mst!6_tkA24%*xmSALmYh?5Va-P{ms>I^fAg{>!(3Ko%IGFYh0qjZP+CWqf5
zU}~fny(vvpNM%{1rQ{X)(Z#iAG47rx+3MD~hOLzVU&xH(vF@{wXH-c0j*lGXcSgnE
z?IvnWZ;c??)RVQ%6DvH{kNKq}ytIyzJa}@wG4dy;*~w;;U7RkVC3zVd?PpB6&M?QY
zh5q8M>Ba=@9Twb`1^NBb7sXe3kVk1qOG%~D5h(%-kKcwVEi)kO!^V^u>s@+ed!9mQ
z6CjKTRIC(vh(`p>KJJwBpbsV+i<w_|t>16o-E!x9{M8~UhNJ2jq-uc*z4G)Yv)~)o
z(c85XDo8aF#6c0FOTwYbD%{IVM_!L%QEK2(UnPW^9;$G>FdYS}O|-PdNARaDoj!lZ
zz$5hen2P--)Z2EEVB>%h;%O1Lveocq3)Fcoo%lP3zG<H%fleN-N;7lT!{0R!@^urq
zW(zQwp@+~dVSLH}!_ae5OiAxH@%NA854!;~eO4;=i^P9X^1myg!(wIr33%u`0Q-oJ
zrVp<1#6e%Uy=pd|=L2uFz=mE74-V38qXi>Il{$tA^6!M94<`d6ANYt5jlV@m5G$dp
z7-%#g#jdBrm)dyR68chw^~(u#?Al)>aD|}xf)kI%?uI7E2{y})V)&91_JIlnr(OQU
zDAr60o@6G_(itlWeY-@kbh8!XHxEJj`e{@?2{)2YV4u$;=Wu!<gVbYgzMSajgT*?c
ztyD5(PKIMX=RZlWg_CNPB$@x8WW|HU%Wzschz@mM{H*;dT$7VIiCNAowf4)Oo4oG8
bwvdm$c{fSj@ux-etLDA?c#lfo3zmNYDWuNw

diff --git a/Demo/WIN32-MSVC/WIN32.vcxproj b/Demo/WIN32-MSVC/WIN32.vcxproj
index a92b9185f..ee994e1da 100644
--- a/Demo/WIN32-MSVC/WIN32.vcxproj
+++ b/Demo/WIN32-MSVC/WIN32.vcxproj
@@ -161,7 +161,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Board.h" />
+    <ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h" />
     <ClInclude Include="FreeRTOSConfig.h" />
     <ClInclude Include="..\..\Source\include\croutine.h" />
     <ClInclude Include="..\..\Source\include\FreeRTOS.h" />
diff --git a/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/Demo/WIN32-MSVC/WIN32.vcxproj.filters
index 3d075c58a..1a088b2ed 100644
--- a/Demo/WIN32-MSVC/WIN32.vcxproj.filters
+++ b/Demo/WIN32-MSVC/WIN32.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{38712199-cebf-4124-bf15-398f7c3419ea}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
@@ -32,6 +28,10 @@
     <Filter Include="Demo App Source\Common Demo Tasks\ModifiedForLowTickRate">
       <UniqueIdentifier>{143cf5a3-f134-4439-9f71-a201ae23b44b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Configuration Files">
+      <UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.c">
@@ -81,11 +81,8 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Board.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="FreeRTOSConfig.h">
-      <Filter>Header Files</Filter>
+      <Filter>Configuration Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\include\croutine.h">
       <Filter>FreeRTOS Source\Include</Filter>
@@ -111,5 +108,8 @@
     <ClInclude Include="..\..\Source\include\task.h">
       <Filter>FreeRTOS Source\Include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h">
+      <Filter>FreeRTOS Source\Include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Demo/WIN32-MSVC/main.c b/Demo/WIN32-MSVC/main.c
index a14753696..e0c63e274 100644
--- a/Demo/WIN32-MSVC/main.c
+++ b/Demo/WIN32-MSVC/main.c
@@ -96,7 +96,6 @@
 #include "QPeek.h"
 #include "recmutex.h"
 #include "flop.h"
-#include "death.h"
 
 /* Priorities at which the tasks are created. */
 #define mainCHECK_TASK_PRIORITY		( configMAX_PRIORITIES - 1 )
@@ -130,11 +129,6 @@ int main( void )
 	vStartMathTasks( mainFLOP_TASK_PRIORITY );
 	vStartRecursiveMutexTasks();
 
-	/* The suicide tasks must be created last as they need to know how many
-	tasks were running prior to their creation in order to ascertain whether
-	or not the correct/expected number of tasks are running at any given time. */
-	vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
-
 	/* Start the scheduler itself. */
 	vTaskStartScheduler();
 
@@ -190,10 +184,6 @@ char *pcStatusMessage = "OK";
 		{
 			pcStatusMessage = "Error: Flop";
 		}
-		else if( xIsCreateTaskStillRunning() != pdPASS )
-		{
-			pcStatusMessage = "Error: Create";
-		}
 	    else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
 	    {
 			pcStatusMessage = "Error: RecMutex";