Make testkjs and DRT delay-load their dependencies

JavaScriptCore:

        Make testkjs delay-load its dependencies

        This lets WebKitInitializer re-route the dependencies to be loaded out
        of the Safari installation directory.

        Rubberstamped by Sam.

        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:

WebKitTools:

        Make DumpRenderTree delay-load its dependencies

        This lets WebKitInitializer re-route the dependencies to be loaded out
        of the Safari installation directory.

        Also replaced all uses of kCFAllocatorDefault with 0 (which means the
        same thing), since we can't import the kCFAllocatorDefault symbol when
        delay-loading CoreFoundation.dll.

        Rubberstamped by Sam.

        * DumpRenderTree/win/DumpRenderTree.cpp:
        (runTest):
        (javaScriptThreads):
        * DumpRenderTree/win/DumpRenderTree.vcproj:
        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
        (LayoutTestController::setWaitToDump):

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 20409592a1e8c373891756cac7bc99b58855a7f9..f7daafc341bd5afdfec408ee50285c6789a70cac 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-25  Adam Roben  <aroben@apple.com>
+
+        Make testkjs delay-load its dependencies
+
+        This lets WebKitInitializer re-route the dependencies to be loaded out
+        of the Safari installation directory.
+
+        Rubberstamped by Sam.
+
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
+
 2007-09-25  David Kilzer  <ddkilzer@webkit.org>
 
         Reviewed by Adam.

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
index 7d76709b94d41074a63b4b158efe6825637b9584..7e0b2394531c8e106d09708d617e9a2312633171 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
@@ -71,6 +71,7 @@
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";..\..\..\icu\lib"
+                               DelayLoadDLLs="icuuc$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"
@@ -155,6 +156,7 @@
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";..\..\..\icu\lib"
+                               DelayLoadDLLs="icuuc$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                OptimizeReferences="2"
@@ -243,6 +245,7 @@
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";..\..\..\icu\lib"
+                               DelayLoadDLLs="icuuc$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8a6f4d7f5ea9674dbf1a66cb8230c3796a23f7d9..cb17ee11324daa13404f3eac9afa0c79f238782e 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2007-09-25  Adam Roben  <aroben@apple.com>
+
+        Make DumpRenderTree delay-load its dependencies
+
+        This lets WebKitInitializer re-route the dependencies to be loaded out
+        of the Safari installation directory.
+
+        Also replaced all uses of kCFAllocatorDefault with 0 (which means the
+        same thing), since we can't import the kCFAllocatorDefault symbol when
+        delay-loading CoreFoundation.dll.
+
+        Rubberstamped by Sam.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (runTest):
+        (javaScriptThreads):
+        * DumpRenderTree/win/DumpRenderTree.vcproj:
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::setWaitToDump):
+
 2007-09-25  Adam Roben  <aroben@apple.com>
 
         Pull ole32.lib into WebKitInitializer

diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 26bb7f84537c77aab6a19e32239eb046046889b3..0f2fbff8f8c3526a743f7cd60ce68b8bef9f87f6 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -540,11 +540,11 @@ static void runTest(const char* pathOrURL)
 
     BSTR urlBStr;
  
-    CFStringRef str = CFStringCreateWithCString(kCFAllocatorDefault, pathOrURL, kCFStringEncodingWindowsLatin1);
-    CFURLRef url = CFURLCreateWithString(kCFAllocatorDefault, str, 0);
+    CFStringRef str = CFStringCreateWithCString(0, pathOrURL, kCFStringEncodingWindowsLatin1);
+    CFURLRef url = CFURLCreateWithString(0, str, 0);
 
     if (!url)
-        url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, str, kCFURLWindowsPathStyle, false);
+        url = CFURLCreateWithFileSystemPath(0, str, kCFURLWindowsPathStyle, false);
 
     CFRelease(str);
 
@@ -665,7 +665,7 @@ static CFMutableDictionaryRef javaScriptThreads()
     assert(pthread_mutex_trylock(&javaScriptThreadsMutex) == EBUSY);
     static CFMutableDictionaryRef staticJavaScriptThreads;
     if (!staticJavaScriptThreads)
-        staticJavaScriptThreads = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &pthreadKeyCallbacks, 0);
+        staticJavaScriptThreads = CFDictionaryCreateMutable(0, 0, &pthreadKeyCallbacks, 0);
     return staticJavaScriptThreads;
 }
 

diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj b/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
index 66b42eb371515853a05c0a0791e684cfa892ba49..b3498ca5f3bd0b6d578b8c84a4da9631176722b4 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
@@ -66,6 +66,7 @@
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";"$(WebKitOutputDir)\bin""
+                               DelayLoadDLLs="WebKit$(WebKitConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"
@@ -145,6 +146,7 @@
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";"$(WebKitOutputDir)\bin""
+                               DelayLoadDLLs="WebKit$(WebKitConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                OptimizeReferences="2"
@@ -228,6 +230,7 @@
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib";"$(WebKitOutputDir)\bin""
+                               DelayLoadDLLs="WebKit$(WebKitConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index 62b899ebc221e0b5c533cb075752dc5446dbf615..3c04fa696a3cfd3cdc1cdcf1a4ddf2e33faea779 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -243,7 +243,7 @@ void LayoutTestController::setWaitToDump(bool waitUntilDone)
     // Same as on mac.  This can be shared.
     m_waitToDump = waitUntilDone;
     if (m_waitToDump && !waitToDumpWatchdog)
-        ::waitToDumpWatchdog = CFRunLoopTimerCreate(kCFAllocatorDefault, 0, waitToDumpWatchdogInterval, 0, 0, waitUntilDoneWatchdogFired, NULL);
+        ::waitToDumpWatchdog = CFRunLoopTimerCreate(0, 0, waitToDumpWatchdogInterval, 0, 0, waitUntilDoneWatchdogFired, NULL);
 }
 
 int LayoutTestController::windowCount()