From 07079466b32c0ce041abc709e8d9c0796023716e Mon Sep 17 00:00:00 2001
From: Felix Arends <edx@rockbox.org>
Date: Sat, 15 Jun 2002 10:58:14 +0000
Subject: [PATCH] defined current_tick variable and repaired broken build.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1008 a1c6a512-1295-4272-9138-f99709370657
---
 uisimulator/win32/thread-win32.c |   1 +
 uisimulator/win32/uisw32.c       |   6 ++++++
 uisimulator/win32/uisw32.h       |   1 +
 uisimulator/win32/uisw32.suo     | Bin 12800 -> 12800 bytes
 uisimulator/win32/uisw32.vcproj  |   2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/uisimulator/win32/thread-win32.c b/uisimulator/win32/thread-win32.c
index 466567c535..2ad356c62f 100644
--- a/uisimulator/win32/thread-win32.c
+++ b/uisimulator/win32/thread-win32.c
@@ -23,6 +23,7 @@
 HANDLE              lpThreads[256];
 int                 nThreads = 0,
                     nPos = 0;
+long                current_tick = 0;
 
 
 DWORD WINAPI runthread (LPVOID lpParameter)
diff --git a/uisimulator/win32/uisw32.c b/uisimulator/win32/uisw32.c
index 77ad917461..2661d74cb0 100644
--- a/uisimulator/win32/uisw32.c
+++ b/uisimulator/win32/uisw32.c
@@ -24,6 +24,7 @@
 #include "button.h"
 #include "thread.h"
 #include "thread-win32.h"
+#include "kernel.h"
 
 // extern functions
 extern void                 app_main (void *); // mod entry point
@@ -51,6 +52,9 @@ LRESULT GUIWndProc (
 
     switch (uMsg)
     {
+    case WM_TIMER:
+        current_tick++;
+        return TRUE;
     case WM_ACTIVATE:
         if (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE)
             bActive = true;
@@ -58,6 +62,7 @@ LRESULT GUIWndProc (
             bActive = false;
         return TRUE;
     case WM_CREATE:
+        SetTimer (hWnd, TIMER_EVENT, 50, NULL);
         // load background image
         hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI),
             IMAGE_BITMAP, 0, 0, LR_VGACOLOR);
@@ -186,6 +191,7 @@ LRESULT GUIWndProc (
         }
     case WM_CLOSE:
         // close simulator
+        KillTimer (hWnd, TIMER_EVENT);
         hGUIWnd = NULL;
         PostQuitMessage (0);
         break;
diff --git a/uisimulator/win32/uisw32.h b/uisimulator/win32/uisw32.h
index fd778e9182..7b38c76987 100644
--- a/uisimulator/win32/uisw32.h
+++ b/uisimulator/win32/uisw32.h
@@ -33,6 +33,7 @@
 #define UI_LCD_POSY                 95 // y position of lcd
 
 #define TM_YIELD                    WM_USER + 101 // thread message for yield
+#define TIMER_EVENT                 0x34928340
 
 extern HWND                         hGUIWnd; // the GUI window handle
 extern unsigned int                 uThreadID; // id of mod thread
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo
index b18805cf4a038fda1ad88a36776a8df17d4fc222..569c42b85326c03dff85b528c7148b6117879d63 100644
GIT binary patch
delta 1267
zcmaKrO-vI}5Xawcx412BX@P=BKNe_dmjKd&rinyBDhCq<j33B{Qd<y(7KDloQE1|Y
zo4_26#)PAhpnFwA#ES=`Bt~y0#)CJ#a4;Ou|EmFuHoVR6?d-gH^Jd=6reo>YN?4?D
zp4G7R>(AJF+O;GsN~0F*R5aOJ{7TR<##Ws)EuA!(AWDE+l1=v0PpMP3Z7bF#54Fe=
zrS#9Gb5LrbJXx5%0O<_43C;q3&Uw81KsUGudO$C@1o{EDxs3M!h=3~~3SwXo41ud)
z7+eF_!3Y=yagYFGV4SfMb_2o$m;_0{oljA#SiUe|eI~!wnPe!T%M3yid1fdqg0`98
zE(mSZWw6sjxkjgFM!IWO1p_UZi)ht6C-2%6#HO!inzqb{4uLi;Z)hz)pluXXh_1H%
zSc@QoI191{JbZ4#d>Hyxt+CK1nnZ~FT<((xLCNBGv}O!wNqeW>#I=^})r|um<bAso
z<@eow-ABR5T{uOiYYy?eGGp#YNPg5D(v}@31ZBs_mD5P34mGZ&U9-YpckY~)noBvA
z<xa_IBx@aNZI-KwoL02#ctQ8vMtV>+tuj{1-s=)#CX>pX_Oih9q85)sP^sTjMKMpY
z!3R|c*m-@d21q5K2=GCxo^;!BbVUlCH-xU4Ks9cmDii3aKGbFm-*L<de8n>B_2{o=
zXvSfYU`J6NBin8VKmQGCD0Og-lu93sI1BALUC_LzVNq34*{q~!U8$^1u>hVvwB&Fm
zh6qlrM;!m2m<j&0FQ|C;xC$6GWP*9*J!bpQGtE1r>duu`@9if{>FQ60ov7%$cd#yi
z=FW=Wx0eTzW~#r@lDpe`2<@G<%b#->xs)%IF0#;|uO}GBKXC`S1cHrCQPz$sjN<Mm
zard`b^zGxO!XGc6d=^mrQW%v1h1Xi|gw#k8PiYzdgQ`G1;A4AF0k_ju>N=(0)QBy$

delta 866
zcmZuwKWGzS6o22{C0;MN3rQMN&XP;ovuUK&w5eigkbt#=C??WLanLkSF?P@nQbZ42
zLZxDSleh#Ni(36wm7*>kL<PaEbP!jU4y8lv`>yQ~>AmB<@BR6`@BO(uXU3UXnUq+&
zSxK_?+saG!OsN|!ZMKw+ePS{IloGh0oDWAyRfzu)VN@N&Ev2jqLlFK@Y%Hk?-V3}}
z+T`G;gDQ&(?K0(vb6T9u%A0rU7a1ob`JnDz$hSjN4D*VDm->rx00Q_(&oK>~dK_2v
zhI(kfBvlBGlJP5u3&sQKDd4uThM%<&z8T3#DY=JY*P#lxVHEQ82suXb6#2(_Ar_Uw
z2C1Sdb+g;?eD^mz8yVsAiE<z;Q6$_M-86ry>VJ+SFRX-IW16_4M*_KMinvRS2~%wq
zP5!#~9JBt&-I5DB>I=ff%p7-84?BPZzCfNzU+e&7{XvVFVV3nu4*G&r=5{IZ^}cb2
z>39xHb}uX7HM>7{Y;T0G%VV*>A78D*EE<{PxN19?&n?S!sN(Nj%?3!q_x-_aQDuo{
z+@;3ElGY*{t@H*uaRb+euDA(aTka<O6GFG326teNWF1@9)q#`r&XVAzy1O};${%Nj
zSlUCm%ke>3=?g69q1^2pMD1+{Ox)=EfX}TP$tq02O{h~(ci{}&hw2th8esTDKim}}
dRs0SG@s)Oo4aA9c*GiCff;b{9zA{`^b^z<}-s=DW

diff --git a/uisimulator/win32/uisw32.vcproj b/uisimulator/win32/uisw32.vcproj
index 99222a64a8..c3429a4871 100644
--- a/uisimulator/win32/uisw32.vcproj
+++ b/uisimulator/win32/uisw32.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;C:\Programming\CVS Checkout\RockBox\apps\recorder&quot;;&quot;C:\Programming\CVS Checkout\RockBox\apps&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware&quot;;&quot;C:\Programming\CVS Checkout\RockBox\uisimulator\win32&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware\drivers&quot;;&quot;C:\Programming\CVS Checkout\RockBox\firmware\common&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_PLAYER_KEYPAD;HAVE_LCD_CHARCELLS;SIMULATOR;SIMULATOR;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_RECORDER_KEYPAD;HAVE_LCD_BITMAP;SIMULATOR;SIMULATOR;"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"