--- qemu-1.1.1/block/vvfat.c.orig	2012-07-17 20:11:14.000000000 +0200
+++ qemu-1.1.1/block/vvfat.c	2012-07-18 18:18:16.762318600 +0200
@@ -821,7 +821,13 @@
 
 static inline uint32_t sector2cluster(BDRVVVFATState* s,off_t sector_num)
 {
-    return (sector_num-s->faked_sectors)/s->sectors_per_cluster;
+    uint32_t ret;
+
+    if (sector_num < s->faked_sectors)
+        ret = 0;
+    else
+        ret = (sector_num-s->faked_sectors)/s->sectors_per_cluster;
+    return ret;
 }
 
 static inline off_t cluster2sector(BDRVVVFATState* s, uint32_t cluster_num)
--- qemu-1.1.1/configure.orig	2012-07-17 20:11:14.000000000 +0200
+++ qemu-1.1.1/configure	2012-07-18 18:33:24.086432200 +0200
@@ -367,7 +367,7 @@
 CYGWIN*)
   mingw32="yes"
   QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS"
-  audio_possible_drivers="winwave sdl"
+  audio_possible_drivers="winwave dsound sdl fmod"
   audio_drv_list="winwave"
 ;;
 MINGW32*)
@@ -2222,14 +2222,12 @@
 ##########################################
 # opengl probe, used by milkymist-tmu2
 if test "$opengl" != "no" ; then
-  opengl_libs="-lGL"
+  opengl_libs="-lopengl32"
   cat > $TMPC << EOF
-#include <X11/Xlib.h>
 #include <GL/gl.h>
-#include <GL/glx.h>
 int main(void) { return GL_VERSION != 0; }
 EOF
-  if compile_prog "" "-lGL" ; then
+  if compile_prog "" "-lopengl32" ; then
     opengl=yes
   else
     if test "$opengl" = "yes" ; then
--- qemu-1.1.1/Makefile.orig	2012-07-17 20:11:14.000000000 +0200
+++ qemu-1.1.1/Makefile	2012-07-18 18:18:16.777943800 +0200
@@ -127,8 +127,8 @@
 
 bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
 
-version.o: $(SRC_PATH)/version.rc config-host.h
-	$(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")
+version.o: $(SRC_PATH)/version.rc config-host.h qemu.ico
+	$(call quiet-command,$(WINDRES) -I. -o $@ '$(shell cygpath -w $<)',"  RC    $(TARGET_DIR)$@")
 
 version-obj-$(CONFIG_WIN32) += version.o
 ######################################################################
@@ -290,6 +290,7 @@
 	$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
 
 install-sysconfig: install-datadir install-confdir
+	$(INSTALL_DATA) $(SRC_PATH)/qemu.ico "$(DESTDIR)$(qemu_confdir)"
 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/cpus-x86_64.conf "$(DESTDIR)$(qemu_datadir)"
 
@@ -401,4 +402,4 @@
 	rm -rf /tmp/$(FILE)
 
 # Include automatically generated dependency files
--include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d)
+#-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d)
--- qemu-1.1.1/qemu-char.c.orig	2012-07-17 20:11:14.000000000 +0200
+++ qemu-1.1.1/qemu-char.c	2012-07-18 18:18:16.793569000 +0200
@@ -515,6 +515,12 @@
     return len1 - len;
 }
 
+static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out)
+{
+    /* NOT AVAILABLE */
+    return NULL;
+}
+
 #else
 
 int send_all(int fd, const void *_buf, int len1)
@@ -537,6 +543,7 @@
     }
     return len1 - len;
 }
+
 #endif /* !_WIN32 */
 
 #define STDIO_MAX_CLIENTS 1
--- qemu-1.1.1/ui/vnc-enc-tight.c.orig	2012-07-17 20:11:14.000000000 +0200
+++ qemu-1.1.1/ui/vnc-enc-tight.c	2012-07-18 18:18:16.793569000 +0200
@@ -50,6 +50,8 @@
 #include "vnc-enc-tight.h"
 #include "vnc-palette.h"
 
+typedef unsigned int uint;
+
 /* Compression level stuff. The following array contains various
    encoder parameters for each of 10 compression levels (0..9).
    Last three parameters correspond to JPEG quality levels (0..9). */
--- qemu-1.1.1/version.rc.orig	2012-07-17 20:11:14.000000000 +0200
+++ qemu-1.1.1/version.rc	2012-07-18 18:18:16.809194200 +0200
@@ -1,6 +1,7 @@
 #include <winver.h>
 #include "config-host.h"
 
+500 ICON "qemu.ico"
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION CONFIG_FILEVERSION
 PRODUCTVERSION CONFIG_PRODUCTVERSION