cpp/openttd-patchpack/source Changeset - r27607:494ddc3d9616

Changeset - r27607:494ddc3d9616

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Rubidium - 14 months ago 2023-06-18 19:30:25
rubidium@openttd.org

Codechange: move to std::string over stredup + free

1 file changed with 3 insertions and 6 deletions:

src/os/windows/win32_main.cpp

0 comments (0 inline, 0 general)

src/os/windows/win32_main.cpp

➞

Show inline comments

@@ @@ -58,10 +58,8 @@ int APIENTRY WinMain(HINSTANCE hInstance @@
 	CrashLog::InitialiseCrashLog();
 	/* Convert the command line to UTF-8. We need a dedicated buffer
 	 * for this because argv[] points into this buffer and this needs to
 	 * be available between subsequent calls to FS2OTTD(). */
 	char *cmdline = stredup(FS2OTTD(GetCommandLine()).c_str());
 	/* Convert the command line to UTF-8. */
 	std::string cmdline = FS2OTTD(GetCommandLine());
 	/* Set the console codepage to UTF-8. */
 	SetConsoleOutputCP(CP_UTF8);
@@ @@ -76,7 +74,7 @@ int APIENTRY WinMain(HINSTANCE hInstance @@
 	SetRandomSeed(GetTickCount());
 	char *argv[64]; // max 64 command line arguments
 	int argc = ParseCommandLine(cmdline, argv, lengthof(argv));
+	int argc = ParseCommandLine(cmdline.data(), argv, lengthof(argv));
 	/* Make sure our arguments contain only valid UTF-8 characters. */
 	for (int i = 0; i < argc; i++) StrMakeValidInPlace(argv[i]);
@@ @@ -86,6 +84,5 @@ int APIENTRY WinMain(HINSTANCE hInstance @@
 	/* Restore system timer resolution. */
 	timeEndPeriod(1);
 	free(cmdline);
 	return ret;
+}

0 comments (0 inline, 0 general)