Changeset 23566 in webkit

Timestamp:

Jun 18, 2007, 9:58:33 AM (17 years ago)

Author:

bdash

Message:

2007-06-18 Jake Helfert <​jake@jakeonthenet.com>

Reviewed by Adam.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14154 Spinneret doesn't build against the new Win32 port.

• Spinneret/Spinneret/Spinneret.cpp: (_tWinMain):

-Changed IWebViewExt to IWebViewPrivate
-Changed Co[Un]initialize to Ole[Un]initialize because WebKit now calls

the WIN32 function RegisterDragDrop which requires the Ole* calls.

• Spinneret/Spinneret/Spinneret.h: (SpinneretWebHost::didReceiveIcon): Updated method signature. (SpinneretWebHost::willPerformClientRedirectToURL): Updated method signature. (SpinneretWebHost::windowScriptObjectAvailable): Updated method signature.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Spinneret/Spinneret/Spinneret.cpp (modified) (5 diffs)
• Spinneret/Spinneret/Spinneret.h (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-06-18  Jake Helfert  <jake@jakeonthenet.com>
+
+        Reviewed by Adam.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14154
+          Spinneret doesn't build against the new Win32 port.
+
+        * Spinneret/Spinneret/Spinneret.cpp:
+        (_tWinMain): 
+            -Changed IWebViewExt to IWebViewPrivate
+            -Changed Co[Un]initialize to Ole[Un]initialize because WebKit now calls
+             the WIN32 function RegisterDragDrop which requires the Ole* calls.
+        * Spinneret/Spinneret/Spinneret.h:
+        (SpinneretWebHost::didReceiveIcon): Updated method signature.
+        (SpinneretWebHost::willPerformClientRedirectToURL): Updated method signature.
+        (SpinneretWebHost::windowScriptObjectAvailable): Updated method signature.
+
 2007-06-14  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/Spinneret/Spinneret/Spinneret.cpp

@@ -167 +167 @@
 
     // Init COM
-    CoInitialize(NULL);
+    OleInitialize(NULL);
 
     hURLBarWnd = CreateWindow(L"EDIT", 0,
@@ -190 +190 @@
         goto exit;
 
-    hr = gWebView->setHostWindow(hMainWnd);
+    hr = gWebView->setHostWindow((OLE_HANDLE) hMainWnd);
     if (FAILED(hr))
         goto exit;
@@ -196 +196 @@
     RECT clientRect;
     GetClientRect(hMainWnd, &clientRect);
-    hr = gWebView->initWithFrame(&clientRect, 0, 0);
+    hr = gWebView->initWithFrame(clientRect, 0, 0);
     if (FAILED(hr))
         goto exit;
@@ -210 +210 @@
     frame->Release();
 
-    IWebViewExt* viewExt;
-    hr = gWebView->QueryInterface(IID_IWebViewExt, (void**)&viewExt);
-    if (FAILED(hr))
-        goto exit;
-    hr = viewExt->viewWindow(&gViewWindow);
+    IWebViewPrivate* viewExt;
+    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 +241 @@
 
     // Shut down COM.
-    CoUninitialize();
+    OleUninitialize();
     
     return (int) msg.wParam;

trunk/WebKitTools/Spinneret/Spinneret/Spinneret.h

@@ -65 +65 @@
     virtual HRESULT STDMETHODCALLTYPE didReceiveIcon( 
         /* [in] */ IWebView *webView,
-        /* [in] */ IWebImage *image,
+        /* [in] */ OLE_HANDLE hBitmap,
         /* [in] */ IWebFrame *frame) { return S_OK; }
     
@@ -80 +80 @@
         /* [in] */ IWebView *webView,
         /* [in] */ IWebFrame *frame) { return S_OK; }
-    
+
     virtual HRESULT STDMETHODCALLTYPE willPerformClientRedirectToURL( 
         /* [in] */ IWebView *webView,
         /* [in] */ BSTR url,
-        UINT delaySeconds,
-        /* [in] */ UINT fireDate,
+        /* [in] */ double delaySeconds,
+        /* [in] */ DATE fireDate,
         /* [in] */ IWebFrame *frame) { return S_OK; }
     
@@ -96 +96 @@
         /* [in] */ IWebFrame *frame) { return S_OK; }
     
-    virtual HRESULT STDMETHODCALLTYPE windowScriptObjectAvailable( 
+    virtual /* [local] */ HRESULT STDMETHODCALLTYPE windowScriptObjectAvailable( 
         /* [in] */ IWebView *webView,
-        /* [in] */ IWebScriptObject *windowScriptObject) { return S_OK; }
+        /* [in] */ JSContextRef context,
+        /* [in] */ JSObjectRef windowScriptObject)  { return S_OK; }
 
     // SpinneretWebHost