diff options
author | Felix Arends <edx@rockbox.org> | 2002-06-15 10:58:14 +0000 |
---|---|---|
committer | Felix Arends <edx@rockbox.org> | 2002-06-15 10:58:14 +0000 |
commit | 07079466b32c0ce041abc709e8d9c0796023716e (patch) | |
tree | 2412192480d1bbfea4ffdb924a4790d934c77879 | |
parent | 2d29a7431f083d8ae376f8d32e7042e9bf62b14b (diff) | |
download | rockbox-07079466b32c0ce041abc709e8d9c0796023716e.tar.gz rockbox-07079466b32c0ce041abc709e8d9c0796023716e.zip |
defined current_tick variable and repaired broken build.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1008 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | uisimulator/win32/thread-win32.c | 1 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.c | 6 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.h | 1 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.suo | bin | 12800 -> 12800 bytes | |||
-rw-r--r-- | uisimulator/win32/uisw32.vcproj | 2 |
5 files changed, 9 insertions, 1 deletions
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 @@ | |||
23 | HANDLE lpThreads[256]; | 23 | HANDLE lpThreads[256]; |
24 | int nThreads = 0, | 24 | int nThreads = 0, |
25 | nPos = 0; | 25 | nPos = 0; |
26 | long current_tick = 0; | ||
26 | 27 | ||
27 | 28 | ||
28 | DWORD WINAPI runthread (LPVOID lpParameter) | 29 | 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 @@ | |||
24 | #include "button.h" | 24 | #include "button.h" |
25 | #include "thread.h" | 25 | #include "thread.h" |
26 | #include "thread-win32.h" | 26 | #include "thread-win32.h" |
27 | #include "kernel.h" | ||
27 | 28 | ||
28 | // extern functions | 29 | // extern functions |
29 | extern void app_main (void *); // mod entry point | 30 | extern void app_main (void *); // mod entry point |
@@ -51,6 +52,9 @@ LRESULT GUIWndProc ( | |||
51 | 52 | ||
52 | switch (uMsg) | 53 | switch (uMsg) |
53 | { | 54 | { |
55 | case WM_TIMER: | ||
56 | current_tick++; | ||
57 | return TRUE; | ||
54 | case WM_ACTIVATE: | 58 | case WM_ACTIVATE: |
55 | if (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE) | 59 | if (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE) |
56 | bActive = true; | 60 | bActive = true; |
@@ -58,6 +62,7 @@ LRESULT GUIWndProc ( | |||
58 | bActive = false; | 62 | bActive = false; |
59 | return TRUE; | 63 | return TRUE; |
60 | case WM_CREATE: | 64 | case WM_CREATE: |
65 | SetTimer (hWnd, TIMER_EVENT, 50, NULL); | ||
61 | // load background image | 66 | // load background image |
62 | hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI), | 67 | hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI), |
63 | IMAGE_BITMAP, 0, 0, LR_VGACOLOR); | 68 | IMAGE_BITMAP, 0, 0, LR_VGACOLOR); |
@@ -186,6 +191,7 @@ LRESULT GUIWndProc ( | |||
186 | } | 191 | } |
187 | case WM_CLOSE: | 192 | case WM_CLOSE: |
188 | // close simulator | 193 | // close simulator |
194 | KillTimer (hWnd, TIMER_EVENT); | ||
189 | hGUIWnd = NULL; | 195 | hGUIWnd = NULL; |
190 | PostQuitMessage (0); | 196 | PostQuitMessage (0); |
191 | break; | 197 | 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 @@ | |||
33 | #define UI_LCD_POSY 95 // y position of lcd | 33 | #define UI_LCD_POSY 95 // y position of lcd |
34 | 34 | ||
35 | #define TM_YIELD WM_USER + 101 // thread message for yield | 35 | #define TM_YIELD WM_USER + 101 // thread message for yield |
36 | #define TIMER_EVENT 0x34928340 | ||
36 | 37 | ||
37 | extern HWND hGUIWnd; // the GUI window handle | 38 | extern HWND hGUIWnd; // the GUI window handle |
38 | extern unsigned int uThreadID; // id of mod thread | 39 | extern unsigned int uThreadID; // id of mod thread |
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo index b18805cf4a..569c42b853 100644 --- a/uisimulator/win32/uisw32.suo +++ b/uisimulator/win32/uisw32.suo | |||
Binary files differ | |||
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 @@ | |||
20 | Name="VCCLCompilerTool" | 20 | Name="VCCLCompilerTool" |
21 | Optimization="0" | 21 | Optimization="0" |
22 | AdditionalIncludeDirectories=""C:\Programming\CVS Checkout\RockBox\apps\recorder";"C:\Programming\CVS Checkout\RockBox\apps";"C:\Programming\CVS Checkout\RockBox\firmware";"C:\Programming\CVS Checkout\RockBox\uisimulator\win32";"C:\Programming\CVS Checkout\RockBox\firmware\drivers";"C:\Programming\CVS Checkout\RockBox\firmware\common"" | 22 | AdditionalIncludeDirectories=""C:\Programming\CVS Checkout\RockBox\apps\recorder";"C:\Programming\CVS Checkout\RockBox\apps";"C:\Programming\CVS Checkout\RockBox\firmware";"C:\Programming\CVS Checkout\RockBox\uisimulator\win32";"C:\Programming\CVS Checkout\RockBox\firmware\drivers";"C:\Programming\CVS Checkout\RockBox\firmware\common"" |
23 | PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_PLAYER_KEYPAD;HAVE_LCD_CHARCELLS;SIMULATOR;SIMULATOR;" | 23 | PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_RECORDER_KEYPAD;HAVE_LCD_BITMAP;SIMULATOR;SIMULATOR;" |
24 | MinimalRebuild="TRUE" | 24 | MinimalRebuild="TRUE" |
25 | BasicRuntimeChecks="3" | 25 | BasicRuntimeChecks="3" |
26 | RuntimeLibrary="1" | 26 | RuntimeLibrary="1" |