Commit 72b53161 authored by bdash's avatar bdash

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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@23566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fe085aa3
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>
Reviewed by Brady.
......
......@@ -166,7 +166,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
return FALSE;
// Init COM
CoInitialize(NULL);
OleInitialize(NULL);
hURLBarWnd = CreateWindow(L"EDIT", 0,
WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT | ES_AUTOVSCROLL,
......@@ -189,13 +189,13 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
if (FAILED(hr))
goto exit;
hr = gWebView->setHostWindow(hMainWnd);
hr = gWebView->setHostWindow((OLE_HANDLE) hMainWnd);
if (FAILED(hr))
goto exit;
RECT clientRect;
GetClientRect(hMainWnd, &clientRect);
hr = gWebView->initWithFrame(&clientRect, 0, 0);
hr = gWebView->initWithFrame(clientRect, 0, 0);
if (FAILED(hr))
goto exit;
......@@ -209,11 +209,11 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
frame->loadHTMLString(defaultHTML, 0);
frame->Release();
IWebViewExt* viewExt;
hr = gWebView->QueryInterface(IID_IWebViewExt, (void**)&viewExt);
IWebViewPrivate* viewExt;
hr = gWebView->QueryInterface(IID_IWebViewPrivate, (void**)&viewExt);
if (FAILED(hr))
goto exit;
hr = viewExt->viewWindow(&gViewWindow);
hr = viewExt->viewWindow((OLE_HANDLE*) &gViewWindow);
viewExt->Release();
if (FAILED(hr) || !gViewWindow)
goto exit;
......@@ -240,7 +240,7 @@ exit:
#endif
// Shut down COM.
CoUninitialize();
OleUninitialize();
return (int) msg.wParam;
}
......
......@@ -64,7 +64,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE didReceiveIcon(
/* [in] */ IWebView *webView,
/* [in] */ IWebImage *image,
/* [in] */ OLE_HANDLE hBitmap,
/* [in] */ IWebFrame *frame) { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE didFinishLoadForFrame(
......@@ -79,12 +79,12 @@ public:
virtual HRESULT STDMETHODCALLTYPE didChangeLocationWithinPageForFrame(
/* [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; }
virtual HRESULT STDMETHODCALLTYPE didCancelClientRedirectForFrame(
......@@ -95,9 +95,10 @@ public:
/* [in] */ IWebView *webView,
/* [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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment