Changeset 70914 in webkit

Timestamp:

Oct 29, 2010 12:13:22 PM (13 years ago)

Author:

Patrick Gansterer

Message:

2010-10-29 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Roben.

Cleanup createGlobalImageFileDescriptor in ClipboardWin
​https://bugs.webkit.org/show_bug.cgi?id=48189

• platform/win/ClipboardWin.cpp: (WebCore::createGlobalURLContent): (WebCore::createGlobalUrlFileDescriptor): (WebCore::ClipboardWin::writeURL):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/ClipboardWin.cpp (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Cleanup createGlobalImageFileDescriptor in ClipboardWin
+        https://bugs.webkit.org/show_bug.cgi?id=48189
+
+        * platform/win/ClipboardWin.cpp:
+        (WebCore::createGlobalURLContent):
+        (WebCore::createGlobalUrlFileDescriptor):
+        (WebCore::ClipboardWin::writeURL):
+
 2010-10-29  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/platform/win/ClipboardWin.cpp

@@ -57 +57 @@
 #include <wtf/RefPtr.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringConcatenate.h> 
 #include <wtf/text/StringHash.h>
 
@@ -64 +65 @@
 
 using namespace HTMLNames;
-
-// format string for 
-static const char szShellDotUrlTemplate[] = "[InternetShortcut]\r\nURL=%s\r\n";
 
 // We provide the IE clipboard types (URL and Text), and the clipboard types specified in the WHATWG Web Applications 1.0 draft
@@ -164 +162 @@
 }
 
-static HGLOBAL createGlobalURLContent(const String& url, int estimatedFileSize)
+static HGLOBAL createGlobalURLContent(const CString& content)
 {
     HRESULT hr = S_OK;
@@ -170 +168 @@
 
     char* fileContents;
-    char ansiUrl[INTERNET_MAX_URL_LENGTH + 1];
-    // Used to generate the buffer. This is null terminated whereas the fileContents won't be.
-    char contentGenerationBuffer[INTERNET_MAX_URL_LENGTH + ARRAYSIZE(szShellDotUrlTemplate) + 1];
-    
-    if (estimatedFileSize > 0 && estimatedFileSize > ARRAYSIZE(contentGenerationBuffer))
-        return 0;
-
-    int ansiUrlSize = ::WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)url.characters(), url.length(), ansiUrl, ARRAYSIZE(ansiUrl) - 1, 0, 0);
-    if (!ansiUrlSize)
-        return 0;
-
-    ansiUrl[ansiUrlSize] = 0;
-    
-    int fileSize = (int) (ansiUrlSize+strlen(szShellDotUrlTemplate)-2); // -2 to remove the %s
-    ASSERT(estimatedFileSize < 0 || fileSize == estimatedFileSize);
-
-    memObj = GlobalAlloc(GPTR, fileSize);
+
+    memObj = GlobalAlloc(GPTR, content.length());
     if (!memObj) 
         return 0;
 
     fileContents = (PSTR)GlobalLock(memObj);
-
-    sprintf_s(contentGenerationBuffer, ARRAYSIZE(contentGenerationBuffer), szShellDotUrlTemplate, ansiUrl);
-    CopyMemory(fileContents, contentGenerationBuffer, fileSize);
+    CopyMemory(fileContents, content.data(), content.length());
     
     GlobalUnlock(memObj);
@@ -278 +259 @@
 }
 
-static HGLOBAL createGlobalUrlFileDescriptor(const String& url, const String& title, int& /*out*/ estimatedSize)
+static HGLOBAL createGlobalUrlFileDescriptor(const String& url, const String& title, const CString& content)
 {
     HRESULT hr = S_OK;
@@ -291 +272 @@
     fgd->cItems = 1;
     fgd->fgd[0].dwFlags = FD_FILESIZE;
-    int fileSize = ::WideCharToMultiByte(CP_ACP, 0, url.characters(), url.length(), 0, 0, 0, 0);
-    fileSize += strlen(szShellDotUrlTemplate) - 2; // -2 is for getting rid of %s in the template string
-    fgd->fgd[0].nFileSizeLow = fileSize;
-    estimatedSize = fileSize;
+    fgd->fgd[0].nFileSizeLow = content.length();
     fsPath = filesystemPathFromUrlOrTitle(url, title, L".URL", true);
 
@@ -745 +723 @@
     WebCore::writeURL(m_writableDataObject.get(), kurl, titleStr, true, true);
 
-    int estimatedSize = 0;
     String url = kurl.string();
-
-    HGLOBAL urlFileDescriptor = createGlobalUrlFileDescriptor(url, titleStr, estimatedSize);
+    ASSERT(url.containsOnlyASCII()); // KURL::string() is URL encoded.
+
+    CString content = makeString("[InternetShortcut]\r\nURL=", url, "\r\n").ascii();
+
+    HGLOBAL urlFileDescriptor = createGlobalUrlFileDescriptor(url, titleStr, content);
     if (!urlFileDescriptor)
         return;
-    HGLOBAL urlFileContent = createGlobalURLContent(url, estimatedSize);
+    HGLOBAL urlFileContent = createGlobalURLContent(content);
     if (!urlFileContent) {
         GlobalFree(urlFileDescriptor);