From 4e82d93729f083bc3a94533288005d3deb64cf62 Mon Sep 17 00:00:00 2001
From: Alexander Babikov <lemondrops358@gmail.com>
Date: Thu, 14 Apr 2022 07:00:06 +0500
Subject: [PATCH] Fix warnings related to variable types

---
 src/86box.c                                  | 2 +-
 src/codegen/codegen_ops_x86-64.h             | 4 ++--
 src/codegen_new/codegen_backend_x86-64_ops.c | 8 ++++----
 src/codegen_new/codegen_reg.c                | 2 +-
 src/qt/evdev_mouse.cpp                       | 4 ++--
 src/qt/qt_harddiskdialog.cpp                 | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/86box.c b/src/86box.c
index 7c5570a5c..8011b7e7c 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -1169,7 +1169,7 @@ pc_close(thread_t *ptr)
 #ifdef __APPLE__
 static void _ui_window_title(void *s)
 {
-    ui_window_title((const wchar_t *) s);
+    ui_window_title((wchar_t *) s);
     free(s);
 }
 #endif
diff --git a/src/codegen/codegen_ops_x86-64.h b/src/codegen/codegen_ops_x86-64.h
index 08d4591ec..8f38b6b90 100644
--- a/src/codegen/codegen_ops_x86-64.h
+++ b/src/codegen/codegen_ops_x86-64.h
@@ -23,12 +23,12 @@ static inline int find_host_xmm_reg()
 }
 static inline void call(codeblock_t *block, uintptr_t func)
 {
-	uintptr_t diff = func - (uintptr_t)&block->data[block_pos + 5];
+	intptr_t diff = (intptr_t)(func - (uintptr_t)&block->data[block_pos + 5]);
 
         codegen_reg_loaded[0] = codegen_reg_loaded[1] = codegen_reg_loaded[2] = codegen_reg_loaded[3] = 0;
         codegen_reg_loaded[4] = codegen_reg_loaded[5] = codegen_reg_loaded[6] = codegen_reg_loaded[7] = 0;
 
-	if (diff >= -0x80000000ULL && diff < 0x7fffffffULL)
+	if (diff >= -0x80000000 && diff < 0x7fffffff)
 	{
 	        addbyte(0xE8); /*CALL*/
 	        addlong((uint32_t)diff);
diff --git a/src/codegen_new/codegen_backend_x86-64_ops.c b/src/codegen_new/codegen_backend_x86-64_ops.c
index 08079bf26..32739668a 100644
--- a/src/codegen_new/codegen_backend_x86-64_ops.c
+++ b/src/codegen_new/codegen_backend_x86-64_ops.c
@@ -27,10 +27,10 @@
 
 static inline void call(codeblock_t *block, uintptr_t func)
 {
-	uintptr_t diff;
+	intptr_t diff;
 
         codegen_alloc_bytes(block, 5);
-        diff = func - (uintptr_t)&block_write_data[block_pos + 5];
+        diff = (intptr_t)(func - (uintptr_t)&block_write_data[block_pos + 5]);
 
 	if (diff >= -0x80000000 && diff < 0x7fffffff)
 	{
@@ -48,10 +48,10 @@ static inline void call(codeblock_t *block, uintptr_t func)
 
 static inline void jmp(codeblock_t *block, uintptr_t func)
 {
-	uintptr_t diff;
+	intptr_t diff;
 
         codegen_alloc_bytes(block, 5);
-        diff = func - (uintptr_t)&block_write_data[block_pos + 5];
+        diff = (intptr_t)(func - (uintptr_t)&block_write_data[block_pos + 5]);
 
 	if (diff >= -0x80000000 && diff < 0x7fffffff)
 	{
diff --git a/src/codegen_new/codegen_reg.c b/src/codegen_new/codegen_reg.c
index c11d1ade5..6b0cc0fd3 100644
--- a/src/codegen_new/codegen_reg.c
+++ b/src/codegen_new/codegen_reg.c
@@ -513,7 +513,7 @@ void codegen_reg_write_imm(codeblock_t *block, ir_reg_t ir_reg, uint32_t imm_dat
 
                 case REG_DWORD:
                 if ((uintptr_t)p < 256)
-                        codegen_direct_write_32_imm_stack(block, (int)p, imm_data);
+                        codegen_direct_write_32_imm_stack(block, (int)((uintptr_t) p), imm_data);
                 else
                         codegen_direct_write_32_imm(block, p, imm_data);
                 break;
diff --git a/src/qt/evdev_mouse.cpp b/src/qt/evdev_mouse.cpp
index c04c8c8d6..8d708d3a1 100644
--- a/src/qt/evdev_mouse.cpp
+++ b/src/qt/evdev_mouse.cpp
@@ -56,7 +56,7 @@ void evdev_thread_func()
 {
     while (!stopped)
     {
-        for (int i = 0; i < evdev_mice.size(); i++)
+        for (unsigned int i = 0; i < evdev_mice.size(); i++)
         {
             struct input_event ev;
             int rc = libevdev_next_event(evdev_mice[i].second, LIBEVDEV_READ_FLAG_NORMAL, &ev);
@@ -67,7 +67,7 @@ void evdev_thread_func()
             }
         }
     }
-    for (int i = 0; i < evdev_mice.size(); i++)
+    for (unsigned int i = 0; i < evdev_mice.size(); i++)
     {
         libevdev_free(evdev_mice[i].second);
         close(evdev_mice[i].first);
diff --git a/src/qt/qt_harddiskdialog.cpp b/src/qt/qt_harddiskdialog.cpp
index b7a44d952..dd598af46 100644
--- a/src/qt/qt_harddiskdialog.cpp
+++ b/src/qt/qt_harddiskdialog.cpp
@@ -564,7 +564,7 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) {
             else if (((size % 3072) == 0) && (size <= 53477376))
                 heads = 6;
             else {
-                int i;
+                uint32_t i;
                 for (i = 5; i < 16; i++) {
                     if (((size % (i << 9)) == 0) && (size <= ((i * 17) << 19)))
                         break;