[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric.carlson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit f9652eb89f68ffdb2d1c9f89a9e0d69626a5e279
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 22:17:56 2009 +0000

    2009-12-03  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Adam Roben.
    
            Minor correction to r51663.
    
            * DumpRenderTree/win/DumpRenderTree.cpp:
            (addQTDirToPATH):
                GetEnvironmentVariable -> GetEnvironmentVariableW.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 934dbe4..a1d9687 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Adam Roben.
 
+        Minor correction to r51663.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (addQTDirToPATH):
+            GetEnvironmentVariable -> GetEnvironmentVariableW.
+
+2009-12-03  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Adam Roben.
+
         ~96 regression tests fail when using QuickTime 7.6 (they pass with QuickTime 7.3)
         https://bugs.webkit.org/show_bug.cgi?id=30256
 
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index bd7f7f4..1315f9e 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -227,7 +227,7 @@ static void addQTDirToPATH()
     // Read the current PATH.
     DWORD pathSize = GetEnvironmentVariableW(pathEnvironmentVariable, 0, 0);
     Vector<WCHAR> oldPath(pathSize);
-    if (!GetEnvironmentVariable(pathEnvironmentVariable, oldPath.data(), oldPath.size()))
+    if (!GetEnvironmentVariableW(pathEnvironmentVariable, oldPath.data(), oldPath.size()))
         return;
 
     // And add the QuickTime dll.

-- 
WebKit Debian packaging