diff --git a/ZuneDBApi/CComPropVariant.cs b/ZuneDBApi/CComPropVariant.cs deleted file mode 100644 index 057168e..0000000 --- a/ZuneDBApi/CComPropVariant.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Microsoft.VisualC; - -[StructLayout(LayoutKind.Sequential, Size = 24)] -[NativeCppClass] -[DebugInfoInPDB] -[MiscellaneousBits(64)] -internal struct CComPropVariant -{ - private long _003Calignment_0020member_003E; -} diff --git a/ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs b/ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs index fd24945..d379b08 100644 --- a/ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs +++ b/ZuneDBApi/CComPtrMgd-EndpointHostManagerMediator-.cs @@ -42,14 +42,13 @@ internal class CComPtrMgd_003CEndpointHostManagerMediator_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CEndpointHostManagerMediator_003E() @@ -77,8 +76,8 @@ internal class CComPtrMgd_003CEndpointHostManagerMediator_003E : IDisposable } [return: MarshalAs(UnmanagedType.U1)] - public unsafe bool operator !() + public static unsafe bool operator !(CComPtrMgd_003CEndpointHostManagerMediator_003E obj) { - return (long)(nint)p == 0; + return (long)(nint)obj.p == 0; } } diff --git a/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs b/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs index ae2022b..c68df1d 100644 --- a/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs +++ b/ZuneDBApi/CComPtrMgd-IFirmwareUpdater-.cs @@ -46,7 +46,7 @@ internal class CComPtrMgd_003CIFirmwareUpdater_003E : IDisposable } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); @@ -99,7 +99,7 @@ internal class CComPtrMgd_003CIFirmwareUpdater_003E : IDisposable return 0; } - public unsafe int QueryInterface_003CIFirmwareUpdater2_003E(IFirmwareUpdater2** pp) + public unsafe int QueryInterfaceIFirmwareUpdater2(IFirmwareUpdater2** pp) { //IL_002e: Expected I, but got I8 IFirmwareUpdater* ptr = p; @@ -108,6 +108,6 @@ internal class CComPtrMgd_003CIFirmwareUpdater_003E : IDisposable Module._ZuneShipAssert(1001u, 186u); return -2147467261; } - return ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(ulong*)ptr)))((nint)ptr, (_GUID*)Unsafe.AsPointer(ref Module._GUID_f066fc29_e525_4ddc_abe6_5213d22c14d2), (void**)pp); + return ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(ulong*)ptr)))((nint)ptr, &Module.GUID_IFirmwareUpdater2, (void**)pp); } } diff --git a/ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs b/ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs index 1c1e6e9..3b200fe 100644 --- a/ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs +++ b/ZuneDBApi/CComPtrMgd-IWinLiveSignup-.cs @@ -49,9 +49,9 @@ internal class CComPtrMgd_003CIWinLiveSignup_003E : IDisposable } [return: MarshalAs(UnmanagedType.U1)] - public unsafe bool operator !() + public static unsafe bool operator !(CComPtrMgd_003CIWinLiveSignup_003E obj) { - return (long)(nint)p == 0; + return (long)(nint)obj.p == 0; } protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) @@ -67,14 +67,13 @@ internal class CComPtrMgd_003CIWinLiveSignup_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIWinLiveSignup_003E() diff --git a/ZuneDBApi/CComPtrMgd-IWlanProvider-.cs b/ZuneDBApi/CComPtrMgd-IWlanProvider-.cs index 3e57169..f21459d 100644 --- a/ZuneDBApi/CComPtrMgd-IWlanProvider-.cs +++ b/ZuneDBApi/CComPtrMgd-IWlanProvider-.cs @@ -49,9 +49,9 @@ internal class CComPtrMgd_003CIWlanProvider_003E : IDisposable } [return: MarshalAs(UnmanagedType.U1)] - public unsafe bool operator !() + public static unsafe bool operator !(CComPtrMgd_003CIWlanProvider_003E obj) { - return (long)(nint)p == 0; + return (long)(nint)obj.p == 0; } protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) @@ -67,14 +67,13 @@ internal class CComPtrMgd_003CIWlanProvider_003E : IDisposable } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CIWlanProvider_003E() diff --git a/ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs b/ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs index 6e46b84..483154e 100644 --- a/ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs +++ b/ZuneDBApi/CComPtrMgd-MicrosoftZuneLibrary.cs @@ -43,14 +43,13 @@ internal class CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediat } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E() @@ -58,9 +57,9 @@ internal class CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediat Dispose(false); } - public unsafe implicit operator FirmwareUpdateMediator*() + public static unsafe implicit operator FirmwareUpdateMediator*(CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E obj) { - return p; + return obj.p; } [SpecialName] @@ -83,8 +82,8 @@ internal class CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediat } [return: MarshalAs(UnmanagedType.U1)] - public unsafe bool operator !() + public static unsafe bool operator !(CComPtrMgd_003CMicrosoftZuneLibrary_003A_003AFirmwareUpdateMediator_003E obj) { - return (long)(nint)p == 0; + return (long)(nint)obj.p == 0; } } diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs b/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs index de2108e..dd8919c 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs @@ -38,7 +38,7 @@ namespace Microsoft.Zune.Configuration } } - public string ConfigurationPath => (!(m_basePath == (string)null)) ? string.Concat(m_basePath + "\\", m_instance) : m_instance; + public string ConfigurationPath => (!(m_basePath == null)) ? string.Concat(m_basePath + "\\", m_instance) : m_instance; [SpecialName] public unsafe event ConfigurationChangeEventHandler OnConfigurationChanged @@ -399,11 +399,11 @@ namespace Microsoft.Zune.Configuration //IL_0047: Expected I, but got I8 //IL_0072: Expected I, but got I8 DateTime dateTime = default(DateTime); - _FILETIME fILETIME; + FILETIME fILETIME; *(int*)(&fILETIME) = 0; // IL initblk instruction Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref fILETIME, 4), 0, 4); - _FILETIME fILETIME2; + FILETIME fILETIME2; *(long*)(&fILETIME2) = defaultValue.ToFileTimeUtc(); fixed (char* m_basePathPtr = m_basePath.ToCharArray()) { @@ -424,8 +424,8 @@ namespace Microsoft.Zune.Configuration _003F val = ptr2; _003F val2 = ptr3; _003F val3 = ptr4; - _FILETIME fILETIME3 = fILETIME2; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)intPtr, hHive, (ushort*)(nint)val, (ushort*)(nint)val2, (ushort*)(nint)val3, &fILETIME, fILETIME3); + FILETIME fILETIME3 = fILETIME2; + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)intPtr, hHive, (ushort*)(nint)val, (ushort*)(nint)val2, (ushort*)(nint)val3, &fILETIME, fILETIME3); if (num >= 0) { return DateTime.FromFileTimeUtc(*(long*)(&fILETIME)); @@ -441,7 +441,7 @@ namespace Microsoft.Zune.Configuration { //IL_002e: Expected I, but got I8 //IL_0056: Expected I, but got I8 - _FILETIME fILETIME; + FILETIME fILETIME; *(long*)(&fILETIME) = value.ToFileTimeUtc(); fixed (char* m_basePathPtr = m_basePath.ToCharArray()) { @@ -464,8 +464,8 @@ namespace Microsoft.Zune.Configuration _003F val = ptr2; _003F val2 = ptr3; _003F val3 = ptr4; - _FILETIME fILETIME2 = fILETIME; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)intPtr, hHive, (ushort*)(nint)val, (ushort*)(nint)val2, (ushort*)(nint)val3, fILETIME2); + FILETIME fILETIME2 = fILETIME; + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)intPtr, hHive, (ushort*)(nint)val, (ushort*)(nint)val2, (ushort*)(nint)val3, fILETIME2); if (num < 0) { goto IL_005b; @@ -509,7 +509,7 @@ namespace Microsoft.Zune.Configuration num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num3))((nint)intPtr, hHive, ptr2, ptr3, ptr4, null, &num2, ptr5); if (num >= 0) { - ushort* ptr6 = (ushort*)Module.new_005B_005D((ulong)num2 * 2uL); + ushort* ptr6 = (ushort*)Module.new_005B_005D(num2 * 2uL); num = (((long)(nint)ptr6 == 0) ? (-2147024882) : num); if (num >= 0) { @@ -609,7 +609,7 @@ namespace Microsoft.Zune.Configuration num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num3))((nint)intPtr, hHive, ptr3, ptr4, ptr5, null, &num2); if (num >= 0) { - ptr2 = (ushort*)Module.new_005B_005D((ulong)num2 * 2uL); + ptr2 = (ushort*)Module.new_005B_005D(num2 * 2uL); num = (((long)(nint)ptr2 == 0) ? (-2147024882) : num); if (num >= 0) { @@ -627,7 +627,7 @@ namespace Microsoft.Zune.Configuration { string item = new string((char*)ptr6); list.Add(item); - ptr6 = (ushort*)((long)(Module.lstrlenW(ptr6) + 1) * 2L + (nint)ptr6); + ptr6 = (ushort*)((Module.lstrlenW(ptr6) + 1) * 2L + (nint)ptr6); } while (*ptr6 != 0); } @@ -690,7 +690,7 @@ namespace Microsoft.Zune.Configuration while (num3 < value.Count); } num2++; - ulong num4 = (ulong)num2 * 2uL; + ulong num4 = num2 * 2uL; ushort* ptr2 = (ushort*)Module.new_005B_005D(num4); if (ptr2 == null) { @@ -715,7 +715,7 @@ namespace Microsoft.Zune.Configuration if (Module.wmemcpy_s(ptr3, num2, s, (ulong)length) == 0) { num2 += (uint)(-1 - length); - ptr3 = (ushort*)((long)length * 2L + (nint)ptr3 + 2); + ptr3 = (ushort*)(length * 2L + (nint)ptr3 + 2); goto IL_00ee; } } @@ -864,7 +864,7 @@ namespace Microsoft.Zune.Configuration val3 = ptr4; val4 = ptr5; intPtr2 = (nint)value.LongLength; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)intPtr, hHive, (ushort*)(nint)val, (ushort*)(nint)val2, (ushort*)(nint)val3, (byte*)(nint)val4, (uint)(nint)intPtr2); + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)intPtr, hHive, (ushort*)(nint)val, (ushort*)(nint)val2, (ushort*)(nint)val3, (byte*)val4, (uint)(nint)intPtr2); if (num < 0) { goto IL_0066; diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerFactory.cs b/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerFactory.cs index a610eb2..74fcaba 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerFactory.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerFactory.cs @@ -13,7 +13,7 @@ namespace Microsoft.Zune.Configuration global::IFileAssociationHandler* ptr = null; try { - int num = Module.ZuneLibraryExports_002ECreateNativeFileAssociationHandler((void**)(&ptr)); + int num = Module.CreateNativeFileAssociationHandler((void**)(&ptr)); if (num >= 0) { fileAssociationHandlerWrapper = new FileAssociationHandlerWrapper(ptr); diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerWrapper.cs b/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerWrapper.cs index 0f8adc0..f52d010 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerWrapper.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/FileAssociationHandlerWrapper.cs @@ -36,15 +36,15 @@ namespace Microsoft.Zune.Configuration int num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pFileAssociationHandler + 24)))((nint)pFileAssociationHandler, null, &num); if (num2 >= 0) { - ptr = (global::FileAssociationInfo*)Module.new_005B_005D((ulong)num * 32uL); + ptr = (global::FileAssociationInfo*)Module.new_005B_005D(num * 32uL); if (ptr == null) { num2 = -2147024882; } else { - // IL initblk instruction - Unsafe.InitBlock(ptr, 0, (long)num * 32L); + // IL initblk instruction + *ptr = default; pFileAssociationHandler = m_pFileAssociationHandler; num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pFileAssociationHandler + 24)))((nint)pFileAssociationHandler, ptr, &num); if (num2 >= 0) @@ -74,7 +74,7 @@ namespace Microsoft.Zune.Configuration //IL_0039: Expected I, but got I8 //IL_005f: Expected I, but got I8 uint count = (uint)fileAssociationInfoList.Count; - global::FileAssociationInfo* ptr = (global::FileAssociationInfo*)Module.new_005B_005D((ulong)count * 32uL); + global::FileAssociationInfo* ptr = (global::FileAssociationInfo*)Module.new_005B_005D(count * 32uL); int num; if (ptr == null) { @@ -89,7 +89,7 @@ namespace Microsoft.Zune.Configuration } while (true) { - num = FileInfoToStruct(fileAssociationInfoList[(int)num2], (global::FileAssociationInfo*)((long)num2 * 32L + (nint)ptr)); + num = FileInfoToStruct(fileAssociationInfoList[(int)num2], (global::FileAssociationInfo*)(num2 * 32L + (nint)ptr)); if (num < 0) { break; @@ -132,15 +132,15 @@ namespace Microsoft.Zune.Configuration //IL_002c: Expected I8, but got I //IL_0037: Expected I8, but got I //IL_0045: Expected I8, but got I - fixed (char* fileAssocInfo.ExtensionPtr = fileAssocInfo.Extension.ToCharArray()) + fixed (char* fileAssocInfoExtensionPtr = fileAssocInfo.Extension.ToCharArray()) { - ushort* ptr = (ushort*)fileAssocInfo.ExtensionPtr; - fixed (char* fileAssocInfo.ProgIdPtr = fileAssocInfo.ProgId.ToCharArray()) + ushort* ptr = (ushort*)fileAssocInfoExtensionPtr; + fixed (char* fileAssocInfoProgIdPtr = fileAssocInfo.ProgId.ToCharArray()) { - ushort* ptr2 = (ushort*)fileAssocInfo.ProgIdPtr; - fixed (char* fileAssocInfo.DescriptionPtr = fileAssocInfo.Description.ToCharArray()) + ushort* ptr2 = (ushort*)fileAssocInfoProgIdPtr; + fixed (char* fileAssocInfoDescriptionPtr = fileAssocInfo.Description.ToCharArray()) { - ushort* ptr3 = (ushort*)fileAssocInfo.DescriptionPtr; + ushort* ptr3 = (ushort*)fileAssocInfoDescriptionPtr; *(long*)pFileAssocInfo = (nint)Module.SysAllocString(ptr); *(long*)((ulong)(nint)pFileAssocInfo + 8uL) = (nint)Module.SysAllocString(ptr2); ushort* ptr4 = Module.SysAllocString(ptr3); @@ -202,16 +202,11 @@ namespace Microsoft.Zune.Configuration { _007EFileAssociationHandlerWrapper(); } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfo.cs b/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfo.cs index f7c8faa..4581e67 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfo.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfo.cs @@ -32,7 +32,7 @@ namespace Microsoft.Zune.Configuration { get { - if (!(m_name == (string)null) && m_name.Length != 0) + if (!(m_name == null) && m_name.Length != 0) { return m_name; } @@ -47,11 +47,11 @@ namespace Microsoft.Zune.Configuration m_tunerType = tunerType; m_tunerRegisterType = tunerRegisterType; m_tunerVersion = tunerVersion; - if (dateCreated == (string)null || !DateTime.TryParse(dateCreated, out m_dtCreated)) + if (dateCreated == null || !DateTime.TryParse(dateCreated, out m_dtCreated)) { m_dtCreated = DateTime.MinValue; } - if (dateLastUsed == (string)null || !DateTime.TryParse(dateLastUsed, out m_dtLastUsed)) + if (dateLastUsed == null || !DateTime.TryParse(dateLastUsed, out m_dtLastUsed)) { m_dtLastUsed = DateTime.MinValue; } diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs b/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs index 58887e2..00c602c 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/TunerInfoHandler.cs @@ -55,7 +55,7 @@ namespace Microsoft.Zune.Configuration //IL_0034: Expected I, but got I8 IService* ptr = null; int num = 0; - if (Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IService, (void**)(&ptr)) >= 0) { IService* intPtr = ptr; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr + 200)))((nint)intPtr); @@ -107,7 +107,7 @@ namespace Microsoft.Zune.Configuration //IL_0077: Expected I, but got I8 //IL_007b: Expected I, but got I8 IService* ptr = null; - int singleton = Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&ptr)); + int singleton = Module.GetSingleton(Module.GUID_IService, (void**)(&ptr)); RefreshCallback* ptr2 = (RefreshCallback*)Module.@new(24uL); RefreshCallback* ptr3; try @@ -136,7 +136,7 @@ namespace Microsoft.Zune.Configuration ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr2 + 16)))((nint)intPtr2); ptr = null; } - if (singleton < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 156uL)) & (true ? 1u : 0u)) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 153uL)) >= 5u) + if (singleton < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 156uL)) & (true ? 1u : 0u)) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 153uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 144uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x2af74624_002EWPP_RegisteredDevicesApi_cpp_Traceguids), (uint)singleton); } @@ -150,7 +150,7 @@ namespace Microsoft.Zune.Configuration //IL_0090: Expected I, but got I8 //IL_0094: Expected I, but got I8 IService* ptr = null; - int singleton = Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&ptr)); + int singleton = Module.GetSingleton(Module.GUID_IService, (void**)(&ptr)); DeregisterCallback* ptr2 = (DeregisterCallback*)Module.@new(24uL); DeregisterCallback* ptr3; try @@ -192,7 +192,7 @@ namespace Microsoft.Zune.Configuration ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr2 + 16)))((nint)intPtr2); ptr = null; } - if (singleton < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 156uL)) & (true ? 1u : 0u)) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 153uL)) >= 5u) + if (singleton < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 156uL)) & (true ? 1u : 0u)) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 153uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 144uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x2af74624_002EWPP_RegisteredDevicesApi_cpp_Traceguids), (uint)singleton); } diff --git a/ZuneDBApi/Microsoft/Zune/Configuration/VersionInfo.cs b/ZuneDBApi/Microsoft/Zune/Configuration/VersionInfo.cs index 6149df6..6adee32 100644 --- a/ZuneDBApi/Microsoft/Zune/Configuration/VersionInfo.cs +++ b/ZuneDBApi/Microsoft/Zune/Configuration/VersionInfo.cs @@ -2,6 +2,11 @@ namespace Microsoft.Zune.Configuration { public class VersionInfo { - public static string BuildNumber => "4.8.2345.0"; + public static string BuildNumber => +#if ZUNE_5 + "5.0.0000.0"; +#else + "4.8.2345.0"; +#endif } } diff --git a/ZuneDBApi/Microsoft/Zune/ErrorMapperApi/ErrorMapperApi.cs b/ZuneDBApi/Microsoft/Zune/ErrorMapperApi/ErrorMapperApi.cs index e0964db..21f1268 100644 --- a/ZuneDBApi/Microsoft/Zune/ErrorMapperApi/ErrorMapperApi.cs +++ b/ZuneDBApi/Microsoft/Zune/ErrorMapperApi/ErrorMapperApi.cs @@ -10,7 +10,7 @@ namespace Microsoft.Zune.ErrorMapperApi ushort* ptr = null; ushort* ptr2 = null; int hr = 0; - if (Module.ZuneLibraryExports_002EGetMappedErrorDescriptionAndUrl(hrOrig, eCondition, &hr, &ptr, &ptr2) < 0) + if (Module.GetMappedErrorDescriptionAndUrl(hrOrig, eCondition, &hr, &ptr, &ptr2) < 0) { errorMapperResult.Hr = hrOrig; errorMapperResult.Description = ""; diff --git a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs index 71173ba..fcbeee6 100644 --- a/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs +++ b/ZuneDBApi/Microsoft/Zune/Messaging/MessagingService.cs @@ -721,7 +721,7 @@ namespace Microsoft.Zune.Messaging //IL_0071: Expected I, but got I8 //IL_0071: Expected I, but got I8 bool result = false; - if (m_pMessaging != null && strProfileImageResource != (string)null && strProfileImageUrl != (string)null) + if (m_pMessaging != null && strProfileImageResource != null && strProfileImageUrl != null) { CComPtrNtv_003CIMessagingCallback_003E cComPtrNtv_003CIMessagingCallback_003E; *(long*)(&cComPtrNtv_003CIMessagingCallback_003E) = 0L; @@ -800,7 +800,7 @@ namespace Microsoft.Zune.Messaging //IL_0090: Expected I, but got I8 //IL_0090: Expected I, but got I8 bool result = false; - if (m_pMessaging != null && profileImage != null && strProfileImageUrl != (string)null) + if (m_pMessaging != null && profileImage != null && strProfileImageUrl != null) { int num = 0; CComPtrNtv_003CIMessagingCallback_003E cComPtrNtv_003CIMessagingCallback_003E; diff --git a/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs b/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs index 793496a..b2e188d 100644 --- a/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs +++ b/ZuneDBApi/Microsoft/Zune/Messaging/PlaylistMessageData.cs @@ -66,7 +66,7 @@ namespace Microsoft.Zune.Messaging return -2147467261; } IMSMediaSchemaPropertyList* ptr = null; - int num = Module.ZuneLibraryExports_002ECreatePropertySetList((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_PLAYLIST), 3229617665u, &ptr); + int num = Module.CreatePropertySetList((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_PLAYLIST), 3229617665u, &ptr); if (num >= 0) { num = AddTracksToPropList(ptr); @@ -74,20 +74,20 @@ namespace Microsoft.Zune.Messaging IMSMediaSchemaPropertySet* ptr2 = null; if (num >= 0) { - num = Module.ZuneLibraryExports_002ECreatePropertySet((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_PLAYLIST), 3229617665u, &ptr2); + num = Module.CreatePropertySet((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_PLAYLIST), 3229617665u, &ptr2); } fixed (char* m_titlePtr = m_title.ToCharArray()) { ushort* ptr3 = (ushort*)m_titlePtr; if (num >= 0) { - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + Unsafe.InitBlock(&cComPropVariant, 0, 24); try { *(short*)(&cComPropVariant) = 8; - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = (nint)Module.SysAllocString(ptr3); + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = (nint)Module.SysAllocString(ptr3); tagPROPVARIANT tagPROPVARIANT = (tagPROPVARIANT)cComPropVariant; IMSMediaSchemaPropertySet* intPtr = ptr2; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr, 16777217u, tagPROPVARIANT); @@ -95,7 +95,7 @@ namespace Microsoft.Zune.Messaging catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -105,13 +105,13 @@ namespace Microsoft.Zune.Messaging ushort* ptr4 = (ushort*)m_authorPtr; if (num >= 0) { - CComPropVariant cComPropVariant2; + PROPVARIANT cComPropVariant2; // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant2, 0, 24); + Unsafe.InitBlock(&cComPropVariant2, 0, 24); try { *(short*)(&cComPropVariant2) = 8; - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)) = (nint)Module.SysAllocString(ptr4); + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)) = (nint)Module.SysAllocString(ptr4); tagPROPVARIANT tagPROPVARIANT2 = (tagPROPVARIANT)cComPropVariant2; IMSMediaSchemaPropertySet* intPtr2 = ptr2; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr2, 16777219u, tagPROPVARIANT2); @@ -119,14 +119,14 @@ namespace Microsoft.Zune.Messaging catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); throw; } Module.CComPropVariant_002EClear(&cComPropVariant2); } - CComPropVariant cComPropVariant3; + PROPVARIANT cComPropVariant3; // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant3, 0, 24); + Unsafe.InitBlock(&cComPropVariant3, 0, 24); try { if (num < 0) @@ -134,7 +134,7 @@ namespace Microsoft.Zune.Messaging goto IL_0144; } *(short*)(&cComPropVariant3) = 13; - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant3, 8)) = (nint)ptr; + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant3, 8)) = (nint)ptr; tagPROPVARIANT tagPROPVARIANT3 = (tagPROPVARIANT)cComPropVariant3; IMSMediaSchemaPropertySet* intPtr3 = ptr2; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr3, 3229617665u, tagPROPVARIANT3); @@ -163,7 +163,7 @@ namespace Microsoft.Zune.Messaging catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant3); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant3); throw; } Module.CComPropVariant_002EClear(&cComPropVariant3); @@ -203,15 +203,15 @@ namespace Microsoft.Zune.Messaging object property = dataProviderObject.GetProperty("ZuneMediaId"); if (property != null) { - gUID = Module.GuidToGUID((Guid)property); + gUID = (Guid)property; } string text = dataProviderObject.GetProperty("Title") as string; object s = ((!(text == (string)null)) ? text : ""); while (true) { - fixed (char* (string)sPtr = (string)s.ToCharArray()) + fixed (char* sPtr = ((string)s).ToCharArray()) { - ushort* ptr = (ushort*)(string)sPtr; + ushort* ptr = (ushort*)sPtr; while (true) { if (num2 < m_tracks.Count) @@ -233,7 +233,7 @@ namespace Microsoft.Zune.Messaging property = dataProviderObject.GetProperty("ZuneMediaId"); if (property != null) { - gUID = Module.GuidToGUID((Guid)property); + gUID = (Guid)property; } text = dataProviderObject.GetProperty("Title") as string; s = ((!(text == (string)null)) ? text : ""); @@ -267,7 +267,7 @@ namespace Microsoft.Zune.Messaging } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Playlist/AutoPlaylistBuilder.cs b/ZuneDBApi/Microsoft/Zune/Playlist/AutoPlaylistBuilder.cs index 68f2c45..2294f71 100644 --- a/ZuneDBApi/Microsoft/Zune/Playlist/AutoPlaylistBuilder.cs +++ b/ZuneDBApi/Microsoft/Zune/Playlist/AutoPlaylistBuilder.cs @@ -43,16 +43,14 @@ namespace Microsoft.Zune.Playlist bool flag = true; do { - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + PROPVARIANT cComPropVariant = default; try { IAutoPlaylistRules* intPtr = ptr; EMediaTypes type = m_type; uint atom; EAutoPlaylistRuleOperators op; - int num3 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 40)))((nint)intPtr, type, (uint)num, (uint)num2, &atom, &op, (PROPVARIANT)(&cComPropVariant)); + int num3 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 40)))((System.nint)intPtr, (EMediaTypes)type, (uint)(uint)num, (uint)(uint)num2, (uint*)&atom, (EAutoPlaylistRuleOperators*)&op, (PROPVARIANT)cComPropVariant); if (num3 >= 0) { if (num3 == 1) @@ -69,7 +67,7 @@ namespace Microsoft.Zune.Playlist } else { - CacheCriterion(num, (int)atom, (PROPVARIANT)(&cComPropVariant), op); + CacheCriterion(num, (int)atom, cComPropVariant, op); num2++; } goto IL_00b3; @@ -78,7 +76,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -88,15 +86,13 @@ namespace Microsoft.Zune.Playlist } while (flag); int num4 = 0; - CComPropVariant cComPropVariant2; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant2, 0, 24); + PROPVARIANT cComPropVariant2 = default; int num5; uint atom2; try { IAutoPlaylistRules* intPtr2 = ptr; - num5 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 72)))((nint)intPtr2, 0u, &atom2, (PROPVARIANT)(&cComPropVariant2)); + num5 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 72)))((System.nint)intPtr2, (uint)0u, (uint*)&atom2, (PROPVARIANT)cComPropVariant2); if (num5 < 0) { goto IL_0160; @@ -105,7 +101,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); throw; } while (true) @@ -116,24 +112,23 @@ namespace Microsoft.Zune.Playlist { break; } - CacheCriterion(0, (int)atom2, (PROPVARIANT)(&cComPropVariant2), (EAutoPlaylistRuleOperators)8); + CacheCriterion(0, (int)atom2, cComPropVariant2, (EAutoPlaylistRuleOperators)8); num4++; goto IL_0126; } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); throw; } - IL_0126: + IL_0126: Module.CComPropVariant_002EClear(&cComPropVariant2); - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant2, 0, 24); + cComPropVariant2 = default; try { IAutoPlaylistRules* intPtr3 = ptr; - num5 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 72)))((nint)intPtr3, (uint)num4, &atom2, (PROPVARIANT)(&cComPropVariant2)); + num5 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 72)))((System.nint)intPtr3, (uint)(uint)num4, (uint*)&atom2, (PROPVARIANT)cComPropVariant2); if (num5 >= 0) { continue; @@ -142,7 +137,7 @@ namespace Microsoft.Zune.Playlist catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); throw; } break; @@ -182,22 +177,18 @@ namespace Microsoft.Zune.Playlist m_currentRuleSetGroup = 0; IAutoPlaylistRules* pAutoPlaylistRules = m_pAutoPlaylistRules; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pAutoPlaylistRules + 24)))((nint)pAutoPlaylistRules); - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); try { - *(short*)(&cComPropVariant) = 3; - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = 1; + PROPVARIANT cComPropVariant = new(1, VarEnum.VT_I4); IAutoPlaylistRules* pAutoPlaylistRules2 = m_pAutoPlaylistRules; EMediaTypes type = m_type; int currentRuleSetGroup = m_currentRuleSetGroup; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pAutoPlaylistRules2 + 32)))((nint)pAutoPlaylistRules2, type, (uint)currentRuleSetGroup, 204u, (EAutoPlaylistRuleOperators)1, (PROPVARIANT)(&cComPropVariant)); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pAutoPlaylistRules2 + 32)))((System.nint)pAutoPlaylistRules2, (EMediaTypes)type, (uint)(uint)currentRuleSetGroup, (uint)204u, (EAutoPlaylistRuleOperators)(EAutoPlaylistRuleOperators)1, (PROPVARIANT)cComPropVariant); } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -208,26 +199,23 @@ namespace Microsoft.Zune.Playlist //IL_000f: Expected I4, but got I8 //IL_0041: Expected I, but got I8 int num = ZuneQueryList.AtomNameToAtom(atomName); - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); HRESULT result; try { - int num2 = ZuneQueryList.ConvertTypeToPropVariant(null, value, (PROPVARIANT)(&cComPropVariant)); + int num2 = ZuneQueryList.ConvertTypeToPropVariant(null, value, out var cComPropVariant); if (num2 >= 0) { IAutoPlaylistRules* pAutoPlaylistRules = m_pAutoPlaylistRules; EMediaTypes type = m_type; int currentRuleSetGroup = m_currentRuleSetGroup; - num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pAutoPlaylistRules + 32)))((nint)pAutoPlaylistRules, type, (uint)currentRuleSetGroup, (uint)num, (EAutoPlaylistRuleOperators)op, (PROPVARIANT)(&cComPropVariant)); + num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pAutoPlaylistRules + 32)))((System.nint)pAutoPlaylistRules, (EMediaTypes)type, (uint)(uint)currentRuleSetGroup, (uint)(uint)num, (EAutoPlaylistRuleOperators)(EAutoPlaylistRuleOperators)op, (PROPVARIANT)cComPropVariant); } result = num2; } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -270,24 +258,21 @@ namespace Microsoft.Zune.Playlist //IL_000f: Expected I4, but got I8 //IL_0034: Expected I, but got I8 int num = ZuneQueryList.AtomNameToAtom(atomName); - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); HRESULT result; try { - int num2 = ZuneQueryList.ConvertTypeToPropVariant(null, value, (PROPVARIANT)(&cComPropVariant)); + int num2 = ZuneQueryList.ConvertTypeToPropVariant(null, value, out var cComPropVariant); if (num2 >= 0) { IAutoPlaylistRules* pAutoPlaylistRules = m_pAutoPlaylistRules; - num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pAutoPlaylistRules + 64)))((nint)pAutoPlaylistRules, (uint)num, (PROPVARIANT)(&cComPropVariant)); + num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pAutoPlaylistRules + 64)))((nint)pAutoPlaylistRules, (uint)(uint)num, (PROPVARIANT)cComPropVariant); } result = num2; } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -342,7 +327,7 @@ namespace Microsoft.Zune.Playlist } else { - stringBuilder.Append(","); + stringBuilder.Append(','); stringBuilder.Append(value); } num++; @@ -395,16 +380,16 @@ namespace Microsoft.Zune.Playlist private unsafe static object PropVariantToObject(PROPVARIANT pvtValue) { Type type; - switch (*(ushort*)pvtValue) + switch (pvtValue.vt) { - case 8: + case VARTYPE.VT_BSTR: type = typeof(string); break; - case 3: + case VARTYPE.VT_I4: type = typeof(int); break; - case 0: - case 1: + case VARTYPE.VT_NULL: + case VARTYPE.VT_EMPTY: return null; default: type = null; @@ -423,16 +408,11 @@ namespace Microsoft.Zune.Playlist { _007EAutoPlaylistBuilder(); } - else - { - Finalize(); - } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperationCompleted.cs b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperationCompleted.cs index b018f73..cfb76f1 100644 --- a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperationCompleted.cs +++ b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistAsyncOperationCompleted.cs @@ -2,5 +2,5 @@ using ZuneUI; namespace Microsoft.Zune.Playlist { - public delegate void PlaylistAsyncOperationCompleted(HRESULT); + public delegate void PlaylistAsyncOperationCompleted(HRESULT hr); } diff --git a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs index 01b142b..0211ca9 100644 --- a/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs @@ -60,10 +60,7 @@ namespace Microsoft.Zune.Playlist public unsafe HRESULT CreatePlaylist(string title, string author, [In] ValueType serviceMediaId, CreatePlaylistOption options, out int playlistId) { - //IL_0097: Expected I4, but got I8 - //IL_00e8: Incompatible stack types: I8 vs Ref - //IL_0115: Expected I, but got I8 - //IL_0115: Expected I, but got I8 + playlistId = -1; bool flag = (options & CreatePlaylistOption.PrivatePlaylist) > CreatePlaylistOption.None; bool flag2 = (options & CreatePlaylistOption.AutoPlaylist) > CreatePlaylistOption.None; bool flag3 = (options & CreatePlaylistOption.SyncRule) > CreatePlaylistOption.None; @@ -90,7 +87,7 @@ namespace Microsoft.Zune.Playlist ushort* ptr3 = (ushort*)authorPtr; try { - EPlaylistCreateConflictAction ePlaylistCreateConflictAction = (EPlaylistCreateConflictAction)0; + EPlaylistCreateConflictAction ePlaylistCreateConflictAction = 0; if (flag5) { ePlaylistCreateConflictAction = (EPlaylistCreateConflictAction)2; @@ -105,7 +102,7 @@ namespace Microsoft.Zune.Playlist Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref gUID, 4), 0, 12); if (serviceMediaId != null) { - gUID = Module.GuidToGUID((Guid)serviceMediaId); + gUID = (Guid)serviceMediaId; } bool flag6 = ((!(flag3 || flag)) ? true : false); EPlaylistType ePlaylistType; @@ -122,7 +119,7 @@ namespace Microsoft.Zune.Playlist } else { - EPlaylistType ePlaylistType3 = (flag2 ? ((EPlaylistType)1) : ((EPlaylistType)0)); + EPlaylistType ePlaylistType3 = (flag2 ? ((EPlaylistType)1) : 0); ePlaylistType2 = ePlaylistType3; } ePlaylistType = ePlaylistType2; @@ -355,21 +352,21 @@ namespace Microsoft.Zune.Playlist ushort* ptr = (ushort*)candidateTitlePtr; try { - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + Unsafe.InitBlock(&cComPropVariant, 0, 24); try { long num = *(long*)m_pPlaylistManager + 136; IPlaylistManager* pPlaylistManager = m_pPlaylistManager; int num2; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)pPlaylistManager, ptr, &num2, (PROPVARIANT)(&cComPropVariant)); - result = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8))); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((System.nint)pPlaylistManager, (ushort*)ptr, (int*)&num2, (PROPVARIANT)cComPropVariant); + result = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8))); } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -388,6 +385,7 @@ namespace Microsoft.Zune.Playlist public unsafe HRESULT GetPlaylistByServiceMediaId(Guid serviceMediaId, out int playlistId) { //IL_0034: Expected I, but got I8 + playlistId = -1; int hr; if (m_pPlaylistManager == null) { @@ -396,7 +394,7 @@ namespace Microsoft.Zune.Playlist else { int num = -1; - _GUID gUID = Module.GuidToGUID(serviceMediaId); + _GUID gUID = serviceMediaId; IPlaylistManager* pPlaylistManager = m_pPlaylistManager; hr = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pPlaylistManager + 168)))((nint)pPlaylistManager, gUID, &num); playlistId = num; @@ -406,7 +404,7 @@ namespace Microsoft.Zune.Playlist public unsafe HRESULT GetAutoPlaylistSchema(int playlistId, out EMediaTypes schema) { - //IL_0033: Expected I, but got I8 + schema = EMediaTypes.eMediaTypeInvalid; EMediaTypes eMediaTypes = EMediaTypes.eMediaTypeInvalid; int num; if (playlistId < 0) @@ -460,7 +458,7 @@ namespace Microsoft.Zune.Playlist { //IL_0009: Expected I, but got I8 IPlaylistManager* pPlaylistManager = null; - int singleton = Module.GetSingleton((_GUID)Module._GUID_c2d9122b_f648_4b95_92fc_11f2e7f326d7, (void**)(&pPlaylistManager)); + int singleton = Module.GetSingleton(Module.GUID_IPlaylistManager, (void**)(&pPlaylistManager)); if (singleton >= 0) { m_pPlaylistManager = pPlaylistManager; @@ -482,14 +480,13 @@ namespace Microsoft.Zune.Playlist } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~PlaylistManager() diff --git a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMix.cs b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMix.cs index 8330b92..29c6fdd 100644 --- a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMix.cs +++ b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMix.cs @@ -31,7 +31,7 @@ namespace Microsoft.Zune.QuickMix *(sbyte*)(&qUICK_MIX_STATUS_INFO) = 0; // IL initblk instruction Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref qUICK_MIX_STATUS_INFO, 1), 0, 15); - int singleton = Module.GetSingleton((_GUID)Module._GUID_d69e22ae_7e21_4959_be6e_14462eb96f64, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); + int singleton = Module.GetSingleton(Module.GUID_IQuickMixManager, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); if (singleton >= 0) { long num = *(long*)(&cComPtrNtv_003CIQuickMixManager_003E); @@ -96,7 +96,7 @@ namespace Microsoft.Zune.QuickMix *(sbyte*)(&qUICK_MIX_STATUS_INFO) = 0; // IL initblk instruction Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref qUICK_MIX_STATUS_INFO, 1), 0, 15); - if (Module.GetSingleton((_GUID)Module._GUID_d69e22ae_7e21_4959_be6e_14462eb96f64, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)) >= 0) + if (Module.GetSingleton(Module.GUID_IQuickMixManager, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)) >= 0) { long num = *(long*)(&cComPtrNtv_003CIQuickMixManager_003E); ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIQuickMixManager_003E)) + 56)))((nint)num, &qUICK_MIX_STATUS_INFO); @@ -131,10 +131,10 @@ namespace Microsoft.Zune.QuickMix *(long*)(&cComPtrNtv_003CIQuickMixSession_003E) = 0L; try { - int num = Module.GetSingleton((_GUID)Module._GUID_d69e22ae_7e21_4959_be6e_14462eb96f64, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); + int num = Module.GetSingleton(Module.GUID_IQuickMixManager, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); if (num >= 0) { - _GUID gUID = Module.GuidToGUID(serviceMediaId); + _GUID gUID = serviceMediaId; fixed (char* mediaTitlePtr = mediaTitle.ToCharArray()) { ushort* ptr = (ushort*)mediaTitlePtr; @@ -190,7 +190,7 @@ namespace Microsoft.Zune.QuickMix *(long*)(&cComPtrNtv_003CIQuickMixSession_003E) = 0L; try { - int num = Module.GetSingleton((_GUID)Module._GUID_d69e22ae_7e21_4959_be6e_14462eb96f64, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); + int num = Module.GetSingleton(Module.GUID_IQuickMixManager, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); if (num >= 0) { fixed (int* ptr = &seedMediaIds[0]) @@ -268,7 +268,7 @@ namespace Microsoft.Zune.QuickMix num2 = num; if (num >= 0) { - num2 = Module.GetSingleton((_GUID)Module._GUID_d69e22ae_7e21_4959_be6e_14462eb96f64, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); + num2 = Module.GetSingleton(Module.GUID_IQuickMixManager, (void**)(&cComPtrNtv_003CIQuickMixManager_003E)); if (num2 >= 0) { QuickMixCallbackProxy* ptr3 = (QuickMixCallbackProxy*)((ptr2 == null) ? 0 : ((ulong)(nint)ptr2 + 8uL)); diff --git a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs index f8dd2dd..b974c1a 100644 --- a/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs +++ b/ZuneDBApi/Microsoft/Zune/QuickMix/QuickMixSession.cs @@ -232,7 +232,7 @@ namespace Microsoft.Zune.QuickMix } else { - ePlaylistCreateConflictAction = (EPlaylistCreateConflictAction)0; + ePlaylistCreateConflictAction = 0; } IQuickMixSession* p = m_spSession.p; long num3 = *(long*)p + 72; diff --git a/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs b/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs index 04a84ae..16131af 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs @@ -17,7 +17,6 @@ namespace Microsoft.Zune.Service try { m_spAccountManagement = spAccountManagement; - base._002Ector(); } catch { @@ -954,34 +953,34 @@ namespace Microsoft.Zune.Service num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 32)))((nint)p, (IAddress**)(&cComPtrNtv_003CIAddress_003E)); if (num >= 0) { - fixed (char* address.Street1Ptr = address.Street1.ToCharArray()) + fixed (char* addressStreet1Ptr = address.Street1.ToCharArray()) { - ushort* ptr = (ushort*)address.Street1Ptr; + ushort* ptr = (ushort*)addressStreet1Ptr; try { - fixed (char* address.Street2Ptr = address.Street2.ToCharArray()) + fixed (char* addressStreet2Ptr = address.Street2.ToCharArray()) { - ushort* ptr2 = (ushort*)address.Street2Ptr; + ushort* ptr2 = (ushort*)addressStreet2Ptr; try { - fixed (char* address.CityPtr = address.City.ToCharArray()) + fixed (char* addressCityPtr = address.City.ToCharArray()) { - ushort* ptr3 = (ushort*)address.CityPtr; + ushort* ptr3 = (ushort*)addressCityPtr; try { - fixed (char* address.StatePtr = address.State.ToCharArray()) + fixed (char* addressStatePtr = address.State.ToCharArray()) { - ushort* ptr4 = (ushort*)address.StatePtr; + ushort* ptr4 = (ushort*)addressStatePtr; try { - fixed (char* address.DistrictPtr = address.District.ToCharArray()) + fixed (char* addressDistrictPtr = address.District.ToCharArray()) { - ushort* ptr5 = (ushort*)address.DistrictPtr; + ushort* ptr5 = (ushort*)addressDistrictPtr; try { - fixed (char* address.PostalCodePtr = address.PostalCode.ToCharArray()) + fixed (char* addressPostalCodePtr = address.PostalCode.ToCharArray()) { - ushort* ptr6 = (ushort*)address.PostalCodePtr; + ushort* ptr6 = (ushort*)addressPostalCodePtr; try { long num2 = *(long*)(*(ulong*)(&cComPtrNtv_003CIAddress_003E)) + 24; @@ -1084,44 +1083,44 @@ namespace Microsoft.Zune.Service if (num >= 0) { _SYSTEMTIME sYSTEMTIME = Module.DateTimeToSystemTime(creditCard.ExpirationDate); - fixed (char* creditCard.AccountHolderNamePtr = creditCard.AccountHolderName.ToCharArray()) + fixed (char* creditCardAccountHolderNamePtr = creditCard.AccountHolderName.ToCharArray()) { - ushort* ptr = (ushort*)creditCard.AccountHolderNamePtr; + ushort* ptr = (ushort*)creditCardAccountHolderNamePtr; try { - fixed (char* creditCard.AccountNumberPtr = creditCard.AccountNumber.ToCharArray()) + fixed (char* creditCardAccountNumberPtr = creditCard.AccountNumber.ToCharArray()) { - ushort* ptr2 = (ushort*)creditCard.AccountNumberPtr; + ushort* ptr2 = (ushort*)creditCardAccountNumberPtr; try { - fixed (char* creditCard.CCVNumberPtr = creditCard.CCVNumber.ToCharArray()) + fixed (char* creditCardCCVNumberPtr = creditCard.CCVNumber.ToCharArray()) { - ushort* ptr3 = (ushort*)creditCard.CCVNumberPtr; + ushort* ptr3 = (ushort*)creditCardCCVNumberPtr; try { - fixed (char* creditCard.LocalePtr = creditCard.Locale.ToCharArray()) + fixed (char* creditCardLocalePtr = creditCard.Locale.ToCharArray()) { - ushort* ptr4 = (ushort*)creditCard.LocalePtr; + ushort* ptr4 = (ushort*)creditCardLocalePtr; try { - fixed (char* creditCard.PhoneNumberPtr = creditCard.PhoneNumber.ToCharArray()) + fixed (char* creditCardPhoneNumberPtr = creditCard.PhoneNumber.ToCharArray()) { - ushort* ptr5 = (ushort*)creditCard.PhoneNumberPtr; + ushort* ptr5 = (ushort*)creditCardPhoneNumberPtr; try { - fixed (char* creditCard.EmailPtr = creditCard.Email.ToCharArray()) + fixed (char* creditCardEmailPtr = creditCard.Email.ToCharArray()) { - ushort* ptr6 = (ushort*)creditCard.EmailPtr; + ushort* ptr6 = (ushort*)creditCardEmailPtr; try { - fixed (char* creditCard.ContactFirstNamePtr = creditCard.ContactFirstName.ToCharArray()) + fixed (char* creditCardContactFirstNamePtr = creditCard.ContactFirstName.ToCharArray()) { - ushort* ptr7 = (ushort*)creditCard.ContactFirstNamePtr; + ushort* ptr7 = (ushort*)creditCardContactFirstNamePtr; try { - fixed (char* creditCard.ContactLastNamePtr = creditCard.ContactLastName.ToCharArray()) + fixed (char* creditCardContactLastNamePtr = creditCard.ContactLastName.ToCharArray()) { - ushort* ptr8 = (ushort*)creditCard.ContactLastNamePtr; + ushort* ptr8 = (ushort*)creditCardContactLastNamePtr; try { long num2 = *(long*)(*(ulong*)(&cComPtrNtv_003CICreditCard_003E)) + 24; @@ -1398,39 +1397,39 @@ namespace Microsoft.Zune.Service { sYSTEMTIME = Module.DateTimeToSystemTime(accountUser.Birthday); } - fixed (char* accountUser.ZuneTagPtr = accountUser.ZuneTag.ToCharArray()) + fixed (char* accountUserZuneTagPtr = accountUser.ZuneTag.ToCharArray()) { - ushort* ptr2 = (ushort*)accountUser.ZuneTagPtr; + ushort* ptr2 = (ushort*)accountUserZuneTagPtr; try { - fixed (char* accountUser.LocalePtr = accountUser.Locale.ToCharArray()) + fixed (char* accountUserLocalePtr = accountUser.Locale.ToCharArray()) { - ushort* ptr3 = (ushort*)accountUser.LocalePtr; + ushort* ptr3 = (ushort*)accountUserLocalePtr; try { - fixed (char* accountUser.FirstNamePtr = accountUser.FirstName.ToCharArray()) + fixed (char* accountUserFirstNamePtr = accountUser.FirstName.ToCharArray()) { - ushort* ptr4 = (ushort*)accountUser.FirstNamePtr; + ushort* ptr4 = (ushort*)accountUserFirstNamePtr; try { - fixed (char* accountUser.LastNamePtr = accountUser.LastName.ToCharArray()) + fixed (char* accountUserLastNamePtr = accountUser.LastName.ToCharArray()) { - ushort* ptr5 = (ushort*)accountUser.LastNamePtr; + ushort* ptr5 = (ushort*)accountUserLastNamePtr; try { - fixed (char* accountUser.EmailPtr = accountUser.Email.ToCharArray()) + fixed (char* accountUserEmailPtr = accountUser.Email.ToCharArray()) { - ushort* ptr6 = (ushort*)accountUser.EmailPtr; + ushort* ptr6 = (ushort*)accountUserEmailPtr; try { - fixed (char* accountUser.PhoneNumberPtr = accountUser.PhoneNumber.ToCharArray()) + fixed (char* accountUserPhoneNumberPtr = accountUser.PhoneNumber.ToCharArray()) { - ushort* ptr7 = (ushort*)accountUser.PhoneNumberPtr; + ushort* ptr7 = (ushort*)accountUserPhoneNumberPtr; try { - fixed (char* accountUser.MobilePhoneNumberPtr = accountUser.MobilePhoneNumber.ToCharArray()) + fixed (char* accountUserMobilePhoneNumberPtr = accountUser.MobilePhoneNumber.ToCharArray()) { - ushort* ptr8 = (ushort*)accountUser.MobilePhoneNumberPtr; + ushort* ptr8 = (ushort*)accountUserMobilePhoneNumberPtr; try { _SYSTEMTIME* ptr = (_SYSTEMTIME*)Unsafe.AsPointer(ref flag ? ref sYSTEMTIME : ref *(_SYSTEMTIME*)null); @@ -1579,7 +1578,7 @@ namespace Microsoft.Zune.Service *(long*)(&cComPtrNtv_003CIService_003E) = 0L; try { - num = Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&cComPtrNtv_003CIService_003E)); + num = Module.GetSingleton(Module.GUID_IService, (void**)(&cComPtrNtv_003CIService_003E)); CComPtrNtv_003CIUnknown_003E cComPtrNtv_003CIUnknown_003E; *(long*)(&cComPtrNtv_003CIUnknown_003E) = 0L; try @@ -1651,16 +1650,11 @@ namespace Microsoft.Zune.Service ((IDisposable)m_spAccountManagement).Dispose(); } } - else - { - Finalize(); - } } public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/AlbumOffer.cs b/ZuneDBApi/Microsoft/Zune/Service/AlbumOffer.cs index fe04642..677add4 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AlbumOffer.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AlbumOffer.cs @@ -33,7 +33,7 @@ namespace Microsoft.Zune.Service { get { - if (m_coverArt == null && m_coverArtUrl != (string)null) + if (m_coverArt == null && m_coverArtUrl != null) { m_coverArt = new Image(m_coverArtUrl); } diff --git a/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs index a794424..120a0a5 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AlbumOfferCollection.cs @@ -14,7 +14,6 @@ namespace Microsoft.Zune.Service public IList Items => m_items; internal unsafe AlbumOfferCollection() - : this() { //IL_0015: Expected I, but got I8 m_items = null; @@ -92,23 +91,23 @@ namespace Microsoft.Zune.Service long num6 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)); int num7 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)) + 176)))((nint)num6, 1, 1); long num8 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)); - int num9 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)) + 72)))((nint)num8, (EMediaRights)4, (EMediaFormat)0); + int num9 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)) + 72)))((nint)num8, (EMediaRights)4, 0); if (Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 64)) != 0L) { releaseYear = Module._wtoi((ushort*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 64))); } - EMediaFormat eMediaFormat = ((num9 == 0) ? ((EMediaFormat)1) : ((EMediaFormat)0)); + EMediaFormat eMediaFormat = ((num9 == 0) ? ((EMediaFormat)1) : 0); long num10 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)); if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)) + 72)))((nint)num10, (EMediaRights)4, eMediaFormat) != 0) { - EMediaFormat eMediaFormat2 = ((num9 == 0) ? ((EMediaFormat)1) : ((EMediaFormat)0)); + EMediaFormat eMediaFormat2 = ((num9 == 0) ? ((EMediaFormat)1) : 0); long num11 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)); IPriceInfo** intPtr = Module.CComPtrNtv_003CIPriceInfo_003E_002E_0026(&cComPtrNtv_003CIPriceInfo_003E); num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 88)) + 104)))((nint)num11, (EMediaRights)4, eMediaFormat2, intPtr); } if (num >= 0) { - Guid id = Module.GUIDToGuid(Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 8))); + Guid id = Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 8)); string recommendationContext = GetRecommendationContext(id, mapIdToContext, Module.CComPtrNtv_003CIContextData_003E_002E_002EPEAUIContextData_0040_0040(&cComPtrNtv_003CIContextData_003E)); bool inCollection = ((num5 != 0) ? true : false); bool previouslyPurchased = ((num7 != 0) ? true : false); @@ -185,7 +184,7 @@ namespace Microsoft.Zune.Service } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Service/AppOffer.cs b/ZuneDBApi/Microsoft/Zune/Service/AppOffer.cs index 79e6ba4..16a92c1 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AppOffer.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AppOffer.cs @@ -41,7 +41,7 @@ namespace Microsoft.Zune.Service { get { - if (m_ratingImage == null && m_ratingImageUrl != (string)null) + if (m_ratingImage == null && m_ratingImageUrl != null) { m_ratingImage = new Image(m_ratingImageUrl); } @@ -53,7 +53,7 @@ namespace Microsoft.Zune.Service { get { - if (m_previewImage == null && m_previewImageUrl != (string)null) + if (m_previewImage == null && m_previewImageUrl != null) { m_previewImage = new Image(m_previewImageUrl); } diff --git a/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs index f5b8cfb..d9cf6b1 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/AppOfferCollection.cs @@ -14,8 +14,7 @@ namespace Microsoft.Zune.Service public IList Items => m_items; - internal unsafe AppOfferCollection() - : this() + internal unsafe AppOfferCollection() : base() { //IL_0015: Expected I, but got I8 m_items = null; @@ -86,7 +85,7 @@ namespace Microsoft.Zune.Service { result = DateTime.MinValue; } - Guid id = Module.GUIDToGuid(Unsafe.As(ref Unsafe.AddByteOffset(ref appMetadata, 8))); + Guid id = Unsafe.As(ref Unsafe.AddByteOffset(ref appMetadata, 8)); long num4 = Unsafe.As(ref Unsafe.AddByteOffset(ref appMetadata, 136)); bool inCollection = ((((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref appMetadata, 136)) + 144)))((nint)num4) != 0) ? true : false); _0024ArrayType_0024_0024_0024BY01W4EMediaRights_0040_0040 _0024ArrayType_0024_0024_0024BY01W4EMediaRights_0040_0040; @@ -176,7 +175,7 @@ namespace Microsoft.Zune.Service } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Service/BillingOffer.cs b/ZuneDBApi/Microsoft/Zune/Service/BillingOffer.cs index e164353..97f2a70 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/BillingOffer.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/BillingOffer.cs @@ -70,7 +70,7 @@ namespace Microsoft.Zune.Service m_price = price; m_taxes = taxes; m_trial = trial; - if (offerName != (string)null) + if (offerName != null) { m_offerName = m_offerName.Trim(); } diff --git a/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs index c2cb459..e0578c1 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/BillingOfferCollection.cs @@ -59,7 +59,7 @@ namespace Microsoft.Zune.Service float price = 0f; int num4 = 1; int num5 = 0; - global::EBillingOfferType eBillingOfferType = (global::EBillingOfferType)0; + global::EBillingOfferType eBillingOfferType = 0; if (num >= 0) { num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pCollection + 32)))((nint)pCollection, num3, &id, &eBillingOfferType, &ptr, &ptr2, &points, &price, &num4, &num5); diff --git a/ZuneDBApi/Microsoft/Zune/Service/CreditCard.cs b/ZuneDBApi/Microsoft/Zune/Service/CreditCard.cs index 474bf3a..838246c 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/CreditCard.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/CreditCard.cs @@ -375,7 +375,7 @@ namespace Microsoft.Zune.Service public override string ToString() { - if (m_accountNumber != (string)null && m_accountNumber.Length > 4) + if (m_accountNumber != null && m_accountNumber.Length > 4) { string accountNumber = m_accountNumber; string text = accountNumber; diff --git a/ZuneDBApi/Microsoft/Zune/Service/DRMInfo.cs b/ZuneDBApi/Microsoft/Zune/Service/DRMInfo.cs index 61d90dc..d2c4ef6 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/DRMInfo.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/DRMInfo.cs @@ -65,7 +65,7 @@ namespace Microsoft.Zune.Service [return: MarshalAs(UnmanagedType.U1)] get { - return m_canPlay == (DRMQueryState)0; + return m_canPlay == 0; } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/HttpWebRequest.cs b/ZuneDBApi/Microsoft/Zune/Service/HttpWebRequest.cs index 170cf7e..0ca3e74 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/HttpWebRequest.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/HttpWebRequest.cs @@ -20,7 +20,6 @@ namespace Microsoft.Zune.Service { m_pRequest = pRequest; m_cancelOnShutdown = cancelOnShutdown; - base._002Ector(); } } @@ -516,9 +515,9 @@ namespace Microsoft.Zune.Service return -2147467261; } *(long*)ppRequest = 0L; - fixed (char* _uri.AbsoluteUriPtr = _uri.AbsoluteUri.ToCharArray()) + fixed (char* _uriAbsoluteUriPtr = _uri.AbsoluteUri.ToCharArray()) { - ushort* ptr = (ushort*)_uri.AbsoluteUriPtr; + ushort* ptr = (ushort*)_uriAbsoluteUriPtr; fixed (char* _methodPtr = _method.ToCharArray()) { ushort* ptr2 = (ushort*)_methodPtr; @@ -527,7 +526,7 @@ namespace Microsoft.Zune.Service int num; try { - num = Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&cComPtrNtv_003CIService_003E)); + num = Module.GetSingleton(Module.GUID_IService, (void**)(&cComPtrNtv_003CIService_003E)); CComPtrNtv_003CIHttpWebRequest_003E cComPtrNtv_003CIHttpWebRequest_003E; *(long*)(&cComPtrNtv_003CIHttpWebRequest_003E) = 0L; try @@ -539,11 +538,11 @@ namespace Microsoft.Zune.Service num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)num3, ptr, ptr2, (IHttpWebRequest**)(&cComPtrNtv_003CIHttpWebRequest_003E)); if (num >= 0) { - if (_authorization != (string)null && _authorization.Length > 0) + if (_authorization != null && _authorization.Length > 0) { Module.Microsoft_002EZune_002EService_002E_003FA0x12f4bdec_002ESetHeader((IHttpWebRequest*)(*(ulong*)(&cComPtrNtv_003CIHttpWebRequest_003E)), "Authorization: " + _authorization); } - if (_acceptLanguage != (string)null && _acceptLanguage.Length > 0) + if (_acceptLanguage != null && _acceptLanguage.Length > 0) { Module.Microsoft_002EZune_002EService_002E_003FA0x12f4bdec_002ESetHeader((IHttpWebRequest*)(*(ulong*)(&cComPtrNtv_003CIHttpWebRequest_003E)), "Accept-Language: " + _acceptLanguage); } @@ -575,7 +574,7 @@ namespace Microsoft.Zune.Service case HttpRequestCachePolicy.BypassCache: { long num5 = *(long*)(&cComPtrNtv_003CIHttpWebRequest_003E); - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIHttpWebRequest_003E)) + 24)))((nint)num5, (EHttpCacheLevel)0); + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIHttpWebRequest_003E)) + 24)))((nint)num5, 0); break; } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs b/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs index 533ba5d..b05fa78 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/PassportIdentity.cs @@ -19,7 +19,7 @@ namespace Microsoft.Zune.Service { //IL_0020: Expected I, but got I8 //IL_0036: Expected I, but got I8 - if (m_serviceTicket == (string)null) + if (m_serviceTicket == null) { CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = m_spPassportIdentity; if (spPassportIdentity.p != null) @@ -43,7 +43,7 @@ namespace Microsoft.Zune.Service { //IL_0020: Expected I, but got I8 //IL_0036: Expected I, but got I8 - if (m_password == (string)null) + if (m_password == null) { CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = m_spPassportIdentity; if (spPassportIdentity.p != null) @@ -67,7 +67,7 @@ namespace Microsoft.Zune.Service { //IL_0020: Expected I, but got I8 //IL_0036: Expected I, but got I8 - if (m_username == (string)null) + if (m_username == null) { CComPtrMgd_003CIPassportIdentity_003E spPassportIdentity = m_spPassportIdentity; if (spPassportIdentity.p != null) diff --git a/ZuneDBApi/Microsoft/Zune/Service/Service.cs b/ZuneDBApi/Microsoft/Zune/Service/Service.cs index 9c8fd33..913f3fb 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/Service.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/Service.cs @@ -34,7 +34,7 @@ namespace Microsoft.Zune.Service //IL_0008: Expected I, but got I8 //IL_0011: Expected I, but got I8 IService* pService = null; - if (Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&pService)) >= 0) + if (Module.GetSingleton(Module.GUID_IService, (void**)(&pService)) >= 0) { m_pService = pService; } @@ -648,7 +648,7 @@ namespace Microsoft.Zune.Service flag = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 384)))((nint)pService, &gUID_NULL, &num) >= 0 || flag; } iUserId = num; - Guid guid = (guidUserGuid = Module.GUIDToGuid(gUID_NULL)); + Guid guid = (guidUserGuid = gUID_NULL); return flag; } @@ -672,7 +672,7 @@ namespace Microsoft.Zune.Service //IL_0035: Expected I, but got I8 //IL_0035: Expected I, but got I8 bool flag = false; - _GUID gUID = Module.GuidToGUID(guidUserGuid); + _GUID gUID = guidUserGuid; int num = 0; IService* pService = m_pService; if (pService != null) @@ -802,7 +802,7 @@ namespace Microsoft.Zune.Service IContextData* intPtr3; IService* pService3; IMediaCollection* intPtr4; - if (!(deviceEndpointId != (string)null) || deviceEndpointId.Equals("")) + if (!(deviceEndpointId != null) || deviceEndpointId.Equals("")) { if (items != null) { @@ -833,7 +833,7 @@ namespace Microsoft.Zune.Service { if (typeName.Equals("PlaylistContentItem")) { - eContentType = (global::EContentType)0; + eContentType = 0; guid = (Guid)dataProviderObject.GetProperty("ZuneMediaId"); s = (string)dataProviderObject.GetProperty("Title"); s2 = (string)dataProviderObject.GetProperty("AlbumName"); @@ -870,7 +870,7 @@ namespace Microsoft.Zune.Service } else { - eContentType = (global::EContentType)0; + eContentType = 0; guid = (Guid)dataProviderObject.GetProperty("Id"); s = (string)dataProviderObject.GetProperty("Title"); s2 = (string)dataProviderObject.GetProperty("AlbumTitle"); @@ -890,7 +890,7 @@ namespace Microsoft.Zune.Service } else if (current is TrackOffer) { - eContentType = (global::EContentType)0; + eContentType = 0; TrackOffer trackOffer = current as TrackOffer; guid = trackOffer.Id; s = trackOffer.Title; @@ -943,7 +943,7 @@ namespace Microsoft.Zune.Service { continue; } - gUID = Module.GuidToGUID(guid); + gUID = guid; fixed (char* sPtr = s.ToCharArray()) { ushort* ptr5 = (ushort*)sPtr; @@ -998,7 +998,7 @@ namespace Microsoft.Zune.Service num3 = eDownloadContextEvent; val2 = ptr9; intPtr = Module.CComPtrNtv_003CIContextData_003E_002E_0026(&cComPtrNtv_003CIContextData_003E); - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)pService2, (ushort*)(nint)val, num3, (ushort*)(nint)val2, intPtr); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)pService2, (ushort*)val, num3, (ushort*)val2, intPtr); long num4 = *(long*)ptr4 + 40; intPtr2 = ptr4; reference4 = ref gUID; @@ -1029,7 +1029,7 @@ namespace Microsoft.Zune.Service num3 = eDownloadContextEvent; val2 = ref reference3; intPtr = Module.CComPtrNtv_003CIContextData_003E_002E_0026(&cComPtrNtv_003CIContextData_003E); - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)pService2, (ushort*)(nint)val, num3, (ushort*)Unsafe.AsPointer(ref val2), intPtr); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)pService2, (ushort*)val, num3, (ushort*)Unsafe.AsPointer(ref val2), intPtr); long num4 = *(long*)ptr4 + 40; intPtr2 = ptr4; reference4 = ref gUID; @@ -2529,7 +2529,7 @@ namespace Microsoft.Zune.Service { if (typeName.Equals("PlaylistContentItem")) { - eContentType = (global::EContentType)0; + eContentType = 0; guid = (Guid)dataProviderObject.GetProperty("ZuneMediaId"); s = (string)dataProviderObject.GetProperty("Title"); s2 = (string)dataProviderObject.GetProperty("AlbumName"); @@ -2566,7 +2566,7 @@ namespace Microsoft.Zune.Service } else { - eContentType = (global::EContentType)0; + eContentType = 0; guid = (Guid)dataProviderObject.GetProperty("Id"); s = (string)dataProviderObject.GetProperty("Title"); s2 = (string)dataProviderObject.GetProperty("AlbumTitle"); @@ -2586,7 +2586,7 @@ namespace Microsoft.Zune.Service } else if (current is TrackOffer) { - eContentType = (global::EContentType)0; + eContentType = 0; TrackOffer trackOffer = current as TrackOffer; guid = trackOffer.Id; s = trackOffer.Title; @@ -2639,7 +2639,7 @@ namespace Microsoft.Zune.Service { continue; } - gUID = Module.GuidToGUID(guid); + gUID = guid; fixed (char* sPtr = s.ToCharArray()) { ushort* ptr5 = (ushort*)sPtr; @@ -4235,7 +4235,7 @@ namespace Microsoft.Zune.Service int num = 0; int num2 = 0; int num3 = 0; - _GUID gUID = Module.GuidToGUID(guidMediaId); + _GUID gUID = guidMediaId; IService* pService = m_pService; if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 616)))((nint)pService, gUID, (global::EContentType)eContentType, &num, &num2, &num3) >= 0) { @@ -4253,7 +4253,7 @@ namespace Microsoft.Zune.Service //IL_0028: Expected I, but got I8 if (m_pService != null) { - _GUID gUID = Module.GuidToGUID(guidMediaId); + _GUID gUID = guidMediaId; IService* pService = m_pService; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 624)))((nint)pService, gUID, (global::EContentType)eContentType); } @@ -4269,7 +4269,7 @@ namespace Microsoft.Zune.Service if (m_pService != null) { ushort* ptr = null; - _GUID gUID = Module.GuidToGUID(guidMediaId); + _GUID gUID = guidMediaId; IService* pService = m_pService; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 584)))((nint)pService, gUID, (global::EContentType)eContentType, (global::EContentUriFlags)eContentUriFlags, eMediaFormat, eMediaRights, &ptr, &gUID_NULL); if (num >= 0) @@ -4288,7 +4288,7 @@ namespace Microsoft.Zune.Service goto IL_005e; IL_005e: uriOut = text; - Guid guid = (mediaInstanceIdOut = Module.GUIDToGuid(gUID_NULL)); + Guid guid = (mediaInstanceIdOut = gUID_NULL); return num; } @@ -4342,7 +4342,7 @@ namespace Microsoft.Zune.Service ushort* ptr = (ushort*)strDeviceEndpointIdPtr; try { - _GUID gUID = Module.GuidToGUID(guidMediaId); + _GUID gUID = guidMediaId; long num4 = *(long*)m_pService + 640; IService* pService = m_pService; if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num4))((nint)pService, gUID, (global::EContentType)eContentType, ptr, &num2, &num, &num3) >= 0) @@ -4434,8 +4434,8 @@ namespace Microsoft.Zune.Service long num = *(long*)m_pService + 120; IService* pService = m_pService; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)pService, ptr, (global::EDownloadContextEvent)(-1), null, (IContextData**)(&cComPtrNtv_003CIContextData_003E)); - _GUID gUID = Module.GuidToGUID(guidAlbumMediaId); - _GUID gUID2 = Module.GuidToGUID(guidTrackMediaId); + _GUID gUID = guidAlbumMediaId; + _GUID gUID2 = guidTrackMediaId; long num2 = *(long*)m_pService + 904; IService* pService2 = m_pService; _003F val = ptr2; @@ -4508,7 +4508,7 @@ namespace Microsoft.Zune.Service ushort* ptr = (ushort*)strTitlePtr; try { - _GUID gUID = Module.GuidToGUID(guidArtistMediaId); + _GUID gUID = guidArtistMediaId; long num = *(long*)m_pService + 912; IService* pService = m_pService; result = (byte)((((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)pService, iUserId, iRating, &gUID, ptr) >= 0) ? 1u : 0u) != 0; @@ -4531,7 +4531,7 @@ namespace Microsoft.Zune.Service bool flag = false; if (m_pService != null) { - _GUID gUID = Module.GuidToGUID(guidMediaId); + _GUID gUID = guidMediaId; IService* pService = m_pService; int num; flag = 0 == ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 920)))((nint)pService, iUserId, &gUID, (global::EContentType)eContentType, &num); @@ -4640,7 +4640,7 @@ namespace Microsoft.Zune.Service Module.DBPropertyRequestStruct_002E_007Bctor_007D((DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), 177u); try { - if (Module.ZuneLibraryExports_002EGetFieldValues(dbMediaId, ContentTypeToListType(EContentType.Video), 1, (DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), null) >= 0 && Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 4)) >= 0) + if (Module.GetFieldValues(dbMediaId, ContentTypeToListType(EContentType.Video), 1, (DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), null) >= 0 && Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 4)) >= 0) { eMediaTypes = ((Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, ushort>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 8)) == 3) ? Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, EMediaTypes>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 16)) : eMediaTypes); } @@ -4648,7 +4648,7 @@ namespace Microsoft.Zune.Service catch { //try-fault - Module.___CxxCallUnwindVecDtor((delegate*, void>)(&Module.__ehvec_dtor), (void*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); + Module.___CxxCallUnwindVecDtor((delegate*, void>)(&Module.__ehvec_dtor), &_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); throw; } Module.__ehvec_dtor(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); @@ -4670,7 +4670,7 @@ namespace Microsoft.Zune.Service Module.DBPropertyRequestStruct_002E_007Bctor_007D((DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402), 149u); try { - if (Module.ZuneLibraryExports_002EGetFieldValues(dbMediaId, ContentTypeToListType(eContentType), 1, (DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402), null) < 0 || Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402, 4)) < 0 || Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, ushort>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402, 8)) != 3) + if (Module.GetFieldValues(dbMediaId, ContentTypeToListType(eContentType), 1, (DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402), null) < 0 || Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402, 4)) < 0 || Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, ushort>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402, 8)) != 3) { goto IL_0118; } @@ -4701,7 +4701,7 @@ namespace Microsoft.Zune.Service catch { //try-fault - Module.___CxxCallUnwindVecDtor((delegate*, void>)(&Module.__ehvec_dtor), (void*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402), 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); + Module.___CxxCallUnwindVecDtor((delegate*, void>)(&Module.__ehvec_dtor), &_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402, 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); throw; } Module.__ehvec_dtor(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_00402, 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); @@ -4982,7 +4982,7 @@ namespace Microsoft.Zune.Service } Module.CComPtrNtv_003CISignInState_003E_002ERelease(&cComPtrNtv_003CISignInState_003E); } - return Module.GUIDToGuid(gUID_NULL); + return gUID_NULL; } public unsafe string GetLocale() @@ -5193,7 +5193,7 @@ namespace Microsoft.Zune.Service //IL_0090: Expected I, but got I8 int num = 0; num = (((long)(nint)m_pService == 0) ? (-2147467259) : num); - _GUID offerId2 = Module.GuidToGUID(offerId); + _GUID offerId2 = offerId; CComPtrNtv_003CIGetOfferDetailsCallback_003E cComPtrNtv_003CIGetOfferDetailsCallback_003E; *(long*)(&cComPtrNtv_003CIGetOfferDetailsCallback_003E) = 0L; HRESULT result; @@ -5349,8 +5349,8 @@ namespace Microsoft.Zune.Service num3 = -1; num4 = 0L; intPtr = Module.CComPtrNtv_003CIContextData_003E_002E_0026(&cComPtrNtv_003CIContextData_003E); - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)pService2, (ushort*)(nint)val, (global::EDownloadContextEvent)num3, (ushort*)num4, intPtr); - gUID = Module.GuidToGUID(guid); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)pService2, (ushort*)val, (global::EDownloadContextEvent)num3, (ushort*)num4, intPtr); + gUID = guid; intPtr2 = ptr3; reference3 = ref gUID; num5 = 1; @@ -5381,7 +5381,7 @@ namespace Microsoft.Zune.Service num4 = 0L; intPtr = Module.CComPtrNtv_003CIContextData_003E_002E_0026(&cComPtrNtv_003CIContextData_003E); ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num2))((nint)pService2, (ushort*)Unsafe.AsPointer(ref val), (global::EDownloadContextEvent)num3, (ushort*)num4, intPtr); - gUID = Module.GuidToGUID(guid); + gUID = guid; intPtr2 = ptr3; reference3 = ref gUID; num5 = 1; @@ -5452,7 +5452,7 @@ namespace Microsoft.Zune.Service long num10 = *(long*)m_pService + 120; pService3 = m_pService; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num10))((nint)pService3, ptr5, (global::EDownloadContextEvent)(-1), null, (IContextData**)(&cComPtrNtv_003CIContextData_003E2)); - gUID2 = Module.GuidToGUID(guid2); + gUID2 = guid2; intPtr3 = ptr3; reference5 = ref gUID2; num11 = 0; @@ -5479,7 +5479,7 @@ namespace Microsoft.Zune.Service long num10 = *(long*)m_pService + 120; pService3 = m_pService; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num10))((nint)pService3, (ushort*)Unsafe.AsPointer(ref reference4), (global::EDownloadContextEvent)(-1), null, (IContextData**)(&cComPtrNtv_003CIContextData_003E2)); - gUID2 = Module.GuidToGUID(guid2); + gUID2 = guid2; intPtr3 = ptr3; reference5 = ref gUID2; num11 = 0; @@ -5518,7 +5518,7 @@ namespace Microsoft.Zune.Service { if (num >= 0) { - _GUID gUID3 = Module.GuidToGUID((Guid)enumerator3.Current); + _GUID gUID3 = (Guid)enumerator3.Current; IMediaCollection* intPtr4 = ptr3; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr3 + 40)))((nint)intPtr4, &gUID3, (global::EContentType)3, null, null, null, null); } @@ -5535,7 +5535,7 @@ namespace Microsoft.Zune.Service { if (num >= 0) { - _GUID gUID4 = Module.GuidToGUID((Guid)enumerator4.Current); + _GUID gUID4 = (Guid)enumerator4.Current; IMediaCollection* intPtr5 = ptr3; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr3 + 40)))((nint)intPtr5, &gUID4, (global::EContentType)7, null, null, null, null); } @@ -5663,9 +5663,9 @@ namespace Microsoft.Zune.Service num = PaymentTypeToMediaPaymentType(payment.Type, &eMediaPaymentType); if (num >= 0) { - fixed (char* payment.IdPtr = payment.Id.ToCharArray()) + fixed (char* paymentIdPtr = payment.Id.ToCharArray()) { - ushort* ptr7 = (ushort*)payment.IdPtr; + ushort* ptr7 = (ushort*)paymentIdPtr; try { long num2 = *(long*)m_pService + 712; @@ -5735,7 +5735,7 @@ namespace Microsoft.Zune.Service num = -2147024882; goto IL_0103; } - _GUID gUID = Module.GuidToGUID(userId); + _GUID gUID = userId; ulong num2 = (ulong)artists.Count; _GUID* ptr3 = (_GUID*)Module.new_005B_005D((num2 > 1152921504606846975L) ? ulong.MaxValue : (num2 * 16)); int num3 = 0; @@ -5744,7 +5744,7 @@ namespace Microsoft.Zune.Service _GUID* ptr4 = ptr3; do { - _GUID gUID2 = Module.GuidToGUID((Guid)artists[num3]); + _GUID gUID2 = (Guid)artists[num3]; // IL cpblk instruction Unsafe.CopyBlockUnaligned(ptr4, ref gUID2, 16); num3++; @@ -5847,7 +5847,7 @@ namespace Microsoft.Zune.Service num = -2147024882; goto IL_0091; } - _GUID gUID = Module.GuidToGUID(mediaId); + _GUID gUID = mediaId; fixed (char* messagePtr = message.ToCharArray()) { ushort* ptr3 = (ushort*)messagePtr; @@ -5910,7 +5910,7 @@ namespace Microsoft.Zune.Service num = -2147024882; goto IL_00a5; } - _GUID gUID = Module.GuidToGUID(mediaId); + _GUID gUID = mediaId; fixed (char* titlePtr = title.ToCharArray()) { ushort* ptr3 = (ushort*)titlePtr; @@ -6008,7 +6008,7 @@ namespace Microsoft.Zune.Service IService* pService = m_pService; if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)pService, ptr, &musicAlbumMetadata) >= 0) { - Guid guid = (guidAlbum = Module.GUIDToGuid(Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 8)))); + Guid guid = (guidAlbum = Unsafe.As(ref Unsafe.AddByteOffset(ref musicAlbumMetadata, 8))); result = true; } } @@ -6049,7 +6049,7 @@ namespace Microsoft.Zune.Service _GUID guid; if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)pService, ptr, &guid) >= 0) { - Guid guid2 = (guidMusicVideo = Module.GUIDToGuid(guid)); + Guid guid2 = (guidMusicVideo = guid); result = true; } } @@ -6078,12 +6078,12 @@ namespace Microsoft.Zune.Service long num = *(long*)m_pService + 568; IService* pService = m_pService; DRMQueryState eCanPlay; - _FILETIME fILETIME; + FILETIME fILETIME; int num2; int num3; - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)pService, ptr, &eCanPlay, &fILETIME, &num2, &num3) >= 0) + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)pService, ptr, &eCanPlay, &fILETIME, &num2, &num3) >= 0) { - long num4 = (long)(uint)Unsafe.As<_FILETIME, int>(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); + long num4 = (uint)Unsafe.As(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); DateTime expiryDate = DateTime.MaxValue; if (num4 > 0) { @@ -6117,15 +6117,15 @@ namespace Microsoft.Zune.Service DRMInfo result = null; if (m_pService != null) { - _GUID gUID = Module.GuidToGUID(mediaId); + _GUID gUID = mediaId; IService* pService = m_pService; DRMQueryState eCanPlay; - _FILETIME fILETIME; + FILETIME fILETIME; int num; int num2; - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 576)))((nint)pService, gUID, (global::EContentType)eContentType, &eCanPlay, &fILETIME, &num, &num2) >= 0) + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 576)))((nint)pService, gUID, (global::EContentType)eContentType, &eCanPlay, &fILETIME, &num, &num2) >= 0) { - long num3 = (long)(uint)Unsafe.As<_FILETIME, int>(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); + long num3 = (uint)Unsafe.As(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); DateTime expiryDate = DateTime.MaxValue; if (num3 > 0) { @@ -6241,7 +6241,7 @@ namespace Microsoft.Zune.Service } goto IL_006d; IL_006d: - if (text != (string)null && text.Length > 0) + if (text != null && text.Length > 0) { DateTime.TryParse(text, out result); } @@ -6293,7 +6293,7 @@ namespace Microsoft.Zune.Service } goto IL_006d; IL_006d: - if (text != (string)null && text.Length > 0) + if (text != null && text.Length > 0) { DateTime.TryParse(text, null, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out result); } @@ -6464,64 +6464,64 @@ namespace Microsoft.Zune.Service else { _SYSTEMTIME sYSTEMTIME = Module.DateTimeToSystemTime(creditCard.ExpirationDate); - fixed (char* creditCard.Address.Street1Ptr = creditCard.Address.Street1.ToCharArray()) + fixed (char* creditCardAddressStreet1Ptr = creditCard.Address.Street1.ToCharArray()) { - ushort* ptr3 = (ushort*)creditCard.Address.Street1Ptr; + ushort* ptr3 = (ushort*)creditCardAddressStreet1Ptr; try { - fixed (char* creditCard.Address.Street2Ptr = creditCard.Address.Street2.ToCharArray()) + fixed (char* creditCardAddressStreet2Ptr = creditCard.Address.Street2.ToCharArray()) { - ushort* ptr4 = (ushort*)creditCard.Address.Street2Ptr; + ushort* ptr4 = (ushort*)creditCardAddressStreet2Ptr; try { - fixed (char* creditCard.Address.CityPtr = creditCard.Address.City.ToCharArray()) + fixed (char* creditCardAddressCityPtr = creditCard.Address.City.ToCharArray()) { - ushort* ptr5 = (ushort*)creditCard.Address.CityPtr; + ushort* ptr5 = (ushort*)creditCardAddressCityPtr; try { - fixed (char* creditCard.Address.DistrictPtr = creditCard.Address.District.ToCharArray()) + fixed (char* creditCardAddressDistrictPtr = creditCard.Address.District.ToCharArray()) { - ushort* ptr6 = (ushort*)creditCard.Address.DistrictPtr; + ushort* ptr6 = (ushort*)creditCardAddressDistrictPtr; try { - fixed (char* creditCard.Address.StatePtr = creditCard.Address.State.ToCharArray()) + fixed (char* creditCardAddressStatePtr = creditCard.Address.State.ToCharArray()) { - ushort* ptr7 = (ushort*)creditCard.Address.StatePtr; + ushort* ptr7 = (ushort*)creditCardAddressStatePtr; try { - fixed (char* creditCard.Address.PostalCodePtr = creditCard.Address.PostalCode.ToCharArray()) + fixed (char* creditCardAddressPostalCodePtr = creditCard.Address.PostalCode.ToCharArray()) { - ushort* ptr8 = (ushort*)creditCard.Address.PostalCodePtr; + ushort* ptr8 = (ushort*)creditCardAddressPostalCodePtr; try { - fixed (char* creditCard.PhonePrefixPtr = creditCard.PhonePrefix.ToCharArray()) + fixed (char* creditCardPhonePrefixPtr = creditCard.PhonePrefix.ToCharArray()) { - ushort* ptr9 = (ushort*)creditCard.PhonePrefixPtr; + ushort* ptr9 = (ushort*)creditCardPhonePrefixPtr; try { - fixed (char* creditCard.PhoneNumberPtr = creditCard.PhoneNumber.ToCharArray()) + fixed (char* creditCardPhoneNumberPtr = creditCard.PhoneNumber.ToCharArray()) { - ushort* ptr10 = (ushort*)creditCard.PhoneNumberPtr; + ushort* ptr10 = (ushort*)creditCardPhoneNumberPtr; try { - fixed (char* creditCard.PhoneExtensionPtr = creditCard.PhoneExtension.ToCharArray()) + fixed (char* creditCardPhoneExtensionPtr = creditCard.PhoneExtension.ToCharArray()) { - ushort* ptr11 = (ushort*)creditCard.PhoneExtensionPtr; + ushort* ptr11 = (ushort*)creditCardPhoneExtensionPtr; try { - fixed (char* creditCard.AccountHolderNamePtr = creditCard.AccountHolderName.ToCharArray()) + fixed (char* creditCardAccountHolderNamePtr = creditCard.AccountHolderName.ToCharArray()) { - ushort* ptr12 = (ushort*)creditCard.AccountHolderNamePtr; + ushort* ptr12 = (ushort*)creditCardAccountHolderNamePtr; try { - fixed (char* creditCard.AccountNumberPtr = creditCard.AccountNumber.ToCharArray()) + fixed (char* creditCardAccountNumberPtr = creditCard.AccountNumber.ToCharArray()) { - ushort* ptr13 = (ushort*)creditCard.AccountNumberPtr; + ushort* ptr13 = (ushort*)creditCardAccountNumberPtr; try { - fixed (char* creditCard.CCVNumberPtr = creditCard.CCVNumber.ToCharArray()) + fixed (char* creditCardCCVNumberPtr = creditCard.CCVNumber.ToCharArray()) { - ushort* ptr14 = (ushort*)creditCard.CCVNumberPtr; + ushort* ptr14 = (ushort*)creditCardCCVNumberPtr; try { long num = *(long*)m_pService + 808; @@ -6664,64 +6664,64 @@ namespace Microsoft.Zune.Service if (num >= 0) { _SYSTEMTIME sYSTEMTIME = Module.DateTimeToSystemTime(creditCard.ExpirationDate); - fixed (char* creditCard.Address.Street1Ptr = creditCard.Address.Street1.ToCharArray()) + fixed (char* creditCardAddressStreet1Ptr = creditCard.Address.Street1.ToCharArray()) { - ushort* ptr = (ushort*)creditCard.Address.Street1Ptr; + ushort* ptr = (ushort*)creditCardAddressStreet1Ptr; try { - fixed (char* creditCard.Address.Street2Ptr = creditCard.Address.Street2.ToCharArray()) + fixed (char* creditCardAddressStreet2Ptr = creditCard.Address.Street2.ToCharArray()) { - ushort* ptr2 = (ushort*)creditCard.Address.Street2Ptr; + ushort* ptr2 = (ushort*)creditCardAddressStreet2Ptr; try { - fixed (char* creditCard.Address.CityPtr = creditCard.Address.City.ToCharArray()) + fixed (char* creditCardAddressCityPtr = creditCard.Address.City.ToCharArray()) { - ushort* ptr3 = (ushort*)creditCard.Address.CityPtr; + ushort* ptr3 = (ushort*)creditCardAddressCityPtr; try { - fixed (char* creditCard.Address.DistrictPtr = creditCard.Address.District.ToCharArray()) + fixed (char* creditCardAddressDistrictPtr = creditCard.Address.District.ToCharArray()) { - ushort* ptr4 = (ushort*)creditCard.Address.DistrictPtr; + ushort* ptr4 = (ushort*)creditCardAddressDistrictPtr; try { - fixed (char* creditCard.Address.StatePtr = creditCard.Address.State.ToCharArray()) + fixed (char* creditCardAddressStatePtr = creditCard.Address.State.ToCharArray()) { - ushort* ptr5 = (ushort*)creditCard.Address.StatePtr; + ushort* ptr5 = (ushort*)creditCardAddressStatePtr; try { - fixed (char* creditCard.Address.PostalCodePtr = creditCard.Address.PostalCode.ToCharArray()) + fixed (char* creditCardAddressPostalCodePtr = creditCard.Address.PostalCode.ToCharArray()) { - ushort* ptr6 = (ushort*)creditCard.Address.PostalCodePtr; + ushort* ptr6 = (ushort*)creditCardAddressPostalCodePtr; try { - fixed (char* creditCard.PhonePrefixPtr = creditCard.PhonePrefix.ToCharArray()) + fixed (char* creditCardPhonePrefixPtr = creditCard.PhonePrefix.ToCharArray()) { - ushort* ptr7 = (ushort*)creditCard.PhonePrefixPtr; + ushort* ptr7 = (ushort*)creditCardPhonePrefixPtr; try { - fixed (char* creditCard.PhoneNumberPtr = creditCard.PhoneNumber.ToCharArray()) + fixed (char* creditCardPhoneNumberPtr = creditCard.PhoneNumber.ToCharArray()) { - ushort* ptr8 = (ushort*)creditCard.PhoneNumberPtr; + ushort* ptr8 = (ushort*)creditCardPhoneNumberPtr; try { - fixed (char* creditCard.PhoneExtensionPtr = creditCard.PhoneExtension.ToCharArray()) + fixed (char* creditCardPhoneExtensionPtr = creditCard.PhoneExtension.ToCharArray()) { - ushort* ptr9 = (ushort*)creditCard.PhoneExtensionPtr; + ushort* ptr9 = (ushort*)creditCardPhoneExtensionPtr; try { - fixed (char* creditCard.AccountHolderNamePtr = creditCard.AccountHolderName.ToCharArray()) + fixed (char* creditCardAccountHolderNamePtr = creditCard.AccountHolderName.ToCharArray()) { - ushort* ptr10 = (ushort*)creditCard.AccountHolderNamePtr; + ushort* ptr10 = (ushort*)creditCardAccountHolderNamePtr; try { - fixed (char* creditCard.AccountNumberPtr = creditCard.AccountNumber.ToCharArray()) + fixed (char* creditCardAccountNumberPtr = creditCard.AccountNumber.ToCharArray()) { - ushort* ptr11 = (ushort*)creditCard.AccountNumberPtr; + ushort* ptr11 = (ushort*)creditCardAccountNumberPtr; try { - fixed (char* creditCard.CCVNumberPtr = creditCard.CCVNumber.ToCharArray()) + fixed (char* creditCardCCVNumberPtr = creditCard.CCVNumber.ToCharArray()) { - ushort* ptr12 = (ushort*)creditCard.CCVNumberPtr; + ushort* ptr12 = (ushort*)creditCardCCVNumberPtr; try { long num2 = *(long*)m_pService + 800; @@ -6988,9 +6988,9 @@ namespace Microsoft.Zune.Service num = PaymentTypeToBillingPaymentType(paymentInstrument.Type, &eBillingPaymentType); if (num >= 0) { - fixed (char* paymentInstrument.IdPtr = paymentInstrument.Id.ToCharArray()) + fixed (char* paymentInstrumentIdPtr = paymentInstrument.Id.ToCharArray()) { - ushort* ptr4 = (ushort*)paymentInstrument.IdPtr; + ushort* ptr4 = (ushort*)paymentInstrumentIdPtr; try { long num2 = *(long*)m_pService + 768; @@ -7030,12 +7030,12 @@ namespace Microsoft.Zune.Service EBillingPaymentType eBillingPaymentType = (EBillingPaymentType)(-1); if (num >= 0) { - num = PaymentTypeToBillingPaymentType(paymentInstrument.Type, &eBillingPaymentType); + num = PaymentTypeToBillingPaymentType(paymentInstrument.Type, ref eBillingPaymentType); if (num >= 0) { - fixed (char* paymentInstrument.IdPtr = paymentInstrument.Id.ToCharArray()) + fixed (char* paymentInstrumentIdPtr = paymentInstrument.Id.ToCharArray()) { - ushort* ptr = (ushort*)paymentInstrument.IdPtr; + ushort* ptr = (ushort*)paymentInstrumentIdPtr; try { long num2 = *(long*)m_pService + 760; @@ -7814,7 +7814,7 @@ namespace Microsoft.Zune.Service goto IL_0059; } } - _GUID gUID = Module.GuidToGUID(guidMediaInstanceId); + _GUID gUID = guidMediaInstanceId; IService* pService = m_pService; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pService + 984)))((nint)pService, (global::EStreamingActionType)eStreamingActionType, gUID, (IAsyncCallback*)ptr); goto IL_0059; @@ -7843,7 +7843,7 @@ namespace Microsoft.Zune.Service } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Service/TokenDetails.cs b/ZuneDBApi/Microsoft/Zune/Service/TokenDetails.cs index bf793fd..f207646 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/TokenDetails.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/TokenDetails.cs @@ -71,8 +71,8 @@ namespace Microsoft.Zune.Service m_sellText = new string((char*)(*(ulong*)(&wBSTRString3))); m_eTokenType = (ETokenType)eTokenType; m_ePurchaseOfferType = (EPurchaseOfferType)ePurchaseOfferType; - Guid guid = (m_mediaOfferId = Module.GUIDToGuid(gUID_NULL)); - Guid guid2 = (m_mediaId = Module.GUIDToGuid(gUID_NULL2)); + Guid guid = (m_mediaOfferId = gUID_NULL); + Guid guid2 = (m_mediaId = gUID_NULL2); m_billingOfferId = billingOfferId; } } diff --git a/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs index c16c8bf..d6257bb 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/TrackOfferCollection.cs @@ -13,8 +13,7 @@ namespace Microsoft.Zune.Service public IList Items => m_items; - internal unsafe TrackOfferCollection() - : this() + internal unsafe TrackOfferCollection() : base() { //IL_0015: Expected I, but got I8 m_items = null; @@ -96,21 +95,21 @@ namespace Microsoft.Zune.Service long num7 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)); int num8 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)) + 176)))((nint)num7, 1, 1); long num9 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)); - int num10 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)) + 72)))((nint)num9, eMediaRights, (EMediaFormat)0); + int num10 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)) + 72)))((nint)num9, eMediaRights, 0); if (eMediaRights != (EMediaRights)5) { - EMediaFormat eMediaFormat = ((num10 == 0) ? ((EMediaFormat)1) : ((EMediaFormat)0)); + EMediaFormat eMediaFormat = ((num10 == 0) ? ((EMediaFormat)1) : 0); long num11 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)); if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)) + 72)))((nint)num11, eMediaRights, eMediaFormat) != 0) { - EMediaFormat eMediaFormat2 = ((num10 == 0) ? ((EMediaFormat)1) : ((EMediaFormat)0)); + EMediaFormat eMediaFormat2 = ((num10 == 0) ? ((EMediaFormat)1) : 0); long num12 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)); num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)) + 104)))((nint)num12, eMediaRights, eMediaFormat2, (IPriceInfo**)(&cComPtrNtv_003CIPriceInfo_003E)); } } if (num >= 0) { - Guid id = Module.GUIDToGuid(Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 8))); + Guid id = Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 8)); string recommendationContext = GetRecommendationContext(id, mapIdToContext, (IContextData*)(*(ulong*)(&cComPtrNtv_003CIContextData_003E))); long num13 = Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)); bool subscriptionFree = ((((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)Unsafe.As(ref Unsafe.AddByteOffset(ref musicTrackMetadata, 152)) + 208)))((nint)num13) != 0) ? true : false); @@ -188,7 +187,7 @@ namespace Microsoft.Zune.Service } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Service/VideoOffer.cs b/ZuneDBApi/Microsoft/Zune/Service/VideoOffer.cs index 43b8ef4..389ce19 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/VideoOffer.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/VideoOffer.cs @@ -100,7 +100,7 @@ namespace Microsoft.Zune.Service { get { - if (m_previewImage == null && m_previewImageUrl != (string)null) + if (m_previewImage == null && m_previewImageUrl != null) { m_previewImage = new Image(m_previewImageUrl); } diff --git a/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs b/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs index 53fb236..09ec2ae 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/VideoOfferCollection.cs @@ -14,8 +14,7 @@ namespace Microsoft.Zune.Service public IList Items => m_items; - internal unsafe VideoOfferCollection() - : this() + internal unsafe VideoOfferCollection() : base() { //IL_0015: Expected I, but got I8 m_items = null; @@ -95,8 +94,8 @@ namespace Microsoft.Zune.Service num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pCollection + 32)))((nint)pCollection, num3, &videoMetadata, null); if (num >= 0) { - Guid id = Module.GUIDToGuid(Unsafe.As(ref Unsafe.AddByteOffset(ref videoMetadata, 8))); - Guid albumId = Module.GUIDToGuid(Unsafe.As(ref Unsafe.AddByteOffset(ref videoMetadata, 80))); + Guid id = Unsafe.As(ref Unsafe.AddByteOffset(ref videoMetadata, 8)); + Guid albumId = Unsafe.As(ref Unsafe.AddByteOffset(ref videoMetadata, 80)); string title = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref videoMetadata, 32))); string seriesTitle = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref videoMetadata, 120))); string artist = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref videoMetadata, 48))); @@ -373,7 +372,7 @@ namespace Microsoft.Zune.Service } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs index 192dc2a..9f4a1cf 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveAvailableInformation.cs @@ -70,7 +70,7 @@ namespace Microsoft.Zune.Service { //IL_0020: Expected I, but got I8 //IL_0036: Expected I, but got I8 - if (m_signinName == (string)null) + if (m_signinName == null) { CComPtrMgd_003CIWinLiveAvailableInformation_003E spWinLiveAvailableInformation = m_spWinLiveAvailableInformation; if (spWinLiveAvailableInformation.p != null) diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs index a25527a..0eefb58 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveInformation.cs @@ -88,7 +88,7 @@ namespace Microsoft.Zune.Service num = (((long)(nint)ptr == 0) ? (-2147467259) : num); HBITMAP* ptr2 = null; void* pData = null; - if (num >= 0 && Module.ZuneLibraryExports_002ECopyThumbnailBitmapData(ptr, &ptr2, &pData) >= 0) + if (num >= 0 && Module.CopyThumbnailBitmapData(ptr, &ptr2, &pData) >= 0) { try { @@ -115,7 +115,7 @@ namespace Microsoft.Zune.Service { //IL_0020: Expected I, but got I8 //IL_0036: Expected I, but got I8 - if (m_hipChallenge == (string)null) + if (m_hipChallenge == null) { CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = m_spWinLiveInformation; if (spWinLiveInformation.p != null) @@ -139,7 +139,7 @@ namespace Microsoft.Zune.Service { //IL_0020: Expected I, but got I8 //IL_0036: Expected I, but got I8 - if (m_privacyUrl == (string)null) + if (m_privacyUrl == null) { CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = m_spWinLiveInformation; if (spWinLiveInformation.p != null) @@ -178,7 +178,7 @@ namespace Microsoft.Zune.Service { //IL_0020: Expected I, but got I8 //IL_0036: Expected I, but got I8 - if (m_termsOfServiceUrl == (string)null) + if (m_termsOfServiceUrl == null) { CComPtrMgd_003CIWinLiveInformation_003E spWinLiveInformation = m_spWinLiveInformation; if (spWinLiveInformation.p != null) @@ -235,7 +235,7 @@ namespace Microsoft.Zune.Service } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs b/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs index de45905..7b2b840 100644 --- a/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs +++ b/ZuneDBApi/Microsoft/Zune/Service/WinLiveSignup.cs @@ -308,7 +308,7 @@ namespace Microsoft.Zune.Service *(long*)(&cComPtrNtv_003CIService_003E) = 0L; try { - num = Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&cComPtrNtv_003CIService_003E)); + num = Module.GetSingleton(Module.GUID_IService, (void**)(&cComPtrNtv_003CIService_003E)); CComPtrNtv_003CIUnknown_003E cComPtrNtv_003CIUnknown_003E; *(long*)(&cComPtrNtv_003CIUnknown_003E) = 0L; try diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs index 782dbc8..6820241 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderItem.cs @@ -51,7 +51,7 @@ namespace Microsoft.Zune.Subscription Unsafe.As<_0024ArrayType_0024_0024_0024BY07UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, long>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY07UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, 112)) = (nint)Unsafe.AsPointer(ref Module._003F_003F_C_0040_1CC_0040PFACMMFM_0040_003F_0024AAE_003F_0024AAp_003F_0024AAi_003F_0024AAs_003F_0024AAo_003F_0024AAd_003F_0024AAe_003F_0024AAM_003F_0024AAe_003F_0024AAd_003F_0024AAi_003F_0024AAa_003F_0024AAT_003F_0024AAy_003F_0024AAp_003F_0024AAe_003F_0024AA_003F_0024AA_0040); Unsafe.As<_0024ArrayType_0024_0024_0024BY07UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY07UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, 120)) = 100683786; int num = 0; - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant, 0, 24); object result; @@ -62,12 +62,12 @@ namespace Microsoft.Zune.Subscription ushort* ptr = (ushort*)propertyNamePtr; if (Module._wcsicmp(ptr, (ushort*)Unsafe.AsPointer(ref Module._003F_003F_C_0040_1BE_0040NCILDCLH_0040_003F_0024AAL_003F_0024AAi_003F_0024AAb_003F_0024AAr_003F_0024AAa_003F_0024AAr_003F_0024AAy_003F_0024AAI_003F_0024AAd_003F_0024AA_003F_0024AA_0040)) == 0) { - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = m_nEpisodeId; + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = m_nEpisodeId; *(short*)(&cComPropVariant) = 3; } else if (Module._wcsicmp(ptr, (ushort*)Unsafe.AsPointer(ref Module._003F_003F_C_0040_1BC_0040JCKMNCPP_0040_003F_0024AAS_003F_0024AAe_003F_0024AAr_003F_0024AAi_003F_0024AAe_003F_0024AAs_003F_0024AAI_003F_0024AAd_003F_0024AA_003F_0024AA_0040)) == 0) { - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = m_nSeriesId; + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = m_nSeriesId; *(short*)(&cComPropVariant) = 3; } else @@ -77,20 +77,20 @@ namespace Microsoft.Zune.Subscription int nEpisodeId = m_nEpisodeId; if (nEpisodeId >= 0) { - num = GetDatabaseValue(nEpisodeId, 145u, (PROPVARIANT)(&cComPropVariant)); + num = GetDatabaseValue(nEpisodeId, 145u, cComPropVariant); if (num < 0) { goto IL_02b0; } - if (m_eLastDownloadState != (EItemDownloadState)Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8))) + if (m_eLastDownloadState != (EItemDownloadState)Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8))) { InvalidateDownloadState(); } - m_eLastDownloadState = Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)); + m_eLastDownloadState = Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)); } else { - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = 0; + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = 0; *(short*)(&cComPropVariant) = 3; } } @@ -99,11 +99,11 @@ namespace Microsoft.Zune.Subscription int nEpisodeId2 = m_nEpisodeId; if (nEpisodeId2 >= 0) { - num = GetDatabaseValue(nEpisodeId2, 146u, (PROPVARIANT)(&cComPropVariant)); + num = GetDatabaseValue(nEpisodeId2, 146u, cComPropVariant); } else { - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = 0; + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)) = 0; *(short*)(&cComPropVariant) = 3; } } @@ -115,7 +115,7 @@ namespace Microsoft.Zune.Subscription { goto IL_028b; } - num = GetDatabaseValue(nEpisodeId3, 262u, (PROPVARIANT)(&cComPropVariant)); + num = GetDatabaseValue(nEpisodeId3, 262u, cComPropVariant); } else if (Module._wcsicmp(ptr, (ushort*)Unsafe.AsPointer(ref Module._003F_003F_C_0040_1BE_0040HHOJDPEL_0040_003F_0024AAS_003F_0024AAo_003F_0024AAu_003F_0024AAr_003F_0024AAc_003F_0024AAe_003F_0024AAU_003F_0024AAr_003F_0024AAl_003F_0024AA_003F_0024AA_0040)) == 0) { @@ -125,7 +125,7 @@ namespace Microsoft.Zune.Subscription { goto IL_028b; } - num = GetDatabaseValue(nEpisodeId4, 317u, (PROPVARIANT)(&cComPropVariant)); + num = GetDatabaseValue(nEpisodeId4, 317u, cComPropVariant); } else if (Module._wcsicmp(ptr, (ushort*)Unsafe.AsPointer(ref Module._003F_003F_C_0040_1CE_0040ELHJHONN_0040_003F_0024AAD_003F_0024AAo_003F_0024AAw_003F_0024AAn_003F_0024AAl_003F_0024AAo_003F_0024AAa_003F_0024AAd_003F_0024AAE_003F_0024AAr_003F_0024AAr_003F_0024AAo_003F_0024AAr_003F_0024AAC_003F_0024AAo_003F_0024AAd_003F_0024AAe_003F_0024AA_003F_0024AA_0040)) == 0) { @@ -135,7 +135,7 @@ namespace Microsoft.Zune.Subscription { goto IL_028b; } - num = GetDatabaseValue(nEpisodeId5, 144u, (PROPVARIANT)(&cComPropVariant)); + num = GetDatabaseValue(nEpisodeId5, 144u, cComPropVariant); } else { @@ -151,9 +151,9 @@ namespace Microsoft.Zune.Subscription } goto IL_028b; } - uint num3 = *(uint*)((long)num2 * 16L + (ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY07UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, 8))); + uint num3 = *(uint*)((long)num2 * 16L + _0024ArrayType_0024_0024_0024BY07UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040 + 8); IMSMediaSchemaPropertySet* pEpisodePropertySet = m_pEpisodePropertySet; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pEpisodePropertySet + 48)))((nint)pEpisodePropertySet, num3, 0u, (PROPVARIANT)(&cComPropVariant)); + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pEpisodePropertySet + 48)))((System.nint)pEpisodePropertySet, (uint)num3, (uint)0u, (PROPVARIANT)cComPropVariant); } if (num < 0) { @@ -176,7 +176,7 @@ namespace Microsoft.Zune.Subscription catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -194,7 +194,7 @@ namespace Microsoft.Zune.Subscription DBPropertySubmitStruct dBPropertySubmitStruct; *(int*)(&dBPropertySubmitStruct) = 144; Unsafe.As(ref Unsafe.AddByteOffset(ref dBPropertySubmitStruct, 8)) = (nint)(&tagVARIANT); - int num = Module.ZuneLibraryExports_002ESetFieldValues(m_nEpisodeId, EListType.ePodcastEpisodeList, 1, &dBPropertySubmitStruct, null); + int num = Module.SetFieldValues(m_nEpisodeId, EListType.ePodcastEpisodeList, 1, &dBPropertySubmitStruct, null); if (0 == num) { FirePropertyChanged(propertyName); @@ -217,14 +217,14 @@ namespace Microsoft.Zune.Subscription int num = 1; int nSeriesId = -1; int nEpisodeId = -1; - int singleton = Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&ptr)); + int singleton = Module.GetSingleton(Module.GUID_IService, (void**)(&ptr)); if (singleton >= 0) { IService* intPtr = ptr; singleton = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 384)))((nint)intPtr, null, &num); if (singleton >= 0) { - singleton = Module.GetSingleton((_GUID)Module._GUID_9dc7c984_41d5_4130_a5ac_46d0825cd29d, (void**)(&ptr2)); + singleton = Module.GetSingleton(Module.GUID_ISubscriptionManager, (void**)(&ptr2)); if (singleton >= 0) { ISubscriptionManager* intPtr2 = ptr2; @@ -279,13 +279,13 @@ namespace Microsoft.Zune.Subscription //IL_00e2: Expected I, but got I8 //IL_00e6: Expected I, but got I8 ISubscriptionManager* ptr = null; - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant, 0, 24); int num2; try { - CComPropVariant cComPropVariant2; + PROPVARIANT cComPropVariant2; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant2, 0, 24); try @@ -294,22 +294,22 @@ namespace Microsoft.Zune.Subscription fixed (char* m_feedUrlPtr = m_feedUrl.ToCharArray()) { ushort* ptr2 = (ushort*)m_feedUrlPtr; - num2 = Module.GetSingleton((_GUID)Module._GUID_9dc7c984_41d5_4130_a5ac_46d0825cd29d, (void**)(&ptr)); + num2 = Module.GetSingleton(Module.GUID_ISubscriptionManager, (void**)(&ptr)); if (num2 >= 0) { IMSMediaSchemaPropertySet* pEpisodePropertySet = m_pEpisodePropertySet; - num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pEpisodePropertySet + 48)))((nint)pEpisodePropertySet, 16797697u, 0u, (PROPVARIANT)(&cComPropVariant)); + num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pEpisodePropertySet + 48)))((System.nint)pEpisodePropertySet, (uint)16797697u, (uint)0u, (PROPVARIANT)cComPropVariant); if (num2 >= 0) { IMSMediaSchemaPropertySet* pEpisodePropertySet2 = m_pEpisodePropertySet; - num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pEpisodePropertySet2 + 48)))((nint)pEpisodePropertySet2, 134238215u, 0u, (PROPVARIANT)(&cComPropVariant2)); + num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pEpisodePropertySet2 + 48)))((System.nint)pEpisodePropertySet2, (uint)134238215u, (uint)0u, (PROPVARIANT)cComPropVariant2); if (num2 >= 0) { long num3 = *(long*)ptr + 160; ISubscriptionManager* intPtr = ptr; _003F val = ptr2; - long num4 = Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)); - long num5 = Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)); + long num4 = Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)); + long num5 = Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)); num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num3))((nint)intPtr, EMediaTypes.eMediaTypePodcastSeries, (ushort*)(nint)val, (ushort*)num4, (ushort*)num5, &num); } } @@ -337,7 +337,7 @@ namespace Microsoft.Zune.Subscription catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); throw; } Module.CComPropVariant_002EClear(&cComPropVariant2); @@ -345,7 +345,7 @@ namespace Microsoft.Zune.Subscription catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -378,7 +378,7 @@ namespace Microsoft.Zune.Subscription } IService* ptr = null; int num = 1; - int num2 = Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&ptr)); + int num2 = Module.GetSingleton(Module.GUID_IService, (void**)(&ptr)); if (num2 >= 0) { IService* intPtr = ptr; @@ -391,15 +391,15 @@ namespace Microsoft.Zune.Subscription { if (num2 >= 0) { - num2 = Module.ZuneLibraryExports_002ECreatePropertyBag(&ptr2); + num2 = Module.CreatePropertyBag(&ptr2); if (num2 >= 0) { IQueryPropertyBag* intPtr2 = ptr2; int num3 = num; - num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr2, (EQueryPropertyBagProp)0, num3); + num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr2, 0, num3); if (num2 >= 0) { - num2 = Module.ZuneLibraryExports_002EGetFieldValues(nMediaId, EListType.ePodcastEpisodeList, 1, &dBPropertyRequestStruct, ptr2); + num2 = Module.GetFieldValues(nMediaId, EListType.ePodcastEpisodeList, 1, &dBPropertyRequestStruct, ptr2); if (num2 >= 0) { num2 = ((Unsafe.As(ref Unsafe.AddByteOffset(ref dBPropertyRequestStruct, 4)) < 0) ? Unsafe.As(ref Unsafe.AddByteOffset(ref dBPropertyRequestStruct, 4)) : Module.PropVariantCopy(pvarValue, (PROPVARIANT)Unsafe.AsPointer(ref Unsafe.AddByteOffset(ref dBPropertyRequestStruct, 8)))); diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderQueryResult.cs b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderQueryResult.cs index ad5b95f..0020acc 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderQueryResult.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionDataProviderQueryResult.cs @@ -51,7 +51,7 @@ namespace Microsoft.Zune.Subscription throw new NotSupportedException(); } - public unsafe static object ConvertVariantToType(string typeName, CComPropVariant* varValue) + public unsafe static object ConvertVariantToType(string typeName, PROPVARIANT* varValue) { //IL_0055: Expected I, but got I8 object result = null; diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs index ce00a3b..8c29991 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs @@ -121,7 +121,7 @@ namespace Microsoft.Zune.Subscription //IL_0245: Expected I, but got I8 //IL_028f: Expected I, but got I8 int num = 0; - if (m_pSubscriptionManager == null || feedUrl == (string)null) + if (m_pSubscriptionManager == null || feedUrl == null) { num = -2147467261; } @@ -135,7 +135,7 @@ namespace Microsoft.Zune.Subscription *(short*)(&tagPROPVARIANT) = 1; if (serviceId != Guid.Empty) { - gUID = Module.GuidToGUID(serviceId); + gUID = serviceId; *(short*)(&tagPROPVARIANT) = 72; Unsafe.As(ref Unsafe.AddByteOffset(ref tagPROPVARIANT, 8)) = (nint)(&gUID); } @@ -150,7 +150,7 @@ namespace Microsoft.Zune.Subscription { if (eSubscriptionMediaType == EMediaTypes.eMediaTypePodcastSeries && 72 == *(ushort*)(&tagPROPVARIANT)) { - num = Module.ZuneLibraryExports_002ECreatePropertySet((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_SERIES), 3229616385u, &ptr); + num = Module.CreatePropertySet((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_SERIES), 3229616385u, &ptr); if (num < 0) { goto IL_027f; @@ -162,17 +162,17 @@ namespace Microsoft.Zune.Subscription } else { - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant, 0, 24); try { - CComPropVariant cComPropVariant2; + PROPVARIANT cComPropVariant2; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant2, 0, 24); try { - CComPropVariant cComPropVariant3; + PROPVARIANT cComPropVariant3; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant3, 0, 24); try @@ -180,7 +180,7 @@ namespace Microsoft.Zune.Subscription EPlaylistType nSrc = (isPersonalChannel ? ((EPlaylistType)6) : ((EPlaylistType)5)); Module.CComPropVariant_002E_003D(&cComPropVariant, (int)nSrc); Module.CComPropVariant_002E_003D(&cComPropVariant3, lastSignedInUserId); - num = Module.ZuneLibraryExports_002ECreatePropertySet((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_PLAYLIST), 3229617665u, &ptr); + num = Module.CreatePropertySet((_GUID*)Unsafe.AsPointer(ref Module.ID_MS_MEDIA_SCHEMA_PLAYLIST), 3229617665u, &ptr); if (num >= 0) { int num3; @@ -189,9 +189,9 @@ namespace Microsoft.Zune.Subscription ushort* ptr2 = (ushort*)subscriptionTitlePtr; try { - Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)) = (nint)Module.SysAllocString(ptr2); + Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)) = (nint)Module.SysAllocString(ptr2); *(short*)(&cComPropVariant2) = 8; - num3 = ((Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)) != 0) ? num : (-2147024882)); + num3 = ((Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)) != 0) ? num : (-2147024882)); num = num3; } catch @@ -230,7 +230,7 @@ namespace Microsoft.Zune.Subscription catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant3); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant3); throw; } Module.CComPropVariant_002E_007Bdtor_007D(&cComPropVariant3); @@ -238,7 +238,7 @@ namespace Microsoft.Zune.Subscription catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); throw; } Module.CComPropVariant_002E_007Bdtor_007D(&cComPropVariant2); @@ -246,7 +246,7 @@ namespace Microsoft.Zune.Subscription catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002E_007Bdtor_007D(&cComPropVariant); @@ -368,7 +368,7 @@ namespace Microsoft.Zune.Subscription { //IL_0050: Expected I, but got I8 int num; - if (m_pSubscriptionManager == null || feedUrl == (string)null) + if (m_pSubscriptionManager == null || feedUrl == null) { num = -2147467261; } @@ -407,7 +407,7 @@ namespace Microsoft.Zune.Subscription int num = 0; int num2 = -1; int num3; - if (!(feedUrl == (string)null) && m_pSubscriptionManager != null) + if (!(feedUrl == null) && m_pSubscriptionManager != null) { subscriptionMediaId = -1; if (EMediaTypes.eMediaTypePlaylist != eSubscriptionMediaType) @@ -459,7 +459,7 @@ namespace Microsoft.Zune.Subscription bool result = false; int num = 0; int num2 = -1; - _GUID gUID = Module.GuidToGUID(serviceId); + _GUID gUID = serviceId; ISubscriptionManager* pSubscriptionManager = m_pSubscriptionManager; int lastSignedInUserId = GetLastSignedInUserId(); if (0 == ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSubscriptionManager + 88)))((nint)pSubscriptionManager, lastSignedInUserId, &gUID, eSubscriptionMediaType, &num2, &num)) @@ -620,7 +620,7 @@ namespace Microsoft.Zune.Subscription { //IL_002d: Expected I, but got I8 //IL_00c4: Expected I, but got I8 - int num = ((m_pSubscriptionManager != null && !(feedUrl == (string)null)) ? ValidateUrl(ref feedUrl) : (-2147467261)); + int num = ((m_pSubscriptionManager != null && !(feedUrl == null)) ? ValidateUrl(ref feedUrl) : (-2147467261)); fixed (char* feedUrlPtr = feedUrl.ToCharArray()) { ushort* ptr3 = (ushort*)feedUrlPtr; @@ -638,7 +638,7 @@ namespace Microsoft.Zune.Subscription { for (int i = 0; i < count; i++) { - *(int*)((long)i * 4L + (nint)ptr) = (int)subscriptionItemMediaIdList[i]; + *(int*)(i * 4L + (nint)ptr) = (int)subscriptionItemMediaIdList[i]; } long num3 = *(long*)m_pSubscriptionManager + 152; ISubscriptionManager* pSubscriptionManager = m_pSubscriptionManager; @@ -690,7 +690,7 @@ namespace Microsoft.Zune.Subscription } else { - if ((string)null == subscriptionTitle) + if (null == subscriptionTitle) { num = GetSubscriptionTitle(subscriptionMediaId, eSubscriptionMediaType, out subscriptionTitle); if (num < 0) @@ -752,7 +752,7 @@ namespace Microsoft.Zune.Subscription } try { - num = Module.ZuneLibraryExports_002EGetFieldValues(subscriptionMediaId, EListType.ePlaylistList, 1, &dBPropertyRequestStruct, null); + num = Module.GetFieldValues(subscriptionMediaId, EListType.ePlaylistList, 1, &dBPropertyRequestStruct, null); } catch { @@ -767,7 +767,7 @@ namespace Microsoft.Zune.Subscription IL_004a: try { - num = Module.ZuneLibraryExports_002EGetFieldValues(subscriptionMediaId, EListType.ePodcastList, 1, &dBPropertyRequestStruct, null); + num = Module.GetFieldValues(subscriptionMediaId, EListType.ePodcastList, 1, &dBPropertyRequestStruct, null); } catch { @@ -800,7 +800,7 @@ namespace Microsoft.Zune.Subscription { //IL_0009: Expected I, but got I8 ISubscriptionManager* pSubscriptionManager = null; - int singleton = Module.GetSingleton((_GUID)Module._GUID_9dc7c984_41d5_4130_a5ac_46d0825cd29d, (void**)(&pSubscriptionManager)); + int singleton = Module.GetSingleton(Module.GUID_ISubscriptionManager, (void**)(&pSubscriptionManager)); if (singleton >= 0) { m_pSubscriptionManager = pSubscriptionManager; @@ -811,7 +811,7 @@ namespace Microsoft.Zune.Subscription private int ValidateUrl([In][Out] ref string feedUrl) { - if (feedUrl == (string)null) + if (feedUrl == null) { return -1072884976; } @@ -832,7 +832,7 @@ namespace Microsoft.Zune.Subscription //IL_003b: Expected I, but got I8 int result = 1; IService* ptr = null; - if (Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IService, (void**)(&ptr)) >= 0) { IService* intPtr = ptr; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 384)))((nint)intPtr, null, &result); @@ -862,7 +862,7 @@ namespace Microsoft.Zune.Subscription } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionSeriesInfo.cs b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionSeriesInfo.cs index 37a171e..dcd3c28 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionSeriesInfo.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionSeriesInfo.cs @@ -14,6 +14,7 @@ namespace Microsoft.Zune.Subscription private unsafe IMSMediaSchemaPropertySet* m_pSeriesPropertySet; public unsafe SubscriptionSeriesInfo(DataProviderQuery owner, object typeCookie, string serviceId) + : base(owner, typeCookie) { //IL_000f: Expected I, but got I8 m_serviceId = serviceId; @@ -48,9 +49,7 @@ namespace Microsoft.Zune.Subscription Unsafe.As<_0024ArrayType_0024_0024_0024BY09UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY09UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, 136)) = 16801796; Unsafe.As<_0024ArrayType_0024_0024_0024BY09UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, long>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY09UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, 144)) = (nint)Unsafe.AsPointer(ref Module._003F_003F_C_0040_1BE_0040GMGHCDOJ_0040_003F_0024AAO_003F_0024AAw_003F_0024AAn_003F_0024AAe_003F_0024AAr_003F_0024AAN_003F_0024AAa_003F_0024AAm_003F_0024AAe_003F_0024AA_003F_0024AA_0040); Unsafe.As<_0024ArrayType_0024_0024_0024BY09UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY09UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, 152)) = 16801799; - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + PROPVARIANT cComPropVariant = new(); object result; try { @@ -75,7 +74,7 @@ namespace Microsoft.Zune.Subscription } uint num2 = *(uint*)((long)num * 16L + (ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY09UPROPERTY_TO_PID_MAP_0040Subscription_0040Zune_0040Microsoft_0040_0040, 8))); IMSMediaSchemaPropertySet* pSeriesPropertySet = m_pSeriesPropertySet; - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet + 48)))((nint)pSeriesPropertySet, num2, 0u, (PROPVARIANT)(&cComPropVariant)) < 0 || *(ushort*)(&cComPropVariant) == 0) + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet + 48)))((System.nint)pSeriesPropertySet, num2, 0u, cComPropVariant) < 0 || *(ushort*)(&cComPropVariant) == 0) { break; } @@ -90,7 +89,7 @@ namespace Microsoft.Zune.Subscription catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -124,42 +123,35 @@ namespace Microsoft.Zune.Subscription //IL_006c: Expected I, but got I8 //IL_009a: Expected I4, but got I8 //IL_00c8: Expected I, but got I8 - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + PROPVARIANT cComPropVariant = new(); try { - if (pSeriesPropertySet != null && ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet + 48)))((nint)pSeriesPropertySet, 16801793u, 0u, (PROPVARIANT)(&cComPropVariant)) >= 0 && *(ushort*)(&cComPropVariant) != 0) + if (pSeriesPropertySet != null && ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet + 48)))((System.nint)pSeriesPropertySet, (uint)16801793u, (uint)0u, (PROPVARIANT)cComPropVariant) >= 0 && *(ushort*)(&cComPropVariant) != 0) { - IMSMediaSchemaPropertySet* pSeriesPropertySet2 = m_pSeriesPropertySet; + IMSMediaSchemaPropertySet* pSeriesPropertySet2 = m_pSeriesPropertySet; if (0L != (nint)pSeriesPropertySet2) { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet2 + 16)))((nint)pSeriesPropertySet2); - m_pSeriesPropertySet = null; + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet2 + 16)))((System.nint)pSeriesPropertySet2); + m_pSeriesPropertySet = null; } - m_pSeriesPropertySet = pSeriesPropertySet; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet + 8)))((nint)pSeriesPropertySet); + m_pSeriesPropertySet = pSeriesPropertySet; + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet + 8)))((System.nint)pSeriesPropertySet); if (!string.IsNullOrEmpty(m_serviceId)) { - Guid guid = new Guid(m_serviceId); - _GUID gUID; - *(int*)(&gUID) = 0; - // IL initblk instruction - Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref gUID, 4), 0, 12); - gUID = Module.GuidToGUID(guid); - tagPROPVARIANT tagPROPVARIANT; + Guid guid = new(m_serviceId); + tagPROPVARIANT tagPROPVARIANT; *(short*)(&tagPROPVARIANT) = 72; - Unsafe.As(ref Unsafe.AddByteOffset(ref tagPROPVARIANT, 8)) = (nint)(&gUID); - IMSMediaSchemaPropertySet* pSeriesPropertySet3 = m_pSeriesPropertySet; - tagPROPVARIANT tagPROPVARIANT2 = tagPROPVARIANT; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet3 + 56)))((nint)pSeriesPropertySet3, 67133455u, tagPROPVARIANT2); + Unsafe.As(ref Unsafe.AddByteOffset(ref tagPROPVARIANT, 8)) = (nint)(&guid); + IMSMediaSchemaPropertySet* pSeriesPropertySet3 = m_pSeriesPropertySet; + tagPROPVARIANT tagPROPVARIANT2 = tagPROPVARIANT; + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pSeriesPropertySet3 + 56)))((nint)pSeriesPropertySet3, (uint)67133455u, (tagPROPVARIANT)tagPROPVARIANT2); } } } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); diff --git a/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs b/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs index 0232cba..1197228 100644 --- a/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs +++ b/ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs @@ -93,7 +93,7 @@ namespace Microsoft.Zune.Subscription UpdateQueryStatus(DataProviderQueryStatus.RequestingData); ISubscriptionViewer* ptr = null; VirtualSubscriptionEpisodeListProxy* ptr2 = null; - int num = ZuneDBApi.Module.ZuneLibraryExports_002ECreateNativeSubscriptionViewer((void**)(&ptr)); + int num = ZuneDBApi.Module.CreateNativeSubscriptionViewer((void**)(&ptr)); if (num >= 0) { VirtualSubscriptionEpisodeListProxy* ptr3 = (VirtualSubscriptionEpisodeListProxy*)ZuneDBApi.Module.@new(40uL); @@ -156,7 +156,7 @@ namespace Microsoft.Zune.Subscription Monitor.Enter(m_lock); try { - if (sortProperty != (string)null) + if (sortProperty != null) { SetSortProperty(sortProperty); } diff --git a/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs b/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs index 042a729..72d690e 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/Clipboard.cs @@ -70,7 +70,7 @@ namespace Microsoft.Zune.Util { num = 87; } - if (num < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (num < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd81a90d8_002EWPP_Clipboard_cpp_Traceguids), (uint)num); } @@ -101,7 +101,7 @@ namespace Microsoft.Zune.Util uint lastError2 = Module.GetLastError(); num = (((int)lastError2 > 0) ? ((int)(lastError2 & 0xFFFF) | -2147024896) : ((int)lastError2)); } - if (num < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (num < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd81a90d8_002EWPP_Clipboard_cpp_Traceguids), (uint)num); } @@ -151,7 +151,7 @@ namespace Microsoft.Zune.Util num = (((int)lastError3 > 0) ? ((int)(lastError3 & 0xFFFF) | -2147024896) : ((int)lastError3)); } } - if (num < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (num < 0 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 12, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd81a90d8_002EWPP_Clipboard_cpp_Traceguids), (uint)num); } diff --git a/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs b/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs index 8243e4e..6167e66 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ContentRefreshTask.cs @@ -80,7 +80,7 @@ namespace Microsoft.Zune.Util IContentRefreshTask* ptr3 = null; if (num >= 0) { - num = Module.ZuneLibraryExports_002ECreateContentRefreshTask((IAsyncCallback*)ptr2, &ptr3); + num = Module.CreateContentRefreshTask((IAsyncCallback*)ptr2, &ptr3); if (num >= 0) { if (0L != (nint)ptr3) diff --git a/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs b/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs index df06808..ba4c071 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/DRMCanDoQuery.cs @@ -11,7 +11,7 @@ namespace Microsoft.Zune.Util public unsafe DRMCanDoQuery() { IDRMQuery* pDRMQuery; - int num = Module.ZuneLibraryExports_002ECreateDRMQuery(&pDRMQuery); + int num = Module.CreateDRMQuery(&pDRMQuery); if (num < 0) { throw new ApplicationException(Module.GetErrorDescription(num)); diff --git a/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs b/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs index 20c0854..8a18db2 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs @@ -300,7 +300,7 @@ namespace Microsoft.Zune.Util if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 104)))((nint)intPtr2, num2, &ptr2) >= 0) { IDownloadTask* intPtr3 = ptr2; - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr3 + 144)))((nint)intPtr3) == (EDownloadType)0) + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr3 + 144)))((nint)intPtr3) == 0) { IDownloadTask* intPtr4 = ptr2; flag = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 200)))((nint)intPtr4, null) == EDownloadTaskState.DLTaskPendingAttach || flag; @@ -433,7 +433,7 @@ namespace Microsoft.Zune.Util if (singleton >= 0) { long num5 = *(long*)(&cComPtrNtv_003CIDownloadTask_003E); - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIDownloadTask_003E)) + 144)))((nint)num5) == (EDownloadType)0) + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIDownloadTask_003E)) + 144)))((nint)num5) == 0) { long num6 = *(long*)(&cComPtrNtv_003CIDownloadTask_003E); if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIDownloadTask_003E)) + 200)))((nint)num6, null) != EDownloadTaskState.DLTaskComplete) diff --git a/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs b/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs index 92617d7..e438e5c 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs @@ -31,15 +31,15 @@ namespace Microsoft.Zune.Util { FamilySettingsManager familySettingsManager = new FamilySettingsManager(); IMetadataManager* ptr; - int singleton = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + int singleton = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (singleton < 0) { throw new ApplicationException(Module.GetErrorDescription(singleton)); } IMetadataManager* intPtr = ptr; - __s_GUID gUID_04f38ab5_391b_4b5a_a2c1_d4b74aeb4be = Module._GUID_04f38ab5_391b_4b5a_a2c1_d4b74aeb4be9; + _GUID guid_IFamilySettingsProvider = Module.GUID_IFamilySettingsProvider; IFamilySettingsProvider* pProvider; - int num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_04f38ab5_391b_4b5a_a2c1_d4b74aeb4be, (void**)(&pProvider)); + int num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, guid_IFamilySettingsProvider, (void**)(&pProvider)); if (num < 0) { throw new ApplicationException(Module.GetErrorDescription(num)); @@ -139,7 +139,7 @@ namespace Microsoft.Zune.Util //IL_0008: Expected I4, but got I8 //IL_0023: Expected I, but got I8 //IL_0033: Expected I, but got I8 - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant, 0, 24); HRESULT result; @@ -148,10 +148,10 @@ namespace Microsoft.Zune.Util IFamilySettingsProvider* pProvider = m_pProvider; int num; int num2; - int num3 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pProvider + 40)))((nint)pProvider, nSettingId, (PROPVARIANT)(&cComPropVariant), &num, &num2); + int num3 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pProvider + 40)))((System.nint)pProvider, (int)nSettingId, (PROPVARIANT)cComPropVariant, (int*)&num, (int*)&num2); if (0 == num3) { - szRatingSystem = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8))); + szRatingSystem = new string((char*)Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8))); nRatingLevel = num; bool flag = (fBlockUnrated = ((num2 != 0) ? true : false)); } @@ -160,7 +160,7 @@ namespace Microsoft.Zune.Util catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -205,14 +205,13 @@ namespace Microsoft.Zune.Util } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~FamilySettingsManager() diff --git a/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs b/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs index 6960eba..95219cb 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/JumpListSession.cs @@ -40,7 +40,7 @@ namespace Microsoft.Zune.Util int num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 24)))((nint)p, &num); if (num2 >= 0) { - IJumpListEntry** ptr = (IJumpListEntry**)Module.new_005B_005D((ulong)num * 8uL); + IJumpListEntry** ptr = (IJumpListEntry**)Module.new_005B_005D(num * 8uL); num2 = (((long)(nint)ptr == 0) ? (-2147024882) : num2); if (num2 >= 0) { diff --git a/ZuneDBApi/Microsoft/Zune/Util/PhotoManager.cs b/ZuneDBApi/Microsoft/Zune/Util/PhotoManager.cs index eb7e8f6..d859546 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/PhotoManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/PhotoManager.cs @@ -47,7 +47,7 @@ namespace Microsoft.Zune.Util IMetadataManager* ptr = null; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (num >= 0) { long num2 = *(long*)ptr + 440; @@ -85,7 +85,7 @@ namespace Microsoft.Zune.Util IFolderProvider* ptr2 = null; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (num >= 0) { IMetadataManager* intPtr = ptr; @@ -155,7 +155,7 @@ namespace Microsoft.Zune.Util IFileProvider* ptr2 = null; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (num >= 0) { IMetadataManager* intPtr = ptr; @@ -215,7 +215,7 @@ namespace Microsoft.Zune.Util IFolderProvider* ptr2 = null; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (num >= 0) { IMetadataManager* intPtr = ptr; @@ -287,7 +287,7 @@ namespace Microsoft.Zune.Util IFolderProvider* ptr2 = null; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (num >= 0) { IMetadataManager* intPtr = ptr; @@ -355,7 +355,7 @@ namespace Microsoft.Zune.Util IFolderProvider* ptr2 = null; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (num >= 0) { IMetadataManager* intPtr = ptr; @@ -419,7 +419,7 @@ namespace Microsoft.Zune.Util IFolderProvider* ptr2 = null; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (num >= 0) { IMetadataManager* intPtr = ptr; diff --git a/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs b/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs index e3f56c1..6bed1c4 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/PinManager.cs @@ -30,7 +30,7 @@ namespace Microsoft.Zune.Util { PinManager pinManager = new PinManager(); IMetadataManager* ptr; - int singleton = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr)); + int singleton = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr)); if (singleton < 0) { throw new ApplicationException(Module.GetErrorDescription(singleton)); diff --git a/ZuneDBApi/Microsoft/Zune/Util/ShipAssert.cs b/ZuneDBApi/Microsoft/Zune/Util/ShipAssert.cs index 1d06731..acd4b92 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ShipAssert.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ShipAssert.cs @@ -11,7 +11,7 @@ namespace Microsoft.Zune.Util //IL_000c: Expected I, but got I8 if (!condition) { - Module.ZuneLibraryExports_002EShipAssert(id, param, null); + Module.ShipAssert(id, param, null); } } @@ -20,7 +20,7 @@ namespace Microsoft.Zune.Util //IL_000c: Expected I, but got I8 if (!condition) { - Module.ZuneLibraryExports_002EShipAssert(id, param, null); + Module.ShipAssert(id, param, null); } } @@ -35,7 +35,7 @@ namespace Microsoft.Zune.Util ushort* ptr = (ushort*)msgPtr; try { - Module.ZuneLibraryExports_002EShipAssert(id, param, ptr); + Module.ShipAssert(id, param, ptr); } catch { @@ -57,7 +57,7 @@ namespace Microsoft.Zune.Util ushort* ptr = (ushort*)msgPtr; try { - Module.ZuneLibraryExports_002EShipAssert(id, param, ptr); + Module.ShipAssert(id, param, ptr); } catch { @@ -76,13 +76,13 @@ namespace Microsoft.Zune.Util StackFrame frame = new StackTrace(1, fNeedFileInfo: false).GetFrame(0); string name = frame.GetMethod().Name; uint num = 0u; - if (name != (string)null && name.Length >= 2) + if (name != null && name.Length >= 2) { char[] array = name.ToCharArray(0, 2); num = ((uint)(array[1] & 0xFF) | ((uint)array[0] << 8)) << 16; } num |= (uint)frame.GetILOffset() & 0xFFFFu; - Module.ZuneLibraryExports_002EShipAssert(1006u, num, null); + Module.ShipAssert(1006u, num, null); } } } diff --git a/ZuneDBApi/Microsoft/Zune/Util/UsageDataService.cs b/ZuneDBApi/Microsoft/Zune/Util/UsageDataService.cs index 7876ebd..731b3f3 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/UsageDataService.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/UsageDataService.cs @@ -14,7 +14,7 @@ namespace Microsoft.Zune.Util //IL_0042: Expected I, but got I8 bool flag = false; IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { int num = 0; IUsageDataManager* intPtr = ptr; @@ -37,7 +37,7 @@ namespace Microsoft.Zune.Util //IL_0020: Expected I, but got I8 //IL_0033: Expected I, but got I8 IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { IUsageDataManager* intPtr = ptr; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 32)))((nint)intPtr, fCanPostUsageData ? 1 : 0); @@ -55,9 +55,9 @@ namespace Microsoft.Zune.Util //IL_0032: Expected I, but got I8 //IL_004e: Expected I, but got I8 IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { - _GUID gUID = Module.GuidToGUID(guidTrackId); + _GUID gUID = guidTrackId; fixed (char* strReferrerPtr = strReferrer.ToCharArray()) { ushort* ptr2 = (ushort*)strReferrerPtr; @@ -88,9 +88,9 @@ namespace Microsoft.Zune.Util //IL_0032: Expected I, but got I8 //IL_004e: Expected I, but got I8 IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { - _GUID gUID = Module.GuidToGUID(guidTrackId); + _GUID gUID = guidTrackId; fixed (char* strReferrerPtr = strReferrer.ToCharArray()) { ushort* ptr2 = (ushort*)strReferrerPtr; @@ -121,9 +121,9 @@ namespace Microsoft.Zune.Util //IL_0032: Expected I, but got I8 //IL_004e: Expected I, but got I8 IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { - _GUID gUID = Module.GuidToGUID(guidTrackId); + _GUID gUID = guidTrackId; fixed (char* strReferrerPtr = strReferrer.ToCharArray()) { ushort* ptr2 = (ushort*)strReferrerPtr; @@ -154,9 +154,9 @@ namespace Microsoft.Zune.Util //IL_0035: Expected I, but got I8 //IL_0051: Expected I, but got I8 IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { - _GUID gUID = Module.GuidToGUID(guidTrackId); + _GUID gUID = guidTrackId; fixed (char* strReferrerPtr = strReferrer.ToCharArray()) { ushort* ptr2 = (ushort*)strReferrerPtr; @@ -187,14 +187,14 @@ namespace Microsoft.Zune.Util //IL_0035: Expected I, but got I8 //IL_0051: Expected I, but got I8 IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { fixed (char* strReferrerPtr = strReferrer.ToCharArray()) { ushort* ptr2 = (ushort*)strReferrerPtr; try { - _GUID gUID = Module.GuidToGUID(guidMediaId); + _GUID gUID = guidMediaId; long num = *(long*)ptr + 136; IUsageDataManager* intPtr = ptr; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)intPtr, &gUID, ptr2); @@ -220,9 +220,9 @@ namespace Microsoft.Zune.Util //IL_0029: Expected I, but got I8 //IL_003c: Expected I, but got I8 IUsageDataManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_2f36e709_c431_4836_ab2b_ab57aef0cf1a, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IUsageDataManager, (void**)(&ptr)) >= 0) { - _GUID gUID = Module.GuidToGUID(guidMediaId); + _GUID gUID = guidMediaId; IUsageDataManager* intPtr = ptr; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 40)))((nint)intPtr, purchase ? 1 : 0, &gUID); } diff --git a/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs b/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs index 503e7e4..eab92d3 100644 --- a/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs +++ b/ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs @@ -22,7 +22,7 @@ namespace Microsoft.Zune.Util { get { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -43,7 +43,7 @@ namespace Microsoft.Zune.Util Monitor.Exit(s_lock); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -60,7 +60,7 @@ namespace Microsoft.Zune.Util //IL_00a8: Expected I, but got I8 //IL_00a8: Expected I, but got I8 //IL_0102: Expected I8, but got I - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 12, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -90,7 +90,7 @@ namespace Microsoft.Zune.Util long num = *(long*)(*(ulong*)(&cComPtrNtv_003CIZuneWebHost_003E)) + 24; long num2 = *(long*)(&cComPtrNtv_003CIZuneWebHost_003E); int num3 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num))((nint)num2, ptr3, (HWND*)hWndHost, width, height, &ptr); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { sbyte* a = (sbyte*)Unsafe.AsPointer(ref num3 < 0 ? ref Module._003F_003F_C_0040_07PPOLEBIF_0040_003F5ERROR_003F3_003F_0024AA_0040 : ref Unsafe.As<_0024ArrayType_0024_0024_0024BY00_0024_0024CBD, _0024ArrayType_0024_0024_0024BY07_0024_0024CBD>(ref Module._003F_003F_C_0040_00CNPNBAHC_0040_003F_0024AA_0040)); Module.WPP_SF_sD(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 13, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids), a, (uint)num3); @@ -113,7 +113,7 @@ namespace Microsoft.Zune.Util { //IL_004d: Expected I, but got I8 bool result = false; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 14, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -126,7 +126,7 @@ namespace Microsoft.Zune.Util result = true; } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 15, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -135,7 +135,7 @@ namespace Microsoft.Zune.Util public unsafe void SetNavigationCompleteHandler(NavigationCompleteHandler navigationCompleteHandler) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 16, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -144,7 +144,7 @@ namespace Microsoft.Zune.Util public unsafe void SetNavigationErrorHandler(NavigationErrorHandler navigationErrorHandler) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 17, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -153,7 +153,7 @@ namespace Microsoft.Zune.Util public unsafe void OnNavigationComplete(string data) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 18, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -161,7 +161,7 @@ namespace Microsoft.Zune.Util { m_navCompleteHandler(data); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 19, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -169,7 +169,7 @@ namespace Microsoft.Zune.Util public unsafe void OnNavigationError(string navUrl, int errorCode) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 20, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } @@ -177,7 +177,7 @@ namespace Microsoft.Zune.Util { m_navErrorHandler(navUrl, errorCode); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 0x8000u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 21, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xd3863cf3_002EWPP_ZuneWebHostInterop_cpp_Traceguids)); } diff --git a/ZuneDBApi/MicrosoftZuneInterop/QueryPropertyBag.cs b/ZuneDBApi/MicrosoftZuneInterop/QueryPropertyBag.cs index b92e720..2ab9775 100644 --- a/ZuneDBApi/MicrosoftZuneInterop/QueryPropertyBag.cs +++ b/ZuneDBApi/MicrosoftZuneInterop/QueryPropertyBag.cs @@ -12,7 +12,7 @@ namespace MicrosoftZuneInterop public unsafe QueryPropertyBag() { IQueryPropertyBag* pPropertyBag; - Module.ZuneLibraryExports_002ECreatePropertyBag(&pPropertyBag); + Module.CreatePropertyBag(&pPropertyBag); m_pPropertyBag = pPropertyBag; } @@ -126,7 +126,7 @@ namespace MicrosoftZuneInterop } else { - eQueryPropertyBagProp = *(EQueryPropertyBagProp*)((long)num * 16L + (ref Unsafe.AddByteOffset(ref Module.MicrosoftZuneInterop_002E_003FA0x52c37a46_002EkPropIdMap, 8))); + eQueryPropertyBagProp = *(EQueryPropertyBagProp*)((long)num * 16L + Module.MicrosoftZuneInterop_002E_003FA0x52c37a46_002EkPropIdMap + 8); if (eQueryPropertyBagProp != (EQueryPropertyBagProp)(-1)) { break; @@ -202,7 +202,7 @@ namespace MicrosoftZuneInterop int* ptr = null; int* ptr2 = null; IMultiSortAttributes* ptr3; - if (Module.ZuneLibraryExports_002ECreateMultiSortAttributes(num, &ptr3) >= 0) + if (Module.CreateMultiSortAttributes(num, &ptr3) >= 0) { IMultiSortAttributes* intPtr = ptr3; ptr = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr + 32)))((nint)intPtr); @@ -262,14 +262,13 @@ namespace MicrosoftZuneInterop } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~QueryPropertyBag() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/AppInitializationSequencer.cs b/ZuneDBApi/MicrosoftZuneLibrary/AppInitializationSequencer.cs index e988800..0defd1e 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/AppInitializationSequencer.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/AppInitializationSequencer.cs @@ -37,7 +37,7 @@ namespace MicrosoftZuneLibrary int num2; if (ptr2 != null) { - int num = Module.ZuneLibraryExports_002EPhase3Initialization((IAsyncCallback*)ptr2); + int num = Module.Phase3Initialization((IAsyncCallback*)ptr2); ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); if (num >= 0) { diff --git a/ZuneDBApi/MicrosoftZuneLibrary/Device.cs b/ZuneDBApi/MicrosoftZuneLibrary/Device.cs index 84f22fc..a37fcdf 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/Device.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/Device.cs @@ -230,10 +230,10 @@ namespace MicrosoftZuneLibrary if (spEndpointHost.p != null) { IEndpointHost* p = spEndpointHost.p; - _FILETIME fILETIME; - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 88)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyLastConnectTime, &fILETIME) >= 0) + FILETIME fILETIME; + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 88)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyLastConnectTime, &fILETIME) >= 0) { - long fileTime = (long)(uint)Unsafe.As<_FILETIME, int>(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); + long fileTime = (uint)Unsafe.As(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); try { result = DateTime.FromFileTime(fileTime); @@ -259,10 +259,10 @@ namespace MicrosoftZuneLibrary if (spEndpointHost.p != null) { IEndpointHost* p = spEndpointHost.p; - _FILETIME fILETIME; - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 88)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyLastSyncTime, &fILETIME) >= 0) + FILETIME fILETIME; + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 88)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyLastSyncTime, &fILETIME) >= 0) { - long fileTime = (long)(uint)Unsafe.As<_FILETIME, int>(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); + long fileTime = (uint)Unsafe.As(ref Unsafe.AddByteOffset(ref fILETIME, 4)) * 4294967296L + (uint)(*(int*)(&fILETIME)); try { result = DateTime.FromFileTime(fileTime); @@ -720,7 +720,7 @@ namespace MicrosoftZuneLibrary private unsafe void _007EDevice() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 12, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); } @@ -757,7 +757,7 @@ namespace MicrosoftZuneLibrary ((IDisposable)predictedGasGauge).Dispose(); m_predictedGasGauge = null; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 13, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -933,7 +933,7 @@ namespace MicrosoftZuneLibrary int num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 112)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyUserGuid, &gUID_NULL); if (num >= 0) { - Guid guid = (guidUserGuid = Module.GUIDToGuid(gUID_NULL)); + Guid guid = (guidUserGuid = gUID_NULL); } return num; } @@ -1146,7 +1146,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1002u, 1139u); return -2147418113; } - _GUID gUID = Module.GuidToGUID(guidUserGuid); + _GUID gUID = guidUserGuid; IEndpointHost* p = m_spEndpointHost.p; int num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 176)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyUserGuid, &gUID); if (num >= 0) @@ -1355,7 +1355,7 @@ namespace MicrosoftZuneLibrary return -2147418113; } IWlanProfileList* ptr = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 29, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); } @@ -1386,7 +1386,7 @@ namespace MicrosoftZuneLibrary { goto IL_035c; } - if (!((string)null != wlanProfile.Key)) + if (!(null != wlanProfile.Key)) { goto IL_0142; } @@ -1470,7 +1470,7 @@ namespace MicrosoftZuneLibrary IWlanProfile* intPtr8 = ptr2; ushort* intPtr9 = ptr5; uint num6 = Module.SysStringLen(intPtr9); - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num5))((nint)intPtr8, (byte*)intPtr9, (uint)((ulong)num6 * 2uL), 0); + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)num5))((nint)intPtr8, (byte*)intPtr9, (uint)(num6 * 2uL), 0); } if (num >= 0) { @@ -1570,7 +1570,7 @@ namespace MicrosoftZuneLibrary ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr17 + 16)))((nint)intPtr17); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 30, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); } @@ -1602,7 +1602,7 @@ namespace MicrosoftZuneLibrary return -2147418113; } IWlanProfileList* ptr = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 31, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); } @@ -1727,7 +1727,7 @@ namespace MicrosoftZuneLibrary } IWlanProfileList* intPtr12 = ptr; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr12 + 16)))((nint)intPtr12); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 32, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); } @@ -1866,7 +1866,7 @@ namespace MicrosoftZuneLibrary return -2147418113; } IWlanAuthCipherPairList* ptr = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 33, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); } @@ -1906,7 +1906,7 @@ namespace MicrosoftZuneLibrary ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr3 + 16)))((nint)intPtr3); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 34, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); } @@ -1946,7 +1946,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1002u, 1845u); return -2147418113; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 35, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); } @@ -1973,7 +1973,7 @@ namespace MicrosoftZuneLibrary { num = 0; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 36, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); } @@ -2435,7 +2435,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1002u, 2366u); return -2147418113; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 37, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); } @@ -2474,7 +2474,7 @@ namespace MicrosoftZuneLibrary operationStatus = eSyncOperationStatus; } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 38, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); } @@ -2498,7 +2498,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1002u, 2461u); return -2147418113; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 39, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); } @@ -2530,7 +2530,7 @@ namespace MicrosoftZuneLibrary { operationStatus = eSyncOperationStatus; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 40, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num3); } @@ -2570,12 +2570,12 @@ namespace MicrosoftZuneLibrary Unsafe.As(ref Unsafe.AddByteOffset(ref intSet, 24)) = 0L; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&cComPtrNtv_003CIMetadataManager_003E)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&cComPtrNtv_003CIMetadataManager_003E)); if (num >= 0) { long num2 = *(long*)(&cComPtrNtv_003CIMetadataManager_003E); - __s_GUID gUID_7472ae89_073d_420b_9828_51f9d80ca2a = Module._GUID_7472ae89_073d_420b_9828_51f9d80ca2a6; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIMetadataManager_003E)) + 24)))((nint)num2, (_GUID)gUID_7472ae89_073d_420b_9828_51f9d80ca2a, (void**)(&cComPtrNtv_003CIDeviceContentProvider_003E)); + _GUID guid_IDeviceContentProvider = Module.GUID_IDeviceContentProvider; + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIMetadataManager_003E)) + 24)))((nint)num2, (_GUID)guid_IDeviceContentProvider, (void**)(&cComPtrNtv_003CIDeviceContentProvider_003E)); if (num >= 0) { long num3 = *(long*)(&cComPtrNtv_003CIDeviceContentProvider_003E); @@ -3018,7 +3018,7 @@ namespace MicrosoftZuneLibrary public unsafe void EndpointStatusChanged(int hrEnumeration, EEndpointStatus eDeviceStatus) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_Dd(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 41, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), (uint)hrEnumeration, m_iDeviceID); } @@ -3036,7 +3036,7 @@ namespace MicrosoftZuneLibrary { m_DeviceStatusChanged(this, m_hrEnumeration, eDeviceStatus); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 42, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3090,13 +3090,13 @@ namespace MicrosoftZuneLibrary { m_spDeviceMediator = spDeviceMediator; base._002Ector(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } m_Lock = new object(); m_eLastDeviceStatus = EEndpointStatus.eEndpointStatusUndefined; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3142,13 +3142,13 @@ namespace MicrosoftZuneLibrary int num = 0; if (pEndpointHost == null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 14, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } return -2147467261; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 15, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3179,7 +3179,7 @@ namespace MicrosoftZuneLibrary } if ((m_syncRules = new SyncRules(pEndpointHost)) == null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 16, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), 0); } @@ -3262,7 +3262,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 17, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3294,7 +3294,7 @@ namespace MicrosoftZuneLibrary //IL_037f: Expected I, but got I8 //IL_03b1: Expected I, but got I8 ManagedLock managedLock = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 18, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3326,7 +3326,7 @@ namespace MicrosoftZuneLibrary num = m_firmwareUpdater.Restorer.ContinueFirmwareProcess(OnFirmwareProcessComplete); if (num < 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 19, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); } @@ -3338,7 +3338,7 @@ namespace MicrosoftZuneLibrary if (!flag) { ESyncRelationship eSyncRelationship = ESyncRelationship.srNone; - EEndpointCompatibilityStatus eEndpointCompatibilityStatus = (EEndpointCompatibilityStatus)0; + EEndpointCompatibilityStatus eEndpointCompatibilityStatus = 0; if (!flag3) { goto IL_0341; @@ -3356,7 +3356,7 @@ namespace MicrosoftZuneLibrary Module.GetEndpointHostEnumProperty_003Cenum_0020ESyncRelationship_003E(m_spEndpointHost.p, EEndpointHostProperty.eEndpointHostPropertySyncRelationship, &eSyncRelationship); if (IsConnectedWirelessly && eSyncRelationship != ESyncRelationship.srSyncWithThisMachine) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 21, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), (uint)eSyncRelationship); } @@ -3377,7 +3377,7 @@ namespace MicrosoftZuneLibrary } if ((m_fClientUpdateRequired || m_fFirmwareUpdateRequired) && IsConnectedWirelessly) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 22, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3415,7 +3415,7 @@ namespace MicrosoftZuneLibrary num = m_firmwareUpdater.ContinueFirmwareProcess(OnFirmwareProcessComplete); if (num < 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 20, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); } @@ -3429,7 +3429,7 @@ namespace MicrosoftZuneLibrary IL_0406: int fInitializationCompleted; m_fInitializationCompleted = (byte)fInitializationCompleted != 0; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_dd(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 23, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num, m_iDeviceID); } @@ -3510,13 +3510,13 @@ namespace MicrosoftZuneLibrary private unsafe void OnFirmwareProcessComplete(int hr) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 27, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), hr); } Initialize(m_spEndpointHost.p); CompleteInitialization(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 28, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3540,7 +3540,7 @@ namespace MicrosoftZuneLibrary try { Monitor.Enter(m_Lock); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 24, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); int num2 = 1; @@ -3565,7 +3565,7 @@ namespace MicrosoftZuneLibrary byte b = ((*pfFirmwareRestoreInProgress = m_firmwareUpdater.Restorer.IsRestoreInProgress()) ? ((byte)1) : ((byte)0)); if (*pfFirmwareUpdateInProgress || b != 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 25, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), m_iDeviceID); int num4 = 1; @@ -3576,7 +3576,7 @@ namespace MicrosoftZuneLibrary } return num; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 26, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num); int num6 = 1; @@ -3611,7 +3611,7 @@ namespace MicrosoftZuneLibrary //IL_0283: Expected I, but got I8 //IL_02af: Expected I, but got I8 //IL_02d1: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 43, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids)); } @@ -3735,7 +3735,7 @@ namespace MicrosoftZuneLibrary { do { - Module.WString_002ESysFreeString((ushort**)((long)num14 * 8L + (nint)ptr3)); + Module.WString_002ESysFreeString((ushort**)(num14 * 8L + (nint)ptr3)); num14++; } while (num14 < num2); @@ -3747,7 +3747,7 @@ namespace MicrosoftZuneLibrary { do { - Module.WString_002ESysFreeString((ushort**)((long)num15 * 8L + (nint)ptr2)); + Module.WString_002ESysFreeString((ushort**)(num15 * 8L + (nint)ptr2)); num15++; } while (num15 < num3); @@ -3757,7 +3757,7 @@ namespace MicrosoftZuneLibrary Module.SafeDeleteArray_003Cunsigned_0020short_0020_002A_003E(&ptr3); Module.SafeDeleteArray_003Cunsigned_0020short_0020_002A_003E(&ptr2); Module.SafeDeleteArray_003Cunsigned_0020long_003E(&ptr); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 44, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xc0985b64_002EWPP_DeviceAPI_cpp_Traceguids), num5); } @@ -3810,7 +3810,7 @@ namespace MicrosoftZuneLibrary } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs b/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs index cfbb474..b8a8b52 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/DeviceList.cs @@ -26,7 +26,7 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] get { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_l(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 39, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), m_fInitialized ? 1 : 0); } @@ -35,7 +35,7 @@ namespace MicrosoftZuneLibrary [param: MarshalAs(UnmanagedType.U1)] set { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_l(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 40, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), value ? 1 : 0); } @@ -48,11 +48,11 @@ namespace MicrosoftZuneLibrary get { ManagedLock managedLock = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 37, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), m_slDevices.Count); } - if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 38, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -118,7 +118,7 @@ namespace MicrosoftZuneLibrary { m_spEndpointHostManagerMediator = spEndpointHostManagerMediator; base._002Ector(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -138,7 +138,7 @@ namespace MicrosoftZuneLibrary throw; } m_spEndpointHostManagerMediator.op_Assign(lp); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -161,7 +161,7 @@ namespace MicrosoftZuneLibrary private unsafe void _007EDeviceList() { ManagedLock managedLock = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 12, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -192,7 +192,7 @@ namespace MicrosoftZuneLibrary ((IDisposable)managedLock).Dispose(); m_lock = null; m_singletonInstance = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 13, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -200,12 +200,12 @@ namespace MicrosoftZuneLibrary public unsafe int InitializeAndEnumerate() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 14, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } int num = Module.EndpointHostManagerMediator_002EInitializeAndEnumerate(m_spEndpointHostManagerMediator.p); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 15, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), num); } @@ -214,12 +214,12 @@ namespace MicrosoftZuneLibrary public unsafe void SetEndpointHostManager(IEndpointHostManager* pEndpointHostManager) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 16, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } m_spEndpointHostManager.op_Assign(pEndpointHostManager); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 17, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -228,7 +228,7 @@ namespace MicrosoftZuneLibrary public unsafe Device GetItem(int idx) { ManagedLock managedLock = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 18, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), idx); } @@ -237,7 +237,7 @@ namespace MicrosoftZuneLibrary try { managedLock = managedLock2; - if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 19, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -247,7 +247,7 @@ namespace MicrosoftZuneLibrary object byIndex = m_slDevices.GetByIndex(idx); if (byIndex != null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 20, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -265,7 +265,7 @@ namespace MicrosoftZuneLibrary Device result2; try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 21, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -291,16 +291,16 @@ namespace MicrosoftZuneLibrary fixed (char* strNamePtr = strName.ToCharArray()) { ushort* a = (ushort*)strNamePtr; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_S(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 22, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), a); } - if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 23, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } HideDeviceInternal(device.EndpointId, fHide: true); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 24, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -314,16 +314,16 @@ namespace MicrosoftZuneLibrary fixed (char* strNamePtr = strName.ToCharArray()) { ushort* a = (ushort*)strNamePtr; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_S(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 25, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), a); } - if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (!m_fInitialized && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 26, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } HideDeviceInternal(device.EndpointId, fHide: false); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 27, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -341,20 +341,20 @@ namespace MicrosoftZuneLibrary } int num = -1; device = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 28, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } int num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pEndpointHost + 136)))((nint)pEndpointHost, EEndpointHostProperty.eEndpointHostPropertyDatabaseEndpointId, &num); if (num2 >= 0 && num > 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 29, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } num2 = AddDeviceToList(pEndpointHost, ref device); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 30, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), num2); } @@ -381,7 +381,7 @@ namespace MicrosoftZuneLibrary { managedLock = managedLock2; int nDeviceId = -1; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 33, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -397,7 +397,7 @@ namespace MicrosoftZuneLibrary ResetUpdater(nDeviceId, fFireDisconnect: true); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 34, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), num); } @@ -504,7 +504,7 @@ namespace MicrosoftZuneLibrary return -2147467261; } int num = -1; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 31, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -546,7 +546,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 32, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), num2); } @@ -587,7 +587,7 @@ namespace MicrosoftZuneLibrary { managedLock = managedLock2; int num = 0; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 35, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids)); } @@ -602,7 +602,7 @@ namespace MicrosoftZuneLibrary { m_slDevices?.Remove(num); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 36, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x6a82d7e8_002EWPP_DeviceListAPI_cpp_Traceguids), num2); } @@ -623,7 +623,7 @@ namespace MicrosoftZuneLibrary //IL_0052: Expected I, but got I8 //IL_0069: Expected I, but got I8 //IL_0069: Expected I, but got I8 - if (!(strEndpointId != (string)null)) + if (!(strEndpointId != null)) { return; } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs index 59cd611..9a40ec8 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareOperationBase.cs @@ -93,7 +93,7 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] internal unsafe bool IsDeviceRebooting() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 18, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -102,7 +102,7 @@ namespace MicrosoftZuneLibrary internal unsafe int Reset([MarshalAs(UnmanagedType.U1)] bool deviceRebooting) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 19, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -150,7 +150,7 @@ namespace MicrosoftZuneLibrary switch (firmwareProcessCompleteArgs.Action) { case CompletionAction.Complete: - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_d(_a1: firmwareProcessCompleteArgs.ErrorInfo.HrStatus.hr, Logger: *(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), id: 23, TraceGuid: (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -158,7 +158,7 @@ namespace MicrosoftZuneLibrary break; case CompletionAction.Rollback: { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_d(_a1: firmwareProcessCompleteArgs.ErrorInfo.HrStatus.hr, Logger: *(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), id: 22, TraceGuid: (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -172,7 +172,7 @@ namespace MicrosoftZuneLibrary } case CompletionAction.Reboot: { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_d(_a1: firmwareProcessCompleteArgs.ErrorInfo.HrStatus.hr, Logger: *(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), id: 21, TraceGuid: (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -185,7 +185,7 @@ namespace MicrosoftZuneLibrary break; } case CompletionAction.Continue: - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_d(_a1: firmwareProcessCompleteArgs.ErrorInfo.HrStatus.hr, Logger: *(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), id: 20, TraceGuid: (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -198,7 +198,7 @@ namespace MicrosoftZuneLibrary { //IL_006c: Expected I, but got I8 FirmwareProcessCompleteArgs firmwareProcessCompleteArgs = (FirmwareProcessCompleteArgs)data; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(_a1: firmwareProcessCompleteArgs.ErrorInfo.HrStatus.hr, Logger: *(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), id: 24, TraceGuid: (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -220,7 +220,7 @@ namespace MicrosoftZuneLibrary IEndpointHost* p = m_spEndpointHost.p; DeviceList.Instance.DeviceDisconnected(p); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 25, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -241,7 +241,7 @@ namespace MicrosoftZuneLibrary *(long*)(&cComPtrNtv_003CIFirmwareUpdateNotification_003E) = 0L; try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 26, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -257,7 +257,7 @@ namespace MicrosoftZuneLibrary firmwareUpdateNotification = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 120)))((nint)p, EEndpointHostProperty.eEndpointHostPropertyEndpointId, (ushort**)(&wBSTRString)); if (firmwareUpdateNotification >= 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_S(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 27, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), (ushort*)(*(ulong*)(&wBSTRString))); } @@ -275,7 +275,7 @@ namespace MicrosoftZuneLibrary Module.WBSTRString_002E_007Bdtor_007D(&wBSTRString); } SendCompleteNotification(-2147467260, disconnectDeviceOnComplete: true); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 28, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -311,7 +311,7 @@ namespace MicrosoftZuneLibrary try { eEndpointClass = EEndpointClass.eEndpointClassInvalid; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 29, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -424,7 +424,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 30, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs index f8dc0db..63da9db 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePoint.cs @@ -71,12 +71,12 @@ namespace MicrosoftZuneLibrary { m_spRestorePoint = spRestorePoint; base._002Ector(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_q(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 64, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), pRestorePoint); } m_spRestorePoint.op_Assign(pRestorePoint); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 65, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -91,12 +91,12 @@ namespace MicrosoftZuneLibrary private unsafe void _007EFirmwareRestorePoint() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 66, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } m_spRestorePoint.Release(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 67, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs index f73fca2..a2fe608 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorePointCollection.cs @@ -60,12 +60,12 @@ namespace MicrosoftZuneLibrary { m_spRestorePointCollection = spRestorePointCollection; base._002Ector(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_q(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 68, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), pRestorePointCollection); } m_spRestorePointCollection.op_Assign(pRestorePointCollection); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 69, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -80,12 +80,12 @@ namespace MicrosoftZuneLibrary private unsafe void _007EFirmwareRestorePointCollection() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 70, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } m_spRestorePointCollection.Release(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 71, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs index aabb03a..e776099 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs @@ -17,7 +17,7 @@ namespace MicrosoftZuneLibrary public unsafe bool IsRestoreInProgress() { //IL_00a6: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 76, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -42,7 +42,7 @@ namespace MicrosoftZuneLibrary Monitor.Exit(m_FirmwareLock); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_ql(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 77, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), m_spFirmwareRestorer.p, num); } @@ -51,7 +51,7 @@ namespace MicrosoftZuneLibrary public unsafe HRESULT StartGetRestorePointCollection(DeferredInvokeHandler getCollectionComplete) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 88, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -73,7 +73,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1004u, 2667u); num = -2147024846; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 89, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -82,7 +82,7 @@ namespace MicrosoftZuneLibrary public unsafe HRESULT StartFirmwareRestore(FirmwareRestorePoint restorePoint, DeferredInvokeHandler restoreBegin, DeferredInvokeHandler restoreProgress, DeferredInvokeHandler restoreComplete) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 78, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -122,7 +122,7 @@ namespace MicrosoftZuneLibrary public unsafe HRESULT Cancel() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 92, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -147,7 +147,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1004u, 2745u); num = -2147024846; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 93, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -163,14 +163,14 @@ namespace MicrosoftZuneLibrary base._002Ector(); try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_q(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 72, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), pEndpointHost); } m_spEndpointHost.op_Assign(pEndpointHost); m_fFirmwareProcessSupported = fFirmwareProcessSupported; m_Updater = updater; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 73, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -192,7 +192,7 @@ namespace MicrosoftZuneLibrary private unsafe void _007EFirmwareRestorer() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 74, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -202,7 +202,7 @@ namespace MicrosoftZuneLibrary } m_spFirmwareRestorer.Release(); m_Updater = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 75, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -210,7 +210,7 @@ namespace MicrosoftZuneLibrary internal unsafe override int InternalReset() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 85, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -233,7 +233,7 @@ namespace MicrosoftZuneLibrary internal unsafe override void ReleaseNativeObject() { //IL_0055: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 87, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -254,7 +254,7 @@ namespace MicrosoftZuneLibrary //IL_00bd: Expected I, but got I8 //IL_00c8: Expected I, but got I8 //IL_00d6: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 86, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -321,7 +321,7 @@ namespace MicrosoftZuneLibrary private unsafe void ContinueFirmwareRestoreWorker(object data) { //IL_015e: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 80, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -329,14 +329,14 @@ namespace MicrosoftZuneLibrary if (m_Canceled) { num = -2147467260; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 81, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } } else if ((long)(nint)m_spFirmwareMediator.p == 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 82, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -371,13 +371,13 @@ namespace MicrosoftZuneLibrary } if (num < 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 83, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } SendCompleteNotification(num, disconnectDeviceOnComplete: false); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 84, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -441,7 +441,7 @@ namespace MicrosoftZuneLibrary Reset(deviceRebooting: false); SendCompleteNotification(num, disconnectDeviceOnComplete: false); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 79, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -458,7 +458,7 @@ namespace MicrosoftZuneLibrary { DeferredInvokeHandler deferredInvokeHandler = (DeferredInvokeHandler)data; int num = 0; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 90, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -494,7 +494,7 @@ namespace MicrosoftZuneLibrary { Monitor.Exit(m_FirmwareLock); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 91, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -542,7 +542,7 @@ namespace MicrosoftZuneLibrary { Monitor.Exit(m_FirmwareLock); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 94, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs index 0b303bb..436ef23 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FirmwareUpdater.cs @@ -29,11 +29,11 @@ namespace MicrosoftZuneLibrary public unsafe UpdateAction IsUpdateInProgress() { //IL_00aa: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 37, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } - EUpdateAction eUpdateAction = (((long)(nint)m_spFirmwareMediator.p != 0) ? ((EUpdateAction)1) : ((EUpdateAction)0)); + EUpdateAction eUpdateAction = (((long)(nint)m_spFirmwareMediator.p != 0) ? ((EUpdateAction)1) : 0); EUpdateAction eUpdateAction2 = eUpdateAction; if (!m_Canceled) { @@ -55,7 +55,7 @@ namespace MicrosoftZuneLibrary Monitor.Exit(m_FirmwareLock); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_qd(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 38, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), m_spFirmwareUpdater.p, (int)eUpdateAction2); } @@ -73,7 +73,7 @@ namespace MicrosoftZuneLibrary *(long*)(&cComPtrNtv_003CIFirmwareUpdater2_003E) = 0L; try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 35, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -84,7 +84,7 @@ namespace MicrosoftZuneLibrary int num = EnsureNativeObject(); if (num >= 0) { - num = m_spFirmwareUpdater.QueryInterface_003CIFirmwareUpdater2_003E((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); + num = m_spFirmwareUpdater.QueryInterfaceIFirmwareUpdater2((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); if (num >= 0) { int num2 = 0; @@ -94,7 +94,7 @@ namespace MicrosoftZuneLibrary flag = (byte)num4 != 0; } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_dl(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 36, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num, flag ? 1 : 0); } @@ -119,7 +119,7 @@ namespace MicrosoftZuneLibrary public unsafe HRESULT StartCheckForDiskSpace(DeferredInvokeHandler checkForDiskSpaceComplete) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 47, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -136,7 +136,7 @@ namespace MicrosoftZuneLibrary { StartCheckForDiskSpaceWorker(checkForDiskSpaceComplete); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 48, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -145,7 +145,7 @@ namespace MicrosoftZuneLibrary public unsafe HRESULT StartCheckForUpdates([MarshalAs(UnmanagedType.U1)] bool fForceServerRequest, DeferredInvokeHandler checkForUpdatesComplete) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_l(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 39, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), fForceServerRequest ? 1 : 0); } @@ -180,7 +180,7 @@ namespace MicrosoftZuneLibrary { num = -2147024846; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 40, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -189,7 +189,7 @@ namespace MicrosoftZuneLibrary public unsafe HRESULT StartFirmwareUpdate(UpdatePackageCollection updates, DeferredInvokeHandler firmwareUpdateBegin, DeferredInvokeHandler firmwareUpdateProgress, DeferredInvokeHandler firmwareUpdateComplete, FirmwareUpdateOption updateOption) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 43, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -201,7 +201,7 @@ namespace MicrosoftZuneLibrary } else { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 44, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), updates.Count); } @@ -211,12 +211,12 @@ namespace MicrosoftZuneLibrary do { FirmwareUpdatePackage firmwareUpdatePackage = updates[num2]; - fixed (char* firmwareUpdatePackage.NamePtr = firmwareUpdatePackage.Name.ToCharArray()) + fixed (char* firmwareUpdatePackageNamePtr = firmwareUpdatePackage.Name.ToCharArray()) { - ushort* a = (ushort*)firmwareUpdatePackage.NamePtr; + ushort* a = (ushort*)firmwareUpdatePackageNamePtr; try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_dSl(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 45, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num2, a, firmwareUpdatePackage.Selected ? 1 : 0); } @@ -252,7 +252,7 @@ namespace MicrosoftZuneLibrary public unsafe HRESULT Cancel() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 56, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -277,7 +277,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1004u, 1955u); num = -2147024846; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 57, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -293,13 +293,13 @@ namespace MicrosoftZuneLibrary base._002Ector(); try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_q(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 31, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), pEndpointHost); } m_spEndpointHost.op_Assign(pEndpointHost); m_fFirmwareProcessSupported = fFirmwareProcessSupported; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 32, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -321,7 +321,7 @@ namespace MicrosoftZuneLibrary private unsafe void _007EFirmwareUpdater() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 33, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -336,7 +336,7 @@ namespace MicrosoftZuneLibrary ((IDisposable)restorer).Dispose(); m_Restorer = null; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 34, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -344,7 +344,7 @@ namespace MicrosoftZuneLibrary internal unsafe override int InternalReset() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 59, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -368,7 +368,7 @@ namespace MicrosoftZuneLibrary internal unsafe override void ReleaseNativeObject() { //IL_0055: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 61, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -386,7 +386,7 @@ namespace MicrosoftZuneLibrary internal unsafe int GetNativeObject(IFirmwareUpdater** ppUpdater) { int num = 0; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 62, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -412,7 +412,7 @@ namespace MicrosoftZuneLibrary { Monitor.Exit(m_FirmwareLock); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 63, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -423,7 +423,7 @@ namespace MicrosoftZuneLibrary { //IL_00a7: Expected I, but got I8 //IL_00b5: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 60, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -473,7 +473,7 @@ namespace MicrosoftZuneLibrary private unsafe void ContinueFirmwareUpdateWorker(object data) { //IL_015e: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 51, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -481,14 +481,14 @@ namespace MicrosoftZuneLibrary if (m_Canceled) { num = -2147467260; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 52, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } } else if ((long)(nint)m_spFirmwareMediator.p == 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 53, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -523,13 +523,13 @@ namespace MicrosoftZuneLibrary } if (num < 0) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 2u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 54, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } SendCompleteNotification(num, disconnectDeviceOnComplete: false); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 55, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -543,7 +543,7 @@ namespace MicrosoftZuneLibrary //IL_00f8: Expected I, but got I8 //IL_0132: Expected I, but got I8 //IL_0153: Expected I, but got I8 - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 41, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -631,7 +631,7 @@ namespace MicrosoftZuneLibrary } Module.CComPtrNtv_003CIFirmwareUpdateErrorInfo_003E_002ERelease(&cComPtrNtv_003CIFirmwareUpdateErrorInfo_003E); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 42, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -701,7 +701,7 @@ namespace MicrosoftZuneLibrary *(long*)(&cComPtrNtv_003CIFirmwareUpdater2_003E) = 0L; try { - num = m_spFirmwareUpdater.QueryInterface_003CIFirmwareUpdater2_003E((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); + num = m_spFirmwareUpdater.QueryInterfaceIFirmwareUpdater2((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); if (num >= 0) { FirmwareUpdateMediator* p3 = m_spFirmwareMediator.p; @@ -732,7 +732,7 @@ namespace MicrosoftZuneLibrary Reset(deviceRebooting: false); SendCompleteNotification(num, disconnectDeviceOnComplete: false); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 46, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -754,7 +754,7 @@ namespace MicrosoftZuneLibrary Module._ZuneShipAssert(1004u, 1779u); } Monitor.Enter(m_FirmwareLock); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 49, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -771,7 +771,7 @@ namespace MicrosoftZuneLibrary num = EnsureNativeObject(); if (num >= 0) { - num = m_spFirmwareUpdater.QueryInterface_003CIFirmwareUpdater2_003E((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); + num = m_spFirmwareUpdater.QueryInterfaceIFirmwareUpdater2((IFirmwareUpdater2**)(&cComPtrNtv_003CIFirmwareUpdater2_003E)); if (num >= 0) { long num2 = *(long*)(&cComPtrNtv_003CIFirmwareUpdater2_003E); @@ -806,7 +806,7 @@ namespace MicrosoftZuneLibrary } CheckDiskSpaceArgs args = new CheckDiskSpaceArgs(num, additionalSpaceRequiredInBytes, totalSpaceRequiredInBytes, driveLetter); deferredInvokeHandler(args); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 50, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), num); } @@ -846,7 +846,7 @@ namespace MicrosoftZuneLibrary { Monitor.Exit(m_FirmwareLock); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 58, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs b/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs index bcb3479..d488d2a 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/FriendsOfArtistQuery.cs @@ -3,7 +3,6 @@ using System.Collections; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; -using _003CCppImplementationDetails_003E; using Microsoft.Iris; namespace MicrosoftZuneLibrary @@ -135,7 +134,7 @@ namespace MicrosoftZuneLibrary int* ptr = null; int* ptr2 = null; int num2 = ((!asyncQueryParams.GetFriends) ? 1 : 100); - if (Module.ZuneLibraryExports_002EUserCardsForMedia(Module.GuidToGUID(asyncQueryParams.ArtistId), EMediaTypes.eMediaTypePersonArtist, asyncQueryParams.UserId, 14, num2, &num, &ptr, &ptr2) >= 0) + if (Module.UserCardsForMedia(asyncQueryParams.ArtistId, EMediaTypes.eMediaTypePersonArtist, asyncQueryParams.UserId, 14, num2, &num, &ptr, &ptr2) >= 0) { bool flag = num > 0; IList list = null; @@ -162,7 +161,7 @@ namespace MicrosoftZuneLibrary Module.DBPropertyRequestStruct_002E_007Bctor_007D((DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), 187u); try { - if (Module.ZuneLibraryExports_002EGetFieldValues(*(int*)(num4 + (nint)ptr), EListType.eUserCardList, 1, (DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), null) >= 0 && Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 4)) >= 0 && Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, ushort>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 8)) == 8) + if (Module.GetFieldValues(*(int*)(num4 + (nint)ptr), EListType.eUserCardList, 1, (DBPropertyRequestStruct*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), null) >= 0 && Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, int>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 4)) >= 0 && Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, ushort>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 8)) == 8) { friendOfArtist.ZuneTag = new string((char*)Unsafe.As<_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, ulong>(ref Unsafe.AddByteOffset(ref _0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 16))); } @@ -170,7 +169,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - Module.___CxxCallUnwindVecDtor((delegate*, void>)(&Module.__ehvec_dtor), (void*)(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040), 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); + Module.___CxxCallUnwindVecDtor((delegate*, void>)(&Module.__ehvec_dtor), &_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); throw; } Module.__ehvec_dtor(&_0024ArrayType_0024_0024_0024BY00UDBPropertyRequestStruct_0040_0040, 32uL, 1, (delegate*)(delegate*)(&Module.DBPropertyRequestStruct_002E_007Bdtor_007D)); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs b/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs index 6f000e7..e82b846 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/HMESettings.cs @@ -671,7 +671,7 @@ namespace MicrosoftZuneLibrary } bool flag = false; INSSDevice* ptr = null; - AuthorizationStatus authorizationStatus = (AuthorizationStatus)0; + AuthorizationStatus authorizationStatus = 0; fixed (INSSDevice** ptr2 = &Unsafe.AsRef(&ptr)) { long num = *(long*)m_pDeviceList + 56; diff --git a/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs b/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs index 3b8383c..7d65465 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/InteropNotifications.cs @@ -53,7 +53,7 @@ namespace MicrosoftZuneLibrary { try { - if (Module.ZuneLibraryExports_002EInteropNotifyAdvise(ptr3, ptr4) >= 0) + if (Module.InteropNotifyAdvise(ptr3, ptr4) >= 0) { m_fAdvised = true; } @@ -81,7 +81,7 @@ namespace MicrosoftZuneLibrary m_fDisposed = true; if (m_fAdvised) { - Module.ZuneLibraryExports_002EInteropNotifyUnAdvise(m_AdviseCookie); + Module.InteropNotifyUnAdvise(m_AdviseCookie); m_fAdvised = false; } } @@ -104,7 +104,7 @@ namespace MicrosoftZuneLibrary } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/LaunchFromShellHelper.cs b/ZuneDBApi/MicrosoftZuneLibrary/LaunchFromShellHelper.cs index 27a8c6c..bd77bd9 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/LaunchFromShellHelper.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/LaunchFromShellHelper.cs @@ -86,18 +86,18 @@ namespace MicrosoftZuneLibrary ushort* ptr2 = (ushort*)_startParamPtr; FileFoundCallback fileFoundCallback = FileFound; delegate* unmanaged[Cdecl, Cdecl] delegate_002A = (delegate* unmanaged[Cdecl, Cdecl])Marshal.GetFunctionPointerForDelegate(fileFoundCallback).ToPointer(); - int num = Module.ZuneLibraryExports_002ECreateDataObjectEnum(&ptr); + int num = Module.CreateDataObjectEnum(&ptr); try { if (num >= 0) { long num2 = *(long*)ptr; IDataObjectEnumerator* intPtr = ptr; - _003F val = ptr2; + var val = ptr2; bool startParamIsDataObject = _startParamIsDataObject; num = ((delegate* unmanaged[Cdecl, Cdecl], int>)(*(ulong*)num2))((nint)intPtr, (ushort*)(nint)val, startParamIsDataObject ? 1 : 0, delegate_002A); } - if (_eventName != (string)null) + if (_eventName != null) { try { @@ -135,7 +135,7 @@ namespace MicrosoftZuneLibrary { if (ptr != null) { - Module.ZuneLibraryExports_002EDestroyDataObjectEnum(ptr); + Module.DestroyDataObjectEnum(ptr); ptr = null; } } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProvider.cs b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProvider.cs index 57c82db..47f0711 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProvider.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProvider.cs @@ -72,16 +72,16 @@ namespace MicrosoftZuneLibrary switch (action) { case BulkItemAction.UnexcludeFromSync: - flag = (byte)((uint)(byte)((((SyncEventArgs)args).Device.Rules.Unexclude(list.ToArray(), mediaType) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; + flag = (byte)((byte)((((SyncEventArgs)args).Device.Rules.Unexclude(list.ToArray(), mediaType) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; break; case BulkItemAction.ExcludeFromSync: - flag = (byte)((uint)(byte)((((SyncEventArgs)args).Device.Rules.Exclude(list.ToArray(), mediaType) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; + flag = (byte)((byte)((((SyncEventArgs)args).Device.Rules.Exclude(list.ToArray(), mediaType) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; break; case BulkItemAction.RemoveSyncRules: - flag = (byte)((uint)(byte)((((SyncEventArgs)args).Device.Rules.Remove(list.ToArray(), mediaType, fDeviceFolderIds: false) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; + flag = (byte)((byte)((((SyncEventArgs)args).Device.Rules.Remove(list.ToArray(), mediaType, fDeviceFolderIds: false) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; break; case BulkItemAction.AddSyncRules: - flag = (byte)((uint)(byte)((((SyncEventArgs)args).Device.Rules.Add(list.ToArray(), mediaType) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; + flag = (byte)((byte)((((SyncEventArgs)args).Device.Rules.Add(list.ToArray(), mediaType) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; if (((TypeDiscoveringSyncEventArgs)args).ContainedTypes == null) { ((TypeDiscoveringSyncEventArgs)args).ContainedTypes = new List(); @@ -92,7 +92,7 @@ namespace MicrosoftZuneLibrary case BulkItemAction.ReverseSync: { ESyncOperationStatus operationStatus = ESyncOperationStatus.osInvalid; - flag = (byte)((action != BulkItemAction.DeleteFromDevice) ? ((uint)(byte)((((SyncEventArgs)args).Device.ReverseSync(list.ToArray(), mediaType, ref operationStatus) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) : ((uint)(byte)((((SyncEventArgs)args).Device.DeleteMedia(list.ToArray(), mediaType, ref operationStatus) >= 0) ? 1u : 0u) & (true ? 1u : 0u))) != 0; + flag = (byte)((action != BulkItemAction.DeleteFromDevice) ? ((byte)((((SyncEventArgs)args).Device.ReverseSync(list.ToArray(), mediaType, ref operationStatus) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) : ((byte)((((SyncEventArgs)args).Device.DeleteMedia(list.ToArray(), mediaType, ref operationStatus) >= 0) ? 1u : 0u) & (true ? 1u : 0u))) != 0; ((DeferrableSyncEventArgs)args).Status = operationStatus; break; } @@ -104,7 +104,7 @@ namespace MicrosoftZuneLibrary { try { - flag = (byte)((uint)(byte)((Module.ZuneLibraryExports_002EDeleteMedia(mediaType, ptr, list.Count, ((DeleteFromLibraryEventArgs)args).DeleteFromDisk ? 1 : 0, 1) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; + flag = (byte)((byte)((Module.DeleteMedia(mediaType, ptr, list.Count, ((DeleteFromLibraryEventArgs)args).DeleteFromDisk ? 1 : 0, 1) >= 0) ? 1u : 0u) & (true ? 1u : 0u)) != 0; } catch { diff --git a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderItemBase.cs b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderItemBase.cs index afade1f..7b34f11 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderItemBase.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderItemBase.cs @@ -50,7 +50,7 @@ namespace MicrosoftZuneLibrary { m_uTraceId = Module.MicrosoftZuneLibrary_002E_003FA0xea57f500_002Es_uNextTraceId; Module.MicrosoftZuneLibrary_002E_003FA0xea57f500_002Es_uNextTraceId++; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -84,14 +84,14 @@ namespace MicrosoftZuneLibrary Image[] thumbnail = m_thumbnail; if (thumbnail[num] != null) { - if (((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { - fixed (char* thumbnail[num].SourcePtr = thumbnail[num].Source.ToCharArray()) + fixed (char* thumbnailSourcePtr = thumbnail[num].Source.ToCharArray()) { - ushort* a = (ushort*)thumbnail[num].SourcePtr; + ushort* a = (ushort*)thumbnailSourcePtr; try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_DdS(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 14, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId, num, a); } @@ -184,7 +184,7 @@ namespace MicrosoftZuneLibrary //IL_0003: Expected I, but got I8 ushort* ptr = null; EMediaTypes eMediaTypes = LibraryDataProvider.NameToMediaType(typeName); - if (Module.ZuneLibraryExports_002ELocateArt(MediaId, eMediaTypes, fCacheOnly, &ptr) >= 0) + if (Module.LocateArt(MediaId, eMediaTypes, fCacheOnly, &ptr) >= 0) { string result = new string((char*)ptr); Module.SysFreeString(ptr); @@ -195,7 +195,7 @@ namespace MicrosoftZuneLibrary public unsafe virtual void InvalidateAllProperties() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 55, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -208,7 +208,7 @@ namespace MicrosoftZuneLibrary { CheckThumbnail(); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 56, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -222,7 +222,7 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] protected unsafe bool SetNewThumbnail(string strThumbnailPath) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 28, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -235,7 +235,7 @@ namespace MicrosoftZuneLibrary ushort* ptr = (ushort*)strThumbnailPathPtr; try { - num = Module.ZuneLibraryExports_002ESetAlbumArt(num2, ptr); + num = Module.SetAlbumArt(num2, ptr); if (num < 0) { Module.SQMAddNumbersToStream("IgnoredErrorEvent", 1u, (uint)num); @@ -251,7 +251,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_Dd(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 29, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId, num); } @@ -261,7 +261,7 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] public unsafe bool SetNewThumbnail(SafeBitmap safeBitmap) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 30, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -270,7 +270,7 @@ namespace MicrosoftZuneLibrary { int num2 = (int)GetFieldValue(typeof(int), 355u, -1); void* ptr = (void*)safeBitmap.DangerousGetHandle(); - num = Module.ZuneLibraryExports_002ESetAlbumArt(num2, (HBITMAP*)ptr); + num = Module.SetAlbumArt(num2, (HBITMAP*)ptr); if (num < 0) { Module.SQMAddNumbersToStream("IgnoredErrorEvent", 1u, (uint)num); @@ -278,7 +278,7 @@ namespace MicrosoftZuneLibrary SetSlowDataThumbnailExtraction(useSlowData: false); InvalidateAllProperties(); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 31, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -288,7 +288,7 @@ namespace MicrosoftZuneLibrary protected internal unsafe virtual void OnRequestSlowData() { DataProviderMapping value = null; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 18, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -326,7 +326,7 @@ namespace MicrosoftZuneLibrary NotifySlowDataAcquireComplete(); goto IL_00fa; IL_00fa: - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 19, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -335,7 +335,7 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] protected unsafe bool BeginGetThumbnail(string thumbnailPropertyName, int thumbnailIndex, [MarshalAs(UnmanagedType.U1)] bool slowDataQuery) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 23, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -349,7 +349,7 @@ namespace MicrosoftZuneLibrary AsyncGetThumbnailState asyncGetThumbnailState = m_fThumbnailRequested[thumbnailIndex]; if (asyncGetThumbnailState == null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 24, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); int num = 1; @@ -370,7 +370,7 @@ namespace MicrosoftZuneLibrary } bool isComplete = asyncGetThumbnailState.isComplete; flag = !isComplete; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_Dl(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 25, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId, isComplete ? 1 : 0); int num2 = 1; @@ -385,7 +385,7 @@ namespace MicrosoftZuneLibrary } goto end_IL_006c; IL_018d: - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 26, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); int num3 = 1; @@ -407,7 +407,7 @@ namespace MicrosoftZuneLibrary Monitor.Exit(m_lockObject); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 27, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -416,7 +416,7 @@ namespace MicrosoftZuneLibrary protected unsafe static void GetThumbnailOnWorkerThread(object listItem) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 34, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids)); } @@ -428,7 +428,7 @@ namespace MicrosoftZuneLibrary try { Monitor.Enter(m_lockObject); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 35, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_thumbnailsToProcess.Count); int num = 1; @@ -444,7 +444,7 @@ namespace MicrosoftZuneLibrary if (asyncGetThumbnailState != null) { flag2 = asyncGetThumbnailState.isComplete; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_Dll(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 36, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), asyncGetThumbnailState.listItem.m_uTraceId, flag2 ? 1 : 0, asyncGetThumbnailState.slowDataQuery ? 1 : 0); int num2 = 1; @@ -461,7 +461,7 @@ namespace MicrosoftZuneLibrary m_thumbnailWorkerAlive = false; flag = false; flag2 = true; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 37, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids)); int num3 = 1; @@ -489,7 +489,7 @@ namespace MicrosoftZuneLibrary LibraryDataProviderItemBase listItem2 = asyncGetThumbnailState.listItem; if (listItem2 != null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 38, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), listItem2.m_uTraceId); } @@ -497,7 +497,7 @@ namespace MicrosoftZuneLibrary } continue; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 39, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), asyncGetThumbnailState.listItem.m_uTraceId); } @@ -510,13 +510,13 @@ namespace MicrosoftZuneLibrary { if (!listItem3.ArtNeedsUpdating(artUrl, asyncGetThumbnailState.thumbnailIndex)) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 40, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), listItem3.m_uTraceId); } continue; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 41, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), listItem3.m_uTraceId); } @@ -526,7 +526,7 @@ namespace MicrosoftZuneLibrary } Application.DeferredInvoke(listItem3.UpdateThumbnail, asyncGetThumbnailState); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 42, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids)); } @@ -534,7 +534,7 @@ namespace MicrosoftZuneLibrary protected unsafe virtual void UpdateThumbnail(object args) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 43, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids)); } @@ -546,7 +546,7 @@ namespace MicrosoftZuneLibrary uint a = (uint)(((int?)asyncGetThumbnailState.listItem?.m_uTraceId) ?? (-1)); if (asyncGetThumbnailState.thumbnail == null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 44, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), a); } @@ -559,14 +559,14 @@ namespace MicrosoftZuneLibrary int thumbnailIndex = asyncGetThumbnailState.thumbnailIndex; if (m_thumbnail[thumbnailIndex] != asyncGetThumbnailState.thumbnail) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_Dd(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 45, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), a, thumbnailIndex); } m_thumbnail[asyncGetThumbnailState.thumbnailIndex] = asyncGetThumbnailState.thumbnail; - if (asyncGetThumbnailState.thumbnailPropertyName != (string)null) + if (asyncGetThumbnailState.thumbnailPropertyName != null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 46, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), a); } @@ -574,7 +574,7 @@ namespace MicrosoftZuneLibrary } } ((IDisposable)asyncGetThumbnailState).Dispose(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 47, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids)); } @@ -595,7 +595,7 @@ namespace MicrosoftZuneLibrary protected unsafe void ClearThumbnailCacheOnAppThread(object stateObj) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 53, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -609,7 +609,7 @@ namespace MicrosoftZuneLibrary ClearThumbnailCache(); FirePropertyChanged("Thumbnail"); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 54, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -662,13 +662,13 @@ namespace MicrosoftZuneLibrary private unsafe void EnsureThumbnailStorage() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 15, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } if (m_thumbnail == null) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 16, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -676,7 +676,7 @@ namespace MicrosoftZuneLibrary m_thumbnail = new Image[3]; m_thumbnailSize = new long[3]; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 17, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -684,7 +684,7 @@ namespace MicrosoftZuneLibrary private unsafe void ClearThumbnailCache() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 32, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -710,7 +710,7 @@ namespace MicrosoftZuneLibrary } while (num < (nint)s_thumbnailSizes.LongLength); } - if (text != (string)null) + if (text != null) { Image.RemoveCache(text, 200, 200, flippable: false, antialiasEdges); Image.RemoveCache(text, 38, 38, flippable: false, antialiasEdges); @@ -720,7 +720,7 @@ namespace MicrosoftZuneLibrary SetSlowDataThumbnailExtraction(useSlowData: false); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 33, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -736,7 +736,7 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] private unsafe bool ArtNeedsUpdating(string strThumbnailPath, int thumbnailIndex) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 51, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -787,7 +787,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_Dl(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 52, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId, flag ? 1 : 0); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderListItem.cs b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderListItem.cs index 7c274a7..3862d81 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderListItem.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderListItem.cs @@ -17,7 +17,7 @@ namespace MicrosoftZuneLibrary internal unsafe LibraryDataProviderListItem(LibraryDataProviderQuery owner, LibraryVirtualList listOwner, object typeCookie, int QueryRN, int index) : base(owner, typeCookie) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_DD(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId, (uint)index); } @@ -47,7 +47,7 @@ namespace MicrosoftZuneLibrary int indexForLibraryId = (int)listOwner.QueryList.GetIndexForLibraryId(m_DontUseDirectly_Index, m_LibraryId); if (indexForLibraryId != -1) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_DDD(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 50, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId, (uint)m_DontUseDirectly_Index, (uint)indexForLibraryId); } @@ -86,17 +86,17 @@ namespace MicrosoftZuneLibrary protected unsafe override void NotifySlowDataAcquireComplete() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 20, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } int index = GetIndex(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_DD(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 21, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId, (uint)index); } m_listOwner.NotifySlowDataAcquireComplete(index); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 22, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids), m_uTraceId); } @@ -115,7 +115,7 @@ namespace MicrosoftZuneLibrary protected unsafe override void UpdateThumbnail(object args) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 48, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids)); } @@ -127,7 +127,7 @@ namespace MicrosoftZuneLibrary { ((IDisposable)(AsyncGetThumbnailState)args).Dispose(); } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL)) >= 7u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 92uL)) & 0x40u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 89uL) >= 7u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 80uL), 49, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xea57f500_002EWPP_LibraryDataProvider_cpp_Traceguids)); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderQuery.cs b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderQuery.cs index 713581d..02b835b 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderQuery.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/LibraryDataProviderQuery.cs @@ -42,11 +42,11 @@ namespace MicrosoftZuneLibrary { return; } - if ((uint)Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 8)) > 1u && ((uint)Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 4)) & 0x10u) != 0) + if (Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 8)) > 1u && ((uint)Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 4)) & 0x10u) != 0) { - fixed (char* ToString()Ptr = ToString().ToCharArray()) + fixed (char* stringPtr = ToString().ToCharArray()) { - ushort* pwszDetail = (ushort*)ToString()Ptr; + ushort* pwszDetail = (ushort*)stringPtr; try { Module.PERFTRACE_COLLECTIONEVENT((_COLLECTION_EVENT)28, pwszDetail); @@ -194,11 +194,11 @@ namespace MicrosoftZuneLibrary if (property6 != null) { int num8 = (int)property6; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)iQueryPropertyBag + 56)))((nint)iQueryPropertyBag, (EQueryPropertyBagProp)0, num8); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)iQueryPropertyBag + 56)))((nint)iQueryPropertyBag, 0, num8); } else { - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)iQueryPropertyBag + 56)))((nint)iQueryPropertyBag, (EQueryPropertyBagProp)0, 1); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)iQueryPropertyBag + 56)))((nint)iQueryPropertyBag, 0, 1); } object property7 = GetProperty("InLibrary"); if (property7 != null) @@ -247,9 +247,9 @@ namespace MicrosoftZuneLibrary object property10 = GetProperty("Keywords"); if (property10 != null) { - fixed (char* (string)property10Ptr = (string)property10.ToCharArray()) + fixed (char* property10Ptr = ((string)property10).ToCharArray()) { - ushort* ptr2 = (ushort*)(string)property10Ptr; + ushort* ptr2 = (ushort*)property10Ptr; try { long num10 = *(long*)iQueryPropertyBag + 40; @@ -313,9 +313,9 @@ namespace MicrosoftZuneLibrary object property14 = GetProperty("TOC"); if (property14 != null) { - fixed (char* (string)property14Ptr = (string)property14.ToCharArray()) + fixed (char* property14Ptr = ((string)property14).ToCharArray()) { - ushort* ptr3 = (ushort*)(string)property14Ptr; + ushort* ptr3 = (ushort*)property14Ptr; try { long num17 = *(long*)iQueryPropertyBag + 40; @@ -354,9 +354,9 @@ namespace MicrosoftZuneLibrary property16 = GetProperty("InitTime"); if (property16 != null) { - fixed (char* (string)property16Ptr = (string)property16.ToCharArray()) + fixed (char* property16Ptr = ((string)property16).ToCharArray()) { - ushort* ptr4 = (ushort*)(string)property16Ptr; + ushort* ptr4 = (ushort*)property16Ptr; try { long num21 = *(long*)iQueryPropertyBag + 40; @@ -592,7 +592,7 @@ namespace MicrosoftZuneLibrary if (eQueryType != EQueryType.eQueryTypeInvalid) { ushort* ptr6 = null; - num29 = Module.ZuneLibraryExports_002EQueryDatabase(eQueryType, iQueryPropertyBag, &ptr5, &ptr6); + num29 = Module.QueryDatabase(eQueryType, iQueryPropertyBag, &ptr5, &ptr6); text = new string((char*)ptr6); Module.SysFreeString(ptr6); } @@ -644,13 +644,13 @@ namespace MicrosoftZuneLibrary libraryDataProviderQueryResult.SetIsEmpty(isEmpty); Result = libraryDataProviderQueryResult; Status = DataProviderQueryStatus.Complete; - if ((uint)Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 8)) <= 1u || (Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 4)) & 0x10) == 0) + if (Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 8)) <= 1u || (Unsafe.As(ref Unsafe.AddByteOffset(ref Module.g_EtwControlerState, 4)) & 0x10) == 0) { return; } - fixed (char* ToString()Ptr = ToString().ToCharArray()) + fixed (char* stringPtr = ToString().ToCharArray()) { - ushort* pwszDetail = (ushort*)ToString()Ptr; + ushort* pwszDetail = (ushort*)stringPtr; try { Module.PERFTRACE_COLLECTIONEVENT((_COLLECTION_EVENT)29, pwszDetail); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs b/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs index 8c15908..209c83b 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/MetadataMgrNotifications.cs @@ -263,7 +263,7 @@ namespace MicrosoftZuneLibrary { try { - if (Module.ZuneLibraryExports_002EMetadataChangeAdvise(ptr3, ptr4) >= 0) + if (Module.MetadataChangeAdvise(ptr3, ptr4) >= 0) { m_fAdvised = true; } @@ -290,7 +290,7 @@ namespace MicrosoftZuneLibrary { if (m_fAdvised) { - Module.ZuneLibraryExports_002EMetadataChangeUnAdvise(m_AdviseCookie); + Module.MetadataChangeUnAdvise(m_AdviseCookie); m_fAdvised = false; } m_disposed = true; @@ -314,7 +314,7 @@ namespace MicrosoftZuneLibrary } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/SafeBitmapWithData.cs b/ZuneDBApi/MicrosoftZuneLibrary/SafeBitmapWithData.cs index 296c6ad..c684a24 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/SafeBitmapWithData.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/SafeBitmapWithData.cs @@ -63,7 +63,7 @@ namespace MicrosoftZuneLibrary } try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x4101eecd_002EWPP_SafeBitmap_cpp_Traceguids), (uint)num); } @@ -133,7 +133,7 @@ namespace MicrosoftZuneLibrary object result = null; HBITMAP* hBitmap = null; void* pData = null; - if (Module.ZuneLibraryExports_002ECopyThumbnailBitmapData((HBITMAP*)handle.ToInt64(), srcX, srcY, srcWidth, srcHeight, dstWidth, dstHeight, &hBitmap, &pData) >= 0) + if (Module.CopyThumbnailBitmapData((HBITMAP*)handle.ToInt64(), srcX, srcY, srcWidth, srcHeight, dstWidth, dstHeight, &hBitmap, &pData) >= 0) { result = new SafeBitmapWithData(dstHeight, dstWidth, pData, hBitmap); } @@ -150,7 +150,7 @@ namespace MicrosoftZuneLibrary int iHeight; void* pData; HBITMAP* hBitmap; - if (Module.ZuneLibraryExports_002EGetThumbnailBitmapData(ptr, &iWidth, &iHeight, &pData, &hBitmap) >= 0) + if (Module.GetThumbnailBitmapData(ptr, &iWidth, &iHeight, &pData, &hBitmap) >= 0) { result = new SafeBitmapWithData(iHeight, iWidth, pData, hBitmap); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs b/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs index 915161a..3ed8dce 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/SyncRules.cs @@ -23,7 +23,7 @@ namespace MicrosoftZuneLibrary { m_spEndpointHost = spEndpointHost; base._002Ector(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -56,7 +56,7 @@ namespace MicrosoftZuneLibrary m_listAllowedToExclude.Add(EMediaTypes.eMediaTypeGenre); m_listAllowedToExclude.Add(EMediaTypes.eMediaTypeUserCard); m_listAllowedToExclude.Add(EMediaTypes.eMediaTypeApp); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -71,12 +71,12 @@ namespace MicrosoftZuneLibrary private unsafe void _007ESyncRules() { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 12, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } m_spEndpointHost.Release(); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 13, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -84,7 +84,7 @@ namespace MicrosoftZuneLibrary public unsafe int Add(int[] rgIds, EMediaTypes mediaType) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 14, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -101,7 +101,7 @@ namespace MicrosoftZuneLibrary num = AddInternal(rgIds, mediaType, EDeviceSyncRuleType.eDeviceSyncRuleTypeIncludeAll, fAutoSelectRuleType: true); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 15, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } @@ -110,7 +110,7 @@ namespace MicrosoftZuneLibrary public unsafe int Add(int[] rgIds, EMediaTypes mediaType, EDeviceSyncRuleType ruleType) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 16, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -131,7 +131,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 17, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } @@ -141,7 +141,7 @@ namespace MicrosoftZuneLibrary public unsafe int AddDeviceSyncRuleWithValue(int[] rgIds, int value) { int num = 0; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 18, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -150,7 +150,7 @@ namespace MicrosoftZuneLibrary { while (num >= 0) { - num = Module.ZuneLibraryExports_002EAddDeviceSyncRuleWithValue(EDeviceSyncRuleType.eDeviceSyncRuleTypeSyncEpisodesCount, m_iDeviceID, EMediaTypes.eMediaTypePodcastSeries, rgIds[num2], value); + num = Module.AddDeviceSyncRuleWithValue(EDeviceSyncRuleType.eDeviceSyncRuleTypeSyncEpisodesCount, m_iDeviceID, EMediaTypes.eMediaTypePodcastSeries, rgIds[num2], value); if (num < 0) { break; @@ -162,7 +162,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 19, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } @@ -171,7 +171,7 @@ namespace MicrosoftZuneLibrary public unsafe int Remove(int[] rgIds, EMediaTypes mediaType, [MarshalAs(UnmanagedType.U1)] bool fDeviceFolderIds) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 24, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -188,7 +188,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 25, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } @@ -197,7 +197,7 @@ namespace MicrosoftZuneLibrary public unsafe int Exclude(int[] rgIds, EMediaTypes mediaType) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 20, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -214,7 +214,7 @@ namespace MicrosoftZuneLibrary num = AddInternal(rgIds, mediaType, EDeviceSyncRuleType.eDeviceSyncRuleTypeExclude, fAutoSelectRuleType: false); } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 21, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } @@ -223,12 +223,12 @@ namespace MicrosoftZuneLibrary public unsafe int Unexclude(int[] rgIds, EMediaTypes mediaType) { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 26, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } int num = (m_listAllowedToExclude.Contains(mediaType) ? RemoveInternal(rgIds, mediaType, EDeviceSyncRuleType.eDeviceSyncRuleTypeExclude, fDeviceFolderIds: false) : (-2147024809)); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 27, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } @@ -238,7 +238,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetSyncRuleForMedia(EMediaTypes mediaType, int iMediaItemId, ref EDeviceSyncRuleType ruleType) { EDeviceSyncRuleType eDeviceSyncRuleType; - int num = Module.ZuneLibraryExports_002EGetSyncRuleForMedia(m_iDeviceID, mediaType, iMediaItemId, &eDeviceSyncRuleType); + int num = Module.GetSyncRuleForMedia(m_iDeviceID, mediaType, iMediaItemId, &eDeviceSyncRuleType); if (num >= 0) { ruleType = eDeviceSyncRuleType; @@ -249,7 +249,7 @@ namespace MicrosoftZuneLibrary public unsafe int GetSyncRuleValueForMedia(int iMediaItemId, ref int iValue) { int num; - int num2 = Module.ZuneLibraryExports_002EGetSyncRuleValueForMedia(EDeviceSyncRuleType.eDeviceSyncRuleTypeSyncEpisodesCount, m_iDeviceID, EMediaTypes.eMediaTypePodcastSeries, iMediaItemId, &num); + int num2 = Module.GetSyncRuleValueForMedia(EDeviceSyncRuleType.eDeviceSyncRuleTypeSyncEpisodesCount, m_iDeviceID, EMediaTypes.eMediaTypePodcastSeries, iMediaItemId, &num); if (num2 >= 0) { iValue = num; @@ -278,11 +278,11 @@ namespace MicrosoftZuneLibrary try { mode = ESyncMode.eSyncModeInvalid; - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&cComPtrNtv_003CIMetadataManager_003E)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&cComPtrNtv_003CIMetadataManager_003E)); if (num >= 0) { long num2 = *(long*)(&cComPtrNtv_003CIMetadataManager_003E); - __s_GUID gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff = Module._GUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff3; + __s_GUID gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff = Module.GUID_IDeviceSyncRulesProvider; num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIMetadataManager_003E)) + 24)))((nint)num2, (_GUID)gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff, (void**)(&cComPtrNtv_003CIDeviceSyncRulesProvider_003E)); if (num >= 0) { @@ -296,7 +296,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_LLd(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 30, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), (uint)cat, (uint)mode, num); } @@ -340,12 +340,12 @@ namespace MicrosoftZuneLibrary *(long*)(&cComPtrNtv_003CIDeviceSyncRulesProvider_003E) = 0L; try { - num = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&cComPtrNtv_003CIMetadataManager_003E)); + num = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&cComPtrNtv_003CIMetadataManager_003E)); if (num >= 0) { long num2 = *(long*)(&cComPtrNtv_003CIMetadataManager_003E); - __s_GUID gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff = Module._GUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff3; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIMetadataManager_003E)) + 24)))((nint)num2, (_GUID)gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff, (void**)(&cComPtrNtv_003CIDeviceSyncRulesProvider_003E)); + _GUID gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff = Module.GUID_IDeviceSyncRulesProvider; + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIMetadataManager_003E)) + 24)))((nint)num2, gUID_b12dc962_cc1b_46c5_a92a_68f1f2b9bff, (void**)(&cComPtrNtv_003CIDeviceSyncRulesProvider_003E)); if (num >= 0) { long num3 = *(long*)(&cComPtrNtv_003CIDeviceSyncRulesProvider_003E); @@ -358,7 +358,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_LLd(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 31, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), (uint)cat, (uint)mode, num); } @@ -440,7 +440,7 @@ namespace MicrosoftZuneLibrary private unsafe int AddInternal(int[] rgIds, EMediaTypes mediaType, EDeviceSyncRuleType ruleType, [MarshalAs(UnmanagedType.U1)] bool fAutoSelectRuleType) { int num = 0; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 22, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -449,7 +449,7 @@ namespace MicrosoftZuneLibrary { while (num >= 0) { - num = Module.ZuneLibraryExports_002EAddDeviceSyncRule(ruleType, fAutoSelectRuleType, m_iDeviceID, mediaType, rgIds[num2]); + num = Module.AddDeviceSyncRule(ruleType, fAutoSelectRuleType, m_iDeviceID, mediaType, rgIds[num2]); if (num < 0) { break; @@ -461,7 +461,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 23, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } @@ -471,7 +471,7 @@ namespace MicrosoftZuneLibrary private unsafe int RemoveInternal(int[] rgIds, EMediaTypes mediaType, EDeviceSyncRuleType ruleType, [MarshalAs(UnmanagedType.U1)] bool fDeviceFolderIds) { int num = 0; - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 28, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids)); } @@ -482,7 +482,7 @@ namespace MicrosoftZuneLibrary try { int* ptr2 = ptr; - num = Module.ZuneLibraryExports_002EDeleteDeviceSyncRules(ruleType, m_iDeviceID, mediaType, ptr2, rgIds.Length, fDeviceFolderIds); + num = Module.DeleteDeviceSyncRules(ruleType, m_iDeviceID, mediaType, ptr2, rgIds.Length, fDeviceFolderIds); } catch { @@ -492,7 +492,7 @@ namespace MicrosoftZuneLibrary } } } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 5u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 0x200u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 29, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x09bc4a52_002EWPP_SyncRulesAPI_cpp_Traceguids), num); } diff --git a/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs b/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs index 3bb9fbe..51dfe53 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/UpdatePackageCollection.cs @@ -64,7 +64,7 @@ namespace MicrosoftZuneLibrary { Packages[index].Selected = value; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_dld(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), index, value ? 1 : 0, num2); } @@ -89,7 +89,6 @@ namespace MicrosoftZuneLibrary try { m_spUpdatePackageCollection = spUpdatePackageCollection; - base._002Ector(); m_spUpdatePackageCollection.op_Assign(pCollection); } catch @@ -124,7 +123,7 @@ namespace MicrosoftZuneLibrary uint num = 0u; IFirmwareUpdateCollection* p = m_spUpdatePackageCollection.p; int num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)p + 24)))((nint)p, &num); - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_d(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 11, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), (int)num); } @@ -156,7 +155,7 @@ namespace MicrosoftZuneLibrary num2 = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIFirmwareMetadata_003E)) + 48)))((nint)num5, &eFirmwareUpdateType); if (num2 >= 0) { - if (eFirmwareUpdateType == (EFirmwareUpdateType)0) + if (eFirmwareUpdateType == 0) { m_GamesPackage = firmwareUpdatePackage; } @@ -166,12 +165,12 @@ namespace MicrosoftZuneLibrary } } } - fixed (char* firmwareUpdatePackage.NamePtr = firmwareUpdatePackage.Name.ToCharArray()) + fixed (char* firmwareUpdatePackageNamePtr = firmwareUpdatePackage.Name.ToCharArray()) { - ushort* a = (ushort*)firmwareUpdatePackage.NamePtr; + ushort* a = (ushort*)firmwareUpdatePackageNamePtr; try { - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_dSdl(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 12, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids), (int)num3, a, (int)eFirmwareUpdateType, firmwareUpdatePackage.Selected ? 1 : 0); } @@ -211,7 +210,7 @@ namespace MicrosoftZuneLibrary { return; } - if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL)) >= 6u) + if (Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 60uL)) & 4u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 6u) { Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 13, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids)); } @@ -247,7 +246,7 @@ namespace MicrosoftZuneLibrary } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs index 35557bf..f251eba 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibrary.cs @@ -29,8 +29,8 @@ namespace MicrosoftZuneLibrary throw; } ((IDisposable)managedLock).Dispose(); - Module.ZuneLibraryExports_002EStopGroveler(false); - Module.ZuneLibraryExports_002EShutdownZuneNativeLib(); + Module.StopGroveler(false); + Module.ShutdownZuneNativeLib(); Module.WppCleanupUm(); Module.ZuneEtwShutdown(); } @@ -46,7 +46,7 @@ namespace MicrosoftZuneLibrary { ushort* ptr = (ushort*)pathPtr; int num = 0; - int result = Module.ZuneLibraryExports_002EStartupZuneNativeLib(ptr, &num); + int result = Module.StartupZuneNativeLib(ptr, &num); bool flag = (dbRebuilt = ((num != 0) ? true : false)); return result; } @@ -56,12 +56,12 @@ namespace MicrosoftZuneLibrary public bool Phase2Initialization(out int hr) { hr = 0; - return (byte)(((hr = Module.ZuneLibraryExports_002EPhase2Initialization()) >= 0) ? 1u : 0u) != 0; + return (byte)(((hr = Module.Phase2Initialization()) >= 0) ? 1u : 0u) != 0; } public unsafe static string LoadStringFromResource(uint dwResourceNumber) { - HINSTANCE* ptr = Module.ZuneLibraryExports_002EGetLocResourceInstance(); + HINSTANCE* ptr = Module.GetLocResourceInstance(); if (ptr == null) { return null; @@ -100,7 +100,7 @@ namespace MicrosoftZuneLibrary } else { - int num = Module.ZuneLibraryExports_002ECreatePropertyBag((IQueryPropertyBag**)(&cComPtrNtv_003CIQueryPropertyBag_003E)); + int num = Module.CreatePropertyBag((IQueryPropertyBag**)(&cComPtrNtv_003CIQueryPropertyBag_003E)); if (num < 0) { result = null; @@ -123,7 +123,7 @@ namespace MicrosoftZuneLibrary ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)) + 56)))((nint)num3, (EQueryPropertyBagProp)22, (int)SortType); long num4 = *(long*)(&cComPtrNtv_003CIQueryPropertyBag_003E); ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)) + 56)))((nint)num4, (EQueryPropertyBagProp)15, LibraryView); - int num = Module.ZuneLibraryExports_002EQueryDatabase(QueryType, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)), &ptr, null); + int num = Module.QueryDatabase(QueryType, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)), &ptr, null); if (num >= 0) { result2 = new ZuneQueryList(ptr, "*** Test Only ***"); @@ -164,7 +164,7 @@ namespace MicrosoftZuneLibrary //IL_0003: Expected I, but got I8 //IL_0021: Expected I, but got I8 IWMPCDDeviceList* ptr = null; - if (Module.ZuneLibraryExports_002EGetCDDeviceList(&ptr) >= 0) + if (Module.GetCDDeviceList(&ptr) >= 0) { ZuneLibraryCDDeviceList zuneLibraryCDDeviceList = new ZuneLibraryCDDeviceList(ptr); IWMPCDDeviceList* intPtr = ptr; @@ -180,7 +180,7 @@ namespace MicrosoftZuneLibrary //IL_0003: Expected I, but got I8 //IL_0026: Expected I, but got I8 IRecordManager* ptr = null; - if (Module.GetSingleton((_GUID)Module._GUID_c1cad55a_5652_40c7_842c_39cbe209379e, (void**)(&ptr)) >= 0) + if (Module.GetSingleton(Module.GUID_IRecordManager, (void**)(&ptr)) >= 0) { ZuneLibraryCDRecorder zuneLibraryCDRecorder = new ZuneLibraryCDRecorder(ptr); IRecordManager* intPtr = ptr; @@ -204,7 +204,7 @@ namespace MicrosoftZuneLibrary //IL_0090: Expected I, but got I8 IDatabaseQueryResults* ptr = null; IQueryPropertyBag* ptr2; - if (Module.ZuneLibraryExports_002ECreatePropertyBag(&ptr2) < 0) + if (Module.CreatePropertyBag(&ptr2) < 0) { return null; } @@ -216,7 +216,7 @@ namespace MicrosoftZuneLibrary ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr3, (EQueryPropertyBagProp)22, (int)SortOrder); IQueryPropertyBag* intPtr4 = ptr2; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr4, (EQueryPropertyBagProp)15, LibraryView); - int num = Module.ZuneLibraryExports_002EQueryDatabase(EQueryType.eQueryTypeTracksForAlbumArtistId, ptr2, &ptr, null); + int num = Module.QueryDatabase(EQueryType.eQueryTypeTracksForAlbumArtistId, ptr2, &ptr, null); if (0L != (nint)ptr2) { IQueryPropertyBag* intPtr5 = ptr2; @@ -247,7 +247,7 @@ namespace MicrosoftZuneLibrary //IL_0093: Expected I, but got I8 IDatabaseQueryResults* ptr = null; IQueryPropertyBag* ptr2 = null; - if (Module.ZuneLibraryExports_002ECreatePropertyBag(&ptr2) < 0) + if (Module.CreatePropertyBag(&ptr2) < 0) { return null; } @@ -259,7 +259,7 @@ namespace MicrosoftZuneLibrary ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr3, (EQueryPropertyBagProp)22, (int)SortOrder); IQueryPropertyBag* intPtr4 = ptr2; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 56)))((nint)intPtr4, (EQueryPropertyBagProp)15, LibraryView); - int num = Module.ZuneLibraryExports_002EQueryDatabase(EQueryType.eQueryTypeTracksForAlbumId, ptr2, &ptr, null); + int num = Module.QueryDatabase(EQueryType.eQueryTypeTracksForAlbumId, ptr2, &ptr, null); if (0L != (nint)ptr2) { IQueryPropertyBag* intPtr5 = ptr2; @@ -304,7 +304,7 @@ namespace MicrosoftZuneLibrary //IL_0079: Expected I, but got I8 //IL_0094: Expected I, but got I8 IQueryPropertyBag* ptr = null; - if (Module.ZuneLibraryExports_002ECreatePropertyBag(&ptr) < 0) + if (Module.CreatePropertyBag(&ptr) < 0) { return null; } @@ -317,7 +317,7 @@ namespace MicrosoftZuneLibrary IQueryPropertyBag* intPtr4 = ptr; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr + 56)))((nint)intPtr4, (EQueryPropertyBagProp)15, LibraryView); IDatabaseQueryResults* ptr2 = null; - int num = Module.ZuneLibraryExports_002EQueryDatabase(EQueryType.eQueryTypePlaylistContentByPlaylistId, ptr, &ptr2, null); + int num = Module.QueryDatabase(EQueryType.eQueryTypePlaylistContentByPlaylistId, ptr, &ptr2, null); if (0L != (nint)ptr) { IQueryPropertyBag* intPtr5 = ptr; @@ -349,7 +349,7 @@ namespace MicrosoftZuneLibrary //IL_0003: Expected I, but got I8 //IL_002f: Expected I, but got I8 IAlbumInfo* ptr = null; - int num = Module.ZuneLibraryExports_002EGetAlbumMetadata(iAlbumId, true, &ptr); + int num = Module.GetAlbumMetadata(iAlbumId, true, &ptr); if (num != 0) { throw new COMException("IAlbumInfo::GetAlbumMetadata failed", num); @@ -367,7 +367,7 @@ namespace MicrosoftZuneLibrary throw new COMException("UpdateAlbumMetadata: albumMetadata is null", -2147024809); } IAlbumInfo* albumInfo = albumMetadata.AlbumInfo; - int num = Module.ZuneLibraryExports_002EUpdateAlbumMetadata(iAlbumId, albumInfo); + int num = Module.UpdateAlbumMetadata(iAlbumId, albumInfo); if (num != 0) { throw new COMException("IAlbumInfo::UpdateAlbumMetadata failed", num); @@ -398,14 +398,14 @@ namespace MicrosoftZuneLibrary { ptr3 = dbAlbumMetadata.AlbumInfo; } - Module.ZuneLibraryExports_002EGetAlbumMetadataForAlbumId(WMISAlbumId, WMISVolume, ptr3, (IWMISGetAlbumForAlbumIdCallback*)ptr2); + Module.GetAlbumMetadataForAlbumId(WMISAlbumId, WMISVolume, ptr3, (IWMISGetAlbumForAlbumIdCallback*)ptr2); ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 16)))((nint)ptr2); } } public static void SplitAudioTrack(int iTrackMediaId) { - int num = Module.ZuneLibraryExports_002ESplitAudioTrack(iTrackMediaId); + int num = Module.SplitAudioTrack(iTrackMediaId); if (num < 0) { throw new COMException("ZuneLibraryExports::SplitAudioTrack failed", num); @@ -428,7 +428,7 @@ namespace MicrosoftZuneLibrary ushort* ptr = (ushort*)folderPtr; try { - result = Module.ZuneLibraryExports_002ECanAddFromFolder(ptr) == 0; + result = Module.CanAddFromFolder(ptr) == 0; } catch { @@ -469,7 +469,7 @@ namespace MicrosoftZuneLibrary ushort* ptr = (ushort*)filenamePtr; try { - result = (byte)((Module.ZuneLibraryExports_002ECanAddMedia(ptr, mediaType) != 0) ? 1u : 0u) != 0; + result = (byte)((Module.CanAddMedia(ptr, mediaType) != 0) ? 1u : 0u) != 0; } catch { @@ -510,7 +510,7 @@ namespace MicrosoftZuneLibrary ushort* ptr = (ushort*)pathPtr; try { - result = Module.ZuneLibraryExports_002EAddGrovelerScanDirectory(ptr, mediaType) == 0; + result = Module.AddGrovelerScanDirectory(ptr, mediaType) == 0; } catch { @@ -556,7 +556,7 @@ namespace MicrosoftZuneLibrary ushort* ptr = (ushort*)filenamePtr; try { - num2 = Module.ZuneLibraryExports_002EAddMedia(ptr, EMediaTypes.eMediaTypeInvalid, 0u, null, &num); + num2 = Module.AddMedia(ptr, EMediaTypes.eMediaTypeInvalid, 0u, null, &num); } catch { @@ -571,7 +571,7 @@ namespace MicrosoftZuneLibrary { if (!s_fShutdown) { - num2 = Module.GetSingleton((_GUID)Module._GUID_6dd7146d_7a19_4fbb_9235_9e6c382fcc71, (void**)(&ptr2)); + num2 = Module.GetSingleton(Module.GUID_IMetadataManager, (void**)(&ptr2)); } if (num2 >= 0 && !s_fShutdown) { @@ -615,10 +615,10 @@ namespace MicrosoftZuneLibrary ushort* ptr5 = (ushort*)strGenrePtr; int num = (int)duration.TotalMilliseconds; IMSMediaSchemaPropertySet* ptr = null; - _GUID gUID = Module.GuidToGUID(guidAlbumServiceMediaId); - if (Module.ZuneLibraryExports_002ECreateTrackPropSet(Module.GuidToGUID(guidTrackServiceMediaId), gUID, iTrackNumber, ptr2, num, ptr3, ptr4, ptr5, &ptr) >= 0) + _GUID gUID = guidAlbumServiceMediaId; + if (Module.CreateTrackPropSet(guidTrackServiceMediaId, gUID, iTrackNumber, ptr2, num, ptr3, ptr4, ptr5, &ptr) >= 0) { - Module.ZuneLibraryExports_002EAddMedia(ptr, EMediaTypes.eMediaTypeAudio, &result); + Module.AddMedia(ptr, EMediaTypes.eMediaTypeAudio, &result); } if (ptr != null) { @@ -645,9 +645,9 @@ namespace MicrosoftZuneLibrary int result; try { - if (Module.ZuneLibraryExports_002ECreateVideoPropSet(Module.GuidToGUID(guidVideoMediaId), ptr, num2, (IMSMediaSchemaPropertySet**)(&cComPtrNtv_003CIMSMediaSchemaPropertySet_003E)) >= 0) + if (Module.CreateVideoPropSet(guidVideoMediaId, ptr, num2, (IMSMediaSchemaPropertySet**)(&cComPtrNtv_003CIMSMediaSchemaPropertySet_003E)) >= 0) { - Module.ZuneLibraryExports_002EAddMedia((IMSMediaSchemaPropertySet*)(*(ulong*)(&cComPtrNtv_003CIMSMediaSchemaPropertySet_003E)), EMediaTypes.eMediaTypeVideo, &num); + Module.AddMedia((IMSMediaSchemaPropertySet*)(*(ulong*)(&cComPtrNtv_003CIMSMediaSchemaPropertySet_003E)), EMediaTypes.eMediaTypeVideo, &num); } result = num; } @@ -669,18 +669,18 @@ namespace MicrosoftZuneLibrary int result = -1; fixed (char* strAlbumPtr = strAlbum.ToCharArray()) { - ushort* ptr2 = (ushort*)strAlbumPtr; + ushort* album = (ushort*)strAlbumPtr; fixed (char* strArtistPtr = strArtist.ToCharArray()) { - ushort* ptr3 = (ushort*)strArtistPtr; - IMSMediaSchemaPropertySet* ptr = null; - if (Module.ZuneLibraryExports_002ECreateAlbumPropSet(Module.GuidToGUID(guidServiceMediaId), ptr2, ptr3, &ptr) >= 0) + ushort* artist = (ushort*)strArtistPtr; + IMSMediaSchemaPropertySet* propSet = null; + if (Module.CreateAlbumPropSet(guidServiceMediaId, album, artist, &propSet) >= 0) { - Module.ZuneLibraryExports_002EAddMedia(ptr, EMediaTypes.eMediaTypeAudioAlbum, &result); + Module.AddMedia(propSet, EMediaTypes.eMediaTypeAudioAlbum, &result); } - if (ptr != null) + if (propSet != null) { - IMSMediaSchemaPropertySet* intPtr = ptr; + IMSMediaSchemaPropertySet* intPtr = propSet; ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)intPtr + 16)))((nint)intPtr); } return result; @@ -697,7 +697,7 @@ namespace MicrosoftZuneLibrary ushort* ptr = (ushort*)filenamePtr; fixed (int* ptr2 = &libraryID) { - int num = Module.ZuneLibraryExports_002EAddTransientMedia(ptr, mediaType, ptr2); + int num = Module.AddTransientMedia(ptr, mediaType, ptr2); if (num < 0) { Module.SQMAddNumbersToStream("IgnoredErrorEvent", 1u, (uint)num); @@ -710,7 +710,7 @@ namespace MicrosoftZuneLibrary public void CleanupTransientMedia() { - int num = Module.ZuneLibraryExports_002ECleanupTransientMedia(); + int num = Module.CleanupTransientMedia(); if (num < 0) { Module.SQMAddNumbersToStream("IgnoredErrorEvent", 1u, (uint)num); @@ -719,7 +719,7 @@ namespace MicrosoftZuneLibrary public void MarkAllDRMFilesAsNeedingLicenseRefresh() { - int num = Module.ZuneLibraryExports_002EMarkAllDRMFilesAsNeedingLicenseRefresh(); + int num = Module.MarkAllDRMFilesAsNeedingLicenseRefresh(); if (num < 0) { Module.SQMAddNumbersToStream("IgnoredErrorEvent", 1u, (uint)num); @@ -735,7 +735,7 @@ namespace MicrosoftZuneLibrary } fixed (int* ptr = &mediaIds[0]) { - return (byte)((Module.ZuneLibraryExports_002EDeleteMedia(mediaType, ptr, mediaIds.Length, fDeleteFileOnDisk ? 1 : 0, 1) >= 0) ? 1u : 0u) != 0; + return (byte)((Module.DeleteMedia(mediaType, ptr, mediaIds.Length, fDeleteFileOnDisk ? 1 : 0, 1) >= 0) ? 1u : 0u) != 0; } } @@ -745,7 +745,7 @@ namespace MicrosoftZuneLibrary fixed (char* folderNamePtr = folderName.ToCharArray()) { ushort* ptr = (ushort*)folderNamePtr; - int num = Module.ZuneLibraryExports_002EDeleteRootFolder(ptr, mediaType); + int num = Module.DeleteRootFolder(ptr, mediaType); if (num < 0) { Module.SQMAddNumbersToStream("IgnoredErrorEvent", 1u, (uint)num); @@ -757,12 +757,12 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] public bool DeleteFilesystemFolder(int folderId, EMediaTypes mediaType) { - return Module.ZuneLibraryExports_002EDeleteFSFolder(folderId, mediaType) == 0; + return Module.DeleteFSFolder(folderId, mediaType) == 0; } public static void ScanAndClearDeletedMedia() { - int num = Module.ZuneLibraryExports_002EScanAndClearDeletedMedia(); + int num = Module.ScanAndClearDeletedMedia(); if (num < 0) { Module.SQMAddNumbersToStream("IgnoredErrorEvent", 1u, (uint)num); @@ -772,13 +772,13 @@ namespace MicrosoftZuneLibrary [return: MarshalAs(UnmanagedType.U1)] public static bool ImportSharedRatingsForUser(int iUserId, EMediaTypes mediaType) { - return (byte)((Module.ZuneLibraryExports_002EImportSharedRatingsForUser(iUserId, mediaType) >= 0) ? 1u : 0u) != 0; + return (byte)((Module.ImportSharedRatingsForUser(iUserId, mediaType) >= 0) ? 1u : 0u) != 0; } [return: MarshalAs(UnmanagedType.U1)] public static bool ExportUserRatings(int iUserId, EMediaTypes mediaType) { - return (byte)((Module.ZuneLibraryExports_002EExportUserRatings(iUserId, mediaType) >= 0) ? 1u : 0u) != 0; + return (byte)((Module.ExportUserRatings(iUserId, mediaType) >= 0) ? 1u : 0u) != 0; } public static HRESULT GetFieldValues(int iMediaId, EListType eList, int cValues, int[] columnIndexes, object[] fieldValues, QueryPropertyBag propertyBag) @@ -833,15 +833,15 @@ namespace MicrosoftZuneLibrary { for (int i = 0; i < cValues; i++) { - *(int*)((long)i * 32L + (nint)ptr4) = columnIndexes[i]; + *(int*)(i * 32L + (nint)ptr4) = columnIndexes[i]; } IQueryPropertyBag* ptr5 = (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)); - num = Module.ZuneLibraryExports_002EGetFieldValues(iMediaId, eList, cValues, ptr4, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E))); + num = Module.GetFieldValues(iMediaId, eList, cValues, ptr4, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E))); if (num >= 0) { for (int j = 0; j < cValues; j++) { - DBPropertyRequestStruct* ptr6 = (DBPropertyRequestStruct*)((long)j * 32L + (nint)ptr4); + DBPropertyRequestStruct* ptr6 = (DBPropertyRequestStruct*)(j * 32L + (nint)ptr4); int num4 = *(int*)((ulong)(nint)ptr6 + 4uL); if (num4 >= 0) { @@ -948,15 +948,15 @@ namespace MicrosoftZuneLibrary DBPropertySubmitStruct* ptr4 = ptr3; ulong num4 = num; ulong num5 = ((num4 > 768614336404564650L) ? ulong.MaxValue : (num4 * 24)); - CComPropVariant* ptr5 = (CComPropVariant*)Module.new_005B_005D((num5 > 18446744073709551607uL) ? ulong.MaxValue : (num5 + 8)); - CComPropVariant* ptr7; + PROPVARIANT* ptr5 = (PROPVARIANT*)Module.new_005B_005D((num5 > 18446744073709551607uL) ? ulong.MaxValue : (num5 + 8)); + PROPVARIANT* ptr7; try { if (ptr5 != null) { uint count2 = (uint)(*(int*)ptr5 = (int)num4); - CComPropVariant* ptr6 = (CComPropVariant*)((ulong)(nint)ptr5 + 8uL); - Module.__ehvec_ctor(ptr6, 24uL, (int)count2, (delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bctor_007D), (delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D)); + PROPVARIANT* ptr6 = (PROPVARIANT*)((ulong)(nint)ptr5 + 8uL); + Module.__ehvec_ctor(ptr6, 24uL, (int)count2, (delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bctor_007D), (delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D)); ptr7 = ptr6; } else @@ -970,7 +970,7 @@ namespace MicrosoftZuneLibrary Module.delete_005B_005D(ptr5); throw; } - CComPropVariant* ptr8 = ptr7; + PROPVARIANT* ptr8 = ptr7; CComPtrNtv_003CIQueryPropertyBag_003E cComPtrNtv_003CIQueryPropertyBag_003E; Module.CComPtrNtv_003CIQueryPropertyBag_003E_002E_007Bctor_007D(&cComPtrNtv_003CIQueryPropertyBag_003E, propertyBag.GetIQueryPropertyBag()); try @@ -982,11 +982,11 @@ namespace MicrosoftZuneLibrary long num6 = i; DBPropertySubmitStruct* ptr9 = (DBPropertySubmitStruct*)(num6 * 16 + (nint)ptr4); *(int*)ptr9 = columnIndexes[i]; - CComPropVariant* ptr10 = (CComPropVariant*)(num6 * 24 + (nint)ptr8); - ZuneQueryList.ConvertTypeToPropVariant(null, fieldValues[i], (PROPVARIANT)ptr10); + PROPVARIANT* ptr10 = (PROPVARIANT*)(num6 * 24 + (nint)ptr8); + ZuneQueryList.ConvertTypeToPropVariant(null, fieldValues[i], (PROPVARIANT)ptr10); *(long*)((ulong)(nint)ptr9 + 8uL) = (nint)ptr10; } - Module.ZuneLibraryExports_002ESetFieldValues(iMediaId, eList, cValues, ptr4, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E))); + Module.SetFieldValues(iMediaId, eList, cValues, ptr4, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E))); } finally { @@ -1042,7 +1042,7 @@ namespace MicrosoftZuneLibrary ushort* ptr3 = null; ushort* ptr4 = null; ushort* ptr5 = null; - result = Module.ZuneLibraryExports_002EGetKnownFolders(&obj, &obj2, &obj3, &obj4, &obj5, &ptr, &ptr2, &ptr3, &ptr4, &ptr5); + result = Module.GetKnownFolders(&obj, &obj2, &obj3, &obj4, &obj5, &ptr, &ptr2, &ptr3, &ptr4, &ptr5); music = Module.BstrArrayToStringArray(&obj); videos = Module.BstrArrayToStringArray(&obj2); pictures = Module.BstrArrayToStringArray(&obj3); @@ -1105,10 +1105,11 @@ namespace MicrosoftZuneLibrary { //IL_0003: Expected I, but got I8 ushort* ptr = null; + localizedPath = null; fixed (char* physicalPathPtr = physicalPath.ToCharArray()) { ushort* ptr2 = (ushort*)physicalPathPtr; - int num = Module.ZuneLibraryExports_002EGetLocalizedPathOfFolder(ptr2, fNetworkPathsAllowed, &ptr); + int num = Module.GetLocalizedPathOfFolder(ptr2, fNetworkPathsAllowed, &ptr); if (num >= 0) { localizedPath = new string((char*)ptr); @@ -1126,7 +1127,7 @@ namespace MicrosoftZuneLibrary fixed (char* @stringPtr = @string.ToCharArray()) { ushort* ptr2 = (ushort*)@stringPtr; - int num = ((Module.ZuneLibraryExports_002ECompareWithoutArticles(ptr, ptr2, &num) != 0) ? (-1) : num); + int num = ((Module.CompareWithoutArticles(ptr, ptr2, &num) != 0) ? (-1) : num); return num; } } @@ -1139,7 +1140,7 @@ namespace MicrosoftZuneLibrary { ushort* ptr = (ushort*)pathPtr; int num = 0; - int num2 = ((Module.ZuneLibraryExports_002EDoesFileExist(ptr, &num) >= 0 && num != 0) ? 1 : 0); + int num2 = ((Module.DoesFileExist(ptr, &num) >= 0 && num != 0) ? 1 : 0); return (byte)num2 != 0; } } @@ -1236,7 +1237,7 @@ namespace MicrosoftZuneLibrary } } IService* ptr3 = null; - if (Module.GetSingleton((_GUID)Module.GUID_IService, (void**)(&ptr3)) >= 0) + if (Module.GetSingleton(Module.GUID_IService, (void**)(&ptr3)) >= 0) { IService* intPtr2 = ptr3; _GUID gUID; @@ -1248,10 +1249,10 @@ namespace MicrosoftZuneLibrary { long num14 = *(long*)(&cComPtrNtv_003CIQueryPropertyBag_003E); int num15 = num12; - ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)) + 56)))((nint)num14, (EQueryPropertyBagProp)0, num15); + ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)) + 56)))((nint)num14, 0, num15); } } - int num16 = Module.ZuneLibraryExports_002EQueryDatabase(eQueryType, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)), &ptr, null); + int num16 = Module.QueryDatabase(eQueryType, (IQueryPropertyBag*)(*(ulong*)(&cComPtrNtv_003CIQueryPropertyBag_003E)), &ptr, null); ((IDisposable)queryPropertyBag)?.Dispose(); if (num16 >= 0) { @@ -1297,7 +1298,7 @@ namespace MicrosoftZuneLibrary } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs index 757d88d..3afe568 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDDevice.cs @@ -56,7 +56,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - ptr = null; + //ptr = null; throw; } } @@ -416,7 +416,6 @@ namespace MicrosoftZuneLibrary m_pDevice = pDevice; m_pBurnPublisher = null; m_fIsBurner = 0; - base._002Ector(); } private void _007EZuneLibraryCDDevice() @@ -510,10 +509,10 @@ namespace MicrosoftZuneLibrary ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)iQueryPropertyBag + 56)))((nint)iQueryPropertyBag, (EQueryPropertyBagProp)21, 437); IPlaylist* ptr = null; IDatabaseQueryResults* ptr2 = null; - int num = Module.ZuneLibraryExports_002EQueryDatabase(EQueryType.eQueryTypePlaylistContentByPlaylistId, iQueryPropertyBag, &ptr2, null); + int num = Module.QueryDatabase(EQueryType.eQueryTypePlaylistContentByPlaylistId, iQueryPropertyBag, &ptr2, null); if (num >= 0) { - num = Module.ZuneLibraryExports_002ECreateEmptyPlaylist(&ptr); + num = Module.CreateEmptyPlaylist(&ptr); } uint num2 = 0u; if (num >= 0) @@ -527,32 +526,28 @@ namespace MicrosoftZuneLibrary uint num3 = 0u; while (num3 < num2) { - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + PROPVARIANT cComPropVariant = new(); try { - CComPropVariant cComPropVariant2; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant2, 0, 24); + PROPVARIANT cComPropVariant2 = new(); try { IDatabaseQueryResults* intPtr2 = ptr2; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 48)))((nint)intPtr2, num3, 233u, (PROPVARIANT)(&cComPropVariant)); + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 48)))((System.nint)intPtr2, (uint)num3, (uint)233u, (PROPVARIANT)cComPropVariant); if (num >= 0) { IDatabaseQueryResults* intPtr3 = ptr2; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 48)))((nint)intPtr3, num3, 234u, (PROPVARIANT)(&cComPropVariant2)); + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)ptr2 + 48)))((System.nint)intPtr3, (uint)num3, (uint)234u, (PROPVARIANT)cComPropVariant2); if (num >= 0) { - num = Module.ZuneLibraryExports_002EAddItemToPlaylist(Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)), Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)), ptr); + num = Module.AddItemToPlaylist(Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant, 8)), Unsafe.As(ref Unsafe.AddByteOffset(ref cComPropVariant2, 8)), ptr); } } } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant2); throw; } Module.CComPropVariant_002EClear(&cComPropVariant2); @@ -560,7 +555,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -815,14 +810,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~ZuneLibraryCDDevice() diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs index f4212ef..32398cc 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryCDRecorder.cs @@ -102,7 +102,6 @@ namespace MicrosoftZuneLibrary //IL_009b: Expected I, but got I8 //IL_00b2: Expected I, but got I8 m_pRecordManager = pRecordManager; - base._002Ector(); IRecordManager* pRecordManager2 = m_pRecordManager; if (pRecordManager2 == null) { @@ -209,9 +208,9 @@ namespace MicrosoftZuneLibrary num = device.GetTrackUrl(dwTrackNumber, stringBuilder); if (num >= 0) { - fixed (char* stringBuilder.ToString()Ptr = stringBuilder.ToString().ToCharArray()) + fixed (char* stringBuilderPtr = stringBuilder.ToString().ToCharArray()) { - ushort* ptr = (ushort*)stringBuilder.ToString()Ptr; + ushort* ptr = (ushort*)stringBuilderPtr; try { long num2 = *(long*)m_pRecordManager + 40; @@ -240,9 +239,9 @@ namespace MicrosoftZuneLibrary num = device.GetTrackUrl(dwTrackNumber, stringBuilder); if (num >= 0) { - fixed (char* stringBuilder.ToString()Ptr = stringBuilder.ToString().ToCharArray()) + fixed (char* stringBuilderPtr = stringBuilder.ToString().ToCharArray()) { - ushort* ptr = (ushort*)stringBuilder.ToString()Ptr; + ushort* ptr = (ushort*)stringBuilderPtr; try { long num2 = *(long*)m_pRecordManager + 48; @@ -271,9 +270,9 @@ namespace MicrosoftZuneLibrary StringBuilder stringBuilder = new StringBuilder(); if (device.GetTrackUrl(dwTrackNumber, stringBuilder) >= 0) { - fixed (char* stringBuilder.ToString()Ptr = stringBuilder.ToString().ToCharArray()) + fixed (char* stringBuilderPtr = stringBuilder.ToString().ToCharArray()) { - ushort* ptr = (ushort*)stringBuilder.ToString()Ptr; + ushort* ptr = (ushort*)stringBuilderPtr; try { long num2 = *(long*)m_pRecordManager + 56; @@ -318,9 +317,9 @@ namespace MicrosoftZuneLibrary num = device.GetTrackUrl(dwTrackNumber, stringBuilder); if (num >= 0) { - fixed (char* stringBuilder.ToString()Ptr = stringBuilder.ToString().ToCharArray()) + fixed (char* stringBuilderPtr = stringBuilder.ToString().ToCharArray()) { - ushort* ptr = (ushort*)stringBuilder.ToString()Ptr; + ushort* ptr = (ushort*)stringBuilderPtr; try { long num2 = *(long*)m_pRecordManager + 24; @@ -349,9 +348,9 @@ namespace MicrosoftZuneLibrary num = device.GetTrackUrl(dwTrackNumber, stringBuilder); if (num >= 0) { - fixed (char* stringBuilder.ToString()Ptr = stringBuilder.ToString().ToCharArray()) + fixed (char* stringBuilderPtr = stringBuilder.ToString().ToCharArray()) { - ushort* ptr = (ushort*)stringBuilder.ToString()Ptr; + ushort* ptr = (ushort*)stringBuilderPtr; try { long num2 = *(long*)m_pRecordManager + 32; @@ -489,7 +488,7 @@ namespace MicrosoftZuneLibrary } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); GC.SuppressFinalize(this); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryUtils.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryUtils.cs index 15da7db..f26b121 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryUtils.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneLibraryUtils.cs @@ -10,25 +10,21 @@ namespace MicrosoftZuneLibrary //IL_001e: Expected I4, but got I8 //IL_003d: Expected I, but got I8 *pRetString = null; - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + PROPVARIANT cComPropVariant = new(); int num; try { num = 0; - PROPVARIANT ptr; - if (*(ushort*)pPropVariant == 8) + PROPVARIANT ptr = new(); + if (pPropVariant.vt == VARTYPE.VT_BSTR) { ptr = pPropVariant; goto IL_0032; } - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); - num = Module.ZuneLibraryExports_002EZunePropVariantChangeType((PROPVARIANT)(&cComPropVariant), pPropVariant, 1, 8); + num = Module.ZunePropVariantChangeType(cComPropVariant, pPropVariant, 1, 8); if (num >= 0) { - ptr = (PROPVARIANT)(&cComPropVariant); + ptr = cComPropVariant; goto IL_0032; } goto end_IL_000b; @@ -39,7 +35,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -51,22 +47,20 @@ namespace MicrosoftZuneLibrary //IL_000a: Expected I4, but got I8 //IL_001b: Expected I4, but got I8 int result = 0; - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; // IL initblk instruction Unsafe.InitBlock(ref cComPropVariant, 0, 24); try { - PROPVARIANT ptr; - if (*(ushort*)pPropVariant == 3) + PROPVARIANT ptr = new(); + if (pPropVariant.vt == VARTYPE.VT_I4) { ptr = pPropVariant; goto IL_002d; } - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); - if (Module.ZuneLibraryExports_002EZunePropVariantChangeType((PROPVARIANT)(&cComPropVariant), pPropVariant, 1, 3) >= 0) + if (Module.ZunePropVariantChangeType(cComPropVariant, pPropVariant, 1, 3) >= 0) { - ptr = (PROPVARIANT)(&cComPropVariant); + ptr = cComPropVariant; goto IL_002d; } goto end_IL_000a; @@ -77,7 +71,7 @@ namespace MicrosoftZuneLibrary catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); diff --git a/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs b/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs index b832106..6259dd1 100644 --- a/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs +++ b/ZuneDBApi/MicrosoftZuneLibrary/ZuneQueryList.cs @@ -220,19 +220,19 @@ namespace MicrosoftZuneLibrary //IL_00cf: Expected I, but got I8 if (m_disposed) { - if (Atom != 340 && Atom != 140 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && (uint)(*(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL)) >= 5u) + if (Atom != 340 && Atom != 140 && Module.WPP_GLOBAL_Control != Unsafe.AsPointer(ref Module.WPP_GLOBAL_Control) && ((uint)(*(int*)((ulong)(nint)Module.WPP_GLOBAL_Control + 28uL)) & 2u) != 0 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u) { Module.WPP_SF_D(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 16uL), 10, (_GUID*)Unsafe.AsPointer(ref Module._003FA0xfab9896e_002EWPP_ZuneDBList_cpp_Traceguids), Atom); } return defaultValue; } - CComPropVariant cComPropVariant; + PROPVARIANT cComPropVariant; object result; if (m_pResults != null) { if (type == typeof(string)) { - WMT_ATTR_DATATYPE wMT_ATTR_DATATYPE = *(WMT_ATTR_DATATYPE*)((long)(int)Atom * 32L + (ref Unsafe.AddByteOffset(ref Module._003Fs_rgSchemaMapEntry_0040CSchemaMap_0040_00400QBU_SCHEMAMAPENTRY_00401_0040B, 16))); + WMT_ATTR_DATATYPE wMT_ATTR_DATATYPE = *(WMT_ATTR_DATATYPE*)((long)(int)Atom * 32L + _003Fs_rgSchemaMapEntry_0040CSchemaMap_0040_00400QBU_SCHEMAMAPENTRY_00401_0040B + 16); if (wMT_ATTR_DATATYPE == (WMT_ATTR_DATATYPE)1) { ushort* value = null; @@ -243,21 +243,21 @@ namespace MicrosoftZuneLibrary } } } - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + // IL initblk instruction + cComPropVariant = default; try { IDatabaseQueryResults* pResults2 = m_pResults; - if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pResults2 + 48)))((nint)pResults2, index, Atom, (PROPVARIANT)(&cComPropVariant)) >= 0) + if (((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pResults2 + 48)))((System.nint)pResults2, (uint)index, (uint)Atom, (PROPVARIANT)cComPropVariant) >= 0) { - result = MarshalResult(type, (PROPVARIANT)(&cComPropVariant), defaultValue); + result = MarshalResult(type, cComPropVariant, defaultValue); goto IL_00ef; } } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -290,16 +290,14 @@ namespace MicrosoftZuneLibrary int num = -2147024809; if (m_pResults != null) { - CComPropVariant cComPropVariant; - // IL initblk instruction - Unsafe.InitBlock(ref cComPropVariant, 0, 24); + PROPVARIANT cComPropVariant; try { if (Value == null) { goto IL_002e; } - num = ConvertTypeToPropVariant(Value.GetType(), Value, (PROPVARIANT)(&cComPropVariant)); + num = ConvertTypeToPropVariant(Value.GetType(), Value, out cComPropVariant); if (num >= 0) { goto IL_002e; @@ -307,13 +305,13 @@ namespace MicrosoftZuneLibrary goto end_IL_0016; IL_002e: IDatabaseQueryResults* pResults = m_pResults; - num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pResults + 64)))((nint)pResults, index, Atom, (PROPVARIANT)(&cComPropVariant)); + num = ((delegate* unmanaged[Cdecl, Cdecl])(*(ulong*)(*(long*)pResults + 64)))((System.nint)pResults, (uint)index, (uint)Atom, (PROPVARIANT)cComPropVariant); end_IL_0016:; } catch { //try-fault - Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); + Module.___CxxCallUnwindDtor((delegate*)(delegate*)(&Module.CComPropVariant_002E_007Bdtor_007D), &cComPropVariant); throw; } Module.CComPropVariant_002EClear(&cComPropVariant); @@ -434,92 +432,88 @@ namespace MicrosoftZuneLibrary //IL_02b0: Expected I, but got I8 if (type == typeof(int)) { - switch (*(ushort*)propVariant) + switch (propVariant.vt) { - case 3: - return *(int*)((ulong)(nint)propVariant + 8uL); - case 11: - return (*(short*)((ulong)(nint)propVariant + 8uL) == -1) ? 1 : 0; + case VARTYPE.VT_I4: + return propVariant.lVal; + case VARTYPE.VT_BOOL: + return propVariant.boolVal; } } else if (type == typeof(uint)) { - ushort num = *(ushort*)propVariant; - if (num == 3 || num == 19) + if (propVariant.vt == VARTYPE.VT_I4 || propVariant.vt == VARTYPE.VT_UI4) { - return *(uint*)((ulong)(nint)propVariant + 8uL); + return propVariant.uintVal; } } else if (type == typeof(long)) { - switch (*(ushort*)propVariant) + switch (propVariant.vt) { - case 20: - return *(long*)((ulong)(nint)propVariant + 8uL); - case 3: - return (long)(*(int*)((ulong)(nint)propVariant + 8uL)); - case 19: - return (long)(uint)(*(int*)((ulong)(nint)propVariant + 8uL)); + case VARTYPE.VT_I8: + return propVariant.hVal; + case VARTYPE.VT_I4: + return propVariant.lVal; + case VARTYPE.VT_UI4: + return propVariant.uintVal; } } else if (type == typeof(ulong)) { - ushort num2 = *(ushort*)propVariant; - if (num2 == 20 || num2 == 21) + if (propVariant.vt == VARTYPE.VT_I8 || propVariant.vt == VARTYPE.VT_UI8) { - return *(ulong*)((ulong)(nint)propVariant + 8uL); + return propVariant.uhVal; } } else if (type == typeof(string)) { - if (*(ushort*)propVariant == 72) + if (propVariant.vt == VARTYPE.VT_CLSID) { - Module.ZuneLibraryExports_002EZunePropVariantChangeType(propVariant, propVariant, 0, 8); + Module.ZunePropVariantChangeType(propVariant, propVariant, 0, 8); } - if (*(ushort*)propVariant == 8) + if (propVariant.vt == VARTYPE.VT_BSTR) { - return new string((char*)(*(ulong*)((ulong)(nint)propVariant + 8uL))); + return propVariant.bstrVal; } } else if (type == typeof(DateTime)) { - if (*(ushort*)propVariant == 7) + if (propVariant.vt == VARTYPE.VT_DATE) { - return DateTime.FromOADate(*(double*)((ulong)(nint)propVariant + 8uL)); + return DateTime.FromOADate(propVariant.dblVal); } } else if (type == typeof(TimeSpan)) { - switch (*(ushort*)propVariant) + switch (propVariant.vt) { - case 3: - return TimeSpan.FromMilliseconds(*(int*)((ulong)(nint)propVariant + 8uL)); - case 20: - case 21: - return TimeSpan.FromMilliseconds(*(ulong*)((ulong)(nint)propVariant + 8uL)); + case VARTYPE.VT_I4: + return TimeSpan.FromMilliseconds(propVariant.lVal); + case VARTYPE.VT_I8: + case VARTYPE.VT_UI8: + return TimeSpan.FromMilliseconds(propVariant.uhVal); } } else if (type == typeof(bool)) { - if (*(ushort*)propVariant == 11) + if (propVariant.vt == VARTYPE.VT_BOOL) { - return (byte)((*(short*)((ulong)(nint)propVariant + 8uL) != 0) ? 1u : 0u) != 0; + return propVariant.boolVal; } } else if (type == typeof(Guid)) { - if (*(ushort*)propVariant == 8) + if (propVariant.vt == VARTYPE.VT_BSTR) { - ValueType valueType = default(Guid); - (Guid)valueType = new Guid(new string((char*)(*(ulong*)((ulong)(nint)propVariant + 8uL)))); - return valueType; + return new Guid(propVariant.bstrVal); } } else if (typeof(IList).IsAssignableFrom(type)) { - switch (*(ushort*)propVariant) + switch (propVariant.vt) { - case 8200: + case (VARTYPE)8200: { tagSAFEARRAY* ptr2 = (tagSAFEARRAY*)(*(ulong*)((ulong)(nint)propVariant + 8uL)); if (Module.SafeArrayGetDim(ptr2) != 1) @@ -553,7 +547,7 @@ namespace MicrosoftZuneLibrary } return arrayList2; } - case 4099: + case (VARTYPE)4099: { ArrayList arrayList = new ArrayList(); if (arrayList != null) @@ -561,7 +555,7 @@ namespace MicrosoftZuneLibrary uint num3 = 0u; if (0u < (uint)(*(int*)((ulong)(nint)propVariant + 8uL))) { - PROPVARIANT ptr = (PROPVARIANT)((ulong)(nint)propVariant + 16uL); + PROPVARIANT ptr = (PROPVARIANT)((ulong)(System.nint)propVariant + 16uL); long num4 = 0L; do { @@ -578,16 +572,15 @@ namespace MicrosoftZuneLibrary } else if (type.IsEnum) { - ushort num10 = *(ushort*)propVariant; - if (num10 == 3 || num10 == 19) + if (propVariant.vt == VARTYPE.VT_I4 || propVariant.vt == VARTYPE.VT_UI4) { - return Enum.ToObject(type, *(int*)((ulong)(nint)propVariant + 8uL)); + return Enum.ToObject(type, propVariant.lVal); } } return defaultValue; } - public unsafe static int ConvertTypeToPropVariant(Type type, object value, PROPVARIANT propVariant) + public unsafe static int ConvertTypeToPropVariant(Type type, object value, out PROPVARIANT propVariant) { //IL_003a: Expected I8, but got I //IL_020e: Expected I4, but got I8 @@ -601,36 +594,22 @@ namespace MicrosoftZuneLibrary } if (type == typeof(string)) { - *(short*)propVariant = 8; - fixed (char* (string)valuePtr = (string)value.ToCharArray()) - { - ushort* ptr = (ushort*)(string)valuePtr; - *(long*)((ulong)(nint)propVariant + 8uL) = (nint)Module.SysAllocString(ptr); - return 0; - } + propVariant = new(value, VarEnum.VT_BSTR); + result = 0; } if (type == typeof(int)) { - *(short*)propVariant = 3; - *(int*)((ulong)(nint)propVariant + 8uL) = (int)value; + propVariant = new(value, VarEnum.VT_I4); result = 0; } else if (type == typeof(uint)) { - *(short*)propVariant = 19; - *(uint*)((ulong)(nint)propVariant + 8uL) = (uint)value; + propVariant = new(value, VarEnum.VT_UI4); result = 0; } - else if (type == typeof(long)) + else if (type == typeof(long) || type == typeof(ulong)) { - *(short*)propVariant = 20; - *(long*)((ulong)(nint)propVariant + 8uL) = (long)value; - result = 0; - } - else if (type == typeof(ulong)) - { - *(short*)propVariant = 20; - *(long*)((ulong)(nint)propVariant + 8uL) = (long)value; + propVariant = new(value, VarEnum.VT_I8); result = 0; } else if (type == typeof(DateTime)) @@ -642,27 +621,23 @@ namespace MicrosoftZuneLibrary { dateTime = ((dateTime.Year >= 30) ? dateTime.AddYears(1900) : dateTime.AddYears(2000)); } - *(short*)propVariant = 7; - *(double*)((ulong)(nint)propVariant + 8uL) = dateTime.ToOADate(); + propVariant = new(dateTime.ToOADate(), VarEnum.VT_DATE); } result = 0; } else if (type == typeof(TimeSpan)) { - *(short*)propVariant = 3; - *(int*)((ulong)(nint)propVariant + 8uL) = (int)((TimeSpan)(TimeSpan)value).TotalMilliseconds; + propVariant = new((int)((TimeSpan)value).TotalMilliseconds, VarEnum.VT_I4); result = 0; } else if (type == typeof(bool)) { - *(short*)propVariant = 11; int num = -1; if (!(bool)value) { num = ~num; } - short num2 = (short)num; - *(short*)((ulong)(nint)propVariant + 8uL) = num2; + propVariant = new((short)num, VarEnum.VT_BOOL); result = 0; } else if (typeof(IList).IsAssignableFrom(type)) @@ -673,6 +648,7 @@ namespace MicrosoftZuneLibrary int count = list.Count; if (count == 0) { + propVariant = new(null, VarEnum.VT_ARRAY); Module.PropVariantClear(propVariant); } else @@ -699,9 +675,9 @@ namespace MicrosoftZuneLibrary { while (true) { - fixed (char* (string)objPtr = (string)obj.ToCharArray()) + fixed (char* stringObjPtr = ((string)obj).ToCharArray()) { - ushort* ptr3 = (ushort*)(string)objPtr; + ushort* ptr3 = (ushort*)stringObjPtr; IL_0217: obj = list[index]; if (obj != null) @@ -784,7 +760,7 @@ namespace MicrosoftZuneLibrary public unsafe static string AtomToAtomName(int atom) { //IL_0012: Expected I, but got I8 - return new string((char*)(*(ulong*)((long)atom * 32L + (ref Module._003Fs_rgSchemaMapEntry_0040CSchemaMap_0040_00400QBU_SCHEMAMAPENTRY_00401_0040B)))); + return new string((char*)(*(ulong*)((long)atom * 32L + Module._003Fs_rgSchemaMapEntry_0040CSchemaMap_0040_00400QBU_SCHEMAMAPENTRY_00401_0040B))); } protected virtual void Dispose([MarshalAs(UnmanagedType.U1)] bool P_0) @@ -800,14 +776,13 @@ namespace MicrosoftZuneLibrary } finally { - base.Finalize(); + //base.Finalize(); } } - public sealed override void Dispose() + public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } ~ZuneQueryList() diff --git a/ZuneDBApi/MicrosoftZunePlayback/AnnouncementHandler.cs b/ZuneDBApi/MicrosoftZunePlayback/AnnouncementHandler.cs index a0e5a0b..18e6fc2 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/AnnouncementHandler.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/AnnouncementHandler.cs @@ -1,4 +1,4 @@ namespace MicrosoftZunePlayback { - public delegate void AnnouncementHandler(Announcement); + public delegate void AnnouncementHandler(Announcement announcement); } diff --git a/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs b/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs index 4d9bb95..9c457dc 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/BandwidthUpdateArgs.cs @@ -72,7 +72,7 @@ namespace MicrosoftZunePlayback int testLength2 = _testLength; if (testLength2 != 0 && currentState != MBRHeuristicState.Playback) { - _percentComplete = (int)(double)((testPosition2 >= testLength2) ? 100f : ((float)((double)(float)testPosition2 / (double)(float)testLength2 * 100.0))); + _percentComplete = (int)((testPosition2 >= testLength2) ? 100f : ((float)((float)testPosition2 / (double)(float)testLength2 * 100.0))); return; } } diff --git a/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs b/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs index 6a781d6..cc93945 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/PlayerInterop.cs @@ -186,11 +186,13 @@ namespace MicrosoftZunePlayback { //IL_004a: Expected I, but got I8 _windowHost = value; - RECT tagRECT; - *(int*)(&tagRECT) = value.Left; - Unsafe.As(ref Unsafe.AddByteOffset(ref tagRECT, 4)) = value.Top; - Unsafe.As(ref Unsafe.AddByteOffset(ref tagRECT, 8)) = value.Right; - Unsafe.As(ref Unsafe.AddByteOffset(ref tagRECT, 12)) = value.Bottom; + RECT tagRECT = new() + { + left = value.Left, + top = value.Top, + right = value.Right, + bottom = value.Bottom + }; IMCDynamicImage* uDynamicImage = _uDynamicImage; if (uDynamicImage != null) { @@ -434,14 +436,14 @@ namespace MicrosoftZunePlayback else if (b != null) { bool result; - fixed (char* b.IdPtr = b.Id.ToCharArray()) + fixed (char* bIdPtr = b.Id.ToCharArray()) { - ushort* ptr = (ushort*)b.IdPtr; + ushort* ptr = (ushort*)bIdPtr; try { - fixed (char* b.SourceFilePtr = b.SourceFile.ToCharArray()) + fixed (char* bSourceFilePtr = b.SourceFile.ToCharArray()) { - ushort* ptr3 = (ushort*)b.SourceFilePtr; + ushort* ptr3 = (ushort*)bSourceFilePtr; try { int num7; @@ -663,7 +665,6 @@ namespace MicrosoftZunePlayback _gotStateCloseEvent = null; _gotStateUninitializeEvent = null; _fShuttingDown = false; - base._002Ector(); } internal unsafe void OnAlertOccurred(MCHResultAnnouncement* pAlert) @@ -736,7 +737,7 @@ namespace MicrosoftZunePlayback if (string.Compare(text, "presentationinfo", StringComparison.Ordinal) == 0) { byte needOverscan = (byte)((*(bool*)((ulong)(nint)pData + 16uL)) ? 1 : 0); - value = new PresentationInfo((int)(double)(*(float*)pData), (int)(double)(*(float*)((ulong)(nint)pData + 4uL)), *(int*)((ulong)(nint)pData + 8uL), *(int*)((ulong)(nint)pData + 12uL), needOverscan != 0); + value = new PresentationInfo((int)*(float*)pData, (int)*(float*)((ulong)(nint)pData + 4uL), *(int*)((ulong)(nint)pData + 8uL), *(int*)((ulong)(nint)pData + 12uL), needOverscan != 0); } else if (string.Compare(text, "volumeinfo", StringComparison.Ordinal) == 0) { @@ -1148,7 +1149,7 @@ namespace MicrosoftZunePlayback public unsafe void SetUri(string uri, long startPositionIn100nsUnits, int UriID) { //IL_0033: Expected I, but got I8 - if (!(uri != (string)null)) + if (!(uri != null)) { return; } @@ -1177,7 +1178,7 @@ namespace MicrosoftZunePlayback public unsafe void SetNextUri(string uri, long startPositionIn100nsUnits, int UriID) { //IL_0033: Expected I, but got I8 - if (!(uri != (string)null)) + if (!(uri != null)) { return; } diff --git a/ZuneDBApi/MicrosoftZunePlayback/VideoWindow.cs b/ZuneDBApi/MicrosoftZunePlayback/VideoWindow.cs index e7bc5b6..d0d0c3d 100644 --- a/ZuneDBApi/MicrosoftZunePlayback/VideoWindow.cs +++ b/ZuneDBApi/MicrosoftZunePlayback/VideoWindow.cs @@ -26,7 +26,6 @@ namespace MicrosoftZunePlayback _top = top; _right = right; _bottom = bottom; - base._002Ector(); } [return: MarshalAs(UnmanagedType.U1)] diff --git a/ZuneDBApi/Module.cs b/ZuneDBApi/Module.cs index fd400df..0027472 100644 --- a/ZuneDBApi/Module.cs +++ b/ZuneDBApi/Module.cs @@ -11,6 +11,7 @@ global using ZuneDBApi; global using GC = System.GC; global using HRESULT = ZuneUI.HRESULT; global using _GUID = System.Guid; +global using _SYSTEMTIME = Vanara.PInvoke.SYSTEMTIME; using System; using System.Runtime.InteropServices; @@ -20,13 +21,29 @@ namespace ZuneDBApi { internal static unsafe class Module { + internal const string ZUNENATIVELIB_DLL = "ZuneNativeLib"; + internal const string ZUNESERVICE_DLL = "ZuneService"; + private static bool s_bIsLonghornOrBetter; private static bool s_bIsLonghornOrBetterInitialized; + internal static readonly string WINDOWCLASS_MsnMsgrUIManager = "MsnMsgrUIManager"; + + internal static readonly _GUID GUID_NULL = _GUID.Empty; internal static readonly _GUID GUID_IService = new("bb2d1edd-1bd5-4be1-8d38-36d4f0849911"); internal static readonly _GUID GUID_IUserManager = new("c9e0f18a-6c53-47d0-991e-dbd4fe395101"); internal static readonly _GUID GUID_IFeatureEnablementManager = new("9581b41a-b5cf-4ebf-9d1a-975477e081ca"); internal static readonly _GUID GUID_ITelemetryManager = new("ab28333b-a55c-4312-a7a3-2dd60d4a7154"); + internal static readonly _GUID GUID_IMetadataManager = new("6dd7146d-7a19-4fbb-9235-9e6c382fcc71"); + internal static readonly _GUID GUID_IDeviceSyncRulesProvider = new("b12dc962-cc1b-46c5-a92a-68f1f2b9bff3"); + internal static readonly _GUID GUID_IFirmwareUpdater2 = new("f066fc29-e525-4ddc-abe6-5213d22c14d2"); + internal static readonly _GUID GUID_IRecordManager = new("c1cad55a-5652-40c7-842c-39cbe209379e"); + internal static readonly _GUID GUID_IQuickMixManager = new("d69e22ae-7e21-4959-be6e-14462eb96f64"); + internal static readonly _GUID GUID_IPlaylistManager = new("c2d9122b-f648-4b95-92fc-11f2e7f326d7"); + internal static readonly _GUID GUID_IDeviceContentProvider = new("7472ae89-073d-420b-9828-51f9d80ca2a6"); + internal static readonly _GUID GUID_ISubscriptionManager = new("9dc7c984-41d5-4130-a5ac-46d0825cd29d"); + internal static readonly _GUID GUID_IUsageDataManager = new("2f36e709-c431-4836-ab2b-ab57aef0cf1a"); + internal static readonly _GUID GUID_IFamilySettingsProvider = new("04f38ab5-391b-4b5a-a2c1-d4b74aeb4be9"); internal static void _ZuneShipAssert(uint v1, uint v2) { @@ -54,7 +71,7 @@ namespace ZuneDBApi return Kernel32.CloseHandle(new IntPtr(h)) ? 1 : 0; } - public static int CoCreateInstance(Guid rclsid, object pUnkOuter, uint dwClsContext, Guid riid, out object ppv) + public static int CoCreateInstance(_GUID rclsid, object pUnkOuter, uint dwClsContext, _GUID riid, out object ppv) { return Ole32.CoCreateInstance(rclsid, pUnkOuter, (CLSCTX)dwClsContext, riid, out ppv).Code; } @@ -113,9 +130,9 @@ namespace ZuneDBApi return result; } - internal static SYSTEMTIME DateTimeToSystemTime(DateTime dateTime) + internal static _SYSTEMTIME DateTimeToSystemTime(DateTime dateTime) { - SYSTEMTIME result = default; + _SYSTEMTIME result = default; FILETIME filetime = DateTimeToFileTime(dateTime); Module.FileTimeToSystemTime(&filetime, &result); @@ -161,7 +178,7 @@ namespace ZuneDBApi return result; } - public static int FileTimeToSystemTime(FILETIME* lpFileTime, SYSTEMTIME* lpSystemTime) + public static int FileTimeToSystemTime(FILETIME* lpFileTime, _SYSTEMTIME* lpSystemTime) { return Kernel32.FileTimeToSystemTime(*lpFileTime, out *lpSystemTime) ? 1 : 0; } @@ -242,7 +259,7 @@ namespace ZuneDBApi return Gdi32.GetObject(new(new IntPtr(hgdiobj)), bufferSize, new IntPtr(lpvObject)); } - [DllImport("ZuneService", CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [DllImport(ZUNESERVICE_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] [MethodImpl(MethodImplOptions.Unmanaged)] public unsafe static extern int GetServiceEndPointUri(EServiceEndpointId endpointId, ushort** uri); @@ -450,13 +467,13 @@ namespace ZuneDBApi return (ulong)User32.SetTimer(*hWnd, new((long)nIDEvent), uElapse, lpTimerFunc).ToInt64(); } - [DllImport("ZuneNativeLib")] + [DllImport(ZUNENATIVELIB_DLL)] public unsafe static extern int SetUIThreadCBWorker(IUIThreadCallbackWorker* pUIThreadCallbackWorker); - [DllImport("ZuneNativeLib", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)] public static extern void SQMAddNumbersToStream(string sqmDataId, uint countTotal, uint dw1); - [DllImport("ZuneNativeLib", CharSet = CharSet.Unicode)] + [DllImport(ZUNENATIVELIB_DLL, CharSet = CharSet.Unicode)] public static extern void SQMAddWrapper(string sqmDataId, int nData); public static ushort* SysAllocString(ushort* psz) @@ -474,7 +491,7 @@ namespace ZuneDBApi return OleAut32.SysStringLen(new SafeBSTR(new(psz))); } - internal unsafe static DateTime SystemTimeToDateTime(SYSTEMTIME stValue) + internal unsafe static DateTime SystemTimeToDateTime(_SYSTEMTIME stValue) { FILETIME ftValue = default; @@ -482,7 +499,7 @@ namespace ZuneDBApi return Module.FileTimeToDateTime(ftValue); } - public static int SystemTimeToFileTime(SYSTEMTIME* lpSystemTime, FILETIME* lpFileTime) + public static int SystemTimeToFileTime(_SYSTEMTIME* lpSystemTime, FILETIME* lpFileTime) { return Kernel32.SystemTimeToFileTime(in *lpSystemTime, out *lpFileTime) ? 1 : 0; } @@ -492,7 +509,7 @@ namespace ZuneDBApi return (uint)AdvApi32.TraceEvent(new TRACEHANDLE(sessionHandle), EventTrace).ToHRESULT().Code; } - public static uint TraceMessage(ulong sessionHandle, uint MessageFlags, Guid MessageGuid, ushort MessageNumber, void* arglist) + public static uint TraceMessage(ulong sessionHandle, uint MessageFlags, _GUID MessageGuid, ushort MessageNumber, void* arglist) { return (uint)AdvApi32.TraceMessageVa(new TRACEHANDLE(sessionHandle), (TRACE_MESSAGE)MessageFlags, in MessageGuid, MessageNumber, new IntPtr(arglist)).ToHRESULT().Code; } @@ -513,5 +530,90 @@ namespace ZuneDBApi } [DllImport(Lib.Kernel32, SetLastError = true, ExactSpelling = true)] private static extern WAIT_STATUS WaitForSingleObject([In] IntPtr hHandle, uint dwMilliseconds); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public static extern int AddDeviceSyncRule(EDeviceSyncRuleType syncRuleType, [MarshalAs(UnmanagedType.U1)] bool b1, int i1, EMediaTypes mediaType, int i2); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public static extern int AddDeviceSyncRuleWithValue(EDeviceSyncRuleType syncRuleType, int i1, EMediaTypes mediaType, int i2, int i3); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int AddGrovelerScanDirectory(ushort* directory, EMediaTypes mediaType); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int AddItemToPlaylist(int i1, int i2, IPlaylist* playlist); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int AddMedia(IMSMediaSchemaPropertySet* properties, EMediaTypes mediaType, int* i1); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int AddMedia(ushort* path, EMediaTypes mediaType, uint u1, bool* b1, int* i1); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int AddTransientMedia(ushort* path, EMediaTypes mediaType, int* i1); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CanAddFromFolder(ushort* folder); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CanAddMedia(ushort* folder, EMediaTypes mediaType); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public static extern int CleanupTransientMedia(); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CompareWithoutArticles(ushort* str1, ushort* str2, int* i1); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int GetSyncRuleForMedia(int rule1, EMediaTypes mediaType, int rule2, EDeviceSyncRuleType* syncRuleType); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int LocateArt(int mediaId, EMediaTypes mediaType, [MarshalAs(UnmanagedType.U1)] bool cacheOnly, ushort** outString); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int QueryDatabase(EQueryType queryType, IQueryPropertyBag* bag, IDatabaseQueryResults** results, ushort** outString); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CopyThumbnailBitmapData(HBITMAP* src, HBITMAP** dst, void** pData); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CopyThumbnailBitmapData(HBITMAP* src, int srcX, int srcY, int srcWidth, int srcHeight, + int dstWidth, int dstHeight, HBITMAP** dst, void** pData); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CreateAlbumPropSet(_GUID albumId, ushort* albumTitle, ushort* artistTitle, IMSMediaSchemaPropertySet** propSet); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CreateContentRefreshTask(IAsyncCallback* callback, IContentRefreshTask** task); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CreateDataObjectEnum(IDataObjectEnumerator** objEnum); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CreateDRMQuery(IDRMQuery** drmQuery); + + [DllImport(ZUNENATIVELIB_DLL, CallingConvention = CallingConvention.Cdecl, SetLastError = true)] + [MethodImpl(MethodImplOptions.Unmanaged)] + public unsafe static extern int CreateEmptyPlaylist(IPlaylist** outPlaylist); } } diff --git a/ZuneDBApi/ZuneDBApi.csproj b/ZuneDBApi/ZuneDBApi.csproj index 5d7a649..6ff9bfa 100644 --- a/ZuneDBApi/ZuneDBApi.csproj +++ b/ZuneDBApi/ZuneDBApi.csproj @@ -1,12 +1,19 @@  ZuneDBApi + 4.8.2345.0 + False net5.0 - x86;x64 + x64;x86 app.manifest latest True + x64 + + + + $(DefineConstants);ZUNE_5 @@ -14,6 +21,20 @@ C:\Program Files\Zune\UIX.dll + + + PreserveNewest + C:\Program Files\Zune\ZuneNativeLib.dll + C:\Program Files (x86)\Zune\ZuneNativeLib.dll + + + + + PreserveNewest + C:\Program Files\Zune\ZuneService.dll + C:\Program Files (x86)\Zune\ZuneService.dll + + diff --git a/ZuneDBApi/ZuneUI/HRESULT.cs b/ZuneDBApi/ZuneUI/HRESULT.cs index 80b5aa6..5853595 100644 --- a/ZuneDBApi/ZuneUI/HRESULT.cs +++ b/ZuneDBApi/ZuneUI/HRESULT.cs @@ -273,7 +273,7 @@ namespace ZuneUI [return: MarshalAs(UnmanagedType.U1)] public override bool Equals(object oCompare) { - int num = ((oCompare is HRESULT && hr == ((HRESULT)(HRESULT)oCompare).hr) ? 1 : 0); + int num = ((oCompare is HRESULT && hr == ((HRESULT)oCompare).hr) ? 1 : 0); return (byte)num != 0; } diff --git a/ZuneShell.sln b/ZuneShell.sln index 39fd207..13e4ad9 100644 --- a/ZuneShell.sln +++ b/ZuneShell.sln @@ -54,8 +54,8 @@ Global {F0323473-F9B6-4875-93B2-DF657C3F7197}.Release|x64.Build.0 = Release|x64 {3040F871-DA7F-4286-AF17-7667525F25ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3040F871-DA7F-4286-AF17-7667525F25ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3040F871-DA7F-4286-AF17-7667525F25ED}.Debug|x64.ActiveCfg = Debug|Any CPU - {3040F871-DA7F-4286-AF17-7667525F25ED}.Debug|x64.Build.0 = Debug|Any CPU + {3040F871-DA7F-4286-AF17-7667525F25ED}.Debug|x64.ActiveCfg = Debug|x64 + {3040F871-DA7F-4286-AF17-7667525F25ED}.Debug|x64.Build.0 = Debug|x64 {3040F871-DA7F-4286-AF17-7667525F25ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {3040F871-DA7F-4286-AF17-7667525F25ED}.Release|Any CPU.Build.0 = Release|Any CPU {3040F871-DA7F-4286-AF17-7667525F25ED}.Release|x64.ActiveCfg = Release|Any CPU diff --git a/ZuneShell/ZuneUI/LibraryPage.cs b/ZuneShell/ZuneUI/LibraryPage.cs index 8f9ba11..a7da9a9 100644 --- a/ZuneShell/ZuneUI/LibraryPage.cs +++ b/ZuneShell/ZuneUI/LibraryPage.cs @@ -166,16 +166,16 @@ namespace ZuneUI { ArrayList tempFilenames = new ArrayList(filenames); ThreadPool.QueueUserWorkItem(o => - { - if (ZuneApplication.AddMedia(tempFilenames, this.MediaType)) - return; - Application.DeferredInvoke(delegate - { - NotificationArea.Instance.Add(new MessageNotification(Shell.LoadString(StringId.IDS_LIBRARY_ADD_FILE_FAILED), NotificationTask.Library, NotificationState.OneShot) - { - SubMessage = Shell.LoadString(StringId.IDS_LIBRARY_ADD_FILE_FAILED_SUBMESSAGE) - }); - }, null); + { + if (ZuneApplication.AddMedia(tempFilenames, this.MediaType)) + return; + Application.DeferredInvoke(delegate + { + NotificationArea.Instance.Add(new MessageNotification(Shell.LoadString(StringId.IDS_LIBRARY_ADD_FILE_FAILED), NotificationTask.Library, NotificationState.OneShot) + { + SubMessage = Shell.LoadString(StringId.IDS_LIBRARY_ADD_FILE_FAILED_SUBMESSAGE) + }); + }, null); }); }