Target down to Win2K

Tatsh · Oct 22, 2023 · c0ff2e8 · c0ff2e8
1 parent a62c0f1
commit c0ff2e8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt
@@ -55,7 +55,7 @@ add_executable(
   shell.c
   shell.h
   msvc.h)
-target_compile_definitions(winprefs PRIVATE UNICODE _UNICODE)
+target_compile_definitions(winprefs PRIVATE UNICODE _UNICODE _WIN32_WINNT=0x0500)
 target_link_libraries(winprefs PRIVATE shlwapi)
 if(CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo" AND WITH_VLD)
   target_compile_definitions(winprefs PRIVATE ENABLE_VLD)

diff --git a/native/msvc.h b/native/msvc.h
@@ -13,4 +13,9 @@
 #define false FALSE
 #endif
 
+#ifndef WC_ERR_INVALID_CHARS
+#define WC_ERR_INVALID_CHARS 0
+#define _WC_ERR_INVALID_CHARS 0x0080
+#endif
+
 #endif // MSVC_H
diff --git a/native/reg_command.c b/native/reg_command.c
@@ -1,6 +1,10 @@
 #include <stdio.h>
 #include <wchar.h>
 
+#include <windows.h>
+// Has to come after
+#include <versionhelpers.h>
+
 #include "constants.h"
 #include "reg_command.h"
 #include "shell.h"
@@ -140,11 +144,24 @@ void do_write_reg_command(FILE *out_fp,
     if (((size_t)wrote < CMD_MAX_COMMAND_LENGTH) ||
         ((size_t)wrote == CMD_MAX_COMMAND_LENGTH && out[CMD_MAX_COMMAND_LENGTH - 1] == L'f' &&
          out[CMD_MAX_COMMAND_LENGTH - 2] == L'/' && out[CMD_MAX_COMMAND_LENGTH - 3] == L' ')) {
-        size_t req_size = (size_t)WideCharToMultiByte(
-            CP_UTF8, WC_ERR_INVALID_CHARS, out, -1, NULL, 0, NULL, NULL);
+        size_t req_size =
+            (size_t)WideCharToMultiByte(CP_UTF8,
+                                        IsWindowsVistaOrGreater() ? _WC_ERR_INVALID_CHARS : 0,
+                                        out,
+                                        -1,
+                                        NULL,
+                                        0,
+                                        NULL,
+                                        NULL);
         char *mb_out = malloc(req_size);
-        WideCharToMultiByte(
-            CP_UTF8, WC_ERR_INVALID_CHARS, out, -1, mb_out, (int)req_size, NULL, NULL);
+        WideCharToMultiByte(CP_UTF8,
+                            IsWindowsVistaOrGreater() ? _WC_ERR_INVALID_CHARS : 0,
+                            out,
+                            -1,
+                            mb_out,
+                            (int)req_size,
+                            NULL,
+                            NULL);
         fprintf(out_fp, "%s\n", mb_out);
         free(mb_out);
     } else {