Changeset 46591 in webkit

Timestamp:

Jul 30, 2009 11:25:42 AM (15 years ago)

Author:

staikos@webkit.org

Message:

2009-07-30 Yong Li <​yong.li@torchmobile.com>

Reviewed by George Staikos.

WINCE PORT: some files modified to build for WINCE
​https://bugs.webkit.org/show_bug.cgi?id=27816

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.h (modified) (2 diffs)
• page/win/EventHandlerWin.cpp (modified) (2 diffs)
• platform/win/PlatformMouseEventWin.cpp (modified) (3 diffs)
• platform/win/PlatformScreenWin.cpp (modified) (3 diffs)
• platform/win/PopupMenuWin.cpp (modified) (11 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-30  Yong Li  <yong.li@torchmobile.com>
+
+        Reviewed by George Staikos.
+
+        WINCE PORT: some files modified to build for WINCE
+        https://bugs.webkit.org/show_bug.cgi?id=27816
+
+        * accessibility/AccessibilityObject.h:
+        * page/win/EventHandlerWin.cpp:
+        (WebCore::EventHandler::createDraggingClipboard):
+        * platform/win/PlatformMouseEventWin.cpp:
+        (WebCore::messageToEventType):
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/win/PlatformScreenWin.cpp:
+        (WebCore::deviceInfoForWidget):
+        (WebCore::screenIsMonochrome):
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::show):
+        (WebCore::PopupMenu::paint):
+        (WebCore::registerPopup):
+        (WebCore::PopupWndProc):
+
 2009-07-30  Yong Li  <yong.li@torchmobile.com>
 

trunk/WebCore/accessibility/AccessibilityObject.h

@@ -41 +41 @@
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) && !PLATFORM(WINCE)
 #include "AccessibilityObjectWrapperWin.h"
 #include "COMPtr.h"
@@ -429 +429 @@
 #if PLATFORM(MAC)
     RetainPtr<AccessibilityObjectWrapper> m_wrapper;
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) && !PLATFORM(WINCE)
     COMPtr<AccessibilityObjectWrapper> m_wrapper;
 #elif PLATFORM(GTK)

trunk/WebCore/page/win/EventHandlerWin.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -88 +89 @@
 PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
 {
+#if PLATFORM(WINCE)
+    return 0;
+#else
     COMPtr<WCDataObject> dataObject;
     WCDataObject::createInstance(&dataObject);
     return ClipboardWin::create(true, dataObject.get(), ClipboardWritable);
+#endif
 }
 

trunk/WebCore/platform/win/PlatformMouseEventWin.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007-2008 Torch Mobile Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64 +65 @@
             return MouseEventReleased;
 
+#if !PLATFORM(WINCE)
         case WM_MOUSELEAVE:
+#endif
         case WM_MOUSEMOVE:
             return MouseEventMoved;
@@ -105 +108 @@
             break;
         case WM_MOUSEMOVE:
+#if !PLATFORM(WINCE)
         case WM_MOUSELEAVE:
+#endif
             if (wParam & MK_LBUTTON)
                 m_button = LeftButton;

trunk/WebCore/platform/win/PlatformScreenWin.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50 +51 @@
 static DEVMODE deviceInfoForWidget(Widget* widget)
 {
-    MONITORINFOEX monitorInfo = monitorInfoForWidget(widget);
-
     DEVMODE deviceInfo;
     deviceInfo.dmSize = sizeof(DEVMODE);
     deviceInfo.dmDriverExtra = 0;
+#if PLATFORM(WINCE)
+    if (!EnumDisplaySettings(0, ENUM_CURRENT_SETTINGS, &deviceInfo))
+        deviceInfo.dmBitsPerPel = 16;
+#else
+    MONITORINFOEX monitorInfo = monitorInfoForWidget(widget);
     EnumDisplaySettings(monitorInfo.szDevice, ENUM_CURRENT_SETTINGS, &deviceInfo);
+#endif
 
     return deviceInfo;
@@ -75 +80 @@
 bool screenIsMonochrome(Widget* widget)
 {
+#if PLATFORM(WINCE)
+    // EnumDisplaySettings doesn't set dmColor in DEVMODE.
+    return false;
+#else
     DEVMODE deviceInfo = deviceInfoForWidget(widget);
     return deviceInfo.dmColor == DMCOLOR_MONOCHROME;
+#endif
 }
 

trunk/WebCore/platform/win/PopupMenuWin.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2009 Torch Mobile Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -40 +41 @@
 #include <tchar.h>
 #include <windows.h>
+#if PLATFORM(WINCE)
+#include <ResDefCE.h>
+#define MAKEPOINTS(l) (*((POINTS FAR *)&(l)))
+#endif
 
 using std::min;
@@ -111 +116 @@
             return;
 
+#if PLATFORM(WINCE)
+        ::SetWindowLong(m_popup, 0, (LONG)this);
+#else
         ::SetWindowLongPtr(m_popup, 0, (LONG_PTR)this);
+#endif
     }
 
@@ -125 +134 @@
     // Note: Must use 'BOOL' and 'FALSE' instead of 'bool' and 'false' to avoid stack corruption with SystemParametersInfo
     BOOL shouldAnimate = FALSE;
+#if !PLATFORM(WINCE)
     ::SystemParametersInfo(SPI_GETCOMBOBOXANIMATION, 0, &shouldAnimate, 0);
 
@@ -139 +149 @@
         }
     } else
+#endif
         ::ShowWindow(m_popup, SW_SHOWNORMAL);
     ::SetCapture(m_popup);
@@ -453 +464 @@
     }
     if (!m_bmp) {
+#if PLATFORM(WINCE)
+        BitmapInfo bitmapInfo(true, clientRect().width(), clientRect().height());
+#else
         BitmapInfo bitmapInfo = BitmapInfo::createBottomUp(clientRect().size());
-
+#endif
         void* pixels = 0;
         m_bmp = ::CreateDIBSection(m_DC, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0);
@@ -585 +599 @@
         return true;
 
+#if PLATFORM(WINCE)
+    WNDCLASS wcex;
+#else
     WNDCLASSEX wcex;
-
     wcex.cbSize = sizeof(WNDCLASSEX);
-
+    wcex.hIconSm        = 0;
     wcex.style          = CS_DROPSHADOW;
+#endif
+
     wcex.lpfnWndProc    = PopupWndProc;
     wcex.cbClsExtra     = 0;
@@ -599 +617 @@
     wcex.lpszMenuName   = 0;
     wcex.lpszClassName  = kPopupWindowClassName;
-    wcex.hIconSm        = 0;
 
     haveRegisteredWindowClass = true;
 
+#if PLATFORM(WINCE)
+    return ::RegisterClass(&wcex);
+#else
     return ::RegisterClassEx(&wcex);
+#endif
 }
 
@@ -610 +631 @@
 {
     LRESULT lResult = 0;
+#if PLATFORM(WINCE)
+    LONG longPtr = GetWindowLong(hWnd, 0);
+#else
     LONG_PTR longPtr = GetWindowLongPtr(hWnd, 0);
+#endif
     PopupMenu* popup = reinterpret_cast<PopupMenu*>(longPtr);
 
@@ -727 +752 @@
 
                 BOOL shouldHotTrack = FALSE;
+#if !PLATFORM(WINCE)
                 ::SystemParametersInfo(SPI_GETHOTTRACKING, 0, &shouldHotTrack, 0);
+#endif
 
                 RECT bounds;
@@ -812 +839 @@
             }
             break;
+#if !PLATFORM(WINCE)
         case WM_PRINTCLIENT:
             if (popup)
                 popup->paint(popup->clientRect(), (HDC)wParam);
             break;
+#endif
         default:
             lResult = DefWindowProc(hWnd, message, wParam, lParam);