From: Alexander Steinhöfer Date: Mon, 14 Aug 2017 10:32:09 +0000 (+0200) Subject: Bumped version to 1.4.4. Updated sln to VS2017. X-Git-Tag: 1.4.4~2 X-Git-Url: https://repos.lx-s.de/gitweb/?a=commitdiff_plain;h=70217386ef70b27d0916daf576458d4ee5254464;p=winmute.git Bumped version to 1.4.4. Updated sln to VS2017. --- diff --git a/.gitignore b/.gitignore index c197100..508b867 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,6 @@ ipch/ *.VC.opendb *.VC.db *.lastcodeanalysissucceeded +.vs/ +Bin/ diff --git a/Build/WinMute.nuspec b/Build/WinMute.nuspec index fc0a5b4..3f82aaa 100644 --- a/Build/WinMute.nuspec +++ b/Build/WinMute.nuspec @@ -3,20 +3,20 @@ winmute - 1.4.3.20160811 + 1.4.4.20170814 WinMute Alexander Steinhöfer Alexander Steinhöfer https://github.com/lx-s/WinMute/releases https://github.com/lx-s/WinMute/ - https://cdn.rawgit.com/lx-s/WinMute/1.4.3/WinMute/app.ico + https://cdn.rawgit.com/lx-s/WinMute/1.4.4/WinMute/app.ico winmute windows utility audio Automatic sound muter WinMute automatically mutes your PC volume if you lock your screen or the screensaver is running. © 2016, Alexander Steinhöfer - https://cdn.rawgit.com/lx-s/WinMute/1.4.3/LICENSE + https://cdn.rawgit.com/lx-s/WinMute/1.4.4/LICENSE - + diff --git a/Build/bin/changelog.txt b/Build/bin/changelog.txt index ab58b1a..384740b 100644 --- a/Build/bin/changelog.txt +++ b/Build/bin/changelog.txt @@ -1,3 +1,7 @@ +Version 1.4.4 (2017-08-14) + * Maintenance release, no new features + * Upgraded compiler toolset to VS2017 + Version 1.4.3 (2016-08-11) * Maintenance release, no new features * Upgraded to new compiler toolset diff --git a/Build/bin/license.txt b/Build/bin/license.txt index 9378ac8..106a9f1 100644 --- a/Build/bin/license.txt +++ b/Build/bin/license.txt @@ -1,5 +1,5 @@ WinMute - Copyright (C) 2016 Alexander Steinhoefer + Copyright (C) 2017 Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/Build/bin/liesmich.html b/Build/bin/liesmich.html index e3820db..3243427 100644 --- a/Build/bin/liesmich.html +++ b/Build/bin/liesmich.html @@ -2,7 +2,7 @@ - WinMute 1.4.3 - Lies mich + WinMute 1.4.5 - Lies mich -

WinMute 1.4.3

-

© Copyright 2016, Alexander Steinhöfer - www.lx-s.de

+

WinMute 1.4.4

+

© Copyright 2017, Alexander Steinhöfer - www.lx-s.de

Über

WinMute schaltet Windows stumm, sobald sie ihren PC sperren oder sich der Bildschirmschoner einschaltet.

@@ -35,7 +35,7 @@
  • Betriebssystem:
    • diff --git a/Build/bin/readme.html b/Build/bin/readme.html index 152913d..95af257 100644 --- a/Build/bin/readme.html +++ b/Build/bin/readme.html @@ -2,7 +2,7 @@ - WinMute 1.4.3 - Readme + WinMute 1.4.4 - Readme -

    WinMute 1.4.3

    -

    © Copyright 2016, by Alexander Steinhöfer - www.lx-s.de

    +

    WinMute 1.4.4

    +

    © Copyright 2017, by Alexander Steinhöfer - www.lx-s.de

    About

    WinMute automatically mutes your PC volume if you lock your screen or the screensaver is running.

    @@ -35,7 +35,7 @@
  • Operating System
    • diff --git a/ScreensaverNotify/ScreensaverNotify.cpp b/ScreensaverNotify/ScreensaverNotify.cpp index 30e71aa..a6a5e81 100644 --- a/ScreensaverNotify/ScreensaverNotify.cpp +++ b/ScreensaverNotify/ScreensaverNotify.cpp @@ -57,7 +57,7 @@ static HINSTANCE hglobInstance_ = nullptr; LRESULT CALLBACK MsgHookProc(UINT code, WPARAM wParam, LPARAM lParam) { if (code >= 0) { - const LPMSG msg = reinterpret_cast(lParam); + MSG const * const msg = reinterpret_cast(lParam); if (msg->message == WM_SYSCOMMAND) { if (msg->wParam == SC_SCREENSAVE) { PostMessage(hNotifyWnd_, notifyWndMsgId_, wParam, lParam); diff --git a/ScreensaverNotify/ScreensaverNotify.vcxproj b/ScreensaverNotify/ScreensaverNotify.vcxproj index 6bb6e10..ea31ba9 100644 --- a/ScreensaverNotify/ScreensaverNotify.vcxproj +++ b/ScreensaverNotify/ScreensaverNotify.vcxproj @@ -5,29 +5,50 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {A48C241D-70F5-4919-BE06-8C5BE99CCC23} Win32Proj ScreensaverNotify ScreensaverNotify - 8.1 + 10.0.15063.0 DynamicLibrary true - v140 + v141 + Unicode + + + DynamicLibrary + true + v141 Unicode DynamicLibrary false - v140 + v141 + true + Unicode + + + DynamicLibrary + false + v141 true Unicode @@ -37,19 +58,55 @@ + + + + + + true - $(SolutionDir)Build\bin\ + $(SolutionDir)Bin\$(PlatformShortName)\ $(ProjectName) + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset + true + false + false + + + $(ProjectName) + true + $(SolutionDir)Bin\$(PlatformShortName)\ + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset + true + false + false false - $(SolutionDir)Build\bin\ + $(SolutionDir)Bin\$(PlatformShortName)\ + $(ProjectName) + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset + true + false + false + + $(ProjectName) + false + $(SolutionDir)Bin\$(PlatformShortName)\ + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset + true + false + false @@ -58,8 +115,27 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;WINMUTEDLL_EXPORTS;%(PreprocessorDefinitions) true - true + false + true + true + Caret + + + Windows + true + + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;WINMUTEDLL_EXPORTS;%(PreprocessorDefinitions) + true + false true + true + Caret Windows @@ -78,6 +154,30 @@ true MultiThreaded true + true + Caret + + + Windows + true + true + true + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;WINMUTEDLL_EXPORTS;%(PreprocessorDefinitions) + true + true + MultiThreaded + true + true + Caret Windows diff --git a/WinMute.sln b/WinMute.sln index 1fa340d..21f83a4 100644 --- a/WinMute.sln +++ b/WinMute.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMute", "WinMute\WinMute.vcxproj", "{488617F0-5DD3-42B5-81ED-A1E9B3117551}" ProjectSection(ProjectDependencies) = postProject {A48C241D-70F5-4919-BE06-8C5BE99CCC23} = {A48C241D-70F5-4919-BE06-8C5BE99CCC23} @@ -26,7 +28,8 @@ Global {488617F0-5DD3-42B5-81ED-A1E9B3117551}.Release|x64.Build.0 = Release|x64 {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Debug|Win32.ActiveCfg = Debug|Win32 {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Debug|Win32.Build.0 = Debug|Win32 - {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Debug|x64.ActiveCfg = Debug|Win32 + {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Debug|x64.ActiveCfg = Debug|x64 + {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Debug|x64.Build.0 = Debug|x64 {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Release|Win32.ActiveCfg = Release|Win32 {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Release|Win32.Build.0 = Release|Win32 {A48C241D-70F5-4919-BE06-8C5BE99CCC23}.Release|x64.ActiveCfg = Release|Win32 diff --git a/WinMute/ScreensaverNotifier.cpp b/WinMute/ScreensaverNotifier.cpp index 1865440..822cd68 100644 --- a/WinMute/ScreensaverNotifier.cpp +++ b/WinMute/ScreensaverNotifier.cpp @@ -58,7 +58,7 @@ static LRESULT CALLBACK ScrsvrWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_NCCREATE: { LPCREATESTRUCTW cs = reinterpret_cast(lParam); SetWindowLongPtr(hWnd, GWLP_USERDATA, - reinterpret_cast(cs->lpCreateParams)); + reinterpret_cast(cs->lpCreateParams)); return TRUE; } default: diff --git a/WinMute/WinMute.cpp b/WinMute/WinMute.cpp index 83cabfc..79a760e 100644 --- a/WinMute/WinMute.cpp +++ b/WinMute/WinMute.cpp @@ -48,7 +48,7 @@ static LRESULT CALLBACK WinMuteWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_NCCREATE: { LPCREATESTRUCTW cs = reinterpret_cast(lParam); SetWindowLongPtr(hWnd, GWLP_USERDATA, - reinterpret_cast(cs->lpCreateParams)); + reinterpret_cast(cs->lpCreateParams)); return TRUE; } default: diff --git a/WinMute/WinMute.vcxproj b/WinMute/WinMute.vcxproj index b38893e..ccc041d 100644 --- a/WinMute/WinMute.vcxproj +++ b/WinMute/WinMute.vcxproj @@ -22,30 +22,30 @@ {488617F0-5DD3-42B5-81ED-A1E9B3117551} WinMute Win32Proj - 8.1 + 10.0.15063.0 Application Unicode true - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140_xp + v141 Application Unicode - v140 + v141 @@ -65,32 +65,52 @@ <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)Build\bin\ - $(SolutionDir)Bin\ - $(Configuration)\ - $(Configuration) (x64)\ + $(SolutionDir)Bin\$(PlatformShortName)\ + $(SolutionDir)Bin\$(PlatformShortName)\ + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ true true - $(SolutionDir)Build\bin\ - $(SolutionDir)Bin\ - $(Configuration)\ - $(Configuration) (x64)\ + $(SolutionDir)Bin\$(PlatformShortName)\ + $(SolutionDir)Bin\$(PlatformShortName)\ + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ + $(SolutionDir).buildtmp\$(Configuration)\$(PlatformShortName)\$(ProjectName)\ false false - AllRules.ruleset - AllRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset - AllRules.ruleset - AllRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset - $(ProjectName) (x64) - $(ProjectName) (x64) + $(ProjectName) + $(ProjectName) + + + true + false + false + + + true + false + false + + + true + false + false + + + true + false + false @@ -104,6 +124,8 @@ EditAndContinue true true + true + Caret strsafe.lib;comctl32.lib;WtsApi32.lib;Winmm.lib;%(AdditionalDependencies) @@ -121,6 +143,10 @@ Use Level4 ProgramDatabase + true + true + Caret + true strsafe.lib;comctl32.lib;WtsApi32.lib;Winmm.lib;%(AdditionalDependencies) @@ -142,6 +168,8 @@ true true true + true + Caret strsafe.lib;comctl32.lib;WtsApi32.lib;Winmm.lib;%(AdditionalDependencies) @@ -164,6 +192,11 @@ Use Level4 ProgramDatabase + true + true + Caret + true + true strsafe.lib;comctl32.lib;WtsApi32.lib;Winmm.lib;%(AdditionalDependencies) diff --git a/WinMute/res.rc b/WinMute/res.rc index afd968b..ebb0a2e 100644 --- a/WinMute/res.rc +++ b/WinMute/res.rc @@ -60,7 +60,7 @@ BEGIN MENUITEM "... Workstation is locked", ID_TRAYMENU_MUTEONLOCK, CHECKED MENUITEM "... Screensaver starts", ID_TRAYMENU_MUTEONSCREENSAVER, CHECKED MENUITEM SEPARATOR - MENUITEM "Restore Volume", ID_TRAYMENU_RESTOREAUDIO, CHECKED + MENUITEM "Restore volume", ID_TRAYMENU_RESTOREAUDIO, CHECKED MENUITEM SEPARATOR MENUITEM "Mute now", ID_TRAYMENU_MUTE MENUITEM SEPARATOR @@ -80,10 +80,10 @@ CAPTION "About WinMute" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,194,7,50,14 - LTEXT "WinMute v1.4.3",IDC_STATIC,43,9,67,11 - CONTROL "lx-systems - lx-s.de",IDC_LINK_HOMEPAGE, + LTEXT "WinMute v1.4.4",IDC_STATIC,43,9,67,11 + CONTROL "lx-systems - lx-s.de",IDC_LINK_HOMEPAGE, "SysLink",WS_TABSTOP,43,31,69,13 - LTEXT "Copyright © 2016, Alexander Steinhöfer",IDC_STATIC,43,20,148,12 + LTEXT "Copyright © 2017, Alexander Steinhöfer",IDC_STATIC,43,20,148,12 ICON IDI_APP,IDC_STATIC,13,7,20,20 END