Title: [137054] trunk/Source/WTF
- Revision
- 137054
- Author
- [email protected]
- Date
- 2012-12-08 18:30:39 -0800 (Sat, 08 Dec 2012)
Log Message
Compiling WTF outside of WebKit failed on Windows
https://bugs.webkit.org/show_bug.cgi?id=100201
Reviewed by Darin Adler.
Explicitly use the Unicode variants of the Windows API to
allow building the WTF library without the UNICODE define.
* wtf/win/MainThreadWin.cpp:
(WTF::initializeMainThreadPlatform):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (137053 => 137054)
--- trunk/Source/WTF/ChangeLog 2012-12-09 01:54:13 UTC (rev 137053)
+++ trunk/Source/WTF/ChangeLog 2012-12-09 02:30:39 UTC (rev 137054)
@@ -1,3 +1,16 @@
+2012-12-08 Patrick Gansterer <[email protected]>
+
+ Compiling WTF outside of WebKit failed on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=100201
+
+ Reviewed by Darin Adler.
+
+ Explicitly use the Unicode variants of the Windows API to
+ allow building the WTF library without the UNICODE define.
+
+ * wtf/win/MainThreadWin.cpp:
+ (WTF::initializeMainThreadPlatform):
+
2012-12-08 Gustavo Noronha Silva <[email protected]>
Unreviewed trivial space fix to silence an automake warning.
Modified: trunk/Source/WTF/wtf/win/MainThreadWin.cpp (137053 => 137054)
--- trunk/Source/WTF/wtf/win/MainThreadWin.cpp 2012-12-09 01:54:13 UTC (rev 137053)
+++ trunk/Source/WTF/wtf/win/MainThreadWin.cpp 2012-12-09 02:30:39 UTC (rev 137054)
@@ -32,9 +32,7 @@
#include "Assertions.h"
#include "Threading.h"
-#if !OS(WINCE)
#include <windows.h>
-#endif
namespace WTF {
@@ -57,26 +55,18 @@
return;
HWND hWndParent = 0;
-#if OS(WINCE)
- WNDCLASS wcex;
- memset(&wcex, 0, sizeof(WNDCLASS));
-#else
- WNDCLASSEX wcex;
- memset(&wcex, 0, sizeof(WNDCLASSEX));
- wcex.cbSize = sizeof(WNDCLASSEX);
-#endif
+ WNDCLASSW wcex;
+ memset(&wcex, 0, sizeof(WNDCLASSW));
wcex.lpfnWndProc = ThreadingWindowWndProc;
wcex.lpszClassName = kThreadingWindowClassName;
-#if OS(WINCE)
- RegisterClass(&wcex);
-#else
- RegisterClassEx(&wcex);
+ RegisterClassW(&wcex);
+#if !OS(WINCE)
hWndParent = HWND_MESSAGE;
#endif
- threadingWindowHandle = CreateWindow(kThreadingWindowClassName, 0, 0,
+ threadingWindowHandle = CreateWindowW(kThreadingWindowClassName, 0, 0,
CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, hWndParent, 0, 0, 0);
- threadingFiredMessage = RegisterWindowMessage(L"com.apple.WebKit.MainThreadFired");
+ threadingFiredMessage = RegisterWindowMessageW(L"com.apple.WebKit.MainThreadFired");
initializeCurrentThreadInternal("Main Thread");
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
