From 9dbd3f193d1b88a46fb86778506c45c29c4331bb Mon Sep 17 00:00:00 2001
From: Wohlstand <admin@wohlnet.ru>
Date: Mon, 21 Sep 2020 03:50:53 +0300
Subject: WinMM-Drv: Minor fix of the build for MSVC

---
 utils/winmm_drv/cpl/config_dialog.c | 4 ++--
 utils/winmm_drv/installer/drvinst.c | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'utils')

diff --git a/utils/winmm_drv/cpl/config_dialog.c b/utils/winmm_drv/cpl/config_dialog.c
index 8489273..195524d 100644
--- a/utils/winmm_drv/cpl/config_dialog.c
+++ b/utils/winmm_drv/cpl/config_dialog.c
@@ -366,7 +366,7 @@ BOOL runAdlSetupBox(HINSTANCE hModule, HWND hwnd)
     return TRUE;
 }
 
-WINBOOL initAdlSetupBox(HINSTANCE hModule, HWND hwnd)
+BOOL initAdlSetupBox(HINSTANCE hModule, HWND hwnd)
 {
     InitCommonControls();
     setupDefault(&g_setup);
@@ -375,7 +375,7 @@ WINBOOL initAdlSetupBox(HINSTANCE hModule, HWND hwnd)
     return TRUE;
 }
 
-WINBOOL cleanUpAdlSetupBox(HINSTANCE hModule, HWND hwnd)
+BOOL cleanUpAdlSetupBox(HINSTANCE hModule, HWND hwnd)
 {
     UNREFERENCED_PARAMETER(hModule);
     UNREFERENCED_PARAMETER(hwnd);
diff --git a/utils/winmm_drv/installer/drvinst.c b/utils/winmm_drv/installer/drvinst.c
index e354691..cbba8f6 100644
--- a/utils/winmm_drv/installer/drvinst.c
+++ b/utils/winmm_drv/installer/drvinst.c
@@ -15,11 +15,8 @@
  */
 
 #define WIN32_LEAN_AND_MEAN
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <winerror.h>
+#include <windows.h>
+
 
 const char OPL3EMU_DRIVER_NAME[] = "adlmididrv.dll";
 const char OPL3EMU_CPLAPPLET_NAME[] = "libadlconfig.cpl";
@@ -187,7 +184,7 @@ void constructDriverPathName(char *pathName, const char*fileName)
 void deleteFileReliably(char *pathName, const char *fileName)
 {
     const size_t nameSize = strlen(fileName) + 1;
-    char tmpFilePrefix[nameSize + 1];
+    char tmpFilePrefix[MAX_PATH + 1];
     char tmpDirName[MAX_PATH + 1];
     char tmpPathName[MAX_PATH + 1];
 
-- 
cgit v1.2.3