Skip to content

Commit e6af87e

Browse files
PWagner1PWagner1
committed
* Version 8.0.14
* Version 8.0.14
1 parent 9ca67af commit e6af87e

43 files changed

Lines changed: 139 additions & 419 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/Documents/Licenses/License.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2009 - 2010 Microsoft Corporation, then modifications by Peter William Wagner 2017 - 2024.
3+
Copyright (c) 2009 - 2010 Microsoft Corporation, then modifications by Peter William Wagner 2017 - 2025.
44

55
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:
66

‎Changelog.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# Changelog
2+
3+
07/12/2025
4+
5+
Version 8.0.14
6+
* Fixed [#32](https://github.com/PWagner1/Windows-API-CodePack-NET/issues/37), `ShellObjectWatcher` won't Destory
7+
* Usage of null propagation operator `?.` in several places to improve null safety
8+
* Alligned binary versions to NuGet package versions
9+
10+
=========
11+
112
02/11/2025
213

314
Version 8.0.12

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<LibraryVersion>8.0.13</LibraryVersion>
4-
<PackageVersion>8.0.13</PackageVersion>
3+
<LibraryVersion>8.0.14</LibraryVersion>
4+
<PackageVersion>8.0.14</PackageVersion>
55
</PropertyGroup>
66
</Project>

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2009 - 2010 Microsoft Corporation, then modifications by Jacob Slusser 2014, Peter William Wagner 2017 - 2024
3+
Copyright (c) 2009 - 2010 Microsoft Corporation, then modifications by Jacob Slusser 2014, Peter William Wagner 2017 - 2025
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Source/Current/Windows API CodePack/Components/Core/Dialogs/Common/DialogControl.cs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,8 @@ protected void CheckPropertyChangeAllowed(string propName)
8585
{
8686
Debug.Assert(!string.IsNullOrEmpty(propName), "Property to change was not specified");
8787

88-
if (HostingDialog != null)
89-
{
90-
// This will throw if the property change is not allowed.
91-
HostingDialog.IsControlPropertyChangeAllowed(propName, this);
92-
}
88+
// This will throw if the property change is not allowed.
89+
HostingDialog?.IsControlPropertyChangeAllowed(propName, this);
9390
}
9491

9592
///<summary>
@@ -105,10 +102,7 @@ protected void ApplyPropertyChange(string propName)
105102
{
106103
Debug.Assert(!string.IsNullOrEmpty(propName), "Property changed was not specified");
107104

108-
if (HostingDialog != null)
109-
{
110-
HostingDialog.ApplyControlPropertyChange(propName, this);
111-
}
105+
HostingDialog?.ApplyControlPropertyChange(propName, this);
112106
}
113107

114108
/// <summary>

‎Source/Current/Windows API CodePack/Components/Core/Dialogs/Common/DialogControlCollection.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ protected override void InsertItem(int index, T control)
4646
base.InsertItem(index, control);
4747

4848
// Notify that we've added a control.
49-
if (_hostingDialog != null)
50-
{
51-
_hostingDialog.ApplyCollectionChanged();
52-
}
49+
_hostingDialog?.ApplyCollectionChanged();
5350
}
5451

5552
/// <summary>
@@ -74,10 +71,7 @@ protected override void RemoveItem(int index)
7471
control.HostingDialog = null;
7572
base.RemoveItem(index);
7673

77-
if (_hostingDialog != null)
78-
{
79-
_hostingDialog.ApplyCollectionChanged();
80-
}
74+
_hostingDialog?.ApplyCollectionChanged();
8175
}
8276

8377
/// <summary>

‎Source/Current/Windows API CodePack/Components/Core/Dialogs/TaskDialogs/TaskDialog.cs‎

Lines changed: 23 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,7 @@ public string? Text
7878
_text = value;
7979
if (NativeDialogShowing)
8080
{
81-
if (_nativeDialog != null)
82-
{
83-
_nativeDialog.UpdateText(_text);
84-
}
81+
_nativeDialog?.UpdateText(_text);
8582
}
8683
}
8784
}
@@ -99,10 +96,7 @@ public string? InstructionText
9996
_instructionText = value;
10097
if (NativeDialogShowing)
10198
{
102-
if (_nativeDialog != null)
103-
{
104-
_nativeDialog.UpdateInstruction(_instructionText);
105-
}
99+
_nativeDialog?.UpdateInstruction(_instructionText);
106100
}
107101
}
108102
}
@@ -134,10 +128,7 @@ public string? FooterText
134128
_footerText = value;
135129
if (NativeDialogShowing)
136130
{
137-
if (_nativeDialog != null)
138-
{
139-
_nativeDialog.UpdateFooterText(_footerText);
140-
}
131+
_nativeDialog?.UpdateFooterText(_footerText);
141132
}
142133
}
143134
}
@@ -169,10 +160,7 @@ public string? DetailsExpandedText
169160
_detailsExpandedText = value;
170161
if (NativeDialogShowing)
171162
{
172-
if (_nativeDialog != null)
173-
{
174-
_nativeDialog.UpdateExpandedText(_detailsExpandedText);
175-
}
163+
_nativeDialog?.UpdateExpandedText(_detailsExpandedText);
176164
}
177165
}
178166
}
@@ -246,10 +234,7 @@ public TaskDialogStandardIcon Icon
246234
_icon = value;
247235
if (NativeDialogShowing)
248236
{
249-
if (_nativeDialog != null)
250-
{
251-
_nativeDialog.UpdateMainIcon(_icon);
252-
}
237+
_nativeDialog?.UpdateMainIcon(_icon);
253238
}
254239
}
255240
}
@@ -267,10 +252,7 @@ public TaskDialogStandardIcon FooterIcon
267252
_footerIcon = value;
268253
if (NativeDialogShowing)
269254
{
270-
if (_nativeDialog != null)
271-
{
272-
_nativeDialog.UpdateFooterIcon(_footerIcon);
273-
}
255+
_nativeDialog?.UpdateFooterIcon(_footerIcon);
274256
}
275257
}
276258
}
@@ -646,10 +628,7 @@ public void Close()
646628
throw new InvalidOperationException(LocalizedMessages.TaskDialogCloseNonShowing);
647629
}
648630

649-
if (_nativeDialog != null)
650-
{
651-
_nativeDialog.NativeClose(TaskDialogResult.Cancel);
652-
}
631+
_nativeDialog?.NativeClose(TaskDialogResult.Cancel);
653632
// TaskDialog's own cleanup code -
654633
// which runs post show - will handle disposal of native dialog.
655634
}
@@ -666,10 +645,7 @@ public void Close(TaskDialogResult closingResult)
666645
throw new InvalidOperationException(LocalizedMessages.TaskDialogCloseNonShowing);
667646
}
668647

669-
if (_nativeDialog != null)
670-
{
671-
_nativeDialog.NativeClose(closingResult);
672-
}
648+
_nativeDialog?.NativeClose(closingResult);
673649
// TaskDialog's own cleanup code -
674650
// which runs post show - will handle disposal of native dialog.
675651
}
@@ -1085,29 +1061,20 @@ void IDialogControlHost.ApplyControlPropertyChange(string propertyName, DialogCo
10851061
case "State":
10861062
if (_progressBar != null)
10871063
{
1088-
if (_nativeDialog != null)
1089-
{
1090-
_nativeDialog.UpdateProgressBarState(_progressBar.State);
1091-
}
1064+
_nativeDialog?.UpdateProgressBarState(_progressBar.State);
10921065
}
10931066
break;
10941067
case "Value":
10951068
if (_progressBar != null)
10961069
{
1097-
if (_nativeDialog != null)
1098-
{
1099-
_nativeDialog.UpdateProgressBarValue(_progressBar.Value);
1100-
}
1070+
_nativeDialog?.UpdateProgressBarValue(_progressBar.Value);
11011071
}
11021072
break;
11031073
case "Minimum":
11041074
case "Maximum":
11051075
if (_progressBar != null)
11061076
{
1107-
if (_nativeDialog != null)
1108-
{
1109-
_nativeDialog.UpdateProgressBarRange(_progressBar.Minimum, _progressBar.Maximum);
1110-
}
1077+
_nativeDialog?.UpdateProgressBarRange(_progressBar.Minimum, _progressBar.Maximum);
11111078
}
11121079
break;
11131080
default:
@@ -1120,16 +1087,10 @@ void IDialogControlHost.ApplyControlPropertyChange(string propertyName, DialogCo
11201087
switch (propertyName)
11211088
{
11221089
case "ShowElevationIcon":
1123-
if (_nativeDialog != null)
1124-
{
1125-
_nativeDialog.UpdateElevationIcon(button.Id, button.UseElevationIcon);
1126-
}
1090+
_nativeDialog?.UpdateElevationIcon(button.Id, button.UseElevationIcon);
11271091
break;
11281092
case "Enabled":
1129-
if (_nativeDialog != null)
1130-
{
1131-
_nativeDialog.UpdateButtonEnabled(button.Id, button.Enabled);
1132-
}
1093+
_nativeDialog?.UpdateButtonEnabled(button.Id, button.Enabled);
11331094
break;
11341095
default:
11351096
Debug.Assert(true, "Unknown property being set");
@@ -1173,7 +1134,7 @@ internal void RaiseButtonClickEvent(int id)
11731134
// If a custom button was found,
11741135
// raise the event - if not, it's a standard button, and
11751136
// we don't support custom event handling for the standard buttons
1176-
if (button != null) { button.RaiseClickEvent(); }
1137+
button?.RaiseClickEvent();
11771138
}
11781139

11791140
internal void RaiseHyperlinkClickEvent(string link)
@@ -1255,25 +1216,19 @@ private void CleanUp()
12551216
{
12561217
// Reset values that would be considered
12571218
// 'volatile' in a given instance.
1258-
if (_progressBar != null)
1259-
{
1260-
_progressBar.Reset();
1261-
}
1219+
_progressBar?.Reset();
12621220

12631221
// Clean out sorted control lists -
12641222
// though we don't of course clear the main controls collection,
12651223
// so the controls are still around; we'll
12661224
// resort on next show, since the collection may have changed.
1267-
if (_buttons != null) { _buttons.Clear(); }
1268-
if (_commandLinks != null) { _commandLinks.Clear(); }
1269-
if (_radioButtons != null) { _radioButtons.Clear(); }
1225+
_buttons?.Clear();
1226+
_commandLinks?.Clear();
1227+
_radioButtons?.Clear();
12701228
_progressBar = null;
12711229

12721230
// Have the native dialog clean up the rest.
1273-
if (_nativeDialog != null)
1274-
{
1275-
_nativeDialog.Dispose();
1276-
}
1231+
_nativeDialog?.Dispose();
12771232
}
12781233

12791234

@@ -1324,17 +1279,10 @@ public void Dispose(bool disposing)
13241279

13251280
// Clean up unmanaged resources SECOND, NTD counts on
13261281
// being closed before being disposed.
1327-
if (_nativeDialog != null)
1328-
{
1329-
_nativeDialog.Dispose();
1330-
_nativeDialog = null;
1331-
}
1332-
1333-
if (_staticDialog != null)
1334-
{
1335-
_staticDialog.Dispose();
1336-
_staticDialog = null;
1337-
}
1282+
_nativeDialog?.Dispose();
1283+
_nativeDialog = null;
1284+
_staticDialog?.Dispose();
1285+
_staticDialog = null;
13381286

13391287

13401288
}

‎Source/Current/Windows API CodePack/Components/Core/PowerManagement/MessageManager.cs‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ internal static class MessageManager
2323
internal static void RegisterPowerEvent(Guid eventId, EventHandler eventToRegister)
2424
{
2525
EnsureInitialized();
26-
if (_window != null)
27-
{
28-
_window.RegisterPowerEvent(eventId, eventToRegister);
29-
}
26+
_window?.RegisterPowerEvent(eventId, eventToRegister);
3027
}
3128

3229
/// <summary>
@@ -37,10 +34,7 @@ internal static void RegisterPowerEvent(Guid eventId, EventHandler eventToRegist
3734
internal static void UnregisterPowerEvent(Guid eventId, EventHandler eventToUnregister)
3835
{
3936
EnsureInitialized();
40-
if (_window != null)
41-
{
42-
_window.UnregisterPowerEvent(eventId, eventToUnregister);
43-
}
37+
_window?.UnregisterPowerEvent(eventId, eventToUnregister);
4438
}
4539

4640
#endregion
@@ -103,10 +97,7 @@ internal void RegisterPowerEvent(Guid eventId, EventHandler eventToRegister)
10397
// ReSharper restore ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
10498
{
10599
ArrayList? currList = (ArrayList)_eventList[eventId];
106-
if (currList != null)
107-
{
108-
currList.Add(eventToRegister);
109-
}
100+
currList?.Add(eventToRegister);
110101
}
111102
}
112103
_readerWriterLock.ReleaseWriterLock();
@@ -127,10 +118,7 @@ internal void UnregisterPowerEvent(Guid eventId, EventHandler eventToUnregister)
127118
if (_eventList.Contains(eventId))
128119
{
129120
ArrayList currList = (ArrayList)_eventList[eventId];
130-
if (currList != null)
131-
{
132-
currList.Remove(eventToUnregister);
133-
}
121+
currList?.Remove(eventToUnregister);
134122
}
135123
else
136124
{
@@ -151,10 +139,7 @@ private static void ExecuteEvents(ArrayList? eventHandlerList)
151139
{
152140
foreach (EventHandler handler in eventHandlerList)
153141
{
154-
if (handler != null)
155-
{
156-
handler.Invoke(null, new());
157-
}
142+
handler?.Invoke(null, new());
158143
}
159144
}
160145
}

‎Source/Current/Windows API CodePack/Components/Sensors/ObjectModel/Sensor.cs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,7 @@ internal HResult InternalUpdateData()
301301
try
302302
{
303303
DataReport = SensorReport.FromNativeReport(this, iReport);
304-
if (DataReportChanged != null)
305-
{
306-
DataReportChanged.Invoke(this, EventArgs.Empty);
307-
}
304+
DataReportChanged?.Invoke(this, EventArgs.Empty);
308305
}
309306
finally
310307
{
@@ -643,19 +640,13 @@ protected virtual void Initialize()
643640

644641
void ISensorEvents.OnStateChanged(ISensor sensor, NativeSensorState state)
645642
{
646-
if (StateChanged != null)
647-
{
648-
StateChanged.Invoke(this, EventArgs.Empty);
649-
}
643+
StateChanged?.Invoke(this, EventArgs.Empty);
650644
}
651645

652646
void ISensorEvents.OnDataUpdated(ISensor sensor, ISensorDataReport newData)
653647
{
654648
DataReport = SensorReport.FromNativeReport(this, newData);
655-
if (DataReportChanged != null)
656-
{
657-
DataReportChanged.Invoke(this, EventArgs.Empty);
658-
}
649+
DataReportChanged?.Invoke(this, EventArgs.Empty);
659650
}
660651

661652
void ISensorEvents.OnEvent(ISensor sensor, Guid eventId, ISensorDataReport newData)

0 commit comments

Comments
 (0)