From: commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 18 Sep 2013 17:21:56 +0000 (+0000)
Subject: Improved WinLauncher's URL handling.
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=ad2bad39b5fcd65b633927e99e2c852b3e1b321d;hp=d8b764e5aa85be741b09fb9248e1aa458a9776c4

Improved WinLauncher's URL handling.
https://bugs.webkit.org/show_bug.cgi?id=121535

Patch by Alex Christensen <achristensen@webkit.org> on 2013-09-18
Reviewed by Brent Fulgham.

* WinLauncher/WinLauncher.cpp:
(EditProc):
Use INTERNET_MAX_URL_LENGTH instead of our MAX_URL_LENGTH.
(loadURL):
Prepend "http://" to URLs with no scheme.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1afe53525e28..061fc7dd3935 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-18  Alex Christensen  <achristensen@webkit.org>
+
+        Improved WinLauncher's URL handling.
+        https://bugs.webkit.org/show_bug.cgi?id=121535
+
+        Reviewed by Brent Fulgham.
+
+        * WinLauncher/WinLauncher.cpp:
+        (EditProc):
+        Use INTERNET_MAX_URL_LENGTH instead of our MAX_URL_LENGTH.
+        (loadURL):
+        Prepend "http://" to URLs with no scheme.
+
 2013-09-18  Filip Pizlo  <fpizlo@apple.com>
 
         DFG should support Int52 for local variables
diff --git a/Tools/WinLauncher/WinLauncher.cpp b/Tools/WinLauncher/WinLauncher.cpp
index ece4b44a97dc..30e7dd500d35 100644
--- a/Tools/WinLauncher/WinLauncher.cpp
+++ b/Tools/WinLauncher/WinLauncher.cpp
@@ -871,15 +871,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     return 0;
 }
 
-#define MAX_URL_LENGTH  1024
-
 LRESULT CALLBACK EditProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message) {
     case WM_CHAR:
         if (wParam == 13) { // Enter Key
-            wchar_t strPtr[MAX_URL_LENGTH];
-            *((LPWORD)strPtr) = MAX_URL_LENGTH; 
+            wchar_t strPtr[INTERNET_MAX_URL_LENGTH];
+            *((LPWORD)strPtr) = INTERNET_MAX_URL_LENGTH; 
             int strLen = SendMessage(hDlg, EM_GETLINE, 0, (LPARAM)strPtr);
 
             strPtr[strLen] = 0;
@@ -953,7 +951,7 @@ static void loadURL(BSTR urlBStr)
     if (FAILED(hr))
         return;
 
-    hr = request->initWithURL(urlBStr, WebURLRequestUseProtocolCachePolicy, 60);
+    hr = request->initWithURL(wcsstr(urlBStr, L"://") ? urlBStr : _bstr_t(L"http://") + urlBStr, WebURLRequestUseProtocolCachePolicy, 60);
     if (FAILED(hr))
         return;