diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/Release/uisw32.res | bin | 259308 -> 0 bytes | |||
-rw-r--r-- | uisimulator/win32/UI.bmp | bin | 259256 -> 0 bytes | |||
-rw-r--r-- | uisimulator/win32/UI256.bmp | bin | 0 -> 87480 bytes | |||
-rw-r--r-- | uisimulator/win32/button.c | 2 | ||||
-rw-r--r-- | uisimulator/win32/makefile | 56 | ||||
-rw-r--r-- | uisimulator/win32/panic-win32.c | 2 | ||||
-rw-r--r-- | uisimulator/win32/resource.h | 6 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.aps | bin | 295684 -> 0 bytes | |||
-rw-r--r-- | uisimulator/win32/uisw32.c | 2 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.rc | 2 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.suo | bin | 12800 -> 17920 bytes | |||
-rw-r--r-- | uisimulator/win32/uisw32.vcproj | 62 |
12 files changed, 104 insertions, 28 deletions
diff --git a/uisimulator/win32/Release/uisw32.res b/uisimulator/win32/Release/uisw32.res deleted file mode 100644 index 50e640e61e..0000000000 --- a/uisimulator/win32/Release/uisw32.res +++ /dev/null | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI.bmp b/uisimulator/win32/UI.bmp deleted file mode 100644 index ee21175ec4..0000000000 --- a/uisimulator/win32/UI.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI256.bmp b/uisimulator/win32/UI256.bmp new file mode 100644 index 0000000000..cb3689a566 --- /dev/null +++ b/uisimulator/win32/UI256.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index 5fbb9e9e3c..d312380f50 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -31,7 +31,7 @@ void button_init(void) | |||
31 | last_key = 0 ; | 31 | last_key = 0 ; |
32 | } | 32 | } |
33 | 33 | ||
34 | int button_get(void) | 34 | int button_get(bool block) |
35 | { | 35 | { |
36 | int btn = 0; | 36 | int btn = 0; |
37 | if (KEY (VK_NUMPAD4) || | 37 | if (KEY (VK_NUMPAD4) || |
diff --git a/uisimulator/win32/makefile b/uisimulator/win32/makefile index 7090ba1188..b484c5b8a1 100644 --- a/uisimulator/win32/makefile +++ b/uisimulator/win32/makefile | |||
@@ -22,12 +22,15 @@ TARGET = rockboxui | |||
22 | FIRMWAREDIR = ../../firmware | 22 | FIRMWAREDIR = ../../firmware |
23 | DRIVERS = $(FIRMWAREDIR)/drivers | 23 | DRIVERS = $(FIRMWAREDIR)/drivers |
24 | COMMON = $(FIRMWAREDIR)/common | 24 | COMMON = $(FIRMWAREDIR)/common |
25 | SIMDIR = ../win32/ | ||
26 | APPDIR = ../../apps/ | ||
27 | RECDIR = $(APPDIR)recorder/ | ||
25 | RM = del | 28 | RM = del |
26 | 29 | ||
27 | CC = cl | 30 | CC = cl |
28 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR -DARCHOS_RECORDER -D_WIN32 -DWIN32 | 31 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR -DARCHOS_RECORDER -D_WIN32 -DWIN32 |
29 | LDFLAGS = /ouisw32.exe /link -subsystem:windows | 32 | LDFLAGS = /ouisw32.exe /link -subsystem:windows |
30 | INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) | 33 | INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(SIMDIR) -I$(APPDIR) -I$(RECDIR) |
31 | LIBS = gdi32.lib user32.lib | 34 | LIBS = gdi32.lib user32.lib |
32 | 35 | ||
33 | 36 | ||
@@ -35,8 +38,10 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" | |||
35 | 38 | ||
36 | #SRCS = $(wildcard *.c) | 39 | #SRCS = $(wildcard *.c) |
37 | 40 | ||
38 | SRCS = lcd-win32.c tetris.c uisw32.c lcd.c button.c tree.c app.c \ | 41 | SRCS = lcd-win32.c tetris.c uisw32.c lcd.c button.c tree.c main.c \ |
39 | chartables.c kernel.c Release/uisw32.res dir-win32.c | 42 | chartables.c kernel.c uisw32.res dir-win32.c main_menu.c \ |
43 | play.c bmp.c debug-win32.c screensaver.c menu.c credits.c \ | ||
44 | icons.c sound_menu.c mpeg.c id3.c settings.c sprintf.c | ||
40 | 45 | ||
41 | OBJS = $(SRCS:.c=.obj) | 46 | OBJS = $(SRCS:.c=.obj) |
42 | 47 | ||
@@ -49,14 +54,47 @@ lcd.obj: $(DRIVERS)/lcd.c | |||
49 | chartables.obj: $(FIRMWAREDIR)/chartables.c | 54 | chartables.obj: $(FIRMWAREDIR)/chartables.c |
50 | $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/chartables.c -ochartables.obj | 55 | $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/chartables.c -ochartables.obj |
51 | 56 | ||
52 | tetris.obj: ../tetris.c | 57 | tetris.obj: ../../apps/recorder/tetris.c |
53 | $(CC) $(CFLAGS) -c ../tetris.c -otetris.obj | 58 | $(CC) $(CFLAGS) -c ../../apps/recorder/tetris.c -otetris.obj |
54 | 59 | ||
55 | tree.obj: ../tree.c | 60 | tree.obj: ../../apps/tree.c |
56 | $(CC) $(CFLAGS) -c ../tree.c -otree.obj | 61 | $(CC) $(CFLAGS) -c ../../apps/tree.c -otree.obj |
57 | 62 | ||
58 | app.obj: ../app.c | 63 | main.obj: ../../apps/main.c |
59 | $(CC) $(CFLAGS) -c ../app.c -oapp.obj | 64 | $(CC) $(CFLAGS) -c ../../apps/main.c -omain.obj |
60 | 65 | ||
66 | main_menu.obj: ../../apps/main_menu.c | ||
67 | $(CC) $(CFLAGS) -c ../../apps/main_menu.c -omain_menu.obj | ||
68 | |||
69 | play.obj: ../../apps/play.c | ||
70 | $(CC) $(CFLAGS) -c ../../apps/play.c -oplay.obj | ||
71 | |||
72 | bmp.obj: ../../apps/recorder/bmp.c | ||
73 | $(CC) $(CFLAGS) -c ../../apps/recorder/bmp.c -obmp.obj | ||
74 | |||
75 | screensaver.obj: ../../apps/recorder/screensaver.c | ||
76 | $(CC) $(CFLAGS) -c ../../apps/recorder/screensaver.c -oscreensaver.obj | ||
77 | |||
78 | menu.obj: ../../apps/menu.c | ||
79 | $(CC) $(CFLAGS) -c ../../apps/menu.c -omenu.obj | ||
80 | |||
81 | credits.obj: ../../apps/credits.c | ||
82 | $(CC) $(CFLAGS) -c ../../apps/credits.c -ocredits.obj | ||
83 | |||
84 | icons.obj: ../../apps/recorder/icons.c | ||
85 | $(CC) $(CFLAGS) -c ../../apps/recorder/icons.c -oicons.obj | ||
86 | |||
87 | sound_menu.obj: ../../apps/sound_menu.c | ||
88 | $(CC) $(CFLAGS) -c ../../apps/sound_menu.c -osound_menu.obj | ||
89 | |||
90 | id3.obj: $(FIRMWAREDIR)/id3.c | ||
91 | $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/id3.c -oid3.obj | ||
92 | |||
93 | settings.obj: $(FIRMWAREDIR)/settings.c | ||
94 | $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/settings.c -osettings.obj | ||
95 | |||
96 | sprintf.obj: $(FIRMWAREDIR)/common/sprintf.c | ||
97 | $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/common/sprintf.c -osprintf.obj | ||
98 | |||
61 | clean: | 99 | clean: |
62 | $(RM) *.obj \ No newline at end of file | 100 | $(RM) *.obj \ No newline at end of file |
diff --git a/uisimulator/win32/panic-win32.c b/uisimulator/win32/panic-win32.c index c4592d5906..ff644a7761 100644 --- a/uisimulator/win32/panic-win32.c +++ b/uisimulator/win32/panic-win32.c | |||
@@ -26,7 +26,7 @@ char panic_buf[128]; | |||
26 | // whatever it says ;) | 26 | // whatever it says ;) |
27 | void panic( char *message ) | 27 | void panic( char *message ) |
28 | { | 28 | { |
29 | debug( message ); | 29 | debugf ( message ); |
30 | PostQuitMessage (-1); | 30 | PostQuitMessage (-1); |
31 | } | 31 | } |
32 | 32 | ||
diff --git a/uisimulator/win32/resource.h b/uisimulator/win32/resource.h index 0e45d58d95..dc8a238d78 100644 --- a/uisimulator/win32/resource.h +++ b/uisimulator/win32/resource.h | |||
@@ -3,13 +3,15 @@ | |||
3 | // Used by uisw32.rc | 3 | // Used by uisw32.rc |
4 | // | 4 | // |
5 | #define IDB_BITMAP1 102 | 5 | #define IDB_BITMAP1 102 |
6 | #define IDB_UI 102 | 6 | #define IDR_JPG1 103 |
7 | #define IDB_BITMAP2 104 | ||
8 | #define IDB_UI 104 | ||
7 | 9 | ||
8 | // Next default values for new objects | 10 | // Next default values for new objects |
9 | // | 11 | // |
10 | #ifdef APSTUDIO_INVOKED | 12 | #ifdef APSTUDIO_INVOKED |
11 | #ifndef APSTUDIO_READONLY_SYMBOLS | 13 | #ifndef APSTUDIO_READONLY_SYMBOLS |
12 | #define _APS_NEXT_RESOURCE_VALUE 103 | 14 | #define _APS_NEXT_RESOURCE_VALUE 105 |
13 | #define _APS_NEXT_COMMAND_VALUE 40001 | 15 | #define _APS_NEXT_COMMAND_VALUE 40001 |
14 | #define _APS_NEXT_CONTROL_VALUE 1001 | 16 | #define _APS_NEXT_CONTROL_VALUE 1001 |
15 | #define _APS_NEXT_SYMED_VALUE 101 | 17 | #define _APS_NEXT_SYMED_VALUE 101 |
diff --git a/uisimulator/win32/uisw32.aps b/uisimulator/win32/uisw32.aps deleted file mode 100644 index 692297976e..0000000000 --- a/uisimulator/win32/uisw32.aps +++ /dev/null | |||
Binary files differ | |||
diff --git a/uisimulator/win32/uisw32.c b/uisimulator/win32/uisw32.c index 567024cf88..87b96f2017 100644 --- a/uisimulator/win32/uisw32.c +++ b/uisimulator/win32/uisw32.c | |||
@@ -50,7 +50,7 @@ LRESULT GUIWndProc ( | |||
50 | case WM_CREATE: | 50 | case WM_CREATE: |
51 | // load background image | 51 | // load background image |
52 | hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI), | 52 | hBkgnd = (HBITMAP)LoadImage (GetModuleHandle (NULL), MAKEINTRESOURCE(IDB_UI), |
53 | IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); | 53 | IMAGE_BITMAP, 0, 0, LR_VGACOLOR); |
54 | hMemDc = CreateCompatibleDC (GetDC (hWnd)); | 54 | hMemDc = CreateCompatibleDC (GetDC (hWnd)); |
55 | SelectObject (hMemDc, hBkgnd); | 55 | SelectObject (hMemDc, hBkgnd); |
56 | return TRUE; | 56 | return TRUE; |
diff --git a/uisimulator/win32/uisw32.rc b/uisimulator/win32/uisw32.rc index f3d467fcab..42f5e6f0a7 100644 --- a/uisimulator/win32/uisw32.rc +++ b/uisimulator/win32/uisw32.rc | |||
@@ -52,7 +52,7 @@ END | |||
52 | // Bitmap | 52 | // Bitmap |
53 | // | 53 | // |
54 | 54 | ||
55 | IDB_UI BITMAP "UI.bmp" | 55 | IDB_UI BITMAP "UI256.bmp" |
56 | #endif // English (U.S.) resources | 56 | #endif // English (U.S.) resources |
57 | ///////////////////////////////////////////////////////////////////////////// | 57 | ///////////////////////////////////////////////////////////////////////////// |
58 | 58 | ||
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo index 62664e5912..d7c4e90f1e 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 54c4be73d6..f82d5829f2 100644 --- a/uisimulator/win32/uisw32.vcproj +++ b/uisimulator/win32/uisw32.vcproj | |||
@@ -19,8 +19,8 @@ | |||
19 | <Tool | 19 | <Tool |
20 | Name="VCCLCompilerTool" | 20 | Name="VCCLCompilerTool" |
21 | Optimization="0" | 21 | Optimization="0" |
22 | AdditionalIncludeDirectories=""C:\Programming\CVS Checkout\RockBox\firmware";"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;ARCHOS_RECORDER;SIMULATOR;HAVE_LCD_BITMAP" | 23 | PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ARCHOS_RECORDER;SIMULATOR;HAVE_LCD_BITMAP;SIMULATOR;" |
24 | MinimalRebuild="TRUE" | 24 | MinimalRebuild="TRUE" |
25 | BasicRuntimeChecks="3" | 25 | BasicRuntimeChecks="3" |
26 | RuntimeLibrary="1" | 26 | RuntimeLibrary="1" |
@@ -107,7 +107,7 @@ | |||
107 | Name="Source Files" | 107 | Name="Source Files" |
108 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> | 108 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> |
109 | <File | 109 | <File |
110 | RelativePath="..\app.c"> | 110 | RelativePath="..\..\apps\recorder\bmp.c"> |
111 | </File> | 111 | </File> |
112 | <File | 112 | <File |
113 | RelativePath="button.c"> | 113 | RelativePath="button.c"> |
@@ -116,16 +116,16 @@ | |||
116 | RelativePath="..\..\firmware\chartables.c"> | 116 | RelativePath="..\..\firmware\chartables.c"> |
117 | </File> | 117 | </File> |
118 | <File | 118 | <File |
119 | RelativePath="debug-win32.c"> | 119 | RelativePath="..\..\apps\credits.c"> |
120 | </File> | 120 | </File> |
121 | <File | 121 | <File |
122 | RelativePath="dir-win32.c"> | 122 | RelativePath="debug-win32.c"> |
123 | </File> | 123 | </File> |
124 | <File | 124 | <File |
125 | RelativePath="..\..\firmware\disk.c"> | 125 | RelativePath="dir-win32.c"> |
126 | </File> | 126 | </File> |
127 | <File | 127 | <File |
128 | RelativePath="..\icons.c"> | 128 | RelativePath="..\..\apps\recorder\icons.c"> |
129 | </File> | 129 | </File> |
130 | <File | 130 | <File |
131 | RelativePath="..\..\firmware\id3.c"> | 131 | RelativePath="..\..\firmware\id3.c"> |
@@ -140,31 +140,67 @@ | |||
140 | RelativePath="..\..\firmware\drivers\lcd.c"> | 140 | RelativePath="..\..\firmware\drivers\lcd.c"> |
141 | </File> | 141 | </File> |
142 | <File | 142 | <File |
143 | RelativePath="..\menu.c"> | 143 | RelativePath="..\..\apps\main.c"> |
144 | </File> | ||
145 | <File | ||
146 | RelativePath="..\..\apps\main_menu.c"> | ||
147 | </File> | ||
148 | <File | ||
149 | RelativePath="..\..\apps\menu.c"> | ||
150 | <FileConfiguration | ||
151 | Name="Debug|Win32"> | ||
152 | <Tool | ||
153 | Name="VCCLCompilerTool" | ||
154 | ObjectFile="$(IntDir)/$(InputName)1.obj"/> | ||
155 | </FileConfiguration> | ||
156 | <FileConfiguration | ||
157 | Name="Release|Win32"> | ||
158 | <Tool | ||
159 | Name="VCCLCompilerTool" | ||
160 | ObjectFile="$(IntDir)/$(InputName)1.obj"/> | ||
161 | </FileConfiguration> | ||
162 | </File> | ||
163 | <File | ||
164 | RelativePath="mpeg.c"> | ||
144 | </File> | 165 | </File> |
145 | <File | 166 | <File |
146 | RelativePath="panic-win32.c"> | 167 | RelativePath="panic-win32.c"> |
147 | </File> | 168 | </File> |
148 | <File | 169 | <File |
149 | RelativePath="..\play.c"> | 170 | RelativePath="..\..\apps\play.c"> |
171 | <FileConfiguration | ||
172 | Name="Debug|Win32"> | ||
173 | <Tool | ||
174 | Name="VCCLCompilerTool" | ||
175 | ObjectFile="$(IntDir)/$(InputName)1.obj"/> | ||
176 | </FileConfiguration> | ||
177 | <FileConfiguration | ||
178 | Name="Release|Win32"> | ||
179 | <Tool | ||
180 | Name="VCCLCompilerTool" | ||
181 | ObjectFile="$(IntDir)/$(InputName)1.obj"/> | ||
182 | </FileConfiguration> | ||
150 | </File> | 183 | </File> |
151 | <File | 184 | <File |
152 | RelativePath="..\..\firmware\playlist.c"> | 185 | RelativePath="..\..\firmware\playlist.c"> |
153 | </File> | 186 | </File> |
154 | <File | 187 | <File |
155 | RelativePath="..\screensaver.c"> | 188 | RelativePath="..\..\apps\recorder\screensaver.c"> |
156 | </File> | 189 | </File> |
157 | <File | 190 | <File |
158 | RelativePath="..\..\firmware\settings.c"> | 191 | RelativePath="..\..\firmware\settings.c"> |
159 | </File> | 192 | </File> |
160 | <File | 193 | <File |
194 | RelativePath="..\..\apps\sound_menu.c"> | ||
195 | </File> | ||
196 | <File | ||
161 | RelativePath="..\..\firmware\common\sprintf.c"> | 197 | RelativePath="..\..\firmware\common\sprintf.c"> |
162 | </File> | 198 | </File> |
163 | <File | 199 | <File |
164 | RelativePath="..\tetris.c"> | 200 | RelativePath="..\..\apps\recorder\tetris.c"> |
165 | </File> | 201 | </File> |
166 | <File | 202 | <File |
167 | RelativePath="..\tree.c"> | 203 | RelativePath="..\..\apps\tree.c"> |
168 | </File> | 204 | </File> |
169 | <File | 205 | <File |
170 | RelativePath="uisw32.c"> | 206 | RelativePath="uisw32.c"> |
@@ -202,7 +238,7 @@ | |||
202 | Name="Resource Files" | 238 | Name="Resource Files" |
203 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> | 239 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> |
204 | <File | 240 | <File |
205 | RelativePath="UI.bmp"> | 241 | RelativePath="UI256.bmp"> |
206 | </File> | 242 | </File> |
207 | <File | 243 | <File |
208 | RelativePath="uisw32.rc"> | 244 | RelativePath="uisw32.rc"> |