From c73be720655e291ddd452459e5f5ded01335694a Mon Sep 17 00:00:00 2001 From: Yoshi Askharoun Date: Mon, 22 Nov 2021 01:51:40 -0600 Subject: [PATCH] Even more fixes --- ZuneDBApi/CComPtrMgd-DeviceMediator-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IAccountManagement-.cs | 5 ++--- ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs | 5 ++--- ZuneDBApi/CComPtrMgd-IEndpointHost-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs | 9 ++++----- .../CComPtrMgd-IFirmwareRestorePoint-.cs | 9 ++++----- ...PtrMgd-IFirmwareRestorePointCollection-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs | 9 ++++----- ...CComPtrMgd-IFirmwareUpdateCallbackData-.cs | 9 ++++----- .../CComPtrMgd-IFirmwareUpdateCollection-.cs | 9 ++++----- .../CComPtrMgd-IFirmwareUpdateErrorInfo-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs | 7 +++---- ZuneDBApi/CComPtrMgd-IGasGauge-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IJumpList-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs | 5 ++--- ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs | 5 ++--- ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs | 11 +++++------ ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IServiceError-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-ISyncEngine-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IThumbBar-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs | 5 ++--- ZuneDBApi/CComPtrMgd-IUpdateManager-.cs | 9 ++++----- ...ComPtrMgd-IWinLiveAvailableInformation-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs | 9 ++++----- .../CComPtrMgd-IZuneMBRBandwidthTest-.cs | 9 ++++----- ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs | 9 ++++----- .../CComPtrMgd-SyncRulesViewMediator-.cs | 9 ++++----- ZuneDBApi/DataStructs/IntSet.cs | 2 +- .../CConfigurationManagedBase.cs | 8 +++----- .../Zune/Configuration/TunerInfoHandler.cs | 5 ++--- .../Zune/Messaging/MessagingNotifier.cs | 5 ++--- .../Zune/Messaging/MessagingService.cs | 7 +++---- .../Zune/Messaging/PlaylistMessageData.cs | 3 +-- .../Zune/Playlist/PlaylistManager.cs | 15 ++++++--------- .../Zune/QuickMix/QuickMixSession.cs | 6 ++---- .../Zune/Service/AlbumOfferCollection.cs | 3 +-- .../Zune/Service/AppOfferCollection.cs | 5 +---- .../Zune/Service/BillingOfferCollection.cs | 5 ++--- .../Zune/Service/CreditCardCollection.cs | 5 ++--- .../Microsoft/Zune/Service/HttpWebResponse.cs | 6 ++---- .../Zune/Service/PassportIdentity.cs | 8 +------- ZuneDBApi/Microsoft/Zune/Service/Service.cs | 4 +--- .../Microsoft/Zune/Service/ServiceError.cs | 8 +------- .../Zune/Service/TrackOfferCollection.cs | 3 +-- .../Zune/Service/UriResourceTracker.cs | 7 +++---- .../Zune/Service/VideoOfferCollection.cs | 5 +---- .../Service/WinLiveAvailableInformation.cs | 8 +------- .../Zune/Service/WinLiveInformation.cs | 6 ------ .../Microsoft/Zune/Service/WinLiveSignup.cs | 8 +------- .../SubscriptionDataProviderItem.cs | 1 - .../Zune/Subscription/SubscriptionManager.cs | 5 ++--- .../VirtualSubscriptionEpisodeList.cs | 6 ------ ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs | 1 - .../Microsoft/Zune/Util/ContentRefreshTask.cs | 5 ++--- .../Microsoft/Zune/Util/DRMCanDoQuery.cs | 5 ++--- .../Zune/Util/DownloadEventArguments.cs | 1 - .../Microsoft/Zune/Util/DownloadManager.cs | 13 ++++++------- ZuneDBApi/Microsoft/Zune/Util/DownloadTask.cs | 5 ++--- .../Zune/Util/FamilySettingsManager.cs | 4 +--- .../Microsoft/Zune/Util/FeaturesChangedApi.cs | 8 +------- .../Microsoft/Zune/Util/JumpListCategory.cs | 8 +------- .../Microsoft/Zune/Util/JumpListEntry.cs | 8 +------- .../Microsoft/Zune/Util/JumpListSession.cs | 9 ++------- ZuneDBApi/Microsoft/Zune/Util/PinManager.cs | 9 ++++----- ZuneDBApi/Microsoft/Zune/Util/Point.cs | 2 -- .../Microsoft/Zune/Util/RadioPlaylist.cs | 6 ++---- .../Zune/Util/RadioStationManager.cs | 11 +++++------ ZuneDBApi/Microsoft/Zune/Util/Size.cs | 2 -- .../Microsoft/Zune/Util/TaskbarPlayer.cs | 3 +-- ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs | 9 ++------- .../Microsoft/Zune/Util/ThumbBarButton.cs | 8 +------- .../Zune/Util/UpdateCheckEventArguments.cs | 1 - .../Microsoft/Zune/Util/UpdateManager.cs | 8 +------- ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs | 2 -- .../MicrosoftZuneLibrary/AlbumMetadata.cs | 5 ++--- .../AsyncGetThumbnailState.cs | 5 ++--- ...llbackOnUIThreadBimodalManaged_DONOTUSE.cs | 5 ++--- .../DeferredSetResultArgs.cs | 1 - ZuneDBApi/MicrosoftZuneLibrary/Device.cs | 18 ++++++------------ ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs | 8 +------- .../FirmwareOperationBase.cs | 8 +------- .../FirmwareRestorePoint.cs | 8 +------- .../FirmwareRestorePointCollection.cs | 8 +------- .../MicrosoftZuneLibrary/FirmwareRestorer.cs | 1 - .../FirmwareUpdateErrorInfo.cs | 8 +------- .../FirmwareUpdatePackage.cs | 8 +------- .../MicrosoftZuneLibrary/FirmwareUpdater.cs | 1 - .../FriendsOfArtistQuery.cs | 5 ----- ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs | 8 +------- ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs | 19 +++++++++---------- .../InteropNotifications.cs | 5 ++--- ZuneDBApi/MicrosoftZuneLibrary/ManagedLock.cs | 8 +------- .../MetadataMgrNotifications.cs | 5 ++--- ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs | 12 +++--------- .../MicrosoftZuneLibrary/SyncRulesView.cs | 8 +------- .../MicrosoftZuneLibrary/TrackMetadata.cs | 5 ++--- .../UpdatePackageCollection.cs | 5 ----- ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs | 8 +------- .../VirtualDatabaseList.cs | 5 ----- .../WlanAuthCipherPair.cs | 5 ++--- ZuneDBApi/MicrosoftZuneLibrary/WlanProfile.cs | 5 ++--- ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs | 5 ----- .../ZuneLibraryCDDevice.cs | 2 +- .../ZuneLibraryCDDeviceList.cs | 8 +++----- .../ZuneLibraryCDRecorder.cs | 5 ++--- .../MicrosoftZuneLibrary/ZunePlaylist.cs | 5 ++--- .../MicrosoftZuneLibrary/ZuneQueryItem.cs | 7 +------ .../MicrosoftZuneLibrary/ZuneQueryList.cs | 2 -- .../BandwidthTestErrorArgs.cs | 1 - .../BandwidthTestInterop.cs | 6 ++---- .../BandwidthUpdateArgs.cs | 1 - .../MicrosoftZunePlayback/PlayerInterop.cs | 7 +------ ZuneDBApi/Module.cs | 7 ++++++- 117 files changed, 250 insertions(+), 524 deletions(-) diff --git a/ZuneDBApi/CComPtrMgd-DeviceMediator-.cs b/ZuneDBApi/CComPtrMgd-DeviceMediator-.cs index 45421d3..fdf93dc 100644 --- a/ZuneDBApi/CComPtrMgd-DeviceMediator-.cs +++ b/ZuneDBApi/CComPtrMgd-DeviceMediator-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CDeviceMediator_003E : IDisposable } } - public unsafe implicit operator DeviceMediator*() + public static unsafe implicit operator DeviceMediator*(CComPtrMgd_003CDeviceMediator_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -66,14 +66,13 @@ internal class CComPtrMgd_003CDeviceMediator_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CDeviceMediator_003E() diff --git a/ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs b/ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs index e3a17a8..19f1a3f 100644 --- a/ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs +++ b/ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CGasGaugeMediator_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CGasGaugeMediator_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CGasGaugeMediator_003E : IDisposable Dispose(false); } - public unsafe implicit operator GasGaugeMediator*() + public static unsafe implicit operator GasGaugeMediator*(CComPtrMgd_003CGasGaugeMediator_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IAccountManagement-.cs b/ZuneDBApi/CComPtrMgd-IAccountManagement-.cs index bf7e3c9..8b1fa16 100644 --- a/ZuneDBApi/CComPtrMgd-IAccountManagement-.cs +++ b/ZuneDBApi/CComPtrMgd-IAccountManagement-.cs @@ -67,14 +67,13 @@ internal class CComPtrMgd_003CIAccountManagement_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIAccountManagement_003E() diff --git a/ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs b/ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs index 21e08a5..96f7980 100644 --- a/ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs +++ b/ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs @@ -55,14 +55,13 @@ internal class CComPtrMgd_003CIAsyncCallback_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIAsyncCallback_003E() diff --git a/ZuneDBApi/CComPtrMgd-IEndpointHost-.cs b/ZuneDBApi/CComPtrMgd-IEndpointHost-.cs index b03190e..a9aadbf 100644 --- a/ZuneDBApi/CComPtrMgd-IEndpointHost-.cs +++ b/ZuneDBApi/CComPtrMgd-IEndpointHost-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CIEndpointHost_003E : IDisposable } } - public unsafe implicit operator IEndpointHost*() + public static unsafe implicit operator IEndpointHost*(CComPtrMgd_003CIEndpointHost_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -66,14 +66,13 @@ internal class CComPtrMgd_003CIEndpointHost_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIEndpointHost_003E() diff --git a/ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs b/ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs index dd4fbbf..1ff4e7b 100644 --- a/ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs +++ b/ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIEndpointHostManager_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIEndpointHostManager_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIEndpointHostManager_003E : IDisposable Dispose(false); } - public unsafe implicit operator IEndpointHostManager*() + public static unsafe implicit operator IEndpointHostManager*(CComPtrMgd_003CIEndpointHostManager_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs index 19d32fb..47c6427 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareMetadata_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareMetadata_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareMetadata_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareMetadata*() + public static unsafe implicit operator IFirmwareMetadata*(CComPtrMgd_003CIFirmwareMetadata_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs index 955b969..56dce8a 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareRestorePoint_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareRestorePoint_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareRestorePoint_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareRestorePoint*() + public static unsafe implicit operator IFirmwareRestorePoint*(CComPtrMgd_003CIFirmwareRestorePoint_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs index 31545ee..cbc42a2 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareRestorePointCollection_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareRestorePointCollection_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareRestorePointCollection_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareRestorePointCollection*() + public static unsafe implicit operator IFirmwareRestorePointCollection*(CComPtrMgd_003CIFirmwareRestorePointCollection_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs index ae11597..05c52b3 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareRestorer_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareRestorer_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareRestorer_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareRestorer*() + public static unsafe implicit operator IFirmwareRestorer*(CComPtrMgd_003CIFirmwareRestorer_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs index e0ee7c9..ec88bab 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareUpdateCallbackData_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareUpdateCallbackData_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareUpdateCallbackData_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareUpdateCallbackData*() + public static unsafe implicit operator IFirmwareUpdateCallbackData*(CComPtrMgd_003CIFirmwareUpdateCallbackData_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs index 068b6e4..a976b40 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareUpdateCollection_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareUpdateCollection_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareUpdateCollection_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareUpdateCollection*() + public static unsafe implicit operator IFirmwareUpdateCollection*(CComPtrMgd_003CIFirmwareUpdateCollection_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs index 45b5a9a..08c4ff0 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareUpdateErrorInfo*() + public static unsafe implicit operator IFirmwareUpdateErrorInfo*(CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs index c68df1d..73d1263 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIFirmwareUpdater_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIFirmwareUpdater_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIFirmwareUpdater_003E : IDisposable Dispose(false); } - public unsafe implicit operator IFirmwareUpdater*() + public static unsafe implicit operator IFirmwareUpdater*(CComPtrMgd_003CIFirmwareUpdater_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IGasGauge-.cs b/ZuneDBApi/CComPtrMgd-IGasGauge-.cs index 106af96..78234a7 100644 --- a/ZuneDBApi/CComPtrMgd-IGasGauge-.cs +++ b/ZuneDBApi/CComPtrMgd-IGasGauge-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIGasGauge_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIGasGauge_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIGasGauge_003E : IDisposable Dispose(false); } - public unsafe implicit operator IGasGauge*() + public static unsafe implicit operator IGasGauge*(CComPtrMgd_003CIGasGauge_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IJumpList-.cs b/ZuneDBApi/CComPtrMgd-IJumpList-.cs index a648b7d..72fdc76 100644 --- a/ZuneDBApi/CComPtrMgd-IJumpList-.cs +++ b/ZuneDBApi/CComPtrMgd-IJumpList-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CIJumpList_003E : IDisposable } } - public unsafe implicit operator IJumpList*() + public static unsafe implicit operator IJumpList*(CComPtrMgd_003CIJumpList_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -66,14 +66,13 @@ internal class CComPtrMgd_003CIJumpList_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIJumpList_003E() diff --git a/ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs b/ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs index ffe705d..93bc7ba 100644 --- a/ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs +++ b/ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs @@ -61,14 +61,13 @@ internal class CComPtrMgd_003CIJumpListCategory_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIJumpListCategory_003E() diff --git a/ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs b/ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs index d3cab0c..494a62d 100644 --- a/ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs +++ b/ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs @@ -61,14 +61,13 @@ internal class CComPtrMgd_003CIJumpListEntry_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIJumpListEntry_003E() diff --git a/ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs b/ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs index 45593a4..4467503 100644 --- a/ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs +++ b/ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIPassportIdentity_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIPassportIdentity_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIPassportIdentity_003E : IDisposable Dispose(false); } - public unsafe implicit operator IPassportIdentity*() + public static unsafe implicit operator IPassportIdentity*(CComPtrMgd_003CIPassportIdentity_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -90,6 +89,6 @@ internal class CComPtrMgd_003CIPassportIdentity_003E : IDisposable Module._ZuneShipAssert(1001u, 186u); return -2147467261; } - return ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(ulong*)ptr)))((nint)ptr, (_GUID*)Unsafe.AsPointer(ref Module._GUID_655b468c_1224_467d_b720_3bac7f99b6ba), (void**)pp); + return ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(ulong*)ptr)))((nint)ptr, (_GUID*)Unsafe.AsPointer(ref Module.GUID_IPassportIdentity), (void**)pp); } } diff --git a/ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs b/ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs index 0178333..a19a401 100644 --- a/ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs +++ b/ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CIQuickMixSession_003E : IDisposable } } - public unsafe implicit operator IQuickMixSession*() + public static unsafe implicit operator IQuickMixSession*(CComPtrMgd_003CIQuickMixSession_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -66,14 +66,13 @@ internal class CComPtrMgd_003CIQuickMixSession_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIQuickMixSession_003E() diff --git a/ZuneDBApi/CComPtrMgd-IServiceError-.cs b/ZuneDBApi/CComPtrMgd-IServiceError-.cs index d9a4880..39b0c96 100644 --- a/ZuneDBApi/CComPtrMgd-IServiceError-.cs +++ b/ZuneDBApi/CComPtrMgd-IServiceError-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIServiceError_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIServiceError_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIServiceError_003E : IDisposable Dispose(false); } - public unsafe implicit operator IServiceError*() + public static unsafe implicit operator IServiceError*(CComPtrMgd_003CIServiceError_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-ISyncEngine-.cs b/ZuneDBApi/CComPtrMgd-ISyncEngine-.cs index 5e4f58d..aaac0b1 100644 --- a/ZuneDBApi/CComPtrMgd-ISyncEngine-.cs +++ b/ZuneDBApi/CComPtrMgd-ISyncEngine-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CISyncEngine_003E : IDisposable } } - public unsafe implicit operator ISyncEngine*() + public static unsafe implicit operator ISyncEngine*(CComPtrMgd_003CISyncEngine_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -67,14 +67,13 @@ internal class CComPtrMgd_003CISyncEngine_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CISyncEngine_003E() diff --git a/ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs b/ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs index e66053e..3ab1b65 100644 --- a/ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs +++ b/ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CISyncRulesView_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CISyncRulesView_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CISyncRulesView_003E : IDisposable Dispose(false); } - public unsafe implicit operator ISyncRulesView*() + public static unsafe implicit operator ISyncRulesView*(CComPtrMgd_003CISyncRulesView_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IThumbBar-.cs b/ZuneDBApi/CComPtrMgd-IThumbBar-.cs index cf214c0..04da242 100644 --- a/ZuneDBApi/CComPtrMgd-IThumbBar-.cs +++ b/ZuneDBApi/CComPtrMgd-IThumbBar-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIThumbBar_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIThumbBar_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CIThumbBar_003E : IDisposable Dispose(false); } - public unsafe implicit operator IThumbBar*() + public static unsafe implicit operator IThumbBar*(CComPtrMgd_003CIThumbBar_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs b/ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs index 167ebf5..030863c 100644 --- a/ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs +++ b/ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CIThumbBarButton_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIThumbBarButton_003E() diff --git a/ZuneDBApi/CComPtrMgd-IUpdateManager-.cs b/ZuneDBApi/CComPtrMgd-IUpdateManager-.cs index 38642b0..3f2c8c2 100644 --- a/ZuneDBApi/CComPtrMgd-IUpdateManager-.cs +++ b/ZuneDBApi/CComPtrMgd-IUpdateManager-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CIUpdateManager_003E : IDisposable } } - public unsafe implicit operator IUpdateManager*() + public static unsafe implicit operator IUpdateManager*(CComPtrMgd_003CIUpdateManager_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -66,14 +66,13 @@ internal class CComPtrMgd_003CIUpdateManager_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIUpdateManager_003E() diff --git a/ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs b/ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs index e2d828e..61cb8eb 100644 --- a/ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs +++ b/ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CIWinLiveAvailableInformation_003E : IDisposable } } - public unsafe implicit operator IWinLiveAvailableInformation*() + public static unsafe implicit operator IWinLiveAvailableInformation*(CComPtrMgd_003CIWinLiveAvailableInformation_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -66,14 +66,13 @@ internal class CComPtrMgd_003CIWinLiveAvailableInformation_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIWinLiveAvailableInformation_003E() diff --git a/ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs b/ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs index f17c938..7bd8506 100644 --- a/ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs +++ b/ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CIWinLiveInformation_003E : IDisposable } } - public unsafe implicit operator IWinLiveInformation*() + public static unsafe implicit operator IWinLiveInformation*(CComPtrMgd_003CIWinLiveInformation_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -66,14 +66,13 @@ internal class CComPtrMgd_003CIWinLiveInformation_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIWinLiveInformation_003E() diff --git a/ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs b/ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs index f5e0902..2d2713b 100644 --- a/ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs +++ b/ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs @@ -29,9 +29,9 @@ internal class CComPtrMgd_003CIZuneMBRBandwidthTest_003E : IDisposable } } - public unsafe implicit operator IZuneMBRBandwidthTest*() + public static unsafe implicit operator IZuneMBRBandwidthTest*(CComPtrMgd_003CIZuneMBRBandwidthTest_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -80,14 +80,13 @@ internal class CComPtrMgd_003CIZuneMBRBandwidthTest_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIZuneMBRBandwidthTest_003E() diff --git a/ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs b/ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs index 8597271..a4b5e1e 100644 --- a/ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs +++ b/ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs @@ -30,9 +30,9 @@ internal class CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEv } } - public unsafe implicit operator CMBRBandwidthTestEventSink*() + public static unsafe implicit operator CMBRBandwidthTestEventSink*(CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -61,14 +61,13 @@ internal class CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEv } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E() diff --git a/ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs b/ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs index 97a10c5..22bd174 100644 --- a/ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs +++ b/ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CSyncRulesViewMediator_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CSyncRulesViewMediator_003E() @@ -57,9 +56,9 @@ internal class CComPtrMgd_003CSyncRulesViewMediator_003E : IDisposable Dispose(false); } - public unsafe implicit operator SyncRulesViewMediator*() + public static unsafe implicit operator SyncRulesViewMediator*(CComPtrMgd_003CSyncRulesViewMediator_003E obj) { - return p; + return obj.p; } [SpecialName] diff --git a/ZuneDBApi/DataStructs/IntSet.cs b/ZuneDBApi/DataStructs/IntSet.cs index 5926a2c..535889a 100644 --- a/ZuneDBApi/DataStructs/IntSet.cs +++ b/ZuneDBApi/DataStructs/IntSet.cs @@ -5,7 +5,7 @@ namespace DataStructs { [StructLayout(LayoutKind.Sequential, Size = 32)] [NativeCppClass] - internal struct IntSet + internal struct IntSet { private long _003Calignment_0020member_003E; } diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs b/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs index dd8919c..4284f9e 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs @@ -84,7 +84,6 @@ namespace Microsoft.Zune.Configuration m_basePath = basePath; m_instance = instance; m_pNotificationMarshaller = null; - base._002Ector(); switch (hive) { default: @@ -806,7 +805,7 @@ namespace Microsoft.Zune.Configuration catch { //try-fault - ptr5 = null; + array = null; throw; } } @@ -1045,14 +1044,13 @@ namespace Microsoft.Zune.Configuration } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CConfigurationManagedBase() diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs b/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs index 00c602c..7c2b307 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs @@ -345,14 +345,13 @@ namespace Microsoft.Zune.Configuration { if (!P_0) { - Finalize(); + //Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingNotifier.cs b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingNotifier.cs index af87624..d7f6c0d 100644 --- a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingNotifier.cs +++ b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingNotifier.cs @@ -166,14 +166,13 @@ namespace Microsoft.Zune.Messaging } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~MessagingNotifier() diff --git a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs index fcbeee6..dfc018b 100644 --- a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs +++ b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs @@ -37,7 +37,7 @@ namespace Microsoft.Zune.Messaging //IL_0008: Expected I, but got I8 //IL_0011: Expected I, but got I8 IZuneNetMessaging* pMessaging = null; - if (Module.GetSingleton((_GUID)Module._GUID_bf368f0d_4743_439c_9142_e487c9534104, (void**)(&pMessaging)) >= 0) + if (Module.GetSingleton(Module.GUID_IZuneNetMessaging, (void**)(&pMessaging)) >= 0) { m_pMessaging = pMessaging; } @@ -1017,14 +1017,13 @@ namespace Microsoft.Zune.Messaging } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~MessagingService() diff --git a/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs b/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs index b2e188d..5dcf9ea 100644 --- a/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs +++ b/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs @@ -263,14 +263,13 @@ namespace Microsoft.Zune.Messaging } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~PlaylistMessageData() diff --git a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs index 8455d7f..b9a36c5 100644 --- a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs @@ -96,10 +96,7 @@ namespace Microsoft.Zune.Playlist { ePlaylistCreateConflictAction = (EPlaylistCreateConflictAction)1; } - _GUID gUID; - *(int*)(&gUID) = 0; - // IL initblk instruction - Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref gUID, 4), 0, 12); + _GUID gUID = new(); if (serviceMediaId != null) { gUID = (Guid)serviceMediaId; @@ -182,7 +179,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - ptr3 = null; + playlistContentIds = null; throw; } } @@ -190,7 +187,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - ptr2 = null; + mediaTypeIds = null; throw; } } @@ -198,7 +195,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - ptr = null; + mediaIds = null; throw; } } @@ -225,7 +222,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - ptr = null; + playlistContentIds = null; throw; } } @@ -253,7 +250,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - ptr = null; + playlistContentIds = null; throw; } } diff --git a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs index b974c1a..1b443e5 100644 --- a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs +++ b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs @@ -16,7 +16,6 @@ namespace Microsoft.Zune.QuickMix try { m_spSession = spSession; - base._002Ector(); m_spSession.op_Assign(pSession); } catch @@ -268,15 +267,14 @@ namespace Microsoft.Zune.QuickMix } finally { - base.Finalize(); + //base.Finalize(); } } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~QuickMixSession() diff --git a/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs index 120a0a5..d74d900 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs @@ -180,14 +180,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~AlbumOfferCollection() diff --git a/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs index d9cf6b1..b7c4625 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs @@ -2,8 +2,6 @@ using System; using System.Collections; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using _003CCppImplementationDetails_003E; - namespace Microsoft.Zune.Service { public class AppOfferCollection : OfferCollection, IDisposable @@ -171,14 +169,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~AppOfferCollection() diff --git a/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs index e0578c1..a3105be 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs @@ -101,14 +101,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~BillingOfferCollection() diff --git a/ZuneDBApi/Microsoft/Zune/Service/CreditCardCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/CreditCardCollection.cs index 45c1dcc..0cc6c96 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/CreditCardCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/CreditCardCollection.cs @@ -136,14 +136,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CreditCardCollection() diff --git a/ZuneDBApi/Microsoft/Zune/Service/HttpWebResponse.cs b/ZuneDBApi/Microsoft/Zune/Service/HttpWebResponse.cs index b56d727..c7dbf69 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/HttpWebResponse.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/HttpWebResponse.cs @@ -85,7 +85,6 @@ namespace Microsoft.Zune.Service //IL_010d: Expected I, but got I8 //IL_0199: Expected I, but got I8 m_pStream = pStream; - base._002Ector(); _statusCode = statusCode; if (pResponse != null) { @@ -182,14 +181,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~HttpWebResponse() diff --git a/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs b/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs index b05fa78..d2b0a0f 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs @@ -91,7 +91,6 @@ namespace Microsoft.Zune.Service try { m_spPassportIdentity = spPassportIdentity; - base._002Ector(); m_spPassportIdentity.op_Assign(pPassportIdentity); } catch @@ -124,16 +123,11 @@ namespace Microsoft.Zune.Service ((IDisposable)m_spPassportIdentity).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/Service.cs b/ZuneDBApi/Microsoft/Zune/Service/Service.cs index 913f3fb..5798962 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/Service.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/Service.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using _003CCppImplementationDetails_003E; using Microsoft.Iris; using Microsoft.Zune.Util; using ZuneUI; @@ -7839,14 +7838,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~Service() diff --git a/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs b/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs index 60606b7..d322d7f 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs @@ -73,7 +73,6 @@ namespace Microsoft.Zune.Service try { m_spServiceError = spServiceError; - base._002Ector(); m_spServiceError.op_Assign(pServiceError); } catch @@ -100,16 +99,11 @@ namespace Microsoft.Zune.Service ((IDisposable)m_spServiceError).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs index d6257bb..58eb3cf 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs @@ -183,14 +183,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~TrackOfferCollection() diff --git a/ZuneDBApi/Microsoft/Zune/Service/UriResourceTracker.cs b/ZuneDBApi/Microsoft/Zune/Service/UriResourceTracker.cs index 01f2452..d4ed8b0 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/UriResourceTracker.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/UriResourceTracker.cs @@ -27,7 +27,7 @@ namespace Microsoft.Zune.Service //IL_0008: Expected I, but got I8 //IL_0011: Expected I, but got I8 IUriResourceTracker* pUriResourceTracker = null; - if (Module.GetSingleton((_GUID)Module._GUID_ddbb9148_dea1_47dd_a0c1_1fdcf002c1e2, (void**)(&pUriResourceTracker)) >= 0) + if (Module.GetSingleton(Module.GUID_IUriResourceTracker, (void**)(&pUriResourceTracker)) >= 0) { m_pUriResourceTracker = pUriResourceTracker; } @@ -117,14 +117,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~UriResourceTracker() diff --git a/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs index 09ec2ae..de80d2f 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs @@ -2,8 +2,6 @@ using System; using System.Collections; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using _003CCppImplementationDetails_003E; - namespace Microsoft.Zune.Service { public class VideoOfferCollection : OfferCollection, IDisposable @@ -368,14 +366,13 @@ namespace Microsoft.Zune.Service } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~VideoOfferCollection() diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs index 9f4a1cf..89499e8 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs @@ -94,7 +94,6 @@ namespace Microsoft.Zune.Service try { m_spWinLiveAvailableInformation = spWinLiveAvailableInformation; - base._002Ector(); m_spWinLiveAvailableInformation.op_Assign(pWinLiveAvailableInformation); } catch @@ -121,16 +120,11 @@ namespace Microsoft.Zune.Service ((IDisposable)m_spWinLiveAvailableInformation).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs index 0eefb58..bad5c85 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs @@ -202,7 +202,6 @@ namespace Microsoft.Zune.Service try { m_spWinLiveInformation = spWinLiveInformation; - base._002Ector(); m_spWinLiveInformation.op_Assign(pWinLiveInformation); } catch @@ -229,16 +228,11 @@ namespace Microsoft.Zune.Service ((IDisposable)m_spWinLiveInformation).Dispose(); } } - else - { - Finalize(); - } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs index 7b2b840..cb13f62 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs @@ -15,7 +15,6 @@ namespace Microsoft.Zune.Service try { m_spWinLiveSignup = spWinLiveSignup; - base._002Ector(); } catch { @@ -379,16 +378,11 @@ namespace Microsoft.Zune.Service ((IDisposable)m_spWinLiveSignup).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs index 3aa7991..68df6b3 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs @@ -1,6 +1,5 @@ using System; using System.Runtime.CompilerServices; -using _003CCppImplementationDetails_003E; using Microsoft.Iris; namespace Microsoft.Zune.Subscription diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs index 8c29991..6f209b0 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs @@ -260,7 +260,7 @@ namespace Microsoft.Zune.Subscription { long num4 = *(long*)m_pSubscriptionManager + 32; ISubscriptionManager* pSubscriptionManager = m_pSubscriptionManager; - _003F val = ptr3; + var val = ptr3; IMSMediaSchemaPropertySet* intPtr6 = ptr; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num4))((nint)pSubscriptionManager, lastSignedInUserId, (ushort*)(nint)val, eSubscriptionMediaType, subscriptionSource, intPtr6, &num2); } @@ -858,14 +858,13 @@ namespace Microsoft.Zune.Subscription } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~SubscriptionManager() diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs b/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs index 6552852..64f5a88 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs @@ -32,7 +32,6 @@ namespace Microsoft.Zune.Subscription m_feedUrl = feedUrl; m_owner = owner; m_typeCookie = typeCookie; - base._002Ector(); try { m_items = new List(); @@ -242,16 +241,11 @@ namespace Microsoft.Zune.Subscription base.Dispose(); } } - else - { - Finalize(); - } } public new void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs b/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs index 72d690e..e088fc9 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs @@ -1,7 +1,6 @@ using System.Collections.Specialized; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using _003CCppImplementationDetails_003E; using MicrosoftZuneLibrary; namespace Microsoft.Zune.Util diff --git a/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs b/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs index 6167e66..a0fbde6 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs @@ -120,14 +120,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~ContentRefreshTask() diff --git a/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs b/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs index ba4c071..50139c2 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs @@ -137,14 +137,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~DRMCanDoQuery() diff --git a/ZuneDBApi/Microsoft/Zune/Util/DownloadEventArguments.cs b/ZuneDBApi/Microsoft/Zune/Util/DownloadEventArguments.cs index 830e243..fcd7708 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/DownloadEventArguments.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/DownloadEventArguments.cs @@ -19,7 +19,6 @@ namespace Microsoft.Zune.Util m_percent = percent; m_state = state; m_hrError = hrError; - base._002Ector(); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs b/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs index 8a18db2..a5252f6 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs @@ -63,7 +63,7 @@ namespace Microsoft.Zune.Util //IL_0037: Expected I, but got I8 bool result = false; IDownloadManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_399f851b_a600_4e88_90c3_03b8f2770076, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IDownloadManager, (void**)(&ptr)) >= 0) { IDownloadManager* intPtr = ptr; result = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr + 144)))((nint)intPtr) != 0; @@ -185,7 +185,7 @@ namespace Microsoft.Zune.Util fixed (char* taskIdPtr = taskId.ToCharArray()) { ushort* ptr3 = (ushort*)taskIdPtr; - int singleton = Module.GetSingleton((_GUID)Module._GUID_399f851b_a600_4e88_90c3_03b8f2770076, (void**)(&ptr)); + int singleton = Module.GetSingleton(Module.GUID_IDownloadManager, (void**)(&ptr)); if (singleton >= 0) { long num = *(long*)ptr + 72; @@ -286,7 +286,7 @@ namespace Microsoft.Zune.Util //IL_00a0: Expected I, but got I8 bool flag = false; IDownloadManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_399f851b_a600_4e88_90c3_03b8f2770076, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IDownloadManager, (void**)(&ptr)) >= 0) { IDownloadManager* intPtr = ptr; int num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr + 88)))((nint)intPtr); @@ -410,7 +410,7 @@ namespace Microsoft.Zune.Util *(long*)(&cComPtrNtv_003CIDownloadManager_003E) = 0L; try { - int singleton = Module.GetSingleton((_GUID)Module._GUID_399f851b_a600_4e88_90c3_03b8f2770076, (void**)(&cComPtrNtv_003CIDownloadManager_003E)); + int singleton = Module.GetSingleton(Module.GUID_IDownloadManager, (void**)(&cComPtrNtv_003CIDownloadManager_003E)); int num = 0; if (singleton >= 0) { @@ -606,14 +606,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~DownloadManager() diff --git a/ZuneDBApi/Microsoft/Zune/Util/DownloadTask.cs b/ZuneDBApi/Microsoft/Zune/Util/DownloadTask.cs index 79c938c..57fd55d 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/DownloadTask.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/DownloadTask.cs @@ -188,14 +188,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~DownloadTask() diff --git a/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs b/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs index cfc8eed..fc12cea 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs @@ -139,9 +139,7 @@ namespace Microsoft.Zune.Util //IL_0008: Expected I4, but got I8 //IL_0023: Expected I, but got I8 //IL_0033: Expected I, but got I8 - PROPVARIANT cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + PROPVARIANT cComPropVariant = new(); HRESULT result; try { diff --git a/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs b/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs index 2128d5e..6247f85 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs @@ -84,7 +84,6 @@ namespace Microsoft.Zune.Util try { m_spAsyncCallback = spAsyncCallback; - base._002Ector(); } catch { @@ -152,16 +151,11 @@ namespace Microsoft.Zune.Util ((IDisposable)m_spAsyncCallback).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs b/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs index b4585fd..7fe9baf 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs @@ -65,7 +65,6 @@ namespace Microsoft.Zune.Util try { m_spCategory = spCategory; - base._002Ector(); m_spCategory.op_Assign(pCategory); } catch @@ -92,16 +91,11 @@ namespace Microsoft.Zune.Util ((IDisposable)m_spCategory).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs b/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs index d7314e3..38f140e 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs @@ -90,7 +90,6 @@ namespace Microsoft.Zune.Util try { m_spEntry = spEntry; - base._002Ector(); m_spEntry.op_Assign(pEntry); } catch @@ -117,16 +116,11 @@ namespace Microsoft.Zune.Util ((IDisposable)m_spEntry).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs b/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs index 95219cb..fd28c3f 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs @@ -32,6 +32,7 @@ namespace Microsoft.Zune.Util if (m_spJumpList.p == null) { Module._ZuneShipAssert(1002u, 214u); + disallowedDestinationList = null; return -2147418113; } disallowedDestinationList = null; @@ -153,7 +154,6 @@ namespace Microsoft.Zune.Util try { m_spJumpList = spJumpList; - base._002Ector(); m_spJumpList.op_Assign(pJumpList); } catch @@ -180,16 +180,11 @@ namespace Microsoft.Zune.Util ((IDisposable)m_spJumpList).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs b/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs index 6bed1c4..2188232 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs @@ -36,9 +36,9 @@ namespace Microsoft.Zune.Util throw new ApplicationException(Module.GetErrorDescription(singleton)); } IMetadataManager* intPtr = ptr; - __s_GUID gUID_b396c324_6ab3_4e8e_a5cd_aafb3e01bedc = Module._GUID_b396c324_6ab3_4e8e_a5cd_aafb3e01bedc; + _GUID guid_IPinProvider = Module.GUID_IPinProvider; IPinProvider* pPinProvider; - int num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_b396c324_6ab3_4e8e_a5cd_aafb3e01bedc, (void**)(&pPinProvider)); + int num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)guid_IPinProvider, (void**)(&pPinProvider)); if (num < 0) { throw new ApplicationException(Module.GetErrorDescription(num)); @@ -163,14 +163,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~PinManager() diff --git a/ZuneDBApi/Microsoft/Zune/Util/Point.cs b/ZuneDBApi/Microsoft/Zune/Util/Point.cs index 1950d10..c10b829 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/Point.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/Point.cs @@ -34,14 +34,12 @@ namespace Microsoft.Zune.Util { m_x = x; m_y = y; - base._002Ector(); } public Point() { m_x = 0; m_y = 0; - base._002Ector(); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/RadioPlaylist.cs b/ZuneDBApi/Microsoft/Zune/Util/RadioPlaylist.cs index 2aae02b..95e27bb 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/RadioPlaylist.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/RadioPlaylist.cs @@ -11,7 +11,6 @@ namespace Microsoft.Zune.Util { //IL_001e: Expected I, but got I8 m_pRadioPlaylist = pRadioPlaylist; - base._002Ector(); IRadioPlaylist* pRadioPlaylist2 = m_pRadioPlaylist; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pRadioPlaylist2 + 8)))((nint)pRadioPlaylist2); } @@ -61,14 +60,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~RadioPlaylist() diff --git a/ZuneDBApi/Microsoft/Zune/Util/RadioStationManager.cs b/ZuneDBApi/Microsoft/Zune/Util/RadioStationManager.cs index 6cec104..ab7aa37 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/RadioStationManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/RadioStationManager.cs @@ -69,7 +69,7 @@ namespace Microsoft.Zune.Util fixed (char* uriPtr = uri.ToCharArray()) { ushort* ptr3 = (ushort*)uriPtr; - int singleton = Module.GetSingleton((_GUID)Module._GUID_e1c20902_172d_4c40_bc82_5164f64ab783, (void**)(&ptr)); + int singleton = Module.GetSingleton(Module.GUID_IRadioStationManager, (void**)(&ptr)); if (singleton >= 0) { long num = *(long*)ptr + 24; @@ -123,7 +123,7 @@ namespace Microsoft.Zune.Util { ushort* ptr6 = (ushort*)imageUrlPtr; IRadioStationManager* ptr3; - if (Module.GetSingleton((_GUID)Module._GUID_e1c20902_172d_4c40_bc82_5164f64ab783, (void**)(&ptr3)) >= 0) + if (Module.GetSingleton(Module.GUID_IRadioStationManager, (void**)(&ptr3)) >= 0) { long num = *(long*)ptr3 + 32; IRadioStationManager* intPtr = ptr3; @@ -165,7 +165,7 @@ namespace Microsoft.Zune.Util { ushort* ptr4 = (ushort*)titlePtr; IRadioStationManager* ptr3; - if (Module.GetSingleton((_GUID)Module._GUID_e1c20902_172d_4c40_bc82_5164f64ab783, (void**)(&ptr3)) >= 0) + if (Module.GetSingleton(Module.GUID_IRadioStationManager, (void**)(&ptr3)) >= 0) { long num = *(long*)ptr3 + 40; IRadioStationManager* intPtr = ptr3; @@ -201,14 +201,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~RadioStationManager() diff --git a/ZuneDBApi/Microsoft/Zune/Util/Size.cs b/ZuneDBApi/Microsoft/Zune/Util/Size.cs index 45b8151..546fe3c 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/Size.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/Size.cs @@ -34,14 +34,12 @@ namespace Microsoft.Zune.Util { m_width = width; m_height = height; - base._002Ector(); } public Size() { m_width = 0; m_height = 0; - base._002Ector(); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/TaskbarPlayer.cs b/ZuneDBApi/Microsoft/Zune/Util/TaskbarPlayer.cs index 96b2a43..42d7a65 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/TaskbarPlayer.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/TaskbarPlayer.cs @@ -535,7 +535,7 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } } @@ -543,7 +543,6 @@ namespace Microsoft.Zune.Util public new void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~TaskbarPlayer() diff --git a/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs b/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs index afe429c..ee66118 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs @@ -14,6 +14,7 @@ namespace Microsoft.Zune.Util if (m_spThumbBar.p == null) { Module._ZuneShipAssert(1002u, 193u); + button = null; return -2147418113; } CComPtrNtv_003CIThumbBarButton_003E cComPtrNtv_003CIThumbBarButton_003E; @@ -52,7 +53,6 @@ namespace Microsoft.Zune.Util try { m_spThumbBar = spThumbBar; - base._002Ector(); m_spThumbBar.op_Assign(thumbBar); } catch @@ -79,16 +79,11 @@ namespace Microsoft.Zune.Util ((IDisposable)m_spThumbBar).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs b/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs index 8472f2b..8a5c144 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs @@ -142,7 +142,6 @@ namespace Microsoft.Zune.Util try { m_spButton = spButton; - base._002Ector(); m_spButton.op_Assign(pButton); } catch @@ -169,16 +168,11 @@ namespace Microsoft.Zune.Util ((IDisposable)m_spButton).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/UpdateCheckEventArguments.cs b/ZuneDBApi/Microsoft/Zune/Util/UpdateCheckEventArguments.cs index 9df80ee..1aa4e8f 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/UpdateCheckEventArguments.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/UpdateCheckEventArguments.cs @@ -35,7 +35,6 @@ namespace Microsoft.Zune.Util m_fUpdateFound = updateFound; m_fCriticalUpdateFound = criticalUpdateFound; m_hr = hr; - base._002Ector(); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs b/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs index a212f05..d8fa6aa 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs @@ -171,7 +171,6 @@ namespace Microsoft.Zune.Util try { m_spUpdateManager = spUpdateManager; - base._002Ector(); } catch { @@ -199,16 +198,11 @@ namespace Microsoft.Zune.Util ((IDisposable)m_spUpdateManager).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs b/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs index eab92d3..36ca784 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs @@ -2,8 +2,6 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; -using _003CCppImplementationDetails_003E; - namespace Microsoft.Zune.Util { public class ZuneWebHost diff --git a/ZuneDBApi/MicrosoftZuneLibrary/AlbumMetadata.cs b/ZuneDBApi/MicrosoftZuneLibrary/AlbumMetadata.cs index 7393c1b..15891cc 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/AlbumMetadata.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/AlbumMetadata.cs @@ -616,14 +616,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~AlbumMetadata() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/AsyncGetThumbnailState.cs b/ZuneDBApi/MicrosoftZuneLibrary/AsyncGetThumbnailState.cs index 0e6feea..73f1a00 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/AsyncGetThumbnailState.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/AsyncGetThumbnailState.cs @@ -38,14 +38,13 @@ namespace MicrosoftZuneLibrary { if (!P_0) { - Finalize(); + //Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalManaged_DONOTUSE.cs b/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalManaged_DONOTUSE.cs index 72b43b0..de9ea83 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalManaged_DONOTUSE.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/CallbackOnUIThreadBimodalManaged_DONOTUSE.cs @@ -67,14 +67,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CallbackOnUIThreadBimodalManaged_DONOTUSE() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/DeferredSetResultArgs.cs b/ZuneDBApi/MicrosoftZuneLibrary/DeferredSetResultArgs.cs index f919209..2f48012 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/DeferredSetResultArgs.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/DeferredSetResultArgs.cs @@ -15,7 +15,6 @@ namespace MicrosoftZuneLibrary RequestGeneration = requestGeneration; QueryList = queryList; RetainedList = retainedList; - base._002Ector(); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/Device.cs b/ZuneDBApi/MicrosoftZuneLibrary/Device.cs index a37fcdf..ca14666 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/Device.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/Device.cs @@ -4,7 +4,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Security; using System.Threading; -using _003CCppImplementationDetails_003E; using DataStructs; namespace MicrosoftZuneLibrary @@ -233,7 +232,7 @@ namespace MicrosoftZuneLibrary FILETIME fILETIME; if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 88)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyLastConnectTime, &fILETIME) >= 0) { - long fileTime = (uint)Unsafe.As(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); + long fileTime = (uint)(&fILETIME + 4) * 4294967296L + (uint)(*(int*)(&fILETIME)); try { result = DateTime.FromFileTime(fileTime); @@ -262,7 +261,7 @@ namespace MicrosoftZuneLibrary FILETIME fILETIME; if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 88)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyLastSyncTime, &fILETIME) >= 0) { - long fileTime = (uint)Unsafe.As(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); + long fileTime = (uint)(&fILETIME + 4) * 4294967296L + (uint)(*(int*)(&fILETIME)); try { result = DateTime.FromFileTime(fileTime); @@ -1169,7 +1168,8 @@ namespace MicrosoftZuneLibrary if (num < 0) { IEndpointHost* p3 = m_spEndpointHost.p; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p3 + 176)))((nint)p3, EEndpointHostProperty.eEndpointHostPropertyUserGuid, (_GUID*)Unsafe.AsPointer(ref Module.GUID_NULL)); + _GUID GUID_NULL = Module.GUID_NULL; + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p3 + 176)))((nint)p3, EEndpointHostProperty.eEndpointHostPropertyUserGuid, (_GUID*)Unsafe.AsPointer(ref GUID_NULL)); } } catch @@ -2482,7 +2482,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr = null; + array = null; throw; } } @@ -2538,7 +2538,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr = null; + array = null; throw; } } @@ -3089,7 +3089,6 @@ namespace MicrosoftZuneLibrary try { m_spDeviceMediator = spDeviceMediator; - base._002Ector(); if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); @@ -3804,16 +3803,11 @@ namespace MicrosoftZuneLibrary } } } - else - { - Finalize(); - } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs b/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs index b8a8b52..0f3be76 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs @@ -117,7 +117,6 @@ namespace MicrosoftZuneLibrary try { m_spEndpointHostManagerMediator = spEndpointHostManagerMediator; - base._002Ector(); if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); @@ -719,16 +718,11 @@ namespace MicrosoftZuneLibrary } } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs index 9a40ec8..db23908 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs @@ -65,7 +65,6 @@ namespace MicrosoftZuneLibrary try { m_spFirmwareMediator = spFirmwareMediator; - base._002Ector(); m_Canceled = false; m_FirmwareLock = new object(); } @@ -493,16 +492,11 @@ namespace MicrosoftZuneLibrary } } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs index 63da9db..cab3e7f 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs @@ -70,7 +70,6 @@ namespace MicrosoftZuneLibrary try { m_spRestorePoint = spRestorePoint; - base._002Ector(); if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_q(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 64, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), pRestorePoint); @@ -115,16 +114,11 @@ namespace MicrosoftZuneLibrary ((IDisposable)m_spRestorePoint).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs index a2fe608..98f8900 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs @@ -59,7 +59,6 @@ namespace MicrosoftZuneLibrary try { m_spRestorePointCollection = spRestorePointCollection; - base._002Ector(); if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_q(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 68, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), pRestorePointCollection); @@ -104,16 +103,11 @@ namespace MicrosoftZuneLibrary ((IDisposable)m_spRestorePointCollection).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs index e776099..a5a0029 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs @@ -160,7 +160,6 @@ namespace MicrosoftZuneLibrary try { m_spFirmwareRestorer = spFirmwareRestorer; - base._002Ector(); try { if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs index 1f99210..155ce5b 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs @@ -65,7 +65,6 @@ namespace MicrosoftZuneLibrary try { m_spErrorInfo = spErrorInfo; - base._002Ector(); m_spErrorInfo.op_Assign(pErrorInfo); } catch @@ -94,16 +93,11 @@ namespace MicrosoftZuneLibrary ((IDisposable)m_spErrorInfo).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs index 925b77d..647d357 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs @@ -154,7 +154,6 @@ namespace MicrosoftZuneLibrary try { m_spFirmwareMetadata = spFirmwareMetadata; - base._002Ector(); m_spFirmwareMetadata.op_Assign(pFirmwareMetadata); m_fSelected = false; } @@ -184,16 +183,11 @@ namespace MicrosoftZuneLibrary ((IDisposable)m_spFirmwareMetadata).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs index 436ef23..d4e92f5 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs @@ -290,7 +290,6 @@ namespace MicrosoftZuneLibrary try { m_spFirmwareUpdater = spFirmwareUpdater; - base._002Ector(); try { if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs b/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs index d488d2a..2b93c99 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs @@ -254,16 +254,11 @@ namespace MicrosoftZuneLibrary base.Dispose(); } } - else - { - Finalize(); - } } public new void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs b/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs index 2ab4a81..f01df34 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs @@ -108,7 +108,6 @@ namespace MicrosoftZuneLibrary try { m_spGasGaugeMediator = spGasGaugeMediator; - base._002Ector(); if (pGasGauge != null) { m_spGasGauge.op_Assign(pGasGauge); @@ -214,16 +213,11 @@ namespace MicrosoftZuneLibrary } } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs b/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs index e82b846..9ed4fa4 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs @@ -439,7 +439,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr = null; + m_pDeviceList = null; throw; } } @@ -512,7 +512,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr7 = null; + ptr4 = null; throw; } } @@ -532,7 +532,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr8 = null; + ptr2 = null; throw; } } @@ -554,7 +554,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr9 = null; + ptr3 = null; throw; } } @@ -598,7 +598,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr10 = null; + ptr3 = null; throw; } } @@ -614,7 +614,7 @@ namespace MicrosoftZuneLibrary { if (*(ushort*)(&tagVARIANT) == 8) { - strSerialNumber = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref tagVARIANT, 8))); + strSerialNumber = new string((char*)(&tagVARIANT + 8)); } Module.VariantClear(ptr5); if (0L != (nint)ptr3) @@ -690,7 +690,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr3 = null; + authorizationStatus = (AuthorizationStatus)0; throw; } } @@ -761,14 +761,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~HMESettings() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs b/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs index 7d65465..65e385f 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs @@ -63,7 +63,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr4 = null; + m_AdviseCookie = 0; throw; } } @@ -100,14 +100,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~InteropNotifications() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ManagedLock.cs b/ZuneDBApi/MicrosoftZuneLibrary/ManagedLock.cs index 7a84671..7349ec7 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ManagedLock.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ManagedLock.cs @@ -20,7 +20,6 @@ namespace MicrosoftZuneLibrary public ManagedLock(object pObject) { m_pObject = pObject; - base._002Ector(); Monitor.Enter(m_pObject); m_locked = true; } @@ -61,16 +60,11 @@ namespace MicrosoftZuneLibrary { _007EManagedLock(); } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs b/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs index 209c83b..365dc31 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs @@ -273,7 +273,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr4 = null; + m_AdviseCookie = null; throw; } } @@ -310,14 +310,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~MetadataMgrNotifications() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs b/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs index 3ed8dce..a7db211 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs @@ -22,7 +22,6 @@ namespace MicrosoftZuneLibrary try { m_spEndpointHost = spEndpointHost; - base._002Ector(); if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); @@ -282,8 +281,8 @@ namespace MicrosoftZuneLibrary if (num >= 0) { long num2 = *(long*)(&cComPtrNtv_003CIMetadataManager_003E); - __s_GUID gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff = Module.GUID_IDeviceSyncRulesProvider; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIMetadataManager_003E)) + 24)))((nint)num2, (_GUID)gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff, (void**)(&cComPtrNtv_003CIDeviceSyncRulesProvider_003E)); + _GUID guid_GUID_IDeviceSyncRulesProvider = Module.GUID_IDeviceSyncRulesProvider; + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIMetadataManager_003E)) + 24)))((nint)num2, (_GUID)guid_GUID_IDeviceSyncRulesProvider, (void**)(&cComPtrNtv_003CIDeviceSyncRulesProvider_003E)); if (num >= 0) { ESyncMode eSyncMode = ESyncMode.eSyncModeInvalid; @@ -512,16 +511,11 @@ namespace MicrosoftZuneLibrary ((IDisposable)m_spEndpointHost).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs b/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs index 69ff663..6b6002d 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs @@ -72,7 +72,6 @@ namespace MicrosoftZuneLibrary try { m_spSyncRulesViewMediator = spSyncRulesViewMediator; - base._002Ector(); if (pSyncRulesView != null) { IGasGauge* ptr = null; @@ -214,16 +213,11 @@ namespace MicrosoftZuneLibrary } } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/TrackMetadata.cs b/ZuneDBApi/MicrosoftZuneLibrary/TrackMetadata.cs index ec0aaf3..1fc60c1 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/TrackMetadata.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/TrackMetadata.cs @@ -498,14 +498,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~TrackMetadata() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs b/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs index 51dfe53..a67aa42 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs @@ -240,16 +240,11 @@ namespace MicrosoftZuneLibrary ((IDisposable)m_spUpdatePackageCollection).Dispose(); } } - else - { - Finalize(); - } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs b/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs index 1e2324e..8e7786d 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs @@ -108,7 +108,6 @@ namespace MicrosoftZuneLibrary try { m_spUpdateStep = spUpdateStep; - base._002Ector(); m_spUpdateStep.op_Assign(pUpdateStep); } catch @@ -156,16 +155,11 @@ namespace MicrosoftZuneLibrary ((IDisposable)m_spUpdateStep).Dispose(); } } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/VirtualDatabaseList.cs b/ZuneDBApi/MicrosoftZuneLibrary/VirtualDatabaseList.cs index fbeba48..53c16b6 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/VirtualDatabaseList.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/VirtualDatabaseList.cs @@ -257,16 +257,11 @@ namespace MicrosoftZuneLibrary base.Dispose(); } } - else - { - Finalize(); - } } public new void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/WlanAuthCipherPair.cs b/ZuneDBApi/MicrosoftZuneLibrary/WlanAuthCipherPair.cs index bd3375e..a064fe1 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/WlanAuthCipherPair.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/WlanAuthCipherPair.cs @@ -53,14 +53,13 @@ namespace MicrosoftZuneLibrary { if (!P_0) { - Finalize(); + //Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/WlanProfile.cs b/ZuneDBApi/MicrosoftZuneLibrary/WlanProfile.cs index 54e6830..cf9ce45 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/WlanProfile.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/WlanProfile.cs @@ -175,14 +175,13 @@ namespace MicrosoftZuneLibrary { if (!P_0) { - Finalize(); + //Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs index f251eba..e2ff19f 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs @@ -1292,16 +1292,11 @@ namespace MicrosoftZuneLibrary { _007EZuneLibrary(); } - else - { - Finalize(); - } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs index 02cf06e..19eec3a 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs @@ -810,7 +810,7 @@ namespace MicrosoftZuneLibrary } finally { - //base.Finalize(); + ////base.Finalize(); } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDeviceList.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDeviceList.cs index 71692a4..ce618b7 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDeviceList.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDeviceList.cs @@ -58,7 +58,6 @@ namespace MicrosoftZuneLibrary m_fAdvised = false; m_disposed = false; m_RefCount = 0; - base._002Ector(); IWMPCDDeviceList* pDeviceList2 = m_pDeviceList; if (pDeviceList2 == null) { @@ -99,7 +98,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr4 = null; + m_dwAdviseCookie = 0; throw; } } @@ -197,14 +196,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~ZuneLibraryCDDeviceList() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs index 32398cc..42058e8 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs @@ -142,7 +142,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr4 = null; + m_dwAdviseCookie = 0; throw; } } @@ -484,14 +484,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~ZuneLibraryCDRecorder() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZunePlaylist.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZunePlaylist.cs index cb6967a..9dbc805 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZunePlaylist.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZunePlaylist.cs @@ -44,14 +44,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~ZunePlaylist() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryItem.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryItem.cs index 979bd34..d96233d 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryItem.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryItem.cs @@ -50,16 +50,11 @@ namespace MicrosoftZuneLibrary { _007EZuneQueryItem(); } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs index fd79df5..fb5b466 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs @@ -3,8 +3,6 @@ using System.Collections; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; -using _003CCppImplementationDetails_003E; - namespace MicrosoftZuneLibrary { public class ZuneQueryList : IDisposable diff --git a/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestErrorArgs.cs b/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestErrorArgs.cs index 9b634a2..deb0f7a 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestErrorArgs.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestErrorArgs.cs @@ -11,7 +11,6 @@ namespace MicrosoftZunePlayback public BandwidthTestErrorArgs(int errorCode) { _errorCode = errorCode; - base._002Ector(); } } } diff --git a/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs b/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs index 59cf8d8..0988e60 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs @@ -60,7 +60,6 @@ namespace MicrosoftZunePlayback m_spMBRBTestSink = spMBRBTestSink; _ignore = true; _async = true; - base._002Ector(); } catch { @@ -255,15 +254,14 @@ namespace MicrosoftZunePlayback } finally { - base.Finalize(); + //base.Finalize(); } } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~BandwidthTestInterop() diff --git a/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs b/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs index 9c457dc..d0daa77 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs @@ -65,7 +65,6 @@ namespace MicrosoftZunePlayback _testLength = testLength; _testPosition = testPosition; _currentState = currentState; - base._002Ector(); int testPosition2 = _testPosition; if (testPosition2 != 0) { diff --git a/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs b/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs index cc93945..06fda59 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs @@ -1289,16 +1289,11 @@ namespace MicrosoftZunePlayback { _007EPlayerInterop(); } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Module.cs b/ZuneDBApi/Module.cs index 8f4051c..1c66549 100644 --- a/ZuneDBApi/Module.cs +++ b/ZuneDBApi/Module.cs @@ -26,7 +26,6 @@ namespace ZuneDBApi private static bool s_bIsLonghornOrBetter; private static bool s_bIsLonghornOrBetterInitialized; - internal static readonly string WINDOWCLASS_MsnMsgrUIManager = "MsnMsgrUIManager"; internal static readonly _GUID GUID_NULL = _GUID.Empty; @@ -44,6 +43,12 @@ namespace ZuneDBApi internal static readonly _GUID GUID_ISubscriptionManager = new("9dc7c984-41d5-4130-a5ac-46d0825cd29d"); internal static readonly _GUID GUID_IUsageDataManager = new("2f36e709-c431-4836-ab2b-ab57aef0cf1a"); internal static readonly _GUID GUID_IFamilySettingsProvider = new("04f38ab5-391b-4b5a-a2c1-d4b74aeb4be9"); + internal static readonly _GUID GUID_IUriResourceTracker = new("ddbb9148-dea1-47dd-a0c1-1fdcf002c1e2"); + internal static readonly _GUID GUID_IRadioStationManager = new("e1c20902-172d-4c40-bc82-5164f64ab783"); + internal static readonly _GUID GUID_IPinProvider = new("b396c324-6ab3-4e8e-a5cd-aafb3e01bedc"); + internal static readonly _GUID GUID_IZuneNetMessaging = new("bf368f0d-4743-439c-9142-e487c9534104"); + internal static readonly _GUID GUID_IDownloadManager = new("399f851b-a600-4e88-90c3-03b8f2770076"); + internal static readonly _GUID GUID_IPassportIdentity = new("655b468c-1224-467d-b720-3bac7f99b6ba"); internal static void _ZuneShipAssert(uint v1, uint v2) {