From 8f30698c757c1f087d801bf02454fdd4f90c439d Mon Sep 17 00:00:00 2001
From: Xadhoom <>
Date: Thu, 14 Mar 2019 19:50:58 +0000
Subject: [PATCH] Reorganize miniwin headers, part 1

---
 CMakeLists.txt                                     | 10 +++++-----
 SourceS/miniwin.h                                  | 14 +++++++-------
 SourceS/{miniwin_com.h => miniwin/com.h}           |  7 ++++---
 .../com/ddraw.inc}                                 |  0
 .../com/ddraw_macro.inc}                           |  0
 .../com/dsound.inc}                                |  0
 .../com/dsound_macro.inc}                          |  0
 .../{miniwin_com_macro.h => miniwin/com_macro.h}   |  4 ++--
 SourceS/{miniwin_misc.h => miniwin/misc.h}         |  2 +-
 .../{miniwin_misc_macro.h => miniwin/misc_macro.h} |  0
 .../{miniwin_popdecl.inc => miniwin/popdecl.inc}   |  0
 .../{miniwin_pushdecl.inc => miniwin/pushdecl.inc} |  0
 SourceS/miniwin/rand.h                             |  8 ++++++++
 SourceS/{miniwin_thread.h => miniwin/thread.h}     |  2 +-
 SourceS/{miniwin_ui.h => miniwin/ui.h}             |  2 +-
 SourceS/miniwin_rand.h                             |  8 --------
 SourceX/{miniwin.cpp => miniwin/misc.cpp}          |  0
 SourceX/{miniwin_io.cpp => miniwin/misc_io.cpp}    |  0
 .../{miniwin_msg_sdl.cpp => miniwin/misc_msg.cpp}  |  0
 SourceX/{stub_rand.cpp => miniwin/rand.cpp}        |  8 +++++---
 SourceX/{miniwin_thread.cpp => miniwin/thread.cpp} |  0
 SourceX/miniwin_sdl.h                              |  9 ---------
 SourceX/utf8.h                                     |  4 ++--
 types.h                                            |  4 ++--
 24 files changed, 38 insertions(+), 44 deletions(-)
 rename SourceS/{miniwin_com.h => miniwin/com.h} (94%)
 rename SourceS/{miniwin_com_ddraw.inc => miniwin/com/ddraw.inc} (100%)
 rename SourceS/{miniwin_com_macro_ddraw.inc => miniwin/com/ddraw_macro.inc} (100%)
 rename SourceS/{miniwin_com_dsound.inc => miniwin/com/dsound.inc} (100%)
 rename SourceS/{miniwin_com_macro_dsound.inc => miniwin/com/dsound_macro.inc} (100%)
 rename SourceS/{miniwin_com_macro.h => miniwin/com_macro.h} (87%)
 rename SourceS/{miniwin_misc.h => miniwin/misc.h} (99%)
 rename SourceS/{miniwin_misc_macro.h => miniwin/misc_macro.h} (100%)
 rename SourceS/{miniwin_popdecl.inc => miniwin/popdecl.inc} (100%)
 rename SourceS/{miniwin_pushdecl.inc => miniwin/pushdecl.inc} (100%)
 create mode 100644 SourceS/miniwin/rand.h
 rename SourceS/{miniwin_thread.h => miniwin/thread.h} (95%)
 rename SourceS/{miniwin_ui.h => miniwin/ui.h} (96%)
 delete mode 100644 SourceS/miniwin_rand.h
 rename SourceX/{miniwin.cpp => miniwin/misc.cpp} (100%)
 rename SourceX/{miniwin_io.cpp => miniwin/misc_io.cpp} (100%)
 rename SourceX/{miniwin_msg_sdl.cpp => miniwin/misc_msg.cpp} (100%)
 rename SourceX/{stub_rand.cpp => miniwin/rand.cpp} (63%)
 rename SourceX/{miniwin_thread.cpp => miniwin/thread.cpp} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28a2cc4dc..a3dcad256 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,11 +154,11 @@ target_include_directories(devilution PRIVATE SourceS)
 
 add_executable(devilutionx
   SourceX/dx.cpp
-  SourceX/miniwin.cpp
-  SourceX/miniwin_io.cpp
-  SourceX/miniwin_msg_sdl.cpp
-  SourceX/stub_rand.cpp
-  SourceX/miniwin_thread.cpp
+  SourceX/miniwin/misc.cpp
+  SourceX/miniwin/misc_io.cpp
+  SourceX/miniwin/misc_msg.cpp
+  SourceX/miniwin/rand.cpp
+  SourceX/miniwin/thread.cpp
   SourceX/sound.cpp
   SourceX/storm.cpp
   SourceX/storm_net.cpp
diff --git a/SourceS/miniwin.h b/SourceS/miniwin.h
index e43a08c1c..d4c488ec7 100644
--- a/SourceS/miniwin.h
+++ b/SourceS/miniwin.h
@@ -25,13 +25,13 @@
 #define __int64 long long __attribute__((aligned(8)))
 #endif
 
-#include "miniwin_misc.h"
-#include "miniwin_com.h"
-#include "miniwin_ui.h"
-#include "miniwin_thread.h"
-#include "miniwin_rand.h"
+#include "miniwin/misc.h"
+#include "miniwin/com.h"
+#include "miniwin/ui.h"
+#include "miniwin/thread.h"
+#include "miniwin/rand.h"
 
 #ifdef DEVILUTION_ENGINE
-#include "miniwin_misc_macro.h"
-#include "miniwin_com_macro.h"
+#include "miniwin/misc_macro.h"
+#include "miniwin/com_macro.h"
 #endif
diff --git a/SourceS/miniwin_com.h b/SourceS/miniwin/com.h
similarity index 94%
rename from SourceS/miniwin_com.h
rename to SourceS/miniwin/com.h
index bb5d20aa3..8a0bfb782 100644
--- a/SourceS/miniwin_com.h
+++ b/SourceS/miniwin/com.h
@@ -43,8 +43,8 @@ struct IUnknown {
 	// clang-format on
 };
 
-#include "miniwin_com_ddraw.inc"
-#include "miniwin_com_dsound.inc"
+#include "miniwin/com/ddraw.inc"
+#include "miniwin/com/dsound.inc"
 
 #ifndef DEVILUTION_ENGINE
 #pragma pop_macro("DECLARE_INTERFACE_")
@@ -65,4 +65,5 @@ constexpr auto DVL_SW_HIDE = 0;
 constexpr auto DVL_SW_SHOWNORMAL = 1;
 constexpr auto DVL_SM_CXSCREEN = 0;
 constexpr auto DVL_SM_CYSCREEN = 1;
-}
+
+}  // namespace dvl
diff --git a/SourceS/miniwin_com_ddraw.inc b/SourceS/miniwin/com/ddraw.inc
similarity index 100%
rename from SourceS/miniwin_com_ddraw.inc
rename to SourceS/miniwin/com/ddraw.inc
diff --git a/SourceS/miniwin_com_macro_ddraw.inc b/SourceS/miniwin/com/ddraw_macro.inc
similarity index 100%
rename from SourceS/miniwin_com_macro_ddraw.inc
rename to SourceS/miniwin/com/ddraw_macro.inc
diff --git a/SourceS/miniwin_com_dsound.inc b/SourceS/miniwin/com/dsound.inc
similarity index 100%
rename from SourceS/miniwin_com_dsound.inc
rename to SourceS/miniwin/com/dsound.inc
diff --git a/SourceS/miniwin_com_macro_dsound.inc b/SourceS/miniwin/com/dsound_macro.inc
similarity index 100%
rename from SourceS/miniwin_com_macro_dsound.inc
rename to SourceS/miniwin/com/dsound_macro.inc
diff --git a/SourceS/miniwin_com_macro.h b/SourceS/miniwin/com_macro.h
similarity index 87%
rename from SourceS/miniwin_com_macro.h
rename to SourceS/miniwin/com_macro.h
index 4ae701a3c..2ba92df54 100644
--- a/SourceS/miniwin_com_macro.h
+++ b/SourceS/miniwin/com_macro.h
@@ -26,5 +26,5 @@
 
 #define MAKE_HRESULT(sev, fac, code) ((HRESULT)(((uint32_t)(sev) << 31) | ((uint32_t)(fac) << 16) | ((uint32_t)(code))))
 
-#include "miniwin_com_macro_ddraw.inc"
-#include "miniwin_com_macro_dsound.inc"
+#include "miniwin/com/ddraw_macro.inc"
+#include "miniwin/com/dsound_macro.inc"
diff --git a/SourceS/miniwin_misc.h b/SourceS/miniwin/misc.h
similarity index 99%
rename from SourceS/miniwin_misc.h
rename to SourceS/miniwin/misc.h
index a36050798..1c08343ef 100644
--- a/SourceS/miniwin_misc.h
+++ b/SourceS/miniwin/misc.h
@@ -772,4 +772,4 @@ constexpr auto DVL_MB_TASKMODAL = 0x00002000L;
 constexpr auto DVL_MB_ICONHAND = 0x00000010L;
 constexpr auto DVL_MB_ICONEXCLAMATION = 0x00000030L;
 
-}
+}  // namespace dvl
diff --git a/SourceS/miniwin_misc_macro.h b/SourceS/miniwin/misc_macro.h
similarity index 100%
rename from SourceS/miniwin_misc_macro.h
rename to SourceS/miniwin/misc_macro.h
diff --git a/SourceS/miniwin_popdecl.inc b/SourceS/miniwin/popdecl.inc
similarity index 100%
rename from SourceS/miniwin_popdecl.inc
rename to SourceS/miniwin/popdecl.inc
diff --git a/SourceS/miniwin_pushdecl.inc b/SourceS/miniwin/pushdecl.inc
similarity index 100%
rename from SourceS/miniwin_pushdecl.inc
rename to SourceS/miniwin/pushdecl.inc
diff --git a/SourceS/miniwin/rand.h b/SourceS/miniwin/rand.h
new file mode 100644
index 000000000..0ce54b985
--- /dev/null
+++ b/SourceS/miniwin/rand.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace dvl {
+
+int rand(void);
+void srand(uint32_t seed);
+
+}  // namespace dvl
diff --git a/SourceS/miniwin_thread.h b/SourceS/miniwin/thread.h
similarity index 95%
rename from SourceS/miniwin_thread.h
rename to SourceS/miniwin/thread.h
index cf5b12bcb..01bd745c8 100644
--- a/SourceS/miniwin_thread.h
+++ b/SourceS/miniwin/thread.h
@@ -8,4 +8,4 @@ void WINAPI EnterCriticalSection(LPCRITICAL_SECTION lpCriticalSection);
 void WINAPI LeaveCriticalSection(LPCRITICAL_SECTION lpCriticalSection);
 void WINAPI DeleteCriticalSection(LPCRITICAL_SECTION lpCriticalSection);
 
-}
+}  // namespace dvl
diff --git a/SourceS/miniwin_ui.h b/SourceS/miniwin/ui.h
similarity index 96%
rename from SourceS/miniwin_ui.h
rename to SourceS/miniwin/ui.h
index 1258ced9c..a93601aa0 100644
--- a/SourceS/miniwin_ui.h
+++ b/SourceS/miniwin/ui.h
@@ -9,4 +9,4 @@ DWORD FormatMessage(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId, DWORD dw
 int DialogBoxParam(HINSTANCE hInstance, LPCSTR msgId, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
 LPCSTR DVL_MAKEINTRESOURCE(int i);
 
-}
+}  // namespace dvl
diff --git a/SourceS/miniwin_rand.h b/SourceS/miniwin_rand.h
deleted file mode 100644
index ed2af7d3f..000000000
--- a/SourceS/miniwin_rand.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace dvl {
-
-int rand(void);
-void srand(unsigned int seed);
-
-}
diff --git a/SourceX/miniwin.cpp b/SourceX/miniwin/misc.cpp
similarity index 100%
rename from SourceX/miniwin.cpp
rename to SourceX/miniwin/misc.cpp
diff --git a/SourceX/miniwin_io.cpp b/SourceX/miniwin/misc_io.cpp
similarity index 100%
rename from SourceX/miniwin_io.cpp
rename to SourceX/miniwin/misc_io.cpp
diff --git a/SourceX/miniwin_msg_sdl.cpp b/SourceX/miniwin/misc_msg.cpp
similarity index 100%
rename from SourceX/miniwin_msg_sdl.cpp
rename to SourceX/miniwin/misc_msg.cpp
diff --git a/SourceX/stub_rand.cpp b/SourceX/miniwin/rand.cpp
similarity index 63%
rename from SourceX/stub_rand.cpp
rename to SourceX/miniwin/rand.cpp
index aa4cafd35..b14b044f4 100644
--- a/SourceX/stub_rand.cpp
+++ b/SourceX/miniwin/rand.cpp
@@ -1,8 +1,10 @@
+#include <stdint.h>
+
 #include "devilution.h"
 
 namespace dvl {
 
-unsigned int rand_state = 1;
+static uint32_t rand_state = 0;
 
 int rand(void)
 {
@@ -10,9 +12,9 @@ int rand(void)
 	return (rand_state >> 16) & 0x7FFF;
 }
 
-void srand(unsigned int seed)
+void srand(uint32_t seed)
 {
 	rand_state = seed;
 }
 
-}
+}  // namespace dvl
diff --git a/SourceX/miniwin_thread.cpp b/SourceX/miniwin/thread.cpp
similarity index 100%
rename from SourceX/miniwin_thread.cpp
rename to SourceX/miniwin/thread.cpp
diff --git a/SourceX/miniwin_sdl.h b/SourceX/miniwin_sdl.h
index 5ad1a7e77..2aee33057 100644
--- a/SourceX/miniwin_sdl.h
+++ b/SourceX/miniwin_sdl.h
@@ -16,12 +16,3 @@ void sdl_present_surface();
 void sdl_update_entire_surface();
 
 }
-
-#ifdef __WINDOWS__
-#include <direct.h>
-#define GetCurrentDir _getcwd
-#else
-#include <unistd.h>
-#define GetCurrentDir getcwd
-#endif
-
diff --git a/SourceX/utf8.h b/SourceX/utf8.h
index 16ff94f72..61687ff3c 100644
--- a/SourceX/utf8.h
+++ b/SourceX/utf8.h
@@ -24,7 +24,7 @@
  * occurs, this pointer will be a guess that depends on the particular
  * error, but it will always advance at least one byte.
  */
-static void *
+inline void *
 utf8_decode(void *buf, uint32_t *c, int *e)
 {
     static const char lengths[] = {
@@ -67,7 +67,7 @@ utf8_decode(void *buf, uint32_t *c, int *e)
     return next;
 }
 
-static std::string utf8_to_latin1(const char* in)
+inline std::string utf8_to_latin1(const char* in)
 {
 	std::string instr(in);
 	instr.resize(instr.size() + 4);
diff --git a/types.h b/types.h
index f879d6b8a..9065abd6d 100644
--- a/types.h
+++ b/types.h
@@ -47,7 +47,7 @@
 #define DEVILUTION_BEGIN_NAMESPACE namespace dvl {
 #define DEVILUTION_END_NAMESPACE }
 
-#include "miniwin_pushdecl.inc"
+#include "miniwin/pushdecl.inc"
 #include "miniwin.h"
 
 #endif
@@ -154,7 +154,7 @@ DEVILUTION_BEGIN_NAMESPACE
 //}
 //#endif
 
-#include "miniwin_popdecl.inc"
+#include "miniwin/popdecl.inc"
 
 DEVILUTION_END_NAMESPACE