Implement form posting via WinINet. This code is crazy... CRAZY

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 341aa9cc5998ab88fa3e8700dcce62fae8ad9bcf..09bae2e37d6223c9873cbf9bf43b41f8a473383e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2006-06-01  Dave Hyatt <hyatt@apple.com>
+
+        Implement form POST using WinINet.  This code is crazy... CRAZY!
+
+        * platform/TransferJobInternal.h:
+        (WebCore::TransferJobInternal::TransferJobInternal):
+        * platform/win/CookieJarWin.cpp:
+        (WebCore::setCookies):
+        (WebCore::cookies):
+        * platform/win/TransferJobWin.cpp:
+        (WebCore::TransferJobWndProc):
+        (WebCore::TransferJob::start):
+
 2006-06-01  Adele Peterson  <adele@apple.com>
 
         Reviewed by Hyatt.

diff --git a/WebCore/platform/TransferJobInternal.h b/WebCore/platform/TransferJobInternal.h
index 4dd53960900e5eadb077e987b528b93377b41a00..d6b6896bdc1b2a0856976a5e491820bf8d7a952e 100644 (file)
--- a/WebCore/platform/TransferJobInternal.h
+++ b/WebCore/platform/TransferJobInternal.h
@@ -58,8 +58,14 @@ namespace WebCore {
 #if WIN32
             , m_fileHandle(0)
             , m_fileLoadTimer(job, &TransferJob::fileLoadTimer)
+            , m_resourceHandle(0)
+            , m_secondaryHandle(0)
             , m_jobId(0)
             , m_threadId(0)
+            , m_writing(false)
+            , m_formDataString(0)
+            , m_formDataLength(0)
+            , m_bytesRemainingToWrite(0)
 #endif
         {
         }
@@ -79,8 +85,14 @@ namespace WebCore {
 #if WIN32
             , m_fileHandle(0)
             , m_fileLoadTimer(job, &TransferJob::fileLoadTimer)
+            , m_resourceHandle(0)
+            , m_secondaryHandle(0)
             , m_jobId(0)
             , m_threadId(0)
+            , m_writing(false)
+            , m_formDataString(0)
+            , m_formDataLength(0)
+            , m_bytesRemainingToWrite(0)
 #endif
         {
         }
@@ -107,8 +119,14 @@ namespace WebCore {
         HANDLE m_fileHandle;
         Timer<TransferJob> m_fileLoadTimer;
         HINTERNET m_resourceHandle;
+        HINTERNET m_secondaryHandle;
         unsigned m_jobId;
         DWORD m_threadId;
+        bool m_writing;
+        char* m_formDataString;
+        int m_formDataLength;
+        int m_bytesRemainingToWrite;
+        DeprecatedString m_postReferrer;
 #endif
         };
 

diff --git a/WebCore/platform/win/CookieJarWin.cpp b/WebCore/platform/win/CookieJarWin.cpp
index cd2432f251d2f8782c01454ae95ab0021726aa01..83592c930f3cad506bb50152304a37b38cedaaee 100755 (executable)
--- a/WebCore/platform/win/CookieJarWin.cpp
+++ b/WebCore/platform/win/CookieJarWin.cpp
@@ -37,10 +37,6 @@ void setCookies(const KURL& url, const KURL& policyURL, const String& value)
 {
     // FIXME: Deal with the policy URL.
     DeprecatedString str = url.url();
-    int fragmentIndex = str.find('#');
-    if (fragmentIndex != -1)
-        str = str.left(fragmentIndex);
-
     str.append((UChar)'\0');
     DeprecatedString val = value.deprecatedString();
     val.append((UChar)'\0');
@@ -50,10 +46,6 @@ void setCookies(const KURL& url, const KURL& policyURL, const String& value)
 String cookies(const KURL& url)
 {
     DeprecatedString str = url.url();
-    int fragmentIndex = str.find('#');
-    if (fragmentIndex != -1)
-        str = str.left(fragmentIndex);
-
     str.append((UChar)'\0');
 
     DWORD count;

diff --git a/WebCore/platform/win/TransferJobWin.cpp b/WebCore/platform/win/TransferJobWin.cpp
index 8297314a2f95c27b36dc16e43fabcc6d4d623726..a69e5c8668fe269fb1781120b39462ae204dcc8c 100644 (file)
--- a/WebCore/platform/win/TransferJobWin.cpp
+++ b/WebCore/platform/win/TransferJobWin.cpp
@@ -30,6 +30,7 @@
 
 #include "DocLoader.h"
 #include "Frame.h"
+#include "Document.h"
 #include <windows.h>
 #include <wininet.h>
 
@@ -89,13 +90,75 @@ LRESULT CALLBACK TransferJobWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
         ASSERT(job->d->m_threadId == GetCurrentThreadId());
 
         if (internetStatus == INTERNET_STATUS_HANDLE_CREATED) {
-            job->d->m_resourceHandle = HINTERNET(dwResult);
-            if (job->d->status != 0) {
-                // We were canceled before Windows actually created a handle for us, close and delete now.
-                InternetCloseHandle(job->d->m_resourceHandle);
-                delete job;
+            if (!job->d->m_resourceHandle) {
+                job->d->m_resourceHandle = HINTERNET(dwResult);
+                if (job->d->status != 0) {
+                    // We were canceled before Windows actually created a handle for us, close and delete now.
+                    InternetCloseHandle(job->d->m_resourceHandle);
+                    delete job;
+                }
+
+                if (job->method() == "POST") {
+                    // FIXME: Too late to set referrer properly.
+                    DeprecatedString urlStr = job->d->URL.path();
+                    int fragmentIndex = urlStr.find('#');
+                    if (fragmentIndex != -1)
+                        urlStr = urlStr.left(fragmentIndex);
+                    static LPCSTR accept[2]={"*/*", NULL};
+                    HINTERNET urlHandle = HttpOpenRequestA(job->d->m_resourceHandle, 
+                                                           "POST", urlStr.ascii(), 0, 0, accept,
+                                                           INTERNET_FLAG_KEEP_CONNECTION | 
+                                                           INTERNET_FLAG_FORMS_SUBMIT |
+                                                           INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_CACHE_WRITE,
+                                                           (DWORD_PTR)job->d->m_jobId);
+                    if (urlHandle == INVALID_HANDLE_VALUE) {
+                        InternetCloseHandle(job->d->m_resourceHandle);
+                        delete job;
+                    }
+                }
+            } else if (!job->d->m_secondaryHandle) {
+                assert(job->method() == "POST");
+                job->d->m_secondaryHandle = HINTERNET(dwResult);
+                
+                // Need to actually send the request now.
+                DeprecatedString headers = "Content-Type: application/x-www-form-urlencoded\n";
+                headers += "Referer: ";
+                headers += job->d->m_postReferrer;
+                headers += "\n";
+                DeprecatedString formData = job->postData().flattenToString();
+                INTERNET_BUFFERSA buffers;
+                memset(&buffers, 0, sizeof(buffers));
+                buffers.dwStructSize = sizeof(INTERNET_BUFFERSA);
+                buffers.lpcszHeader = headers.ascii();
+                buffers.dwHeadersLength = headers.length();
+                buffers.dwBufferTotal = formData.length();
+                
+                job->d->m_bytesRemainingToWrite = formData.length();
+                job->d->m_formDataString = (char*)malloc(formData.length());
+                job->d->m_formDataLength = formData.length();
+                strncpy(job->d->m_formDataString, formData.ascii(), formData.length());
+                job->d->m_writing = true;
+                HttpSendRequestExA(job->d->m_secondaryHandle, &buffers, 0, 0, (DWORD_PTR)job->d->m_jobId);
             }
         } else if (internetStatus == INTERNET_STATUS_REQUEST_COMPLETE) {
+            if (job->d->m_writing) {
+                DWORD bytesWritten;
+                InternetWriteFile(job->d->m_secondaryHandle,
+                                  job->d->m_formDataString + (job->d->m_formDataLength - job->d->m_bytesRemainingToWrite),
+                                  job->d->m_bytesRemainingToWrite,
+                                  &bytesWritten);
+                job->d->m_bytesRemainingToWrite -= bytesWritten;
+                if (!job->d->m_bytesRemainingToWrite) {
+                    // End the request.
+                    job->d->m_writing = false;
+                    HttpEndRequest(job->d->m_secondaryHandle, 0, 0, (DWORD_PTR)job->d->m_jobId);
+                    free(job->d->m_formDataString);
+                    job->d->m_formDataString = 0;
+                }
+                return 0;
+            }
+
+            HINTERNET handle = (job->method() == "POST") ? job->d->m_secondaryHandle : job->d->m_resourceHandle;
             BOOL ok = FALSE;
 
             static const int bufferSize = 32768;
@@ -105,7 +168,7 @@ LRESULT CALLBACK TransferJobWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
             buffers.lpvBuffer = buffer;
             buffers.dwBufferLength = bufferSize;
 
-            while ((ok = InternetReadFileExA(job->d->m_resourceHandle, &buffers, IRF_NO_WAIT, (DWORD_PTR)job)) && buffers.dwBufferLength) {
+            while ((ok = InternetReadFileExA(handle, &buffers, IRF_NO_WAIT, (DWORD_PTR)job)) && buffers.dwBufferLength) {
                 job->client()->receivedData(job, buffer, buffers.dwBufferLength);
                 buffers.dwBufferLength = bufferSize;
             }
@@ -131,7 +194,10 @@ LRESULT CALLBACK TransferJobWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
                 }
             }
             
+            if (job->d->m_secondaryHandle)
+                InternetCloseHandle(job->d->m_secondaryHandle);
             InternetCloseHandle(job->d->m_resourceHandle);
+            
             job->client()->receivedAllData(job, &platformData);
             job->client()->receivedAllData(job);
             delete job;
@@ -216,12 +282,27 @@ bool TransferJob::start(DocLoader* docLoader)
         initializeOffScreenTransferJobWindow();
         d->m_jobId = addToOutstandingJobs(this);
 
-        DeprecatedString urlStr = d->URL.url();
-        int fragmentIndex = urlStr.find('#');
-        if (fragmentIndex != -1)
-            urlStr = urlStr.left(fragmentIndex);
-
-        HINTERNET urlHandle = InternetOpenUrlA(internetHandle, urlStr.ascii(), NULL, -1, 0, (DWORD_PTR)d->m_jobId);
+        // For form posting, we can't use InternetOpenURL.  We have to use InternetConnect followed by
+        // HttpSendRequest.
+        HINTERNET urlHandle;
+        if (method() == "POST") {
+            d->m_postReferrer = docLoader->frame()->referrer();
+            DeprecatedString host = d->URL.host();
+            host += "\0";
+            urlHandle = InternetConnectA(internetHandle, host.ascii(), d->URL.port(), 0, 0, 
+                                         INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)d->m_jobId);
+        } else {
+            DeprecatedString urlStr = d->URL.url();
+            int fragmentIndex = urlStr.find('#');
+            if (fragmentIndex != -1)
+                urlStr = urlStr.left(fragmentIndex);
+            DeprecatedString headers("Referer: ");
+            headers += docLoader->frame()->referrer();
+            headers += "\n";
+
+            urlHandle = InternetOpenUrlA(internetHandle, urlStr.ascii(), headers.ascii(), headers.length(),
+                                         INTERNET_FLAG_KEEP_CONNECTION, (DWORD_PTR)d->m_jobId);
+        }
 
         if (urlHandle == INVALID_HANDLE_VALUE) {
             delete this;