mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
9f8fe3f04c
Previously, we were comparing the signed int `target_length` (returned by WideCharToMultiByte) to a size_t string length, resulting in a signed/unsigned comparison warning as follows: ``` windows\runner\utils.cpp(54,43): warning C4018: '>': signed/unsigned mismatch ``` WideCharToMultiByte returns: * 0 on error * the number of bytes written to the buffer pointed to by its fifth parameter, lpMultiByteStr, on success. As a result it's safe to store the return value in an unsigned int, which eliminates the warning. No changes to tests since this is dependent on end-user project settings/modifications and does not trigger a warning with default project settings. Fixes: https://github.com/flutter/flutter/issues/134227
70 lines
1.9 KiB
C++
70 lines
1.9 KiB
C++
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "utils.h"
|
|
|
|
#include <flutter_windows.h>
|
|
#include <io.h>
|
|
#include <stdio.h>
|
|
#include <windows.h>
|
|
|
|
#include <iostream>
|
|
|
|
void CreateAndAttachConsole() {
|
|
if (::AllocConsole()) {
|
|
FILE *unused;
|
|
if (freopen_s(&unused, "CONOUT$", "w", stdout)) {
|
|
_dup2(_fileno(stdout), 1);
|
|
}
|
|
if (freopen_s(&unused, "CONOUT$", "w", stderr)) {
|
|
_dup2(_fileno(stdout), 2);
|
|
}
|
|
std::ios::sync_with_stdio();
|
|
FlutterDesktopResyncOutputStreams();
|
|
}
|
|
}
|
|
|
|
std::vector<std::string> GetCommandLineArguments() {
|
|
// Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
|
|
int argc;
|
|
wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
|
|
if (argv == nullptr) {
|
|
return std::vector<std::string>();
|
|
}
|
|
|
|
std::vector<std::string> command_line_arguments;
|
|
|
|
// Skip the first argument as it's the binary name.
|
|
for (int i = 1; i < argc; i++) {
|
|
command_line_arguments.push_back(Utf8FromUtf16(argv[i]));
|
|
}
|
|
|
|
::LocalFree(argv);
|
|
|
|
return command_line_arguments;
|
|
}
|
|
|
|
std::string Utf8FromUtf16(const wchar_t* utf16_string) {
|
|
if (utf16_string == nullptr) {
|
|
return std::string();
|
|
}
|
|
unsigned int target_length = ::WideCharToMultiByte(
|
|
CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
|
|
-1, nullptr, 0, nullptr, nullptr)
|
|
-1; // remove the trailing null character
|
|
int input_length = (int)wcslen(utf16_string);
|
|
std::string utf8_string;
|
|
if (target_length == 0 || target_length > utf8_string.max_size()) {
|
|
return utf8_string;
|
|
}
|
|
utf8_string.resize(target_length);
|
|
int converted_length = ::WideCharToMultiByte(
|
|
CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
|
|
input_length, utf8_string.data(), target_length, nullptr, nullptr);
|
|
if (converted_length == 0) {
|
|
return std::string();
|
|
}
|
|
return utf8_string;
|
|
}
|