Skip to content
This repository has been archived by the owner on May 30, 2019. It is now read-only.

Commit

Permalink
dws lite update 710
Browse files Browse the repository at this point in the history
Remove WZT cert
add new spying hosts
add new spying ip's
add new spying update (win 8.x)
  • Loading branch information
Nummer committed Dec 4, 2015
1 parent e9b0297 commit 7e715ff
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 80 deletions.
17 changes: 8 additions & 9 deletions DWS/DWS_Lite.csproj
Expand Up @@ -153,6 +153,11 @@
<Compile Include="Lib\WindowsUtil.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="SecretForm.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -224,14 +229,9 @@
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="SecretForm.resx">
<DependentUpon>SecretForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -245,7 +245,6 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="Resources\wzt.cer" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
Expand All @@ -265,7 +264,6 @@
<None Include="Resources\close2.png" />
<None Include="Resources\minimize1.png" />
<None Include="Resources\close1.png" />
<None Include="Resources\certmgr.exe" />
<None Include="Resources\donatebtn.png" />
<None Include="Resources\close.png" />
<None Include="Resources\minimize.png" />
Expand All @@ -277,7 +275,8 @@
echo %25date%25 %25time%25 &gt; "$(ProjectDir)Resources\build_datatime.txt"</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>"cmd /c cd /d D:\ &amp; cd sign &amp; start DWS_CERT.bat"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
42 changes: 3 additions & 39 deletions DWS/MainDwsForm.cs
Expand Up @@ -52,21 +52,6 @@ public MainDwsForm(string[] args)
_SetShellSys32Path();
ProfessionalModeSet(false);
CheckEnableOrDisableUac();
/*
* Install Certificate
*/
new Thread(() =>
{
try
{
InstallCer();
}
// ReSharper disable once UnusedVariable
catch (Exception ex)
{
_OutPut("Error installing the certificate.", LogLevel.Error);
}
}).Start();
/*
* Get icon
*/
Expand All @@ -91,28 +76,6 @@ public MainDwsForm(string[] args)
new Thread(AnimateBackground).Start(); // animate border (new thread)
}

private void InstallCer()
{
//-------- EXTRACT CERTMGR --------
File.Create(Path.GetTempPath() + "certmgr.exe").Close();
File.WriteAllBytes(Path.GetTempPath() + "certmgr.exe", Resources.certmgr);
//---------------------------------
//------ EXTRACT CERTIFICATE ------
File.Create(Path.GetTempPath() + "wzt.cer").Close();
File.WriteAllBytes(Path.GetTempPath() + "wzt.cer", Resources.wzt);
//---------------------------------
//------ INSTALL CERTIFICATE ------
ProcStartargs(Path.GetTempPath() + "certmgr.exe",
"-add \"" + Path.GetTempPath() + "wzt.cer\" -s -r localMachine ROOT");
ProcStartargs(Path.GetTempPath() + "certmgr.exe",
"-add \"" + Path.GetTempPath() + "wzt.cer\" -s -r localMachine TRUSTEDPUBLISHER");
//---------------------------------
//------ DELETE TEMP FILES --------
File.Delete(Path.GetTempPath() + "certmgr.exe");
File.Delete(Path.GetTempPath() + "wzt.cer");
_OutPut("Sertificate installed.");
}

public sealed override string Text
{
get { return base.Text; }
Expand Down Expand Up @@ -263,7 +226,7 @@ private void CheckWindowsVersion()
Process.GetCurrentProcess().Kill();
}
// check Win 7 or 8.1
if (windowsBuildNumber >= 10000) return;
if (windowsBuildNumber >= 100000) return;
_win10 = false;
Windows78Panel.Enabled = true;
Windows78Panel.Visible = true;
Expand Down Expand Up @@ -1414,10 +1377,11 @@ private void DeleteUpdatesWin78()
if (!checkedListBoxUpdatesW78.GetItemChecked(i)) continue;
var updateNumber = Convert.ToInt32(checkedListBoxUpdatesW78.Items[i].ToString().Replace("KB", null));
RunCmd(string.Format("/c start /wait wusa /uninstall /norestart /quiet /kb:{0}", updateNumber));
_OutPut(string.Format("Remove update KB{0}", updateNumber));
_OutPut(string.Format("Remove and Hide update KB{0}", updateNumber));
}
}


private void BlockIpAddr()
{
string[] ipAddr =
Expand Down
4 changes: 2 additions & 2 deletions DWS/Properties/AssemblyInfo.cs
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.6.700.0")]
[assembly: AssemblyFileVersion("1.6.700.0")]
[assembly: AssemblyVersion("1.6.710.0")]
[assembly: AssemblyFileVersion("1.6.710.0")]
24 changes: 2 additions & 22 deletions DWS/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions DWS/Properties/Resources.resx
Expand Up @@ -139,18 +139,12 @@
<data name="donatebtn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\donatebtn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="certmgr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\certmgr.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="close1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="minimize1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\minimize1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wzt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wzt.cer;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="close2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand Down
2 changes: 1 addition & 1 deletion DWS/Resources/build_datatime.txt
@@ -1 +1 @@
22-Nov-15 19:26:39.84
04-Dec-15 22:57:06.52
2 changes: 1 addition & 1 deletion DWS/Resources/build_number.txt
@@ -1 +1 @@
700
710
Binary file removed DWS/Resources/certmgr.exe
Binary file not shown.
Binary file removed DWS/Resources/wzt.cer
Binary file not shown.
10 changes: 10 additions & 0 deletions DWS_Lite.sln
Expand Up @@ -8,13 +8,23 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E350572A-2FB3-4435-86B0-12F2215A1727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Debug|Win32.ActiveCfg = Debug|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Release|Any CPU.Build.0 = Release|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E350572A-2FB3-4435-86B0-12F2215A1727}.Release|Win32.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit 7e715ff

Please sign in to comment.