Mikescher/CarotDav_decompile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed decompiler errors - project compiles

Browse Source
This commit is contained in:
Mike Schwörer 2017-10-06 18:20:35 +02:00
parent 2d8b6914b8
commit 9cefa0e9dd
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
40 changed files with 420 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
CarotDAV/AsyncCopy.cs
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)

28
CarotDAV/CacheManager.cs
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);
}

30
CarotDAV/CarotDAV.csproj
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>

9
CarotDAV/CarotDAVDataObject.cs
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);

28
CarotDAV/DAVServer.cs
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);

2
CarotDAV/ErrorPromptForm.cs
View File

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

121
CarotDAV/MainForm.cs
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,19 +6896,9 @@ label_38:
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);
@ -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;

31
CarotDAV/My/MyProject.cs
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
@ -471,13 +462,20 @@ namespace CarotDAV.My
[ComVisible(false)]
internal sealed class ThreadSafeObjectProvider<T> where T : new()
{
private readonly ContextValue<T> m_Context;
internal T GetInstance
{
[DebuggerHidden] get
[DebuggerHidden]
get
{
if ((object) MyProject.ThreadSafeObjectProvider<T>.m_ThreadStaticValue == null)
MyProject.ThreadSafeObjectProvider<T>.m_ThreadStaticValue = Activator.CreateInstance<T>();
return MyProject.ThreadSafeObjectProvider<T>.m_ThreadStaticValue;
T instance = this.m_Context.Value;
if ((object)instance == null)
{
instance = Activator.CreateInstance<T>();
this.m_Context.Value = instance;
}
return instance;
}
}
@ -485,6 +483,7 @@ namespace CarotDAV.My
[DebuggerHidden]
public ThreadSafeObjectProvider()
{
this.m_Context = new ContextValue<T>();
}
}
}

90
CarotDAV/My/Resources/Resources.cs
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));
}
}
}

14
CarotDAV/NetDriveManager.cs
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()
var v0 = new NetDriveManager.NETRESOURCE()
{
dwType = NetDriveManager.ResourceType.Disk,
lpLocalName = Conversions.ToString(letter) + ":",
lpRemoteName = unc,
lpProvider = (string) null
}, "", "", 0);
};
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();

71
CarotDAV/OleStream.cs
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();
}
}
}

2
CarotDAV/OleStreamCreator.cs
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);

7
CarotDAV/PropertyForm.cs
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;

5
CarotDAV/TaskbarManager.cs
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()
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;
}

11
CarotDAV/UpDownForm.cs
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,6 +1697,7 @@ namespace CarotDAV
this.RadioButtonFileSkip.Checked = true;
break;
}
goto case ConflictType.FileToFolder;
case ConflictType.FileToFolder:
switch (e.Result.Action)
{
@ -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);

15
CarotDAV/XmlSettingManager.cs
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;

BIN
CarotDAV/lib/Rei.Com.dll
View File

Binary file not shown.

BIN
CarotDAV/lib/Rei.Fs.Webdav.dll
View File

Binary file not shown.

BIN
CarotDAV/lib/Rei.Fs.dll
View File

Binary file not shown.

BIN
CarotDAV/lib/Rei.Net.HttpServer.dll
View File

Binary file not shown.

62
Rei.Com/DataObject.cs
View File

@ -118,12 +118,14 @@ namespace Rei.Com
{
this.Dispose(false);
// ISSUE: explicit finalizer call
base.Finalize();
//base.Finalize();
}
[EditorBrowsable(EditorBrowsableState.Never)]
public int DAdvise(ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, ref int connection)
public int DAdvise(ref FORMATETC pFormatetc, ADVF advf, IAdviseSink adviseSink, out int connection)
{
connection = 0;
return -2147221501;
}
@ -134,13 +136,15 @@ namespace Rei.Com
}
[EditorBrowsable(EditorBrowsableState.Never)]
public int EnumDAdvise(ref IEnumSTATDATA enumAdvise)
public int EnumDAdvise(out IEnumSTATDATA enumAdvise)
{
enumAdvise = null;
return -2147221501;
}
[EditorBrowsable(EditorBrowsableState.Never)]
public int GetCanonicalFormatEtc(ref FORMATETC formatIn, ref FORMATETC formatOut)
public int GetCanonicalFormatEtc(ref FORMATETC formatIn, out FORMATETC formatOut)
{
formatOut = formatIn;
return -2147221404;
@ -186,8 +190,10 @@ namespace Rei.Com
[EditorBrowsable(EditorBrowsableState.Never)]
[DebuggerStepThrough]
public virtual void GetData(ref FORMATETC format, ref STGMEDIUM medium)
public virtual void GetData(ref FORMATETC format, out STGMEDIUM medium)
{
medium = new STGMEDIUM();
if ((format.tymed & (TYMED.TYMED_HGLOBAL | TYMED.TYMED_ISTREAM)) == TYMED.TYMED_NULL)
Marshal.ThrowExceptionForHR(-2147483647);
try
@ -312,11 +318,11 @@ namespace Rei.Com
FORMATETC formatetc2 = formatetcList[index2];
// ISSUE: explicit reference operation
// ISSUE: variable of a reference type
FORMATETC& local = @formatetc2;
FORMATETC local = @formatetc2;
formatetc1 = formatetcList[index2];
int num5 = (int) (formatetc1.tymed | formatetcArray[index1].tymed);
// ISSUE: explicit reference operation
(^local).tymed = (TYMED) num5;
(local).tymed = (TYMED) num5;
formatetcList[index2] = formatetc2;
break;
}
@ -360,14 +366,14 @@ namespace Rei.Com
FORMATETC formatetc2 = formatetcList[index2];
// ISSUE: explicit reference operation
// ISSUE: variable of a reference type
FORMATETC& local = @formatetc2;
FORMATETC local = @formatetc2;
int tymed1 = (int) formatetcList[index2].tymed;
objectEntry = this.Data[index3];
format2 = objectEntry.Format;
int tymed2 = (int) format2.tymed;
int num5 = tymed1 | tymed2;
// ISSUE: explicit reference operation
(^local).tymed = (TYMED) num5;
(local).tymed = (TYMED) num5;
formatetcList[index2] = formatetc2;
break;
}
@ -404,7 +410,7 @@ namespace Rei.Com
get
{
bool pfInAsyncOp;
this.InOperation(ref pfInAsyncOp);
this.InOperation(out pfInAsyncOp);
return pfInAsyncOp;
}
}
@ -418,7 +424,7 @@ namespace Rei.Com
}
[EditorBrowsable(EditorBrowsableState.Never)]
public void GetAsyncMode(ref bool pfIsOpAsync)
public void GetAsyncMode(out bool pfIsOpAsync)
{
pfIsOpAsync = this.AsyncSupported;
}
@ -480,7 +486,7 @@ namespace Rei.Com
}
[EditorBrowsable(EditorBrowsableState.Never)]
public void InOperation(ref bool pfInAsyncOp)
public void InOperation(out bool pfInAsyncOp)
{
object pInOperationLock = this.pInOperationLock;
ObjectFlowControl.CheckForSyncLockOnValueType(pInOperationLock);
@ -544,7 +550,7 @@ namespace Rei.Com
public byte[] GetHGlobal(string format)
{
FORMATETC format1;
FORMATETC format1=new FORMATETC();
format1.lindex = -1;
format1.dwAspect = DVASPECT.DVASPECT_CONTENT;
format1.tymed = TYMED.TYMED_HGLOBAL;
@ -592,7 +598,7 @@ namespace Rei.Com
byte[] hglobal = this.GetHGlobal(ShellClipboardFormats.TargetCLSID);
if (hglobal == null)
{
Guid guid;
Guid guid=new Guid();
return guid;
}
return new Guid(hglobal);
@ -603,7 +609,7 @@ namespace Rei.Com
byte[] hglobal = this.GetHGlobal(ShellClipboardFormats.DropDescription);
if (hglobal == null)
{
DropDesctiption dropDesctiption;
DropDesctiption dropDesctiption=new DropDesctiption();
return dropDesctiption;
}
return new DropDesctiption()
@ -624,7 +630,7 @@ namespace Rei.Com
private void SetHGlobal(string format, byte[] buf)
{
FORMATETC f;
FORMATETC f=new FORMATETC();
f.cfFormat = DataObject.MakecfFormat(format);
f.dwAspect = DVASPECT.DVASPECT_CONTENT;
f.lindex = -1;
@ -685,7 +691,7 @@ namespace Rei.Com
public void SetFileDropList(string[] paths)
{
DropFiles dropFiles;
DropFiles dropFiles=new DropFiles();
dropFiles.pFiles = Marshal.SizeOf((object) dropFiles);
dropFiles.pt = new POINTL();
dropFiles.fNC = false;
@ -729,7 +735,7 @@ namespace Rei.Com
{
if (finfos[index1].IStreamCreator != null)
{
FORMATETC f;
FORMATETC f=new FORMATETC();
f.cfFormat = DataObject.MakecfFormat(ShellClipboardFormats.FileContents);
f.dwAspect = DVASPECT.DVASPECT_CONTENT;
f.lindex = index1;
@ -800,7 +806,7 @@ namespace Rei.Com
public void RemoveTexts()
{
FORMATETC format;
FORMATETC format=new FORMATETC();
format.lindex = -1;
format.dwAspect = DVASPECT.DVASPECT_CONTENT;
format.tymed = TYMED.TYMED_HGLOBAL;
@ -810,7 +816,7 @@ namespace Rei.Com
public void RemoveUris()
{
FORMATETC format;
FORMATETC format=new FORMATETC();
format.lindex = -1;
format.dwAspect = DVASPECT.DVASPECT_CONTENT;
format.tymed = TYMED.TYMED_HGLOBAL;
@ -820,7 +826,7 @@ namespace Rei.Com
public void RemoveVirtualFiles()
{
FORMATETC format;
FORMATETC format=new FORMATETC();
format.cfFormat = DataObject.MakecfFormat(ShellClipboardFormats.FileContents);
format.dwAspect = DVASPECT.DVASPECT_CONTENT;
format.tymed = TYMED.TYMED_ISTREAM;
@ -864,7 +870,7 @@ namespace Rei.Com
protected virtual void OnAsyncOperationStart()
{
EventHandler operationStartEvent = this.AsyncOperationStartEvent;
EventHandler operationStartEvent = this.AsyncOperationStart;
if (operationStartEvent == null)
return;
operationStartEvent((object) this, EventArgs.Empty);
@ -872,7 +878,7 @@ namespace Rei.Com
protected virtual void OnAsyncOperationFinished(DataObject.AsyncOperationFinishedEventArgs e)
{
EventHandler<DataObject.AsyncOperationFinishedEventArgs> operationFinishedEvent = this.AsyncOperationFinishedEvent;
EventHandler<DataObject.AsyncOperationFinishedEventArgs> operationFinishedEvent = this.AsyncOperationFinished;
if (operationFinishedEvent == null)
return;
operationFinishedEvent((object) this, e);
@ -880,7 +886,7 @@ namespace Rei.Com
protected virtual void OnDataRequested(DataObject.DataEventArgs e)
{
EventHandler<DataObject.DataEventArgs> dataRequestedEvent = this.DataRequestedEvent;
EventHandler<DataObject.DataEventArgs> dataRequestedEvent = this.DataRequested;
if (dataRequestedEvent == null)
return;
dataRequestedEvent((object) this, e);
@ -888,7 +894,7 @@ namespace Rei.Com
protected virtual void OnDataStored(DataObject.DataEventArgs e)
{
EventHandler<DataObject.DataEventArgs> dataStoredEvent = this.DataStoredEvent;
EventHandler<DataObject.DataEventArgs> dataStoredEvent = this.DataStored;
if (dataStoredEvent == null)
return;
dataStoredEvent((object) this, e);
@ -896,7 +902,7 @@ namespace Rei.Com
protected virtual void OnDataQueried(DataObject.DataEventArgs e)
{
EventHandler<DataObject.DataEventArgs> dataQueriedEvent = this.DataQueriedEvent;
EventHandler<DataObject.DataEventArgs> dataQueriedEvent = this.DataQueried;
if (dataQueriedEvent == null)
return;
dataQueriedEvent((object) this, e);
@ -1010,7 +1016,7 @@ namespace Rei.Com
this.pindex = index;
}
public void Clone(ref IEnumFORMATETC newEnum)
public void Clone(out IEnumFORMATETC newEnum)
{
newEnum = (IEnumFORMATETC) new DataObject._EnumFormatEtc(this.pFormats, this.pdirection, this.pindex);
}
@ -1018,7 +1024,7 @@ namespace Rei.Com
public int Reset()
{
this.pindex = 0;
int num;
int num=0;
return num;
}

2
Rei.Com/DataObjectHelper.cs
View File

@ -41,7 +41,7 @@ namespace Rei.Com
while (num4 <= num3)
{
object structure = Marshal.PtrToStructure(ptr, typeof (FileDescriptor));
FileDescriptor fileDescriptor1;
FileDescriptor fileDescriptor1 = new FileDescriptor();
FileDescriptor fileDescriptor2 = structure != null ? (FileDescriptor) structure : fileDescriptor1;
VirtualFileInfo virtualFileInfo = new VirtualFileInfo();
virtualFileInfo.FileName = fileDescriptor2.cFileName;

9
Rei.Fs.Webdav/Rei.Fs.Webdav.csproj
View File

@ -52,9 +52,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Rei.Fs">
<HintPath>lib\Rei.Fs.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
@ -93,5 +90,11 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Rei.Fs\Rei.Fs.csproj">
<Project>{bd378147-118c-4141-a046-bfd575ef1b05}</Project>
<Name>Rei.Fs</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

94
Rei.Fs.Webdav/WebdavFs.cs
View File

@ -224,10 +224,9 @@ namespace Rei.Fs.Webdav
public override void ResetConnection()
{
bool flag1 = true;
List<ServicePoint>.Enumerator enumerator;
List<ServicePoint>.Enumerator enumerator = this.pServicePointList.GetEnumerator(); ;
try
{
enumerator = this.pServicePointList.GetEnumerator();
while (enumerator.MoveNext())
{
ServicePoint current = enumerator.Current;
@ -1046,9 +1045,9 @@ namespace Rei.Fs.Webdav
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
else
@ -1622,9 +1621,9 @@ namespace Rei.Fs.Webdav
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
this.OnLogMessage(message);
}
@ -1672,9 +1671,9 @@ namespace Rei.Fs.Webdav
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
this.OnLogMessage(message);
@ -1711,9 +1710,9 @@ namespace Rei.Fs.Webdav
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
this.OnLogMessage(message1);
return httpWebResponse1;
@ -1735,10 +1734,10 @@ namespace Rei.Fs.Webdav
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
}
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
} //
this.OnLogMessage(message1);
Stream requestStream1;
try
@ -1784,9 +1783,9 @@ namespace Rei.Fs.Webdav
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
this.OnLogMessage(message2);
@ -1941,7 +1940,7 @@ label_19:
Stream stream = res.GetResponseStream();
List<byte[]> numArrayList = new List<byte[]>();
List<int> intList = new List<int>();
int num1;
int num1=0;
try
{
if (res.Headers[HttpResponseHeader.ContentEncoding] != null)
@ -2131,9 +2130,9 @@ label_19:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
}
@ -2141,9 +2140,9 @@ label_19:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
}
@ -2151,9 +2150,9 @@ label_19:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
if ((object) resourceInfo.Id != null)
{
@ -2218,9 +2217,9 @@ label_19:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
}
@ -2228,9 +2227,9 @@ label_19:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
if (resourceInfoList.Count == 0)
throw new InvalidServerResponseException("Cannot Parse PROPFIND Response. No response element.", message);
@ -2247,10 +2246,9 @@ label_19:
}
checked { ++index1; }
}
List<ResourceInfo>.Enumerator enumerator1;
List<ResourceInfo>.Enumerator enumerator1 = resourceInfoList.GetEnumerator();
try
{
enumerator1 = resourceInfoList.GetEnumerator();
while (enumerator1.MoveNext())
{
ResourceInfo current = enumerator1.Current;
@ -2372,9 +2370,9 @@ label_19:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
}
else if (childNode["status", "DAV:"] != null)
@ -2391,9 +2389,9 @@ label_19:
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
return true;
}
@ -2404,10 +2402,9 @@ label_19:
bool flag = false;
stringBuilder.Append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
stringBuilder.Append("<D:propertyupdate xmlns:D=\"DAV:\">\r\n");
List<ResourceInfo.ResourceProperty>.Enumerator enumerator1;
List<ResourceInfo.ResourceProperty>.Enumerator enumerator1 = newinfo.Properties.GetEnumerator();
try
{
enumerator1 = newinfo.Properties.GetEnumerator();
while (enumerator1.MoveNext())
{
ResourceInfo.ResourceProperty current = enumerator1.Current;
@ -2440,10 +2437,9 @@ label_19:
{
enumerator1.Dispose();
}
List<ResourceInfo.ResourceProperty>.Enumerator enumerator2;
List<ResourceInfo.ResourceProperty>.Enumerator enumerator2 = originalinfo.Properties.GetEnumerator();
try
{
enumerator2 = originalinfo.Properties.GetEnumerator();
while (enumerator2.MoveNext())
{
ResourceInfo.ResourceProperty current = enumerator2.Current;

BIN
Rei.Fs.Webdav/lib/Rei.Fs.dll
View File

Binary file not shown.

2
Rei.Fs/ChunkedStream.cs
View File

@ -141,7 +141,7 @@ namespace Rei.Fs
if (count <= 0)
return;
this.pBaseStream.Close();
EventHandler finishedEventEvent = this.ChunkFinishedEventEvent;
EventHandler finishedEventEvent = this.ChunkFinishedEvent;
if (finishedEventEvent != null)
finishedEventEvent((object) this, EventArgs.Empty);
this.Write(buffer, offset, count);

4
Rei.Fs/CloseNotifyStream.cs
View File

@ -176,7 +176,7 @@ namespace Rei.Fs
this.pDisposed = true;
try
{
EventHandler closingEventEvent = this.ClosingEventEvent;
EventHandler closingEventEvent = this.ClosingEvent;
if (closingEventEvent != null)
closingEventEvent((object) this, EventArgs.Empty);
}
@ -184,7 +184,7 @@ namespace Rei.Fs
{
this.pBaseStream.Close();
}
EventHandler closedEventEvent = this.ClosedEventEvent;
EventHandler closedEventEvent = this.ClosedEvent;
if (closedEventEvent == null)
return;
closedEventEvent((object) this, EventArgs.Empty);

2
Rei.Fs/FsBase.cs
View File

@ -192,7 +192,7 @@ namespace Rei.Fs
public void OnLogMessage(string message)
{
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessageEvent;
EventHandler<LogMessageEventArgs> logMessageEvent = this.LogMessage;
if (logMessageEvent == null)
return;
logMessageEvent((object) this, new LogMessageEventArgs(message));

2
Rei.Fs/HostRootedUriParser.cs
View File

@ -36,7 +36,7 @@ namespace Rei.Fs
field.SetValue((object) this, (object) num);
}
protected override void InitializeAndValidate(Uri uri, ref UriFormatException parsingError)
protected override void InitializeAndValidate(Uri uri, out UriFormatException parsingError)
{
base.InitializeAndValidate(uri, out parsingError);
if (parsingError == null && Operators.CompareString(uri.Host, "", false) == 0)

4
Rei.Fs/IO/FileInfo.cs
View File

@ -26,7 +26,7 @@ namespace Rei.Fs.IO
this.pCreationTime = DateTime.FromFileTime((long) d.ftCreationTime.dwHighDateTime << 32 | (long) d.ftCreationTime.dwLowDateTime & (long) uint.MaxValue);
this.pLastAccessTime = DateTime.FromFileTime((long) d.ftLastAccessTime.dwHighDateTime << 32 | (long) d.ftLastAccessTime.dwLowDateTime & (long) uint.MaxValue);
this.pLastWriteTime = DateTime.FromFileTime((long) d.ftLastWriteTime.dwHighDateTime << 32 | (long) d.ftLastWriteTime.dwLowDateTime & (long) uint.MaxValue);
this.pFileSize = checked ((ulong) d.nFileSizeHigh << 32 + (ulong) d.nFileSizeLow);
this.pFileSize = checked (((ulong) d.nFileSizeHigh << 32) + (ulong) d.nFileSizeLow);
this.pFileName = d.cFileName;
this.pAltFileName = d.cAlternateFileName;
this.pFullPath = path;
@ -38,7 +38,7 @@ namespace Rei.Fs.IO
this.pCreationTime = DateTime.FromFileTime((long) d.ftCreationTime.dwHighDateTime << 32 | (long) d.ftCreationTime.dwLowDateTime & (long) uint.MaxValue);
this.pLastAccessTime = DateTime.FromFileTime((long) d.ftLastAccessTime.dwHighDateTime << 32 | (long) d.ftLastAccessTime.dwLowDateTime & (long) uint.MaxValue);
this.pLastWriteTime = DateTime.FromFileTime((long) d.ftLastWriteTime.dwHighDateTime << 32 | (long) d.ftLastWriteTime.dwLowDateTime & (long) uint.MaxValue);
this.pFileSize = checked ((ulong) d.nFileSizeHigh << 32 + (ulong) d.nFileSizeLow);
this.pFileSize = checked (((ulong) d.nFileSizeHigh << 32) + (ulong) d.nFileSizeLow);
this.pFileName = FileSystem.GetFilename(path);
this.pAltFileName = (string) null;
this.pFullPath = path;

18
Rei.Fs/IO/FileSystem.cs
View File

@ -112,7 +112,7 @@ namespace Rei.Fs.IO
public static bool TryGetFileInfo(string path, ref FileInfo info)
{
string path1 = FileSystem.NormalizePath(path);
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData;
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData=new Win32Native.WIN32_FILE_ATTRIBUTE_DATA();
if (!Win32Native.GetFileAttributesEx(FileSystem.NormalizePath(path), Win32Native.GET_FILEEX_INFO_LEVELS.GetFileExInfoStandard, ref fileData))
{
switch (Marshal.GetLastWin32Error())
@ -136,7 +136,7 @@ namespace Rei.Fs.IO
public static bool FileOrDirectoryExists(string path, ref bool isdirectory)
{
Win32Native.ErrorModeType uMode = Win32Native.SetErrorMode(Win32Native.ErrorModeType.SEM_FAILCRITICALERRORS);
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData;
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData = new Win32Native.WIN32_FILE_ATTRIBUTE_DATA();
bool fileAttributesEx;
try
{
@ -166,7 +166,7 @@ namespace Rei.Fs.IO
public static bool FileExists(string path)
{
Win32Native.ErrorModeType uMode = Win32Native.SetErrorMode(Win32Native.ErrorModeType.SEM_FAILCRITICALERRORS);
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData;
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData = new Win32Native.WIN32_FILE_ATTRIBUTE_DATA();
bool fileAttributesEx;
try
{
@ -193,7 +193,7 @@ namespace Rei.Fs.IO
public static bool DirectoryExists(string path)
{
Win32Native.ErrorModeType uMode = Win32Native.SetErrorMode(Win32Native.ErrorModeType.SEM_FAILCRITICALERRORS);
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData;
Win32Native.WIN32_FILE_ATTRIBUTE_DATA fileData = new Win32Native.WIN32_FILE_ATTRIBUTE_DATA();
bool fileAttributesEx;
try
{
@ -237,7 +237,7 @@ namespace Rei.Fs.IO
while (num4 <= num3)
{
object structure = Marshal.PtrToStructure(ptr, typeof (Win32Native.SHARE_INFO_0));
Win32Native.SHARE_INFO_0 shareInfo0_1;
Win32Native.SHARE_INFO_0 shareInfo0_1=new Win32Native.SHARE_INFO_0();
Win32Native.SHARE_INFO_0 shareInfo0_2 = structure != null ? (Win32Native.SHARE_INFO_0) structure : shareInfo0_1;
stringList.Add(shareInfo0_2.shi0_netname);
ptr = new IntPtr(checked (ptr.ToInt32() + num1));
@ -269,7 +269,7 @@ namespace Rei.Fs.IO
}
else
{
uint dwDesiredAccess;
uint dwDesiredAccess=0;
if (access == FileAccess.Read)
dwDesiredAccess = 2147483648U;
else if (access == FileAccess.Write)
@ -357,7 +357,7 @@ namespace Rei.Fs.IO
public static void DeleteFile(string path, bool recursive)
{
string str1 = FileSystem.NormalizePath(path);
bool isdirectory;
bool isdirectory=false;
if (!FileSystem.FileOrDirectoryExists(str1, ref isdirectory))
throw new FileNotFoundException();
if (!isdirectory)
@ -416,10 +416,10 @@ namespace Rei.Fs.IO
{
string str1 = FileSystem.NormalizePath(path1);
string str2 = FileSystem.NormalizePath(path2);
bool isdirectory1;
bool isdirectory1 = false;
if (!FileSystem.FileOrDirectoryExists(str1, ref isdirectory1))
throw new FileNotFoundException();
bool isdirectory2;
bool isdirectory2 = false;
if (!overwrite && FileSystem.FileOrDirectoryExists(str2, ref isdirectory2))
FileSystem.RaiseError(str2, 183);
if (!isdirectory1)

26
Rei.Fs/JsonObject.cs
View File

@ -166,18 +166,7 @@ label_19:
}
throw new Exception();
}
catch (Exception ex) when (
{
// ISSUE: unable to correctly present filter
ProjectData.SetProjectError(ex);
if (!(ex is InvalidServerResponseException))
{
SuccessfulFiltering;
}
else
throw;
}
)
catch (InvalidServerResponseException ex)
{
throw new InvalidServerResponseException("Cannot parse server response. index:" + index.ToString() + " arround: \"" + JsonObject.GetSubStrArround(str, index) + "\"");
}
@ -229,18 +218,7 @@ label_19:
checked { ++index; }
}
}
catch (Exception ex) when (
{
// ISSUE: unable to correctly present filter
ProjectData.SetProjectError(ex);
if (!(ex is InvalidServerResponseException))
{
SuccessfulFiltering;
}
else
throw;
}
)
catch (InvalidServerResponseException ex)
{
throw new InvalidServerResponseException("Cannot parse server response. index:" + index.ToString() + " arround: \"" + JsonObject.GetSubStrArround(str, index) + "\"");
}

2
Rei.Fs/NoHostRootedUriParser.cs
View File

@ -36,7 +36,7 @@ namespace Rei.Fs
field.SetValue((object) this, (object) num);
}
protected override void InitializeAndValidate(Uri uri, ref UriFormatException parsingError)
protected override void InitializeAndValidate(Uri uri, out UriFormatException parsingError)
{
base.InitializeAndValidate(uri, out parsingError);
if (parsingError == null && Operators.CompareString(uri.Host, "", false) != 0)

2
Rei.Fs/PartialStream.cs
View File

@ -147,7 +147,7 @@ namespace Rei.Fs
this.pHasError = true;
throw;
}
long num;
long num=0;
return num;
}

5
Rei.Fs/UriUtil.cs
View File

@ -141,7 +141,7 @@ namespace Rei.Fs
if (str.Contains("%u") || str.Contains("%U"))
throw new ArgumentException("cannot use %u encoding uri");
List<byte> byteList = new List<byte>();
int index1;
int index1=0;
while (index1 < str.Length)
{
if ((int) str[index1] != 37)
@ -382,10 +382,9 @@ namespace Rei.Fs
public static string CreateFormUrlencodedString(Dictionary<string, string> values)
{
List<string> stringList = new List<string>();
Dictionary<string, string>.KeyCollection.Enumerator enumerator;
Dictionary<string, string>.KeyCollection.Enumerator enumerator = values.Keys.GetEnumerator();
try
{
enumerator = values.Keys.GetEnumerator();
while (enumerator.MoveNext())
{
string current = enumerator.Current;

3
Rei.Fs/WebRequestCertificateValidationManager.cs
View File

@ -24,10 +24,9 @@ namespace Rei.Fs
while (registeredModules.MoveNext())
authenticationModuleList.Add((IAuthenticationModule) registeredModules.Current);
AuthenticationManager.Register((IAuthenticationModule) new WebRequestCertificateValidationManager.FookAuthClient());
List<IAuthenticationModule>.Enumerator enumerator;
List<IAuthenticationModule>.Enumerator enumerator = authenticationModuleList.GetEnumerator();
try
{
enumerator = authenticationModuleList.GetEnumerator();
while (enumerator.MoveNext())
AuthenticationManager.Register(enumerator.Current);
}

2
Rei.Net.HttpServer/MyHttpListener.cs
View File

@ -68,7 +68,7 @@ namespace Rei.Net.HttpServer
public void Close()
{
this.Dispose();
((IDisposable)this).Dispose();
}
protected virtual void Dispose(bool disposing)

11
Rei.Net.HttpServer/MyHttpServerConnection.cs
View File

@ -1045,9 +1045,9 @@ namespace Rei.Net.HttpServer
}
finally
{
IEnumerator enumerator;
if (enumerator is IDisposable)
(enumerator as IDisposable).Dispose();
//IEnumerator enumerator;
//if (enumerator is IDisposable)
// (enumerator as IDisposable).Dispose();
}
stringList.Add("");
stringList.Add("");
@ -1377,6 +1377,11 @@ label_6:
return str + "\r\n" + this._remoteep.ToString() + "\r\n" + this._req_state.ToString();
}
public void Dispose()
{
Dispose(true);
}
private enum BodyLengthType
{
Unknown,

5
Rei.Net.HttpServer/MyHttpServerRequest.cs
View File

@ -151,5 +151,10 @@ namespace Rei.Net.HttpServer
{
return this._requestline + " " + this._host;
}
public void Dispose()
{
Dispose(true);
}
}
}

9
Rei.Net.HttpServer/UPnPManager.cs
View File

@ -228,10 +228,9 @@ label_18:
public IPEndPoint[] GetExternalEndpoints()
{
List<IPEndPoint> ipEndPointList = new List<IPEndPoint>();
List<UPnPManager.portmappingentry>.Enumerator enumerator;
List<UPnPManager.portmappingentry>.Enumerator enumerator = this.mappinglist.GetEnumerator();
try
{
enumerator = this.mappinglist.GetEnumerator();
while (enumerator.MoveNext())
{
UPnPManager.portmappingentry current = enumerator.Current;
@ -264,10 +263,9 @@ label_18:
{
IPInterfaceProperties ipProperties = networkInterface.GetIPProperties();
IPAddress internalip = (IPAddress) null;
IEnumerator<UnicastIPAddressInformation> enumerator1;
IEnumerator<UnicastIPAddressInformation> enumerator1 = ipProperties.UnicastAddresses.GetEnumerator();
try
{
enumerator1 = ipProperties.UnicastAddresses.GetEnumerator();
while (enumerator1.MoveNext())
{
UnicastIPAddressInformation current = enumerator1.Current;
@ -283,12 +281,11 @@ label_18:
if (enumerator1 != null)
enumerator1.Dispose();
}
IEnumerator<GatewayIPAddressInformation> enumerator2;
IEnumerator<GatewayIPAddressInformation> enumerator2 = ipProperties.GatewayAddresses.GetEnumerator();
if (internalip != null)
{
try
{
enumerator2 = ipProperties.GatewayAddresses.GetEnumerator();
while (enumerator2.MoveNext())
{
GatewayIPAddressInformation current = enumerator2.Current;