Changeset 137054 in webkit

Timestamp:

Dec 8, 2012 6:30:39 PM (11 years ago)

Author:

Patrick Gansterer

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):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/win/MainThreadWin.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-12-08  Patrick Gansterer  <paroga@webkit.org>
+
+        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  <gns@gnome.org>
 

trunk/Source/WTF/wtf/win/MainThreadWin.cpp

@@ -33 +33 @@
 #include "Assertions.h"
 #include "Threading.h"
-#if !OS(WINCE)
 #include <windows.h>
-#endif
 
 namespace WTF {
@@ -58 +56 @@
 
     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");