diff --git a/CHANGELOG.md b/CHANGELOG.md index 6046ecb..a718e33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [1.1] - 2019-12-11 +### Added +- DpiAwareness +- Application ID column +- support for DeploymentAction='OptionalInstallation' + + ## [1.0] - 2019-10-19 ### Added - Added italian translation thx @irondave diff --git a/wumgr/App.config b/wumgr/App.config index 4543795..be705a9 100644 --- a/wumgr/App.config +++ b/wumgr/App.config @@ -3,4 +3,7 @@ + + + diff --git a/wumgr/Common/MiscFunc.cs b/wumgr/Common/MiscFunc.cs index 44e4ea9..0f9b21b 100644 --- a/wumgr/Common/MiscFunc.cs +++ b/wumgr/Common/MiscFunc.cs @@ -109,7 +109,7 @@ static public bool IsRunningAsUwp() } } - static private bool IsWindows7OrLower + static public bool IsWindows7OrLower { get { diff --git a/wumgr/MsUpdate.cs b/wumgr/MsUpdate.cs index 6ce9bb7..cf93017 100644 --- a/wumgr/MsUpdate.cs +++ b/wumgr/MsUpdate.cs @@ -68,6 +68,7 @@ public MsUpdate(IUpdateHistoryEntry2 update) Description = update.Description; Date = update.Date; SupportUrl = update.SupportUrl; + ApplicationID = update.ClientApplicationID; State = UpdateState.History; @@ -144,6 +145,7 @@ public IUpdate GetUpdate() public DateTime Date = DateTime.MinValue; public decimal Size = 0; public String SupportUrl = ""; + public String ApplicationID = ""; public System.Collections.Specialized.StringCollection Downloads = new System.Collections.Specialized.StringCollection(); public enum UpdateState diff --git a/wumgr/Properties/AssemblyInfo.cs b/wumgr/Properties/AssemblyInfo.cs index 89481e0..b5d4eee 100644 --- a/wumgr/Properties/AssemblyInfo.cs +++ b/wumgr/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("wumgr")] -[assembly: AssemblyCopyright("Copyright © DavidXanatos 2018-2019")] +[assembly: AssemblyCopyright("Copyright © DavidXanatos 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("1.0.0")] +[assembly: AssemblyVersion("1.1.0")] +[assembly: AssemblyFileVersion("1.1.0")] diff --git a/wumgr/Translate.cs b/wumgr/Translate.cs index 4833b9e..f43ad09 100644 --- a/wumgr/Translate.cs +++ b/wumgr/Translate.cs @@ -90,6 +90,7 @@ static public void Load(string lang = "") mStrings.Add("col_title", "Title"); mStrings.Add("col_cat", "Category"); mStrings.Add("col_kb", "KB Article"); + mStrings.Add("col_app_id", "Application ID"); mStrings.Add("col_date", "Date"); mStrings.Add("col_site", "Size"); mStrings.Add("col_stat", "State"); diff --git a/wumgr/WuAgent.cs b/wumgr/WuAgent.cs index aafef77..8df35dc 100644 --- a/wumgr/WuAgent.cs +++ b/wumgr/WuAgent.cs @@ -391,7 +391,14 @@ private RetCodes SearchForUpdates() // http://msdn.microsoft.com/en-us/library/windows/desktop/aa386526(v=VS.85).aspx try { - mSearchJob = mUpdateSearcher.BeginSearch("(IsInstalled = 0 and IsHidden = 0) or (IsInstalled = 1 and IsHidden = 0) or (IsHidden = 1)", mCallback, null); + //string query = "(IsInstalled = 0 and IsHidden = 0) or (IsInstalled = 1 and IsHidden = 0) or (IsHidden = 1)"; + //string query = "(IsInstalled = 0 and IsHidden = 0) or (IsInstalled = 1 and IsHidden = 0) or (IsHidden = 1) or (IsInstalled = 0 and IsHidden = 0 and DeploymentAction='OptionalInstallation') or (IsInstalled = 1 and IsHidden = 0 and DeploymentAction='OptionalInstallation') or (IsHidden = 1 and DeploymentAction='OptionalInstallation')"; + string query; + if (MiscFunc.IsWindows7OrLower) + query = "(IsInstalled = 0 and IsHidden = 0) or (IsInstalled = 1 and IsHidden = 0) or (IsHidden = 1)"; + else + query = "(IsInstalled = 0 and IsHidden = 0 and DeploymentAction=*) or (IsInstalled = 1 and IsHidden = 0 and DeploymentAction=*) or (IsHidden = 1 and DeploymentAction=*)"; + mSearchJob = mUpdateSearcher.BeginSearch(query, mCallback, null); } catch (Exception err) { diff --git a/wumgr/WuMgr.Designer.cs b/wumgr/WuMgr.Designer.cs index 43a7daa..ae7838a 100644 --- a/wumgr/WuMgr.Designer.cs +++ b/wumgr/WuMgr.Designer.cs @@ -238,6 +238,7 @@ private void InitializeComponent() this.columnHeader4, this.columnHeader5, this.columnHeader6}); + this.updateView.HideSelection = false; this.updateView.Location = new System.Drawing.Point(3, 23); this.updateView.Name = "updateView"; this.updateView.ShowItemToolTips = true; diff --git a/wumgr/WuMgr.cs b/wumgr/WuMgr.cs index 75b96ef..a2f1c5a 100644 --- a/wumgr/WuMgr.cs +++ b/wumgr/WuMgr.cs @@ -548,7 +548,7 @@ void LoadList(List List) string[] strings = new string[] { Update.Title, Update.Category, - Update.KB, + CurrentList == UpdateLists.UpdateHistory ? Update.ApplicationID : Update.KB, Update.Date.ToString(CultureInfo.CurrentUICulture.DateTimeFormat.ShortDatePattern), FileOps.FormatSize(Update.Size), State}; @@ -643,6 +643,9 @@ void SwitchList(UpdateLists List) suspendChange = false; CurrentList = List; + + updateView.Columns[2].Text = (CurrentList == UpdateLists.UpdateHistory) ? Translate.fmt("col_app_id") : Translate.fmt("col_kb"); + LoadList(); UpdateState(); diff --git a/wumgr/wumgr.csproj b/wumgr/wumgr.csproj index 764ae39..55362fe 100644 --- a/wumgr/wumgr.csproj +++ b/wumgr/wumgr.csproj @@ -144,7 +144,9 @@ - + + Designer +