<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42726] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42726">42726</a></dd>
<dt>Author</dt> <dd>sfalken@apple.com</dd>
<dt>Date</dt> <dd>2009-04-21 13:42:20 -0700 (Tue, 21 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebKit/win:

2009-04-21  Steve Falkenburg  &lt;sfalken@apple.com&gt;

        Add registry-free CoCreateInstance API for WebKit clients: WebKitCreateInstance.

        Manifest-based registry-free COM continues to work for clients that have embedded
        manifests with isolated COM information.
        
        Reviewed by Adam Roben.

        * WebKit.vcproj/WebKit.def: Added WebKitCreateInstance.
        * WebKit.vcproj/WebKit.vcproj: Link against rpcrt4.dll for UUID hashing.
        * WebKit.vcproj/WebKit_debug.def: Added WebKitCreateInstance.
        * WebKitCOMAPI.cpp: Added.
        (CLSIDHash::hash):
        (CLSIDHash::equal):
        (CLSIDHashTraits::constructDeletedValue):
        (CLSIDHashTraits::isDeletedValue):
        (classFactory):
        (WebKitCreateInstance): New API.
        * WebKitCOMAPI.h: Added.

WebKitTools:

2009-04-21  Steve Falkenburg  &lt;sfalken@apple.com&gt;

        Use new WebKitCreateInstance API instead of CoCreateInstance
        or COMPtr's createInstance to instantiate WebKit COM objects.

        Reviewed by Adam Roben.

        * DumpRenderTree/win/DumpRenderTree.cpp:
        (initialize):
        (runTest):
        (createWebViewAndOffscreenWindow):
        (main):
        * DumpRenderTree/win/DumpRenderTree.vcproj:
        * DumpRenderTree/win/GCControllerWin.cpp:
        (GCController::collect):
        (GCController::collectOnAlternateThread):
        (GCController::getJSObjectCount):
        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
        (LayoutTestController::keepWebHistory):
        (LayoutTestController::webHistoryItemCount):
        (LayoutTestController::setIconDatabaseEnabled):
        * DumpRenderTree/win/WorkQueueItemWin.cpp:
        (LoadItem::invoke):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebKitvcprojWebKitdef">trunk/WebKit/win/WebKit.vcproj/WebKit.def</a></li>
<li><a href="#trunkWebKitwinWebKitvcprojWebKitvcproj">trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj</a></li>
<li><a href="#trunkWebKitwinWebKitvcprojWebKit_debugdef">trunk/WebKit/win/WebKit.vcproj/WebKit_debug.def</a></li>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreewinDumpRenderTreecpp">trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreewinDumpRenderTreevcproj">trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreewinGCControllerWincpp">trunk/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreewinLayoutTestControllerWincpp">trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreewinWorkQueueItemWincpp">trunk/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebKitwinWebKitCOMAPIcpp">trunk/WebKit/win/WebKitCOMAPI.cpp</a></li>
<li><a href="#trunkWebKitwinWebKitCOMAPIh">trunk/WebKit/win/WebKitCOMAPI.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKit/win/ChangeLog        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2009-04-21  Steve Falkenburg  &lt;sfalken@apple.com&gt;
+
+        Add registry-free CoCreateInstance API for WebKit clients: WebKitCreateInstance.
+
+        Manifest-based registry-free COM continues to work for clients that have embedded
+        manifests with isolated COM information.
+        
+        Reviewed by Adam Roben.
+
+        * WebKit.vcproj/WebKit.def: Added WebKitCreateInstance.
+        * WebKit.vcproj/WebKit.vcproj: Link against rpcrt4.dll for UUID hashing.
+        * WebKit.vcproj/WebKit_debug.def: Added WebKitCreateInstance.
+        * WebKitCOMAPI.cpp: Added.
+        (CLSIDHash::hash):
+        (CLSIDHash::equal):
+        (CLSIDHashTraits::constructDeletedValue):
+        (CLSIDHashTraits::isDeletedValue):
+        (classFactory):
+        (WebKitCreateInstance): New API.
+        * WebKitCOMAPI.h: Added.
+
</ins><span class="cx"> 2009-04-21  Adam Roben  &lt;aroben@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rename JavaScriptCore_debug.dll to JavaScriptCore.dll in the Debug
</span></span></pre></div>
<a id="trunkWebKitwinWebKitvcprojWebKitdef"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebKit.vcproj/WebKit.def (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebKit.vcproj/WebKit.def        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKit/win/WebKit.vcproj/WebKit.def        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -19,7 +19,8 @@
</span><span class="cx">         RightTruncateStringToWidth
</span><span class="cx">         WebKitSetShouldUseFontSmoothing
</span><span class="cx">         WebKitShouldUseFontSmoothing
</span><del>-
</del><ins>+        WebKitCreateInstance
+                
</ins><span class="cx">         ; These functions are deprecated
</span><span class="cx">         WebLocalizedString
</span><span class="cx">         WebLocalizedLPCTSTR
</span></span></pre></div>
<a id="trunkWebKitwinWebKitvcprojWebKitvcproj"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -58,11 +58,11 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCLinkerTool&quot;
</span><del>-                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib crypt32.lib iphlpapi.lib winmm.lib&quot;
</del><ins>+                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib crypt32.lib iphlpapi.lib winmm.lib rpcrt4.lib&quot;
</ins><span class="cx">                                 OutputFile=&quot;$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll&quot;
</span><span class="cx">                                 AdditionalLibraryDirectories=&quot;&quot;
</span><span class="cx">                                 ModuleDefinitionFile=&quot;WebKit$(WebKitDLLConfigSuffix).def&quot;
</span><del>-                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll&quot;
</del><ins>+                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll;rpcrt4.dll&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCALinkTool&quot;
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCPostBuildEventTool&quot;
</span><del>-                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ForEachCoClass.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ProgIDMacros.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\incl
 ude\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&am
 p;quot;&amp;#x0D;&amp;#x0A;&quot;
</del><ins>+                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitCOMAPI.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOut
 putDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot;&amp;#x0D;&amp;#x0A;&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                 &lt;/Configuration&gt;
</span><span class="cx">                 &lt;Configuration
</span><span class="lines">@@ -134,11 +134,11 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCLinkerTool&quot;
</span><del>-                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib crypt32.lib iphlpapi.lib winmm.lib&quot;
</del><ins>+                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib crypt32.lib iphlpapi.lib winmm.lib rpcrt4.lib&quot;
</ins><span class="cx">                                 OutputFile=&quot;$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll&quot;
</span><span class="cx">                                 AdditionalLibraryDirectories=&quot;&quot;
</span><span class="cx">                                 ModuleDefinitionFile=&quot;WebKit$(WebKitDLLConfigSuffix).def&quot;
</span><del>-                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll&quot;
</del><ins>+                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll;rpcrt4.dll&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCALinkTool&quot;
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCPostBuildEventTool&quot;
</span><del>-                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ForEachCoClass.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ProgIDMacros.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\incl
 ude\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&am
 p;quot;&amp;#x0D;&amp;#x0A;&quot;
</del><ins>+                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitCOMAPI.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOut
 putDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot;&amp;#x0D;&amp;#x0A;&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                 &lt;/Configuration&gt;
</span><span class="cx">                 &lt;Configuration
</span><span class="lines">@@ -210,11 +210,11 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCLinkerTool&quot;
</span><del>-                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib crypt32.lib iphlpapi.lib winmm.lib&quot;
</del><ins>+                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib QTMovieWin$(WebKitConfigSuffix).lib crypt32.lib iphlpapi.lib winmm.lib rpcrt4.lib&quot;
</ins><span class="cx">                                 OutputFile=&quot;$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll&quot;
</span><span class="cx">                                 AdditionalLibraryDirectories=&quot;&quot;
</span><span class="cx">                                 ModuleDefinitionFile=&quot;WebKit$(WebKitDLLConfigSuffix).def&quot;
</span><del>-                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll&quot;
</del><ins>+                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll;iphlpapi.dll;rpcrt4.dll&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCALinkTool&quot;
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCPostBuildEventTool&quot;
</span><del>-                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ForEachCoClass.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ProgIDMacros.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\incl
 ude\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&am
 p;quot;&amp;#x0D;&amp;#x0A;&quot;
</del><ins>+                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitCOMAPI.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOut
 putDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot;&amp;#x0D;&amp;#x0A;&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                 &lt;/Configuration&gt;
</span><span class="cx">                 &lt;Configuration
</span><span class="lines">@@ -287,11 +287,11 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCLinkerTool&quot;
</span><del>-                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite_Debug.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib cairo.lib giflib.lib jpeg.lib libpng.lib libcurl_imp.lib ws2_32.lib wininet.lib Wldap32.lib iphlpapi.lib winmm.lib&quot;
</del><ins>+                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite_Debug.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib cairo.lib giflib.lib jpeg.lib libpng.lib libcurl_imp.lib ws2_32.lib wininet.lib Wldap32.lib iphlpapi.lib winmm.lib rpcrt4.lib&quot;
</ins><span class="cx">                                 OutputFile=&quot;$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll&quot;
</span><span class="cx">                                 AdditionalLibraryDirectories=&quot;&quot;
</span><span class="cx">                                 ModuleDefinitionFile=&quot;WebKit_Cairo$(WebKitDLLConfigSuffix).def&quot;
</span><del>-                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll&quot;
</del><ins>+                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll;rpcrt4.dll&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCALinkTool&quot;
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCPostBuildEventTool&quot;
</span><del>-                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ForEachCoClass.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ProgIDMacros.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\incl
 ude\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&am
 p;quot;&amp;#x0D;&amp;#x0A;&quot;
</del><ins>+                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitCOMAPI.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOut
 putDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot;&amp;#x0D;&amp;#x0A;&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                 &lt;/Configuration&gt;
</span><span class="cx">                 &lt;Configuration
</span><span class="lines">@@ -366,11 +366,11 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCLinkerTool&quot;
</span><del>-                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib cairo.lib giflib.lib jpeg.lib libpng.lib libcurl_imp.lib ws2_32.lib wininet.lib Wldap32.lib iphlpapi.lib winmm.lib&quot;
</del><ins>+                                AdditionalDependencies=&quot;delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib cairo.lib giflib.lib jpeg.lib libpng.lib libcurl_imp.lib ws2_32.lib wininet.lib Wldap32.lib iphlpapi.lib winmm.lib rpcrt4.lib&quot;
</ins><span class="cx">                                 OutputFile=&quot;$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll&quot;
</span><span class="cx">                                 AdditionalLibraryDirectories=&quot;&quot;
</span><span class="cx">                                 ModuleDefinitionFile=&quot;WebKit_Cairo$(WebKitDLLConfigSuffix).def&quot;
</span><del>-                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll&quot;
</del><ins>+                                DelayLoadDLLs=&quot;comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll;rpcrt4.dll&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCALinkTool&quot;
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCPostBuildEventTool&quot;
</span><del>-                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ForEachCoClass.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\ProgIDMacros.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\incl
 ude\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&am
 p;quot;&amp;#x0D;&amp;#x0A;&quot;
</del><ins>+                                CommandLine=&quot;mkdir 2&amp;gt;NUL &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebLocalizableStrings.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitGraphics.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)\..\WebKitCOMAPI.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npfunctions.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npapi.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime.h&amp;quot; &amp;quot;$(WebKitOut
 putDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(WebKitOutputDir)\include\WebCore\npruntime_internal.h&amp;quot; &amp;quot;$(WebKitOutputDir)\include\WebKit&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\$(ProjectName).resources\*&amp;quot; &amp;quot;$(OutDir)\$(ProjectName).resources&amp;quot;&amp;#x0D;&amp;#x0A;mkdir 2&amp;gt;NUL &amp;quot;$(OutDir)\WebKit.resources\en.lproj&amp;quot;&amp;#x0D;&amp;#x0A;xcopy /y /d &amp;quot;$(ProjectDir)..\..\English.lproj\Localizable.strings&amp;quot; &amp;quot;$(OutDir)\WebKit.resources\en.lproj\&amp;quot;&amp;#x0D;&amp;#x0A;&amp;#x0D;&amp;#x0A;if exist &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot; del &amp;quot;$(WebKitOutputDir)\buildfailed&amp;quot;&amp;#x0D;&amp;#x0A;&quot;
</ins><span class="cx">                         /&gt;
</span><span class="cx">                 &lt;/Configuration&gt;
</span><span class="cx">         &lt;/Configurations&gt;
</span><span class="lines">@@ -1186,6 +1186,10 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><ins>+                                RelativePath=&quot;..\WebKitCOMAPI.cpp&quot;
+                                &gt;
+                        &lt;/File&gt;
+                        &lt;File
</ins><span class="cx">                                 RelativePath=&quot;..\WebKitGraphics.cpp&quot;
</span><span class="cx">                                 &gt;
</span><span class="cx">                                 &lt;FileConfiguration
</span></span></pre></div>
<a id="trunkWebKitwinWebKitvcprojWebKit_debugdef"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebKit.vcproj/WebKit_debug.def (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebKit.vcproj/WebKit_debug.def        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKit/win/WebKit.vcproj/WebKit_debug.def        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -19,7 +19,8 @@
</span><span class="cx">         RightTruncateStringToWidth
</span><span class="cx">         WebKitSetShouldUseFontSmoothing
</span><span class="cx">         WebKitShouldUseFontSmoothing
</span><del>-
</del><ins>+        WebKitCreateInstance
+                
</ins><span class="cx">         ; These functions are deprecated
</span><span class="cx">         WebLocalizedString
</span><span class="cx">         WebLocalizedLPCTSTR
</span></span></pre></div>
<a id="trunkWebKitwinWebKitCOMAPIcpp"></a>
<div class="addfile"><h4>Added: trunk/WebKit/win/WebKitCOMAPI.cpp (0 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebKitCOMAPI.cpp                                (rev 0)
+++ trunk/WebKit/win/WebKitCOMAPI.cpp        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include &quot;config.h&quot;
+#include &quot;WebKitCOMAPI.h&quot;
+
+#include &quot;WebKit.h&quot;
+#include &quot;WebKitDLL.h&quot;
+
+#include &lt;WebCore/COMPtr.h&gt;
+
+struct CLSIDHash {
+    static unsigned hash(const CLSID&amp; clsid)
+    {
+        RPC_STATUS status;
+        return ::UuidHash(const_cast&lt;CLSID*&gt;(&amp;clsid), &amp;status);
+    }
+    static bool equal(const CLSID&amp; a, const CLSID&amp; b) { return ::IsEqualCLSID(a, b); }
+    static const bool safeToCompareToEmptyOrDeleted = true;
+};
+
+struct CLSIDHashTraits : WTF::GenericHashTraits&lt;CLSID&gt; {
+    static void constructDeletedValue(CLSID&amp; slot) { slot = CLSID_NULL; }
+    static bool isDeletedValue(const CLSID&amp; value) { return value == CLSID_NULL; }
+};
+
+static COMPtr&lt;IClassFactory&gt; classFactory(const CLSID&amp; clsid)
+{
+    typedef HashMap&lt;CLSID, COMPtr&lt;IClassFactory&gt;, CLSIDHash, CLSIDHashTraits&gt; FactoryMap;
+    static FactoryMap&amp; factories = *new FactoryMap;
+
+    COMPtr&lt;IClassFactory&gt;&amp; factory = factories.add(clsid, 0).first-&gt;second;
+    if (!factory &amp;&amp; FAILED(DllGetClassObject(clsid, __uuidof(factory), reinterpret_cast&lt;void**&gt;(&amp;factory))))
+        factory = 0;
+
+    return factory;
+}
+
+HRESULT WebKitCreateInstance(REFCLSID rclsid, IUnknown *pUnkOuter, REFIID riid, void **ppvObject)
+{
+    COMPtr&lt;IClassFactory&gt; factory = classFactory(rclsid);
+    if (!factory)
+        return REGDB_E_CLASSNOTREG;
+
+    return factory-&gt;CreateInstance(pUnkOuter, riid, ppvObject);
+}
</ins><span class="cx">Property changes on: trunk/WebKit/win/WebKitCOMAPI.cpp
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkWebKitwinWebKitCOMAPIh"></a>
<div class="addfile"><h4>Added: trunk/WebKit/win/WebKitCOMAPI.h (0 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebKitCOMAPI.h                                (rev 0)
+++ trunk/WebKit/win/WebKitCOMAPI.h        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebKitCOMAPI_h
+#define WebKitCOMAPI_h
+
+extern &quot;C&quot; {
+
+// Callers should use this API instead of CoCreateInstance to instantiate WebKit COM classes.
+// This bypasses CoCreateInstance entirely, so registry keys and isolated COM manifests aren't needed.
+HRESULT WebKitCreateInstance(REFCLSID, IUnknown* pUnkOuter, REFIID, void** ppvObject);
+
+}
+
+#endif // !defined(WebKitCOMAPI_h)
</ins><span class="cx">Property changes on: trunk/WebKit/win/WebKitCOMAPI.h
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKitTools/ChangeLog        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2009-04-21  Steve Falkenburg  &lt;sfalken@apple.com&gt;
+
+        Use new WebKitCreateInstance API instead of CoCreateInstance
+        or COMPtr's createInstance to instantiate WebKit COM objects.
+
+        Reviewed by Adam Roben.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (initialize):
+        (runTest):
+        (createWebViewAndOffscreenWindow):
+        (main):
+        * DumpRenderTree/win/DumpRenderTree.vcproj:
+        * DumpRenderTree/win/GCControllerWin.cpp:
+        (GCController::collect):
+        (GCController::collectOnAlternateThread):
+        (GCController::getJSObjectCount):
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::keepWebHistory):
+        (LayoutTestController::webHistoryItemCount):
+        (LayoutTestController::setIconDatabaseEnabled):
+        * DumpRenderTree/win/WorkQueueItemWin.cpp:
+        (LoadItem::invoke):
+
</ins><span class="cx"> 2009-04-20  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Stop using the fullDocumentTeardownEnabled WebPreference methods.
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> #include &lt;CFNetwork/CFURLCachePriv.h&gt;
</span><span class="cx"> #include &lt;CoreFoundation/CoreFoundation.h&gt;
</span><span class="cx"> #include &lt;JavaScriptCore/JavaScriptCore.h&gt;
</span><del>-#include &lt;WebKit/ForEachCoClass.h&gt;
</del><span class="cx"> #include &lt;WebKit/WebKit.h&gt;
</span><ins>+#include &lt;WebKit/WebKitCOMAPI.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> using namespace std;
</span><span class="cx"> 
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">     wstring resourcesPath = fontsPath();
</span><span class="cx"> 
</span><span class="cx">     COMPtr&lt;IWebTextRenderer&gt; textRenderer;
</span><del>-    if (SUCCEEDED(CoCreateInstance(CLSID_WebTextRenderer, 0, CLSCTX_ALL, IID_IWebTextRenderer, (void**)&amp;textRenderer)))
</del><ins>+    if (SUCCEEDED(WebKitCreateInstance(CLSID_WebTextRenderer, 0, IID_IWebTextRenderer, (void**)&amp;textRenderer)))
</ins><span class="cx">         for (int i = 0; i &lt; ARRAYSIZE(fontsToInstall); ++i)
</span><span class="cx">             textRenderer-&gt;registerPrivateFont(wstring(resourcesPath + fontsToInstall[i]).c_str());
</span><span class="cx"> 
</span><span class="lines">@@ -740,8 +740,8 @@
</span><span class="cx">     if (shouldLogFrameLoadDelegates(pathOrURL.c_str()))
</span><span class="cx">         gLayoutTestController-&gt;setDumpFrameLoadCallbacks(true);
</span><span class="cx"> 
</span><del>-    COMPtr&lt;IWebHistory&gt; history(Create, CLSID_WebHistory);
-    if (history)
</del><ins>+    COMPtr&lt;IWebHistory&gt; history;
+    if (SUCCEEDED(WebKitCreateInstance(CLSID_WebHistory, 0, __uuidof(history), reinterpret_cast&lt;void**&gt;(&amp;history))))
</ins><span class="cx">         history-&gt;setOptionalSharedHistory(0);
</span><span class="cx"> 
</span><span class="cx">     resetWebViewToConsistentStateBeforeTesting();
</span><span class="lines">@@ -761,7 +761,7 @@
</span><span class="cx">     webView-&gt;hostWindow(reinterpret_cast&lt;OLE_HANDLE*&gt;(&amp;hostWindow));
</span><span class="cx"> 
</span><span class="cx">     COMPtr&lt;IWebMutableURLRequest&gt; request;
</span><del>-    HRESULT hr = CoCreateInstance(CLSID_WebMutableURLRequest, 0, CLSCTX_ALL, IID_IWebMutableURLRequest, (void**)&amp;request);
</del><ins>+    HRESULT hr = WebKitCreateInstance(CLSID_WebMutableURLRequest, 0, IID_IWebMutableURLRequest, (void**)&amp;request);
</ins><span class="cx">     if (FAILED(hr))
</span><span class="cx">         goto exit;
</span><span class="cx"> 
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx"> 
</span><span class="cx">     IWebView* webView;
</span><span class="cx"> 
</span><del>-    HRESULT hr = CoCreateInstance(CLSID_WebView, 0, CLSCTX_ALL, IID_IWebView, (void**)&amp;webView);
</del><ins>+    HRESULT hr = WebKitCreateInstance(CLSID_WebView, 0, IID_IWebView, (void**)&amp;webView);
</ins><span class="cx">     if (FAILED(hr)) {
</span><span class="cx">         fprintf(stderr, &quot;Failed to create CLSID_WebView instance, error 0x%x\n&quot;, hr);
</span><span class="cx">         return 0;
</span><span class="lines">@@ -1096,7 +1096,7 @@
</span><span class="cx"> 
</span><span class="cx">     COMPtr&lt;IWebIconDatabase&gt; iconDatabase;
</span><span class="cx">     COMPtr&lt;IWebIconDatabase&gt; tmpIconDatabase;
</span><del>-    if (FAILED(CoCreateInstance(CLSID_WebIconDatabase, 0, CLSCTX_ALL, IID_IWebIconDatabase, (void**)&amp;tmpIconDatabase)))
</del><ins>+    if (FAILED(WebKitCreateInstance(CLSID_WebIconDatabase, 0, IID_IWebIconDatabase, (void**)&amp;tmpIconDatabase)))
</ins><span class="cx">         return -1;
</span><span class="cx">     if (FAILED(tmpIconDatabase-&gt;sharedIconDatabase(&amp;iconDatabase)))
</span><span class="cx">         return -1;
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreewinDumpRenderTreevcproj"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -66,8 +66,6 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCManifestTool&quot;
</span><del>-                                TypeLibraryFile=&quot;$(WebKitOutputDir)\lib\WebKit.tlb&quot;
-                                ComponentFileName=&quot;WebKit$(WebKitDLLConfigSuffix)&quot;
</del><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCXDCMakeTool&quot;
</span><span class="lines">@@ -141,8 +139,6 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCManifestTool&quot;
</span><del>-                                TypeLibraryFile=&quot;$(WebKitOutputDir)\lib\WebKit.tlb&quot;
-                                ComponentFileName=&quot;WebKit$(WebKitDLLConfigSuffix)&quot;
</del><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCXDCMakeTool&quot;
</span><span class="lines">@@ -214,8 +210,6 @@
</span><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCManifestTool&quot;
</span><del>-                                TypeLibraryFile=&quot;$(WebKitOutputDir)\lib\WebKit.tlb&quot;
-                                ComponentFileName=&quot;WebKit$(WebKitDLLConfigSuffix)&quot;
</del><span class="cx">                         /&gt;
</span><span class="cx">                         &lt;Tool
</span><span class="cx">                                 Name=&quot;VCXDCMakeTool&quot;
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreewinGCControllerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKitTools/DumpRenderTree/win/GCControllerWin.cpp        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -32,11 +32,12 @@
</span><span class="cx"> #include &quot;DumpRenderTree.h&quot;
</span><span class="cx"> #include &lt;WebCore/COMPtr.h&gt;
</span><span class="cx"> #include &lt;WebKit/WebKit.h&gt;
</span><ins>+#include &lt;WebKit/WebKitCOMAPI.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> void GCController::collect() const
</span><span class="cx"> {
</span><span class="cx">     COMPtr&lt;IWebJavaScriptCollector&gt; collector;
</span><del>-    if (FAILED(::CoCreateInstance(CLSID_WebJavaScriptCollector, 0, CLSCTX_ALL, IID_IWebJavaScriptCollector, (void**)&amp;collector)))
</del><ins>+    if (FAILED(WebKitCreateInstance(CLSID_WebJavaScriptCollector, 0, IID_IWebJavaScriptCollector, (void**)&amp;collector)))
</ins><span class="cx">         return;
</span><span class="cx">     collector-&gt;collect();
</span><span class="cx"> }
</span><span class="lines">@@ -44,7 +45,7 @@
</span><span class="cx"> void GCController::collectOnAlternateThread(bool waitUntilDone) const
</span><span class="cx"> {
</span><span class="cx">     COMPtr&lt;IWebJavaScriptCollector&gt; collector;
</span><del>-    if (FAILED(::CoCreateInstance(CLSID_WebJavaScriptCollector, 0, CLSCTX_ALL, IID_IWebJavaScriptCollector, (void**)&amp;collector)))
</del><ins>+    if (FAILED(WebKitCreateInstance(CLSID_WebJavaScriptCollector, 0, IID_IWebJavaScriptCollector, (void**)&amp;collector)))
</ins><span class="cx">         return;
</span><span class="cx">     collector-&gt;collectOnAlternateThread(waitUntilDone ? TRUE : FALSE);
</span><span class="cx"> }
</span><span class="lines">@@ -52,7 +53,7 @@
</span><span class="cx"> size_t GCController::getJSObjectCount() const
</span><span class="cx"> {
</span><span class="cx">     COMPtr&lt;IWebJavaScriptCollector&gt; collector;
</span><del>-    if (FAILED(::CoCreateInstance(CLSID_WebJavaScriptCollector, 0, CLSCTX_ALL, IID_IWebJavaScriptCollector, (void**)&amp;collector)))
</del><ins>+    if (FAILED(WebKitCreateInstance(CLSID_WebJavaScriptCollector, 0, IID_IWebJavaScriptCollector, (void**)&amp;collector)))
</ins><span class="cx">         return 0;
</span><span class="cx">     UINT objects = 0;
</span><span class="cx">     collector-&gt;objectCount(&amp;objects);
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreewinLayoutTestControllerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include &lt;JavaScriptCore/JSRetainPtr.h&gt;
</span><span class="cx"> #include &lt;JavaScriptCore/JSStringRefBSTR.h&gt;
</span><span class="cx"> #include &lt;WebKit/WebKit.h&gt;
</span><ins>+#include &lt;WebKit/WebKitCOMAPI.h&gt;
</ins><span class="cx"> #include &lt;string&gt;
</span><span class="cx"> #include &lt;CoreFoundation/CoreFoundation.h&gt;
</span><span class="cx"> #include &lt;shlwapi.h&gt;
</span><span class="lines">@@ -127,12 +128,12 @@
</span><span class="cx"> 
</span><span class="cx"> void LayoutTestController::keepWebHistory()
</span><span class="cx"> {
</span><del>-    COMPtr&lt;IWebHistory&gt; history(Create, CLSID_WebHistory);
-    if (!history)
</del><ins>+    COMPtr&lt;IWebHistory&gt; history;
+    if (FAILED(WebKitCreateInstance(CLSID_WebHistory, 0, __uuidof(history), reinterpret_cast&lt;void**&gt;(&amp;history))))
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    COMPtr&lt;IWebHistory&gt; sharedHistory(Create, CLSID_WebHistory);
-    if (!sharedHistory)
</del><ins>+    COMPtr&lt;IWebHistory&gt; sharedHistory;
+    if (FAILED(WebKitCreateInstance(CLSID_WebHistory, 0, __uuidof(sharedHistory), reinterpret_cast&lt;void**&gt;(&amp;sharedHistory))))
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     history-&gt;setOptionalSharedHistory(sharedHistory.get());
</span><span class="lines">@@ -145,8 +146,8 @@
</span><span class="cx"> 
</span><span class="cx"> size_t LayoutTestController::webHistoryItemCount()
</span><span class="cx"> {
</span><del>-    COMPtr&lt;IWebHistory&gt; history(Create, CLSID_WebHistory);
-    if (!history)
</del><ins>+    COMPtr&lt;IWebHistory&gt; history;
+    if (FAILED(WebKitCreateInstance(CLSID_WebHistory, 0, __uuidof(history), reinterpret_cast&lt;void**&gt;(&amp;history))))
</ins><span class="cx">         return 0;
</span><span class="cx"> 
</span><span class="cx">     COMPtr&lt;IWebHistory&gt; sharedHistory;
</span><span class="lines">@@ -276,7 +277,7 @@
</span><span class="cx">     // See also &lt;rdar://problem/6480108&gt;
</span><span class="cx">     COMPtr&lt;IWebIconDatabase&gt; iconDatabase;
</span><span class="cx">     COMPtr&lt;IWebIconDatabase&gt; tmpIconDatabase;
</span><del>-    if (FAILED(CoCreateInstance(CLSID_WebIconDatabase, 0, CLSCTX_ALL, IID_IWebIconDatabase, (void**)&amp;tmpIconDatabase)))
</del><ins>+    if (FAILED(WebKitCreateInstance(CLSID_WebIconDatabase, 0, IID_IWebIconDatabase, (void**)&amp;tmpIconDatabase)))
</ins><span class="cx">         return;
</span><span class="cx">     if (FAILED(tmpIconDatabase-&gt;sharedIconDatabase(&amp;iconDatabase)))
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreewinWorkQueueItemWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp (42725 => 42726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp        2009-04-21 20:21:50 UTC (rev 42725)
+++ trunk/WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp        2009-04-21 20:42:20 UTC (rev 42726)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include &quot;DumpRenderTree.h&quot;
</span><span class="cx"> #include &lt;WebCore/COMPtr.h&gt;
</span><span class="cx"> #include &lt;WebKit/WebKit.h&gt;
</span><ins>+#include &lt;WebKit/WebKitCOMAPI.h&gt;
</ins><span class="cx"> #include &lt;JavaScriptCore/JSStringRef.h&gt;
</span><span class="cx"> #include &lt;JavaScriptCore/JSStringRefCF.h&gt;
</span><span class="cx"> #include &lt;JavaScriptCore/RetainPtr.h&gt;
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     COMPtr&lt;IWebURLRequest&gt; request;
</span><del>-    if (FAILED(CoCreateInstance(CLSID_WebURLRequest, 0, CLSCTX_ALL, IID_IWebURLRequest, (void**)&amp;request)))
</del><ins>+    if (FAILED(WebKitCreateInstance(CLSID_WebURLRequest, 0, IID_IWebURLRequest, (void**)&amp;request)))
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     wstring urlString = jsStringRefToWString(m_url.get());
</span></span></pre>
</div>
</div>

</body>
</html>