zune/ZuneShell.dll
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneShell.dll.git synced 2026-07-27 13:11:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Converted to lock blocks

Browse Source
This commit is contained in:
Yoshi Askharoun
2021-12-23 22:40:40 -06:00
parent 0502215213
commit 4e49c93747
26 changed files with 234 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneDBApi/CComPtrNtv.cs
+8
View File
@@ -41,6 +41,14 @@ internal unsafe class CComPtrNtv<TPtr> : IDisposable where TPtr : unmanaged
}
}
public ref TPtr* GetPinnableReference()
{
fixed (TPtr** ptr = &p)
{
return ref *ptr;
}
}
protected virtual void Dispose(bool disposing)
{
if (!disposedValue)
ZuneDBApi/Microsoft/Zune/Configuration/CConfigurationManagedBase.cs
+2 -12
View File
@@ -45,34 +45,24 @@ namespace Microsoft.Zune.Configuration
{
add
{
try
lock (m_lock)
{
Monitor.Enter(m_lock);
if (null == m_configurationChangeEventHandler)
{
Subscribe(OnNativeConfigChangedCallback);
}
m_configurationChangeEventHandler = (ConfigurationChangeEventHandler)Delegate.Combine(m_configurationChangeEventHandler, value);
}
finally
{
Monitor.Exit(m_lock);
}
}
remove
{
try
lock (m_lock)
{
Monitor.Enter(m_lock);
if (null == (m_configurationChangeEventHandler = (ConfigurationChangeEventHandler)Delegate.Remove(m_configurationChangeEventHandler, value)))
{
Unsubscribe();
}
}
finally
{
Monitor.Exit(m_lock);
}
}
}
ZuneDBApi/Microsoft/Zune/Playlist/PlaylistManager.cs
+18 -25
View File
@@ -22,9 +22,8 @@ namespace Microsoft.Zune.Playlist
{
if (sm_instance == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_instance == null)
{
PlaylistManager playlistManager = new PlaylistManager();
@@ -32,10 +31,6 @@ namespace Microsoft.Zune.Playlist
sm_instance = playlistManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_instance;
}
@@ -61,13 +56,13 @@ namespace Microsoft.Zune.Playlist
public unsafe HRESULT CreatePlaylist(string title, string author, [In] ValueType serviceMediaId, CreatePlaylistOption options, out int playlistId)
{
playlistId = -1;
bool flag = (options & CreatePlaylistOption.PrivatePlaylist) > CreatePlaylistOption.None;
bool flag2 = (options & CreatePlaylistOption.AutoPlaylist) > CreatePlaylistOption.None;
bool flag3 = (options & CreatePlaylistOption.SyncRule) > CreatePlaylistOption.None;
bool flag4 = (options & CreatePlaylistOption.OverwriteOnConflict) > CreatePlaylistOption.None;
bool flag5 = (options & CreatePlaylistOption.RenameOnConflict) > CreatePlaylistOption.None;
bool isPrivate = (options & CreatePlaylistOption.PrivatePlaylist) > CreatePlaylistOption.None;
bool isAuto = (options & CreatePlaylistOption.AutoPlaylist) > CreatePlaylistOption.None;
bool syncRule = (options & CreatePlaylistOption.SyncRule) > CreatePlaylistOption.None;
bool overwrite = (options & CreatePlaylistOption.OverwriteOnConflict) > CreatePlaylistOption.None;
bool rename = (options & CreatePlaylistOption.RenameOnConflict) > CreatePlaylistOption.None;
int hr;
if ((flag && (flag2 || flag3)) || (flag4 && flag5))
if ((isPrivate && (isAuto || syncRule)) || (overwrite && rename))
{
hr = -2147024809;
}
@@ -77,22 +72,22 @@ namespace Microsoft.Zune.Playlist
}
else
{
fixed (char* titlePtr = title.ToCharArray())
fixed (char* titlePtr = title)
{
ushort* ptr2 = (ushort*)titlePtr;
try
{
fixed (char* authorPtr = author.ToCharArray())
fixed (char* authorPtr = author)
{
ushort* ptr3 = (ushort*)authorPtr;
try
{
EPlaylistCreateConflictAction ePlaylistCreateConflictAction = 0;
if (flag5)
if (rename)
{
ePlaylistCreateConflictAction = EPlaylistCreateConflictAction.RenameOnConflict;
}
else if (flag || flag4)
else if (isPrivate || overwrite)
{
ePlaylistCreateConflictAction = EPlaylistCreateConflictAction.OverwriteOnConflict;
}
@@ -101,22 +96,22 @@ namespace Microsoft.Zune.Playlist
{
gUID = (Guid)serviceMediaId;
}
bool flag6 = !(flag3 || flag);
bool flag6 = !(syncRule || isPrivate);
EPlaylistType ePlaylistType;
if (flag)
if (isPrivate)
{
ePlaylistType = (EPlaylistType)4;
}
else
{
EPlaylistType ePlaylistType2;
if (flag3)
if (syncRule)
{
ePlaylistType2 = (EPlaylistType)3;
}
else
{
EPlaylistType ePlaylistType3 = (flag2 ? ((EPlaylistType)1) : 0);
EPlaylistType ePlaylistType3 = (isAuto ? ((EPlaylistType)1) : 0);
ePlaylistType2 = ePlaylistType3;
}
ePlaylistType = ePlaylistType2;
@@ -278,7 +273,7 @@ namespace Microsoft.Zune.Playlist
}
else
{
fixed (char* newTitlePtr = newTitle.ToCharArray())
fixed (char* newTitlePtr = newTitle)
{
ushort* ptr = (ushort*)newTitlePtr;
try
@@ -344,14 +339,12 @@ namespace Microsoft.Zune.Playlist
string result = candidateTitle;
if (m_pPlaylistManager != null)
{
fixed (char* candidateTitlePtr = candidateTitle.ToCharArray())
fixed (char* candidateTitlePtr = candidateTitle)
{
ushort* ptr = (ushort*)candidateTitlePtr;
try
{
PROPVARIANT cComPropVariant;
// IL initblk instruction
Unsafe.InitBlock(&cComPropVariant, 0, 24);
PROPVARIANT cComPropVariant = new();
try
{
long num = *(long*)m_pPlaylistManager + 136;
ZuneDBApi/Microsoft/Zune/QuickMix/QuickMix.cs
+1 -6
View File
@@ -52,9 +52,8 @@ namespace Microsoft.Zune.QuickMix
{
if (sm_instance == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_instance == null)
{
QuickMix quickMix = new QuickMix();
@@ -66,10 +65,6 @@ namespace Microsoft.Zune.QuickMix
}
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_instance;
}
ZuneDBApi/Microsoft/Zune/Service/AccountManagement.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace Microsoft.Zune.Service
catch
{
//try-fault
((IDisposable)m_spAccountManagement).Dispose();
m_spAccountManagement.Dispose();
throw;
}
}
ZuneDBApi/Microsoft/Zune/Subscription/SubscriptionManager.cs
+3 -8
View File
@@ -22,9 +22,8 @@ namespace Microsoft.Zune.Subscription
{
if (sm_instance == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_instance == null)
{
SubscriptionManager subscriptionManager = new SubscriptionManager();
@@ -32,10 +31,6 @@ namespace Microsoft.Zune.Subscription
sm_instance = subscriptionManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_instance;
}
@@ -242,7 +237,7 @@ namespace Microsoft.Zune.Subscription
}
if (num >= 0)
{
fixed (char* feedUrlPtr = feedUrl.ToCharArray())
fixed (char* feedUrlPtr = feedUrl))
{
ushort* ptr3 = (ushort*)feedUrlPtr;
try
@@ -366,7 +361,7 @@ namespace Microsoft.Zune.Subscription
num = ValidateUrl(ref feedUrl);
if (num >= 0)
{
fixed (char* feedUrlPtr = feedUrl.ToCharArray())
fixed (char* feedUrlPtr = feedUrl))
{
ushort* ptr = (ushort*)feedUrlPtr;
try
ZuneDBApi/Microsoft/Zune/Subscription/VirtualSubscriptionEpisodeList.cs
+3 -18
View File
@@ -48,8 +48,7 @@ namespace Microsoft.Zune.Subscription
private void _007EVirtualSubscriptionEpisodeList()
{
Monitor.Enter(m_lock);
try
lock (m_lock)
{
List<SubscriptionDataProviderItem>.Enumerator enumerator = m_items.GetEnumerator();
while (enumerator.MoveNext())
@@ -58,26 +57,17 @@ namespace Microsoft.Zune.Subscription
}
m_items = null;
}
finally
{
Monitor.Exit(m_lock);
}
}
internal unsafe void AddItem(IMSMediaSchemaPropertySet* pEpisodeItem)
{
Monitor.Enter(m_lock);
try
lock (m_lock)
{
if (m_items != null)
{
m_items.Add(new SubscriptionDataProviderItem(m_owner, m_typeCookie, m_feedUrl, pEpisodeItem));
}
}
finally
{
Monitor.Exit(m_lock);
}
}
internal unsafe void AsyncRetrieveEpisodeList(SubscriptionSeriesInfo seriesInfo)
@@ -152,8 +142,7 @@ namespace Microsoft.Zune.Subscription
internal void Sort(string sortProperty)
{
Monitor.Enter(m_lock);
try
lock (m_lock)
{
if (sortProperty != null)
{
@@ -165,10 +154,6 @@ namespace Microsoft.Zune.Subscription
}
Application.DeferredInvoke(DeferredResetList, null);
}
finally
{
Monitor.Exit(m_lock);
}
}
protected override object OnRequestItem(int index)
ZuneDBApi/Microsoft/Zune/User/UserManager.cs
+1 -6
View File
@@ -17,9 +17,8 @@ namespace Microsoft.Zune.User
{
if (sm_instance == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_instance == null)
{
UserManager userManager = new UserManager();
@@ -27,10 +26,6 @@ namespace Microsoft.Zune.User
sm_instance = userManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_instance;
}
ZuneDBApi/Microsoft/Zune/UserCredential/UserCredentialManager.cs
+2 -7
View File
@@ -15,9 +15,8 @@ namespace Microsoft.Zune.UserCredential
{
if (sm_instance == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_instance == null)
{
UserCredentialManager userCredentialManager = new UserCredentialManager();
@@ -25,10 +24,6 @@ namespace Microsoft.Zune.UserCredential
sm_instance = userCredentialManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_instance;
}
@@ -67,7 +62,7 @@ namespace Microsoft.Zune.UserCredential
{
return -2147024882;
}
num = Module.GetSingleton((_GUID)Module._GUID_41c80590_c50b_4d27_b860_7c87f3f0cb54, (void**)(&ptr4));
num = Module.GetSingleton(Module.GUIDIUserCredentialManager, (void**)(&ptr4));
if (num >= 0)
{
num = Module.Microsoft_002EZune_002EUserCredential_002ECUserCredentialProviderProxy_002EInitialize(ptr2, credentialHandler);
ZuneDBApi/Microsoft/Zune/Util/DownloadManager.cs
+6 -17
View File
@@ -112,9 +112,8 @@ namespace Microsoft.Zune.Util
{
if (sm_downloadManager == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_downloadManager == null)
{
DownloadManager downloadManager = new DownloadManager();
@@ -122,10 +121,6 @@ namespace Microsoft.Zune.Util
sm_downloadManager = downloadManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_downloadManager;
}
@@ -427,7 +422,7 @@ namespace Microsoft.Zune.Util
try
{
long num4 = *(long*)(cComPtrNtv_003CIDownloadManager_003E.p);
singleton = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, int, IDownloadTask**, int>)(*(ulong*)(*(long*)(*(ulong*)(cComPtrNtv_003CIDownloadManager_003E.p)) + 104)))((nint)num4, num3, (IDownloadTask**)(cComPtrNtv_003CIDownloadTask_003E.p));
singleton = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, int, IDownloadTask**, int>)(*(ulong*)(*(long*)(*(ulong*)(cComPtrNtv_003CIDownloadManager_003E.p)) + 104)))((nint)num4, num3, (IDownloadTask**)(cComPtrNtv_003CIDownloadTask_003E.GetPtrToPtr()));
if (singleton >= 0)
{
long num5 = *(long*)(cComPtrNtv_003CIDownloadTask_003E.p);
@@ -441,27 +436,21 @@ namespace Microsoft.Zune.Util
}
}
}
catch
finally
{
//try-fault
Module.___CxxCallUnwindDtor((delegate*<void*, void>)(delegate*<IDownloadTask*, void>)(&Module.CComPtrNtv_003CIDownloadTask_003E._007Bdtor_007D), cComPtrNtv_003CIDownloadTask_003E.p);
throw;
}
cComPtrNtv_003CIDownloadTask_003E.Dispose();
}
num3++;
}
while (num3 < num);
}
Application.DeferredInvoke(DeferredUpdateActiveList, list);
}
catch
finally
{
//try-fault
Module.___CxxCallUnwindDtor((delegate*<void*, void>)(delegate*<IDownloadManager*, void>)(&Module.CComPtrNtv_003CIDownloadManager_003E._007Bdtor_007D), cComPtrNtv_003CIDownloadManager_003E.p);
throw;
}
cComPtrNtv_003CIDownloadManager_003E.Dispose();
}
}
private void DeferredUpdateActiveList(object args)
{
ZuneDBApi/Microsoft/Zune/Util/FamilySettingsManager.cs
+1 -6
View File
@@ -24,9 +24,8 @@ namespace Microsoft.Zune.Util
//IL_0086: Expected I, but got I8
if (sm_manager == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_manager == null)
{
FamilySettingsManager familySettingsManager = new FamilySettingsManager();
@@ -55,10 +54,6 @@ namespace Microsoft.Zune.Util
sm_manager = familySettingsManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_manager;
}
ZuneDBApi/Microsoft/Zune/Util/FeaturesChangedApi.cs
+2 -11
View File
@@ -124,13 +124,10 @@ namespace Microsoft.Zune.Util
}
}
}
catch
finally
{
//try-fault
cComPtrNtv_003CIAsyncCallback_003E.Dispose();
throw;
}
cComPtrNtv_003CIAsyncCallback_003E.Dispose();
return num;
}
@@ -142,13 +139,7 @@ namespace Microsoft.Zune.Util
{
if (P_0)
{
try
{
}
finally
{
((IDisposable)m_spAsyncCallback).Dispose();
}
m_spAsyncCallback.Dispose();
}
}
ZuneDBApi/Microsoft/Zune/Util/PhotoManager.cs
+23 -37
View File
@@ -18,9 +18,8 @@ namespace Microsoft.Zune.Util
{
if (sm_PhotoManager == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_PhotoManager == null)
{
PhotoManager photoManager = new PhotoManager();
@@ -28,10 +27,6 @@ namespace Microsoft.Zune.Util
sm_PhotoManager = photoManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_PhotoManager;
}
@@ -89,16 +84,13 @@ namespace Microsoft.Zune.Util
if (num >= 0)
{
IMetadataManager* intPtr = ptr;
__s_GUID gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d = Module._GUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d6;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d, (void**)(&ptr2));
_GUID guid_IFolderProvider = Module.GUID_IFolderProvider;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, guid_IFolderProvider, (void**)(&ptr2));
}
VARIANT tagVARIANT;
*(short*)(&tagVARIANT) = 0;
// IL initblk instruction
Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref tagVARIANT, 2), 0, 22);
VARIANT tagVARIANT = default;
if (num >= 0)
{
fixed (char* szFolderNamePtr = szFolderName.ToCharArray())
fixed (char* szFolderNamePtr = szFolderName)
{
ushort* ptr3 = (ushort*)szFolderNamePtr;
try
@@ -116,7 +108,7 @@ namespace Microsoft.Zune.Util
}
if (num >= 0)
{
nFolderId = Unsafe.As<VARIANT, int>(ref Unsafe.AddByteOffset(ref tagVARIANT, 8));
nFolderId = Unsafe.As<decimal, int>(ref tagVARIANT.decVal);
}
}
}
@@ -159,20 +151,17 @@ namespace Microsoft.Zune.Util
if (num >= 0)
{
IMetadataManager* intPtr = ptr;
__s_GUID gUID_16a9f8be_e76c_4391_ad74_8df74b7a3c = Module._GUID_16a9f8be_e76c_4391_ad74_8df74b7a3c21;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_16a9f8be_e76c_4391_ad74_8df74b7a3c, (void**)(&ptr2));
_GUID guid_IFileProvider = Module.GUID_IFileProvider;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, guid_IFileProvider, (void**)(&ptr2));
}
VARIANT tagVARIANT;
*(short*)(&tagVARIANT) = 0;
// IL initblk instruction
Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref tagVARIANT, 2), 0, 22);
VARIANT tagVARIANT = default;
if (num >= 0)
{
IFileProvider* intPtr2 = ptr2;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, int, EMediaTypes, VARIANT*, int>)(*(ulong*)(*(long*)ptr2 + 528)))((nint)intPtr2, nMediaId, EMediaTypes.eMediaTypeImage, &tagVARIANT);
if (num >= 0)
{
nFolderId = Unsafe.As<VARIANT, int>(ref Unsafe.AddByteOffset(ref tagVARIANT, 8));
nFolderId = Unsafe.As<decimal, int>(ref tagVARIANT.decVal);
}
}
}
@@ -219,16 +208,13 @@ namespace Microsoft.Zune.Util
if (num >= 0)
{
IMetadataManager* intPtr = ptr;
__s_GUID gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d = Module._GUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d6;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d, (void**)(&ptr2));
_GUID guid_IFolderProvider = Module.GUID_IFolderProvider;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, guid_IFolderProvider, (void**)(&ptr2));
}
VARIANT tagVARIANT;
*(short*)(&tagVARIANT) = 0;
// IL initblk instruction
Unsafe.InitBlockUnaligned(ref Unsafe.AddByteOffset(ref tagVARIANT, 2), 0, 22);
VARIANT tagVARIANT = default;
if (num >= 0)
{
fixed (char* szFolderNamePtr = szFolderName.ToCharArray())
fixed (char* szFolderNamePtr = szFolderName)
{
ushort* ptr3 = (ushort*)szFolderNamePtr;
try
@@ -246,7 +232,7 @@ namespace Microsoft.Zune.Util
}
if (num >= 0)
{
nCreatedFolderId = Unsafe.As<VARIANT, int>(ref Unsafe.AddByteOffset(ref tagVARIANT, 8));
nCreatedFolderId = Unsafe.As<decimal, int>(ref tagVARIANT.decVal);
}
}
}
@@ -291,11 +277,11 @@ namespace Microsoft.Zune.Util
if (num >= 0)
{
IMetadataManager* intPtr = ptr;
__s_GUID gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d = Module._GUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d6;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d, (void**)(&ptr2));
_GUID guid_IFolderProvider = Module.GUID_IFolderProvider;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, guid_IFolderProvider, (void**)(&ptr2));
if (num >= 0)
{
fixed (char* szNewFolderNamePtr = szNewFolderName.ToCharArray())
fixed (char* szNewFolderNamePtr = szNewFolderName)
{
ushort* ptr3 = (ushort*)szNewFolderNamePtr;
try
@@ -359,8 +345,8 @@ namespace Microsoft.Zune.Util
if (num >= 0)
{
IMetadataManager* intPtr = ptr;
__s_GUID gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d = Module._GUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d6;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d, (void**)(&ptr2));
_GUID guid_IFolderProvider = Module.GUID_IFolderProvider;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, guid_IFolderProvider, (void**)(&ptr2));
if (num >= 0)
{
fixed (int* ptr3 = &mediaIds[0])
@@ -375,7 +361,7 @@ namespace Microsoft.Zune.Util
catch
{
//try-fault
ptr3 = null;
mediaIds = null;
throw;
}
}
@@ -423,8 +409,8 @@ namespace Microsoft.Zune.Util
if (num >= 0)
{
IMetadataManager* intPtr = ptr;
__s_GUID gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d = Module._GUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d6;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, (_GUID)gUID_a2889317_d0c7_41d8_abc7_1eb4cb8d46d, (void**)(&ptr2));
_GUID guid_IFolderProvider = Module.GUID_IFolderProvider;
num = ((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, _GUID, void**, int>)(*(ulong*)(*(long*)ptr + 24)))((nint)intPtr, guid_IFolderProvider, (void**)(&ptr2));
if (num >= 0)
{
fixed (char* szPathPtr = szPath.ToCharArray())
ZuneDBApi/Microsoft/Zune/Util/PinManager.cs
+1 -6
View File
@@ -23,9 +23,8 @@ namespace Microsoft.Zune.Util
//IL_0086: Expected I, but got I8
if (sm_PinManager == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_PinManager == null)
{
PinManager pinManager = new PinManager();
@@ -54,10 +53,6 @@ namespace Microsoft.Zune.Util
sm_PinManager = pinManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_PinManager;
}
ZuneDBApi/Microsoft/Zune/Util/RadioStationManager.cs
+1 -6
View File
@@ -19,9 +19,8 @@ namespace Microsoft.Zune.Util
{
if (sm_radioStationManager == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_radioStationManager == null)
{
RadioStationManager radioStationManager = new RadioStationManager();
@@ -29,10 +28,6 @@ namespace Microsoft.Zune.Util
sm_radioStationManager = radioStationManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_radioStationManager;
}
ZuneDBApi/Microsoft/Zune/Util/UpdateManager.cs
+13 -20
View File
@@ -18,9 +18,8 @@ namespace Microsoft.Zune.Util
{
if (sm_updateManager == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_updateManager == null)
{
UpdateManager updateManager = new();
@@ -28,10 +27,6 @@ namespace Microsoft.Zune.Util
sm_updateManager = updateManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_updateManager;
}
@@ -59,9 +54,10 @@ namespace Microsoft.Zune.Util
throw;
}
UpdateProxy* ptr4 = ptr3;
lock (sm_lock)
{
try
{
Monitor.Enter(sm_lock);
if (Module.GetSingleton(Module.GUID_UpdateProxy, (void**)(&ptr)) >= 0)
{
m_spUpdateManager.op_Assign(ptr);
@@ -81,16 +77,16 @@ namespace Microsoft.Zune.Util
((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, uint>)(*(ulong*)(*(long*)intPtr + 16)))((nint)intPtr);
ptr = null;
}
Monitor.Exit(sm_lock);
}
}
}
public unsafe void CancelUpdateCheck()
{
//IL_002f: Expected I, but got I8
lock (sm_lock)
{
try
{
Monitor.Enter(sm_lock);
CComPtrMgd<IUpdateManager> spUpdateManager = m_spUpdateManager;
IUpdateManager* p = spUpdateManager.p;
if (0L != (nint)p)
@@ -102,7 +98,7 @@ namespace Microsoft.Zune.Util
finally
{
m_spUpdateManager.Release();
Monitor.Exit(sm_lock);
}
}
}
@@ -125,9 +121,10 @@ namespace Microsoft.Zune.Util
throw;
}
UpdateProxy* ptr3 = ptr2;
lock (sm_lock)
{
try
{
Monitor.Enter(sm_lock);
IUpdateManager* p = m_spUpdateManager.p;
if (0L == (nint)p)
{
@@ -140,13 +137,10 @@ namespace Microsoft.Zune.Util
m_spUpdateManager.op_Assign((IUpdateManager*)(*(ulong*)(cComPtrNtv_003CIUpdateManager_003E.p)));
}
}
catch
finally
{
//try-fault
cComPtrNtv_003CIUpdateManager_003E.Dispose();
throw;
}
cComPtrNtv_003CIUpdateManager_003E.Dispose();
}
CComPtrMgd<IUpdateManager> spUpdateManager = m_spUpdateManager;
IUpdateManager* p2 = spUpdateManager.p;
@@ -158,15 +152,14 @@ namespace Microsoft.Zune.Util
}
finally
{
Module.SafeRelease_003Cclass_0020Microsoft_003A_003AZune_003A_003AUtil_003A_003AUpdateProxy_003E(&ptr3);
m_spUpdateManager.Release();
Monitor.Exit(sm_lock);
}
}
}
private UpdateManager()
{
CComPtrMgd<IUpdateManager> spUpdateManager = new CComPtrMgd<IUpdateManager>();
CComPtrMgd<IUpdateManager> spUpdateManager = new();
try
{
m_spUpdateManager = spUpdateManager;
@@ -194,7 +187,7 @@ namespace Microsoft.Zune.Util
}
finally
{
((IDisposable)m_spUpdateManager).Dispose();
m_spUpdateManager.Dispose();
}
}
}
ZuneDBApi/Microsoft/Zune/Util/Win7ShellManager.cs
+1 -6
View File
@@ -23,9 +23,8 @@ namespace Microsoft.Zune.Util
{
if (sm_win7ShellManager == null)
{
try
lock (sm_lock)
{
Monitor.Enter(sm_lock);
if (sm_win7ShellManager == null)
{
Win7ShellManager win7ShellManager = new Win7ShellManager();
@@ -33,10 +32,6 @@ namespace Microsoft.Zune.Util
sm_win7ShellManager = win7ShellManager;
}
}
finally
{
Monitor.Exit(sm_lock);
}
}
return sm_win7ShellManager;
}
ZuneDBApi/Microsoft/Zune/Util/ZuneWebHost.cs
+3 -11
View File
@@ -26,9 +26,8 @@ namespace Microsoft.Zune.Util
}
if (s_zuneWebHost == null)
{
try
lock (s_lock)
{
Monitor.Enter(s_lock);
if (s_zuneWebHost == null)
{
ZuneWebHost zuneWebHost = new ZuneWebHost();
@@ -36,10 +35,6 @@ namespace Microsoft.Zune.Util
s_zuneWebHost = zuneWebHost;
}
}
finally
{
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 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 25uL) >= 5u)
{
@@ -67,7 +62,7 @@ namespace Microsoft.Zune.Util
long result;
try
{
Module.GetSingleton((_GUID)Module._GUID_51005f8f_675e_45e1_ae94_8edef996a02e, (void**)(cComPtrNtv_003CIZuneWebHost_003E.p));
Module.GetSingleton((_GUID)Module.GUID_IZuneWebHost, (void**)(cComPtrNtv_003CIZuneWebHost_003E.GetPtrToPtr()));
fixed (char* navUrlPtr = navUrl.ToCharArray())
{
ushort* ptr3 = (ushort*)navUrlPtr;
@@ -95,13 +90,10 @@ namespace Microsoft.Zune.Util
result = (nint)ptr;
}
}
catch
finally
{
//try-fault
cComPtrNtv_003CIZuneWebHost_003E.Dispose();
throw;
}
cComPtrNtv_003CIZuneWebHost_003E.Dispose();
return result;
}
ZuneDBApi/MicrosoftZuneLibrary/Device.cs
+1 -6
View File
@@ -3529,9 +3529,8 @@ namespace MicrosoftZuneLibrary
*pfFirmwareUpdateInProgress = false;
*pfFirmwareRestoreInProgress = false;
int num = 0;
try
lock (m_Lock)
{
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 && *(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));
@@ -3577,10 +3576,6 @@ namespace MicrosoftZuneLibrary
int num7 = 0;
return num;
}
finally
{
Monitor.Exit(m_Lock);
}
}
private unsafe int CreateDeviceAssetSet(IDeviceAssetProvider* pDeviceAssetProvider)
ZuneDBApi/MicrosoftZuneLibrary/FirmwareRestorer.cs
+13 -54
View File
@@ -28,8 +28,7 @@ namespace MicrosoftZuneLibrary
{
Module._ZuneShipAssert(1004u, 2313u);
}
Monitor.Enter(m_FirmwareLock);
try
lock (m_FirmwareLock)
{
if (m_fFirmwareProcessSupported && EnsureNativeObject() >= 0)
{
@@ -37,10 +36,6 @@ namespace MicrosoftZuneLibrary
((delegate* unmanaged[Cdecl, Cdecl]<IntPtr, int*, int>)(*(ulong*)(*(long*)p + 32)))((nint)p, &num);
}
}
finally
{
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 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 5u)
{
@@ -236,15 +231,10 @@ namespace MicrosoftZuneLibrary
{
Module.WPP_SF_(*(ulong*)((ulong)(nint)Module.WPP_GLOBAL_Control + 48uL), 87, (_GUID*)Unsafe.AsPointer(ref Module._003FA0x15529884_002EWPP_FirmwareUpdateAPI_cpp_Traceguids));
}
Monitor.Enter(m_FirmwareLock);
try
lock (m_FirmwareLock)
{
m_spFirmwareRestorer.op_Assign(null);
}
finally
{
Monitor.Exit(m_FirmwareLock);
}
}
private unsafe int EnsureNativeObject()
@@ -262,8 +252,7 @@ namespace MicrosoftZuneLibrary
{
Module._ZuneShipAssert(1004u, 2582u);
}
Monitor.Enter(m_FirmwareLock);
try
lock (m_FirmwareLock)
{
if (!m_fFirmwareProcessSupported)
{
@@ -289,29 +278,19 @@ namespace MicrosoftZuneLibrary
m_spFirmwareRestorer.op_Assign((IFirmwareRestorer*)(*(ulong*)(cComPtrNtv_003CIFirmwareRestorer_003E.p)));
}
}
catch
finally
{
//try-fault
cComPtrNtv_003CIFirmwareRestorer_003E.Dispose();
throw;
}
cComPtrNtv_003CIFirmwareRestorer_003E.Dispose();
}
}
catch
{
//try-fault
cComPtrNtv_003CIFirmwareUpdater_003E.Dispose();
throw;
}
cComPtrNtv_003CIFirmwareUpdater_003E.Dispose();
return result;
}
return result;
}
finally
{
Monitor.Exit(m_FirmwareLock);
cComPtrNtv_003CIFirmwareUpdater_003E.Dispose();
}
return result;
}
return result;
}
}
@@ -343,8 +322,7 @@ namespace MicrosoftZuneLibrary
{
Module._ZuneShipAssert(1004u, 2514u);
}
Monitor.Enter(m_FirmwareLock);
try
lock (m_FirmwareLock)
{
if (num >= 0)
{
@@ -362,10 +340,6 @@ namespace MicrosoftZuneLibrary
}
}
}
finally
{
Monitor.Exit(m_FirmwareLock);
}
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 && *(byte*)((ulong)(nint)Module.WPP_GLOBAL_Control + 57uL) >= 2u)
@@ -413,8 +387,7 @@ namespace MicrosoftZuneLibrary
{
Module._ZuneShipAssert(1004u, 2424u);
}
Monitor.Enter(m_FirmwareLock);
try
lock (m_FirmwareLock)
{
if (num >= 0)
{
@@ -428,10 +401,6 @@ namespace MicrosoftZuneLibrary
}
}
}
finally
{
Monitor.Exit(m_FirmwareLock);
}
startFirmwareRestoreArgs.HrStatus = num;
if (num < 0)
{
@@ -462,8 +431,7 @@ namespace MicrosoftZuneLibrary
{
Module._ZuneShipAssert(1004u, 2687u);
}
Monitor.Enter(m_FirmwareLock);
try
lock (m_FirmwareLock)
{
num = EnsureNativeObject();
if (num >= 0)
@@ -486,10 +454,6 @@ namespace MicrosoftZuneLibrary
deferredInvokeHandler(args);
}
}
finally
{
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 && *(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);
@@ -511,8 +475,7 @@ namespace MicrosoftZuneLibrary
{
Module._ZuneShipAssert(1004u, 2758u);
}
Monitor.Enter(m_FirmwareLock);
try
lock (m_FirmwareLock)
{
CComPtrMgd<FirmwareUpdateMediator> spFirmwareMediator = m_spFirmwareMediator;
if (spFirmwareMediator.p != null)
@@ -534,10 +497,6 @@ namespace MicrosoftZuneLibrary
DeferredCancel();
}
}
finally
{
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 && *(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));

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