Permalink
Browse files

* Updated shfb project for release 0.5-pre1

* Set COM threading model to STA in WebKitBrowser.dll.manifest
  • Loading branch information...
1 parent 2f17073 commit b398988bf2fc5caddeee52885d2b093f92581225 peterdn committed Aug 1, 2010
@@ -7,30 +7,30 @@
</dependentAssembly>
</dependency>
<file name="WebKit" hashalg="SHA1">
- <comClass clsid="{D6BCA079-F61C-4E1E-B453-32A0477D02E3}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{66827EC1-3AEF-4241-BAC5-F776B44F030F}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{A062ECC3-BB1B-4694-A569-F59E0AD6BE0C}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{BA590766-0A6F-46C7-B96E-743490D94CB7}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{A4B9B45D-949F-4C8C-9B92-6FBFCC1CAAA2}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{DD653964-4D37-4FB2-9CB6-6A9A97719332}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{6BE190E9-1725-4E4A-88DB-6A9FE242C9E5}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{F71071FD-A51B-4B69-9EB6-44374405E80C}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{1820D883-42FE-4B78-88C8-5456BB19D224}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{67B89F90-F778-438B-ABBF-34D1ACBF8651}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{E93AA8D7-F362-4A4A-A95D-325906BEB5F0}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{6C6AF3F9-36B4-4BF7-8BDE-74DCD4AD75A4}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{7433F53B-7FE9-484A-9432-72909457A646}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{C0F98BD9-3B1C-413D-904A-E2D1453EAF1F}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{2FB5499A-BB5D-4469-8517-789FEC8FD9BA}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{F366A6E8-E43C-4FD4-AAB0-8E6E79C73E6E}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{24A53AD5-AA9F-44E6-AA22-2C7C250B661A}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{715636C4-59E7-4B85-BBC5-B555888787D7}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{AB201196-8DD2-4D45-AEBD-029B6A37AA27}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{24040CD6-AFF4-4A51-9C8B-71539580EE76}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{C2A1BFC2-1E7C-49FE-8592-D0C7FB440BC0}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{1B63D781-9BC4-4A04-899F-C4B05BBD3BE5}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{96B93356-9D61-4B3F-A6CF-A78283AC9649}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
- <comClass clsid="{3F35F332-BB2B-49B3-AEDD-27B317687E07}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}"></comClass>
+ <comClass clsid="{D6BCA079-F61C-4E1E-B453-32A0477D02E3}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{66827EC1-3AEF-4241-BAC5-F776B44F030F}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{A062ECC3-BB1B-4694-A569-F59E0AD6BE0C}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{BA590766-0A6F-46C7-B96E-743490D94CB7}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{A4B9B45D-949F-4C8C-9B92-6FBFCC1CAAA2}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{DD653964-4D37-4FB2-9CB6-6A9A97719332}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{6BE190E9-1725-4E4A-88DB-6A9FE242C9E5}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{F71071FD-A51B-4B69-9EB6-44374405E80C}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{1820D883-42FE-4B78-88C8-5456BB19D224}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{67B89F90-F778-438B-ABBF-34D1ACBF8651}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{E93AA8D7-F362-4A4A-A95D-325906BEB5F0}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{6C6AF3F9-36B4-4BF7-8BDE-74DCD4AD75A4}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{7433F53B-7FE9-484A-9432-72909457A646}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{C0F98BD9-3B1C-413D-904A-E2D1453EAF1F}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{2FB5499A-BB5D-4469-8517-789FEC8FD9BA}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{F366A6E8-E43C-4FD4-AAB0-8E6E79C73E6E}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{24A53AD5-AA9F-44E6-AA22-2C7C250B661A}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{715636C4-59E7-4B85-BBC5-B555888787D7}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{AB201196-8DD2-4D45-AEBD-029B6A37AA27}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{24040CD6-AFF4-4A51-9C8B-71539580EE76}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{C2A1BFC2-1E7C-49FE-8592-D0C7FB440BC0}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{1B63D781-9BC4-4A04-899F-C4B05BBD3BE5}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{96B93356-9D61-4B3F-A6CF-A78283AC9649}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
+ <comClass clsid="{3F35F332-BB2B-49B3-AEDD-27B317687E07}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" threadingModel="Apartment"></comClass>
<typelib tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" version="530.0" helpdir="" flags="HASDISKIMAGE"></typelib>
</file>
<comInterfaceExternalProxyStub name="IWebView" iid="{174BBEFD-058E-49C7-91DF-6F110AA4AC28}" tlbid="{2A748656-625D-4207-B29F-40C95BFEB3A9}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
@@ -26,7 +26,7 @@
</DocumentationSources>
<Preliminary>True</Preliminary>
<CopyrightText>Copyright &amp;#169%3b 2009 WebKit .NET Project</CopyrightText>
- <FeedbackEMailAddress>charn.opcode%40gmail.com</FeedbackEMailAddress>
+ <FeedbackEMailAddress>webkitdotnet%40peterdn.com</FeedbackEMailAddress>
<FeedbackEMailLinkText>Peter Nelson</FeedbackEMailLinkText>
<ProjectSummary>WebKit .NET is a WinForms control library wrapper for WebKit written in C#. The aim is to make it easy for developers to incorporate WebKit into their .NET applications.</ProjectSummary>
<NamespaceSummaries>
@@ -59,6 +59,7 @@ private void InitializeComponent()
this.closeTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+ this.pageSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -74,7 +75,7 @@ private void InitializeComponent()
this.tToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl = new System.Windows.Forms.TabControl();
this.navigationBar = new WebKitBrowserTest.NavigationBar();
- this.pageSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.newWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
@@ -126,6 +127,13 @@ private void InitializeComponent()
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(159, 6);
//
+ // pageSetupToolStripMenuItem
+ //
+ this.pageSetupToolStripMenuItem.Name = "pageSetupToolStripMenuItem";
+ this.pageSetupToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.pageSetupToolStripMenuItem.Text = "Page &Setup...";
+ this.pageSetupToolStripMenuItem.Click += new System.EventHandler(this.pageSetupToolStripMenuItem_Click);
+ //
// printToolStripMenuItem
//
this.printToolStripMenuItem.Name = "printToolStripMenuItem";
@@ -195,27 +203,28 @@ private void InitializeComponent()
this.testToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.testPageToolStripMenuItem,
this.toolStripMenuItem1,
- this.tToolStripMenuItem});
+ this.tToolStripMenuItem,
+ this.newWindowToolStripMenuItem});
this.testToolStripMenuItem.Name = "testToolStripMenuItem";
this.testToolStripMenuItem.Size = new System.Drawing.Size(41, 20);
this.testToolStripMenuItem.Text = "Test";
//
// testPageToolStripMenuItem
//
this.testPageToolStripMenuItem.Name = "testPageToolStripMenuItem";
- this.testPageToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+ this.testPageToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.testPageToolStripMenuItem.Text = "Test Page";
this.testPageToolStripMenuItem.Click += new System.EventHandler(this.testPageToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(122, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
//
// tToolStripMenuItem
//
this.tToolStripMenuItem.Name = "tToolStripMenuItem";
- this.tToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+ this.tToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.tToolStripMenuItem.Text = "Test 1";
this.tToolStripMenuItem.Click += new System.EventHandler(this.tToolStripMenuItem_Click);
//
@@ -239,12 +248,12 @@ private void InitializeComponent()
this.navigationBar.TabIndex = 1;
this.navigationBar.UrlText = "";
//
- // pageSetupToolStripMenuItem
+ // newWindowToolStripMenuItem
//
- this.pageSetupToolStripMenuItem.Name = "pageSetupToolStripMenuItem";
- this.pageSetupToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
- this.pageSetupToolStripMenuItem.Text = "Page &Setup...";
- this.pageSetupToolStripMenuItem.Click += new System.EventHandler(this.pageSetupToolStripMenuItem_Click);
+ this.newWindowToolStripMenuItem.Name = "newWindowToolStripMenuItem";
+ this.newWindowToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.newWindowToolStripMenuItem.Text = "New &Window";
+ this.newWindowToolStripMenuItem.Click += new System.EventHandler(this.newWindowToolStripMenuItem_Click);
//
// MainForm
//
@@ -288,6 +297,7 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem printToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pageSetupToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem newWindowToolStripMenuItem;
}
}
@@ -34,6 +34,7 @@
using System.Collections;
using WebKit;
using WebKit.DOM;
+using System.Threading;
namespace WebKitBrowserTest
{
@@ -218,5 +219,21 @@ private void pageSetupToolStripMenuItem_Click(object sender, EventArgs e)
{
currentPage.browser.ShowPageSetupDialog();
}
+
+ private void newWindowToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (MessageBox.Show("This is likely to cause a crash. Continue?",
+ "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
+ {
+ var thread = new Thread(new ThreadStart(MyThread));
+ thread.SetApartmentState(ApartmentState.STA);
+ thread.Start();
+ }
+ }
+
+ private void MyThread()
+ {
+ Application.Run(new MainForm());
+ }
}
}

0 comments on commit b398988

Please sign in to comment.