2 files changed, 5 insertions, 7 deletions

diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c
index c8935d81f3..da193814e5 100644
--- a/uisimulator/win32/button.c
+++ b/uisimulator/win32/button.c
@@ -24,7 +24,7 @@
 #include "button.h"
 #include "kernel.h"
 
-#define KEY(k)      HIBYTE(GetKeyState (k))
+#define KEY(k)      (HIBYTE(GetKeyState (k)) & 1)
 
 int last_key ;
 
@@ -65,13 +65,13 @@ int button_get(bool block)
             if (KEY (VK_RETURN))
                 btn |= BUTTON_OFF; // off button
 
-            if (KEY (VK_DIVIDE))
+            if (KEY (VK_DIVIDE) || KEY(VK_F1))
                 btn |= BUTTON_F1; // F1 button
 
-            if (KEY (VK_MULTIPLY))
+            if (KEY (VK_MULTIPLY) || KEY(VK_F2))
                 btn |= BUTTON_F2; // F2 button
 
-            if (KEY (VK_SUBTRACT))
+            if (KEY (VK_SUBTRACT) || KEY(VK_F3))
                 btn |= BUTTON_F3; // F3 button
 
             if (KEY (VK_NUMPAD5) ||
diff --git a/uisimulator/win32/makefile b/uisimulator/win32/makefile
index bb157ab3e3..d3d326836b 100644
--- a/uisimulator/win32/makefile
+++ b/uisimulator/win32/makefile
@@ -17,8 +17,6 @@
 #
 ############################################################################
 
-TARGET = rockboxui
-
 FIRMWAREDIR = ../../firmware
 DRIVERS = $(FIRMWAREDIR)/drivers
 COMMON = $(FIRMWAREDIR)/common
@@ -46,7 +44,7 @@ INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(SIMDIR) -I$(APPDIR) -I$
 CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c
 
 SRCS = *.c \
-        $(DRIVERS)/lcd.c \
+        $(DRIVERS)/lcd.c $(DRIVERS)/power.c \
         $(APPDIR)*.c \
         $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c \
         $(COMMON)/sprintf.c $(COMMON)/strtok.c