Compare commits
69 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 72a048875d | |||
| 62ae981ff0 | |||
| bd6cabdc6b | |||
| 7d1d7b2456 | |||
| 422284a81d | |||
| 0de71bfe21 | |||
| c81de4f897 | |||
| 29ac0eff94 | |||
| 86bab7a53b | |||
| a141add693 | |||
| 826a9e1c74 | |||
| 2b55035234 | |||
| b09c969798 | |||
| 849689b286 | |||
| dfbf103b2e | |||
| b5ade2a064 | |||
| 82c90d4628 | |||
| 3e8b3b906b | |||
| 016e42bbf2 | |||
| f19e8178d6 | |||
| 181403098c | |||
| 4d230a850f | |||
| 53a70e1ad7 | |||
| bac58b056a | |||
| 6cb3b2aabd | |||
| c5b377b22f | |||
| 4228258e80 | |||
| 21c65369ec | |||
| 34ec99e90b | |||
| 2fea7600fb | |||
| e7609c1a34 | |||
| 2b340791b9 | |||
| b067ea9be4 | |||
| d26aa77af3 | |||
| 450173f0ee | |||
| ce275c0fcc | |||
| 6ba949de4b | |||
| 5b205ad2e4 | |||
| b8ce96ee99 | |||
| 76be5eb941 | |||
| d0f211d931 | |||
| abed2c3fd0 | |||
|
|
a103c80745 | ||
| f558df6bf9 | |||
| 8c570ab1e9 | |||
| 6b592d78c1 | |||
| a6d6527ff3 | |||
| 72158f53d7 | |||
| 4bfcf90e2a | |||
| 1a3e3ef4b1 | |||
| b0a14f731a | |||
| b12bfe08be | |||
| febb3bda2f | |||
| 2d90c60a1c | |||
| 382428e6fa | |||
| 1f8fb92dbe | |||
| 14ee12cb85 | |||
| 56e6a5b6b2 | |||
| 251b965073 | |||
| b855b0d624 | |||
| 0403415607 | |||
| 18959b1ef0 | |||
| 4299d9b89f | |||
| 049375a2d7 | |||
| 5bf973347f | |||
| b71793cfed | |||
| 0150121c02 | |||
|
|
8303665159 | ||
| f2ef0f9bb4 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -437,5 +437,7 @@ lightgbm.Rcheck/
|
||||
# GraphViz artifacts
|
||||
*.gv
|
||||
*.gv.*
|
||||
/VersionInfo.h
|
||||
|
||||
/wCenterWindow/VersionInfo.h
|
||||
[Pp]atches/
|
||||
*.patch
|
||||
|
||||
21
LICENSE
Normal file
21
LICENSE
Normal file
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2020-2024 Vladislav Salikov aka W0LF
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
32
README.md
32
README.md
@@ -1,22 +1,34 @@
|
||||
## wCenterWindow
|
||||
|
||||
This program centers the current active window by a `LCTRL + LWIN + C` hotkey,
|
||||
or pressing `LCTRL + LWIN + MMB` (Middle Mouse Button).
|
||||
Copyright (c) 2020-2024 Vladislav Salikov aka W0LF.<br>
|
||||
Program icon made by Kirill Topov.
|
||||
|
||||
---
|
||||
|
||||
This program centers the current active window by a `LCTRL + LWIN + C` hotkey, or pressing `LCTRL + LWIN + MMB` (Middle Mouse Button).
|
||||
|
||||
`LCTRL + LWIN + V` - manual editing of size and position of the window.
|
||||
|
||||
You can use `LCTRL + LWIN + I` hotkey for hide/show trayicon.
|
||||
You can also use commandline option `/hide` for hide trayicon at startup.
|
||||
`LCTRL + LWIN + I` hotkey is used to hide/show trayicon.
|
||||
You can also use commandline option `/hide` to hide trayicon at startup.
|
||||
|
||||
`Use workarea` option means that the window is centered without a taskbar, otherwise, the full resolution of the monitor will be used.
|
||||
The `/noupdate` commandline option is used to disable check for updates. By default, the program checks for updates upon startup and once a day.
|
||||
|
||||
If some windows does not centers you should run wCenterWindow with administrative rights.
|
||||
The `Use workarea` option (at popup menu) means that the window is centered without a taskbar, otherwise, the full resolution of the monitor will be used.
|
||||
|
||||
If some windows does not centers, you should run wCenterWindow with administrative rights.
|
||||
|
||||
## Automatic startup
|
||||
|
||||
Usually, to start the application when Windows starts, it is enough to put the application's shortcut in the "Startup" folder -\
|
||||
"C:\Users\[*Your user name*]\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup". (The easiest way to get there - press 'WIN + R' and type 'shell:startup').\
|
||||
Usually, to start the application when Windows starts, it is enough to put the application's shortcut in the "Startup" folder -
|
||||
"C:\Users\\<*Your user name*>\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup".
|
||||
(The easiest way to get there - press 'WIN + R' and type `shell:startup`).<br>
|
||||
However, in this case wCenterWindow will not be able to work with windows that are open with elevated privileges.
|
||||
And if you enable the "Run as administrator" option in the shortcut, then wCenterWindow will not start. This is related to the security of Windows (maybe only in 10/11, I did not check).\
|
||||
This behavior can be bypassed by creating a task in the Task Scheduler with the "Run with highest privileges" option.\
|
||||
And if you enable the "Run as administrator" option in the shortcut, then wCenterWindow will not start. This is related to the security of Windows (maybe only in 10/11, I did not check).
|
||||
This behavior can be bypassed by creating a task in the Task Scheduler with the "Run with highest privileges" option.<br>
|
||||
**Note:** If you run wCenterWindow via the Task Scheduler, I highly recommend enabling the "Delay task for" option for 15-30 seconds, otherwise you may get an error message "Can't create tray icon".
|
||||
|
||||
## License
|
||||
|
||||
This software is licensed under a [MIT License](https://mit-license.org).<br>
|
||||
This software uses the [PicoJSON](https://github.com/kazuho/picojson) - a C++ JSON parser / serializer by Kazuho Oku.
|
||||
|
||||
@@ -40,11 +40,12 @@ function makeVersionString([string]$vmaj, [string]$vmin, [string]$vbld, [string]
|
||||
}
|
||||
|
||||
#region Initializing variables
|
||||
[string]$verMajor = [string]$verMinor = [string]$verBuild = [string]$verRevision = $null
|
||||
[string]$verMajor = [string]$verMinor = [string]$verBuild = [string]$verPatch = $null
|
||||
[string]$pn = [string]$pa = [string]$aboutBuild = [string]$pnf = [string]$pcf = $null
|
||||
[string]$buildDateTime = [string]$vs = [string]$vn = [string]$intName = [string]$origName = $null
|
||||
[int]$pys = [int]$spanDays = [int]$spanSecs = $null
|
||||
[int]$currentYear = [int]$currentMonth = [int]$currentDay = [int]$currentHour = [int]$currentMinute = [int]$currentSecond = $null
|
||||
[string]$platformArch = $args[0]
|
||||
[string]$iniFile = ".\Version.ini"
|
||||
#endregion
|
||||
|
||||
@@ -80,7 +81,7 @@ $config = (Get-IniContent -FilePath $iniFile)["Config"]
|
||||
$verMajor = $config.Major
|
||||
$verMinor = $config.Minor
|
||||
$verBuild = $config.Build
|
||||
$verRevision = $config.Revision
|
||||
$verPatch = $config.Patch
|
||||
$pys = $config.ProductYearStart
|
||||
$pn = $config.ProductName
|
||||
$pa = $config.ProductAutors
|
||||
@@ -103,17 +104,17 @@ $currentSecond = $date.Second
|
||||
$buildDateTime = "Build date: $($date.GetDateTimeFormats('u').Replace('Z', ''))"
|
||||
$spanDays = [math]::Round((New-TimeSpan -Start $(Get-Date -Month 1 -Day 1 -Year 2000) -End $date).TotalDays)
|
||||
$spanSecs = [math]::Round((New-TimeSpan -Start $($date.Date) -End $($date.DateTime)).TotalSeconds)
|
||||
if ($pys -eq $currentYear) { $pcf = "Copyright (C) $pys by $pa" } else { $pcf = "Copyright (C) $pys-$currentYear by $pa" }
|
||||
$intName = "$pn-C++"
|
||||
if ($pys -eq $currentYear) { $pcf = "Copyright (c) $pys $pa" } else { $pcf = "Copyright (c) $pys-$currentYear $pa" }
|
||||
$intName = "$pn-$platformArch-C++"
|
||||
$origName = "$pn.exe"
|
||||
$verMajor = getValue $verMajor
|
||||
$verMinor = getValue $verMinor
|
||||
$verBuild = getValue $verBuild
|
||||
$verRevision = getValue $verRevision
|
||||
$verPatch = getValue $verPatch
|
||||
#endregion
|
||||
|
||||
$vs = (makeVersionString $verMajor $verMinor $verBuild $verRevision)[0]
|
||||
$vn = (makeVersionString $verMajor $verMinor $verBuild $verRevision)[1]
|
||||
$vs = (makeVersionString $verMajor $verMinor $verBuild $verPatch)[0]
|
||||
$vn = (makeVersionString $verMajor $verMinor $verBuild $verPatch)[1]
|
||||
|
||||
# if ([string]::IsNullOrEmpty($gitVerStr)) { $pnf = "$pn v$vs" } else { $pnf = "$pn $gitVerStr" }
|
||||
if ($isGit) {
|
||||
@@ -125,6 +126,8 @@ else {
|
||||
$pnf = "$pn v$vs"
|
||||
}
|
||||
|
||||
$pnf = "$pn v$vs ($platformArch)"
|
||||
|
||||
#region Save all variables to file
|
||||
"// $pn" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode
|
||||
"// VersionInfo.h" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||
@@ -154,9 +157,10 @@ else {
|
||||
# echo " verMajor: [$verMajor]"
|
||||
# echo " verMinor: [$verMinor]"
|
||||
# echo " verBuild: [$verBuild]"
|
||||
# echo " verRevision: [$verRevision]"
|
||||
# echo " verPatch: [$verPatch]"
|
||||
# echo ""
|
||||
# echo " aboutBuild: [$aboutBuild]"
|
||||
# echo " platformArch: [$platformArch]"
|
||||
# echo " productNameFull: [$pnf]"
|
||||
# echo "productCopyrightFull: [$pcf]"
|
||||
# echo " internalName: [$intName]"
|
||||
|
||||
BIN
Version.ini
BIN
Version.ini
Binary file not shown.
@@ -1,16 +1,22 @@
|
||||
@ECHO OFF
|
||||
|
||||
:: In VisualStudio add to Pre-Build events:
|
||||
:: "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"
|
||||
:: Then in "Resource Includes..." add '#include "VersionInfo.rc"' into 'Compile-time Directives'
|
||||
|
||||
REM In VisualStudio add to Pre-Build events:
|
||||
REM "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"
|
||||
REM "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"
|
||||
REM Then in "Resource Includes..." add '#include "VersionInfo.rc"' into 'Compile-time Directives'
|
||||
|
||||
IF "%~1" == "" GOTO :no_args
|
||||
IF "%~2" == "" GOTO :no_args
|
||||
IF "%~3" == "" GOTO :no_args
|
||||
SET solutionDir=%1
|
||||
SET projectDir=%2
|
||||
SET platformArch=%3
|
||||
|
||||
CD /D %solutionDir%
|
||||
powershell -ExecutionPolicy RemoteSigned -File Update_Version.ps1
|
||||
powershell -ExecutionPolicy RemoteSigned -File Update_Version.ps1 %platformArch%
|
||||
MOVE /Y %solutionDir%VersionInfo.h %projectDir%VersionInfo.h
|
||||
EXIT
|
||||
|
||||
|
||||
74
wCenterWindow/CLogger.cpp
Normal file
74
wCenterWindow/CLogger.cpp
Normal file
@@ -0,0 +1,74 @@
|
||||
// wCenterWindow
|
||||
// CLogger.cpp
|
||||
|
||||
#include "CLogger.h"
|
||||
#include <string>
|
||||
#include <filesystem>
|
||||
#include <strsafe.h>
|
||||
|
||||
inline wchar_t* CLogger::GetTimeStamp() {
|
||||
GetLocalTime(<);
|
||||
StringCchPrintfW(logTimeBuffer, _countof(logTimeBuffer), L"%d-%02d-%02d %02d:%02d:%02d.%03d | ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
|
||||
return logTimeBuffer;
|
||||
}
|
||||
|
||||
void CLogger::Out(const wchar_t* fmt, ...) {
|
||||
if (fsLogFile.is_open()) {
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
EnterCriticalSection(&cs);
|
||||
StringCchVPrintfW(logBuffer, _countof(logBuffer), fmt, args);
|
||||
va_end(args);
|
||||
fsLogFile << GetTimeStamp() << logBuffer << std::endl;
|
||||
LeaveCriticalSection(&cs);
|
||||
}
|
||||
}
|
||||
|
||||
void CLogger::Init() {
|
||||
wchar_t szPath[MAX_PATH] = { 0 };
|
||||
DWORD dwPathLength = GetModuleFileNameW(NULL, szPath, MAX_PATH);
|
||||
DWORD dwError = GetLastError();
|
||||
if (ERROR_INSUFFICIENT_BUFFER == dwError) {
|
||||
MessageBoxW(NULL, L"Warning!\nPath to log file is too long! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL);
|
||||
return;
|
||||
}
|
||||
if (NULL == dwPathLength) {
|
||||
MessageBoxW(NULL, L"Warning!\nCan't get application's filename! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL);
|
||||
return;
|
||||
}
|
||||
|
||||
std::filesystem::path log_path = szPath;
|
||||
log_path.replace_extension(L".log");
|
||||
std::filesystem::path bak_path = log_path;
|
||||
bak_path.replace_extension(L".bak");
|
||||
|
||||
if (std::filesystem::exists(log_path)) std::filesystem::rename(log_path, bak_path);
|
||||
#ifdef _DEBUG
|
||||
log_path = L"D:\\test.log";
|
||||
#endif
|
||||
fsLogFile.open(log_path, std::ios::trunc);
|
||||
if (fsLogFile.is_open()) {
|
||||
InitializeCriticalSection(&cs);
|
||||
fsLogFile << "\xEF\xBB\xBF"; // (0xEF, 0xBB, 0xBF) - UTF-8 BOM
|
||||
fsLogFile.imbue(std::locale("en-US.utf8"));
|
||||
fsLogFile << GetTimeStamp() << "[ " << szAppTitleVer.c_str() << " ] Start log." << std::endl;
|
||||
fsLogFile << GetTimeStamp() << "Logfile: \"" << log_path.native() << "\"" << std::endl;
|
||||
}
|
||||
else {
|
||||
MessageBoxW(NULL, L"Warning!\nCan't create log file! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL);
|
||||
}
|
||||
}
|
||||
|
||||
CLogger::CLogger(const wchar_t* _appTitle) {
|
||||
szAppTitle = _appTitle;
|
||||
szAppTitleVer = _appTitle;
|
||||
Init();
|
||||
}
|
||||
|
||||
CLogger::~CLogger() {
|
||||
if (fsLogFile) {
|
||||
fsLogFile << GetTimeStamp() << "Stop log." << std::endl;
|
||||
fsLogFile.close();
|
||||
DeleteCriticalSection(&cs);
|
||||
}
|
||||
}
|
||||
29
wCenterWindow/CLogger.h
Normal file
29
wCenterWindow/CLogger.h
Normal file
@@ -0,0 +1,29 @@
|
||||
// wCenterWindow
|
||||
// CLogger.h
|
||||
|
||||
#pragma once
|
||||
#include <Windows.h>
|
||||
#include <fstream>
|
||||
|
||||
#define MAX_LOGBUFFER_LENGTH 512
|
||||
|
||||
class CLogger {
|
||||
public:
|
||||
void Out(const wchar_t*, ...);
|
||||
CLogger(const wchar_t*);
|
||||
~CLogger();
|
||||
|
||||
private:
|
||||
SYSTEMTIME lt;
|
||||
CRITICAL_SECTION cs;
|
||||
wchar_t logTimeBuffer[28]{ 0 };
|
||||
wchar_t logBuffer[MAX_LOGBUFFER_LENGTH]{ 0 };
|
||||
std::wofstream fsLogFile;
|
||||
std::wstring szAppTitle{ 0 };
|
||||
std::wstring szAppVersion{ 0 };
|
||||
std::wstring szAppPlatform{ 0 };
|
||||
std::wstring szAppTitleVer{ 0 };
|
||||
|
||||
inline wchar_t* GetTimeStamp();
|
||||
void Init();
|
||||
};
|
||||
@@ -1,6 +1,6 @@
|
||||
// wCenterWindow
|
||||
// framework.h
|
||||
//
|
||||
|
||||
#pragma once
|
||||
#include "targetver.h"
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
// wCenterWindow
|
||||
// globals.h
|
||||
//
|
||||
#pragma once
|
||||
#include "wCenterWindow.h"
|
||||
|
||||
#define MAX_LOADSTRING 50
|
||||
#define TBUFLEN 32
|
||||
#define DBUFLEN 256
|
||||
|
||||
extern WCHAR szTitle[];
|
||||
extern SYSTEMTIME lt;
|
||||
extern wchar_t debugBuffer[DBUFLEN];
|
||||
extern std::wofstream logfile;
|
||||
extern CRITICAL_SECTION cs;
|
||||
@@ -1,68 +0,0 @@
|
||||
// wCenterWindow
|
||||
// logger.cpp
|
||||
//
|
||||
#include "globals.h"
|
||||
#include "logger.h"
|
||||
|
||||
SYSTEMTIME lt;
|
||||
wchar_t debugTimeBuffer[TBUFLEN];
|
||||
wchar_t debugBuffer[DBUFLEN];
|
||||
std::wofstream logfile;
|
||||
|
||||
wchar_t* GetTimeStamp()
|
||||
{
|
||||
GetLocalTime(<);
|
||||
StringCchPrintfW(debugTimeBuffer, TBUFLEN, L"%d-%02d-%02d %02d:%02d:%02d.%03d | ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
|
||||
return debugTimeBuffer;
|
||||
}
|
||||
|
||||
void OpenLogFile(const wchar_t appTitle[], const wchar_t appVersion[])
|
||||
{
|
||||
WCHAR appTitleVer[MAX_LOADSTRING]{ 0 };
|
||||
StringCchPrintfW(appTitleVer, MAX_LOADSTRING, L"%s v%s", appTitle, appVersion);
|
||||
WCHAR lpszPath[MAX_PATH + 1] = { 0 };
|
||||
DWORD dwPathLength = GetModuleFileNameW(NULL, lpszPath, MAX_PATH);
|
||||
DWORD dwError = GetLastError();
|
||||
if (ERROR_INSUFFICIENT_BUFFER == dwError)
|
||||
{
|
||||
MessageBoxW(NULL, L"Path to logfile is too long! Working without logging", appTitle, MB_OK | MB_ICONWARNING);
|
||||
return;
|
||||
}
|
||||
if (NULL == dwPathLength)
|
||||
{
|
||||
MessageBoxW(NULL, L"Can't get module filename! Working without logging", appTitle, MB_OK | MB_ICONWARNING);
|
||||
return;
|
||||
}
|
||||
|
||||
std::filesystem::path log_path = lpszPath;
|
||||
log_path.replace_extension(L".log");
|
||||
std::filesystem::path bak_path = log_path;
|
||||
bak_path.replace_extension(L".bak");
|
||||
|
||||
if (std::filesystem::exists(log_path)) std::filesystem::rename(log_path, bak_path);
|
||||
#ifdef _DEBUG
|
||||
log_path = L"D:\\test.log";
|
||||
#endif
|
||||
logfile.open(log_path, std::ios::trunc);
|
||||
if (logfile.is_open())
|
||||
{
|
||||
logfile << "\xEF\xBB\xBF"; // (0xEF, 0xBB, 0xBF) - UTF-8 BOM
|
||||
logfile.imbue(std::locale("en-US.utf8"));
|
||||
logfile << GetTimeStamp() << "[ " << appTitleVer << " ] Start log." << std::endl;
|
||||
logfile << GetTimeStamp() << "Logfile: \"" << log_path.native() << "\"" << std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBoxW(NULL, L"Can't open logfile! Working without logging", appTitle, MB_OK | MB_ICONWARNING);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
void CloseLogFile()
|
||||
{
|
||||
if (logfile)
|
||||
{
|
||||
logfile << GetTimeStamp() << "Stop log." << std::endl;
|
||||
logfile.close();
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
// wCenterWindow
|
||||
// logger.h
|
||||
// wLogger v3.3 (Edited version from RBTray project [https://github.com/benbuck/rbtray])
|
||||
//
|
||||
// Usage: LOG_TO_FILE(L"%s(%d): Log message", TEXT(__FUNCTION__), __LINE__);
|
||||
//
|
||||
#pragma once
|
||||
#define LOG_TO_FILE(fmt, ...) do {\
|
||||
EnterCriticalSection(&cs); \
|
||||
StringCchPrintfW(debugBuffer, DBUFLEN, fmt, ##__VA_ARGS__); \
|
||||
logfile << GetTimeStamp() << debugBuffer << std::endl; \
|
||||
LeaveCriticalSection(&cs); \
|
||||
} while (0);
|
||||
|
||||
wchar_t* GetTimeStamp();
|
||||
void OpenLogFile(const wchar_t[], const wchar_t[]);
|
||||
void CloseLogFile();
|
||||
@@ -2,42 +2,38 @@
|
||||
// Microsoft Visual C++ generated include file.
|
||||
// Used by wCenterWindow.rc
|
||||
//
|
||||
#define IDS_CLASSNAME 102
|
||||
#define IDS_APP_TITLE 103
|
||||
#define IDD_ABOUTBOX 104
|
||||
#define IDI_TRAYICON 105
|
||||
#define IDR_MENU 106
|
||||
#define ID_POPUPMENU_ICON 107
|
||||
#define ID_POPUPMENU_AREA 108
|
||||
#define ID_POPUPMENU_ABOUT 110
|
||||
#define ID_POPUPMENU_EXIT 111
|
||||
#define IDS_ABOUT 112
|
||||
#define IDS_ERR_MAIN 113
|
||||
#define IDS_ERR_CLASS 114
|
||||
#define IDS_ERR_WND 115
|
||||
#define IDS_ERR_ICON 116
|
||||
#define IDS_ERR_MENU 117
|
||||
#define IDS_ERR_POPUP 118
|
||||
#define IDS_ERR_HOOK 119
|
||||
#define IDS_ERR_MAXMIN 120
|
||||
#define IDS_RUNNING 121
|
||||
#define IDR_MAINFRAME 128
|
||||
#define IDD_MANUAL_EDITING 129
|
||||
#define IDC_EDIT_X 1000
|
||||
#define IDC_EDIT_Y 1001
|
||||
#define IDC_EDIT_WIDTH 1002
|
||||
#define IDC_EDIT_HEIGHT 1003
|
||||
#define IDC_EDIT_TITLE 1004
|
||||
#define IDC_EDIT_CLASS 1005
|
||||
#define IDC_BUTTON_SET 1006
|
||||
#define IDC_BUTTON_CLOSE 1007
|
||||
#define IDC_ABOUTHELP 1008
|
||||
#define IDC_DONATIONLINK 1009
|
||||
#define IDC_DONATIONTEXT 1010
|
||||
#define IDC_ABOUT_PROGNAME 1011
|
||||
#define IDC_ABOUT_COPYRIGHT 1012
|
||||
#define IDC_ABOUT_BUILDTIME 1013
|
||||
#define IDC_ABOUTEDIT 1014
|
||||
#define IDS_CLASSNAME 100
|
||||
#define IDS_APP_TITLE 101
|
||||
#define IDI_TRAYICON 102
|
||||
#define IDR_MENU 103
|
||||
#define ID_POPUPMENU_ICON 104
|
||||
#define ID_POPUPMENU_AREA 105
|
||||
#define ID_POPUPMENU_HELP 106
|
||||
#define ID_POPUPMENU_ABOUT 107
|
||||
#define ID_POPUPMENU_EXIT 108
|
||||
#define IDS_HELP 109
|
||||
#define IDS_ERR_MAIN 110
|
||||
#define IDS_ERR_CLASS 111
|
||||
#define IDS_ERR_WND 112
|
||||
#define IDS_ERR_ICON 113
|
||||
#define IDS_ERR_MENU 114
|
||||
#define IDS_ERR_POPUP 115
|
||||
#define IDS_ERR_HOOK 116
|
||||
#define IDS_ERR_TIMER 117
|
||||
#define IDS_ERR_HEAP 118
|
||||
#define IDS_ERR_MAXMIN 119
|
||||
#define IDS_RUNNING 120
|
||||
#define IDT_TIMER 121
|
||||
#define IDD_MANUAL_EDITING 1000
|
||||
#define IDC_EDIT_X 1001
|
||||
#define IDC_EDIT_Y 1002
|
||||
#define IDC_EDIT_WIDTH 1003
|
||||
#define IDC_EDIT_HEIGHT 1004
|
||||
#define IDC_EDIT_TITLE 1005
|
||||
#define IDC_EDIT_CLASS 1006
|
||||
#define IDC_BUTTON_SET 1007
|
||||
#define IDC_BUTTON_CENTER 1008
|
||||
#define IDC_BUTTON_CLOSE 1009
|
||||
#define IDC_STATIC -1
|
||||
|
||||
// Next default values for new objects
|
||||
@@ -45,9 +41,9 @@
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||
#define _APS_NO_MFC 1
|
||||
#define _APS_NEXT_RESOURCE_VALUE 130
|
||||
#define _APS_NEXT_RESOURCE_VALUE 200
|
||||
#define _APS_NEXT_COMMAND_VALUE 32771
|
||||
#define _APS_NEXT_CONTROL_VALUE 1015
|
||||
#define _APS_NEXT_CONTROL_VALUE 1010
|
||||
#define _APS_NEXT_SYMED_VALUE 122
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
// wCenterWindow
|
||||
// targetver.h
|
||||
#pragma once
|
||||
|
||||
// // Including SDKDDKVer.h defines the highest available Windows platform.
|
||||
// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
|
||||
// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
|
||||
#include <winsdkver.h>
|
||||
#define WINVER 0x0601
|
||||
#define _WIN32_WINNT 0x0601
|
||||
#define _WIN32_IE 0x0601
|
||||
#include <SDKDDKVer.h>
|
||||
|
||||
@@ -1,23 +1,21 @@
|
||||
// wCenterWindow
|
||||
// updater.h
|
||||
//
|
||||
#include "globals.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include "wCenterWindow.h"
|
||||
#include "updater.h"
|
||||
#include "picojson.h"
|
||||
#include <cwctype>
|
||||
|
||||
#define GITHUB_URL TEXT("api.github.com")
|
||||
#define GITHUB_URI TEXT("/repos/dreamforceinc/wCenterWindow/releases/latest")
|
||||
|
||||
picojson::value json;
|
||||
WCHAR errMessageBuffer[DBUFLEN]{ 0 };
|
||||
|
||||
struct Version
|
||||
{
|
||||
UINT Major = 0;
|
||||
UINT Minor = 0;
|
||||
UINT Build = 0;
|
||||
UINT Revision = 0;
|
||||
struct Version {
|
||||
UINT Major = 0;
|
||||
UINT Minor = 0;
|
||||
UINT Build = 0;
|
||||
UINT Patch = 0;
|
||||
} verApp, verGh;
|
||||
|
||||
bool GetLatestRelease(const std::wstring& urn);
|
||||
@@ -25,192 +23,179 @@ void FillVersionStructure(Version& ver, const std::wstring& str);
|
||||
std::vector<std::wstring> Split(const std::wstring& s, wchar_t delim);
|
||||
std::wstring ConvertUtf8ToWide(const std::string& str);
|
||||
|
||||
DWORD WINAPI Updater(LPVOID)
|
||||
{
|
||||
LOG_TO_FILE(L"Entering the %s() function", TEXT(__FUNCTION__));
|
||||
UINT WINAPI Updater(void*) {
|
||||
logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
|
||||
logger.Out(L"[UPDT] Sleeping %d seconds", T0);
|
||||
|
||||
if (!GetLatestRelease(GITHUB_URI))
|
||||
{
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): Failed getting releases!", TEXT(__FUNCTION__), __LINE__);
|
||||
StringCchPrintfW(errMessageBuffer, DBUFLEN, L"Failed getting releases!");
|
||||
MessageBoxW(NULL, errMessageBuffer, szTitle, MB_OK | MB_ICONERROR);
|
||||
return 101;
|
||||
}
|
||||
Sleep(T0 * 1000); // 10 seconds
|
||||
|
||||
std::wstring j_tag_name, j_file_name, j_file_ext, j_file_url, j_page_url;
|
||||
int64_t j_file_size = 0;
|
||||
picojson::object obj, obj2;
|
||||
picojson::object::iterator it, it2;
|
||||
if (!GetLatestRelease(GITHUB_URI)) {
|
||||
logger.Out(L"[UPDT] %s(%d): Failed getting releases!", TEXT(__FUNCTION__), __LINE__);
|
||||
|
||||
if (json.is<picojson::object>())
|
||||
{
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): Parsing JSON object", TEXT(__FUNCTION__), __LINE__);
|
||||
MessageBoxW(NULL, L"Failed getting releases!", szTitle, MB_OK | MB_ICONERROR);
|
||||
return 101;
|
||||
_endthreadex(101);
|
||||
}
|
||||
|
||||
obj = json.get<picojson::object>();
|
||||
it = obj.find("message"), it2;
|
||||
if (it != obj.end())
|
||||
{
|
||||
std::string u = (*it).second.get<std::string>();
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): Error! The url is %s", TEXT(__FUNCTION__), __LINE__, u);
|
||||
return 102;
|
||||
}
|
||||
std::wstring j_tag_name, j_file_name, j_file_ext, j_file_url, j_page_url;
|
||||
int64_t j_file_size = 0;
|
||||
picojson::object obj, obj2;
|
||||
picojson::object::iterator it, it2;
|
||||
|
||||
for (it = obj.begin(); it != obj.end(); it++)
|
||||
{
|
||||
if ((*it).first == "tag_name") j_tag_name = ConvertUtf8ToWide((*it).second.to_str());
|
||||
if ((*it).first == "html_url") j_page_url = ConvertUtf8ToWide((*it).second.to_str());
|
||||
if ((*it).first == "assets" && (*it).second.is<picojson::array>())
|
||||
{
|
||||
picojson::array a = (*it).second.get<picojson::array>();
|
||||
obj2 = a[0].get<picojson::object>();
|
||||
for (it2 = obj2.begin(); it2 != obj2.end(); it2++)
|
||||
{
|
||||
if ((*it2).first == "name") j_file_name = ConvertUtf8ToWide((*it2).second.to_str());
|
||||
if ((*it2).first == "browser_download_url") j_file_url = ConvertUtf8ToWide((*it2).second.to_str());
|
||||
if ((*it2).first == "size") j_file_size = static_cast<int64_t>((*it2).second.get<double>());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): Error! Cannot recognize JSON object!", TEXT(__FUNCTION__), __LINE__);
|
||||
return 103;
|
||||
}
|
||||
if (json.is<picojson::object>()) {
|
||||
logger.Out(L"[UPDT] %s(%d): Parsing JSON object", TEXT(__FUNCTION__), __LINE__);
|
||||
|
||||
std::wstring gh_version = j_tag_name.substr(1);
|
||||
obj = json.get<picojson::object>();
|
||||
it = obj.find("message"), it2;
|
||||
if (it != obj.end()) {
|
||||
std::string u = (*it).second.get<std::string>();
|
||||
logger.Out(L"[UPDT] %s(%d): Error! The url is %s", TEXT(__FUNCTION__), __LINE__, u);
|
||||
return 102;
|
||||
_endthreadex(102);
|
||||
}
|
||||
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): AppVersion : %s", TEXT(__FUNCTION__), __LINE__, TEXT(VERSION_STR));
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): GitVersion : %s", TEXT(__FUNCTION__), __LINE__, gh_version.c_str());
|
||||
//LOG_TO_FILE(L"[UPDT] %s(%d): FileName : %s", TEXT(__FUNCTION__), __LINE__, j_file_name.c_str());
|
||||
//LOG_TO_FILE(L"[UPDT] %s(%d): FileSize : %d", TEXT(__FUNCTION__), __LINE__, j_file_size);
|
||||
//LOG_TO_FILE(L"[UPDT] %s(%d): File Url : %s", TEXT(__FUNCTION__), __LINE__, j_file_url.c_str());
|
||||
//LOG_TO_FILE(L"[UPDT] %s(%d): Page Url : %s", TEXT(__FUNCTION__), __LINE__, j_page_url.c_str());
|
||||
for (it = obj.begin(); it != obj.end(); it++) {
|
||||
if ((*it).first == "tag_name") j_tag_name = ConvertUtf8ToWide((*it).second.to_str());
|
||||
if ((*it).first == "html_url") j_page_url = ConvertUtf8ToWide((*it).second.to_str());
|
||||
if ((*it).first == "assets" && (*it).second.is<picojson::array>()) {
|
||||
picojson::array a = (*it).second.get<picojson::array>();
|
||||
obj2 = a[0].get<picojson::object>();
|
||||
for (it2 = obj2.begin(); it2 != obj2.end(); it2++) {
|
||||
if ((*it2).first == "name") j_file_name = ConvertUtf8ToWide((*it2).second.to_str());
|
||||
if ((*it2).first == "browser_download_url") j_file_url = ConvertUtf8ToWide((*it2).second.to_str());
|
||||
if ((*it2).first == "size") j_file_size = static_cast<int64_t>((*it2).second.get<double>());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
logger.Out(L"[UPDT] %s(%d): Error! Cannot recognize JSON object!", TEXT(__FUNCTION__), __LINE__);
|
||||
return 103;
|
||||
_endthreadex(103);
|
||||
}
|
||||
|
||||
FillVersionStructure(verApp, TEXT(VERSION_STR));
|
||||
FillVersionStructure(verGh, gh_version);
|
||||
size_t pos = 0;
|
||||
while (std::iswdigit(j_tag_name.at(pos)) == 0) pos++;
|
||||
std::wstring gh_version = j_tag_name.substr(pos);
|
||||
|
||||
if ((verGh.Major > verApp.Major) || (verGh.Minor > verApp.Minor) || (verGh.Build > verApp.Build) || (verGh.Revision > verApp.Revision))
|
||||
{
|
||||
logger.Out(L"[UPDT] %s(%d): AppVersion : %s", TEXT(__FUNCTION__), __LINE__, TEXT(VERSION_STR));
|
||||
logger.Out(L"[UPDT] %s(%d): GitVersion : %s", TEXT(__FUNCTION__), __LINE__, gh_version.c_str());
|
||||
//logger.Out(L"[UPDT] %s(%d): FileName : %s", TEXT(__FUNCTION__), __LINE__, j_file_name.c_str());
|
||||
//logger.Out(L"[UPDT] %s(%d): FileSize : %d", TEXT(__FUNCTION__), __LINE__, j_file_size);
|
||||
//logger.Out(L"[UPDT] %s(%d): File Url : %s", TEXT(__FUNCTION__), __LINE__, j_file_url.c_str());
|
||||
//logger.Out(L"[UPDT] %s(%d): Page Url : %s", TEXT(__FUNCTION__), __LINE__, j_page_url.c_str());
|
||||
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): An update is available!", TEXT(__FUNCTION__), __LINE__);
|
||||
FillVersionStructure(verApp, TEXT(VERSION_STR));
|
||||
FillVersionStructure(verGh, gh_version);
|
||||
|
||||
if (IDYES == MessageBoxW(NULL, L"An update is available!\nDo you want to open the download page?", szTitle, MB_YESNO | MB_ICONINFORMATION))
|
||||
{
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): Opening download page by default browser", TEXT(__FUNCTION__), __LINE__);
|
||||
ShellExecuteW(NULL, L"open", j_page_url.c_str(), NULL, NULL, SW_SHOW);
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): The user refused the update", TEXT(__FUNCTION__), __LINE__);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): No updates is available", TEXT(__FUNCTION__), __LINE__);
|
||||
return 104;
|
||||
}
|
||||
if ((verGh.Major > verApp.Major) || (verGh.Minor > verApp.Minor) || (verGh.Build > verApp.Build) || (verGh.Patch > verApp.Patch)) {
|
||||
|
||||
LOG_TO_FILE(L"[UPDT] Exit from the %s() function", TEXT(__FUNCTION__));
|
||||
logger.Out(L"[UPDT] %s(%d): An update is available!", TEXT(__FUNCTION__), __LINE__);
|
||||
|
||||
return 0;
|
||||
if (IDYES == MessageBoxW(NULL, L"An update is available!\nDo you want to open the download page?", szTitle, MB_YESNO | MB_ICONINFORMATION)) {
|
||||
logger.Out(L"[UPDT] %s(%d): Opening download page by default browser", TEXT(__FUNCTION__), __LINE__);
|
||||
ShellExecuteW(NULL, L"open", j_page_url.c_str(), NULL, NULL, SW_SHOW);
|
||||
}
|
||||
else {
|
||||
logger.Out(L"[UPDT] %s(%d): The user refused the update", TEXT(__FUNCTION__), __LINE__);
|
||||
}
|
||||
}
|
||||
else {
|
||||
logger.Out(L"[UPDT] %s(%d): No updates is available", TEXT(__FUNCTION__), __LINE__);
|
||||
}
|
||||
|
||||
logger.Out(L"[UPDT] Exit from the %s() function", TEXT(__FUNCTION__));
|
||||
|
||||
return 0;
|
||||
_endthreadex(0);
|
||||
}
|
||||
|
||||
bool GetLatestRelease(const std::wstring& urn)
|
||||
{
|
||||
std::wstring user_agent = L"User-Agent: ";
|
||||
user_agent.append(szTitle);
|
||||
const std::wstring url = GITHUB_URL;
|
||||
bool ret = true;
|
||||
DWORD err = 0;
|
||||
bool GetLatestRelease(const std::wstring& urn) {
|
||||
std::wstring user_agent = L"User-Agent: ";
|
||||
user_agent.append(szTitle);
|
||||
const std::wstring url = GITHUB_URL;
|
||||
bool ret = true;
|
||||
DWORD err = 0;
|
||||
|
||||
HINTERNET hInternet = InternetOpenW(user_agent.c_str(), INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
|
||||
if (hInternet != NULL)
|
||||
{
|
||||
HINTERNET hConnect = InternetConnectW(hInternet, url.c_str(), INTERNET_DEFAULT_HTTPS_PORT, L"", L"", INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0);
|
||||
if (hConnect != NULL)
|
||||
{
|
||||
HINTERNET hRequest = HttpOpenRequestW(hConnect, L"GET", urn.c_str(), NULL, NULL, NULL, INTERNET_FLAG_SECURE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_UI, 0);
|
||||
if (hRequest != NULL)
|
||||
{
|
||||
BOOL isSend = HttpSendRequestW(hRequest, NULL, 0, 0, 0);
|
||||
if (isSend)
|
||||
{
|
||||
char szData[1024]{ 0 };
|
||||
DWORD dwBytesRead = 0;
|
||||
std::string buffer;
|
||||
do
|
||||
{
|
||||
InternetReadFile(hRequest, szData, sizeof(szData), &dwBytesRead);
|
||||
buffer.append(szData, dwBytesRead);
|
||||
} while (dwBytesRead != 0);
|
||||
logger.Out(L"[UPDT] %s(%d): %s", TEXT(__FUNCTION__), __LINE__, user_agent.c_str());
|
||||
|
||||
picojson::parse(json, buffer);
|
||||
std::string jerr = picojson::get_last_error();
|
||||
if (!jerr.empty())
|
||||
{
|
||||
std::cout << jerr << std::endl;
|
||||
ret = false;
|
||||
}
|
||||
HINTERNET hInternet = InternetOpenW(user_agent.c_str(), INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
|
||||
if (hInternet != NULL) {
|
||||
HINTERNET hConnect = InternetConnectW(hInternet, url.c_str(), INTERNET_DEFAULT_HTTPS_PORT, L"", L"", INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0);
|
||||
if (hConnect != NULL) {
|
||||
HINTERNET hRequest = HttpOpenRequestW(hConnect, L"GET", urn.c_str(), NULL, NULL, NULL, INTERNET_FLAG_SECURE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_UI, 0);
|
||||
if (hRequest != NULL) {
|
||||
BOOL isSend = HttpSendRequestW(hRequest, NULL, 0, 0, 0);
|
||||
if (isSend) {
|
||||
char szData[1024]{ 0 };
|
||||
DWORD dwBytesRead = 0;
|
||||
std::string buffer;
|
||||
do {
|
||||
InternetReadFile(hRequest, szData, sizeof(szData), &dwBytesRead);
|
||||
buffer.append(szData, dwBytesRead);
|
||||
}
|
||||
while (dwBytesRead != 0);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
err = GetLastError();
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): HttpSendRequestW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
err = GetLastError();
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): HttpOpenRequestW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
InternetCloseHandle(hRequest);
|
||||
}
|
||||
else
|
||||
{
|
||||
err = GetLastError();
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): InternetConnectW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
InternetCloseHandle(hConnect);
|
||||
}
|
||||
else
|
||||
{
|
||||
err = GetLastError();
|
||||
LOG_TO_FILE(L"[UPDT] %s(%d): InternetOpenW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
InternetCloseHandle(hInternet);
|
||||
return ret;
|
||||
picojson::parse(json, buffer);
|
||||
std::string jerr = picojson::get_last_error();
|
||||
if (!jerr.empty()) {
|
||||
logger.Out(L"[UPDT] %s(%d): Error while parsing JSON object: %s", TEXT(__FUNCTION__), __LINE__, ConvertUtf8ToWide(jerr));
|
||||
|
||||
MessageBoxW(NULL, L"Error while parsing JSON object!", szTitle, MB_OK | MB_ICONERROR);
|
||||
ret = false;
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
err = GetLastError();
|
||||
logger.Out(L"[UPDT] %s(%d): HttpSendRequestW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
err = GetLastError();
|
||||
logger.Out(L"[UPDT] %s(%d): HttpOpenRequestW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
InternetCloseHandle(hRequest);
|
||||
}
|
||||
else {
|
||||
err = GetLastError();
|
||||
logger.Out(L"[UPDT] %s(%d): InternetConnectW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
InternetCloseHandle(hConnect);
|
||||
}
|
||||
else {
|
||||
err = GetLastError();
|
||||
logger.Out(L"[UPDT] %s(%d): InternetOpenW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
|
||||
ret = false;
|
||||
}
|
||||
InternetCloseHandle(hInternet);
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::vector<std::wstring> Split(const std::wstring& s, wchar_t delim)
|
||||
{
|
||||
std::vector<std::wstring> result;
|
||||
std::wstringstream ss(s);
|
||||
std::wstring item;
|
||||
while (getline(ss, item, delim)) result.push_back(item);
|
||||
return result;
|
||||
std::vector<std::wstring> Split(const std::wstring& s, wchar_t delim) {
|
||||
std::vector<std::wstring> result;
|
||||
std::wstringstream ss(s);
|
||||
std::wstring item;
|
||||
while (getline(ss, item, delim)) result.push_back(item);
|
||||
return result;
|
||||
}
|
||||
|
||||
void FillVersionStructure(Version& ver, const std::wstring& str)
|
||||
{
|
||||
std::vector<std::wstring> v;
|
||||
v = Split(str, '.');
|
||||
if (v.size() < 4) v.push_back(L"0");
|
||||
ver.Major = std::stoul(v[0]);
|
||||
ver.Minor = std::stoul(v[1]);
|
||||
ver.Build = std::stoul(v[2]);
|
||||
ver.Revision = std::stoul(v[3]);
|
||||
void FillVersionStructure(Version& ver, const std::wstring& str) {
|
||||
std::vector<std::wstring> v;
|
||||
v = Split(str, '.');
|
||||
if (v.size() < 4) v.push_back(L"0");
|
||||
ver.Major = std::stoul(v[0]);
|
||||
ver.Minor = std::stoul(v[1]);
|
||||
ver.Build = std::stoul(v[2]);
|
||||
ver.Patch = std::stoul(v[3]);
|
||||
}
|
||||
|
||||
std::wstring ConvertUtf8ToWide(const std::string& str)
|
||||
{
|
||||
int count = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), NULL, 0);
|
||||
std::wstring wstr(count, 0);
|
||||
MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), &wstr[0], count);
|
||||
return wstr;
|
||||
std::wstring ConvertUtf8ToWide(const std::string& str) {
|
||||
int count = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), NULL, 0);
|
||||
std::wstring wstr(count, 0);
|
||||
MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), &wstr[0], count);
|
||||
return wstr;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// wCenterWindow
|
||||
// updater.h
|
||||
//
|
||||
|
||||
#pragma once
|
||||
DWORD WINAPI Updater(LPVOID);
|
||||
UINT WINAPI Updater(void*);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,21 @@
|
||||
// wCenterWindow
|
||||
// wCenterWindow.h
|
||||
//
|
||||
|
||||
#pragma once
|
||||
#include "resource.h"
|
||||
|
||||
#define T0 10
|
||||
#define T1 60
|
||||
#define T2 86400
|
||||
|
||||
#ifdef _WIN64
|
||||
#define ARCH 64
|
||||
#else
|
||||
#define ARCH 86
|
||||
#endif
|
||||
|
||||
#define MAX_LOADSTRING 64
|
||||
|
||||
// Windows Header Files
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
@@ -12,10 +24,20 @@
|
||||
#include <vector>
|
||||
#include <strsafe.h>
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
#include <wininet.h>
|
||||
#include <shellapi.h>
|
||||
#include <CommCtrl.h>
|
||||
#include <process.h>
|
||||
|
||||
// Logger header file
|
||||
#include "CLogger.h"
|
||||
|
||||
// VerionInfo header file
|
||||
#include "VersionInfo.h"
|
||||
|
||||
// wCenterWindow's title
|
||||
extern WCHAR szTitle[MAX_LOADSTRING];
|
||||
|
||||
// An instance of the "CLogger" class
|
||||
extern CLogger logger;
|
||||
|
||||
Binary file not shown.
@@ -112,7 +112,7 @@
|
||||
</ManifestFromManagedAssembly>
|
||||
</Manifest>
|
||||
<PreBuildEvent>
|
||||
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"</Command>
|
||||
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
@@ -137,7 +137,7 @@
|
||||
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
</Manifest>
|
||||
<PreBuildEvent>
|
||||
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"</Command>
|
||||
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
@@ -151,13 +151,14 @@
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
</Manifest>
|
||||
<PreBuildEvent>
|
||||
<Command>powershell -File "$(SolutionDir)Update_Version.ps1" move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)"</Command>
|
||||
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
@@ -176,19 +177,19 @@
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
</Manifest>
|
||||
<PreBuildEvent>
|
||||
<Command>powershell -File "$(SolutionDir)Update_Version.ps1" move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)"</Command>
|
||||
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="CLogger.h" />
|
||||
<ClInclude Include="framework.h" />
|
||||
<ClInclude Include="globals.h" />
|
||||
<ClInclude Include="logger.h" />
|
||||
<ClInclude Include="picojson.h" />
|
||||
<ClInclude Include="resource.h" />
|
||||
<ClInclude Include="targetver.h" />
|
||||
@@ -196,7 +197,7 @@
|
||||
<ClInclude Include="wCenterWindow.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="logger.cpp" />
|
||||
<ClCompile Include="CLogger.cpp" />
|
||||
<ClCompile Include="updater.cpp" />
|
||||
<ClCompile Include="wCenterWindow.cpp" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -27,27 +27,24 @@
|
||||
<ClInclude Include="wCenterWindow.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="logger.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="globals.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="picojson.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="updater.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CLogger.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="wCenterWindow.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="logger.cpp">
|
||||
<ClCompile Include="updater.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="updater.cpp">
|
||||
<ClCompile Include="CLogger.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
||||
@@ -1,11 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LocalDebuggerCommandArguments>
|
||||
</LocalDebuggerCommandArguments>
|
||||
<LocalDebuggerCommandArguments>/noupdate</LocalDebuggerCommandArguments>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerCommandArguments>
|
||||
</LocalDebuggerCommandArguments>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LocalDebuggerCommandArguments>/noupdate</LocalDebuggerCommandArguments>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LocalDebuggerCommandArguments>
|
||||
</LocalDebuggerCommandArguments>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user