Title: [264740] trunk/Source/WebKit
- Revision
- 264740
- Author
- hironori.fu...@sony.com
- Date
- 2020-07-22 18:44:59 -0700 (Wed, 22 Jul 2020)
Log Message
[WinCairo][32bit] ConnectionWin.cpp(327): error C2664: 'BOOL RegisterWaitForSingleObject(...)': cannot convert argument 3 from 'void (__cdecl *)(...)' to 'WAITORTIMERCALLBACK'
https://bugs.webkit.org/show_bug.cgi?id=214658
Reviewed by Darin Adler.
__cdecl and __stdcall calling conventions don't match.
<https://docs.microsoft.com/en-us/cpp/cpp/argument-passing-and-naming-conventions>
* Platform/IPC/Connection.h: Added WINAPI to Connection::EventListener::callback method.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (264739 => 264740)
--- trunk/Source/WebKit/ChangeLog 2020-07-23 01:41:16 UTC (rev 264739)
+++ trunk/Source/WebKit/ChangeLog 2020-07-23 01:44:59 UTC (rev 264740)
@@ -1,3 +1,15 @@
+2020-07-22 Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo][32bit] ConnectionWin.cpp(327): error C2664: 'BOOL RegisterWaitForSingleObject(...)': cannot convert argument 3 from 'void (__cdecl *)(...)' to 'WAITORTIMERCALLBACK'
+ https://bugs.webkit.org/show_bug.cgi?id=214658
+
+ Reviewed by Darin Adler.
+
+ __cdecl and __stdcall calling conventions don't match.
+ <https://docs.microsoft.com/en-us/cpp/cpp/argument-passing-and-naming-conventions>
+
+ * Platform/IPC/Connection.h: Added WINAPI to Connection::EventListener::callback method.
+
2020-07-22 David Kilzer <ddkil...@apple.com>
Follow-up: [IPC hardening] WebKit::ObjCObjectGraph::decode() and encode() should use enum ObjCType type
Modified: trunk/Source/WebKit/Platform/IPC/Connection.h (264739 => 264740)
--- trunk/Source/WebKit/Platform/IPC/Connection.h 2020-07-23 01:41:16 UTC (rev 264739)
+++ trunk/Source/WebKit/Platform/IPC/Connection.h 2020-07-23 01:44:59 UTC (rev 264740)
@@ -448,7 +448,7 @@
OVERLAPPED& state() { return m_state; }
private:
- static void callback(void*, BOOLEAN);
+ static void WINAPI callback(void*, BOOLEAN);
OVERLAPPED m_state;
HANDLE m_waitHandle { INVALID_HANDLE_VALUE };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
