Even more fixes

This commit is contained in:
Yoshi Askharoun
2021-11-22 01:51:40 -06:00
parent c9e5476dcc
commit c73be72065
117 changed files with 250 additions and 524 deletions
@@ -84,7 +84,6 @@ namespace Microsoft.Zune.Configuration
m_basePath = basePath;
m_instance = instance;
m_pNotificationMarshaller = null;
base._002Ector();
switch (hive)
{
default:
@@ -806,7 +805,7 @@ namespace Microsoft.Zune.Configuration
catch
{
//try-fault
ptr5 = null;
array = null;
throw;
}
}
@@ -1045,14 +1044,13 @@ namespace Microsoft.Zune.Configuration
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~CConfigurationManagedBase()
@@ -345,14 +345,13 @@ namespace Microsoft.Zune.Configuration
{
if (!P_0)
{
Finalize();
//Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
}
}
@@ -166,14 +166,13 @@ namespace Microsoft.Zune.Messaging
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~MessagingNotifier()
@@ -37,7 +37,7 @@ namespace Microsoft.Zune.Messaging
//IL_0008: Expected I, but got I8
//IL_0011: Expected I, but got I8
IZuneNetMessaging* pMessaging = null;
if (Module.GetSingleton((_GUID)Module._GUID_bf368f0d_4743_439c_9142_e487c9534104, (void**)(&pMessaging)) >= 0)
if (Module.GetSingleton(Module.GUID_IZuneNetMessaging, (void**)(&pMessaging)) >= 0)
{
m_pMessaging = pMessaging;
}
@@ -1017,14 +1017,13 @@ namespace Microsoft.Zune.Messaging
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~MessagingService()
@@ -263,14 +263,13 @@ namespace Microsoft.Zune.Messaging
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~PlaylistMessageData()
@@ -96,10 +96,7 @@ namespace Microsoft.Zune.Playlist
{
ePlaylistCreateConflictAction = (EPlaylistCreateConflictAction)1;
}
_GUID gUID;
*(int*)(&gUID) = 0;
// IL initblk instruction
Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref gUID, 4), 0, 12);
_GUID gUID = new();
if (serviceMediaId != null)
{
gUID = (Guid)serviceMediaId;
@@ -182,7 +179,7 @@ namespace Microsoft.Zune.Playlist
catch
{
//try-fault
ptr3 = null;
playlistContentIds = null;
throw;
}
}
@@ -190,7 +187,7 @@ namespace Microsoft.Zune.Playlist
catch
{
//try-fault
ptr2 = null;
mediaTypeIds = null;
throw;
}
}
@@ -198,7 +195,7 @@ namespace Microsoft.Zune.Playlist
catch
{
//try-fault
ptr = null;
mediaIds = null;
throw;
}
}
@@ -225,7 +222,7 @@ namespace Microsoft.Zune.Playlist
catch
{
//try-fault
ptr = null;
playlistContentIds = null;
throw;
}
}
@@ -253,7 +250,7 @@ namespace Microsoft.Zune.Playlist
catch
{
//try-fault
ptr = null;
playlistContentIds = null;
throw;
}
}
@@ -16,7 +16,6 @@ namespace Microsoft.Zune.QuickMix
try
{
m_spSession = spSession;
base._002Ector();
m_spSession.op_Assign(pSession);
}
catch
@@ -268,15 +267,14 @@ namespace Microsoft.Zune.QuickMix
}
finally
{
base.Finalize();
//base.Finalize();
}
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~QuickMixSession()
@@ -180,14 +180,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~AlbumOfferCollection()
@@ -2,8 +2,6 @@ using System;
using System.Collections;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using _003CCppImplementationDetails_003E;
namespace Microsoft.Zune.Service
{
public class AppOfferCollection : OfferCollection, IDisposable
@@ -171,14 +169,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~AppOfferCollection()
@@ -101,14 +101,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~BillingOfferCollection()
@@ -136,14 +136,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~CreditCardCollection()
@@ -85,7 +85,6 @@ namespace Microsoft.Zune.Service
//IL_010d: Expected I, but got I8
//IL_0199: Expected I, but got I8
m_pStream = pStream;
base._002Ector();
_statusCode = statusCode;
if (pResponse != null)
{
@@ -182,14 +181,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~HttpWebResponse()
@@ -91,7 +91,6 @@ namespace Microsoft.Zune.Service
try
{
m_spPassportIdentity = spPassportIdentity;
base._002Ector();
m_spPassportIdentity.op_Assign(pPassportIdentity);
}
catch
@@ -124,16 +123,11 @@ namespace Microsoft.Zune.Service
((IDisposable)m_spPassportIdentity).Dispose();
}
}
else
{
Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
}
}
+1 -3
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using _003CCppImplementationDetails_003E;
using Microsoft.Iris;
using Microsoft.Zune.Util;
using ZuneUI;
@@ -7839,14 +7838,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~Service()
@@ -73,7 +73,6 @@ namespace Microsoft.Zune.Service
try
{
m_spServiceError = spServiceError;
base._002Ector();
m_spServiceError.op_Assign(pServiceError);
}
catch
@@ -100,16 +99,11 @@ namespace Microsoft.Zune.Service
((IDisposable)m_spServiceError).Dispose();
}
}
else
{
Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
}
}
@@ -183,14 +183,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~TrackOfferCollection()
@@ -27,7 +27,7 @@ namespace Microsoft.Zune.Service
//IL_0008: Expected I, but got I8
//IL_0011: Expected I, but got I8
IUriResourceTracker* pUriResourceTracker = null;
if (Module.GetSingleton((_GUID)Module._GUID_ddbb9148_dea1_47dd_a0c1_1fdcf002c1e2, (void**)(&pUriResourceTracker)) >= 0)
if (Module.GetSingleton(Module.GUID_IUriResourceTracker, (void**)(&pUriResourceTracker)) >= 0)
{
m_pUriResourceTracker = pUriResourceTracker;
}
@@ -117,14 +117,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~UriResourceTracker()
@@ -2,8 +2,6 @@ using System;
using System.Collections;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using _003CCppImplementationDetails_003E;
namespace Microsoft.Zune.Service
{
public class VideoOfferCollection : OfferCollection, IDisposable
@@ -368,14 +366,13 @@ namespace Microsoft.Zune.Service
}
finally
{
base.Finalize();
//base.Finalize();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
~VideoOfferCollection()
@@ -94,7 +94,6 @@ namespace Microsoft.Zune.Service
try
{
m_spWinLiveAvailableInformation = spWinLiveAvailableInformation;
base._002Ector();
m_spWinLiveAvailableInformation.op_Assign(pWinLiveAvailableInformation);
}
catch
@@ -121,16 +120,11 @@ namespace Microsoft.Zune.Service
((IDisposable)m_spWinLiveAvailableInformation).Dispose();
}
}
else
{
Finalize();
}
}
public sealed override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
}
}
@@ -202,7 +202,6 @@ namespace Microsoft.Zune.Service
try
{
m_spWinLiveInformation = spWinLiveInformation;
base._002Ector();
m_spWinLiveInformation.op_Assign(pWinLiveInformation);
}
catch
@@ -229,16 +228,11 @@ namespace Microsoft.Zune.Service
((IDisposable)m_spWinLiveInformation).Dispose();
}
}
else
{
Finalize();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
}
}

Some files were not shown because too many files have changed in this diff Show More