Modified: trunk/Tools/ChangeLog (125504 => 125505)
--- trunk/Tools/ChangeLog 2012-08-14 02:53:57 UTC (rev 125504)
+++ trunk/Tools/ChangeLog 2012-08-14 03:20:33 UTC (rev 125505)
@@ -1,3 +1,15 @@
+2012-08-13 Alex Christensen <[email protected]>
+
+ Windows 64 bit compliance
+ https://bugs.webkit.org/show_bug.cgi?id=93275
+
+ Reviewed by Brent Fulgham.
+
+ Fixed a few compile and link problems for Win64
+
+ * WinLauncher/WinLauncher.cpp:
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+
2012-08-13 MORITA Hajime <[email protected]>
Unreviewed update for webcomponents-bugzilla address.
Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (125504 => 125505)
--- trunk/Tools/WinLauncher/WinLauncher.cpp 2012-08-14 02:53:57 UTC (rev 125504)
+++ trunk/Tools/WinLauncher/WinLauncher.cpp 2012-08-14 03:20:33 UTC (rev 125505)
@@ -228,8 +228,13 @@
static void subclassForLayeredWindow()
{
hMainWnd = gViewWindow;
- DefWebKitProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hMainWnd, GWL_WNDPROC));
- ::SetWindowLongPtr(hMainWnd, GWL_WNDPROC, reinterpret_cast<LONG_PTR>(WndProc));
+#if defined _M_AMD64 || defined _WIN64
+ DefWebKitProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hMainWnd, GWLP_WNDPROC));
+ ::SetWindowLongPtr(hMainWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(WndProc));
+#else
+ DefWebKitProc = reinterpret_cast<WNDPROC>(::GetWindowLong(hMainWnd, GWL_WNDPROC));
+ ::SetWindowLong(hMainWnd, GWL_WNDPROC, reinterpret_cast<LONG_PTR>(WndProc));
+#endif
}
static void computeFullDesktopFrame()
@@ -314,8 +319,14 @@
UpdateWindow(hMainWnd);
}
- DefEditProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(hURLBarWnd, GWL_WNDPROC));
- SetWindowLongPtr(hURLBarWnd, GWL_WNDPROC, reinterpret_cast<LONG_PTR>(MyEditProc));
+#if defined _M_AMD64 || defined _WIN64
+ DefEditProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(hURLBarWnd, GWLP_WNDPROC));
+ SetWindowLongPtr(hURLBarWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(MyEditProc));
+#else
+ DefEditProc = reinterpret_cast<WNDPROC>(GetWindowLong(hURLBarWnd, GWL_WNDPROC));
+ SetWindowLong(hURLBarWnd, GWL_WNDPROC, reinterpret_cast<LONG_PTR>(MyEditProc));
+#endif
+
SetFocus(hURLBarWnd);
RECT clientRect = { s_windowPosition.x, s_windowPosition.y, s_windowPosition.x + s_windowSize.cx, s_windowPosition.y + s_windowSize.cy };
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (125504 => 125505)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2012-08-14 02:53:57 UTC (rev 125504)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2012-08-14 03:20:33 UTC (rev 125505)
@@ -184,11 +184,19 @@
#if USE_CONSOLE_ENTRY_POINT
typedef int (WINAPI*EntryPoint)(int, const char*[]);
+#if defined _M_AMD64 || defined _WIN64
+ const char* entryPointName = "_dllLauncherEntryPoint";
+#else
const char* entryPointName = "_dllLauncherEntryPoint@8";
+#endif
#else
typedef int (WINAPI*EntryPoint)(HINSTANCE, HINSTANCE, LPWSTR, int);
+#if defined _M_AMD64 || defined _WIN64
+ const char* entryPointName = "_dllLauncherEntryPoint";
+#else
const char* entryPointName = "_dllLauncherEntryPoint@16";
#endif
+#endif
EntryPoint entryPoint = reinterpret_cast<EntryPoint>(::GetProcAddress(module, entryPointName));
if (!entryPoint)
