protect against unsafe gain changes

log message updated to reflect new kinds

replace_multiple_space_with_one() now returns new line length

kind_as_string() added to util.c

README.md

@@ -12,10 +12,13 @@
 
 ## `Use`
 
-`./vmrcli.exe [-i] [-k] [-D] <api commands>`
+```powershell
+./vmrcli.exe [-h] [-i] [-k] [-D] <api commands>
+```
 
 Where:
 
+- `h`: Prints the help dialogue.
 - `i`: Enable interactive mode. If set, any api commands passed on the command line will be ignored.
 - `k`: The kind of Voicemeeter (basic, banana or potato). Use this to launch the GUI.
 - `D`: Set log level 0=TRACE, 1=DEBUG, 2=INFO, 3=WARN, 4=ERROR, 5=FATAL
@@ -30,17 +33,23 @@ Examples:
 
 Launch basic GUI, set log level to INFO, Toggle Strip 0 Mute, then print its new value
 
-`./vmrcli.exe -kbasic -D2 !strip[0].mute strip[0].mute`
+```powershell
+./vmrcli.exe -kbasic -D2 !strip[0].mute strip[0].mute
+```
 
 Launch banana GUI, set log level to DEBUG, set Strip 0 label to podmic then print Strip 2 label
 
-`./vmrcli.exe -kbanana -D1 strip[0].label=podmic strip[2].label`
+```powershell
+./vmrcli.exe -kbanana -D1 strip[0].label=podmic strip[2].label
+```
 
 ## `Interactive Mode`
 
 Running the following command in Powershell:
 
-`./vmrcli.exe -i`
+```powershell
+./vmrcli.exe -i
+```
 
 Will open an interactive prompt:
 
@@ -61,7 +70,7 @@ Scripts can be loaded from text files, for example in Powershell:
 
 ## `Build`
 
-Run the included `makefile` to build with [GNU Make](https://www.gnu.org/software/make/).
+Run the included `makefile` with [GNU Make](https://www.gnu.org/software/make/).
 
 By default the log.c module is built with coloured logging enabled. To disable this you can override the `LOG_USE_COLOR` variable, for example:
 

include/util.h

@@ -1,6 +1,9 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
-void replace_multiple_space_with_one(char *s, size_t len);
+void remove_name_in_path(char *szPath);
+int replace_multiple_space_with_one(char *s, size_t len);
+char *kind_as_string(char *s, enum kind kind, int n);
+char *version_as_string(char *, long v, int n);
 
 #endif /* __UTIL_H__ */

include/vmr.h

@@ -9,7 +9,9 @@ enum kind
     BASIC = 1,
     BANANA,
     POTATO,
-    POTATOX64 = 6
+    BASICX64,
+    BANANAX64,
+    POTATOX64,
 };
 
 long login(T_VBVMR_INTERFACE *iVMR, int kind);
@@ -20,7 +22,7 @@ long version(T_VBVMR_INTERFACE *iVMR, long *version);
 
 bool is_pdirty(T_VBVMR_INTERFACE *iVMR);
 long get_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float *f);
-long get_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, char *s);
+long get_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, unsigned short *s);
 long set_parameter_float(T_VBVMR_INTERFACE *iVMR, char *param, float val);
 long set_parameter_string(T_VBVMR_INTERFACE *iVMR, char *param, char *s);
 long set_parameters(T_VBVMR_INTERFACE *iVMR, char *command);

src/cdll.c

@@ -1,6 +1,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "cdll.h"
+#include "util.h"
 
 /*******************************************************************************/
 /**                           GET VOICEMEETER DIRECTORY                       **/
@@ -12,18 +13,6 @@
 #define KEY_WOW64_32KEY 0x0200
 #endif
 
-void remove_name_in_path(char *szPath)
-{
-    char *p = szPath;
-
-    while (*p++)
-        ;
-    while (p > szPath && *p != '\\')
-        p--;
-    if (*p == '\\')
-        *p = '\0';
-}
-
 bool __cdecl registry_get_voicemeeter_folder(char *szDir)
 {
     char szKey[256];

src/util.c

@@ -1,6 +1,28 @@
 #include <stddef.h>
+#include <stdio.h>
+#include "vmr.h"
+#include "util.h"
 
-void replace_multiple_space_with_one(char *s, size_t len)
+void remove_name_in_path(char *szPath)
+{
+    char *p = szPath;
+
+    while (*p++)
+        ;
+    while (p > szPath && *p != '\\')
+        p--;
+    if (*p == '\\')
+        *p = '\0';
+}
+
+/**
+ * @brief replaces multiple newlines and tabs with single spaces
+ *
+ * @param s the string to be reduced
+ * @param len current length of the string
+ * @return int new length of the string
+ */
+int replace_multiple_space_with_one(char *s, size_t len)
 {
     int j = 0;
     int count = 0;
@@ -8,11 +30,11 @@ void replace_multiple_space_with_one(char *s, size_t len)
     if (len == 1 && (s[0] == ' ' || s[0] == '\t'))
     {
         s[0] = '\0';
-        return;
+        return len;
     }
 
     if (len < 2)
-        return;
+        return len;
 
     for (int i = 0; s[i] != '\0'; i++)
     {
@@ -32,4 +54,37 @@ void replace_multiple_space_with_one(char *s, size_t len)
         }
     }
     s[j] = '\0';
+    return j;
+}
+
+char *kind_as_string(char *s, enum kind kind, int n)
+{
+    char *kinds[] = {
+        "Basic",
+        "Banana",
+        "Potato",
+        "Basic x64",
+        "Banana x64",
+        "Potato x64",
+    };
+    snprintf(s, n, kinds[kind - 1]);
+    return s;
+}
+
+/**
+ * @brief returns Voicemeeter's version as a string
+ *
+ * @param s string buffer the version will be written to
+ * @param v unprocessed version as a long int
+ * @param n maximum number of characters to be written to the buffer
+ * @return char*
+ */
+char *version_as_string(char *s, long v, int n)
+{
+    long v1 = (v & 0xFF000000) >> 24,
+         v2 = (v & 0x00FF0000) >> 16,
+         v3 = (v & 0x0000FF00) >> 8,
+         v4 = (v & 0x000000FF);
+    snprintf(s, n, "%i.%i.%i.%i", (int)v1, (int)v2, (int)v3, (int)v4);
+    return s;
 }

src/vmr.c

@@ -3,6 +3,10 @@
 #include <time.h>
 #include "vmr.h"
 #include "log.h"
+#include "util.h"
+
+#define VERSION_STR_LEN 128
+#define KIND_STR_LEN 64
 
 long login(T_VBVMR_INTERFACE *vmr, int kind)
 {
@@ -13,21 +17,10 @@ long login(T_VBVMR_INTERFACE *vmr, int kind)
     if (rep == 1)
     {
         run_voicemeeter(vmr, kind);
-        switch (kind)
-        {
-        case BASIC:
-            log_info("Launching Voicemeeter Basic GUI");
-            break;
-        case BANANA:
-            log_info("Launching Voicemeeter Banana GUI");
-            break;
-        case POTATO:
-            log_info("Launching Voicemeeter Potato GUI");
-            break;
-        case POTATOX64:
-            log_info("Launching Voicemeeter Potato x64 GUI");
-            break;
-        }
+        char kind_s[KIND_STR_LEN];
+        log_info(
+            "Launching Voicemeeter %s GUI",
+            kind_as_string(kind_s, kind, KIND_STR_LEN));
 
         time_t endwait;
         int timeout = 2;
@@ -43,13 +36,10 @@ long login(T_VBVMR_INTERFACE *vmr, int kind)
     if (rep == 0)
     {
         version(vmr, &v);
-        long v1 = (v & 0xFF000000) >> 24,
-             v2 = (v & 0x00FF0000) >> 16,
-             v3 = (v & 0x0000FF00) >> 8,
-             v4 = (v & 0x000000FF);
-        char version_s[128];
-        sprintf(version_s, "%i.%i.%i.%i", (int)v1, (int)v2, (int)v3, (int)v4);
-        log_info("Successfully logged into the Voicemeeter API v%s", version_s);
+        char version_s[VERSION_STR_LEN];
+        log_info(
+            "Successfully logged into the Voicemeeter API v%s",
+            version_as_string(version_s, v, VERSION_STR_LEN));
         clear_dirty(vmr);
     }
     return rep;
@@ -92,14 +82,14 @@ bool is_pdirty(T_VBVMR_INTERFACE *vmr)
 
 long get_parameter_float(T_VBVMR_INTERFACE *vmr, char *param, float *f)
 {
-    log_trace("VBVMR_GetParameterFloat(%s, <float> *f)", param, f);
+    log_trace("VBVMR_GetParameterFloat(%s, <float> *f)", param);
     return vmr->VBVMR_GetParameterFloat(param, f);
 }
 
-long get_parameter_string(T_VBVMR_INTERFACE *vmr, char *param, char *s)
+long get_parameter_string(T_VBVMR_INTERFACE *vmr, char *param, unsigned short *s)
 {
-    log_trace("VBVMR_GetParameterStringA(%s, <char> *s)", param, s);
-    return vmr->VBVMR_GetParameterStringA(param, s);
+    log_trace("VBVMR_GetParameterStringW(%s, <unsigned short> *s)", param);
+    return vmr->VBVMR_GetParameterStringW(param, s);
 }
 
 long set_parameter_float(T_VBVMR_INTERFACE *vmr, char *param, float val)

src/vmrcli.c

@@ -21,12 +21,12 @@ struct result
     union val
     {
         float f;
-        char s[MAX_LINE];
+        wchar_t s[MAX_LINE];
     } val;
 };
 
 void help(void);
-int set_kind(char *kval);
+enum kind set_kind(char *kval);
 int init_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind);
 void interactive(T_VBVMR_INTERFACE *vmr);
 void parse_command(T_VBVMR_INTERFACE *vmr, char *command);
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
     int opt;
     char *kvalue = "";
     int dvalue;
-    int kind = BANANA;
+    enum kind kind = BANANAX64;
 
     if (argc == 1)
     {
@@ -109,24 +109,41 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
 }
 
+/**
+ * @brief prints the help dialogue
+ *
+ */
 void help()
 {
     puts(
-        "Usage: ./vmrcli.exe [-i] [-k] [-D] <api commands>\n"
+        "Usage: ./vmrcli.exe [-h] [-i] [-k] [-D] <api commands>\n"
         "Where: \n"
+        "\th: Prints the help dialogue\n"
         "\ti: Enable interactive mode\n"
         "\tk: The kind of Voicemeeter (basic, banana, potato)\n"
         "\tD: Set log level 0=TRACE, 1=DEBUG, 2=INFO, 3=WARN, 4=ERROR, 5=FATAL");
 }
 
-int set_kind(char *kval)
+/**
+ * @brief Set the kind object
+ *
+ * @param kval
+ * @return enum kind
+ */
+enum kind set_kind(char *kval)
 {
     if (strcmp(kval, "basic") == 0)
     {
+        if (sizeof(void *) == 8)
+            return BASICX64;
+        else
             return BASIC;
     }
     else if (strcmp(kval, "banana") == 0)
     {
+        if (sizeof(void *) == 8)
+            return BANANAX64;
+        else
             return BANANA;
     }
     else if (strcmp(kval, "potato") == 0)
@@ -171,9 +188,8 @@ int init_voicemeeter(T_VBVMR_INTERFACE *vmr, int kind)
 
 void interactive(T_VBVMR_INTERFACE *vmr)
 {
-    char input[MAX_LINE];
+    char input[MAX_LINE], command[MAX_LINE];
     char *p = input;
-    char command[MAX_LINE];
     int i;
     size_t len;
 
@@ -193,20 +209,21 @@ void interactive(T_VBVMR_INTERFACE *vmr)
                 p++;
                 continue;
             }
-            i = 0;
             log_trace("commands still in buffer: %s", p);
 
-            while (!isspace(*p))
+            i = 0;
+            while (*p && !isspace(*p))
                 command[i++] = *p++;
             command[i] = '\0';
+            p++; /* shift to next char */
 
             if (command[0] != '\0')
                 parse_command(vmr, command);
-            memset(command, '\0', sizeof(command));
+            memset(command, '\0', MAX_LINE);
         }
 
         p = input;                     /* reset pointer */
-        memset(input, '\0', sizeof(input)); /* reset input buffer */
+        memset(input, '\0', MAX_LINE); /* reset input buffer */
         printf(">> ");
     }
 }
@@ -223,7 +240,10 @@ void parse_command(T_VBVMR_INTERFACE *vmr, char *command)
         get(vmr, command, &res);
         if (res.type == FLOAT_T)
         {
+            if (res.val.f == 1 || res.val.f == 0)
                 set_parameter_float(vmr, command, 1 - res.val.f);
+            else
+                log_warn("%s does not appear to be a boolean parameter", command);
         }
         return;
     }
@@ -243,7 +263,7 @@ void parse_command(T_VBVMR_INTERFACE *vmr, char *command)
             printf("%.1f\n", res.val.f);
             break;
         case STRING_T:
-            puts(res.val.s);
+            printf("%ls\n", res.val.s);
             break;
         default:
             break;