Reviewed by Steve.

        - fix <rdar://problem/5095701> Download requring HTTP auth fails
          (progress bar forever)

        The functions in WebDownload relating to authentication challenges needed
        to be implemented.

        * WebDownload.cpp:
        (WebDownload::cancelAuthenticationChallenge): Implement.
        (WebDownload::continueWithoutCredentialForAuthenticationChallenge): Ditto.
        (WebDownload::useCredential): Ditto.
        (WebDownload::willSendRequest): Fix storage leak by adopting request
        and response after creating them. Also retain the result before returning
        it, since that's the API contract with CFNetwork.
        (WebDownload::didReceiveAuthenticationChallenge): Implement.
        (WebDownload::didReceiveResponse): Fix storage leak by adopting response.
        (WebDownload::willResumeWithResponse): Ditto.
        (WebDownload::didFail): Ditto.

        * WebURLAuthenticationChallenge.h: Get rid of the IID #define,
        instead using __declspec(uuid). Added a sender parameter to the
        create function and an m_sender data member.
        * WebURLAuthenticationChallenge.cpp:
        (WebURLAuthenticationChallenge::WebURLAuthenticationChallenge): Added an
        explicit sender parameter so this can be used with a WebDownload, which
        does not involve a ResourceHandle. Later we should clean this up and not
        involve WebCore or ResourceHandle directly even for the non-download case.
        (WebURLAuthenticationChallenge::createInstance): Added an overload for the
        case with an explicit sender parameter.
        (WebURLAuthenticationChallenge::QueryInterface): Use __uuidof for the ID
        of this class. In general, we should move to __uuidof as much as possible
        and keep the separate macros to a minimum -- but we should do this for all
        uses of each class at one time to make sure we don't run into problems
        with two different UUIDs for the same class. This patch does it for three
        classes.
        (WebURLAuthenticationChallenge::initWithProtectionSpace): Use the query
        constructor instead of an explicit QueryInterface for WebURLCredential.
        This is another class where I'm switching from CLSID/IID macros to the
        use of __uuidof, but in this case the use of __uuidof is implicit.
        (WebURLAuthenticationChallenge::initWithAuthenticationChallenge): Ditto,
        but for WebURLAuthenticationChallenge and WebURLAuthenticationChallengeSender.
        (WebURLAuthenticationChallenge::sender): Use the new m_sender member to
        cache the sender object and also use the one that was passed into the
        constructor, if any.

        * WebURLAuthenticationChallengeSender.h: Get rid of the IID #define,
        instead using __declspec(uuid). Also minimize includes and make data
        members private instead of protected.
        * WebURLAuthenticationChallengeSender.cpp:
        (WebURLAuthenticationChallengeSender::QueryInterface): Use __uuidof instead
        of IID macro.
        (WebURLAuthenticationChallengeSender::cancelAuthenticationChallenge):
        Use query constructor instead of QueryInterface.
        (WebURLAuthenticationChallengeSender::continueWithoutCredentialForAuthenticationChallenge):
        Ditto.
        (WebURLAuthenticationChallengeSender::useCredential): Ditto.

        * WebURLCredential.cpp: (WebURLCredential::QueryInterface): Use __uuidof
        instead of CLSID_WebURLCredential.

        - tangentially-related cleanup

        * WebFrame.cpp:
        (WebFrame::dispatchDidReceiveAuthenticationChallenge): Use the adopt
        constructor instead of a separate adoptRef call.
        (WebFrame::dispatchDidCancelAuthenticationChallenge): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index d318597ce6dc4ddb86591d1b1af4b72ac11664d1..e8cb58a4cd08f40e50737b81ce86c8439b6a890e 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,73 @@
+2007-09-25  Darin Adler  <darin@apple.com>
+
+        Reviewed by Steve.
+
+        - fix <rdar://problem/5095701> Download requring HTTP auth fails
+          (progress bar forever)
+
+        The functions in WebDownload relating to authentication challenges needed
+        to be implemented.
+
+        * WebDownload.cpp:
+        (WebDownload::cancelAuthenticationChallenge): Implement.
+        (WebDownload::continueWithoutCredentialForAuthenticationChallenge): Ditto.
+        (WebDownload::useCredential): Ditto.
+        (WebDownload::willSendRequest): Fix storage leak by adopting request
+        and response after creating them. Also retain the result before returning
+        it, since that's the API contract with CFNetwork.
+        (WebDownload::didReceiveAuthenticationChallenge): Implement.
+        (WebDownload::didReceiveResponse): Fix storage leak by adopting response.
+        (WebDownload::willResumeWithResponse): Ditto.
+        (WebDownload::didFail): Ditto.
+
+        * WebURLAuthenticationChallenge.h: Get rid of the IID #define,
+        instead using __declspec(uuid). Added a sender parameter to the
+        create function and an m_sender data member.
+        * WebURLAuthenticationChallenge.cpp:
+        (WebURLAuthenticationChallenge::WebURLAuthenticationChallenge): Added an
+        explicit sender parameter so this can be used with a WebDownload, which
+        does not involve a ResourceHandle. Later we should clean this up and not
+        involve WebCore or ResourceHandle directly even for the non-download case.
+        (WebURLAuthenticationChallenge::createInstance): Added an overload for the
+        case with an explicit sender parameter.
+        (WebURLAuthenticationChallenge::QueryInterface): Use __uuidof for the ID
+        of this class. In general, we should move to __uuidof as much as possible
+        and keep the separate macros to a minimum -- but we should do this for all
+        uses of each class at one time to make sure we don't run into problems
+        with two different UUIDs for the same class. This patch does it for three
+        classes.
+        (WebURLAuthenticationChallenge::initWithProtectionSpace): Use the query
+        constructor instead of an explicit QueryInterface for WebURLCredential.
+        This is another class where I'm switching from CLSID/IID macros to the
+        use of __uuidof, but in this case the use of __uuidof is implicit.
+        (WebURLAuthenticationChallenge::initWithAuthenticationChallenge): Ditto,
+        but for WebURLAuthenticationChallenge and WebURLAuthenticationChallengeSender.
+        (WebURLAuthenticationChallenge::sender): Use the new m_sender member to
+        cache the sender object and also use the one that was passed into the
+        constructor, if any.
+
+        * WebURLAuthenticationChallengeSender.h: Get rid of the IID #define,
+        instead using __declspec(uuid). Also minimize includes and make data
+        members private instead of protected.
+        * WebURLAuthenticationChallengeSender.cpp:
+        (WebURLAuthenticationChallengeSender::QueryInterface): Use __uuidof instead
+        of IID macro.
+        (WebURLAuthenticationChallengeSender::cancelAuthenticationChallenge):
+        Use query constructor instead of QueryInterface.
+        (WebURLAuthenticationChallengeSender::continueWithoutCredentialForAuthenticationChallenge):
+        Ditto.
+        (WebURLAuthenticationChallengeSender::useCredential): Ditto.
+
+        * WebURLCredential.cpp: (WebURLCredential::QueryInterface): Use __uuidof
+        instead of CLSID_WebURLCredential.
+
+        - tangentially-related cleanup
+
+        * WebFrame.cpp:
+        (WebFrame::dispatchDidReceiveAuthenticationChallenge): Use the adopt
+        constructor instead of a separate adoptRef call.
+        (WebFrame::dispatchDidCancelAuthenticationChallenge): Ditto.
+
 2007-09-24  Brady Eidson  <beidson@apple.com>
 
         Reviewed by John Sullivan

diff --git a/WebKit/win/WebDownload.cpp b/WebKit/win/WebDownload.cpp
index 2576bab566f4ab04631d62b19718085761890537..f51a6a17925c28839c65c95c6b617b6eddd7e9a7 100644 (file)
--- a/WebKit/win/WebDownload.cpp
+++ b/WebKit/win/WebDownload.cpp
@@ -22,6 +22,7 @@
  * (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 "config.h"
 #include "WebKitDLL.h"
 #include "WebDownload.h"
@@ -32,6 +33,8 @@
 #include "WebKit.h"
 #include "WebKitLogging.h"
 #include "WebMutableURLRequest.h"
+#include "WebURLAuthenticationChallenge.h"
+#include "WebURLCredential.h"
 #include "WebURLResponse.h"
 
 #include <io.h>
@@ -39,6 +42,7 @@
 #include <sys/types.h>
 
 #pragma warning(push, 0)
+#include <WebCore/AuthenticationCF.h>
 #include <WebCore/BString.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/ResourceError.h>
@@ -403,9 +407,7 @@ HRESULT STDMETHODCALLTYPE WebDownload::setDestination(
     CFURLDownloadSetDestination(m_download.get(), pathURL, !!allowOverwrite);
     CFRelease(pathURL);
 
-#ifndef NDEBUG
     LOG(Download, "WebDownload - Set destination to %s", m_bundlePath.ascii().data());
-#endif
 
     return S_OK;
 }
@@ -415,23 +417,48 @@ HRESULT STDMETHODCALLTYPE WebDownload::setDestination(
 HRESULT STDMETHODCALLTYPE WebDownload::cancelAuthenticationChallenge(
         /* [in] */ IWebURLAuthenticationChallenge*)
 {
-    notImplemented();
-    return E_FAIL;
+    if (m_download) {
+        CFURLDownloadCancel(m_download.get());
+        m_download = 0;
+    }
+
+    // FIXME: Do we need a URL or description for this error code?
+    ResourceError error(String(WebURLErrorDomain), WebURLErrorUserCancelledAuthentication, "", "");
+    COMPtr<WebError> webError(AdoptCOM, WebError::createInstance(error));
+    m_delegate->didFailWithError(this, webError.get());
+
+    return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE WebDownload::continueWithoutCredentialForAuthenticationChallenge(
-        /* [in] */ IWebURLAuthenticationChallenge*)
+        /* [in] */ IWebURLAuthenticationChallenge* challenge)
 {
-    notImplemented();
-    return E_FAIL;
+    COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
+    if (!webChallenge)
+        return E_NOINTERFACE;
+
+    if (m_download)
+        CFURLDownloadUseCredential(m_download.get(), 0, webChallenge->authenticationChallenge().cfURLAuthChallengeRef());
+    return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE WebDownload::useCredential(
-        /* [in] */ IWebURLCredential*, 
-        /* [in] */ IWebURLAuthenticationChallenge*)
+        /* [in] */ IWebURLCredential* credential, 
+        /* [in] */ IWebURLAuthenticationChallenge* challenge)
 {
-    notImplemented();
-    return E_FAIL;
+    COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
+    if (!webChallenge)
+        return E_NOINTERFACE;
+
+    COMPtr<WebURLCredential> webCredential(Query, credential);
+    if (!webCredential)
+        return E_NOINTERFACE;
+
+    RetainPtr<CFURLCredentialRef> cfCredential(AdoptCF, createCF(webCredential->credential()));
+
+    if (m_download)
+        CFURLDownloadUseCredential(m_download.get(), cfCredential.get(), webChallenge->authenticationChallenge().cfURLAuthChallengeRef());
+    return S_OK;
 }
 
 // CFURLDownload Callbacks -------------------------------------------------------------------
@@ -448,8 +475,8 @@ void WebDownload::didStart()
 
 CFURLRequestRef WebDownload::willSendRequest(CFURLRequestRef request, CFURLResponseRef response)
 {
-    COMPtr<WebMutableURLRequest> webRequest = WebMutableURLRequest::createInstance(ResourceRequest(request));
-    COMPtr<WebURLResponse> webResponse = WebURLResponse::createInstance(ResourceResponse(response));
+    COMPtr<WebMutableURLRequest> webRequest(AdoptCOM, WebMutableURLRequest::createInstance(ResourceRequest(request)));
+    COMPtr<WebURLResponse> webResponse(AdoptCOM, WebURLResponse::createInstance(ResourceResponse(response)));
     COMPtr<IWebMutableURLRequest> finalRequest;
 
     if (FAILED(m_delegate->willSendRequest(this, webRequest.get(), webResponse.get(), &finalRequest)))
@@ -458,26 +485,34 @@ CFURLRequestRef WebDownload::willSendRequest(CFURLRequestRef request, CFURLRespo
     if (!finalRequest)
         return 0;
 
-    COMPtr<WebMutableURLRequest> finalWebRequest = WebMutableURLRequest::createInstance(finalRequest.get());
+    COMPtr<WebMutableURLRequest> finalWebRequest(AdoptCOM, WebMutableURLRequest::createInstance(finalRequest.get()));
     m_request = finalWebRequest.get();
-    return finalWebRequest->resourceRequest().cfURLRequest();
+    CFURLRequestRef result = finalWebRequest->resourceRequest().cfURLRequest();
+    CFRetain(result);
+    return result;
 }
 
-void WebDownload::didReceiveAuthenticationChallenge(CFURLAuthChallengeRef )
+void WebDownload::didReceiveAuthenticationChallenge(CFURLAuthChallengeRef challenge)
 {
-    notImplemented();
+    COMPtr<IWebURLAuthenticationChallenge> webChallenge(AdoptCOM,
+        WebURLAuthenticationChallenge::createInstance(AuthenticationChallenge(challenge, 0), this));
+
+    if (SUCCEEDED(m_delegate->didReceiveAuthenticationChallenge(this, webChallenge.get())))
+        return;
+
+    cancelAuthenticationChallenge(webChallenge.get());
 }
 
 void WebDownload::didReceiveResponse(CFURLResponseRef response)
 {
-    COMPtr<WebURLResponse> webResponse = WebURLResponse::createInstance(ResourceResponse(response));
+    COMPtr<WebURLResponse> webResponse(AdoptCOM, WebURLResponse::createInstance(ResourceResponse(response)));
     if (FAILED(m_delegate->didReceiveResponse(this, webResponse.get())))
         LOG_ERROR("DownloadDelegate->didReceiveResponse failed");
 }
 
 void WebDownload::willResumeWithResponse(CFURLResponseRef response, UInt64 fromByte)
 {
-    COMPtr<WebURLResponse> webResponse = WebURLResponse::createInstance(ResourceResponse(response));
+    COMPtr<WebURLResponse> webResponse(AdoptCOM, WebURLResponse::createInstance(ResourceResponse(response)));
     if (FAILED(m_delegate->willResumeWithResponse(this, webResponse.get(), fromByte)))
         LOG_ERROR("DownloadDelegate->willResumeWithResponse failed");
 }
@@ -576,7 +611,7 @@ void WebDownload::didFinish()
 
 void WebDownload::didFail(CFErrorRef error)
 {
-    COMPtr<WebError> webError = WebError::createInstance(ResourceError(error));
+    COMPtr<WebError> webError(AdoptCOM, WebError::createInstance(ResourceError(error)));
     if (FAILED(m_delegate->didFailWithError(this, webError.get())))
         LOG_ERROR("DownloadDelegate->didFailWithError failed");
 }

diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index d29124c5679eaede571836f40ebb92ddc4cd8e7e..8ff2178dd0e1caac0fb529251d01b3fe43e0be33 100644 (file)
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -2209,8 +2209,7 @@ void WebFrame::dispatchDidReceiveAuthenticationChallenge(DocumentLoader* loader,
 
     COMPtr<IWebResourceLoadDelegate> resourceLoadDelegate;
     if (SUCCEEDED(d->webView->resourceLoadDelegate(&resourceLoadDelegate))) {
-        COMPtr<IWebURLAuthenticationChallenge> webChallenge;
-        webChallenge.adoptRef(WebURLAuthenticationChallenge::createInstance(challenge));
+        COMPtr<IWebURLAuthenticationChallenge> webChallenge(AdoptCOM, WebURLAuthenticationChallenge::createInstance(challenge));
 
         if (SUCCEEDED(resourceLoadDelegate->didReceiveAuthenticationChallenge(d->webView, identifier, webChallenge.get(), getWebDataSource(loader))))
             return;
@@ -2225,8 +2224,7 @@ void WebFrame::dispatchDidCancelAuthenticationChallenge(DocumentLoader* loader,
 {
     COMPtr<IWebResourceLoadDelegate> resourceLoadDelegate;
     if (SUCCEEDED(d->webView->resourceLoadDelegate(&resourceLoadDelegate))) {
-        COMPtr<IWebURLAuthenticationChallenge> webChallenge;
-        webChallenge.adoptRef(WebURLAuthenticationChallenge::createInstance(challenge));
+        COMPtr<IWebURLAuthenticationChallenge> webChallenge(AdoptCOM, WebURLAuthenticationChallenge::createInstance(challenge));
 
         if (SUCCEEDED(resourceLoadDelegate->didCancelAuthenticationChallenge(d->webView, identifier, webChallenge.get(), getWebDataSource(loader))))
             return;

diff --git a/WebKit/win/WebURLAuthenticationChallenge.cpp b/WebKit/win/WebURLAuthenticationChallenge.cpp
index 04cabe5b532e2a2eabd9474e2a90d329fbedcf09..dde81c881c7c88055717c99a377e4977144e3927 100644 (file)
--- a/WebKit/win/WebURLAuthenticationChallenge.cpp
+++ b/WebKit/win/WebURLAuthenticationChallenge.cpp
@@ -46,9 +46,11 @@ using namespace WebCore;
 
 // WebURLAuthenticationChallenge ----------------------------------------------------------------
 
-WebURLAuthenticationChallenge::WebURLAuthenticationChallenge(const AuthenticationChallenge& authenticationChallenge)
+WebURLAuthenticationChallenge::WebURLAuthenticationChallenge(const AuthenticationChallenge& authenticationChallenge,
+                                                             IWebURLAuthenticationChallengeSender* sender)
     : m_refCount(0)
     , m_authenticationChallenge(authenticationChallenge)
+    , m_sender(sender)
 {
     gClassCount++;
 }
@@ -58,16 +60,17 @@ WebURLAuthenticationChallenge::~WebURLAuthenticationChallenge()
     gClassCount--;
 }
 
-WebURLAuthenticationChallenge* WebURLAuthenticationChallenge::createInstance()
+WebURLAuthenticationChallenge* WebURLAuthenticationChallenge::createInstance(const AuthenticationChallenge& authenticationChallenge)
 {
-    WebURLAuthenticationChallenge* instance = new WebURLAuthenticationChallenge(AuthenticationChallenge());
+    WebURLAuthenticationChallenge* instance = new WebURLAuthenticationChallenge(authenticationChallenge, 0);
     instance->AddRef();
     return instance;
 }
 
-WebURLAuthenticationChallenge* WebURLAuthenticationChallenge::createInstance(const AuthenticationChallenge& authenticationChallenge)
+WebURLAuthenticationChallenge* WebURLAuthenticationChallenge::createInstance(const AuthenticationChallenge& authenticationChallenge,
+                                                                             IWebURLAuthenticationChallengeSender* sender)
 {
-    WebURLAuthenticationChallenge* instance = new WebURLAuthenticationChallenge(authenticationChallenge);
+    WebURLAuthenticationChallenge* instance = new WebURLAuthenticationChallenge(authenticationChallenge, sender);
     instance->AddRef();
     return instance;
 }
@@ -79,7 +82,7 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallenge::QueryInterface(REFIID r
     *ppvObject = 0;
     if (IsEqualGUID(riid, IID_IUnknown))
         *ppvObject = static_cast<IUnknown*>(this);
-    else if (IsEqualGUID(riid, IID_WebURLAuthenticationChallenge))
+    else if (IsEqualGUID(riid, __uuidof(WebURLAuthenticationChallenge)))
         *ppvObject = static_cast<WebURLAuthenticationChallenge*>(this);
     else if (IsEqualGUID(riid, IID_IWebURLAuthenticationChallenge))
         *ppvObject = static_cast<IWebURLAuthenticationChallenge*>(this);
@@ -125,10 +128,9 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallenge::initWithProtectionSpace
     if (FAILED(hr))
         return hr;
 
-    COMPtr<WebURLCredential> webCredential;
-    hr = proposedCredential->QueryInterface(CLSID_WebURLCredential, (void**)&webCredential);
-    if (FAILED(hr))
-        return hr;
+    COMPtr<WebURLCredential> webCredential(Query, proposedCredential);
+    if (!webCredential)
+        return E_NOINTERFACE;
 
     COMPtr<WebURLResponse> webResponse;
     hr = failureResponse->QueryInterface(IID_WebURLResponse, (void**)&webResponse);
@@ -140,10 +142,9 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallenge::initWithProtectionSpace
     if (FAILED(hr))
         return hr;
     
-    COMPtr<WebURLAuthenticationChallengeSender> webSender;
-    hr = sender->QueryInterface(IID_WebURLAuthenticationChallengeSender, (void**)&webSender);
-    if (FAILED(hr))
-        return hr;
+    COMPtr<WebURLAuthenticationChallengeSender> webSender(Query, sender);
+    if (!webSender)
+        return E_NOINTERFACE;
 
     // FIXME: After we change AuthenticationChallenge to use "ResourceHandle" as the abstract "Sender" or "Source of this Auth Challenge", then we'll
     // construct the AuthenticationChallenge with that as obtained from the webSender
@@ -160,17 +161,13 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallenge::initWithAuthenticationC
     if (!challenge || !sender)
         return E_POINTER;
 
-    HRESULT hr = S_OK;
-
-    COMPtr<WebURLAuthenticationChallenge> webChallenge;
-    hr = challenge->QueryInterface(IID_WebURLAuthenticationChallenge, (void**)&webChallenge);
-    if (FAILED(hr))
-        return hr;
+    COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
+    if (!webChallenge)
+        return E_NOINTERFACE;
 
-    COMPtr<WebURLAuthenticationChallengeSender> webSender;
-    hr = sender->QueryInterface(IID_WebURLAuthenticationChallengeSender, (void**)&webSender);
-    if (FAILED(hr))
-        return hr;
+    COMPtr<WebURLAuthenticationChallengeSender> webSender(Query, sender);
+    if (!webSender)
+        return E_NOINTERFACE;
 
     m_authenticationChallenge = AuthenticationChallenge(webChallenge->authenticationChallenge().cfURLAuthChallengeRef(), webSender->resourceHandle());
 
@@ -215,10 +212,12 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallenge::protectionSpace(
 HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallenge::sender(
     /* [out, retval] */ IWebURLAuthenticationChallengeSender** sender)
 {
-    ResourceHandle* handle = m_authenticationChallenge.sourceHandle();
-    *sender = WebURLAuthenticationChallengeSender::createInstance(handle);
+    if (!m_sender) {
+        ResourceHandle* handle = m_authenticationChallenge.sourceHandle();
+        m_sender.adoptRef(WebURLAuthenticationChallengeSender::createInstance(handle));
+    }
 
-    return S_OK;
+    return m_sender.copyRefTo(sender);
 }
 
 // WebURLAuthenticationChallenge -------------------------------------------------------------------

diff --git a/WebKit/win/WebURLAuthenticationChallenge.h b/WebKit/win/WebURLAuthenticationChallenge.h
index f6675402c546a8ca55e71f6331e139b4c5ac4e80..8463e6e148f5fdbfaf23db9a519c12a7d72a43a2 100644 (file)
--- a/WebKit/win/WebURLAuthenticationChallenge.h
+++ b/WebKit/win/WebURLAuthenticationChallenge.h
@@ -30,18 +30,15 @@
 
 #pragma warning(push, 0)
 #include <WebCore/AuthenticationChallenge.h>
+#include <WebCore/COMPtr.h>
 #pragma warning(pop)
 
-// {FD3B2381-0BB6-4b59-AF09-0E599C8901CF}
-DEFINE_GUID(IID_WebURLAuthenticationChallenge, 0xfd3b2381, 0xbb6, 0x4b59, 0xaf, 0x9, 0xe, 0x59, 0x9c, 0x89, 0x1, 0xcf);
-
-class WebURLAuthenticationChallenge : public IWebURLAuthenticationChallenge
-{
+class __declspec(uuid("FD3B2381-0BB6-4B59-AF09-0E599C8901CF")) WebURLAuthenticationChallenge : public IWebURLAuthenticationChallenge {
 public:
-    static WebURLAuthenticationChallenge* createInstance();
     static WebURLAuthenticationChallenge* createInstance(const WebCore::AuthenticationChallenge&);
+    static WebURLAuthenticationChallenge* createInstance(const WebCore::AuthenticationChallenge&, IWebURLAuthenticationChallengeSender*);
 private:
-    WebURLAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
+    WebURLAuthenticationChallenge(const WebCore::AuthenticationChallenge&, IWebURLAuthenticationChallengeSender*);
     ~WebURLAuthenticationChallenge();
 public:
     // IUnknown
@@ -87,6 +84,7 @@ protected:
     ULONG m_refCount;
 
     WebCore::AuthenticationChallenge m_authenticationChallenge;
+    COMPtr<IWebURLAuthenticationChallengeSender> m_sender;
 };
 
 

diff --git a/WebKit/win/WebURLAuthenticationChallengeSender.cpp b/WebKit/win/WebURLAuthenticationChallengeSender.cpp
index 40d617253d8b8c66f92ddf10f438d800a7b9dfac..57d95762df76198a0f43b797613838fd82631434 100644 (file)
--- a/WebKit/win/WebURLAuthenticationChallengeSender.cpp
+++ b/WebKit/win/WebURLAuthenticationChallengeSender.cpp
@@ -68,7 +68,7 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::QueryInterface(RE
     *ppvObject = 0;
     if (IsEqualGUID(riid, IID_IUnknown))
         *ppvObject = static_cast<IUnknown*>(this);
-    else if (IsEqualGUID(riid, IID_WebURLAuthenticationChallengeSender))
+    else if (IsEqualGUID(riid, __uuidof(WebURLAuthenticationChallengeSender)))
         *ppvObject = static_cast<WebURLAuthenticationChallengeSender*>(this);
     else if (IsEqualGUID(riid, IID_IWebURLAuthenticationChallengeSender))
         *ppvObject = static_cast<IWebURLAuthenticationChallengeSender*>(this);
@@ -98,8 +98,8 @@ ULONG STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::Release(void)
 HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::cancelAuthenticationChallenge(
         /* [in] */ IWebURLAuthenticationChallenge* challenge)
 {
-    COMPtr<WebURLAuthenticationChallenge> webChallenge;
-    if (!challenge || FAILED(challenge->QueryInterface(IID_WebURLAuthenticationChallenge, (void**)&webChallenge)))
+    COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
+    if (!webChallenge)
         return E_FAIL;
 
     m_handle->receivedCancellation(webChallenge->authenticationChallenge());
@@ -109,8 +109,8 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::cancelAuthenticat
 HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::continueWithoutCredentialForAuthenticationChallenge(
         /* [in] */ IWebURLAuthenticationChallenge* challenge)
 {
-    COMPtr<WebURLAuthenticationChallenge> webChallenge;
-    if (!challenge || FAILED(challenge->QueryInterface(IID_WebURLAuthenticationChallenge, (void**)&webChallenge)))
+    COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
+    if (!webChallenge)
         return E_FAIL;
 
     m_handle->receivedRequestToContinueWithoutCredential(webChallenge->authenticationChallenge());
@@ -121,12 +121,12 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenticationChallengeSender::useCredential(
         /* [in] */ IWebURLCredential* credential, 
         /* [in] */ IWebURLAuthenticationChallenge* challenge)
 {
-    COMPtr<WebURLAuthenticationChallenge> webChallenge;
-    if (!challenge || FAILED(challenge->QueryInterface(IID_WebURLAuthenticationChallenge, (void**)&webChallenge)))
+    COMPtr<WebURLAuthenticationChallenge> webChallenge(Query, challenge);
+    if (!webChallenge)
         return E_FAIL;
     
     COMPtr<WebURLCredential> webCredential;
-    if (!credential || FAILED(credential->QueryInterface(CLSID_WebURLCredential, (void**)&webCredential)))
+    if (!credential || FAILED(credential->QueryInterface(__uuidof(WebURLCredential), (void**)&webCredential)))
         return E_FAIL;
 
     m_handle->receivedCredential(webChallenge->authenticationChallenge(), webCredential->credential());

diff --git a/WebKit/win/WebURLAuthenticationChallengeSender.h b/WebKit/win/WebURLAuthenticationChallengeSender.h
index 01af22fdb2db2169bca12fe8ddb9a22e93b27aa2..25235c3fa4c8d2ccb6ff2c8ef5d6dd922a650f1f 100644 (file)
--- a/WebKit/win/WebURLAuthenticationChallengeSender.h
+++ b/WebKit/win/WebURLAuthenticationChallengeSender.h
@@ -28,18 +28,15 @@
 
 #include "IWebURLAuthenticationChallenge.h"
 
-#include <wtf/PassRefPtr.h>
+#include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 
-
 namespace WebCore {
     class ResourceHandle;
-};
-
-// {5CACD637-F82F-491f-947A-5DCA38AA0FEA}
-DEFINE_GUID(IID_WebURLAuthenticationChallengeSender, 0x5cacd637, 0xf82f, 0x491f, 0x94, 0x7a, 0x5d, 0xca, 0x38, 0xaa, 0xf, 0xea);
+}
 
-class WebURLAuthenticationChallengeSender : public IWebURLAuthenticationChallengeSender
+class __declspec(uuid("5CACD637-F82F-491F-947A-5DCA38AA0FEA")) WebURLAuthenticationChallengeSender
+    : public IWebURLAuthenticationChallengeSender
 {
 public:
     static WebURLAuthenticationChallengeSender* createInstance(PassRefPtr<WebCore::ResourceHandle>);
@@ -64,11 +61,11 @@ public:
         /* [in] */ IWebURLAuthenticationChallenge* challenge);
 
     WebCore::ResourceHandle* resourceHandle() const;
-protected:
+
+private:
     ULONG m_refCount;
 
     RefPtr<WebCore::ResourceHandle> m_handle;
 };
 
-
 #endif

diff --git a/WebKit/win/WebURLCredential.cpp b/WebKit/win/WebURLCredential.cpp
index 95e945d7b940cc67ce6d7a5ea30be271f8a69173..a6cc35c477b9a5d6d39f7071db2afd67399aa7b1 100644 (file)
--- a/WebKit/win/WebURLCredential.cpp
+++ b/WebKit/win/WebURLCredential.cpp
@@ -69,7 +69,7 @@ HRESULT STDMETHODCALLTYPE WebURLCredential::QueryInterface(REFIID riid, void** p
     *ppvObject = 0;
     if (IsEqualGUID(riid, IID_IUnknown))
         *ppvObject = static_cast<IUnknown*>(this);
-    else if (IsEqualGUID(riid, CLSID_WebURLCredential))
+    else if (IsEqualGUID(riid, __uuidof(WebURLCredential)))
         *ppvObject = static_cast<WebURLCredential*>(this);
     else if (IsEqualGUID(riid, IID_IWebURLCredential))
         *ppvObject = static_cast<IWebURLCredential*>(this);