fixed decompiler errors - project compiles

This commit is contained in:
2017-10-06 18:20:35 +02:00
parent 2d8b6914b8
commit 9cefa0e9dd
40 changed files with 420 additions and 411 deletions

View File

@@ -129,13 +129,12 @@ namespace CarotDAV
object pLock = this.pLock;
ObjectFlowControl.CheckForSyncLockOnValueType(pLock);
Monitor.Enter(pLock);
int num;
int num=0;
try
{
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator;
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator = this.pTaskList.GetEnumerator();
try
{
enumerator = this.pTaskList.GetEnumerator();
while (enumerator.MoveNext())
{
AsyncCopy.DavCopyTask current = enumerator.Current;
@@ -163,13 +162,12 @@ namespace CarotDAV
object pLock = this.pLock;
ObjectFlowControl.CheckForSyncLockOnValueType(pLock);
Monitor.Enter(pLock);
int num;
int num=0;
try
{
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator;
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator = this.pTaskList.GetEnumerator();
try
{
enumerator = this.pTaskList.GetEnumerator();
while (enumerator.MoveNext())
{
AsyncCopy.DavCopyTask current = enumerator.Current;
@@ -468,7 +466,7 @@ namespace CarotDAV
{
try
{
EventHandler<ResourceChangedEventArgs> resourceChangedEvent = this.RemoteResourceChangedEvent;
EventHandler<ResourceChangedEventArgs> resourceChangedEvent = this.RemoteResourceChanged;
if (resourceChangedEvent == null)
return;
resourceChangedEvent((object) null, e);
@@ -486,7 +484,7 @@ namespace CarotDAV
{
this.pWorkerState = 0;
this.pFS.ResetConnection();
AsyncCompletedEventHandler copyCompletedEvent = this.CopyCompletedEvent;
AsyncCompletedEventHandler copyCompletedEvent = this.CopyCompleted;
if (copyCompletedEvent == null)
return;
copyCompletedEvent((object) null, e);
@@ -547,10 +545,9 @@ namespace CarotDAV
Monitor.Enter(pLock);
try
{
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator;
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator = this.pTaskList.GetEnumerator();
try
{
enumerator = this.pTaskList.GetEnumerator();
while (enumerator.MoveNext())
{
AsyncCopy.DavCopyTask current = enumerator.Current;
@@ -674,10 +671,9 @@ label_45:
Monitor.Enter(pLock);
try
{
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator1;
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator1 = this.pTaskList.GetEnumerator();
try
{
enumerator1 = this.pTaskList.GetEnumerator();
while (enumerator1.MoveNext())
{
AsyncCopy.DavCopyTask current = enumerator1.Current;
@@ -689,10 +685,9 @@ label_45:
{
enumerator1.Dispose();
}
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator2;
LinkedList<AsyncCopy.DavCopyTask>.Enumerator enumerator2 = this.pTaskList.GetEnumerator();
try
{
enumerator2 = this.pTaskList.GetEnumerator();
while (enumerator2.MoveNext())
{
AsyncCopy.DavCopyTask davCopyTask1 = enumerator2.Current;
@@ -772,7 +767,7 @@ label_11:
Exception ex2 = ex1;
this.pFS.ResetConnection();
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during downloading property.", task.GetDownloadFileName(), ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)
@@ -880,7 +875,7 @@ label_11:
else
{
AsyncCopy.CopyConflictedEventArgs e = new AsyncCopy.CopyConflictedEventArgs(new SimpleResourceInfo(task.GetDownloadFileName(), task.Size, task.LastModifiedTime, true), localFileInfo, type, (this.pFS.Ability & FsAbility.PartialRead) != FsAbility.None, FsAbility.All, retryminutes);
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurredEvent;
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurred;
if (conflictionOccurredEvent != null)
conflictionOccurredEvent((object) this, e);
conflictAction = e.Result.Action;
@@ -939,7 +934,7 @@ label_11:
ProjectData.SetProjectError(ex1);
Exception ex2 = ex1;
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during confirming folder property.", str, ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)
@@ -1022,7 +1017,7 @@ label_11:
else
{
AsyncCopy.CopyConflictedEventArgs e = new AsyncCopy.CopyConflictedEventArgs(new SimpleResourceInfo(task.GetDownloadFileName(), task.Size, task.LastModifiedTime, false), localFileInfo, type, (this.pFS.Ability & FsAbility.PartialRead) != FsAbility.None, FsAbility.All, retryminutes);
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurredEvent;
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurred;
if (conflictionOccurredEvent != null)
conflictionOccurredEvent((object) this, e);
conflictAction = e.Result.Action;
@@ -1152,7 +1147,7 @@ label_11:
return;
}
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during downloading file.", task.RemoteId.Uri, ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)
@@ -1216,7 +1211,7 @@ label_62:
ProjectData.SetProjectError(ex1);
Exception ex2 = ex1;
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during updating folder property.", task.LocalPath, ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)
@@ -1316,7 +1311,7 @@ label_62:
ProjectData.SetProjectError(ex1);
Exception ex2 = ex1;
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during reading file property.", task.LocalPath, ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)
@@ -1401,7 +1396,7 @@ label_62:
else
{
AsyncCopy.CopyConflictedEventArgs e = new AsyncCopy.CopyConflictedEventArgs(new SimpleResourceInfo(task.LocalPath, task.Size, task.LastModifiedTime, true), new SimpleResourceInfo(ri), type, (this.pFS.Ability & FsAbility.PartialWrite) != FsAbility.None, this.pFS.Ability, retryminutes);
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurredEvent;
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurred;
if (conflictionOccurredEvent != null)
conflictionOccurredEvent((object) this, e);
conflictAction = e.Result.Action;
@@ -1462,7 +1457,7 @@ label_62:
Exception ex2 = ex1;
this.pFS.ResetConnection();
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during confirming collection.", task.GetUploadFileName(name), ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)
@@ -1554,7 +1549,7 @@ label_62:
else
{
AsyncCopy.CopyConflictedEventArgs e = new AsyncCopy.CopyConflictedEventArgs(new SimpleResourceInfo(task.LocalPath, task.Size, task.LastModifiedTime, true), new SimpleResourceInfo(ri), type, (this.pFS.Ability & FsAbility.PartialWrite) != FsAbility.None, this.pFS.Ability, retryminutes);
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurredEvent;
EventHandler<AsyncCopy.CopyConflictedEventArgs> conflictionOccurredEvent = this.ConflictionOccurred;
if (conflictionOccurredEvent != null)
conflictionOccurredEvent((object) this, e);
conflictAction = e.Result.Action;
@@ -1726,7 +1721,7 @@ label_62:
return;
}
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during uploading resource.", task.GetUploadFileName(name), ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)
@@ -1805,7 +1800,7 @@ label_83:
Exception ex2 = ex1;
this.pFS.ResetConnection();
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during updating collection property.", task.GetUploadFileName((string) null), ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
switch (e.Result.Action)

View File

@@ -83,7 +83,7 @@ namespace CarotDAV
label_21:
if (e != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e);
}
@@ -149,7 +149,7 @@ label_11:
label_27:
if (e != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e);
}
@@ -229,7 +229,7 @@ label_9:
int index3 = num5;
while (index3 <= num6)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, changedEventArgsList[index3]);
checked { ++index3; }
@@ -280,7 +280,7 @@ label_9:
int index1 = num3;
while (index1 <= num4)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, changedEventArgsList[index1]);
checked { ++index1; }
@@ -331,7 +331,7 @@ label_9:
int index1 = num3;
while (index1 <= num4)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, changedEventArgsList[index1]);
checked { ++index1; }
@@ -383,7 +383,7 @@ label_9:
int index1 = num3;
while (index1 <= num4)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, changedEventArgsList[index1]);
checked { ++index1; }
@@ -434,7 +434,7 @@ label_9:
label_20:
if (e != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e);
}
@@ -470,7 +470,7 @@ label_20:
label_11:
if (e == null)
return;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent == null)
return;
resourceChangedEvent((object) this, e);
@@ -531,13 +531,13 @@ label_11:
label_25:
if (e1 != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e1);
}
if (e2 != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e2);
}
@@ -588,7 +588,7 @@ label_25:
label_20:
if (e != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e);
}
@@ -633,7 +633,7 @@ label_20:
label_15:
if (e != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e);
}
@@ -678,7 +678,7 @@ label_15:
label_15:
if (e != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e);
}
@@ -743,7 +743,7 @@ label_15:
label_15:
if (e != null)
{
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChangedEvent;
CacheManager.ResourceChangedEventHandler resourceChangedEvent = this.ResourceChanged;
if (resourceChangedEvent != null)
resourceChangedEvent((object) this, e);
}

View File

@@ -54,20 +54,8 @@
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System" />
<Reference Include="Rei.Fs">
<HintPath>lib\Rei.Fs.dll</HintPath>
</Reference>
<Reference Include="Rei.Com">
<HintPath>lib\Rei.Com.dll</HintPath>
</Reference>
<Reference Include="Rei.Net.HttpServer">
<HintPath>lib\Rei.Net.HttpServer.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<Reference Include="Rei.Fs.Webdav">
<HintPath>lib\Rei.Fs.Webdav.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
</ItemGroup>
<ItemGroup>
@@ -188,5 +176,23 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Rei.Com\Rei.Com.csproj">
<Project>{0d383f20-fccc-4f1d-bb46-5a5b5b7e29fe}</Project>
<Name>Rei.Com</Name>
</ProjectReference>
<ProjectReference Include="..\Rei.Fs.Webdav\Rei.Fs.Webdav.csproj">
<Project>{d0dc76c1-5aa0-466f-84d3-d6c4deb083de}</Project>
<Name>Rei.Fs.Webdav</Name>
</ProjectReference>
<ProjectReference Include="..\Rei.Fs\Rei.Fs.csproj">
<Project>{bd378147-118c-4141-a046-bfd575ef1b05}</Project>
<Name>Rei.Fs</Name>
</ProjectReference>
<ProjectReference Include="..\Rei.Net.HttpServer\Rei.Net.HttpServer.csproj">
<Project>{5ff0f1e1-621a-478e-ba41-831a85c694ee}</Project>
<Name>Rei.Net.HttpServer</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -210,7 +210,7 @@ namespace CarotDAV
{
List<FORMATETC> formatetcList = new List<FORMATETC>();
formatetcList.AddRange((IEnumerable<FORMATETC>) base.SupportedFormats());
FORMATETC formatetc;
FORMATETC formatetc=new FORMATETC();
formatetc.dwAspect = DVASPECT.DVASPECT_CONTENT;
formatetc.lindex = -1;
formatetc.tymed = TYMED.TYMED_HGLOBAL;
@@ -496,10 +496,9 @@ namespace CarotDAV
}
Interlocked.Decrement(ref this.restfolders);
}
Dictionary<ResourceInfo, string>.Enumerator enumerator;
Dictionary<ResourceInfo, string>.Enumerator enumerator = dictionary1.GetEnumerator();
try
{
enumerator = dictionary1.GetEnumerator();
while (enumerator.MoveNext())
{
KeyValuePair<ResourceInfo, string> current = enumerator.Current;
@@ -798,7 +797,7 @@ label_14:
private void pFS_LogMessage(object sender, LogMessageEventArgs e)
{
CarotDAVDataObject.LogMessageEventHandler logMessageEvent = this.LogMessageEvent;
CarotDAVDataObject.LogMessageEventHandler logMessageEvent = this.LogMessage;
if (logMessageEvent == null)
return;
logMessageEvent(RuntimeHelpers.GetObjectValue(sender), e);
@@ -808,7 +807,7 @@ label_14:
{
this.PerformDeleteOnPaste();
this.State = CarotDAVDataObject.CarotDAVDataObjectState.Finished;
CarotDAVDataObject.ReleaseEventHandler releaseEvent = this.ReleaseEvent;
CarotDAVDataObject.ReleaseEventHandler releaseEvent = this.Release;
if (releaseEvent == null)
return;
releaseEvent((object) this, EventArgs.Empty);

View File

@@ -374,7 +374,7 @@ label_16:
{
ProjectData.SetProjectError((Exception) ex);
RemoteCertificateErrorException certificateErrorException = ex;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent != null)
logMessageEvent((object) this, new LogMessageEventArgs(certificateErrorException.ToString()));
LogWriter.WriteException((Exception) certificateErrorException);
@@ -397,7 +397,7 @@ label_16:
{
ProjectData.SetProjectError((Exception) ex1);
UnauthorizedException unauthorizedException = ex1;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent != null)
logMessageEvent((object) this, new LogMessageEventArgs(unauthorizedException.ToString()));
LogWriter.WriteException((Exception) unauthorizedException);
@@ -453,7 +453,7 @@ label_16:
{
ProjectData.SetProjectError(ex1);
Exception ex2 = ex1;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent != null)
logMessageEvent((object) this, new LogMessageEventArgs(ex2.ToString()));
LogWriter.WriteException(ex2);
@@ -562,7 +562,7 @@ label_55:
{
ProjectData.SetProjectError((Exception) ex);
RemoteCertificateErrorException certificateErrorException = ex;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent != null)
logMessageEvent((object) this, new LogMessageEventArgs(certificateErrorException.ToString()));
LogWriter.WriteException((Exception) certificateErrorException);
@@ -585,7 +585,7 @@ label_55:
{
ProjectData.SetProjectError((Exception) ex1);
UnauthorizedException unauthorizedException = ex1;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent != null)
logMessageEvent((object) this, new LogMessageEventArgs(unauthorizedException.ToString()));
LogWriter.WriteException((Exception) unauthorizedException);
@@ -639,7 +639,7 @@ label_55:
{
ProjectData.SetProjectError(ex1);
Exception ex2 = ex1;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent != null)
logMessageEvent((object) this, new LogMessageEventArgs(ex2.ToString()));
LogWriter.WriteException(ex2);
@@ -850,9 +850,9 @@ label_111:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
else if (Operators.CompareString(childNode.LocalName, "remove", false) == 0)
@@ -868,9 +868,9 @@ label_111:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
if ((client.Ability & FsAbility.LastModifiedTime) == FsAbility.None)
result2 = DateTime.MinValue;
@@ -1568,7 +1568,7 @@ label_49:
private void OnLogMessage(string str)
{
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent == null)
return;
logMessageEvent((object) this, new LogMessageEventArgs(str));
@@ -1607,7 +1607,7 @@ label_49:
private void Client_OnMessage(object sender, LogMessageEventArgs e)
{
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent == null)
return;
logMessageEvent(RuntimeHelpers.GetObjectValue(sender), e);

View File

@@ -360,7 +360,7 @@ namespace CarotDAV
}
}
private virtual Button RetryButton
internal virtual Button RetryButton
{
get
{

View File

@@ -4527,7 +4527,7 @@ namespace CarotDAV
}
}
private virtual BackgroundWorker pFaviconDownloadWorker
internal virtual BackgroundWorker pFaviconDownloadWorker
{
get
{
@@ -4550,7 +4550,7 @@ namespace CarotDAV
}
}
private virtual BackgroundWorker pVersionChecker
internal virtual BackgroundWorker pVersionChecker
{
get
{
@@ -4573,7 +4573,7 @@ namespace CarotDAV
}
}
private virtual CacheManager pCache
internal virtual CacheManager pCache
{
get
{
@@ -5069,10 +5069,9 @@ namespace CarotDAV
if (!uriList.Contains(uri))
uriList.Add(uri);
byte[] buffer = new byte[4097];
List<Uri>.Enumerator enumerator;
List<Uri>.Enumerator enumerator = uriList.GetEnumerator();
try
{
enumerator = uriList.GetEnumerator();
while (enumerator.MoveNext())
{
Uri current = enumerator.Current;
@@ -5088,7 +5087,7 @@ namespace CarotDAV
if (count > 0)
{
memoryStream.Write(buffer, 0, count);
int num;
int num=0;
checked { num += count; }
if (num >= this.pSetting.MaxFaviconSize)
throw new Exception("Favicon too large");
@@ -5493,9 +5492,9 @@ label_13:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
case WebDAVClientSetting.GroupType.Type:
if (this.IsConnected)
@@ -5512,16 +5511,15 @@ label_13:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
stringList.Sort();
Dictionary<string, ListViewGroup> dictionary2 = new Dictionary<string, ListViewGroup>();
List<string>.Enumerator enumerator1;
List<string>.Enumerator enumerator1 = stringList.GetEnumerator();
try
{
enumerator1 = stringList.GetEnumerator();
while (enumerator1.MoveNext())
{
string current = enumerator1.Current;
@@ -5542,9 +5540,9 @@ label_13:
}
finally
{
IEnumerator enumerator2;
if (enumerator2 is IDisposable)
(enumerator2 as IDisposable).Dispose();
//IEnumerator enumerator2;
//if (enumerator2 is IDisposable)
// (enumerator2 as IDisposable).Dispose();
}
}
else
@@ -5567,16 +5565,15 @@ label_13:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
// IEnumerator enumerator;
// if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
stringList.Sort();
Dictionary<string, ListViewGroup> dictionary3 = new Dictionary<string, ListViewGroup>();
List<string>.Enumerator enumerator1;
List<string>.Enumerator enumerator1 = stringList.GetEnumerator();
try
{
enumerator1 = stringList.GetEnumerator();
while (enumerator1.MoveNext())
{
string current = enumerator1.Current;
@@ -5597,9 +5594,9 @@ label_13:
}
finally
{
IEnumerator enumerator2;
if (enumerator2 is IDisposable)
(enumerator2 as IDisposable).Dispose();
//IEnumerator enumerator2;
//if (enumerator2 is IDisposable)
// (enumerator2 as IDisposable).Dispose();
}
}
case WebDAVClientSetting.GroupType.Size:
@@ -5631,16 +5628,15 @@ label_13:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
Dictionary<ListViewGroup, int> dictionary4 = new Dictionary<ListViewGroup, int>();
List<ListViewGroup>.Enumerator enumerator3;
List<ListViewGroup>.Enumerator enumerator3 = listViewGroupList.GetEnumerator();
try
{
enumerator3 = listViewGroupList.GetEnumerator();
while (enumerator3.MoveNext())
{
ListViewGroup current = enumerator3.Current;
@@ -5665,14 +5661,13 @@ label_13:
}
finally
{
IEnumerator enumerator1;
if (enumerator1 is IDisposable)
(enumerator1 as IDisposable).Dispose();
//IEnumerator enumerator1;
//if (enumerator1 is IDisposable)
// (enumerator1 as IDisposable).Dispose();
}
List<ListViewGroup>.Enumerator enumerator4;
List<ListViewGroup>.Enumerator enumerator4 = listViewGroupList.GetEnumerator();
try
{
enumerator4 = listViewGroupList.GetEnumerator();
while (enumerator4.MoveNext())
{
ListViewGroup current = enumerator4.Current;
@@ -5709,9 +5704,9 @@ label_13:
}
finally
{
IEnumerator enumerator1;
if (enumerator1 is IDisposable)
(enumerator1 as IDisposable).Dispose();
//IEnumerator enumerator1;
//if (enumerator1 is IDisposable)
// (enumerator1 as IDisposable).Dispose();
}
}
}
@@ -6489,19 +6484,9 @@ label_1:
goto label_32;
}
}
catch (UnauthorizedException ex1) when (
{
// ISSUE: unable to correctly present filter
ProjectData.SetProjectError((Exception) ex1);
if (ex1.CanRetry)
{
SuccessfulFiltering;
}
else
throw;
}
)
catch (UnauthorizedException ex1)
{
if (!ex1.CanRetry) throw;
this.LeaveWaitState();
this.WriteLineLog(ex1.ToString());
LogWriter.WriteException((Exception) ex1);
@@ -6763,19 +6748,9 @@ label_14:
this.LeaveWaitState();
break;
}
catch (DestinationAlreadyExistsException ex1) when (
{
// ISSUE: unable to correctly present filter
ProjectData.SetProjectError((Exception) ex1);
if (!overwrite)
{
SuccessfulFiltering;
}
else
throw;
}
)
catch (DestinationAlreadyExistsException ex1)
{
if (overwrite) throw;
this.LeaveWaitState();
this.WriteLineLog(ex1.ToString());
LogWriter.WriteException((Exception) ex1);
@@ -6921,20 +6896,10 @@ label_38:
this.LeaveWaitState();
break;
}
catch (DestinationAlreadyExistsException ex1) when (
{
// ISSUE: unable to correctly present filter
ProjectData.SetProjectError((Exception) ex1);
if (!overwrite)
{
SuccessfulFiltering;
}
else
throw;
}
)
{
this.LeaveWaitState();
catch (DestinationAlreadyExistsException ex1)
{
if (overwrite) throw;
this.LeaveWaitState();
this.WriteLineLog(ex1.ToString());
LogWriter.WriteException((Exception) ex1);
if (newname != null)
@@ -7663,7 +7628,7 @@ label_6:
private DragDropEffects PerformDataTransfer(IDataObject dobj, DragDropEffects effect, ResourceId targetid, bool samefolder, bool IsPaste)
{
DragDropEffects dragDropEffects;
DragDropEffects dragDropEffects = DragDropEffects.None;
try
{
if ((object) targetid == null)
@@ -8235,10 +8200,9 @@ label_58:
private void UpDownForm_FormClosed(object sender, FormClosedEventArgs e)
{
UpDownForm upDownForm = (UpDownForm) sender;
Dictionary<ConnectionSettingBase, UpDownForm>.KeyCollection.Enumerator enumerator1;
Dictionary<ConnectionSettingBase, UpDownForm>.KeyCollection.Enumerator enumerator1 = this.pDownForms.Keys.GetEnumerator();
try
{
enumerator1 = this.pDownForms.Keys.GetEnumerator();
while (enumerator1.MoveNext())
{
ConnectionSettingBase current = enumerator1.Current;
@@ -8253,10 +8217,9 @@ label_58:
{
enumerator1.Dispose();
}
Dictionary<ConnectionSettingBase, UpDownForm>.KeyCollection.Enumerator enumerator2;
Dictionary<ConnectionSettingBase, UpDownForm>.KeyCollection.Enumerator enumerator2 = this.pUpForms.Keys.GetEnumerator();
try
{
enumerator2 = this.pUpForms.Keys.GetEnumerator();
while (enumerator2.MoveNext())
{
ConnectionSettingBase current = enumerator2.Current;

View File

@@ -17,6 +17,7 @@ using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Microsoft.VisualBasic.MyServices.Internal;
namespace CarotDAV.My
{
@@ -352,19 +353,9 @@ namespace CarotDAV.My
{
return Activator.CreateInstance<T>();
}
catch (TargetInvocationException ex) when (
{
// ISSUE: unable to correctly present filter
ProjectData.SetProjectError((Exception) ex);
if (ex.InnerException != null)
{
SuccessfulFiltering;
}
else
throw;
}
)
{
catch (TargetInvocationException ex)
{
if (ex.InnerException == null) throw;
throw new InvalidOperationException(Utils.GetResourceString("WinForms_SeeInnerException", new string[1]
{
ex.InnerException.Message
@@ -470,22 +461,30 @@ namespace CarotDAV.My
[EditorBrowsable(EditorBrowsableState.Never)]
[ComVisible(false)]
internal sealed class ThreadSafeObjectProvider<T> where T : new()
{
internal T GetInstance
{
[DebuggerHidden] get
{
if ((object) MyProject.ThreadSafeObjectProvider<T>.m_ThreadStaticValue == null)
MyProject.ThreadSafeObjectProvider<T>.m_ThreadStaticValue = Activator.CreateInstance<T>();
return MyProject.ThreadSafeObjectProvider<T>.m_ThreadStaticValue;
}
}
{
private readonly ContextValue<T> m_Context;
[EditorBrowsable(EditorBrowsableState.Never)]
[DebuggerHidden]
public ThreadSafeObjectProvider()
{
}
}
internal T GetInstance
{
[DebuggerHidden]
get
{
T instance = this.m_Context.Value;
if ((object)instance == null)
{
instance = Activator.CreateInstance<T>();
this.m_Context.Value = instance;
}
return instance;
}
}
[EditorBrowsable(EditorBrowsableState.Never)]
[DebuggerHidden]
public ThreadSafeObjectProvider()
{
this.m_Context = new ContextValue<T>();
}
}
}
}

View File

@@ -1,5 +1,5 @@
// Decompiled with JetBrains decompiler
// Type: CarotDAV.My.Resources.Resources
// Type: global::CarotDAV.My.Resources.Resources
// Assembly: CarotDAV, Version=1.13.2.18337, Culture=neutral, PublicKeyToken=null
// MVID: C31F2651-A4A8-4D09-916A-8C6106F5E7C8
// Assembly location: F:\Eigene Dateien\Dropbox\portable Collection\Progs\CarotDAV\CarotDAV.exe
@@ -31,9 +31,9 @@ namespace CarotDAV.My.Resources
{
get
{
if (object.ReferenceEquals((object) CarotDAV.My.Resources.Resources.resourceMan, (object) null))
CarotDAV.My.Resources.Resources.resourceMan = new ResourceManager("CarotDAV.Resources", typeof (CarotDAV.My.Resources.Resources).Assembly);
return CarotDAV.My.Resources.Resources.resourceMan;
if (object.ReferenceEquals((object) global::CarotDAV.My.Resources.Resources.resourceMan, (object) null))
global::CarotDAV.My.Resources.Resources.resourceMan = new ResourceManager("CarotDAV.Resources", typeof (global::CarotDAV.My.Resources.Resources).Assembly);
return global::CarotDAV.My.Resources.Resources.resourceMan;
}
}
@@ -42,11 +42,11 @@ namespace CarotDAV.My.Resources
{
get
{
return CarotDAV.My.Resources.Resources.resourceCulture;
return global::CarotDAV.My.Resources.Resources.resourceCulture;
}
set
{
CarotDAV.My.Resources.Resources.resourceCulture = value;
global::CarotDAV.My.Resources.Resources.resourceCulture = value;
}
}
@@ -54,7 +54,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (_Error), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (_Error), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -62,7 +62,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (CarotDAV), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (CarotDAV), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -70,7 +70,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (CarotDrive), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (CarotDrive), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -78,7 +78,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Collection), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Collection), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -86,7 +86,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Connect), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Connect), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -94,7 +94,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (ConnectNew), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (ConnectNew), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -102,7 +102,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Copy), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Copy), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -110,7 +110,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Copy2), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Copy2), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -118,7 +118,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Cut), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Cut), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -126,7 +126,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Delete), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Delete), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -134,7 +134,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Document), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Document), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -142,7 +142,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Document_Split), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Document_Split), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -150,7 +150,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Download), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Download), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -158,7 +158,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Export), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Export), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -166,7 +166,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (FolderUpload), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (FolderUpload), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -174,7 +174,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Go), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Go), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -182,7 +182,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (GoToParentFolder), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (GoToParentFolder), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -190,7 +190,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Help), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Help), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -198,7 +198,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Home), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Home), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -206,7 +206,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Import), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Import), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -214,7 +214,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Lock), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Lock), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -222,7 +222,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (logo_w), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (logo_w), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -230,7 +230,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Move), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Move), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -238,7 +238,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (MoveDown), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (MoveDown), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -246,7 +246,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (MoveUp), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (MoveUp), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -254,7 +254,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (NavBack), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (NavBack), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -262,7 +262,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (NavForward), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (NavForward), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -270,7 +270,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (NewFolder), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (NewFolder), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -278,7 +278,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (OptionsHS), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (OptionsHS), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -286,7 +286,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Paste), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Paste), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -294,7 +294,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Properties), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Properties), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -302,7 +302,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Refresh), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Refresh), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -310,7 +310,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (RenameFolderHS), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (RenameFolderHS), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -318,7 +318,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (security), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (security), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -326,7 +326,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Security_Overlay), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Security_Overlay), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -334,7 +334,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Upload), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Upload), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -342,7 +342,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (View), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (View), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -350,7 +350,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Bitmap) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Warning), CarotDAV.My.Resources.Resources.resourceCulture));
return (Bitmap) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Warning), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
@@ -358,7 +358,7 @@ namespace CarotDAV.My.Resources
{
get
{
return (Icon) RuntimeHelpers.GetObjectValue(CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Warning_Overlay), CarotDAV.My.Resources.Resources.resourceCulture));
return (Icon) RuntimeHelpers.GetObjectValue(global::CarotDAV.My.Resources.Resources.ResourceManager.GetObject(nameof (Warning_Overlay), global::CarotDAV.My.Resources.Resources.resourceCulture));
}
}
}

View File

@@ -70,21 +70,23 @@ namespace CarotDAV
public static void MountDrive(char letter, string unc, string name, string iconpath, int index)
{
int num = NetDriveManager.WNetAddConnection2(ref new NetDriveManager.NETRESOURCE()
{
dwType = NetDriveManager.ResourceType.Disk,
lpLocalName = Conversions.ToString(letter) + ":",
lpRemoteName = unc,
lpProvider = (string) null
}, "", "", 0);
var v0 = new NetDriveManager.NETRESOURCE()
{
dwType = NetDriveManager.ResourceType.Disk,
lpLocalName = Conversions.ToString(letter) + ":",
lpRemoteName = unc,
lpProvider = (string) null
};
int num = NetDriveManager.WNetAddConnection2(ref v0, "", "", 0);
if (num != 0)
throw new Exception(num.ToString());
Registry.SetValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MountPoints2\\" + unc.Replace("\\", "#"), "_LabelFromReg", (object) name);
NetDriveManager.SHFILEINFO psfi = new NetDriveManager.SHFILEINFO();
IntPtr fileInfo = NetDriveManager.SHGetFileInfo(Conversions.ToString(letter) + ":", 0U, ref psfi, Marshal.SizeOf((object) psfi), 4096U);
string str = "";
int iIcon1;
int iIcon2;
int iIcon1=0;
int iIcon2=0;
if (fileInfo != IntPtr.Zero)
{
str = psfi.szDisplayName;
@@ -104,8 +106,8 @@ namespace CarotDAV
public static void UnmountDrive(char letter)
{
string str = "";
int iIcon1;
int iIcon2;
int iIcon1=0;
int iIcon2=0;
try
{
NetDriveManager.SHFILEINFO psfi = new NetDriveManager.SHFILEINFO();

View File

@@ -14,6 +14,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
using System.Threading;
using STATSTG = System.Runtime.InteropServices.ComTypes.STATSTG;
namespace CarotDAV
{
@@ -142,7 +143,7 @@ namespace CarotDAV
{
OleStream oleStream = new OleStream(this.pResourceInfo, this.pName, this.pClient, this.pErrorManager);
oleStream.pLock = RuntimeHelpers.GetObjectValue(this.pLock);
oleStream.ExceptionOccurredEvent = (EventHandler<ExceptionOccurredEventArgs>) this.ExceptionOccurredEvent.Clone();
oleStream.ExceptionOccurred = (EventHandler<ExceptionOccurredEventArgs>) this.ExceptionOccurred.Clone();
this.pClonelist.Add(oleStream);
ppstm = (IStream) oleStream;
}
@@ -225,7 +226,7 @@ label_9:
else
{
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during downloading file.", this.pResourceInfo.Id.ToString(), ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
this.pErrorManager.RegisterAction(e.Result);
@@ -256,7 +257,7 @@ label_9:
}
while (num1 < cb)
{
int num2;
int num2=0;
try
{
num2 = this.pStream.Read(pv, num1, checked (cb - num1));
@@ -286,7 +287,7 @@ label_9:
else
{
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during downloading file.", this.pResourceInfo.Id.ToString(), ErrorPromptType.IgnoreAllIgnoreRetryCancel, ex2, retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
this.pErrorManager.RegisterAction(e.Result);
@@ -333,7 +334,7 @@ label_9:
else
{
ExceptionOccurredEventArgs e = new ExceptionOccurredEventArgs("Error occurred during downloading file.", this.pResourceInfo.Id.ToString(), ErrorPromptType.IgnoreAllIgnoreRetryCancel, (Exception) new IOException("unexpected close of stream"), retryminutes);
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent != null)
exceptionOccurredEvent((object) this, e);
this.pErrorManager.RegisterAction(e.Result);
@@ -414,10 +415,9 @@ label_45:
Interlocked.Decrement(ref OleStream.pOpenCount);
this.pStream = (Stream) null;
}
List<OleStream>.Enumerator enumerator;
List<OleStream>.Enumerator enumerator = this.pClonelist.GetEnumerator();
try
{
enumerator = this.pClonelist.GetEnumerator();
while (enumerator.MoveNext())
{
OleStream current = enumerator.Current;
@@ -453,7 +453,7 @@ label_45:
{
this.Dispose(false);
// ISSUE: explicit finalizer call
base.Finalize();
//base.Finalize();
}
private System.Runtime.InteropServices.ComTypes.FILETIME ToFileTime(DateTime time)
@@ -479,5 +479,60 @@ label_45:
LOCK_EXCLUSIVE = 2,
LOCK_ONLYONCE = 4,
}
public void Read(byte[] pv, int cb, IntPtr pcbRead)
{
throw new NotImplementedException();
}
public void Write(byte[] pv, int cb, IntPtr pcbWritten)
{
throw new NotImplementedException();
}
public void Seek(long dlibMove, int dwOrigin, IntPtr plibNewPosition)
{
throw new NotImplementedException();
}
public void SetSize(long libNewSize)
{
throw new NotImplementedException();
}
public void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten)
{
throw new NotImplementedException();
}
public void Commit(int grfCommitFlags)
{
throw new NotImplementedException();
}
public void Revert()
{
throw new NotImplementedException();
}
public void LockRegion(long libOffset, long cb, int dwLockType)
{
throw new NotImplementedException();
}
public void UnlockRegion(long libOffset, long cb, int dwLockType)
{
throw new NotImplementedException();
}
public void Stat(out STATSTG pstatstg, int grfStatFlag)
{
throw new NotImplementedException();
}
public void Clone(out IStream ppstm)
{
throw new NotImplementedException();
}
}
}

View File

@@ -42,7 +42,7 @@ namespace CarotDAV
public void OnExceptionOccurred(object sender, ExceptionOccurredEventArgs e)
{
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurredEvent;
EventHandler<ExceptionOccurredEventArgs> exceptionOccurredEvent = this.ExceptionOccurred;
if (exceptionOccurredEvent == null)
return;
exceptionOccurredEvent(RuntimeHelpers.GetObjectValue(sender), e);

View File

@@ -970,7 +970,7 @@ namespace CarotDAV
{
if (!this.MainForm.Fs_SetResourceInfo(this.pCurrentInfo, this.pOriginalInfo))
return;
EventHandler propertyUpdatedEvent = this.PropertyUpdatedEvent;
EventHandler propertyUpdatedEvent = this.PropertyUpdated;
if (propertyUpdatedEvent != null)
propertyUpdatedEvent((object) this, EventArgs.Empty);
this.DialogResult = DialogResult.OK;
@@ -987,7 +987,7 @@ namespace CarotDAV
{
if (!this.MainForm.Fs_SetResourceInfo(this.pCurrentInfo, this.pOriginalInfo))
return;
EventHandler propertyUpdatedEvent = this.PropertyUpdatedEvent;
EventHandler propertyUpdatedEvent = this.PropertyUpdated;
if (propertyUpdatedEvent != null)
propertyUpdatedEvent((object) this, EventArgs.Empty);
this.ReloadProperty();
@@ -1048,10 +1048,9 @@ namespace CarotDAV
{
this.PropListView.BeginUpdate();
this.PropListView.Items.Clear();
List<ResourceInfo.ResourceProperty>.Enumerator enumerator;
List<ResourceInfo.ResourceProperty>.Enumerator enumerator = this.pCurrentInfo.Properties.GetEnumerator();
try
{
enumerator = this.pCurrentInfo.Properties.GetEnumerator();
while (enumerator.MoveNext())
{
ResourceInfo.ResourceProperty current = enumerator.Current;

View File

@@ -115,11 +115,12 @@ namespace CarotDAV
instance.SetIconLocation(iconpath, iconindex);
if (tooltip != null)
instance.SetDescription(tooltip);
propertyStore.SetValue(ref TaskbarManager.PKEY_Title, ref new TaskbarManager.PropVariant()
{
_ptr = Marshal.StringToCoTaskMemUni(title),
_valueType = VarEnum.VT_LPWSTR
});
var v0 = new TaskbarManager.PropVariant()
{
_ptr = Marshal.StringToCoTaskMemUni(title),
_valueType = VarEnum.VT_LPWSTR
};
propertyStore.SetValue(ref TaskbarManager.PKEY_Title, ref v0);
propertyStore.Commit();
return instance;
}

View File

@@ -1497,7 +1497,7 @@ namespace CarotDAV
this.Text = this.Title;
this.AsyncCopy1.Clear();
TaskbarManager.SetProgressState((Control) this, TaskbarManager.TaskbarProgressBarStatus.NoProgress);
EventHandler transferFinishedEvent = this.TransferFinishedEvent;
EventHandler transferFinishedEvent = this.TransferFinished;
if (transferFinishedEvent != null)
transferFinishedEvent((object) this, EventArgs.Empty);
if (!this.AsyncCopy1.StopAfterFile)
@@ -1512,7 +1512,7 @@ namespace CarotDAV
this.Text = this.Title;
this.AsyncCopy1.Clear();
TaskbarManager.SetProgressState((Control) this, TaskbarManager.TaskbarProgressBarStatus.NoProgress);
EventHandler transferFinishedEvent = this.TransferFinishedEvent;
EventHandler transferFinishedEvent = this.TransferFinished;
if (transferFinishedEvent == null)
return;
transferFinishedEvent((object) this, EventArgs.Empty);
@@ -1529,7 +1529,7 @@ namespace CarotDAV
this.Text = "100.0% " + this.Title;
this.AsyncCopy1.Clear();
TaskbarManager.SetProgressState((Control) this, TaskbarManager.TaskbarProgressBarStatus.NoProgress);
EventHandler transferFinishedEvent = this.TransferFinishedEvent;
EventHandler transferFinishedEvent = this.TransferFinished;
if (transferFinishedEvent != null)
transferFinishedEvent((object) this, EventArgs.Empty);
this.Close();
@@ -1697,7 +1697,8 @@ namespace CarotDAV
this.RadioButtonFileSkip.Checked = true;
break;
}
case ConflictType.FileToFolder:
goto case ConflictType.FileToFolder;
case ConflictType.FileToFolder:
switch (e.Result.Action)
{
case ConflictAction.DeleteTarget:
@@ -1710,6 +1711,7 @@ namespace CarotDAV
this.RadioButtonOtherSkip.Checked = true;
break;
}
goto case ConflictType.FileToFile;
case ConflictType.FileToFile:
switch (e.Result.Action)
{
@@ -1732,6 +1734,7 @@ namespace CarotDAV
this.RadioButtonFileSkip.Checked = true;
break;
}
break;
}
}
e.Result.ToAll = false;
@@ -1771,7 +1774,7 @@ namespace CarotDAV
private void AsyncCopy1_RemoteResourceChanged(object sender, ResourceChangedEventArgs e)
{
EventHandler<ResourceChangedEventArgs> resourceChangedEvent = this.RemoteResourceChangedEvent;
EventHandler<ResourceChangedEventArgs> resourceChangedEvent = this.RemoteResourceChanged;
if (resourceChangedEvent == null)
return;
resourceChangedEvent((object) this, e);

View File

@@ -135,10 +135,9 @@ namespace CarotDAV
XmlDocument document = new XmlDocument();
using (MemoryStream memoryStream = new MemoryStream(array))
document.Load((Stream) memoryStream);
IEnumerator enumerator1;
IEnumerator enumerator1 = document.GetElementsByTagName("ConnectionSettings").GetEnumerator();
try
{
enumerator1 = document.GetElementsByTagName("ConnectionSettings").GetEnumerator();
if (enumerator1.MoveNext())
{
XmlNode current = (XmlNode) enumerator1.Current;
@@ -167,9 +166,9 @@ namespace CarotDAV
}
finally
{
IEnumerator enumerator2;
if (enumerator2 is IDisposable)
(enumerator2 as IDisposable).Dispose();
//IEnumerator enumerator2;
//if (enumerator2 is IDisposable)
// (enumerator2 as IDisposable).Dispose();
}
try
{
@@ -178,9 +177,9 @@ namespace CarotDAV
}
finally
{
IEnumerator enumerator2;
if (enumerator2 is IDisposable)
(enumerator2 as IDisposable).Dispose();
//IEnumerator enumerator2;
//if (enumerator2 is IDisposable)
// (enumerator2 as IDisposable).Dispose();
}
SymmetricAlgorithm crypto = XmlSettingManager.CreateCrypto(setting.MasterPassword);
int num1 = 0;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.