Changeset 125505 in webkit

Timestamp:

Aug 13, 2012 8:20:33 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Windows 64 bit compliance
​https://bugs.webkit.org/show_bug.cgi?id=93275

Patch by Alex Christensen <​alex.christensen@flexsim.com> on 2012-08-13
Reviewed by Brent Fulgham.

Fixed a few compile and link problems for Win64

• WinLauncher/WinLauncher.cpp:
• win/DLLLauncher/DLLLauncherMain.cpp:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WinLauncher/WinLauncher.cpp (modified) (2 diffs)
• win/DLLLauncher/DLLLauncherMain.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-13  Alex Christensen  <alex.christensen@flexsim.com>
+
+        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  <morrita@google.com>
 

trunk/Tools/WinLauncher/WinLauncher.cpp

@@ -229 +229 @@
 {
     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
 }
 
@@ -315 +320 @@
     }
 
-    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);
 

trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp

@@ -185 +185 @@
 #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