4 files changed, 17 insertions, 11 deletions
diff --git a/WebCore/platform/win/PasteboardWin.cpp b/WebCore/platform/win/PasteboardWin.cpp
index 03ecd36..c065f04 100644
--- a/WebCore/platform/win/PasteboardWin.cpp
+++ b/WebCore/platform/win/PasteboardWin.cpp
@@ -230,14 +230,7 @@ void Pasteboard::writeImage(Node* node, const KURL&, const String&)
     HGDIOBJ oldSource = SelectObject(sourceDC, coreBitmap);
     image->getHBITMAP(coreBitmap);
 
-#if !defined(NO_ALPHABLEND)
-    BLENDFUNCTION bf = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA};
-    AlphaBlend(compatibleDC, 0, 0, image->width(), image->height(),
-        sourceDC, 0, 0, image->width(), image->height(), bf);
-#else
-    StretchBlt(compatibleDC, 0, 0, image->width(), image->height(),
-        sourceDC, 0, 0, image->width(), image->height(), SRCCOPY);
-#endif
+    BitBlt(compatibleDC, 0, 0, image->width(), image->height(), sourceDC, 0, 0, SRCCOPY);
 
     SelectObject(sourceDC, oldSource);
     DeleteObject(coreBitmap);
diff --git a/WebCore/platform/win/ScrollbarThemeWin.cpp b/WebCore/platform/win/ScrollbarThemeWin.cpp
index 2ee3512..a8d374a 100644
--- a/WebCore/platform/win/ScrollbarThemeWin.cpp
+++ b/WebCore/platform/win/ScrollbarThemeWin.cpp
@@ -288,7 +288,10 @@ void ScrollbarThemeWin::paintButton(GraphicsContext* context, Scrollbar* scrollb
                (scrollbar->hoveredPart() == ForwardButtonEndPart && !start)) {
         if (scrollbar->pressedPart() == scrollbar->hoveredPart()) {
             xpState += TS_ACTIVE;
-            classicState |= DFCS_PUSHED | DFCS_FLAT;
+            classicState |= DFCS_PUSHED;
+#if !OS(WINCE)
+            classicState |= DFCS_FLAT;
+#endif
         } else
             xpState += TS_HOVER;
     } else {
diff --git a/WebCore/platform/win/SoftLinking.h b/WebCore/platform/win/SoftLinking.h
index a82fe35..b67cc81 100644
--- a/WebCore/platform/win/SoftLinking.h
+++ b/WebCore/platform/win/SoftLinking.h
@@ -39,6 +39,12 @@
         return library; \
     }
 
+#if OS(WINCE)
+#define SOFT_LINK_GETPROCADDRESS GetProcAddressA
+#else
+#define SOFT_LINK_GETPROCADDRESS GetProcAddress
+#endif
+
 #define SOFT_LINK_LIBRARY(lib) SOFT_LINK_LIBRARY_HELPER(lib, L".dll")
 #define SOFT_LINK_DEBUG_LIBRARY(lib) SOFT_LINK_LIBRARY_HELPER(lib, L"_debug.dll")
 
@@ -48,7 +54,7 @@
     \
     static resultType callingConvention init##functionName parameterDeclarations \
     { \
-        softLink##functionName = reinterpret_cast<resultType (callingConvention*) parameterDeclarations>(GetProcAddress(library##Library(), #functionName)); \
+        softLink##functionName = reinterpret_cast<resultType (callingConvention*) parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
         ASSERT(softLink##functionName); \
         return softLink##functionName parameterNames; \
     }\
@@ -69,7 +75,7 @@
             return ptr; \
         initialized = true; \
         \
-        ptr = reinterpret_cast<functionName##PtrType>(GetProcAddress(library##Library(), #functionName)); \
+        ptr = reinterpret_cast<functionName##PtrType>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
         return ptr; \
     }\
 
diff --git a/WebCore/platform/win/SystemInfo.cpp b/WebCore/platform/win/SystemInfo.cpp
index f010769..f2fe62b 100644
--- a/WebCore/platform/win/SystemInfo.cpp
+++ b/WebCore/platform/win/SystemInfo.cpp
@@ -32,6 +32,9 @@ namespace WebCore {
 
 bool isRunningOnVistaOrLater()
 {
+#if OS(WINCE)
+    return false;
+#else
     static bool isVistaOrLater;
     static bool initialized;
 
@@ -47,6 +50,7 @@ bool isRunningOnVistaOrLater()
     isVistaOrLater = vi.dwMajorVersion >= 6;
 
     return isVistaOrLater;
+#endif
 }
 
 } // namespace WebCore