Skip to content

Display and control your Android device

Support wchar_t in argv for Windows

Yu-Chen Lin48bb6f2ea858
diff --git a/app/src/main.c b/app/src/main.c
index 3334cbf9..b3a468cc 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -4,6 +4,10 @@
#include <stdbool.h>
#include <unistd.h>
#include <libavformat/avformat.h>
+#ifdef _WIN32
+#include <windows.h>
+#include "util/str.h"
+#endif
#ifdef HAVE_V4L2
# include <libavdevice/avdevice.h>
#endif
@@ -18,8 +22,8 @@
#include "version.h"
int
-main(int argc, char *argv[]) {
-#ifdef __WINDOWS__
+main_scrcpy(int argc, char *argv[]) {
+#ifdef _WIN32
// disable buffering, we want logs immediately
// even line buffering (setvbuf() with mode _IOLBF) is not sufficient
setbuf(stdout, NULL);
@@ -80,3 +84,52 @@ main(int argc, char *argv[]) {
return ret;
}
+
+int
+main(int argc, char *argv[]) {
+#ifndef _WIN32
+ return main_scrcpy(argc, argv);
+#else
+ (void) argc;
+ (void) argv;
+ int wargc;
+ wchar_t **wargv = CommandLineToArgvW(GetCommandLineW(), &wargc);
+ if (!wargv) {
+ LOG_OOM();
+ return SCRCPY_EXIT_FAILURE;
+ }
+
+ char **argv_utf8 = malloc((wargc + 1) * sizeof(*argv_utf8));
+ if (!argv_utf8) {
+ LOG_OOM();
+ LocalFree(wargv);
+ return SCRCPY_EXIT_FAILURE;
+ }
+
+ argv_utf8[wargc] = NULL;
+
+ for (int i = 0; i < wargc; ++i) {
+ argv_utf8[i] = sc_str_from_wchars(wargv[i]);
+ if (!argv_utf8[i]) {
+ LOG_OOM();
+ for (int j = 0; j < i; ++j) {
+ free(argv_utf8[j]);
+ }
+ LocalFree(wargv);
+ free(argv_utf8);
+ return SCRCPY_EXIT_FAILURE;
+ }
+ }
+
+ LocalFree(wargv);
+
+ int ret = main_scrcpy(wargc, argv_utf8);
+
+ for (int i = 0; i < wargc; ++i) {
+ free(argv_utf8[i]);
+ }
+ free(argv_utf8);
+
+ return ret;
+#endif
+}