Compare commits
127 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b0a7265a7 | |||
| 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 | |||
| 10db7316fa | |||
| 5e9a553b67 | |||
| e74c775f90 | |||
| aadba59546 | |||
| b58039b4ab | |||
| 9dd557311e | |||
| 8df89dc8e1 | |||
| cf16651ae2 | |||
| 9fe46f867c | |||
| bb904723fa | |||
| eaed0ae8dc | |||
| 854a9a473b | |||
|
|
61b5f1d39c | ||
| 1dd9883f42 | |||
| 90b281d3a5 | |||
| bf609d3c08 | |||
| 582cce5b20 | |||
| 710d9d9d3e | |||
| b6a6ec685d | |||
| 28ea979492 | |||
| 8cd54374ab | |||
| 9b3b505ec6 | |||
| d81f43b4a3 | |||
| a1db2f16e9 | |||
| 117c4f780f | |||
| 266afddfe5 | |||
| 6b3a90d682 | |||
| 0f8304ef23 | |||
| c035b8a980 | |||
| cc2e5b5654 | |||
| 1929e3dc4f | |||
| 93ea96bca0 | |||
| 6fb8d35643 | |||
| 7d0e5ee0a7 | |||
| 146208bd03 | |||
| 342c6e3009 | |||
| bcf45417d8 | |||
| 2763bbd12d | |||
| a256184737 | |||
| 2510b74aa1 | |||
| 96940111aa | |||
| bad4d37e7a | |||
| fe10e4ec72 | |||
| 6edbf1f9c6 | |||
| 79acd5d110 | |||
| 4d503f6421 | |||
| dcf844ddd3 | |||
| 517cfdcc82 | |||
| 5c3e15b949 | |||
| 790ae9ab67 | |||
| 52364a228a | |||
|
|
73b91259c8 | ||
| cb01a4b815 | |||
| e15f08d521 | |||
| 28de2585a8 | |||
| 3cd3faea01 | |||
| 19660bb346 | |||
| b332c7476f |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -6,6 +6,7 @@
|
|||||||
*.user
|
*.user
|
||||||
*.userosscache
|
*.userosscache
|
||||||
*.sln.docstates
|
*.sln.docstates
|
||||||
|
[Vv]ersion.h
|
||||||
|
|
||||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||||
*.userprefs
|
*.userprefs
|
||||||
@@ -436,3 +437,7 @@ lightgbm.Rcheck/
|
|||||||
# GraphViz artifacts
|
# GraphViz artifacts
|
||||||
*.gv
|
*.gv
|
||||||
*.gv.*
|
*.gv.*
|
||||||
|
|
||||||
|
/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.
|
||||||
38
README.md
38
README.md
@@ -1,12 +1,34 @@
|
|||||||
# wCenterWindow
|
## wCenterWindow
|
||||||
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.
|
Copyright (c) 2020-2024 Vladislav Salikov aka W0LF.<br>
|
||||||
|
Program icon made by Kirill Topov.
|
||||||
|
|
||||||
You can use ```LCTRL + LWIN + I``` hotkey for hide/show trayicon.
|
---
|
||||||
You can also use commandline option ```/hide``` for 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.
|
This program centers the current active window by a `LCTRL + LWIN + C` hotkey, or pressing `LCTRL + LWIN + MMB` (Middle Mouse Button).
|
||||||
|
|
||||||
If some windows does not centers you should run wCenterWindow with administrative rights.
|
`LCTRL + LWIN + V` - manual editing of size and position of the window.
|
||||||
|
|
||||||
|
`LCTRL + LWIN + I` hotkey is used to hide/show trayicon.
|
||||||
|
You can also use commandline option `/hide` to hide trayicon at startup.
|
||||||
|
|
||||||
|
The `/noupdate` commandline option is used to disable check for updates. By default, the program checks for updates upon startup and once a day.
|
||||||
|
|
||||||
|
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`).<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.<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.
|
||||||
|
|||||||
177
Update_Version.ps1
Normal file
177
Update_Version.ps1
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
# Update Version v2.1
|
||||||
|
# Required module: PSIni
|
||||||
|
# Installation: Install-Module -Name PsIni
|
||||||
|
|
||||||
|
$date = Get-Date
|
||||||
|
|
||||||
|
function addLeadingZero([int]$nvar) {
|
||||||
|
[string]$svar = $null
|
||||||
|
if ($nvar -lt 10) { $svar = '0' + $nvar.ToString() }
|
||||||
|
else { $svar = $nvar.ToString() }
|
||||||
|
return $svar
|
||||||
|
}
|
||||||
|
|
||||||
|
function getValue([string]$var) {
|
||||||
|
switch -CaseSensitive ($var) {
|
||||||
|
"%y" { $var = $currentYear; break }
|
||||||
|
"%m" { $var = $currentMonth; break }
|
||||||
|
"%d" { $var = $currentDay; break }
|
||||||
|
"%t" { $var = -join ((addLeadingZero($currentHour)), (addLeadingZero($currentMinute)), (addLeadingZero($currentSecond))); break }
|
||||||
|
"%D" { $var = $spanDays; break }
|
||||||
|
"%S" { $var = $spanSecs; break }
|
||||||
|
"%C" { $var = $gitCommitCount; break }
|
||||||
|
"%c" { $var = $gitRevCount; break }
|
||||||
|
}
|
||||||
|
return $var
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeVersionString([string]$vmaj, [string]$vmin, [string]$vbld, [string]$vrev) {
|
||||||
|
[string]$vstr = $null
|
||||||
|
if ($vmin -eq "") { $vmin = $vbld = $vrev = 0; $vstr = ($vmaj) -join '.' }
|
||||||
|
else {
|
||||||
|
if ($vbld -eq "") { $vbld = $vrev = 0; $vstr = ($vmaj, $vmin) -join '.' }
|
||||||
|
else {
|
||||||
|
if ($vrev -eq "") { $vrev = 0; $vstr = ($vmaj, $vmin, $vbld) -join '.' }
|
||||||
|
else { $vstr = ($vmaj, $vmin, $vbld, $vrev) -join '.' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
[string]$nstr = ($vmaj, $vmin, $vbld, $vrev) -join ','
|
||||||
|
return @($vstr, $nstr)
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Initializing variables
|
||||||
|
[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
|
||||||
|
|
||||||
|
if (-not (Test-Path $iniFile)) {
|
||||||
|
Write-Error "Can't find file '$iniFile'"
|
||||||
|
# Start-Sleep -Seconds 3
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
[bool]$isGit = $false
|
||||||
|
if (Test-Path ".\.git") {
|
||||||
|
$isGit = $true
|
||||||
|
[int]$gitCommitCount = [int]$gitRevCount = $null
|
||||||
|
[string]$gitRevDate = [string]$gitVerStr = [string]$gitAHash = $null
|
||||||
|
$gitCommitCount = $(git rev-list --count HEAD)
|
||||||
|
$gitRevDate = $(git log -1 HEAD --date=rfc --pretty=format:%ad%n)
|
||||||
|
$gitVerStr = $(git describe HEAD --long)
|
||||||
|
if ($LastExitCode -eq 0) {
|
||||||
|
$gitVerStr = $gitVerStr.Replace('-g', '-')
|
||||||
|
$gitRevCount = $gitVerStr.Split('-')[-2]
|
||||||
|
$gitAHash = $gitVerStr.Split('-')[-1]
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$gitVerStr = ""
|
||||||
|
$gitRevCount = 0
|
||||||
|
$gitAHash = $(git describe HEAD --always)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Reading values from INI file
|
||||||
|
$config = $null
|
||||||
|
$config = (Get-IniContent -FilePath $iniFile)["Config"]
|
||||||
|
$verMajor = $config.Major
|
||||||
|
$verMinor = $config.Minor
|
||||||
|
$verBuild = $config.Build
|
||||||
|
$verPatch = $config.Patch
|
||||||
|
$pys = $config.ProductYearStart
|
||||||
|
$pn = $config.ProductName
|
||||||
|
$pa = $config.ProductAutors
|
||||||
|
$pd = $config.ProductDescription
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
if ($verMajor -eq "") {
|
||||||
|
Write-Error "Major version cannot be empty!"
|
||||||
|
# Start-Sleep -Seconds 3
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Variables preparation
|
||||||
|
$currentYear = $date.Year
|
||||||
|
$currentMonth = $date.Month
|
||||||
|
$currentDay = $date.Day
|
||||||
|
$currentHour = $date.Hour
|
||||||
|
$currentMinute = $date.Minute
|
||||||
|
$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 $pa" } else { $pcf = "Copyright (c) $pys-$currentYear $pa" }
|
||||||
|
$intName = "$pn-$platformArch-C++"
|
||||||
|
$origName = "$pn.exe"
|
||||||
|
$verMajor = getValue $verMajor
|
||||||
|
$verMinor = getValue $verMinor
|
||||||
|
$verBuild = getValue $verBuild
|
||||||
|
$verPatch = getValue $verPatch
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
$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) {
|
||||||
|
$aboutBuild = "Git date: $gitRevDate"
|
||||||
|
$pnf = "$pn v$vs ($gitAHash)"
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$aboutBuild = $buildDateTime
|
||||||
|
$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
|
||||||
|
"#pragma once" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define PRODUCT_NAME `"$pn`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define PRODUCT_NAME_FULL `"$pnf`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define PRODUCT_AUTHORS `"$pa`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define PRODUCT_DESCRIPTION `"$pd`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define ABOUT_BUILD `"$aboutBuild`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define INTERNAL_NAME `"$intName`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define ORIG_FILE_NAME `"$origName`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define PRODUCT_COPYRIGHT `"$pcf`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define VERSION_STR `"$vs`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
"#define VERSION_NUM $vn" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
# "#define SPAN_DAYS $spanDays" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
# "#define SPAN_SECS $spanSecs" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
|
||||||
|
# if ($isGit) {
|
||||||
|
# # "#define GIT_VERSION_STR `"$gitVerStr`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
# # "#define GIT_REV_DATE `"Git date: $gitRevDate`"" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
# # "#define GIT_REV_COUNT $gitRevCount" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
# # "#define GIT_COMMIT_COUNT $gitCommitCount" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
|
||||||
|
# }
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Print out all variables
|
||||||
|
# echo " verMajor: [$verMajor]"
|
||||||
|
# echo " verMinor: [$verMinor]"
|
||||||
|
# echo " verBuild: [$verBuild]"
|
||||||
|
# echo " verPatch: [$verPatch]"
|
||||||
|
# echo ""
|
||||||
|
# echo " aboutBuild: [$aboutBuild]"
|
||||||
|
# echo " platformArch: [$platformArch]"
|
||||||
|
# echo " productNameFull: [$pnf]"
|
||||||
|
# echo "productCopyrightFull: [$pcf]"
|
||||||
|
# echo " internalName: [$intName]"
|
||||||
|
# echo " originalName: [$origName]"
|
||||||
|
# echo " versionStr: [$vs]"
|
||||||
|
# echo " versionNum: [$vn]"
|
||||||
|
# echo " spanDays: [$spanDays]"
|
||||||
|
# echo " spanSecs: [$spanSecs]"
|
||||||
|
# echo ""
|
||||||
|
# echo " gitCommitCount: [$gitCommitCount]"
|
||||||
|
# echo " gitRevCount: [$gitRevCount]"
|
||||||
|
# echo " gitRevDate: [$gitRevDate]"
|
||||||
|
# echo " gitVerStr: [$gitVerStr]"
|
||||||
|
#endregion
|
||||||
BIN
Version.ini
Normal file
BIN
Version.ini
Normal file
Binary file not shown.
25
pre-build.cmd
Normal file
25
pre-build.cmd
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
@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)" "$(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 %platformArch%
|
||||||
|
MOVE /Y %solutionDir%VersionInfo.h %projectDir%VersionInfo.h
|
||||||
|
EXIT
|
||||||
|
|
||||||
|
:no_args
|
||||||
|
ECHO Not enough arguments!
|
||||||
|
EXIT 1
|
||||||
@@ -1,10 +1,15 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 16.0.31112.23
|
VisualStudioVersion = 17.5.33516.290
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wCenterWindow", "wCenterWindow\wCenterWindow.vcxproj", "{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wCenterWindow", "wCenterWindow\wCenterWindow.vcxproj", "{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C7B4FD1E-DC1B-46A4-842C-5130F09EFCB5}"
|
||||||
|
ProjectSection(SolutionItems) = preProject
|
||||||
|
Version.ini = Version.ini
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
|
|||||||
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,76 +0,0 @@
|
|||||||
// wCenterWindow, v2.3.2
|
|
||||||
// Logger.cpp
|
|
||||||
//
|
|
||||||
#include "framework.h"
|
|
||||||
|
|
||||||
#define TS_LEN 30
|
|
||||||
#define PATH_LEN 1024
|
|
||||||
|
|
||||||
std::wofstream logfile;
|
|
||||||
extern WCHAR szTitle[];
|
|
||||||
extern LPVOID szBuffer;
|
|
||||||
namespace fs = std::filesystem;
|
|
||||||
|
|
||||||
std::wstring PrintTitle()
|
|
||||||
{
|
|
||||||
wchar_t szWinTitle[2048];
|
|
||||||
StringCchPrintf(szWinTitle, 2048, L"%s", szBuffer);
|
|
||||||
return szWinTitle;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::wstring GetTimeStamp()
|
|
||||||
{
|
|
||||||
SYSTEMTIME lt;
|
|
||||||
GetLocalTime(<);
|
|
||||||
wchar_t ts[TS_LEN];
|
|
||||||
StringCchPrintfW(ts, TS_LEN, L"%d-%02d-%02d %02d:%02d:%02d.%03d - ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
|
|
||||||
return ts;
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenLogFile()
|
|
||||||
{
|
|
||||||
wchar_t lpszPath[PATH_LEN]{};
|
|
||||||
DWORD dwPathLength = GetModuleFileNameW(NULL, lpszPath, PATH_LEN);
|
|
||||||
DWORD dwError = GetLastError();
|
|
||||||
if (ERROR_INSUFFICIENT_BUFFER == dwError)
|
|
||||||
{
|
|
||||||
MessageBoxW(NULL, L"Path to logfile is too long! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (NULL == dwPathLength)
|
|
||||||
{
|
|
||||||
MessageBoxW(NULL, L"Can't get module filename! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
fs::path log_path = lpszPath;
|
|
||||||
log_path.replace_extension(L".log");
|
|
||||||
fs::path bak_path = log_path;
|
|
||||||
bak_path.replace_extension(L".bak");
|
|
||||||
|
|
||||||
if (fs::exists(log_path)) fs::rename(log_path, bak_path);
|
|
||||||
#ifdef _DEBUG
|
|
||||||
log_path = L"d:\\test.log";
|
|
||||||
#endif
|
|
||||||
logfile.open(log_path);
|
|
||||||
if (logfile.is_open())
|
|
||||||
{
|
|
||||||
diag_log(L"Start logging.");
|
|
||||||
diag_log(L"Logfile:", log_path);
|
|
||||||
diag_log(log_path, L"successfully opened.");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
MessageBoxW(NULL, L"Can't open logfile! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CloseLogFile()
|
|
||||||
{
|
|
||||||
if (logfile)
|
|
||||||
{
|
|
||||||
diag_log(L"End logging.");
|
|
||||||
logfile.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
// wCenterWindow, v2.3.2
|
|
||||||
// Logger.h
|
|
||||||
//
|
|
||||||
#pragma once
|
|
||||||
#include "framework.h"
|
|
||||||
|
|
||||||
extern std::wofstream logfile;
|
|
||||||
std::wstring GetTimeStamp();
|
|
||||||
std::wstring PrintTitle();
|
|
||||||
|
|
||||||
template <typename T1>
|
|
||||||
void diag_log(T1 arg1)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T1, typename T2>
|
|
||||||
void diag_log(T1 arg1, T2 arg2)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T1, typename T2, typename T3>
|
|
||||||
void diag_log(T1 arg1, T2 arg2, T3 arg3)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T1, typename T2, typename T3, typename T4>
|
|
||||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T1, typename T2, typename T3, typename T4, typename T5>
|
|
||||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
|
|
||||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
|
|
||||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << ' ' << arg7 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
|
|
||||||
void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
|
|
||||||
{
|
|
||||||
logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << ' ' << arg7 << ' ' << arg8 << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpenLogFile();
|
|
||||||
void CloseLogFile();
|
|
||||||
Binary file not shown.
@@ -1,26 +1,6 @@
|
|||||||
// header.h : include file for standard system include files,
|
// wCenterWindow
|
||||||
// or project specific include files
|
// framework.h
|
||||||
//
|
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "targetver.h"
|
#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
|
||||||
|
|
||||||
// Windows Header Files
|
|
||||||
#include <iostream>
|
|
||||||
#include <fstream>
|
|
||||||
#include <filesystem>
|
|
||||||
#include <string>
|
|
||||||
#include <strsafe.h>
|
|
||||||
#include <windows.h>
|
|
||||||
#include <shellapi.h>
|
|
||||||
#include <CommCtrl.h>
|
|
||||||
|
|
||||||
// C RunTime Header Files
|
|
||||||
//#include <stdlib.h>
|
|
||||||
//#include <malloc.h>
|
|
||||||
//#include <memory.h>
|
|
||||||
|
|
||||||
// Project Specific Header Files
|
|
||||||
#include "Logger.h"
|
|
||||||
|
|||||||
1010
wCenterWindow/picojson.h
Normal file
1010
wCenterWindow/picojson.h
Normal file
File diff suppressed because it is too large
Load Diff
@@ -2,36 +2,38 @@
|
|||||||
// Microsoft Visual C++ generated include file.
|
// Microsoft Visual C++ generated include file.
|
||||||
// Used by wCenterWindow.rc
|
// Used by wCenterWindow.rc
|
||||||
//
|
//
|
||||||
#define IDS_CLASSNAME 102
|
#define IDS_CLASSNAME 100
|
||||||
#define IDS_APP_TITLE 103
|
#define IDS_APP_TITLE 101
|
||||||
#define IDD_ABOUTBOX 104
|
#define IDI_TRAYICON 102
|
||||||
#define IDI_TRAYICON 105
|
#define IDR_MENU 103
|
||||||
#define IDR_MENU 106
|
#define ID_POPUPMENU_ICON 104
|
||||||
#define ID_POPUPMENU_ICON 107
|
#define ID_POPUPMENU_AREA 105
|
||||||
#define ID_POPUPMENU_AREA 108
|
#define ID_POPUPMENU_HELP 106
|
||||||
#define ID_POPUPMENU_ABOUT 110
|
#define ID_POPUPMENU_ABOUT 107
|
||||||
#define ID_POPUPMENU_EXIT 111
|
#define ID_POPUPMENU_EXIT 108
|
||||||
#define IDS_ABOUT 112
|
#define IDS_HELP 109
|
||||||
#define IDS_ERR_MAIN 113
|
#define IDS_ERR_MAIN 110
|
||||||
#define IDS_ERR_WND 114
|
#define IDS_ERR_CLASS 111
|
||||||
#define IDS_ERR_ICON 115
|
#define IDS_ERR_WND 112
|
||||||
#define IDS_ERR_MENU 116
|
#define IDS_ERR_ICON 113
|
||||||
#define IDS_ERR_POPUP 117
|
#define IDS_ERR_MENU 114
|
||||||
#define IDS_ERR_HOOK 118
|
#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_ERR_MAXMIN 119
|
||||||
#define IDS_RUNNING 121
|
#define IDS_RUNNING 120
|
||||||
#define IDR_MAINFRAME 128
|
#define IDT_TIMER 121
|
||||||
#define IDD_MANUAL_EDITING 129
|
#define IDD_MANUAL_EDITING 1000
|
||||||
#define IDC_EDIT_X 1000
|
#define IDC_EDIT_X 1001
|
||||||
#define IDC_EDIT_Y 1001
|
#define IDC_EDIT_Y 1002
|
||||||
#define IDC_EDIT_WIDTH 1002
|
#define IDC_EDIT_WIDTH 1003
|
||||||
#define IDC_EDIT_HEIGHT 1003
|
#define IDC_EDIT_HEIGHT 1004
|
||||||
#define IDC_EDIT_TITLE 1004
|
#define IDC_EDIT_TITLE 1005
|
||||||
#define IDC_EDIT_CLASS 1005
|
#define IDC_EDIT_CLASS 1006
|
||||||
#define IDC_BUTTON_SET 1006
|
#define IDC_BUTTON_SET 1007
|
||||||
#define IDC_BUTTON_CLOSE 1007
|
#define IDC_BUTTON_CENTER 1008
|
||||||
#define IDC_ABOUTHELP 1008
|
#define IDC_BUTTON_CLOSE 1009
|
||||||
#define IDC_DONATIONLINK 1009
|
|
||||||
#define IDC_STATIC -1
|
#define IDC_STATIC -1
|
||||||
|
|
||||||
// Next default values for new objects
|
// Next default values for new objects
|
||||||
@@ -39,7 +41,7 @@
|
|||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||||
#define _APS_NO_MFC 1
|
#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_COMMAND_VALUE 32771
|
||||||
#define _APS_NEXT_CONTROL_VALUE 1010
|
#define _APS_NEXT_CONTROL_VALUE 1010
|
||||||
#define _APS_NEXT_SYMED_VALUE 122
|
#define _APS_NEXT_SYMED_VALUE 122
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
|
// wCenterWindow
|
||||||
|
// targetver.h
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
// // Including SDKDDKVer.h defines the highest available Windows platform.
|
// // 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
|
// 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.
|
// 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>
|
#include <SDKDDKVer.h>
|
||||||
|
|||||||
201
wCenterWindow/updater.cpp
Normal file
201
wCenterWindow/updater.cpp
Normal file
@@ -0,0 +1,201 @@
|
|||||||
|
// wCenterWindow
|
||||||
|
// updater.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;
|
||||||
|
|
||||||
|
struct Version {
|
||||||
|
UINT Major = 0;
|
||||||
|
UINT Minor = 0;
|
||||||
|
UINT Build = 0;
|
||||||
|
UINT Patch = 0;
|
||||||
|
} verApp, verGh;
|
||||||
|
|
||||||
|
bool GetLatestRelease(const std::wstring& urn);
|
||||||
|
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);
|
||||||
|
|
||||||
|
UINT WINAPI Updater(void*) {
|
||||||
|
logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
|
||||||
|
logger.Out(L"[UPDT] Sleeping %d seconds", T0);
|
||||||
|
|
||||||
|
Sleep(T0 * 1000); // 10 seconds
|
||||||
|
|
||||||
|
if (!GetLatestRelease(GITHUB_URI)) {
|
||||||
|
logger.Out(L"[UPDT] %s(%d): Failed getting releases!", TEXT(__FUNCTION__), __LINE__);
|
||||||
|
|
||||||
|
MessageBoxW(NULL, L"Failed getting releases!", szTitle, MB_OK | MB_ICONERROR);
|
||||||
|
return 101;
|
||||||
|
_endthreadex(101);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 (json.is<picojson::object>()) {
|
||||||
|
logger.Out(L"[UPDT] %s(%d): Parsing JSON object", TEXT(__FUNCTION__), __LINE__);
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t pos = 0;
|
||||||
|
while (std::iswdigit(j_tag_name.at(pos)) == 0) pos++;
|
||||||
|
std::wstring gh_version = j_tag_name.substr(pos);
|
||||||
|
|
||||||
|
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());
|
||||||
|
|
||||||
|
FillVersionStructure(verApp, TEXT(VERSION_STR));
|
||||||
|
FillVersionStructure(verGh, gh_version);
|
||||||
|
|
||||||
|
if ((verGh.Major > verApp.Major) || (verGh.Minor > verApp.Minor) || (verGh.Build > verApp.Build) || (verGh.Patch > verApp.Patch)) {
|
||||||
|
|
||||||
|
logger.Out(L"[UPDT] %s(%d): An update is available!", TEXT(__FUNCTION__), __LINE__);
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
logger.Out(L"[UPDT] %s(%d): %s", TEXT(__FUNCTION__), __LINE__, user_agent.c_str());
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
5
wCenterWindow/updater.h
Normal file
5
wCenterWindow/updater.h
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
// wCenterWindow
|
||||||
|
// updater.h
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
UINT WINAPI Updater(void*);
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -2,22 +2,15 @@
|
|||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
|
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||||
|
|
||||||
<description>Centers windows by hotkey (C++)</description>
|
<description>Centers windows by hotkey (C++)</description>
|
||||||
|
|
||||||
<assemblyIdentity
|
|
||||||
version="2.3.2.0"
|
|
||||||
processorArchitecture="x86"
|
|
||||||
name="W0LF.wCenterWindow.c++"
|
|
||||||
type="win32">
|
|
||||||
</assemblyIdentity>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity
|
<assemblyIdentity
|
||||||
type="Win32"
|
type="Win32"
|
||||||
name="Microsoft.Windows.Common-Controls"
|
name="Microsoft.Windows.Common-Controls"
|
||||||
version="6.0.0.0"
|
version="6.0.0.0"
|
||||||
publicKeyToken="6595b64144ccf1df"
|
publicKeyToken="6595b64144ccf1df"
|
||||||
language="*"
|
language="*"
|
||||||
processorArchitecture="*"/>
|
processorArchitecture="*"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</dependency>
|
</dependency>
|
||||||
@@ -32,11 +25,18 @@
|
|||||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||||
<!--ID Windows 8.1 -->
|
<!--ID Windows 8.1 -->
|
||||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
||||||
<!--ID Windows 10 -->
|
<!--ID Windows 10/11 -->
|
||||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
||||||
</application>
|
</application>
|
||||||
</compatibility>
|
</compatibility>
|
||||||
|
|
||||||
|
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||||
|
<windowsSettings> <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware> </windowsSettings>
|
||||||
|
<windowsSettings> <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2,PerMonitor</dpiAwareness> </windowsSettings>
|
||||||
|
<windowsSettings> <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware> </windowsSettings>
|
||||||
|
<windowsSettings> <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType> </windowsSettings>
|
||||||
|
</application>
|
||||||
|
|
||||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||||
<security>
|
<security>
|
||||||
<requestedPrivileges>
|
<requestedPrivileges>
|
||||||
@@ -1,3 +1,43 @@
|
|||||||
#pragma once
|
// wCenterWindow
|
||||||
|
// wCenterWindow.h
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#include "resource.h"
|
#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>
|
||||||
|
#include <filesystem>
|
||||||
|
#include <string>
|
||||||
|
#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.
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 113 KiB |
Binary file not shown.
@@ -73,16 +73,25 @@
|
|||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<EnableMicrosoftCodeAnalysis>false</EnableMicrosoftCodeAnalysis>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
<CopyCppRuntimeToOutputDir>false</CopyCppRuntimeToOutputDir>
|
<CopyCppRuntimeToOutputDir>false</CopyCppRuntimeToOutputDir>
|
||||||
|
<CopyLocalDeploymentContent>false</CopyLocalDeploymentContent>
|
||||||
|
<CopyLocalProjectReference>false</CopyLocalProjectReference>
|
||||||
|
<CopyLocalDebugSymbols>false</CopyLocalDebugSymbols>
|
||||||
|
<EnableMicrosoftCodeAnalysis>false</EnableMicrosoftCodeAnalysis>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<CopyLocalDeploymentContent>false</CopyLocalDeploymentContent>
|
||||||
|
<CopyLocalProjectReference>false</CopyLocalProjectReference>
|
||||||
|
<CopyLocalDebugSymbols>false</CopyLocalDebugSymbols>
|
||||||
|
<CopyCppRuntimeToOutputDir>false</CopyCppRuntimeToOutputDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
@@ -95,11 +104,16 @@
|
|||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<AdditionalManifestFiles>$(ProjectName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
|
<ManifestFromManagedAssembly>
|
||||||
|
</ManifestFromManagedAssembly>
|
||||||
</Manifest>
|
</Manifest>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
@@ -108,8 +122,8 @@
|
|||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>false</ConformanceMode>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
@@ -117,11 +131,14 @@
|
|||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<AdditionalManifestFiles>$(ProjectName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
|
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
</Manifest>
|
</Manifest>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
@@ -134,8 +151,15 @@
|
|||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||||
</Link>
|
</Link>
|
||||||
|
<Manifest>
|
||||||
|
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
|
</Manifest>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
@@ -146,36 +170,48 @@
|
|||||||
<PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||||
</Link>
|
</Link>
|
||||||
|
<Manifest>
|
||||||
|
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||||
|
</Manifest>
|
||||||
|
<PreBuildEvent>
|
||||||
|
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
|
||||||
|
</PreBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ClInclude Include="CLogger.h" />
|
||||||
<ClInclude Include="framework.h" />
|
<ClInclude Include="framework.h" />
|
||||||
<ClInclude Include="Logger.h" />
|
<ClInclude Include="picojson.h" />
|
||||||
<ClInclude Include="Resource.h" />
|
<ClInclude Include="resource.h" />
|
||||||
<ClInclude Include="targetver.h" />
|
<ClInclude Include="targetver.h" />
|
||||||
|
<ClInclude Include="updater.h" />
|
||||||
<ClInclude Include="wCenterWindow.h" />
|
<ClInclude Include="wCenterWindow.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="Logger.cpp" />
|
<ClCompile Include="CLogger.cpp" />
|
||||||
|
<ClCompile Include="updater.cpp" />
|
||||||
<ClCompile Include="wCenterWindow.cpp" />
|
<ClCompile Include="wCenterWindow.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="wCenterWindow.rc" />
|
<ResourceCompile Include="wCenterWindow.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Image Include="small.ico" />
|
|
||||||
<Image Include="wCenterWindow.ico" />
|
<Image Include="wCenterWindow.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Manifest Include="wCenterWindow.manifest" />
|
<Manifest Include="wCenterWindow.exe.manifest" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\README.md" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
|||||||
@@ -27,7 +27,13 @@
|
|||||||
<ClInclude Include="wCenterWindow.h">
|
<ClInclude Include="wCenterWindow.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="Logger.h">
|
<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>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -35,7 +41,10 @@
|
|||||||
<ClCompile Include="wCenterWindow.cpp">
|
<ClCompile Include="wCenterWindow.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="Logger.cpp">
|
<ClCompile Include="updater.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="CLogger.cpp">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -45,16 +54,16 @@
|
|||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Image Include="small.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="wCenterWindow.ico">
|
<Image Include="wCenterWindow.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Manifest Include="wCenterWindow.manifest">
|
<Manifest Include="wCenterWindow.exe.manifest">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Manifest>
|
</Manifest>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="..\README.md" />
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,7 +1,21 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<LocalDebuggerCommandArguments>/test1 /test2</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>
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Reference in New Issue
Block a user