No commit message

shadabs22 · Nov 9, 2007 · 6ae16ce · 6ae16ce
1 parent a94a656
commit 6ae16ce
Show file tree

Hide file tree

Showing 48 changed files with 52 additions and 14 deletions.
diff --git a/Program.cs b/Program.cs
@@ -134,7 +134,7 @@ public static void Main(string[] args)
                     new Thread(new ThreadStart(new HttpWorker(context).Handle)).Start();
 
                     TimeSpan span = DateTime.Now - start;
-                    if (span.Hours > 3) System.Environment.Exit(-1);
+                    if (span.Hours > 5) System.Environment.Exit(-1);
                 }
             }
         }

diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -146,6 +146,6 @@
     <value>..\Images\tshadowtopright.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>1.3r</value>
+    <value>1.4b</value>
   </data>
 </root>
diff --git a/WebShot.cs b/WebShot.cs
@@ -11,12 +11,13 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Net;
-using System.Web;
+//using System.Web;
 using FastImage;
 using Gif.Components;
 using System.Resources;
 using System.Xml;
 using System.Diagnostics;
+//using SHDocVw;
 using T.Serv;
 
 namespace GetSiteThumbnail
@@ -209,6 +210,7 @@ private void DocumentCancelEventHandler(object sender, CancelEventArgs e)
             // Don't want pop-ups.
             e.Cancel = true;
         }
+
         private void DocumentCompletedEventHandler(object sender, WebBrowserDocumentCompletedEventArgs ex)
         {
             int shadowSize = 5;
@@ -293,12 +295,11 @@ public class WebShotQueueWorker
         [DllImport("user32")]
         private static extern int GetQueueStatus(int fuFlags);
 
+        public int count;
         private readonly object syncRoot;
-
         public Queue<WebShot> queue = new Queue<WebShot>();
         public Hashtable hash = new Hashtable();
-        public int count;
-
+
         private IDictionary<string, ArrayList> data = new Dictionary<string, ArrayList>();
 
         public WebShotQueueWorker(int count)
@@ -351,7 +352,8 @@ private void Fetch()
                     webBrowser.Size = new Size(WebShot.width, WebShot.height);
                     webBrowser.ScrollBarsEnabled = false;
                     webBrowser.ScriptErrorsSuppressed = true;
-
+                   // webBrowser.Silent
+                    (SHDocVw.IWebBrowser2)webBrowser.Silent = true;
                     hash[webShot.url] = "fetching";
 
                     switch (webShot.ReadyState)
@@ -388,7 +390,6 @@ private void Fetch()
                         }
                     }
                     webShot.Save();
-                    webBrowser.Stop();
                 }
 
                 hash.Remove(webShot.url);

diff --git a/app.config b/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>
diff --git a/bin/Debug/webshots/www.ag.ru__160x96.png b/bin/Debug/webshots/www.ag.ru__160x96.png
diff --git a/bin/Debug/webshots/www.apple.com__160x96.png b/bin/Debug/webshots/www.apple.com__160x96.png
diff --git a/bin/Debug/webshots/www.bash.org.ru__160x96.png b/bin/Debug/webshots/www.bash.org.ru__160x96.png
diff --git a/bin/Debug/webshots/www.blizzard.com__160x96.png b/bin/Debug/webshots/www.blizzard.com__160x96.png
diff --git a/bin/Debug/webshots/www.cnn.com__160x96.png b/bin/Debug/webshots/www.cnn.com__160x96.png
diff --git a/bin/Debug/webshots/www.dota-allstars.com__160x96.png b/bin/Debug/webshots/www.dota-allstars.com__160x96.png
diff --git a/bin/Debug/webshots/www.fazed.net__160x96.png b/bin/Debug/webshots/www.fazed.net__160x96.png
diff --git a/bin/Debug/webshots/www.km.ru__160x96.png b/bin/Debug/webshots/www.km.ru__160x96.png
diff --git a/bin/Debug/webshots/www.lenta.ru__160x96.png b/bin/Debug/webshots/www.lenta.ru__160x96.png
diff --git a/bin/Debug/webshots/www.microsoft.com__160x96.png b/bin/Debug/webshots/www.microsoft.com__160x96.png
diff --git a/bin/Debug/webshots/www.oper.ru__160x96.png b/bin/Debug/webshots/www.oper.ru__160x96.png
diff --git a/bin/Debug/webshots/www.udaff.com__160x96.png b/bin/Debug/webshots/www.udaff.com__160x96.png
diff --git a/bin/Release/webshot.serv.application b/bin/Release/webshot.serv.application
@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>2ScUwT9Ag8BeNgqcE3w7A5OkmtA=</dsig:DigestValue>
+        <dsig:DigestValue>fLNtmd6T1bQvZRJnaUadiIicSo0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/bin/Release/webshot.serv.exe b/bin/Release/webshot.serv.exe
diff --git a/bin/Release/webshot.serv.exe.config b/bin/Release/webshot.serv.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>
diff --git a/bin/Release/webshot.serv.exe.manifest b/bin/Release/webshot.serv.exe.manifest
@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iyhqn+M9xdhxHmBnVC2UveGxcrI=</dsig:DigestValue>
+        <dsig:DigestValue>vo3cgAyBwyvVDsBxSqIv20jZTt8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/bin/Release/webshot.serv.exe.mda.config b/bin/Release/webshot.serv.exe.mda.config
@@ -0,0 +1 @@
+<mdaConfig>  <assistants>    <contextSwitchDeadlock enable="false" />  </assistants></mdaConfig>

diff --git a/bin/Release/webshot.serv.pdb b/bin/Release/webshot.serv.pdb
diff --git a/bin/Release/webshot.serv.vshost.application b/bin/Release/webshot.serv.vshost.application
@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>2ScUwT9Ag8BeNgqcE3w7A5OkmtA=</dsig:DigestValue>
+        <dsig:DigestValue>fLNtmd6T1bQvZRJnaUadiIicSo0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/bin/Release/webshot.serv.vshost.exe.config b/bin/Release/webshot.serv.vshost.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>
diff --git a/bin/Release/webshots/www.ag.ru__160x96.png b/bin/Release/webshots/www.ag.ru__160x96.png
diff --git a/bin/Release/webshots/www.cnn.com__160x96.png b/bin/Release/webshots/www.cnn.com__160x96.png
diff --git a/bin/Release/webshots/www.google.com__100x96.png b/bin/Release/webshots/www.google.com__100x96.png
diff --git a/bin/Release/webshots/www.google.com__101x96.png b/bin/Release/webshots/www.google.com__101x96.png
diff --git a/bin/Release/webshots/www.google.com__10x96.png b/bin/Release/webshots/www.google.com__10x96.png
diff --git a/bin/Release/webshots/www.google.com__160x96.png b/bin/Release/webshots/www.google.com__160x96.png
diff --git a/bin/Release/webshots/www.km.ru__160x96.png b/bin/Release/webshots/www.km.ru__160x96.png
diff --git a/bin/Release/webshots/www.km.ru__48x96.png b/bin/Release/webshots/www.km.ru__48x96.png
diff --git a/bin/Release/webshots/www.lenta.ru__160x96.png b/bin/Release/webshots/www.lenta.ru__160x96.png
diff --git a/bin/Release/webshots/www.oper.ru__160x96.png b/bin/Release/webshots/www.oper.ru__160x96.png
diff --git a/obj/Release/Interop.SHDocVw.dll b/obj/Release/Interop.SHDocVw.dll
diff --git a/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/obj/Release/webshot.serv.Properties.Resources.resources b/obj/Release/webshot.serv.Properties.Resources.resources
diff --git a/obj/Release/webshot.serv.application b/obj/Release/webshot.serv.application
@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>2ScUwT9Ag8BeNgqcE3w7A5OkmtA=</dsig:DigestValue>
+        <dsig:DigestValue>fLNtmd6T1bQvZRJnaUadiIicSo0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/obj/Release/webshot.serv.csproj.FileListAbsolute.txt b/obj/Release/webshot.serv.csproj.FileListAbsolute.txt
@@ -21,3 +21,5 @@ C:\Documents and Settings\strelkov.NMG.000\Desktop\code.google\obj\Release\websh
 C:\Documents and Settings\strelkov.NMG.000\Desktop\code.google\obj\Release\webshot.serv.exe.manifest
 C:\Documents and Settings\strelkov.NMG.000\Desktop\code.google\obj\Release\webshot.serv.application
 C:\Documents and Settings\strelkov.NMG.000\Desktop\code.google\bin\Release\webshot.serv.exe.config
+C:\Documents and Settings\strelkov.NMG.000\Desktop\code.google\obj\Release\Interop.SHDocVw.dll
+C:\Documents and Settings\strelkov.NMG.000\Desktop\code.google\obj\Release\webshot.serv.csproj.ResolveComReference.cache
diff --git a/obj/Release/webshot.serv.csproj.GenerateResource.Cache b/obj/Release/webshot.serv.csproj.GenerateResource.Cache
diff --git a/obj/Release/webshot.serv.csproj.ResolveComReference.cache b/obj/Release/webshot.serv.csproj.ResolveComReference.cache
diff --git a/obj/Release/webshot.serv.exe b/obj/Release/webshot.serv.exe
diff --git a/obj/Release/webshot.serv.exe.manifest b/obj/Release/webshot.serv.exe.manifest
@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iyhqn+M9xdhxHmBnVC2UveGxcrI=</dsig:DigestValue>
+        <dsig:DigestValue>vo3cgAyBwyvVDsBxSqIv20jZTt8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/obj/Release/webshot.serv.pdb b/obj/Release/webshot.serv.pdb
diff --git a/webshot.serv.csproj b/webshot.serv.csproj
@@ -132,6 +132,16 @@
     <None Include="Resources\index.xml" />
     <None Include="webshot.serv_TemporaryKey.pfx" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="SHDocVw">
+      <Guid>{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>1</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- 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.

diff --git a/webshot.serv.csproj.user b/webshot.serv.csproj.user
@@ -0,0 +1,15 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory>
+    </InstallUrlHistory>
+    <SupportUrlHistory>
+    </SupportUrlHistory>
+    <UpdateUrlHistory>
+    </UpdateUrlHistory>
+    <BootstrapperUrlHistory>
+    </BootstrapperUrlHistory>
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>
diff --git a/webshot.serv.suo b/webshot.serv.suo
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<mdaConfig> <assistants> <contextSwitchDeadlock enable="false" /> </assistants></mdaConfig>
Expand Down