[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 37f759a7081df8801632b0732499f0ceeb6ad644
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 00:54:22 2010 +0000

    2010-08-27  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Adam Roben.
    
            [WINCE] Port SoftLinking to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=44693
    
            WinCE provides GetProcAddressW and GetProcAddressA for softlinking.
            Unfortunately WinNT provides only GetProcAddress (without A or W).
    
            Add a platform dependent macro for GetProcAddress.
    
            * platform/win/SoftLinking.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66286 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8f4052f..1f74fd2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-27  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Port SoftLinking to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=44693
+
+        WinCE provides GetProcAddressW and GetProcAddressA for softlinking.
+        Unfortunately WinNT provides only GetProcAddress (without A or W).
+
+        Add a platform dependent macro for GetProcAddress.
+
+        * platform/win/SoftLinking.h:
+
 2010-08-27  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/win/SoftLinking.h b/WebCore/platform/win/SoftLinking.h
index a82fe35..b67cc81 100644
--- a/WebCore/platform/win/SoftLinking.h
+++ b/WebCore/platform/win/SoftLinking.h
@@ -39,6 +39,12 @@
         return library; \
     }
 
+#if OS(WINCE)
+#define SOFT_LINK_GETPROCADDRESS GetProcAddressA
+#else
+#define SOFT_LINK_GETPROCADDRESS GetProcAddress
+#endif
+
 #define SOFT_LINK_LIBRARY(lib) SOFT_LINK_LIBRARY_HELPER(lib, L".dll")
 #define SOFT_LINK_DEBUG_LIBRARY(lib) SOFT_LINK_LIBRARY_HELPER(lib, L"_debug.dll")
 
@@ -48,7 +54,7 @@
     \
     static resultType callingConvention init##functionName parameterDeclarations \
     { \
-        softLink##functionName = reinterpret_cast<resultType (callingConvention*) parameterDeclarations>(GetProcAddress(library##Library(), #functionName)); \
+        softLink##functionName = reinterpret_cast<resultType (callingConvention*) parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
         ASSERT(softLink##functionName); \
         return softLink##functionName parameterNames; \
     }\
@@ -69,7 +75,7 @@
             return ptr; \
         initialized = true; \
         \
-        ptr = reinterpret_cast<functionName##PtrType>(GetProcAddress(library##Library(), #functionName)); \
+        ptr = reinterpret_cast<functionName##PtrType>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
         return ptr; \
     }\
 

-- 
WebKit Debian packaging