[webkit-changes] [207282] trunk/Source/WebCore

Thu, 13 Oct 2016 04:29:49 -0700

Title: [207282] trunk/Source/WebCore
Revision
207282
Author
pvol...@apple.com
Date
2016-10-13 04:30:25 -0700 (Thu, 13 Oct 2016)

Log Message

[Win] Encode function pointers.
https://bugs.webkit.org/show_bug.cgi?id=163331

Reviewed by Brent Fulgham.

We should encode stored function pointers.

* platform/win/SoftLinking.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (207281 => 207282)


--- trunk/Source/WebCore/ChangeLog	2016-10-13 10:34:15 UTC (rev 207281)
+++ trunk/Source/WebCore/ChangeLog	2016-10-13 11:30:25 UTC (rev 207282)
@@ -1,3 +1,14 @@
+2016-10-12  Per Arne Vollan  <pvol...@apple.com>
+
+        [Win] Encode function pointers.
+        https://bugs.webkit.org/show_bug.cgi?id=163331
+
+        Reviewed by Brent Fulgham.
+
+        We should encode stored function pointers.
+
+        * platform/win/SoftLinking.h:
+
 2016-10-13  Youenn Fablet  <you...@apple.com>
 
         Remove CachedResourceRequest::mutableResourceRequest

Modified: trunk/Source/WebCore/platform/win/SoftLinking.h (207281 => 207282)


--- trunk/Source/WebCore/platform/win/SoftLinking.h	2016-10-13 10:34:15 UTC (rev 207281)
+++ trunk/Source/WebCore/platform/win/SoftLinking.h	2016-10-13 11:30:25 UTC (rev 207282)
@@ -44,19 +44,13 @@
 #pragma mark - Soft-link macros for use within a single source file
 
 #define SOFT_LINK(library, functionName, resultType, callingConvention, parameterDeclarations, parameterNames) \
-    static resultType callingConvention init##functionName parameterDeclarations; \
-    static resultType (callingConvention*softLink##functionName) parameterDeclarations = init##functionName; \
+    static resultType(callingConvention*softLink##functionName) parameterDeclarations = nullptr; \
     \
-    static resultType callingConvention init##functionName parameterDeclarations \
-    { \
-        softLink##functionName = reinterpret_cast<resultType (callingConvention*) parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
-        ASSERT(softLink##functionName); \
-        return softLink##functionName parameterNames; \
-    } \
-    \
     inline resultType functionName parameterDeclarations \
     { \
-        return softLink##functionName parameterNames; \
+        if (!softLink##functionName) \
+            softLink##functionName = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(::EncodePointer(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName))); \
+        return reinterpret_cast<resultType (callingConvention*) parameterDeclarations>(::DecodePointer(softLink##functionName)) parameterNames; \
     }
 
 #define SOFT_LINK_OPTIONAL(library, functionName, resultType, callingConvention, parameterDeclarations) \
@@ -66,12 +60,11 @@
         static functionName##PtrType ptr; \
         static bool initialized; \
         \
-        if (initialized) \
-            return ptr; \
-        initialized = true; \
-        \
-        ptr = reinterpret_cast<functionName##PtrType>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
-        return ptr; \
+        if (!initialized) { \
+            ptr = reinterpret_cast<functionName##PtrType>(::EncodePointer(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName))); \
+            initialized = true; \
+        } \
+        return reinterpret_cast<functionName##PtrType>(::DecodePointer(ptr)); \
     } \
 
 #define SOFT_LINK_LOADED_LIBRARY(library, functionName, resultType, callingConvention, parameterDeclarations) \
@@ -81,14 +74,13 @@
         static functionName##PtrType ptr; \
         static bool initialized; \
         \
-        if (initialized) \
-            return ptr; \
-        initialized = true; \
+        if (!initialized) { \
+            static HINSTANCE libraryInstance = ::GetModuleHandle(L#library); \
+            ptr = reinterpret_cast<functionName##PtrType>(::EncodePointer(SOFT_LINK_GETPROCADDRESS(libraryInstance, #functionName))); \
+            initialized = true; \
+        } \
         \
-        static HINSTANCE libraryInstance = ::GetModuleHandle(L#library); \
-        \
-        ptr = reinterpret_cast<functionName##PtrType>(SOFT_LINK_GETPROCADDRESS(libraryInstance, #functionName)); \
-        return ptr; \
+        return reinterpret_cast<functionName##PtrType>(::DecodePointer(ptr)); \
     } \
 
 /*
@@ -99,19 +91,13 @@
     #define myFunction softLink_myFunction
 */
 #define SOFT_LINK_DLL_IMPORT(library, functionName, resultType, callingConvention, parameterDeclarations, parameterNames) \
-    static resultType callingConvention init##functionName parameterDeclarations; \
-    static resultType(callingConvention*softLink##functionName) parameterDeclarations = init##functionName; \
+    static resultType(callingConvention*softLink##functionName) parameterDeclarations = nullptr; \
     \
-    static resultType callingConvention init##functionName parameterDeclarations \
-    { \
-        softLink##functionName = reinterpret_cast<resultType (callingConvention*)parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
-        ASSERT(softLink##functionName); \
-        return softLink##functionName parameterNames; \
-    } \
-    \
     inline resultType softLink_##functionName parameterDeclarations \
     { \
-        return softLink##functionName parameterNames; \
+        if (!softLink##functionName) \
+            softLink##functionName = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(::EncodePointer(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName))); \
+        return reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(::DecodePointer(softLink##functionName)) parameterNames; \
     }
 
 #define SOFT_LINK_DLL_IMPORT_OPTIONAL(library, functionName, resultType, callingConvention, parameterDeclarations) \
@@ -121,12 +107,11 @@
         static functionName##PtrType ptr; \
         static bool initialized; \
         \
-        if (initialized) \
-            return ptr; \
-        initialized = true; \
-        \
-        ptr = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
-        return ptr; \
+        if (!initialized) { \
+            ptr = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(::EncodePointer(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName))); \
+            initialized = true; \
+        } \
+        return reinterpret_cast<functionName##PtrType>(::DecodePointer(ptr)); \
     } \
 
 #define SOFT_LINK_DLL_IMPORT_OPTIONAL(library, functionName, resultType, callingConvention, parameterDeclarations) \
@@ -136,12 +121,11 @@
         static functionName##PtrType ptr; \
         static bool initialized; \
         \
-        if (initialized) \
-            return ptr; \
-        initialized = true; \
-        \
-        ptr = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
-        return ptr; \
+        if (!initialized) { \
+            ptr = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(::EncodePointer(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName))); \
+            initialized = true; \
+        } \
+        return reinterpret_cast<functionName##PtrType>(::DecodePointer(ptr)); \
     } \
 
 /*

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to