3 files changed, 24 insertions, 19 deletions
diff --git a/WebKitTools/WinLauncher/WinLauncher.cpp b/WebKitTools/WinLauncher/WinLauncher.cpp
index 035077d..2dda619 100644
--- a/WebKitTools/WinLauncher/WinLauncher.cpp
+++ b/WebKitTools/WinLauncher/WinLauncher.cpp
@@ -25,7 +25,7 @@
 
 #include "stdafx.h"
 #include "WinLauncher.h"
-#include "WebKit.h"
+#include <WebKit/WebKitCOMAPI.h>
 
 #include <commctrl.h>
 #include <objbase.h>
@@ -177,7 +177,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
     SetWindowLong(hURLBarWnd, GWL_WNDPROC,(long)MyEditProc);
     SetFocus(hURLBarWnd);
 
-    HRESULT hr = CoCreateInstance(CLSID_WebView, 0, CLSCTX_ALL, IID_IWebView, (void**)&gWebView);
+    HRESULT hr = WebKitCreateInstance(CLSID_WebView, 0, IID_IWebView, (void**)&gWebView);
     if (FAILED(hr))
         goto exit;
 
@@ -201,9 +201,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
     hr = gWebView->mainFrame(&frame);
     if (FAILED(hr))
         goto exit;
-    static BSTR defaultHTML = 0;
-    if (!defaultHTML)
-        defaultHTML = SysAllocString(TEXT("<p style=\"background-color: #00FF00\">Testing</p><img src=\"http://webkit.org/images/icon-gold.png\" alt=\"Face\"><div style=\"border: solid blue\" contenteditable=\"true\">div with blue border</div><ul><li>foo<li>bar<li>baz</ul>"));
+
+    static BSTR defaultHTML = SysAllocString(TEXT("<p style=\"background-color: #00FF00\">Testing</p><img src=\"http://webkit.org/images/icon-gold.png\" alt=\"Face\"><div style=\"border: solid blue\" contenteditable=\"true\">div with blue border</div><ul><li>foo<li>bar<li>baz</ul>"));
     frame->loadHTMLString(defaultHTML, 0);
     frame->Release();
 
@@ -211,6 +210,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
     hr = gWebView->QueryInterface(IID_IWebViewPrivate, (void**)&viewExt);
     if (FAILED(hr))
         goto exit;
+
     hr = viewExt->viewWindow((OLE_HANDLE*) &gViewWindow);
     viewExt->Release();
     if (FAILED(hr) || !gViewWindow)
@@ -241,7 +241,7 @@ exit:
     // Shut down COM.
     OleUninitialize();
     
-    return (int) msg.wParam;
+    return static_cast<int>(msg.wParam);
 }
 
 ATOM MyRegisterClass(HINSTANCE hInstance)
@@ -324,7 +324,7 @@ LRESULT CALLBACK MyEditProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPara
 {
     switch (message) {
         case WM_CHAR:
-            if( wParam == 13 ) { // Enter Key
+            if (wParam == 13) { // Enter Key
                 wchar_t strPtr[MAX_URL_LENGTH];
                 *((LPWORD)strPtr) = MAX_URL_LENGTH; 
                 int strLen = SendMessage(hDlg, EM_GETLINE, 0, (LPARAM)strPtr);
@@ -367,23 +367,22 @@ static void loadURL(BSTR urlBStr)
 {
     IWebFrame* frame = 0;
     IWebMutableURLRequest* request = 0;
-    static BSTR methodBStr = 0;
 
-    if (!methodBStr)
-        methodBStr = SysAllocString(TEXT("GET"));
+    static BSTR methodBStr = SysAllocString(TEXT("GET"));
 
     if (urlBStr && urlBStr[0] && (PathFileExists(urlBStr) || PathIsUNC(urlBStr))) {
         TCHAR fileURL[INTERNET_MAX_URL_LENGTH];
         DWORD fileURLLength = sizeof(fileURL)/sizeof(fileURL[0]);
+
         if (SUCCEEDED(UrlCreateFromPath(urlBStr, fileURL, &fileURLLength, 0)))
-            urlBStr = fileURL;
+            SysReAllocString(&urlBStr, fileURL);
     }
 
     HRESULT hr = gWebView->mainFrame(&frame);
     if (FAILED(hr))
         goto exit;
 
-    hr = CoCreateInstance(CLSID_WebMutableURLRequest, 0, CLSCTX_ALL, IID_IWebMutableURLRequest, (void**)&request);
+    hr = WebKitCreateInstance(CLSID_WebMutableURLRequest, 0, IID_IWebMutableURLRequest, (void**)&request);
     if (FAILED(hr))
         goto exit;
 
diff --git a/WebKitTools/WinLauncher/WinLauncher.h b/WebKitTools/WinLauncher/WinLauncher.h
index 1f57bff..03e9dd5 100644
--- a/WebKitTools/WinLauncher/WinLauncher.h
+++ b/WebKitTools/WinLauncher/WinLauncher.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "resource.h"
-#include "WebKit.h"
+#include <WebKit/WebKit.h>
 
 class WinLauncherWebHost : public IWebFrameLoadDelegate
 {
@@ -99,6 +99,12 @@ public:
         /* [in] */ JSContextRef context,
         /* [in] */ JSObjectRef windowScriptObject)  { return S_OK; }
 
+    virtual /* [local] */ HRESULT STDMETHODCALLTYPE didClearWindowObject( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ JSContextRef context,
+        /* [in] */ JSObjectRef windowScriptObject,
+        /* [in] */ IWebFrame *frame) { return S_OK; }
+
     // WinLauncherWebHost
 
 protected:
diff --git a/WebKitTools/WinLauncher/WinLauncher.vcproj b/WebKitTools/WinLauncher/WinLauncher.vcproj
index d1002ea..7e3c761 100644
--- a/WebKitTools/WinLauncher/WinLauncher.vcproj
+++ b/WebKitTools/WinLauncher/WinLauncher.vcproj
@@ -74,8 +74,8 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
-				TypeLibraryFile="$(WebKitOutputDir)\lib\WebKit.tlb"
-				ComponentFileName="WebKit$(WebKitDLLConfigSuffix)"
+				TypeLibraryFile=""
+				ComponentFileName=""
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -156,8 +156,8 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
-				TypeLibraryFile="$(WebKitOutputDir)\lib\WebKit.tlb"
-				ComponentFileName="WebKit$(WebKitDLLConfigSuffix)"
+				TypeLibraryFile=""
+				ComponentFileName=""
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -237,8 +237,8 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
-				TypeLibraryFile="$(WebKitOutputDir)\lib\WebKit.tlb"
-				ComponentFileName="WebKit$(WebKitDLLConfigSuffix)"
+				TypeLibraryFile=""
+				ComponentFileName=""
 			/>
 			<Tool
 				Name="VCXDCMakeTool"