From 5e75dc3a1072d589a3d261aba5db4d4528dbb191 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Mon, 6 Jun 2005 20:14:50 +0000
Subject: [PATCH] - some more warnings in MSVC fixed

---
 bochs/cpu/i387.h              | 4 ++--
 bochs/cpu/xmm.h               | 4 ++--
 bochs/gui/textconfig.cc       | 8 ++++----
 bochs/gui/win32.cc            | 8 ++++----
 bochs/iodev/slowdown_timer.cc | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bochs/cpu/i387.h b/bochs/cpu/i387.h
index 636d938d9..7c178ff64 100644
--- a/bochs/cpu/i387.h
+++ b/bochs/cpu/i387.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: i387.h,v 1.29 2005-05-12 18:07:41 sshwarts Exp $
+// $Id: i387.h,v 1.30 2005-06-06 20:14:49 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //   Copyright (c) 2004 Stanislav Shwartsman
@@ -47,7 +47,7 @@ extern int FPU_tagof(const floatx80 &reg);
 //
 // Minimal i387 structure
 //
-struct i387_t 
+struct BOCHSAPI i387_t 
 {
     i387_t() {}
 
diff --git a/bochs/cpu/xmm.h b/bochs/cpu/xmm.h
index 28f360d7d..804e41f9f 100644
--- a/bochs/cpu/xmm.h
+++ b/bochs/cpu/xmm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: xmm.h,v 1.18 2005-05-12 18:07:45 sshwarts Exp $
+// $Id: xmm.h,v 1.19 2005-06-06 20:14:49 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //   Copyright (c) 2003 Stanislav Shwartsman
@@ -154,7 +154,7 @@ typedef union bx_xmm_reg_t {
 
 #define MXCSR_RESET 0x00001F80  /* reset value of the MXCSR register */
 
-struct bx_mxcsr_t 
+struct BOCHSAPI bx_mxcsr_t 
 {
   Bit32u mxcsr;
 
diff --git a/bochs/gui/textconfig.cc b/bochs/gui/textconfig.cc
index 54ff84d33..4587cf9ef 100644
--- a/bochs/gui/textconfig.cc
+++ b/bochs/gui/textconfig.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: textconfig.cc,v 1.29 2004-11-22 13:14:54 akrisak Exp $
+// $Id: textconfig.cc,v 1.30 2005-06-06 20:14:50 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // This is code for a text-mode configuration interface.  Note that this file
@@ -468,12 +468,12 @@ int bx_config_interface (int menu)
      }
      break;
    case BX_CI_RUNTIME:
-     char prompt[1024];
      bx_floppy_options floppyop;
      bx_atadevice_options cdromop;
 #ifdef WIN32
      choice = RuntimeOptionsDialog();
 #else
+     char prompt[1024];
      build_runtime_options_prompt (runtime_menu_prompt, prompt, 1024);
      if (ask_uint (prompt, 1, BX_CI_RT_QUIT, BX_CI_RT_CONT, &choice, 10) < 0) return -1;
 #endif
@@ -844,7 +844,7 @@ bx_param_num_c::text_ask (FILE *fpin, FILE *fpout)
       prompt = "Enter new value in hex: [%x] ";
   }
   Bit32u n = get ();
-  status = ask_uint (prompt, min, max, n, &n, base);
+  status = ask_uint (prompt, (Bit32u)min, (Bit32u)max, n, &n, base);
   if (status < 0) return status;
   set (n);
   return 0;
@@ -882,7 +882,7 @@ bx_param_enum_c::text_ask (FILE *fpin, FILE *fpout)
     prompt = "Enter new value: [%s] ";
   }
   Bit32s n = (Bit32s)(get () - min);
-  int status = ask_menu (prompt, (max-min+1), choices, n, &n);
+  int status = ask_menu (prompt, (Bit32u)(max-min+1), choices, n, &n);
   if (status < 0) return status;
   n += (Bit32s)min;
   set (n);
diff --git a/bochs/gui/win32.cc b/bochs/gui/win32.cc
index e562b54cb..014ddef61 100644
--- a/bochs/gui/win32.cc
+++ b/bochs/gui/win32.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: win32.cc,v 1.94 2005-05-11 18:00:02 vruppert Exp $
+// $Id: win32.cc,v 1.95 2005-06-06 20:14:50 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -867,10 +867,10 @@ void
 bx_win32_gui_c::statusbar_setitem(int element, bx_bool active)
 {
   if (element < 0) {
-    for (int i = 0; i < statusitem_count; i++) {
+    for (int i = 0; i < (int)statusitem_count; i++) {
       SetStatusText(i+1, statusitem_text[i], active);
     }
-  } else if (element < statusitem_count) {
+  } else if (element < (int)statusitem_count) {
     SetStatusText(element+1, statusitem_text[element], active);
   }
 }
@@ -1348,7 +1348,7 @@ void bx_win32_gui_c::text_update(Bit8u *old_text, Bit8u *new_text,
       if (char_changed[c]) {
         memset(data, 0, sizeof(data));
         BOOL gfxchar = tm_info.line_graphics && ((c & 0xE0) == 0xC0);
-        for (unsigned i=0; i<yChar; i++) {
+        for (unsigned i=0; i<(unsigned)yChar; i++) {
           data[i*2] = vga_charmap[c*32+i];
           if (gfxchar) {
             data[i*2+1] = (data[i*2] << 7);
diff --git a/bochs/iodev/slowdown_timer.cc b/bochs/iodev/slowdown_timer.cc
index ceeedf6a6..8d97fce9d 100644
--- a/bochs/iodev/slowdown_timer.cc
+++ b/bochs/iodev/slowdown_timer.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: slowdown_timer.cc,v 1.20 2005-06-04 17:44:58 vruppert Exp $
+// $Id: slowdown_timer.cc,v 1.21 2005-06-06 20:14:50 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -146,7 +146,7 @@ bx_slowdown_timer_c::handle_timer() {
 #if BX_HAVE_USLEEP
     usleep(s.Q);
 #elif BX_HAVE_MSLEEP
-    msleep(usectomsec(s.Q));
+    msleep(usectomsec((Bit32u)s.Q));
 #elif BX_HAVE_SLEEP
     sleep(usectosec(s.Q));
 #else