WinMM-DRV: Organize resources and use ResEdit instead of VS

7 files changed, 84 insertions, 206 deletions

diff --git a/utils/winmm_drv/CMakeLists.txt b/utils/winmm_drv/CMakeLists.txt
index e65f281..ad35aaa 100644
--- a/utils/winmm_drv/CMakeLists.txt
+++ b/utils/winmm_drv/CMakeLists.txt
@@ -87,7 +87,7 @@ set(ADLMIDI_DRIVER_SRC
     config/regconfig.c
 )
 
-add_library(adlmidiconfig MODULE ${ADLMIDI_DRIVER_SRC} cpl/adlconfig.c)
+add_library(adlmidiconfig MODULE ${ADLMIDI_DRIVER_SRC} cpl/adlconfig.c cpl/res-cpl.rc)
 set_target_properties(adlmidiconfig PROPERTIES PREFIX "" OUTPUT_NAME "libadlconfig" SUFFIX ".cpl")
 target_include_directories(adlmidiconfig PRIVATE config)
 target_compile_definitions(adlmidiconfig PRIVATE
@@ -101,7 +101,7 @@ target_compile_definitions(adlmidiconfig PRIVATE
 
 target_link_libraries(adlmidiconfig PRIVATE comctl32 gdi32 user32)
 
-add_executable(adlmidiconfigtool ${ADLMIDI_DRIVER_SRC} cpl/adlconfig-tool.c)
+add_executable(adlmidiconfigtool ${ADLMIDI_DRIVER_SRC} cpl/adlconfig-tool.c cpl/res-tool.rc)
 set_target_properties(adlmidiconfigtool PROPERTIES WIN32_EXECUTABLE ON)
 target_include_directories(adlmidiconfigtool PRIVATE config)
 target_compile_definitions(adlmidiconfigtool PRIVATE
diff --git a/utils/winmm_drv/cpl/adlconfig.cpl.manifest b/utils/winmm_drv/cpl/adlconfig.cpl.manifest
deleted file mode 100644
index 1016f98..0000000
--- a/utils/winmm_drv/cpl/adlconfig.cpl.manifest
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <assemblyIdentity
-        version="1.0.0.0"
-        processorArchitecture="*"
-        name="Wohlstand.libADLMIDI.WinMMDriver"
-        type="win32"
-    />
-    <description>libADLMIDI synth Driver settings tool</description>
-    <dependency>
-        <dependentAssembly>
-            <assemblyIdentity
-                type="win32"
-                name="Microsoft.Windows.Common-Controls"
-                version="6.0.0.0"
-                processorArchitecture="*"
-                publicKeyToken="6595b64144ccf1df"
-                language="*"
-            />
-        </dependentAssembly>
-    </dependency>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-        <application>
-            <!-- Windows 10 -->
-            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-            <!-- Windows 8.1 -->
-            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-            <!-- Windows 8 -->
-            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-            <!-- Windows 7 -->
-            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-            <!-- Windows Vista -->
-            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-        </application>
-    </compatibility>
-</assembly>
diff --git a/utils/winmm_drv/cpl/adlconfig-tool.exe.manifest b/utils/winmm_drv/cpl/adlconfig.manifest
index 1016f98..1016f98 100644
--- a/utils/winmm_drv/cpl/adlconfig-tool.exe.manifest
+++ b/utils/winmm_drv/cpl/adlconfig.manifest
diff --git a/utils/winmm_drv/cpl/adlconfig.rc b/utils/winmm_drv/cpl/adlconfig.rc
index 91d0cb7..584276e 100644
--- a/utils/winmm_drv/cpl/adlconfig.rc
+++ b/utils/winmm_drv/cpl/adlconfig.rc
@@ -1,142 +1,68 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-/////////////////////////////////////////////////////////////////////////////
-// Russian (Russia) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST
-//
-
-#ifdef ADL_IS_CPL_APPLET
-MANIFSEST_RES_CPL RT_MANIFEST         "adlconfig.cpl.manifest"
-#else
-MANIFSEST_RES RT_MANIFEST             "adlconfig-tool.exe.manifest"
-#endif
+// Generated by ResEdit 1.6.6
+// Copyright (C) 2006-2015
+// http://www.resedit.net
 
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include "resource.h"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
 
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "opl3icon.ico"
 
 
-/////////////////////////////////////////////////////////////////////////////
 //
-// Dialog
+// Dialog resources
 //
-
-IDD_CONFIG_BOX DIALOGEX 0, 0, 243, 242
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+IDD_CONFIG_BOX DIALOGEX 0, 0, 251, 244
+STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "libADLMIDI settings"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,81,210,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,135,210,50,14
-    PUSHBUTTON      "Apply",IDC_APPLYBUTTON,191,210,50,14
-    COMBOBOX        IDC_VOLUMEMODEL,79,95,155,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Volume model:",IDC_VM_LABEL,5,97,66,8
-    COMBOBOX        IDC_BANK_ID,79,15,155,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Instruments bank",IDC_INS_BANK,4,2,234,51
-    CONTROL         "Internal bank",IDC_BANK_INTERNAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,9,16,63,10
-    CONTROL         "External bank",IDC_BANK_EXTERNAL,"Button",BS_AUTORADIOBUTTON,9,33,67,10
-    EDITTEXT        IDC_BANK_PATH,79,31,107,14,ES_AUTOHSCROLL | WS_DISABLED
-    PUSHBUTTON      "Browse...",IDC_BROWSE_BANK,187,31,48,14
-    PUSHBUTTON      "Restore defaults",IDC_RESTORE_DEFAULTS,153,193,88,14
-    CONTROL         "Deep tremolo (Auto/Enable/Disable)",IDC_FLAG_TREMOLO,
-                    "Button",BS_AUTO3STATE | WS_TABSTOP,5,124,227,10
-    CONTROL         "Deep vibrato (Auto/Enable/Disable)",IDC_FLAG_VIBRATO,
-                    "Button",BS_AUTO3STATE | WS_TABSTOP,5,141,227,10
-    CONTROL         "Full-panning stereo",IDC_FLAG_SOFTPAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,108,227,10
-    COMBOBOX        IDC_EMULATOR,79,56,155,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Chip emulator type:",IDC_CHIPEMU_LABEL,5,58,67,8
-    LTEXT           "Number of chips",IDC_CHIPNUM_LABEL,5,75,69,8
-    COMBOBOX        IDC_NUM_CHIPS,79,74,33,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_NUM_4OPVO,193,74,41,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Number of 4OP voices",IDC_4OPSNUM_LABEL,115,76,72,8
-    CONTROL         "Scalable modulation",IDC_FLAG_SCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,157,228,10
-    CONTROL         "Full-range brightness (CC74)",IDC_FLAG_FULLBRIGHT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,173,228,10
-    PUSHBUTTON      "About...",IDC_ABOUT,5,210,50,14
-    PUSHBUTTON      "Reset synth now",IDC_RESET_SYNTH,69,193,80,14
-    RTEXT           "Settings will be applied immediately",IDC_BOTTOMNOTE_LABEL,0,227,241,8
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
+FONT 8, "MS Shell Dlg", 400, 0, 1
 BEGIN
-    "resource.h\0"
+    GROUPBOX        "Instruments bank", IDC_INS_BANK, 9, 4, 233, 51, 0, WS_EX_LEFT
+    AUTORADIOBUTTON "Internal bank", IDC_BANK_INTERNAL, 15, 17, 63, 8, WS_GROUP | WS_TABSTOP, WS_EX_LEFT
+    COMBOBOX        IDC_BANK_ID, 83, 14, 155, 14, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    AUTORADIOBUTTON "External bank", IDC_BANK_EXTERNAL, 15, 33, 63, 8, WS_TABSTOP, WS_EX_LEFT
+    EDITTEXT        IDC_BANK_PATH, 83, 31, 107, 14, WS_DISABLED | ES_AUTOHSCROLL, WS_EX_LEFT
+    PUSHBUTTON      "Browse...", IDC_BROWSE_BANK, 194, 30, 45, 14, 0, WS_EX_LEFT
+    LTEXT           "Chip emulator type:", IDC_CHIPEMU_LABEL, 11, 60, 67, 10, SS_LEFT, WS_EX_LEFT
+    COMBOBOX        IDC_EMULATOR, 83, 58, 159, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    LTEXT           "Number of chips", IDC_CHIPNUM_LABEL, 11, 78, 67, 8, SS_LEFT, WS_EX_LEFT
+    COMBOBOX        IDC_NUM_CHIPS, 83, 76, 34, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    LTEXT           "Number of 4OP voices", IDC_4OPSNUM_LABEL, 131, 78, 72, 8, SS_LEFT, WS_EX_LEFT
+    COMBOBOX        IDC_NUM_4OPVO, 209, 76, 33, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    LTEXT           "Volume model:", IDC_VM_LABEL, 11, 95, 67, 13, SS_LEFT, WS_EX_LEFT
+    COMBOBOX        IDC_VOLUMEMODEL, 83, 95, 159, 200, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    AUTOCHECKBOX    "Full-panning stereo", IDC_FLAG_SOFTPAN, 11, 115, 227, 10, 0, WS_EX_LEFT
+    AUTO3STATE      "Deep tremolo (Auto/Enable/Disable)", IDC_FLAG_TREMOLO, 11, 130, 227, 10, NOT WS_TABSTOP, WS_EX_LEFT
+    AUTO3STATE      "Deep vibrato (Auto/Enable/Disable)", IDC_FLAG_VIBRATO, 11, 145, 227, 10, NOT WS_TABSTOP, WS_EX_LEFT
+    AUTOCHECKBOX    "Scalable modulation", IDC_FLAG_SCALE, 11, 160, 227, 10, 0, WS_EX_LEFT
+    AUTOCHECKBOX    "Full-range brightness (CC74)", IDC_FLAG_FULLBRIGHT, 11, 175, 227, 10, 0, WS_EX_LEFT
+    PUSHBUTTON      "Reset synth now", IDC_RESET_SYNTH, 73, 195, 80, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Restore defaults", IDC_RESTORE_DEFAULTS, 155, 195, 88, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "About...", IDC_ABOUT, 10, 212, 50, 14, 0, WS_EX_LEFT
+    DEFPUSHBUTTON   "OK", IDOK, 88, 212, 50, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Cancel", IDCANCEL, 141, 212, 50, 14, 0, WS_EX_LEFT
+    PUSHBUTTON      "Apply", IDC_APPLYBUTTON, 194, 212, 50, 14, 0, WS_EX_LEFT
+    RTEXT           "Settings will be applied immediately", IDC_BOTTOMNOTE_LABEL, 7, 227, 235, 8, SS_RIGHT, WS_EX_LEFT
 END
 
-2 TEXTINCLUDE
-BEGIN
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
 
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_SETUP_BOX, DIALOG
-    BEGIN
-        RIGHTMARGIN, 241
-        BOTTOMMARGIN, 241
-    END
-END
-#endif    // APSTUDIO_INVOKED
 
-
-/////////////////////////////////////////////////////////////////////////////
 //
-// String Table
+// String Table resources
 //
-
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 STRINGTABLE
 BEGIN
-    IDC_DRIVERNAME               "libADLMIDI settings"
-    IDC_DRIVERDESC               "Settings for libADLMIDI synthesizer"
+    IDC_DRIVERNAME                "libADLMIDI settings"
+    IDC_DRIVERDESC                "Settings for libADLMIDI synthesizer"
 END
 
-#endif    // Russian (Russia) resources
-/////////////////////////////////////////////////////////////////////////////
 
 
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
 //
-// Generated from the TEXTINCLUDE 3 resource.
+// Icon resources
 //
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
+IDI_ICON1          ICON           "opl3icon.ico"
diff --git a/utils/winmm_drv/cpl/res-cpl.rc b/utils/winmm_drv/cpl/res-cpl.rc
new file mode 100644
index 0000000..c23b501
--- /dev/null
+++ b/utils/winmm_drv/cpl/res-cpl.rc
@@ -0,0 +1,3 @@
+#include <winresrc.h>
+
+123     RT_MANIFEST    "adlconfig.manifest"
diff --git a/utils/winmm_drv/cpl/res-tool.rc b/utils/winmm_drv/cpl/res-tool.rc
new file mode 100644
index 0000000..22e6bfa
--- /dev/null
+++ b/utils/winmm_drv/cpl/res-tool.rc
@@ -0,0 +1,3 @@
+#include <winresrc.h>
+
+1       RT_MANIFEST    "adlconfig.manifest"
diff --git a/utils/winmm_drv/cpl/resource.h b/utils/winmm_drv/cpl/resource.h
index bd6b662..4d41e9f 100644
--- a/utils/winmm_drv/cpl/resource.h
+++ b/utils/winmm_drv/cpl/resource.h
@@ -1,50 +1,32 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by adlsetup.rc
-//
-#include <winresrc.h>
-
-#define MANIFSEST_RES                   1
-#define MANIFSEST_RES_CPL               123
-#define IDD_CONFIG_BOX                  101
-#define IDI_ICON1                       102
-#define IDC_DRIVERNAME                  103
-#define IDC_DRIVERDESC                  104
-
-#define IDC_APPLYBUTTON                 1000
-#define IDC_VOLUMEMODEL                 1001
-#define IDC_VM_LABEL                    1002
-#define IDC_BANK_ID                     1003
-#define IDC_INS_BANK                    1004
-#define IDC_BANK_INTERNAL               1005
-#define IDC_BANK_EXTERNAL               1006
-#define IDC_BANK_PATH                   1007
-#define IDC_BROWSE_BANK                 1008
-#define IDC_RESTORE_DEFAULTS            1010
-#define IDC_FLAG_TREMOLO                1011
-#define IDC_FLAG_VIBRATO                1012
-#define IDC_FLAG_SOFTPAN                1013
-#define IDC_EMULATOR                    1014
-#define IDC_NUM_CHIPS                   1018
-#define IDC_NUM_4OPVO                   1019
-#define IDC_FLAG_SCALE                  1020
-#define IDC_FLAG_FULLBRIGHT             1021
-#define IDC_ABOUT                       1022
-#define IDC_CHIPEMU_LABEL               1023
-#define IDC_CHIPNUM_LABEL               1024
-#define IDC_4OPSNUM_LABEL               1025
-#define IDC_RESET_SYNTH                 1026
-#define IDC_BOTTOMNOTE_LABEL            1027
-
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        105
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1028
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
 #endif
+
+#define IDI_ICON1                               104
+#define IDD_CONFIG_BOX                          106
+#define IDC_APPLYBUTTON                         1000
+#define IDC_VOLUMEMODEL                         1001
+#define IDC_VM_LABEL                            1002
+#define IDC_BANK_ID                             1003
+#define IDC_INS_BANK                            1004
+#define IDC_BANK_INTERNAL                       1005
+#define IDC_BANK_EXTERNAL                       1006
+#define IDC_BANK_PATH                           1007
+#define IDC_BROWSE_BANK                         1008
+#define IDC_RESTORE_DEFAULTS                    1010
+#define IDC_FLAG_TREMOLO                        1011
+#define IDC_FLAG_VIBRATO                        1012
+#define IDC_FLAG_SOFTPAN                        1013
+#define IDC_EMULATOR                            1014
+#define IDC_NUM_CHIPS                           1018
+#define IDC_NUM_4OPVO                           1019
+#define IDC_FLAG_SCALE                          1020
+#define IDC_FLAG_FULLBRIGHT                     1021
+#define IDC_ABOUT                               1022
+#define IDC_CHIPEMU_LABEL                       1023
+#define IDC_CHIPNUM_LABEL                       1024
+#define IDC_4OPSNUM_LABEL                       1025
+#define IDC_RESET_SYNTH                         1026
+#define IDC_BOTTOMNOTE_LABEL                    1027
+#define IDC_DRIVERNAME                          40000
+#define IDC_DRIVERDESC                          40001