Reorganize miniwin headers, part 1

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

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

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

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"

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

SourceS/miniwin/rand.h

@@ -0,0 +1,8 @@
+#pragma once
+
+namespace dvl {
+
+int rand(void);
+void srand(uint32_t seed);
+
+}  // namespace dvl

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

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

SourceS/miniwin_rand.h

@@ -1,8 +0,0 @@
-#pragma once
-
-namespace dvl {
-
-int rand(void);
-void srand(unsigned int seed);
-
-}

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

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
-

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);

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