mirror of
https://github.com/feeddeck/feeddeck.git
synced 2026-03-24 15:59:59 -05:00
676ff316d7
This commit fixes the following warnings for the web build:
```
Warning: In index.html:38: Local variable for "serviceWorkerVersion" is deprecated. Use "{{flutter_service_worker_version}}" template token instead.
Warning: In index.html:60: "FlutterLoader.loadEntrypoint" is deprecated. Use "FlutterLoader.load" instead.
```
To re-add the slash screen we alsow run the
`flutter pub run flutter_native_splash:create` command again, which also
updated the splash screens for iOS and Android.
Last but not least this commit also fixes the following warnings for the
Windows build:
```
windows/runner/flutter_window.cpp does not ensure the show window callback is called, updating.
windows/flutter/CMakeLists.txt does not use FLUTTER_TARGET_PLATFORM, updating.
```
66 lines
1.8 KiB
C++
66 lines
1.8 KiB
C++
#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;
|
|
}
|