Changeset 39098

Timestamp:

12/08/08 10:36:39 (16 months ago)

Author:

ap@webkit.org

Message:

Reviewed by Darin Adler.

 https://bugs.webkit.org/show_bug.cgi?id=22737
Try debug version when locating CFNetwork

• platform/network/cf/ResourceRequestCFNet.cpp: (WebCore::findCFNetworkModule): (WebCore::findCFURLRequestSetContentDispositionEncodingFallbackArrayFunction): (WebCore::findCFURLRequestCopyContentDispositionEncodingFallbackArrayFunction):
• platform/network/win/CookieJarCFNetWin.cpp: (WebCore::findCFNetworkModule): (WebCore::findIsHTTPOnlyFunction):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/ResourceRequestCFNet.cpp (modified) (1 diff)
• platform/network/win/CookieJarCFNetWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-08  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22737
+        Try debug version when locating CFNetwork
+
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::findCFNetworkModule):
+        (WebCore::findCFURLRequestSetContentDispositionEncodingFallbackArrayFunction):
+        (WebCore::findCFURLRequestCopyContentDispositionEncodingFallbackArrayFunction):
+        * platform/network/win/CookieJarCFNetWin.cpp:
+        (WebCore::findCFNetworkModule):
+        (WebCore::findIsHTTPOnlyFunction):
+
 2008-12-08  Aaron Boodman  <aa@chromium.org>
 

trunk/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

@@ -37 +37 @@
 typedef CFArrayRef (*CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction)(CFURLRequestRef);
 
+static HMODULE findCFNetworkModule()
+{
+    if (HMODULE module = GetModuleHandleA("CFNetwork"))
+        return module;
+    return GetModuleHandleA("CFNetwork_debug");
+}
+
 static CFURLRequestSetContentDispositionEncodingFallbackArrayFunction findCFURLRequestSetContentDispositionEncodingFallbackArrayFunction()
 {
-    return reinterpret_cast<CFURLRequestSetContentDispositionEncodingFallbackArrayFunction>(GetProcAddress(GetModuleHandleA("CFNetwork"), "_CFURLRequestSetContentDispositionEncodingFallbackArray"));
+    return reinterpret_cast<CFURLRequestSetContentDispositionEncodingFallbackArrayFunction>(GetProcAddress(findCFNetworkModule(), "_CFURLRequestSetContentDispositionEncodingFallbackArray"));
 }
 
 static CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction findCFURLRequestCopyContentDispositionEncodingFallbackArrayFunction()
 {
-    return reinterpret_cast<CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction>(GetProcAddress(GetModuleHandleA("CFNetwork"), "_CFURLRequestCopyContentDispositionEncodingFallbackArray"));
+    return reinterpret_cast<CFURLRequestCopyContentDispositionEncodingFallbackArrayFunction>(GetProcAddress(findCFNetworkModule(), "_CFURLRequestCopyContentDispositionEncodingFallbackArray"));
 }
 

trunk/WebCore/platform/network/win/CookieJarCFNetWin.cpp

@@ -44 +44 @@
 typedef Boolean (*IsHTTPOnlyFunction)(CFHTTPCookieRef);
 
+static HMODULE findCFNetworkModule()
+{
+    if (HMODULE module = GetModuleHandleA("CFNetwork"))
+        return module;
+    return GetModuleHandleA("CFNetwork_debug");
+}
+
 static IsHTTPOnlyFunction findIsHTTPOnlyFunction()
 {
-    return reinterpret_cast<IsHTTPOnlyFunction>(GetProcAddress(GetModuleHandleA("CFNetwork"), "CFHTTPCookieIsHTTPOnly"));
+    return reinterpret_cast<IsHTTPOnlyFunction>(GetProcAddress(findCFNetworkModule(), "CFHTTPCookieIsHTTPOnly"));
 }