From 24e1ad6204befb1ea885bb5f09d775c88f904c96 Mon Sep 17 00:00:00 2001 From: Yoshi Askharoun Date: Tue, 23 Nov 2021 01:09:52 -0600 Subject: [PATCH] Added generic CComPtrMgd class --- ZuneDBApi/CComPtrMgd-DeviceMediator-.cs | 82 ------------ ...CComPtrMgd-EndpointHostManagerMediator-.cs | 83 ------------ ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IAccountManagement-.cs | 83 ------------ ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs | 71 ---------- ZuneDBApi/CComPtrMgd-IEndpointHost-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs | 82 ------------ .../CComPtrMgd-IFirmwareRestorePoint-.cs | 82 ------------ ...PtrMgd-IFirmwareRestorePointCollection-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs | 82 ------------ ...CComPtrMgd-IFirmwareUpdateCallbackData-.cs | 82 ------------ .../CComPtrMgd-IFirmwareUpdateCollection-.cs | 82 ------------ .../CComPtrMgd-IFirmwareUpdateErrorInfo-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs | 112 ---------------- ZuneDBApi/CComPtrMgd-IGasGauge-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IJumpList-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs | 77 ----------- ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs | 77 ----------- ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs | 94 ------------- ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IServiceError-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-ISyncEngine-.cs | 83 ------------ ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IThumbBar-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs | 77 ----------- ZuneDBApi/CComPtrMgd-IUpdateManager-.cs | 82 ------------ ...ComPtrMgd-IWinLiveAvailableInformation-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs | 82 ------------ ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs | 83 ------------ ZuneDBApi/CComPtrMgd-IWlanProvider-.cs | 83 ------------ .../CComPtrMgd-IZuneMBRBandwidthTest-.cs | 96 -------------- ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs | 89 ------------- ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs | 77 ----------- .../CComPtrMgd-SyncRulesViewMediator-.cs | 82 ------------ ZuneDBApi/CComPtrMgd.cs | 124 ++++++++++++++++++ .../Zune/QuickMix/QuickMixSession.cs | 4 +- .../Zune/Service/AccountManagement.cs | 4 +- .../Zune/Service/PassportIdentity.cs | 14 +- .../Microsoft/Zune/Service/ServiceError.cs | 4 +- .../Service/WinLiveAvailableInformation.cs | 6 +- .../Zune/Service/WinLiveInformation.cs | 12 +- .../Microsoft/Zune/Service/WinLiveSignup.cs | 4 +- .../Microsoft/Zune/Util/FeaturesChangedApi.cs | 4 +- .../Microsoft/Zune/Util/JumpListCategory.cs | 4 +- .../Microsoft/Zune/Util/JumpListEntry.cs | 4 +- .../Microsoft/Zune/Util/JumpListSession.cs | 4 +- ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs | 4 +- .../Microsoft/Zune/Util/ThumbBarButton.cs | 4 +- .../Microsoft/Zune/Util/UpdateManager.cs | 8 +- ZuneDBApi/MicrosoftZuneLibrary/Device.cs | 76 +++++------ ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs | 12 +- .../FirmwareOperationBase.cs | 10 +- .../FirmwareRestorePoint.cs | 4 +- .../FirmwareRestorePointCollection.cs | 6 +- .../MicrosoftZuneLibrary/FirmwareRestorer.cs | 8 +- .../FirmwareUpdateErrorInfo.cs | 4 +- .../FirmwareUpdatePackage.cs | 6 +- .../MicrosoftZuneLibrary/FirmwareUpdater.cs | 14 +- ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs | 8 +- ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs | 8 +- .../MicrosoftZuneLibrary/SyncRulesView.cs | 8 +- .../UpdatePackageCollection.cs | 4 +- ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs | 4 +- ZuneDBApi/MicrosoftZuneLibrary/WorkerQueue.cs | 1 + .../BandwidthTestInterop.cs | 10 +- 66 files changed, 256 insertions(+), 3038 deletions(-) delete mode 100644 ZuneDBApi/CComPtrMgd-DeviceMediator-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IAccountManagement-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IEndpointHost-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IGasGauge-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IJumpList-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IServiceError-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-ISyncEngine-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IThumbBar-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IUpdateManager-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IWlanProvider-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs delete mode 100644 ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs delete mode 100644 ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs delete mode 100644 ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs create mode 100644 ZuneDBApi/CComPtrMgd.cs diff --git a/ZuneDBApi/CComPtrMgd-DeviceMediator-.cs b/ZuneDBApi/CComPtrMgd-DeviceMediator-.cs deleted file mode 100644 index fdf93dc..0000000 --- a/ZuneDBApi/CComPtrMgd-DeviceMediator-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CDeviceMediator_003E : IDisposable -{ - public unsafe DeviceMediator* p = null; - - private void _007ECComPtrMgd_003CDeviceMediator_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CDeviceMediator_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - DeviceMediator* ptr = p; - DeviceMediator* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator DeviceMediator*(CComPtrMgd_003CDeviceMediator_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe DeviceMediator* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe DeviceMediator* op_Assign(DeviceMediator* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CDeviceMediator_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs b/ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs deleted file mode 100644 index d379b08..0000000 --- a/ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CEndpointHostManagerMediator_003E : IDisposable -{ - public unsafe EndpointHostManagerMediator* p = null; - - private void _007ECComPtrMgd_003CEndpointHostManagerMediator_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CEndpointHostManagerMediator_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - EndpointHostManagerMediator* ptr = p; - EndpointHostManagerMediator* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CEndpointHostManagerMediator_003E() - { - Dispose(false); - } - - [SpecialName] - public unsafe EndpointHostManagerMediator* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe EndpointHostManagerMediator* op_Assign(EndpointHostManagerMediator* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - [return: MarshalAs(UnmanagedType.U1)] - public static unsafe bool operator !(CComPtrMgd_003CEndpointHostManagerMediator_003E obj) - { - return (long)(nint)obj.p == 0; - } -} diff --git a/ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs b/ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs deleted file mode 100644 index 19f1a3f..0000000 --- a/ZuneDBApi/CComPtrMgd-GasGaugeMediator-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CGasGaugeMediator_003E : IDisposable -{ - public unsafe GasGaugeMediator* p = null; - - private void _007ECComPtrMgd_003CGasGaugeMediator_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CGasGaugeMediator_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - GasGaugeMediator* ptr = p; - GasGaugeMediator* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CGasGaugeMediator_003E() - { - Dispose(false); - } - - public static unsafe implicit operator GasGaugeMediator*(CComPtrMgd_003CGasGaugeMediator_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe GasGaugeMediator* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe GasGaugeMediator* op_Assign(GasGaugeMediator* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IAccountManagement-.cs b/ZuneDBApi/CComPtrMgd-IAccountManagement-.cs deleted file mode 100644 index 8b1fa16..0000000 --- a/ZuneDBApi/CComPtrMgd-IAccountManagement-.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIAccountManagement_003E : IDisposable -{ - public unsafe IAccountManagement* p = null; - - private void _007ECComPtrMgd_003CIAccountManagement_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIAccountManagement_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IAccountManagement* ptr = p; - IAccountManagement* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - [SpecialName] - public unsafe IAccountManagement* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IAccountManagement* op_Assign(IAccountManagement* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - [return: MarshalAs(UnmanagedType.U1)] - public static unsafe bool operator !(CComPtrMgd_003CIAccountManagement_003E self) - { - return (long)(nint)self.p == 0; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIAccountManagement_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs b/ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs deleted file mode 100644 index 96f7980..0000000 --- a/ZuneDBApi/CComPtrMgd-IAsyncCallback-.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIAsyncCallback_003E : IDisposable -{ - public unsafe IAsyncCallback* p = null; - - private void _007ECComPtrMgd_003CIAsyncCallback_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIAsyncCallback_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IAsyncCallback* ptr = p; - IAsyncCallback* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - [SpecialName] - public unsafe IAsyncCallback* op_Assign(IAsyncCallback* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIAsyncCallback_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IEndpointHost-.cs b/ZuneDBApi/CComPtrMgd-IEndpointHost-.cs deleted file mode 100644 index a9aadbf..0000000 --- a/ZuneDBApi/CComPtrMgd-IEndpointHost-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIEndpointHost_003E : IDisposable -{ - public unsafe IEndpointHost* p = null; - - private void _007ECComPtrMgd_003CIEndpointHost_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIEndpointHost_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IEndpointHost* ptr = p; - IEndpointHost* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator IEndpointHost*(CComPtrMgd_003CIEndpointHost_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IEndpointHost* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IEndpointHost* op_Assign(IEndpointHost* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIEndpointHost_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs b/ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs deleted file mode 100644 index 1ff4e7b..0000000 --- a/ZuneDBApi/CComPtrMgd-IEndpointHostManager-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIEndpointHostManager_003E : IDisposable -{ - public unsafe IEndpointHostManager* p = null; - - private void _007ECComPtrMgd_003CIEndpointHostManager_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIEndpointHostManager_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IEndpointHostManager* ptr = p; - IEndpointHostManager* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIEndpointHostManager_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IEndpointHostManager*(CComPtrMgd_003CIEndpointHostManager_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IEndpointHostManager* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IEndpointHostManager* op_Assign(IEndpointHostManager* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs deleted file mode 100644 index 47c6427..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareMetadata-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareMetadata_003E : IDisposable -{ - public unsafe IFirmwareMetadata* p = null; - - private void _007ECComPtrMgd_003CIFirmwareMetadata_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareMetadata_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareMetadata* ptr = p; - IFirmwareMetadata* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareMetadata_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareMetadata*(CComPtrMgd_003CIFirmwareMetadata_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareMetadata* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareMetadata* op_Assign(IFirmwareMetadata* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs deleted file mode 100644 index 56dce8a..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePoint-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareRestorePoint_003E : IDisposable -{ - public unsafe IFirmwareRestorePoint* p = null; - - private void _007ECComPtrMgd_003CIFirmwareRestorePoint_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareRestorePoint_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareRestorePoint* ptr = p; - IFirmwareRestorePoint* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareRestorePoint_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareRestorePoint*(CComPtrMgd_003CIFirmwareRestorePoint_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareRestorePoint* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareRestorePoint* op_Assign(IFirmwareRestorePoint* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs deleted file mode 100644 index cbc42a2..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareRestorePointCollection-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareRestorePointCollection_003E : IDisposable -{ - public unsafe IFirmwareRestorePointCollection* p = null; - - private void _007ECComPtrMgd_003CIFirmwareRestorePointCollection_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareRestorePointCollection_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareRestorePointCollection* ptr = p; - IFirmwareRestorePointCollection* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareRestorePointCollection_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareRestorePointCollection*(CComPtrMgd_003CIFirmwareRestorePointCollection_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareRestorePointCollection* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareRestorePointCollection* op_Assign(IFirmwareRestorePointCollection* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs deleted file mode 100644 index 05c52b3..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareRestorer-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareRestorer_003E : IDisposable -{ - public unsafe IFirmwareRestorer* p = null; - - private void _007ECComPtrMgd_003CIFirmwareRestorer_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareRestorer_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareRestorer* ptr = p; - IFirmwareRestorer* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareRestorer_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareRestorer*(CComPtrMgd_003CIFirmwareRestorer_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareRestorer* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareRestorer* op_Assign(IFirmwareRestorer* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs deleted file mode 100644 index ec88bab..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCallbackData-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareUpdateCallbackData_003E : IDisposable -{ - public unsafe IFirmwareUpdateCallbackData* p = null; - - private void _007ECComPtrMgd_003CIFirmwareUpdateCallbackData_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareUpdateCallbackData_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareUpdateCallbackData* ptr = p; - IFirmwareUpdateCallbackData* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareUpdateCallbackData_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareUpdateCallbackData*(CComPtrMgd_003CIFirmwareUpdateCallbackData_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareUpdateCallbackData* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareUpdateCallbackData* op_Assign(IFirmwareUpdateCallbackData* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs deleted file mode 100644 index a976b40..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateCollection-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareUpdateCollection_003E : IDisposable -{ - public unsafe IFirmwareUpdateCollection* p = null; - - private void _007ECComPtrMgd_003CIFirmwareUpdateCollection_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareUpdateCollection_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareUpdateCollection* ptr = p; - IFirmwareUpdateCollection* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareUpdateCollection_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareUpdateCollection*(CComPtrMgd_003CIFirmwareUpdateCollection_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareUpdateCollection* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareUpdateCollection* op_Assign(IFirmwareUpdateCollection* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs deleted file mode 100644 index 08c4ff0..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdateErrorInfo-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E : IDisposable -{ - public unsafe IFirmwareUpdateErrorInfo* p = null; - - private void _007ECComPtrMgd_003CIFirmwareUpdateErrorInfo_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareUpdateErrorInfo* ptr = p; - IFirmwareUpdateErrorInfo* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareUpdateErrorInfo*(CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareUpdateErrorInfo* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareUpdateErrorInfo* op_Assign(IFirmwareUpdateErrorInfo* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs deleted file mode 100644 index 73d1263..0000000 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIFirmwareUpdater_003E : IDisposable -{ - public unsafe IFirmwareUpdater* p = null; - - private void _007ECComPtrMgd_003CIFirmwareUpdater_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIFirmwareUpdater_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IFirmwareUpdater* ptr = p; - IFirmwareUpdater* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIFirmwareUpdater_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IFirmwareUpdater*(CComPtrMgd_003CIFirmwareUpdater_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IFirmwareUpdater* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IFirmwareUpdater* op_Assign(IFirmwareUpdater* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - public unsafe int CopyTo(IFirmwareUpdater** ppT) - { - //IL_0020: Expected I8, but got I - //IL_0036: Expected I, but got I8 - if (ppT == null) - { - Module._ZuneShipAssert(1001u, 168u); - return -2147467261; - } - *(long*)ppT = (nint)p; - IFirmwareUpdater* ptr = p; - if (ptr != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 8)))((nint)ptr); - } - return 0; - } - - public unsafe int QueryInterfaceIFirmwareUpdater2(IFirmwareUpdater2** pp) - { - //IL_002e: Expected I, but got I8 - IFirmwareUpdater* ptr = p; - if (ptr == null) - { - Module._ZuneShipAssert(1001u, 186u); - return -2147467261; - } - return ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(ulong*)ptr)))((nint)ptr, &Module.GUID_IFirmwareUpdater2, (void**)pp); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IGasGauge-.cs b/ZuneDBApi/CComPtrMgd-IGasGauge-.cs deleted file mode 100644 index 78234a7..0000000 --- a/ZuneDBApi/CComPtrMgd-IGasGauge-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIGasGauge_003E : IDisposable -{ - public unsafe IGasGauge* p = null; - - private void _007ECComPtrMgd_003CIGasGauge_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIGasGauge_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IGasGauge* ptr = p; - IGasGauge* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIGasGauge_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IGasGauge*(CComPtrMgd_003CIGasGauge_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IGasGauge* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IGasGauge* op_Assign(IGasGauge* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IJumpList-.cs b/ZuneDBApi/CComPtrMgd-IJumpList-.cs deleted file mode 100644 index 72fdc76..0000000 --- a/ZuneDBApi/CComPtrMgd-IJumpList-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIJumpList_003E : IDisposable -{ - public unsafe IJumpList* p = null; - - private void _007ECComPtrMgd_003CIJumpList_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIJumpList_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IJumpList* ptr = p; - IJumpList* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator IJumpList*(CComPtrMgd_003CIJumpList_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IJumpList* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IJumpList* op_Assign(IJumpList* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIJumpList_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs b/ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs deleted file mode 100644 index 93bc7ba..0000000 --- a/ZuneDBApi/CComPtrMgd-IJumpListCategory-.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIJumpListCategory_003E : IDisposable -{ - public unsafe IJumpListCategory* p = null; - - private void _007ECComPtrMgd_003CIJumpListCategory_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIJumpListCategory_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IJumpListCategory* ptr = p; - IJumpListCategory* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - [SpecialName] - public unsafe IJumpListCategory* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IJumpListCategory* op_Assign(IJumpListCategory* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIJumpListCategory_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs b/ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs deleted file mode 100644 index 494a62d..0000000 --- a/ZuneDBApi/CComPtrMgd-IJumpListEntry-.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIJumpListEntry_003E : IDisposable -{ - public unsafe IJumpListEntry* p = null; - - private void _007ECComPtrMgd_003CIJumpListEntry_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIJumpListEntry_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IJumpListEntry* ptr = p; - IJumpListEntry* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - [SpecialName] - public unsafe IJumpListEntry* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IJumpListEntry* op_Assign(IJumpListEntry* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIJumpListEntry_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs b/ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs deleted file mode 100644 index 4467503..0000000 --- a/ZuneDBApi/CComPtrMgd-IPassportIdentity-.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIPassportIdentity_003E : IDisposable -{ - public unsafe IPassportIdentity* p = null; - - private void _007ECComPtrMgd_003CIPassportIdentity_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIPassportIdentity_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IPassportIdentity* ptr = p; - IPassportIdentity* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIPassportIdentity_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IPassportIdentity*(CComPtrMgd_003CIPassportIdentity_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IPassportIdentity* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IPassportIdentity* op_Assign(IPassportIdentity* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - public unsafe int QueryInterface_003CIPassportIdentity_003E(IPassportIdentity** pp) - { - //IL_002e: Expected I, but got I8 - IPassportIdentity* ptr = p; - if (ptr == null) - { - Module._ZuneShipAssert(1001u, 186u); - return -2147467261; - } - 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 deleted file mode 100644 index a19a401..0000000 --- a/ZuneDBApi/CComPtrMgd-IQuickMixSession-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIQuickMixSession_003E : IDisposable -{ - public unsafe IQuickMixSession* p = null; - - private void _007ECComPtrMgd_003CIQuickMixSession_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIQuickMixSession_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IQuickMixSession* ptr = p; - IQuickMixSession* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator IQuickMixSession*(CComPtrMgd_003CIQuickMixSession_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IQuickMixSession* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IQuickMixSession* op_Assign(IQuickMixSession* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIQuickMixSession_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IServiceError-.cs b/ZuneDBApi/CComPtrMgd-IServiceError-.cs deleted file mode 100644 index 39b0c96..0000000 --- a/ZuneDBApi/CComPtrMgd-IServiceError-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIServiceError_003E : IDisposable -{ - public unsafe IServiceError* p = null; - - private void _007ECComPtrMgd_003CIServiceError_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIServiceError_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IServiceError* ptr = p; - IServiceError* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIServiceError_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IServiceError*(CComPtrMgd_003CIServiceError_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IServiceError* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IServiceError* op_Assign(IServiceError* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-ISyncEngine-.cs b/ZuneDBApi/CComPtrMgd-ISyncEngine-.cs deleted file mode 100644 index aaac0b1..0000000 --- a/ZuneDBApi/CComPtrMgd-ISyncEngine-.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CISyncEngine_003E : IDisposable -{ - public unsafe ISyncEngine* p = null; - - private void _007ECComPtrMgd_003CISyncEngine_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CISyncEngine_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - ISyncEngine* ptr = p; - ISyncEngine* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator ISyncEngine*(CComPtrMgd_003CISyncEngine_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe ISyncEngine* op_MemberSelection() - { - return p; - } - - public unsafe void Attach(ISyncEngine* p2) - { - //IL_001b: Expected I, but got I8 - ISyncEngine* ptr = p; - if (ptr != p2) - { - if (ptr != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 16)))((nint)ptr); - } - p = p2; - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CISyncEngine_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs b/ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs deleted file mode 100644 index 3ab1b65..0000000 --- a/ZuneDBApi/CComPtrMgd-ISyncRulesView-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CISyncRulesView_003E : IDisposable -{ - public unsafe ISyncRulesView* p = null; - - private void _007ECComPtrMgd_003CISyncRulesView_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CISyncRulesView_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - ISyncRulesView* ptr = p; - ISyncRulesView* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CISyncRulesView_003E() - { - Dispose(false); - } - - public static unsafe implicit operator ISyncRulesView*(CComPtrMgd_003CISyncRulesView_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe ISyncRulesView* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe ISyncRulesView* op_Assign(ISyncRulesView* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IThumbBar-.cs b/ZuneDBApi/CComPtrMgd-IThumbBar-.cs deleted file mode 100644 index 04da242..0000000 --- a/ZuneDBApi/CComPtrMgd-IThumbBar-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIThumbBar_003E : IDisposable -{ - public unsafe IThumbBar* p = null; - - private void _007ECComPtrMgd_003CIThumbBar_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIThumbBar_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IThumbBar* ptr = p; - IThumbBar* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIThumbBar_003E() - { - Dispose(false); - } - - public static unsafe implicit operator IThumbBar*(CComPtrMgd_003CIThumbBar_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IThumbBar* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IThumbBar* op_Assign(IThumbBar* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs b/ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs deleted file mode 100644 index 030863c..0000000 --- a/ZuneDBApi/CComPtrMgd-IThumbBarButton-.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIThumbBarButton_003E : IDisposable -{ - public unsafe IThumbBarButton* p = null; - - private void _007ECComPtrMgd_003CIThumbBarButton_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIThumbBarButton_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IThumbBarButton* ptr = p; - IThumbBarButton* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIThumbBarButton_003E() - { - Dispose(false); - } - - [SpecialName] - public unsafe IThumbBarButton* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IThumbBarButton* op_Assign(IThumbBarButton* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd-IUpdateManager-.cs b/ZuneDBApi/CComPtrMgd-IUpdateManager-.cs deleted file mode 100644 index 3f2c8c2..0000000 --- a/ZuneDBApi/CComPtrMgd-IUpdateManager-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIUpdateManager_003E : IDisposable -{ - public unsafe IUpdateManager* p = null; - - private void _007ECComPtrMgd_003CIUpdateManager_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIUpdateManager_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IUpdateManager* ptr = p; - IUpdateManager* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator IUpdateManager*(CComPtrMgd_003CIUpdateManager_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IUpdateManager* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IUpdateManager* op_Assign(IUpdateManager* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIUpdateManager_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs b/ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs deleted file mode 100644 index 61cb8eb..0000000 --- a/ZuneDBApi/CComPtrMgd-IWinLiveAvailableInformation-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIWinLiveAvailableInformation_003E : IDisposable -{ - public unsafe IWinLiveAvailableInformation* p = null; - - private void _007ECComPtrMgd_003CIWinLiveAvailableInformation_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIWinLiveAvailableInformation_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IWinLiveAvailableInformation* ptr = p; - IWinLiveAvailableInformation* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator IWinLiveAvailableInformation*(CComPtrMgd_003CIWinLiveAvailableInformation_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IWinLiveAvailableInformation* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IWinLiveAvailableInformation* op_Assign(IWinLiveAvailableInformation* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIWinLiveAvailableInformation_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs b/ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs deleted file mode 100644 index 7bd8506..0000000 --- a/ZuneDBApi/CComPtrMgd-IWinLiveInformation-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIWinLiveInformation_003E : IDisposable -{ - public unsafe IWinLiveInformation* p = null; - - private void _007ECComPtrMgd_003CIWinLiveInformation_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIWinLiveInformation_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IWinLiveInformation* ptr = p; - IWinLiveInformation* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator IWinLiveInformation*(CComPtrMgd_003CIWinLiveInformation_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IWinLiveInformation* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IWinLiveInformation* op_Assign(IWinLiveInformation* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIWinLiveInformation_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs b/ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs deleted file mode 100644 index 3b200fe..0000000 --- a/ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIWinLiveSignup_003E : IDisposable -{ - public unsafe IWinLiveSignup* p = null; - - private void _007ECComPtrMgd_003CIWinLiveSignup_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIWinLiveSignup_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IWinLiveSignup* ptr = p; - IWinLiveSignup* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - [SpecialName] - public unsafe IWinLiveSignup* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IWinLiveSignup* op_Assign(IWinLiveSignup* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - [return: MarshalAs(UnmanagedType.U1)] - public static unsafe bool operator !(CComPtrMgd_003CIWinLiveSignup_003E obj) - { - return (long)(nint)obj.p == 0; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIWinLiveSignup_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IWlanProvider-.cs b/ZuneDBApi/CComPtrMgd-IWlanProvider-.cs deleted file mode 100644 index f21459d..0000000 --- a/ZuneDBApi/CComPtrMgd-IWlanProvider-.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIWlanProvider_003E : IDisposable -{ - public unsafe IWlanProvider* p = null; - - private void _007ECComPtrMgd_003CIWlanProvider_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIWlanProvider_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IWlanProvider* ptr = p; - IWlanProvider* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - [SpecialName] - public unsafe IWlanProvider* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IWlanProvider* op_Assign(IWlanProvider* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - [return: MarshalAs(UnmanagedType.U1)] - public static unsafe bool operator !(CComPtrMgd_003CIWlanProvider_003E obj) - { - return (long)(nint)obj.p == 0; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIWlanProvider_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs b/ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs deleted file mode 100644 index 2d2713b..0000000 --- a/ZuneDBApi/CComPtrMgd-IZuneMBRBandwidthTest-.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CIZuneMBRBandwidthTest_003E : IDisposable -{ - public unsafe IZuneMBRBandwidthTest* p = null; - - private void _007ECComPtrMgd_003CIZuneMBRBandwidthTest_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CIZuneMBRBandwidthTest_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - IZuneMBRBandwidthTest* ptr = p; - IZuneMBRBandwidthTest* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator IZuneMBRBandwidthTest*(CComPtrMgd_003CIZuneMBRBandwidthTest_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe IZuneMBRBandwidthTest* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe IZuneMBRBandwidthTest* op_Assign(IZuneMBRBandwidthTest* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - public unsafe void Attach(IZuneMBRBandwidthTest* p2) - { - //IL_001b: Expected I, but got I8 - IZuneMBRBandwidthTest* ptr = p; - if (ptr != p2) - { - if (ptr != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 16)))((nint)ptr); - } - p = p2; - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CIZuneMBRBandwidthTest_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs b/ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs deleted file mode 100644 index 483154e..0000000 --- a/ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using MicrosoftZuneLibrary; - -internal class CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E : IDisposable -{ - public unsafe FirmwareUpdateMediator* p = null; - - private void _007ECComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - FirmwareUpdateMediator* ptr = p; - FirmwareUpdateMediator* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E() - { - Dispose(false); - } - - public static unsafe implicit operator FirmwareUpdateMediator*(CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe FirmwareUpdateMediator* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe FirmwareUpdateMediator* op_Assign(FirmwareUpdateMediator* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - [return: MarshalAs(UnmanagedType.U1)] - public static unsafe bool operator !(CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E obj) - { - return (long)(nint)obj.p == 0; - } -} diff --git a/ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs b/ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs deleted file mode 100644 index a4b5e1e..0000000 --- a/ZuneDBApi/CComPtrMgd-MicrosoftZunePlayback.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using MicrosoftZunePlayback; - -internal class CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E : IDisposable -{ - public unsafe CMBRBandwidthTestEventSink* p = null; - - private void _007ECComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - CMBRBandwidthTestEventSink* ptr = p; - CMBRBandwidthTestEventSink* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - public static unsafe implicit operator CMBRBandwidthTestEventSink*(CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe CMBRBandwidthTestEventSink* op_Assign(CMBRBandwidthTestEventSink* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E() - { - Dispose(false); - } -} diff --git a/ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs b/ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs deleted file mode 100644 index 22bd174..0000000 --- a/ZuneDBApi/CComPtrMgd-SyncRulesViewMediator-.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -internal class CComPtrMgd_003CSyncRulesViewMediator_003E : IDisposable -{ - public unsafe SyncRulesViewMediator* p = null; - - private void _007ECComPtrMgd_003CSyncRulesViewMediator_003E() - { - Release(); - } - - private void _0021CComPtrMgd_003CSyncRulesViewMediator_003E() - { - Release(); - } - - public unsafe void Release() - { - //IL_0014: Expected I, but got I8 - //IL_0021: Expected I, but got I8 - SyncRulesViewMediator* ptr = p; - SyncRulesViewMediator* ptr2 = ptr; - if (ptr != null) - { - p = null; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); - } - } - - protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) - { - if (P_0) - { - Release(); - return; - } - try - { - Release(); - } - finally - { - //base.Finalize(); - } - } - - public void Dispose() - { - Dispose(true); - } - - ~CComPtrMgd_003CSyncRulesViewMediator_003E() - { - Dispose(false); - } - - public static unsafe implicit operator SyncRulesViewMediator*(CComPtrMgd_003CSyncRulesViewMediator_003E obj) - { - return obj.p; - } - - [SpecialName] - public unsafe SyncRulesViewMediator* op_MemberSelection() - { - return p; - } - - [SpecialName] - public unsafe SyncRulesViewMediator* op_Assign(SyncRulesViewMediator* lp) - { - //IL_001c: Expected I, but got I8 - Release(); - p = lp; - if (lp != null) - { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); - } - return p; - } -} diff --git a/ZuneDBApi/CComPtrMgd.cs b/ZuneDBApi/CComPtrMgd.cs new file mode 100644 index 0000000..f9b6a40 --- /dev/null +++ b/ZuneDBApi/CComPtrMgd.cs @@ -0,0 +1,124 @@ +using System; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +internal unsafe class CComPtrMgd : IDisposable where TPtr : unmanaged +{ + public TPtr* p = null; + + private void _007ECComPtrMgd() + { + Release(); + } + + private void _0021CComPtrMgd() + { + Release(); + } + + public void Release() + { + TPtr* ptr = p; + TPtr* ptr2 = ptr; + if (ptr != null) + { + p = null; + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); + } + } + + public static implicit operator TPtr*(CComPtrMgd obj) + { + return obj.p; + } + + [SpecialName] + public TPtr* op_MemberSelection() + { + return p; + } + + [SpecialName] + public TPtr* op_Assign(TPtr* lp) + { + Release(); + p = lp; + if (lp != null) + { + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)lp + 8)))((nint)lp); + } + return p; + } + + public unsafe int CopyTo(TPtr** ppT) + { + if (ppT == null) + { + Module._ZuneShipAssert(1001u, 168u); + return -2147467261; + } + *(long*)ppT = (nint)p; + TPtr* ptr = p; + if (ptr != null) + { + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 8)))((nint)ptr); + } + return 0; + } + + public int QueryInterface(TPtr2** pp) where TPtr2 : unmanaged + { + TPtr* ptr = p; + if (ptr == null) + { + Module._ZuneShipAssert(1001u, 186u); + return -2147467261; + } + + // Use reflection on Module to get the CLSID + string guidFieldName = "GUID_" + typeof(TPtr2).Name; + _GUID guid = (Guid)typeof(Module).GetField(guidFieldName).GetValue(null); + + return ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(ulong*)ptr)))((nint)ptr, &guid, (void**)pp); + } + + public void Attach(TPtr* p2) + { + TPtr* ptr = p; + if (ptr != p2) + { + if (ptr != null) + { + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 16)))((nint)ptr); + } + p = p2; + } + } + + protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) + { + if (P_0) + { + Release(); + return; + } + try + { + Release(); + } + finally + { + + } + } + + public void Dispose() + { + Dispose(true); + } + + ~CComPtrMgd() + { + Dispose(false); + } +} diff --git a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs index 1b443e5..ce8bf66 100644 --- a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs +++ b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs @@ -8,11 +8,11 @@ namespace Microsoft.Zune.QuickMix { public class QuickMixSession : IDisposable { - private readonly CComPtrMgd_003CIQuickMixSession_003E m_spSession; + private readonly CComPtrMgd m_spSession; public unsafe QuickMixSession(IQuickMixSession* pSession) { - CComPtrMgd_003CIQuickMixSession_003E spSession = new CComPtrMgd_003CIQuickMixSession_003E(); + CComPtrMgd spSession = new CComPtrMgd(); try { m_spSession = spSession; diff --git a/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs b/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs index 16131af..4b6f7cc 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs @@ -9,11 +9,11 @@ namespace Microsoft.Zune.Service { public class AccountManagement : IDisposable { - private readonly CComPtrMgd_003CIAccountManagement_003E m_spAccountManagement; + private readonly CComPtrMgd m_spAccountManagement; public AccountManagement() { - CComPtrMgd_003CIAccountManagement_003E spAccountManagement = new CComPtrMgd_003CIAccountManagement_003E(); + CComPtrMgd spAccountManagement = new CComPtrMgd(); try { m_spAccountManagement = spAccountManagement; diff --git a/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs b/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs index d2b0a0f..97a9d61 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs @@ -5,7 +5,7 @@ namespace Microsoft.Zune.Service { public class PassportIdentity : IDisposable { - private readonly CComPtrMgd_003CIPassportIdentity_003E m_spPassportIdentity; + private readonly CComPtrMgd m_spPassportIdentity; private string m_username; @@ -21,7 +21,7 @@ namespace Microsoft.Zune.Service //IL_0036: Expected I, but got I8 if (m_serviceTicket == null) { - CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = m_spPassportIdentity; + CComPtrMgd spPassportIdentity = m_spPassportIdentity; if (spPassportIdentity.p != null) { ushort* ptr = null; @@ -45,7 +45,7 @@ namespace Microsoft.Zune.Service //IL_0036: Expected I, but got I8 if (m_password == null) { - CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = m_spPassportIdentity; + CComPtrMgd spPassportIdentity = m_spPassportIdentity; if (spPassportIdentity.p != null) { ushort* ptr = null; @@ -69,7 +69,7 @@ namespace Microsoft.Zune.Service //IL_0036: Expected I, but got I8 if (m_username == null) { - CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = m_spPassportIdentity; + CComPtrMgd spPassportIdentity = m_spPassportIdentity; if (spPassportIdentity.p != null) { ushort* ptr = null; @@ -87,7 +87,7 @@ namespace Microsoft.Zune.Service internal unsafe PassportIdentity(IPassportIdentity* pPassportIdentity) { - CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = new CComPtrMgd_003CIPassportIdentity_003E(); + CComPtrMgd spPassportIdentity = new CComPtrMgd(); try { m_spPassportIdentity = spPassportIdentity; @@ -103,8 +103,8 @@ namespace Microsoft.Zune.Service internal unsafe int GetComPointer(IPassportIdentity** ppPassportIdentity) { - CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = m_spPassportIdentity; - return (spPassportIdentity.p == null) ? (-2147467259) : spPassportIdentity.QueryInterface_003CIPassportIdentity_003E(ppPassportIdentity); + CComPtrMgd spPassportIdentity = m_spPassportIdentity; + return (spPassportIdentity.p == null) ? (-2147467259) : spPassportIdentity.QueryInterface(ppPassportIdentity); } public void _007EPassportIdentity() diff --git a/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs b/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs index d322d7f..a89c01e 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/ServiceError.cs @@ -7,7 +7,7 @@ namespace Microsoft.Zune.Service { public class ServiceError : IDisposable { - private readonly CComPtrMgd_003CIServiceError_003E m_spServiceError; + private readonly CComPtrMgd m_spServiceError; private IList m_propertyErrors; @@ -69,7 +69,7 @@ namespace Microsoft.Zune.Service internal unsafe ServiceError(IServiceError* pServiceError) { - CComPtrMgd_003CIServiceError_003E spServiceError = new CComPtrMgd_003CIServiceError_003E(); + CComPtrMgd spServiceError = new CComPtrMgd(); try { m_spServiceError = spServiceError; diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs index 89499e8..bb003ff 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs @@ -6,7 +6,7 @@ namespace Microsoft.Zune.Service { public class WinLiveAvailableInformation : IDisposable { - private readonly CComPtrMgd_003CIWinLiveAvailableInformation_003E m_spWinLiveAvailableInformation; + private readonly CComPtrMgd m_spWinLiveAvailableInformation; private string m_signinName; @@ -72,7 +72,7 @@ namespace Microsoft.Zune.Service //IL_0036: Expected I, but got I8 if (m_signinName == null) { - CComPtrMgd_003CIWinLiveAvailableInformation_003E spWinLiveAvailableInformation = m_spWinLiveAvailableInformation; + CComPtrMgd spWinLiveAvailableInformation = m_spWinLiveAvailableInformation; if (spWinLiveAvailableInformation.p != null) { ushort* ptr = null; @@ -90,7 +90,7 @@ namespace Microsoft.Zune.Service internal unsafe WinLiveAvailableInformation(IWinLiveAvailableInformation* pWinLiveAvailableInformation) { - CComPtrMgd_003CIWinLiveAvailableInformation_003E spWinLiveAvailableInformation = new CComPtrMgd_003CIWinLiveAvailableInformation_003E(); + CComPtrMgd spWinLiveAvailableInformation = new CComPtrMgd(); try { m_spWinLiveAvailableInformation = spWinLiveAvailableInformation; diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs index bad5c85..49683f7 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs @@ -7,7 +7,7 @@ namespace Microsoft.Zune.Service { public class WinLiveInformation : IDisposable { - private readonly CComPtrMgd_003CIWinLiveInformation_003E m_spWinLiveInformation; + private readonly CComPtrMgd m_spWinLiveInformation; private string m_termsOfServiceUrl; @@ -79,7 +79,7 @@ namespace Microsoft.Zune.Service //IL_0041: Expected I, but got I8 if (m_hipImage == null) { - CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = m_spWinLiveInformation; + CComPtrMgd spWinLiveInformation = m_spWinLiveInformation; if (spWinLiveInformation.p != null) { int num = 0; @@ -117,7 +117,7 @@ namespace Microsoft.Zune.Service //IL_0036: Expected I, but got I8 if (m_hipChallenge == null) { - CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = m_spWinLiveInformation; + CComPtrMgd spWinLiveInformation = m_spWinLiveInformation; if (spWinLiveInformation.p != null) { ushort* ptr = null; @@ -141,7 +141,7 @@ namespace Microsoft.Zune.Service //IL_0036: Expected I, but got I8 if (m_privacyUrl == null) { - CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = m_spWinLiveInformation; + CComPtrMgd spWinLiveInformation = m_spWinLiveInformation; if (spWinLiveInformation.p != null) { ushort* ptr = null; @@ -180,7 +180,7 @@ namespace Microsoft.Zune.Service //IL_0036: Expected I, but got I8 if (m_termsOfServiceUrl == null) { - CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = m_spWinLiveInformation; + CComPtrMgd spWinLiveInformation = m_spWinLiveInformation; if (spWinLiveInformation.p != null) { ushort* ptr = null; @@ -198,7 +198,7 @@ namespace Microsoft.Zune.Service internal unsafe WinLiveInformation(IWinLiveInformation* pWinLiveInformation) { - CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = new CComPtrMgd_003CIWinLiveInformation_003E(); + CComPtrMgd spWinLiveInformation = new CComPtrMgd(); try { m_spWinLiveInformation = spWinLiveInformation; diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs index cb13f62..9770033 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs @@ -7,11 +7,11 @@ namespace Microsoft.Zune.Service { public class WinLiveSignup : IDisposable { - private readonly CComPtrMgd_003CIWinLiveSignup_003E m_spWinLiveSignup; + private readonly CComPtrMgd m_spWinLiveSignup; public WinLiveSignup() { - CComPtrMgd_003CIWinLiveSignup_003E spWinLiveSignup = new CComPtrMgd_003CIWinLiveSignup_003E(); + CComPtrMgd spWinLiveSignup = new CComPtrMgd(); try { m_spWinLiveSignup = spWinLiveSignup; diff --git a/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs b/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs index 6247f85..f0960fb 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs @@ -11,7 +11,7 @@ namespace Microsoft.Zune.Util private FeaturesChangedHandler m_featuresChangedHandler; - private readonly CComPtrMgd_003CIAsyncCallback_003E m_spAsyncCallback; + private readonly CComPtrMgd m_spAsyncCallback; public static FeaturesChangedApi Instance { @@ -80,7 +80,7 @@ namespace Microsoft.Zune.Util private FeaturesChangedApi() { - CComPtrMgd_003CIAsyncCallback_003E spAsyncCallback = new CComPtrMgd_003CIAsyncCallback_003E(); + CComPtrMgd spAsyncCallback = new CComPtrMgd(); try { m_spAsyncCallback = spAsyncCallback; diff --git a/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs b/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs index 7fe9baf..a4bc9e2 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/JumpListCategory.cs @@ -6,7 +6,7 @@ namespace Microsoft.Zune.Util { public class JumpListCategory : IDisposable { - private readonly CComPtrMgd_003CIJumpListCategory_003E m_spCategory; + private readonly CComPtrMgd m_spCategory; public unsafe string Name { @@ -61,7 +61,7 @@ namespace Microsoft.Zune.Util internal unsafe JumpListCategory(IJumpListCategory* pCategory) { - CComPtrMgd_003CIJumpListCategory_003E spCategory = new CComPtrMgd_003CIJumpListCategory_003E(); + CComPtrMgd spCategory = new CComPtrMgd(); try { m_spCategory = spCategory; diff --git a/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs b/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs index 38f140e..b727844 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/JumpListEntry.cs @@ -6,7 +6,7 @@ namespace Microsoft.Zune.Util { public class JumpListEntry : IDisposable { - private readonly CComPtrMgd_003CIJumpListEntry_003E m_spEntry; + private readonly CComPtrMgd m_spEntry; public unsafe int IconIndex { @@ -86,7 +86,7 @@ namespace Microsoft.Zune.Util internal unsafe JumpListEntry(IJumpListEntry* pEntry) { - CComPtrMgd_003CIJumpListEntry_003E spEntry = new CComPtrMgd_003CIJumpListEntry_003E(); + CComPtrMgd spEntry = new CComPtrMgd(); try { m_spEntry = spEntry; diff --git a/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs b/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs index fd28c3f..820f2a2 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs @@ -6,7 +6,7 @@ namespace Microsoft.Zune.Util { public class JumpListSession : IDisposable { - private readonly CComPtrMgd_003CIJumpList_003E m_spJumpList; + private readonly CComPtrMgd m_spJumpList; public unsafe bool IsAlive { @@ -150,7 +150,7 @@ namespace Microsoft.Zune.Util internal unsafe JumpListSession(IJumpList* pJumpList) { - CComPtrMgd_003CIJumpList_003E spJumpList = new CComPtrMgd_003CIJumpList_003E(); + CComPtrMgd spJumpList = new CComPtrMgd(); try { m_spJumpList = spJumpList; diff --git a/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs b/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs index ee66118..a7972ab 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ThumbBar.cs @@ -5,7 +5,7 @@ namespace Microsoft.Zune.Util { public class ThumbBar : IDisposable { - private readonly CComPtrMgd_003CIThumbBar_003E m_spThumbBar; + private readonly CComPtrMgd m_spThumbBar; public unsafe int CreateButton(out ThumbBarButton button) { @@ -49,7 +49,7 @@ namespace Microsoft.Zune.Util internal unsafe ThumbBar(IThumbBar* thumbBar) { - CComPtrMgd_003CIThumbBar_003E spThumbBar = new CComPtrMgd_003CIThumbBar_003E(); + CComPtrMgd spThumbBar = new CComPtrMgd(); try { m_spThumbBar = spThumbBar; diff --git a/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs b/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs index 8a5c144..c030f1f 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ThumbBarButton.cs @@ -6,7 +6,7 @@ namespace Microsoft.Zune.Util { public class ThumbBarButton : IDisposable { - private readonly CComPtrMgd_003CIThumbBarButton_003E m_spButton; + private readonly CComPtrMgd m_spButton; public unsafe bool ShowBackground { @@ -138,7 +138,7 @@ namespace Microsoft.Zune.Util internal unsafe ThumbBarButton(IThumbBarButton* pButton) { - CComPtrMgd_003CIThumbBarButton_003E spButton = new CComPtrMgd_003CIThumbBarButton_003E(); + CComPtrMgd spButton = new CComPtrMgd(); try { m_spButton = spButton; diff --git a/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs b/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs index d8fa6aa..d462b6b 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs @@ -6,7 +6,7 @@ namespace Microsoft.Zune.Util { public class UpdateManager : IDisposable { - private readonly CComPtrMgd_003CIUpdateManager_003E m_spUpdateManager; + private readonly CComPtrMgd m_spUpdateManager; private static UpdateManager sm_updateManager = null; @@ -91,7 +91,7 @@ namespace Microsoft.Zune.Util try { Monitor.Enter(sm_lock); - CComPtrMgd_003CIUpdateManager_003E spUpdateManager = m_spUpdateManager; + CComPtrMgd spUpdateManager = m_spUpdateManager; IUpdateManager* p = spUpdateManager.p; if (0L != (nint)p) { @@ -149,7 +149,7 @@ namespace Microsoft.Zune.Util } Module.CComPtrNtv_003CIUpdateManager_003E_002ERelease(&cComPtrNtv_003CIUpdateManager_003E); } - CComPtrMgd_003CIUpdateManager_003E spUpdateManager = m_spUpdateManager; + CComPtrMgd spUpdateManager = m_spUpdateManager; IUpdateManager* p2 = spUpdateManager.p; if (0L != (nint)p2) { @@ -167,7 +167,7 @@ namespace Microsoft.Zune.Util private UpdateManager() { - CComPtrMgd_003CIUpdateManager_003E spUpdateManager = new CComPtrMgd_003CIUpdateManager_003E(); + CComPtrMgd spUpdateManager = new CComPtrMgd(); try { m_spUpdateManager = spUpdateManager; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/Device.cs b/ZuneDBApi/MicrosoftZuneLibrary/Device.cs index ca14666..8d7ec01 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/Device.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/Device.cs @@ -14,13 +14,13 @@ namespace MicrosoftZuneLibrary private object m_Lock; - private readonly CComPtrMgd_003CIEndpointHost_003E m_spEndpointHost; + private readonly CComPtrMgd m_spEndpointHost; - private readonly CComPtrMgd_003CISyncEngine_003E m_spSyncEngine; + private readonly CComPtrMgd m_spSyncEngine; - private readonly CComPtrMgd_003CIWlanProvider_003E m_spWlanProvider; + private readonly CComPtrMgd m_spWlanProvider; - private readonly CComPtrMgd_003CDeviceMediator_003E m_spDeviceMediator; + private readonly CComPtrMgd m_spDeviceMediator; private SyncBeganHandler m_SyncBegan; @@ -85,7 +85,7 @@ namespace MicrosoftZuneLibrary //IL_0014: Expected I, but got I8 //IL_002c: Expected I, but got I8 string result = null; - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p != null) { ushort* ptr = null; @@ -144,7 +144,7 @@ namespace MicrosoftZuneLibrary //IL_0014: Expected I, but got I8 //IL_002c: Expected I, but got I8 string result = null; - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p != null) { ushort* ptr = null; @@ -166,7 +166,7 @@ namespace MicrosoftZuneLibrary //IL_0014: Expected I, but got I8 //IL_002c: Expected I, but got I8 string result = null; - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p != null) { ushort* ptr = null; @@ -225,7 +225,7 @@ namespace MicrosoftZuneLibrary { //IL_002d: Expected I, but got I8 DateTime result = DateTime.Now; - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p != null) { IEndpointHost* p = spEndpointHost.p; @@ -254,7 +254,7 @@ namespace MicrosoftZuneLibrary { //IL_002d: Expected I, but got I8 DateTime result = DateTime.Now; - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p != null) { IEndpointHost* p = spEndpointHost.p; @@ -361,7 +361,7 @@ namespace MicrosoftZuneLibrary //IL_0018: Expected I, but got I8 //IL_0030: Expected I, but got I8 string result = string.Empty; - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p != null) { ushort* ptr = null; @@ -833,7 +833,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_003f: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 777u); @@ -880,7 +880,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_003f: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 821u); @@ -901,7 +901,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_003f: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 842u); @@ -921,7 +921,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetUserGuid(ref Guid guidUserGuid) { //IL_0042: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 863u); @@ -956,7 +956,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_003f: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1029u); @@ -977,7 +977,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_003f: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1051u); @@ -997,7 +997,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetIsTvOutSupported(ref bool fIsTvOutSupported) { //IL_003d: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1073u); @@ -1016,7 +1016,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetIsRestorePointSupported(ref bool fIsRestorePointSupported) { //IL_003e: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1095u); @@ -1035,7 +1035,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetCapability(EEndpointCapability capabilityId, ref bool fHasCapability) { //IL_003d: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1117u); @@ -1211,7 +1211,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetOOBECompleted(ref bool oobeCompleted) { //IL_0040: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1241u); @@ -1230,7 +1230,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetPurchaseEnabled(ref bool purchaseEnabled) { //IL_0040: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1220u); @@ -1258,7 +1258,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetAndResetLastLoginError(ref int hrLogin) { //IL_0042: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1279u); @@ -1274,7 +1274,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetAndResetLastDownloadError(ref int hrDownload) { //IL_0042: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 1301u); @@ -2331,7 +2331,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_003f: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2266u); @@ -2351,7 +2351,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetSpaceFree(ref ulong ui64SpaceFree) { //IL_0042: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2286u); @@ -2629,7 +2629,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetVideoTranscodeOptimization(ref ETranscodeOptimization transcodeOptimization) { //IL_0040: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2500u); @@ -2660,7 +2660,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetPhotoVideoReverseSync(ref bool bReverseSync) { //IL_0040: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2530u); @@ -2691,7 +2691,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetDeletePhotoVideoAfterReverseSync(ref bool bDeleteAfterSync) { //IL_0041: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2563u); @@ -2723,7 +2723,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_0042: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2596u); @@ -2770,7 +2770,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_0042: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2643u); @@ -2816,7 +2816,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetPhotoTranscodeSetting(ref ETranscodePhotoSetting ePhotoSetting) { //IL_0040: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 2690u); @@ -2952,7 +2952,7 @@ namespace MicrosoftZuneLibrary public unsafe int DeleteAllGuestContent(ref ESyncOperationStatus operationStatus) { //IL_003f: Expected I, but got I8 - CComPtrMgd_003CISyncEngine_003E spSyncEngine = m_spSyncEngine; + CComPtrMgd spSyncEngine = m_spSyncEngine; if (spSyncEngine.p == null) { Module._ZuneShipAssert(1002u, 2836u); @@ -3054,7 +3054,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_0042: Expected I, but got I8 - CComPtrMgd_003CISyncEngine_003E spSyncEngine = m_spSyncEngine; + CComPtrMgd spSyncEngine = m_spSyncEngine; if (spSyncEngine.p == null) { Module._ZuneShipAssert(1002u, 2986u); @@ -3073,19 +3073,19 @@ namespace MicrosoftZuneLibrary internal unsafe Device() { - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = new CComPtrMgd_003CIEndpointHost_003E(); + CComPtrMgd spEndpointHost = new CComPtrMgd(); try { m_spEndpointHost = spEndpointHost; - CComPtrMgd_003CISyncEngine_003E spSyncEngine = new CComPtrMgd_003CISyncEngine_003E(); + CComPtrMgd spSyncEngine = new CComPtrMgd(); try { m_spSyncEngine = spSyncEngine; - CComPtrMgd_003CIWlanProvider_003E spWlanProvider = new CComPtrMgd_003CIWlanProvider_003E(); + CComPtrMgd spWlanProvider = new CComPtrMgd(); try { m_spWlanProvider = spWlanProvider; - CComPtrMgd_003CDeviceMediator_003E spDeviceMediator = new CComPtrMgd_003CDeviceMediator_003E(); + CComPtrMgd spDeviceMediator = new CComPtrMgd(); try { m_spDeviceMediator = spDeviceMediator; @@ -3156,7 +3156,7 @@ namespace MicrosoftZuneLibrary { managedLock = managedLock2; m_fInitializationCompleted = false; - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p != pEndpointHost) { spEndpointHost.op_Assign(pEndpointHost); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs b/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs index 0f3be76..cf752da 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs @@ -11,9 +11,9 @@ namespace MicrosoftZuneLibrary private DeviceAddedHandler _003Cbacking_store_003EAdded; - private readonly CComPtrMgd_003CIEndpointHostManager_003E m_spEndpointHostManager; + private readonly CComPtrMgd m_spEndpointHostManager; - private readonly CComPtrMgd_003CEndpointHostManagerMediator_003E m_spEndpointHostManagerMediator; + private readonly CComPtrMgd m_spEndpointHostManagerMediator; private SortedList m_slDevices; @@ -109,11 +109,11 @@ namespace MicrosoftZuneLibrary private unsafe DeviceList() { //IL_0093: Expected I, but got I8 - CComPtrMgd_003CIEndpointHostManager_003E spEndpointHostManager = new CComPtrMgd_003CIEndpointHostManager_003E(); + CComPtrMgd spEndpointHostManager = new CComPtrMgd(); try { m_spEndpointHostManager = spEndpointHostManager; - CComPtrMgd_003CEndpointHostManagerMediator_003E spEndpointHostManagerMediator = new CComPtrMgd_003CEndpointHostManagerMediator_003E(); + CComPtrMgd spEndpointHostManagerMediator = new CComPtrMgd(); try { m_spEndpointHostManagerMediator = spEndpointHostManagerMediator; @@ -165,7 +165,7 @@ namespace MicrosoftZuneLibrary Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 12, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } m_spEndpointHostManager.Release(); - CComPtrMgd_003CEndpointHostManagerMediator_003E spEndpointHostManagerMediator = m_spEndpointHostManagerMediator; + CComPtrMgd spEndpointHostManagerMediator = m_spEndpointHostManagerMediator; if ((long)(nint)spEndpointHostManagerMediator.p == 0) { Module.EndpointHostManagerMediator_002EShutdown(spEndpointHostManagerMediator.p); @@ -635,7 +635,7 @@ namespace MicrosoftZuneLibrary ushort* ptr = (ushort*)strEndpointIdPtr; try { - CComPtrMgd_003CIEndpointHostManager_003E spEndpointHostManager = m_spEndpointHostManager; + CComPtrMgd spEndpointHostManager = m_spEndpointHostManager; if (spEndpointHostManager.p != null && Module.IUnknown_002EQueryInterface_003Cstruct_0020IEndpointNotification_003E((IUnknown*)spEndpointHostManager.p, (IEndpointNotification**)(&cComPtrNtv_003CIEndpointNotification_003E)) >= 0) { if (fHide) diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs index db23908..ee8506c 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs @@ -9,7 +9,7 @@ namespace MicrosoftZuneLibrary { public abstract class FirmwareOperationBase : IDisposable { - internal readonly CComPtrMgd_003CIEndpointHost_003E m_spEndpointHost; + internal readonly CComPtrMgd m_spEndpointHost; internal object m_FirmwareLock; @@ -19,7 +19,7 @@ namespace MicrosoftZuneLibrary internal bool m_DeviceRebooting; - internal readonly CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E m_spFirmwareMediator; + internal readonly CComPtrMgd m_spFirmwareMediator; internal FirmwareCompleteHandler m_OnCompleteHandler; @@ -57,11 +57,11 @@ namespace MicrosoftZuneLibrary internal FirmwareOperationBase() { - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = new CComPtrMgd_003CIEndpointHost_003E(); + CComPtrMgd spEndpointHost = new CComPtrMgd(); try { m_spEndpointHost = spEndpointHost; - CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E spFirmwareMediator = new CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E(); + CComPtrMgd spFirmwareMediator = new CComPtrMgd(); try { m_spFirmwareMediator = spFirmwareMediator; @@ -350,7 +350,7 @@ namespace MicrosoftZuneLibrary Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPtrNtv_003CIEndpointHostManager_003E_002E_007Bdtor_007D), &cComPtrNtv_003CIEndpointHostManager_003E); throw; } - CComPtrMgd_003CIEndpointHost_003E spEndpointHost; + CComPtrMgd spEndpointHost; try { try diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs index cab3e7f..f847e79 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs @@ -6,7 +6,7 @@ namespace MicrosoftZuneLibrary { public class FirmwareRestorePoint : IDisposable { - private readonly CComPtrMgd_003CIFirmwareRestorePoint_003E m_spRestorePoint; + private readonly CComPtrMgd m_spRestorePoint; internal unsafe IFirmwareRestorePoint* NativeRestorePointPtr => m_spRestorePoint.p; @@ -66,7 +66,7 @@ namespace MicrosoftZuneLibrary internal unsafe FirmwareRestorePoint(IFirmwareRestorePoint* pRestorePoint) { - CComPtrMgd_003CIFirmwareRestorePoint_003E spRestorePoint = new CComPtrMgd_003CIFirmwareRestorePoint_003E(); + CComPtrMgd spRestorePoint = new CComPtrMgd(); try { m_spRestorePoint = spRestorePoint; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs index 98f8900..d4e6d75 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs @@ -6,7 +6,7 @@ namespace MicrosoftZuneLibrary { public class FirmwareRestorePointCollection : IDisposable { - private readonly CComPtrMgd_003CIFirmwareRestorePointCollection_003E m_spRestorePointCollection; + private readonly CComPtrMgd m_spRestorePointCollection; public unsafe int Count { @@ -33,7 +33,7 @@ namespace MicrosoftZuneLibrary *(long*)(&cComPtrNtv_003CIFirmwareRestorePoint_003E) = 0L; try { - CComPtrMgd_003CIFirmwareRestorePointCollection_003E spRestorePointCollection = m_spRestorePointCollection; + CComPtrMgd spRestorePointCollection = m_spRestorePointCollection; if (spRestorePointCollection.p != null) { IFirmwareRestorePointCollection* p = spRestorePointCollection.p; @@ -55,7 +55,7 @@ namespace MicrosoftZuneLibrary internal unsafe FirmwareRestorePointCollection(IFirmwareRestorePointCollection* pRestorePointCollection) { - CComPtrMgd_003CIFirmwareRestorePointCollection_003E spRestorePointCollection = new CComPtrMgd_003CIFirmwareRestorePointCollection_003E(); + CComPtrMgd spRestorePointCollection = new CComPtrMgd(); try { m_spRestorePointCollection = spRestorePointCollection; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs index a5a0029..afcfcbd 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs @@ -9,7 +9,7 @@ namespace MicrosoftZuneLibrary { public class FirmwareRestorer : FirmwareOperationBase { - private readonly CComPtrMgd_003CIFirmwareRestorer_003E m_spFirmwareRestorer; + private readonly CComPtrMgd m_spFirmwareRestorer; private FirmwareUpdater m_Updater; @@ -156,7 +156,7 @@ namespace MicrosoftZuneLibrary internal unsafe FirmwareRestorer(IEndpointHost* pEndpointHost, [MarshalAs(UnmanagedType.U1)] bool fFirmwareProcessSupported, FirmwareUpdater updater) { - CComPtrMgd_003CIFirmwareRestorer_003E spFirmwareRestorer = new CComPtrMgd_003CIFirmwareRestorer_003E(); + CComPtrMgd spFirmwareRestorer = new CComPtrMgd(); try { m_spFirmwareRestorer = spFirmwareRestorer; @@ -517,12 +517,12 @@ namespace MicrosoftZuneLibrary Monitor.Enter(m_FirmwareLock); try { - CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E spFirmwareMediator = m_spFirmwareMediator; + CComPtrMgd spFirmwareMediator = m_spFirmwareMediator; if (spFirmwareMediator.p != null) { Module.MicrosoftZuneLibrary_002EFirmwareUpdateMediator_002EFirmwareProcessCanceled(spFirmwareMediator.p); } - CComPtrMgd_003CIFirmwareRestorer_003E spFirmwareRestorer = m_spFirmwareRestorer; + CComPtrMgd spFirmwareRestorer = m_spFirmwareRestorer; if (spFirmwareRestorer.p != null) { IFirmwareRestorer* p = spFirmwareRestorer.p; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs index 155ce5b..392f7d0 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdateErrorInfo.cs @@ -6,7 +6,7 @@ namespace MicrosoftZuneLibrary { public class FirmwareUpdateErrorInfo : IDisposable { - private readonly CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E m_spErrorInfo; + private readonly CComPtrMgd m_spErrorInfo; public unsafe string Url { @@ -61,7 +61,7 @@ namespace MicrosoftZuneLibrary internal unsafe FirmwareUpdateErrorInfo(IFirmwareUpdateErrorInfo* pErrorInfo) { - CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E spErrorInfo = new CComPtrMgd_003CIFirmwareUpdateErrorInfo_003E(); + CComPtrMgd spErrorInfo = new CComPtrMgd(); try { m_spErrorInfo = spErrorInfo; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs index 647d357..db3524f 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdatePackage.cs @@ -5,7 +5,7 @@ namespace MicrosoftZuneLibrary { public class FirmwareUpdatePackage : IDisposable { - private readonly CComPtrMgd_003CIFirmwareMetadata_003E m_spFirmwareMetadata; + private readonly CComPtrMgd m_spFirmwareMetadata; private bool m_fSelected; @@ -29,7 +29,7 @@ namespace MicrosoftZuneLibrary { //IL_002f: Expected I, but got I8 TimeSpan result = default(TimeSpan); - CComPtrMgd_003CIFirmwareMetadata_003E spFirmwareMetadata = m_spFirmwareMetadata; + CComPtrMgd spFirmwareMetadata = m_spFirmwareMetadata; if (spFirmwareMetadata.p != null) { uint num = 0u; @@ -150,7 +150,7 @@ namespace MicrosoftZuneLibrary internal unsafe FirmwareUpdatePackage(IFirmwareMetadata* pFirmwareMetadata) { - CComPtrMgd_003CIFirmwareMetadata_003E spFirmwareMetadata = new CComPtrMgd_003CIFirmwareMetadata_003E(); + CComPtrMgd spFirmwareMetadata = new CComPtrMgd(); try { m_spFirmwareMetadata = spFirmwareMetadata; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs index d4e92f5..6870de4 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs @@ -9,7 +9,7 @@ namespace MicrosoftZuneLibrary { public class FirmwareUpdater : FirmwareOperationBase { - private readonly CComPtrMgd_003CIFirmwareUpdater_003E m_spFirmwareUpdater; + private readonly CComPtrMgd m_spFirmwareUpdater; private FirmwareRestorer m_Restorer; @@ -84,7 +84,7 @@ namespace MicrosoftZuneLibrary int num = EnsureNativeObject(); if (num >= 0) { - num = m_spFirmwareUpdater.QueryInterfaceIFirmwareUpdater2((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); + num = m_spFirmwareUpdater.QueryInterface((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); if (num >= 0) { int num2 = 0; @@ -286,7 +286,7 @@ namespace MicrosoftZuneLibrary internal unsafe FirmwareUpdater(IEndpointHost* pEndpointHost, [MarshalAs(UnmanagedType.U1)] bool fFirmwareProcessSupported) { - CComPtrMgd_003CIFirmwareUpdater_003E spFirmwareUpdater = new CComPtrMgd_003CIFirmwareUpdater_003E(); + CComPtrMgd spFirmwareUpdater = new CComPtrMgd(); try { m_spFirmwareUpdater = spFirmwareUpdater; @@ -700,7 +700,7 @@ namespace MicrosoftZuneLibrary *(long*)(&cComPtrNtv_003CIFirmwareUpdater2_003E) = 0L; try { - num = m_spFirmwareUpdater.QueryInterfaceIFirmwareUpdater2((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); + num = m_spFirmwareUpdater.QueryInterface((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); if (num >= 0) { FirmwareUpdateMediator* p3 = m_spFirmwareMediator.p; @@ -770,7 +770,7 @@ namespace MicrosoftZuneLibrary num = EnsureNativeObject(); if (num >= 0) { - num = m_spFirmwareUpdater.QueryInterfaceIFirmwareUpdater2((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); + num = m_spFirmwareUpdater.QueryInterface((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); if (num >= 0) { long num2 = *(long*)(&cComPtrNtv_003CIFirmwareUpdater2_003E); @@ -821,12 +821,12 @@ namespace MicrosoftZuneLibrary Monitor.Enter(m_FirmwareLock); try { - CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E spFirmwareMediator = m_spFirmwareMediator; + CComPtrMgd spFirmwareMediator = m_spFirmwareMediator; if (spFirmwareMediator.p != null) { Module.MicrosoftZuneLibrary_002EFirmwareUpdateMediator_002EFirmwareProcessCanceled(spFirmwareMediator.p); } - CComPtrMgd_003CIFirmwareUpdater_003E spFirmwareUpdater = m_spFirmwareUpdater; + CComPtrMgd spFirmwareUpdater = m_spFirmwareUpdater; if (spFirmwareUpdater.p != null) { IFirmwareUpdater* p = spFirmwareUpdater.p; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs b/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs index f01df34..7ab6604 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/GasGauge.cs @@ -6,9 +6,9 @@ namespace MicrosoftZuneLibrary { public class GasGauge : IDisposable { - private readonly CComPtrMgd_003CIGasGauge_003E m_spGasGauge; + private readonly CComPtrMgd m_spGasGauge; - private readonly CComPtrMgd_003CGasGaugeMediator_003E m_spGasGaugeMediator; + private readonly CComPtrMgd m_spGasGaugeMediator; private CategorySpaceUsedUpdatedHandler m_categorySpaceUsedUpdatedHandler; @@ -100,11 +100,11 @@ namespace MicrosoftZuneLibrary internal unsafe GasGauge(IGasGauge* pGasGauge) { //IL_004a: Expected I, but got I8 - CComPtrMgd_003CIGasGauge_003E spGasGauge = new CComPtrMgd_003CIGasGauge_003E(); + CComPtrMgd spGasGauge = new CComPtrMgd(); try { m_spGasGauge = spGasGauge; - CComPtrMgd_003CGasGaugeMediator_003E spGasGaugeMediator = new CComPtrMgd_003CGasGaugeMediator_003E(); + CComPtrMgd spGasGaugeMediator = new CComPtrMgd(); try { m_spGasGaugeMediator = spGasGaugeMediator; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs b/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs index 6932431..dda519f 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs @@ -7,7 +7,7 @@ namespace MicrosoftZuneLibrary { public class SyncRules : IDisposable { - private readonly CComPtrMgd_003CIEndpointHost_003E m_spEndpointHost; + private readonly CComPtrMgd m_spEndpointHost; private int m_iDeviceID; @@ -18,7 +18,7 @@ namespace MicrosoftZuneLibrary internal unsafe SyncRules(IEndpointHost* pEndpointHost) { //IL_0083: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = new CComPtrMgd_003CIEndpointHost_003E(); + CComPtrMgd spEndpointHost = new CComPtrMgd(); try { m_spEndpointHost = spEndpointHost; @@ -383,7 +383,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetDontSyncHatedContent(ref bool fDontSyncHatedContent) { //IL_0040: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 554u); @@ -415,7 +415,7 @@ namespace MicrosoftZuneLibrary { //IL_0027: Expected I, but got I8 //IL_0061: Expected I, but got I8 - CComPtrMgd_003CIEndpointHost_003E spEndpointHost = m_spEndpointHost; + CComPtrMgd spEndpointHost = m_spEndpointHost; if (spEndpointHost.p == null) { Module._ZuneShipAssert(1002u, 592u); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs b/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs index 6b6002d..6226267 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/SyncRulesView.cs @@ -6,9 +6,9 @@ namespace MicrosoftZuneLibrary { public class SyncRulesView : IDisposable { - private readonly CComPtrMgd_003CISyncRulesView_003E m_spSyncRulesView; + private readonly CComPtrMgd m_spSyncRulesView; - private readonly CComPtrMgd_003CSyncRulesViewMediator_003E m_spSyncRulesViewMediator; + private readonly CComPtrMgd m_spSyncRulesViewMediator; private SyncRulesViewItemAddedHandler m_itemAddedHandler; @@ -64,11 +64,11 @@ namespace MicrosoftZuneLibrary //IL_0052: Expected I, but got I8 //IL_0073: Expected I, but got I8 //IL_008e: Expected I, but got I8 - CComPtrMgd_003CISyncRulesView_003E spSyncRulesView = new CComPtrMgd_003CISyncRulesView_003E(); + CComPtrMgd spSyncRulesView = new CComPtrMgd(); try { m_spSyncRulesView = spSyncRulesView; - CComPtrMgd_003CSyncRulesViewMediator_003E spSyncRulesViewMediator = new CComPtrMgd_003CSyncRulesViewMediator_003E(); + CComPtrMgd spSyncRulesViewMediator = new CComPtrMgd(); try { m_spSyncRulesViewMediator = spSyncRulesViewMediator; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs b/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs index a67aa42..d6caa19 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs @@ -7,7 +7,7 @@ namespace MicrosoftZuneLibrary { public class UpdatePackageCollection : IDisposable { - private readonly CComPtrMgd_003CIFirmwareUpdateCollection_003E m_spUpdatePackageCollection; + private readonly CComPtrMgd m_spUpdatePackageCollection; private List m_packages; @@ -85,7 +85,7 @@ namespace MicrosoftZuneLibrary internal unsafe UpdatePackageCollection(IFirmwareUpdateCollection* pCollection) { - CComPtrMgd_003CIFirmwareUpdateCollection_003E spUpdatePackageCollection = new CComPtrMgd_003CIFirmwareUpdateCollection_003E(); + CComPtrMgd spUpdatePackageCollection = new CComPtrMgd(); try { m_spUpdatePackageCollection = spUpdatePackageCollection; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs b/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs index 8e7786d..640cb0d 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/UpdateStep.cs @@ -5,7 +5,7 @@ namespace MicrosoftZuneLibrary { public class UpdateStep : IDisposable { - private readonly CComPtrMgd_003CIFirmwareUpdateCallbackData_003E m_spUpdateStep; + private readonly CComPtrMgd m_spUpdateStep; private int m_cTotalSteps; @@ -104,7 +104,7 @@ namespace MicrosoftZuneLibrary internal unsafe UpdateStep(IFirmwareUpdateCallbackData* pUpdateStep) { - CComPtrMgd_003CIFirmwareUpdateCallbackData_003E spUpdateStep = new CComPtrMgd_003CIFirmwareUpdateCallbackData_003E(); + CComPtrMgd spUpdateStep = new CComPtrMgd(); try { m_spUpdateStep = spUpdateStep; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/WorkerQueue.cs b/ZuneDBApi/MicrosoftZuneLibrary/WorkerQueue.cs index c944fa1..df481bc 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/WorkerQueue.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/WorkerQueue.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Threading; +using WaitCallback = Vanara.PInvoke.Kernel32.WaitCallback; namespace MicrosoftZuneLibrary { diff --git a/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs b/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs index 0988e60..e8a60dd 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/BandwidthTestInterop.cs @@ -10,9 +10,9 @@ namespace MicrosoftZunePlayback private BandwidthTestErrorEventHandler _003Cbacking_store_003EBandwidthTestError; - private readonly CComPtrMgd_003CIZuneMBRBandwidthTest_003E m_spMBRBandwidthTest; + private readonly CComPtrMgd m_spMBRBandwidthTest; - private readonly CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E m_spMBRBTestSink; + private readonly CComPtrMgd m_spMBRBTestSink; private bool _ignore; @@ -50,11 +50,11 @@ namespace MicrosoftZunePlayback public BandwidthTestInterop() { - CComPtrMgd_003CIZuneMBRBandwidthTest_003E spMBRBandwidthTest = new CComPtrMgd_003CIZuneMBRBandwidthTest_003E(); + CComPtrMgd spMBRBandwidthTest = new CComPtrMgd(); try { m_spMBRBandwidthTest = spMBRBandwidthTest; - CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E spMBRBTestSink = new CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E(); + CComPtrMgd spMBRBTestSink = new(); try { m_spMBRBTestSink = spMBRBTestSink; @@ -169,7 +169,7 @@ namespace MicrosoftZunePlayback m_spMBRBandwidthTest.Release(); m_spMBRBandwidthTest.op_Assign(null); } - CComPtrMgd_003CMicrosoftZunePlayback_003A_003ACMBRBandwidthTestEventSink_003E spMBRBTestSink = m_spMBRBTestSink; + CComPtrMgd spMBRBTestSink = m_spMBRBTestSink; if (spMBRBTestSink.p != null) { spMBRBTestSink.Release();